honeymoose/angular-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert: feat(compiler-cli): support metadata file aliases (#15331)

Browse Source 
This reverts commit 0ab49d4cec23e2957fd7e8dad55d15fc539c69ed.

PR Close #15331
This commit is contained in:
Chuck Jazdzewski 2017-03-20 19:43:39 -07:00 committed by Miško Hevery
parent c2ffb6bfcd
commit 16e0423085
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/compiler-cli/src/compiler_host.ts
View File

@ -207,11 +207,7 @@ export class CompilerHost implements AotCompilerHost {
return metadatas; return metadatas;
} }
try { try {
let metadataOrMetadatas = JSON.parse(this.context.readFile(filePath)); const metadataOrMetadatas = JSON.parse(this.context.readFile(filePath));
while (metadataOrMetadatas && metadataOrMetadatas.alias) {
filePath = path.join(path.dirname(filePath), metadataOrMetadatas.alias);
metadataOrMetadatas = JSON.parse(this.context.readFile(filePath));
}
const metadatas: ModuleMetadata[] = metadataOrMetadatas ? const metadatas: ModuleMetadata[] = metadataOrMetadatas ?
(Array.isArray(metadataOrMetadatas) ? metadataOrMetadatas : [metadataOrMetadatas]) : (Array.isArray(metadataOrMetadatas) ? metadataOrMetadatas : [metadataOrMetadatas]) :
[]; [];

9
packages/compiler-cli/test/aot_host_spec.ts
View File

@ -202,10 +202,6 @@ describe('CompilerHost', () => {
{__symbolic: 'module', version: 3, metadata: {}, exports: [{from: './lib/utils'}]} {__symbolic: 'module', version: 3, metadata: {}, exports: [{from: './lib/utils'}]}
]); ]);
}); });
it('should follow metadata aliases', () => {
expect(hostNestedGenDir.getMetadataFor('alias/file.d.ts')).toEqual([dummyMetadata]);
});
}); });
const dummyModule = 'export let foo: any[];'; const dummyModule = 'export let foo: any[];';
@ -241,11 +237,6 @@ const FILES: Entry = {
'empty.metadata.json': '[]', 'empty.metadata.json': '[]',
} }
}, },
'alias': {
'file.d.ts': dummyModule,
'file.metadata.json': '{ "alias": "sub/index.metadata.json"}',
'sub': {'index.metadata.json': JSON.stringify(dummyMetadata)}
},
'metadata_versions': { 'metadata_versions': {
'v1.d.ts': ` 'v1.d.ts': `
import {ReExport} from './lib/utils2'; import {ReExport} from './lib/utils2';