miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

fix(core): find imports in export type statements (#13921)

Browse Source
This commit is contained in:
Spencer 2022-12-30 12:43:04 -06:00 committed by GitHub
parent c783ac5e9a
commit d5c93bfa39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/nx/src/utils/strip-source-code.spec.ts
View File

@ -47,6 +47,7 @@ import('./module.ts')`;
} from './a'; } from './a';
export { B } from './b'; export { B } from './b';
export type { B } from './b';
export { C as D } from './c'; export { C as D } from './c';
@ -58,6 +59,7 @@ export {
A A
} from './a' } from './a'
export { B } from './b' export { B } from './b'
export type { B } from './b'
export { C as D } from './c'`; export { C as D } from './c'`;
expect(stripSourceCode(scanner, input)).toEqual(expected); expect(stripSourceCode(scanner, input)).toEqual(expected);

5
packages/nx/src/utils/strip-source-code.ts
View File

@ -1,6 +1,6 @@
import type { Scanner } from 'typescript'; import type { Scanner } from 'typescript';
let SyntaxKind; let SyntaxKind: typeof import('typescript').SyntaxKind;
export function stripSourceCode(scanner: Scanner, contents: string): string { export function stripSourceCode(scanner: Scanner, contents: string): string {
if (!SyntaxKind) { if (!SyntaxKind) {
SyntaxKind = require('typescript').SyntaxKind; SyntaxKind = require('typescript').SyntaxKind;
@ -90,7 +90,8 @@ export function stripSourceCode(scanner: Scanner, contents: string): string {
} }
if ( if (
token === SyntaxKind.OpenBraceToken || token === SyntaxKind.OpenBraceToken ||
token === SyntaxKind.AsteriskToken token === SyntaxKind.AsteriskToken ||
token === SyntaxKind.TypeKeyword
) { ) {
start = potentialStart; start = potentialStart;
} }