Skip to content

Various Fixes with Modules #5510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 20, 2017
Merged

Various Fixes with Modules #5510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1216c0d
fix(@ngtools/webpack): only remove moduleId in decorators
hansl Mar 19, 2017
3d322cf
fix(@ngtools/webpack): add parent nodes and keep program
hansl Mar 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 37 additions & 4 deletions packages/@ngtools/webpack/src/loader.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,49 @@ describe('@ngtools/webpack', () => {
host.writeFile('/file.ts', `
export const obj = { moduleId: 123 };
export const obj2 = { moduleId: 123, otherValue: 1 };
export const obj2 = { otherValue: 1, moduleId: 123 };
export const obj3 = { otherValue: 1, moduleId: 123 };
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You added obj3 but don't check it on the tests. Is that intentional?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed the check to not use the variable name.

`, false);
host.writeFile('/file2.ts', `
@SomeDecorator({ moduleId: 123 }) class CLS {}
@SomeDecorator({ moduleId: 123, otherValue1: 1 }) class CLS2 {}
@SomeDecorator({ otherValue2: 2, moduleId: 123, otherValue3: 3 }) class CLS3 {}
@SomeDecorator({ otherValue4: 4, moduleId: 123 }) class CLS4 {}
`, false);

const program = ts.createProgram(['/file.ts'], {}, host);
const program = ts.createProgram(['/file.ts', '/file2.ts'], {}, host);

const refactor = new TypeScriptFileRefactor('/file.ts', host, program);
removeModuleIdOnlyForTesting(refactor);
expect(refactor.sourceText).not.toMatch(/obj = \{\s+};/);
expect(refactor.sourceText).not.toMatch(/\{\s*otherValue: 1\s*};/);

const refactor2 = new TypeScriptFileRefactor('/file2.ts', host, program);
removeModuleIdOnlyForTesting(refactor2);
expect(refactor2.sourceText).toMatch(/\(\{\s+}\)/);
expect(refactor2.sourceText).toMatch(/\(\{\s*otherValue1: 1\s*}\)/);
expect(refactor2.sourceText).toMatch(/\(\{\s*otherValue2: 2\s*,\s*otherValue3: 3\s*}\)/);
expect(refactor2.sourceText).toMatch(/\(\{\s*otherValue4: 4\s*}\)/);
});

expect(refactor.sourceText).toMatch(/obj = \{\s+};/);
expect(refactor.sourceText).toMatch(/obj2 = \{\s*otherValue: 1\s*};/);
it('should work without a root name', () => {
const host = new WebpackCompilerHost({}, '');
host.writeFile('/file.ts', `
import './file2.ts';
`, false);
host.writeFile('/file2.ts', `
@SomeDecorator({ moduleId: 123 }) class CLS {}
@SomeDecorator({ moduleId: 123, otherValue1: 1 }) class CLS2 {}
@SomeDecorator({ otherValue2: 2, moduleId: 123, otherValue3: 3 }) class CLS3 {}
@SomeDecorator({ otherValue4: 4, moduleId: 123 }) class CLS4 {}
`, false);

const program = ts.createProgram(['/file.ts'], {}, host);
const refactor = new TypeScriptFileRefactor('/file2.ts', host, program);
removeModuleIdOnlyForTesting(refactor);
expect(refactor.sourceText).toMatch(/\(\{\s+}\)/);
expect(refactor.sourceText).toMatch(/\(\{\s*otherValue1: 1\s*}\)/);
expect(refactor.sourceText).toMatch(/\(\{\s*otherValue2: 2\s*,\s*otherValue3: 3\s*}\)/);
expect(refactor.sourceText).toMatch(/\(\{\s*otherValue4: 4\s*}\)/);
});
});
});
Expand Down
10 changes: 7 additions & 3 deletions packages/@ngtools/webpack/src/loader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,10 @@ export function removeModuleIdOnlyForTesting(refactor: TypeScriptFileRefactor) {
function _removeModuleId(refactor: TypeScriptFileRefactor) {
const sourceFile = refactor.sourceFile;

refactor.findAstNodes(sourceFile, ts.SyntaxKind.ObjectLiteralExpression, true)
refactor.findAstNodes(sourceFile, ts.SyntaxKind.Decorator, true)
.reduce((acc, node) => {
return acc.concat(refactor.findAstNodes(node, ts.SyntaxKind.ObjectLiteralExpression, true));
}, [])
// Get all their property assignments.
.filter((node: ts.ObjectLiteralExpression) => {
return node.properties.some(prop => {
Expand All @@ -254,8 +257,9 @@ function _removeModuleId(refactor: TypeScriptFileRefactor) {
return prop.kind == ts.SyntaxKind.PropertyAssignment
&& _getContentOfKeyLiteral(sourceFile, prop.name) == 'moduleId';
})[0];
// get the trailing comma
const moduleIdCommaProp = moduleIdProp.parent.getChildAt(1).getChildren()[1];
// Get the trailing comma.
const moduleIdCommaProp = moduleIdProp.parent
? moduleIdProp.parent.getChildAt(1).getChildren()[1] : null;
refactor.removeNodes(moduleIdProp, moduleIdCommaProp);
});
}
Expand Down
3 changes: 1 addition & 2 deletions packages/@ngtools/webpack/src/refactor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,8 @@ export class TypeScriptFileRefactor {
this._sourceFile = _program.getSourceFile(fileName);
}
if (!this._sourceFile) {
this._program = null;
this._sourceFile = ts.createSourceFile(fileName, _host.readFile(fileName),
ts.ScriptTarget.Latest);
ts.ScriptTarget.Latest, true);
}
this._sourceText = this._sourceFile.getFullText(this._sourceFile);
this._sourceString = new MagicString(this._sourceText);
Expand Down