2018-07-16 03:54:16 -04:00
|
|
|
/**
|
|
|
|
* @license
|
|
|
|
* Copyright Google Inc. All Rights Reserved.
|
|
|
|
*
|
|
|
|
* Use of this source code is governed by an MIT-style license that can be
|
|
|
|
* found in the LICENSE file at https://angular.io/license
|
|
|
|
*/
|
2019-05-25 16:34:40 -04:00
|
|
|
import * as ts from 'typescript';
|
2019-10-14 16:04:42 -04:00
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
import {AbsoluteFsPath, NgtscCompilerHost, absoluteFrom, getFileSystem} from '../../../src/ngtsc/file_system';
|
|
|
|
import {TestFile} from '../../../src/ngtsc/file_system/testing';
|
|
|
|
import {BundleProgram, makeBundleProgram} from '../../src/packages/bundle_program';
|
2019-10-14 16:04:42 -04:00
|
|
|
import {NgccEntryPointConfig} from '../../src/packages/configuration';
|
2019-08-07 19:19:52 -04:00
|
|
|
import {EntryPoint, EntryPointFormat} from '../../src/packages/entry_point';
|
2018-11-25 16:40:25 -05:00
|
|
|
import {EntryPointBundle} from '../../src/packages/entry_point_bundle';
|
2019-06-06 15:22:32 -04:00
|
|
|
import {NgccSourcesCompilerHost} from '../../src/packages/ngcc_compiler_host';
|
2018-07-16 03:54:16 -04:00
|
|
|
|
2019-10-14 16:04:42 -04:00
|
|
|
export type TestConfig = Pick<NgccEntryPointConfig, 'generateDeepReexports'>;
|
|
|
|
|
2019-05-25 12:46:07 -04:00
|
|
|
export function makeTestEntryPoint(
|
2019-10-14 16:04:42 -04:00
|
|
|
entryPointName: string, packageName: string = entryPointName, config?: TestConfig): EntryPoint {
|
2019-05-25 12:46:07 -04:00
|
|
|
return {
|
|
|
|
name: entryPointName,
|
|
|
|
packageJson: {name: entryPointName},
|
|
|
|
package: absoluteFrom(`/node_modules/${packageName}`),
|
|
|
|
path: absoluteFrom(`/node_modules/${entryPointName}`),
|
|
|
|
typings: absoluteFrom(`/node_modules/${entryPointName}/index.d.ts`),
|
|
|
|
compiledByAngular: true,
|
2019-10-02 03:32:57 -04:00
|
|
|
ignoreMissingDependencies: false,
|
2019-10-14 16:04:42 -04:00
|
|
|
generateDeepReexports: config !== undefined ? !!config.generateDeepReexports : false,
|
2019-05-25 12:46:07 -04:00
|
|
|
};
|
|
|
|
}
|
|
|
|
|
2018-11-25 16:40:25 -05:00
|
|
|
/**
|
|
|
|
*
|
|
|
|
* @param format The format of the bundle.
|
|
|
|
* @param files The source files to include in the bundle.
|
|
|
|
* @param dtsFiles The typings files to include the bundle.
|
|
|
|
*/
|
|
|
|
export function makeTestEntryPointBundle(
|
2019-08-07 19:19:52 -04:00
|
|
|
packageName: string, format: EntryPointFormat, isCore: boolean, srcRootNames: AbsoluteFsPath[],
|
2019-12-03 03:36:38 -05:00
|
|
|
dtsRootNames?: AbsoluteFsPath[], config?: TestConfig,
|
|
|
|
enableI18nLegacyMessageIdFormat = false): EntryPointBundle {
|
2019-10-14 16:04:42 -04:00
|
|
|
const entryPoint = makeTestEntryPoint(packageName, packageName, config);
|
2019-06-06 15:22:32 -04:00
|
|
|
const src = makeTestBundleProgram(srcRootNames[0], isCore);
|
2019-08-13 20:02:44 -04:00
|
|
|
const dts =
|
|
|
|
dtsRootNames ? makeTestDtsBundleProgram(dtsRootNames[0], entryPoint.package, isCore) : null;
|
2019-03-20 09:47:58 -04:00
|
|
|
const isFlatCore = isCore && src.r3SymbolsFile === null;
|
2019-12-03 03:36:38 -05:00
|
|
|
return {
|
|
|
|
entryPoint,
|
|
|
|
format,
|
|
|
|
rootDirs: [absoluteFrom('/')], src, dts, isCore, isFlatCore, enableI18nLegacyMessageIdFormat
|
|
|
|
};
|
2018-12-17 19:17:38 -05:00
|
|
|
}
|
2018-11-25 16:40:25 -05:00
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
export function makeTestBundleProgram(
|
2019-08-13 20:02:44 -04:00
|
|
|
path: AbsoluteFsPath, isCore: boolean = false,
|
|
|
|
additionalFiles?: AbsoluteFsPath[]): BundleProgram {
|
2019-06-06 15:22:32 -04:00
|
|
|
const fs = getFileSystem();
|
|
|
|
const entryPointPath = fs.dirname(path);
|
2019-05-25 16:34:40 -04:00
|
|
|
const rootDir = fs.dirname(entryPointPath);
|
|
|
|
const options: ts.CompilerOptions =
|
|
|
|
{allowJs: true, maxNodeModuleJsDepth: Infinity, checkJs: false, rootDir, rootDirs: [rootDir]};
|
2019-06-06 15:22:32 -04:00
|
|
|
const host = new NgccSourcesCompilerHost(fs, options, entryPointPath);
|
2019-08-13 20:02:44 -04:00
|
|
|
return makeBundleProgram(
|
|
|
|
fs, isCore, rootDir, path, 'r3_symbols.js', options, host, additionalFiles);
|
2018-07-16 03:54:16 -04:00
|
|
|
}
|
2018-10-01 06:10:55 -04:00
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
export function makeTestDtsBundleProgram(
|
2019-08-13 20:02:44 -04:00
|
|
|
path: AbsoluteFsPath, packagePath: AbsoluteFsPath, isCore: boolean = false): BundleProgram {
|
2019-06-06 15:22:32 -04:00
|
|
|
const fs = getFileSystem();
|
|
|
|
const options = {};
|
|
|
|
const host = new NgtscCompilerHost(fs, options);
|
2019-08-13 20:02:44 -04:00
|
|
|
return makeBundleProgram(fs, isCore, packagePath, path, 'r3_symbols.d.ts', options, host);
|
2018-09-30 15:53:25 -04:00
|
|
|
}
|
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
export function convertToDirectTsLibImport(filesystem: TestFile[]) {
|
2018-10-01 06:10:55 -04:00
|
|
|
return filesystem.map(file => {
|
|
|
|
const contents =
|
|
|
|
file.contents
|
|
|
|
.replace(
|
|
|
|
`import * as tslib_1 from 'tslib';`,
|
|
|
|
`import { __decorate, __metadata, __read, __values, __param, __extends, __assign } from 'tslib';`)
|
2018-09-30 15:53:25 -04:00
|
|
|
.replace(/tslib_1\./g, '');
|
2018-10-01 06:10:55 -04:00
|
|
|
return {...file, contents};
|
|
|
|
});
|
|
|
|
}
|
2019-04-28 15:47:57 -04:00
|
|
|
|
2019-07-19 17:22:52 -04:00
|
|
|
export function convertToInlineTsLib(filesystem: TestFile[], suffix: string = '') {
|
refactor(ivy): ngcc - categorize the various decorate calls upfront (#31614)
Any decorator information present in TypeScript is emitted into the
generated JavaScript sources by means of `__decorate` call. This call
contains both the decorators as they existed in the original source
code, together with calls to `tslib` helpers that convey additional
information on e.g. type information and parameter decorators. These
different kinds of decorator calls were not previously distinguished on
their own, but instead all treated as `Decorator` by themselves. The
"decorators" that were actually `tslib` helper calls were conveniently
filtered out because they were not imported from `@angular/core`, a
characteristic that ngcc uses to drop certain decorators.
Note that this posed an inconsistency in ngcc when it processes
`@angular/core`'s UMD bundle, as the `tslib` helper functions have been
inlined in said bundle. Because of the inlining, the `tslib` helpers
appear to be from `@angular/core`, so ngcc would fail to drop those
apparent "decorators". This inconsistency does not currently cause any
issues, as ngtsc is specifically looking for decorators based on their
name and any remaining decorators are simply ignored.
This commit rewrites the decorator analysis of a class to occur all in a
single phase, instead of all throughout the `ReflectionHost`. This
allows to categorize the various decorate calls in a single sweep,
instead of constantly needing to filter out undesired decorate calls on
the go. As an added benefit, the computed decorator information is now
cached per class, such that subsequent reflection queries that need
decorator information can reuse the cached info.
PR Close #31614
2019-07-19 17:17:22 -04:00
|
|
|
return filesystem.map(file => {
|
|
|
|
const contents = file.contents
|
|
|
|
.replace(`import * as tslib_1 from 'tslib';`, `
|
2019-07-19 17:22:52 -04:00
|
|
|
var __decorate${suffix} = null;
|
|
|
|
var __metadata${suffix} = null;
|
|
|
|
var __read${suffix} = null;
|
|
|
|
var __values${suffix} = null;
|
|
|
|
var __param${suffix} = null;
|
|
|
|
var __extends${suffix} = null;
|
|
|
|
var __assign${suffix} = null;
|
|
|
|
`).replace(/tslib_1\.([_a-z]+)/gi, '$1' + suffix.replace('$', '$$'));
|
refactor(ivy): ngcc - categorize the various decorate calls upfront (#31614)
Any decorator information present in TypeScript is emitted into the
generated JavaScript sources by means of `__decorate` call. This call
contains both the decorators as they existed in the original source
code, together with calls to `tslib` helpers that convey additional
information on e.g. type information and parameter decorators. These
different kinds of decorator calls were not previously distinguished on
their own, but instead all treated as `Decorator` by themselves. The
"decorators" that were actually `tslib` helper calls were conveniently
filtered out because they were not imported from `@angular/core`, a
characteristic that ngcc uses to drop certain decorators.
Note that this posed an inconsistency in ngcc when it processes
`@angular/core`'s UMD bundle, as the `tslib` helper functions have been
inlined in said bundle. Because of the inlining, the `tslib` helpers
appear to be from `@angular/core`, so ngcc would fail to drop those
apparent "decorators". This inconsistency does not currently cause any
issues, as ngtsc is specifically looking for decorators based on their
name and any remaining decorators are simply ignored.
This commit rewrites the decorator analysis of a class to occur all in a
single phase, instead of all throughout the `ReflectionHost`. This
allows to categorize the various decorate calls in a single sweep,
instead of constantly needing to filter out undesired decorate calls on
the go. As an added benefit, the computed decorator information is now
cached per class, such that subsequent reflection queries that need
decorator information can reuse the cached info.
PR Close #31614
2019-07-19 17:17:22 -04:00
|
|
|
return {...file, contents};
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
export function getRootFiles(testFiles: TestFile[]): AbsoluteFsPath[] {
|
|
|
|
return testFiles.filter(f => f.isRoot !== false).map(f => absoluteFrom(f.name));
|
2019-04-28 15:47:57 -04:00
|
|
|
}
|