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
|
|
|
|
*/
|
|
|
|
import * as ts from 'typescript';
|
2018-11-25 16:40:25 -05:00
|
|
|
|
2019-03-20 09:47:58 -04:00
|
|
|
import {AbsoluteFsPath} from '../../../src/ngtsc/path';
|
|
|
|
import {makeProgram} from '../../../src/ngtsc/testing/in_memory_typescript';
|
2018-11-25 16:40:25 -05:00
|
|
|
import {BundleProgram} from '../../src/packages/bundle_program';
|
|
|
|
import {EntryPointFormat} from '../../src/packages/entry_point';
|
|
|
|
import {EntryPointBundle} from '../../src/packages/entry_point_bundle';
|
2018-07-16 03:54:16 -04:00
|
|
|
|
2019-03-20 09:47:58 -04:00
|
|
|
export {getDeclaration} from '../../../src/ngtsc/testing/in_memory_typescript';
|
2018-07-16 03:54:16 -04:00
|
|
|
|
2018-11-25 16:40:25 -05:00
|
|
|
|
feat(ivy): use fileNameToModuleName to emit imports when it's available (#28523)
The ultimate goal of this commit is to make use of fileNameToModuleName to
get the module specifier to use when generating an import, when that API is
available in the CompilerHost that ngtsc is created with.
As part of getting there, the way in which ngtsc tracks references and
generates import module specifiers is refactored considerably. References
are tracked with the Reference class, and previously ngtsc had several
different kinds of Reference. An AbsoluteReference represented a declaration
which needed to be imported via an absolute module specifier tracked in the
AbsoluteReference, and a RelativeReference represented a declaration from
the local program, imported via relative path or referred to directly by
identifier if possible. Thus, how to refer to a particular declaration was
encoded into the Reference type _at the time of creation of the Reference_.
This commit refactors that logic and reduces Reference to a single class
with no subclasses. A Reference represents a node being referenced, plus
context about how the node was located. This context includes a
"bestGuessOwningModule", the compiler's best guess at which absolute
module specifier has defined this reference. For example, if the compiler
arrives at the declaration of CommonModule via an import to @angular/common,
then any references obtained from CommonModule (e.g. NgIf) will also be
considered to be owned by @angular/common.
A ReferenceEmitter class and accompanying ReferenceEmitStrategy interface
are introduced. To produce an Expression referring to a given Reference'd
node, the ReferenceEmitter consults a sequence of ReferenceEmitStrategy
implementations.
Several different strategies are defined:
- LocalIdentifierStrategy: use local ts.Identifiers if available.
- AbsoluteModuleStrategy: if the Reference has a bestGuessOwningModule,
import the node via an absolute import from that module specifier.
- LogicalProjectStrategy: if the Reference is in the logical project
(is under the project rootDirs), import the node via a relative import.
- FileToModuleStrategy: use a FileToModuleHost to generate the module
specifier by which to import the node.
Depending on the availability of fileNameToModuleName in the CompilerHost,
then, a different collection of these strategies is used for compilation.
PR Close #28523
2019-02-01 20:24:21 -05: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(
|
|
|
|
format: EntryPointFormat, files: {name: string, contents: string, isRoot?: boolean}[],
|
|
|
|
dtsFiles?: {name: string, contents: string, isRoot?: boolean}[]): EntryPointBundle {
|
|
|
|
const src = makeTestBundleProgram(files);
|
|
|
|
const dts = dtsFiles ? makeTestBundleProgram(dtsFiles) : null;
|
|
|
|
const isFlat = src.r3SymbolsFile === null;
|
feat(ivy): use fileNameToModuleName to emit imports when it's available (#28523)
The ultimate goal of this commit is to make use of fileNameToModuleName to
get the module specifier to use when generating an import, when that API is
available in the CompilerHost that ngtsc is created with.
As part of getting there, the way in which ngtsc tracks references and
generates import module specifiers is refactored considerably. References
are tracked with the Reference class, and previously ngtsc had several
different kinds of Reference. An AbsoluteReference represented a declaration
which needed to be imported via an absolute module specifier tracked in the
AbsoluteReference, and a RelativeReference represented a declaration from
the local program, imported via relative path or referred to directly by
identifier if possible. Thus, how to refer to a particular declaration was
encoded into the Reference type _at the time of creation of the Reference_.
This commit refactors that logic and reduces Reference to a single class
with no subclasses. A Reference represents a node being referenced, plus
context about how the node was located. This context includes a
"bestGuessOwningModule", the compiler's best guess at which absolute
module specifier has defined this reference. For example, if the compiler
arrives at the declaration of CommonModule via an import to @angular/common,
then any references obtained from CommonModule (e.g. NgIf) will also be
considered to be owned by @angular/common.
A ReferenceEmitter class and accompanying ReferenceEmitStrategy interface
are introduced. To produce an Expression referring to a given Reference'd
node, the ReferenceEmitter consults a sequence of ReferenceEmitStrategy
implementations.
Several different strategies are defined:
- LocalIdentifierStrategy: use local ts.Identifiers if available.
- AbsoluteModuleStrategy: if the Reference has a bestGuessOwningModule,
import the node via an absolute import from that module specifier.
- LogicalProjectStrategy: if the Reference is in the logical project
(is under the project rootDirs), import the node via a relative import.
- FileToModuleStrategy: use a FileToModuleHost to generate the module
specifier by which to import the node.
Depending on the availability of fileNameToModuleName in the CompilerHost,
then, a different collection of these strategies is used for compilation.
PR Close #28523
2019-02-01 20:24:21 -05:00
|
|
|
return {format, rootDirs: [AbsoluteFsPath.fromUnchecked('/')], src, dts, isFlat};
|
2018-11-25 16:40:25 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Create a bundle program for testing.
|
|
|
|
* @param files The source files of the bundle program.
|
|
|
|
*/
|
|
|
|
export function makeTestBundleProgram(files: {name: string, contents: string}[]): BundleProgram {
|
2018-12-17 19:17:38 -05:00
|
|
|
const {program, options, host} = makeTestProgramInternal(...files);
|
2018-11-25 16:40:25 -05:00
|
|
|
const path = files[0].name;
|
|
|
|
const file = program.getSourceFile(path) !;
|
|
|
|
const r3SymbolsInfo = files.find(file => file.name.indexOf('r3_symbols') !== -1) || null;
|
|
|
|
const r3SymbolsPath = r3SymbolsInfo && r3SymbolsInfo.name;
|
|
|
|
const r3SymbolsFile = r3SymbolsPath && program.getSourceFile(r3SymbolsPath) || null;
|
2018-12-17 19:17:38 -05:00
|
|
|
return {program, options, host, path, file, r3SymbolsPath, r3SymbolsFile};
|
2018-11-25 16:40:25 -05:00
|
|
|
}
|
|
|
|
|
2018-12-17 19:17:38 -05:00
|
|
|
function makeTestProgramInternal(
|
|
|
|
...files: {name: string, contents: string, isRoot?: boolean | undefined}[]): {
|
|
|
|
program: ts.Program,
|
|
|
|
host: ts.CompilerHost,
|
|
|
|
options: ts.CompilerOptions,
|
|
|
|
} {
|
|
|
|
return makeProgram([getFakeCore(), getFakeTslib(), ...files], {allowJs: true, checkJs: false});
|
|
|
|
}
|
2018-11-25 16:40:25 -05:00
|
|
|
|
|
|
|
export function makeTestProgram(
|
|
|
|
...files: {name: string, contents: string, isRoot?: boolean | undefined}[]): ts.Program {
|
2018-12-17 19:17:38 -05:00
|
|
|
return makeTestProgramInternal(...files).program;
|
2018-07-16 03:54:16 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
// TODO: unify this with the //packages/compiler-cli/test/ngtsc/fake_core package
|
|
|
|
export function getFakeCore() {
|
|
|
|
return {
|
|
|
|
name: 'node_modules/@angular/core/index.ts',
|
|
|
|
contents: `
|
|
|
|
type FnWithArg<T> = (arg?: any) => T;
|
|
|
|
|
|
|
|
function callableClassDecorator(): FnWithArg<(clazz: any) => any> {
|
|
|
|
return null !;
|
|
|
|
}
|
|
|
|
|
|
|
|
function callableParamDecorator(): FnWithArg<(a: any, b: any, c: any) => void> {
|
|
|
|
return null !;
|
|
|
|
}
|
|
|
|
|
|
|
|
function makePropDecorator(): any {
|
|
|
|
}
|
|
|
|
|
|
|
|
export const Component = callableClassDecorator();
|
|
|
|
export const Directive = callableClassDecorator();
|
|
|
|
export const Injectable = callableClassDecorator();
|
|
|
|
export const NgModule = callableClassDecorator();
|
|
|
|
|
|
|
|
export const Input = makePropDecorator();
|
|
|
|
|
|
|
|
export const Inject = callableParamDecorator();
|
|
|
|
export const Self = callableParamDecorator();
|
|
|
|
export const SkipSelf = callableParamDecorator();
|
|
|
|
export const Optional = callableParamDecorator();
|
|
|
|
|
|
|
|
export class InjectionToken {
|
|
|
|
constructor(name: string) {}
|
|
|
|
}
|
2018-12-07 08:10:52 -05:00
|
|
|
|
|
|
|
export interface ModuleWithProviders<T = any> {}
|
2018-07-16 03:54:16 -04:00
|
|
|
`
|
|
|
|
};
|
|
|
|
}
|
2018-10-01 06:10:55 -04:00
|
|
|
|
2018-09-30 15:53:25 -04:00
|
|
|
export function getFakeTslib() {
|
|
|
|
return {
|
|
|
|
name: 'node_modules/tslib/index.ts',
|
|
|
|
contents: `
|
|
|
|
export function __decorate(decorators: any[], target: any, key?: string | symbol, desc?: any) {}
|
|
|
|
export function __param(paramIndex: number, decorator: any) {}
|
|
|
|
export function __metadata(metadataKey: any, metadataValue: any) {}
|
|
|
|
`
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
2018-10-01 06:10:55 -04:00
|
|
|
export function convertToDirectTsLibImport(filesystem: {name: string, contents: string}[]) {
|
|
|
|
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};
|
|
|
|
});
|
|
|
|
}
|