static-injector 4.0.2 → 5.0.0-alpha.0

package/transform/compiler-cli/src/ngtsc/ts_compatibility/index.js

@@ -1,24 +0,0 @@
-"use strict";
-/**
- * @license
- * Copyright Google LLC 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
- */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./src/ts_cross_version_utils"), exports);

package/transform/compiler-cli/src/ngtsc/ts_compatibility/src/ts_cross_version_utils.d.ts

@@ -1,45 +0,0 @@
-/*!
- * @license
- * Copyright Google LLC 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 ts from 'typescript';
-/** Type of `ts.factory.CreateParameterDeclaration` in TS 4.9+. */
-type Ts49CreateParameterDeclarationFn = (modifiers: readonly ts.ModifierLike[] | undefined, dotDotDotToken: ts.DotDotDotToken | undefined, name: string | ts.BindingName, questionToken?: ts.QuestionToken | undefined, type?: ts.TypeNode | undefined, initializer?: ts.Expression) => ts.ParameterDeclaration;
-/**
- * Creates a `ts.ParameterDeclaration` declaration.
- *
- * TODO(crisbeto): this is a backwards-compatibility layer for versions of TypeScript less than 4.9.
- * We should remove it once we have dropped support for the older versions.
- */
-export declare const createParameterDeclaration: Ts49CreateParameterDeclarationFn;
-/** Type of `ts.factory.createImportDeclaration` in TS 4.9+. */
-type Ts49CreateImportDeclarationFn = (modifiers: readonly ts.Modifier[] | undefined, importClause: ts.ImportClause | undefined, moduleSpecifier: ts.Expression, assertClause?: ts.AssertClause) => ts.ImportDeclaration;
-/**
- * Creates a `ts.ImportDeclaration` declaration.
- *
- * TODO(crisbeto): this is a backwards-compatibility layer for versions of TypeScript less than 4.9.
- * We should remove it once we have dropped support for the older versions.
- */
-export declare const createImportDeclaration: Ts49CreateImportDeclarationFn;
-/** Type of `ts.factory.createFunctionDeclaration` in TS 4.9+. */
-type Ts49CreateFunctionDeclarationFn = (modifiers: readonly ts.ModifierLike[] | undefined, asteriskToken: ts.AsteriskToken | undefined, name: string | ts.Identifier | undefined, typeParameters: readonly ts.TypeParameterDeclaration[] | undefined, parameters: readonly ts.ParameterDeclaration[], type: ts.TypeNode | undefined, body: ts.Block | undefined) => ts.FunctionDeclaration;
-/**
- * Creates a `ts.FunctionDeclaration` declaration.
- *
- * TODO(crisbeto): this is a backwards-compatibility layer for versions of TypeScript less than 4.9.
- * We should remove it once we have dropped support for the older versions.
- */
-export declare const createFunctionDeclaration: Ts49CreateFunctionDeclarationFn;
-/** Type of `ts.factory.createIndexSignature` in TS 4.9+. */
-type Ts49CreateIndexSignatureFn = (modifiers: readonly ts.Modifier[] | undefined, parameters: readonly ts.ParameterDeclaration[], type: ts.TypeNode) => ts.IndexSignatureDeclaration;
-/**
- * Creates a `ts.IndexSignatureDeclaration` declaration.
- *
- * TODO(crisbeto): this is a backwards-compatibility layer for versions of TypeScript less than 4.9.
- * We should remove it once we have dropped support for the older versions.
- */
-export declare const createIndexSignature: Ts49CreateIndexSignatureFn;
-export {};

package/transform/compiler-cli/src/ngtsc/ts_compatibility/src/ts_cross_version_utils.js

@@ -1,86 +0,0 @@
-"use strict";
-/*!
- * @license
- * Copyright Google LLC 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
- */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createIndexSignature = exports.createFunctionDeclaration = exports.createImportDeclaration = exports.createParameterDeclaration = void 0;
-const typescript_1 = __importDefault(require("typescript"));
-/** Whether the current TypeScript version is after 4.9. */
-const IS_AFTER_TS_49 = isAfterVersion(4, 9);
-/**
- * Creates a `ts.ParameterDeclaration` declaration.
- *
- * TODO(crisbeto): this is a backwards-compatibility layer for versions of TypeScript less than 4.9.
- * We should remove it once we have dropped support for the older versions.
- */
-exports.createParameterDeclaration = IS_AFTER_TS_49
-    ? typescript_1.default.factory.createParameterDeclaration
-    : (modifiers, dotDotDotToken, name, questionToken, type, initializer) => typescript_1.default.factory.createParameterDeclaration(...splitModifiers(modifiers), dotDotDotToken, name, questionToken, type, initializer);
-/**
- * Creates a `ts.ImportDeclaration` declaration.
- *
- * TODO(crisbeto): this is a backwards-compatibility layer for versions of TypeScript less than 4.9.
- * We should remove it once we have dropped support for the older versions.
- */
-exports.createImportDeclaration = IS_AFTER_TS_49
-    ? typescript_1.default.factory.createImportDeclaration
-    : (modifiers, importClause, moduleSpecifier, assertClause) => typescript_1.default.factory.createImportDeclaration(undefined, modifiers, importClause, moduleSpecifier, assertClause);
-/**
- * Creates a `ts.FunctionDeclaration` declaration.
- *
- * TODO(crisbeto): this is a backwards-compatibility layer for versions of TypeScript less than 4.9.
- * We should remove it once we have dropped support for the older versions.
- */
-exports.createFunctionDeclaration = IS_AFTER_TS_49
-    ? typescript_1.default.factory.createFunctionDeclaration
-    : (modifiers, asteriskToken, name, typeParameters, parameters, type, body) => typescript_1.default.factory.createFunctionDeclaration(...splitModifiers(modifiers), asteriskToken, name, typeParameters, parameters, type, body);
-/**
- * Creates a `ts.IndexSignatureDeclaration` declaration.
- *
- * TODO(crisbeto): this is a backwards-compatibility layer for versions of TypeScript less than 4.9.
- * We should remove it once we have dropped support for the older versions.
- */
-exports.createIndexSignature = IS_AFTER_TS_49
-    ? typescript_1.default.factory.createIndexSignature
-    : (modifiers, parameters, type) => typescript_1.default.factory.createIndexSignature(modifiers, parameters, type);
-/**
- * Splits a `ModifierLike` into two arrays: decorators and modifiers. Used for backwards
- * compatibility with TS 4.7 and below where most factory functions require separate `decorators`
- * and `modifiers` arrays.
- */
-function splitModifiers(allModifiers) {
-    if (!allModifiers) {
-        return [undefined, undefined];
-    }
-    const decorators = [];
-    const modifiers = [];
-    for (const current of allModifiers) {
-        if (typescript_1.default.isDecorator(current)) {
-            decorators.push(current);
-        }
-        else {
-            modifiers.push(current);
-        }
-    }
-    return [
-        decorators.length ? decorators : undefined,
-        modifiers.length ? modifiers : undefined,
-    ];
-}
-/** Checks if the current version of TypeScript is after the specified major/minor versions. */
-function isAfterVersion(targetMajor, targetMinor) {
-    const [major, minor] = typescript_1.default.versionMajorMinor
-        .split('.')
-        .map((part) => parseInt(part));
-    if (major < targetMajor) {
-        return false;
-    }
-    return major === targetMajor ? minor >= targetMinor : true;
-}

package/transform/compiler-cli/src/ngtsc/util/src/typescript.d.ts

@@ -1,4 +0,0 @@
-import ts from 'typescript';
-export declare function identifierOfNode(decl: ts.Node & {
-    name?: ts.Node;
-}): ts.Identifier | null;

package/transform/compiler-cli/src/ngtsc/util/src/typescript.js

@@ -1,16 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.identifierOfNode = void 0;
-const typescript_1 = __importDefault(require("typescript"));
-function identifierOfNode(decl) {
-    if (decl.name !== undefined && typescript_1.default.isIdentifier(decl.name)) {
-        return decl.name;
-    }
-    else {
-        return null;
-    }
-}
-exports.identifierOfNode = identifierOfNode;

package/transform/index.d.ts

@@ -1 +0,0 @@
-export * from './injectable-transform';

package/transform/index.js

@@ -1,17 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./injectable-transform"), exports);

package/transform/injectable-transform.d.ts

@@ -1,41 +0,0 @@
-import ts from 'typescript';
-import { InjectableDecoratorHandler } from './compiler-cli/src/ngtsc/annotations/src/injectable';
-import { TypeScriptReflectionHost } from './compiler-cli/src/ngtsc/reflection';
-export interface InjectableTransformerFactoryOptions {
-    strictCtorDeps?: boolean;
-}
-export declare function createTransformer(program: ts.Program, options?: InjectableTransformerFactoryOptions): (context: ts.TransformationContext) => (sf: ts.SourceFile) => ts.SourceFile;
-export declare class InjectableTransformerFactory {
-    private program;
-    private options;
-    typeChecker: ts.TypeChecker;
-    reflectionHost: TypeScriptReflectionHost;
-    handler: InjectableDecoratorHandler;
-    constructor(program: ts.Program, options?: InjectableTransformerFactoryOptions);
-    getTransform(): (context: ts.TransformationContext) => (sf: ts.SourceFile) => ts.SourceFile;
-    private visit;
-    private transform;
-    private preAnalysis;
-    private translate;
-    /**
-     * Remove Angular decorators from a `ts.Node` in a shallow manner.
-     *
-     * This will remove decorators from class elements (getters, setters, properties, methods) as well
-     * as parameters of constructors.
-     */
-    private _stripAngularDecorators;
-    /**
-     * Return all decorators on a `Declaration` which are from static-injector, or an empty set if none
-     * are.
-     */
-    private _angularCoreDecorators;
-    /**
-     * Given a `ts.Node`, filter the decorators array and return a version containing only non-Angular
-     * decorators.
-     *
-     * If all decorators are removed (or none existed in the first place), this method returns
-     * `undefined`.
-     */
-    private _nonCoreDecoratorsOnly;
-    private updateStatements;
-}

package/transform/injectable-transform.js

@@ -1,245 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.InjectableTransformerFactory = exports.createTransformer = void 0;
-const typescript_1 = __importDefault(require("typescript"));
-const injectable_1 = require("./compiler-cli/src/ngtsc/annotations/src/injectable");
-const imports_1 = require("./compiler-cli/src/ngtsc/imports");
-const reflection_1 = require("./compiler-cli/src/ngtsc/reflection");
-const transform_1 = require("./compiler-cli/src/ngtsc/transform");
-const translator_1 = require("./compiler-cli/src/ngtsc/translator");
-const node_Iteration_1 = require("./node-Iteration");
-const NO_DECORATORS = new Set();
-function createTransformer(program, options) {
-    let factory = new InjectableTransformerFactory(program, options);
-    return factory.getTransform();
-}
-exports.createTransformer = createTransformer;
-class InjectableTransformerFactory {
-    program;
-    options;
-    typeChecker;
-    reflectionHost;
-    handler;
-    constructor(program, options = {}) {
-        this.program = program;
-        this.options = options;
-        this.typeChecker = this.program.getTypeChecker();
-        this.reflectionHost = new reflection_1.TypeScriptReflectionHost(this.typeChecker);
-        this.handler = new injectable_1.InjectableDecoratorHandler(this.reflectionHost, false, !!this.options.strictCtorDeps, false, transform_1.CompilationMode.FULL);
-    }
-    getTransform() {
-        return (context) => this.transform(context);
-    }
-    visit(node, context, map) {
-        return typescript_1.default.visitEachChild(node, (node) => {
-            let result = map.get(node);
-            if (result) {
-                const filteredDecorators = 
-                // Remove the decorator which triggered this compilation, leaving the others alone.
-                maybeFilterDecorator(typescript_1.default.getDecorators(node), [
-                    result.decorator,
-                ]);
-                const nodeModifiers = typescript_1.default.getModifiers(node);
-                let updatedModifiers;
-                if (filteredDecorators?.length || nodeModifiers?.length) {
-                    updatedModifiers = [
-                        ...(filteredDecorators || []),
-                        ...(nodeModifiers || []),
-                    ];
-                }
-                return typescript_1.default.factory.updateClassDeclaration(node, updatedModifiers, node.name, node.typeParameters, node.heritageClauses || [], [
-                    ...node.members.map((node) => this._stripAngularDecorators(node)),
-                    ...result.members,
-                ]);
-            }
-            return this.visit(node, context, map);
-        }, context);
-    }
-    transform(context) {
-        return (sf) => {
-            let map = this.preAnalysis(sf);
-            sf = this.updateStatements(sf, map.importManager);
-            return this.visit(sf, context, map.classMetadataMap);
-        };
-    }
-    preAnalysis(sf) {
-        let classMetadataMap = new Map();
-        let write = new imports_1.NoopImportRewriter();
-        let importManager = new translator_1.ImportManager(write);
-        (0, node_Iteration_1.nodeIteration)(sf, (node) => {
-            if (typescript_1.default.isClassDeclaration(node) &&
-                typescript_1.default.getDecorators(node) &&
-                this.reflectionHost.isClass(node)) {
-                const decorators = this.reflectionHost.getDecoratorsOfDeclaration(node) || [];
-                let result = this.handler.detect(node, decorators);
-                if (!result) {
-                    return;
-                }
-                let analysisOutput = this.handler.analyze(node, result.metadata);
-                let compileResult = this.handler.compileFull(node, analysisOutput.analysis);
-                let resultNode = this.translate(compileResult, importManager);
-                classMetadataMap.set(node, {
-                    ...resultNode,
-                    decorator: result.trigger,
-                });
-            }
-        });
-        // this.sourceFileMetadataMap.set(sf, {
-        //   classMetadataMap,
-        //   importManager: importManager,
-        // });
-        return { classMetadataMap, importManager };
-    }
-    translate(compileResult, importManager) {
-        // There is at least one field to add.
-        const statements = [];
-        const members = [];
-        for (const field of compileResult) {
-            // Translate the initializer for the field into TS nodes.
-            const exprNode = (0, translator_1.translateExpression)(field.initializer, importManager);
-            // Create a static property declaration for the new field.
-            const property = typescript_1.default.factory.createPropertyDeclaration([typescript_1.default.factory.createToken(typescript_1.default.SyntaxKind.StaticKeyword)], field.name, undefined, undefined, exprNode);
-            if (false) {
-                // Closure compiler transforms the form `Service.ɵprov = X` into `Service$ɵprov = X`. To
-                // prevent this transformation, such assignments need to be annotated with @nocollapse.
-                // Note that tsickle is typically responsible for adding such annotations, however it
-                // doesn't yet handle synthetic fields added during other transformations.
-                typescript_1.default.addSyntheticLeadingComment(property, typescript_1.default.SyntaxKind.MultiLineCommentTrivia, '* @nocollapse ', 
-                /* hasTrailingNewLine */ false);
-            }
-            field.statements
-                .map((stmt) => (0, translator_1.translateStatement)(stmt, importManager))
-                .forEach((stmt) => statements.push(stmt));
-            members.push(property);
-        }
-        return { statements, members };
-    }
-    /**
-     * Remove Angular decorators from a `ts.Node` in a shallow manner.
-     *
-     * This will remove decorators from class elements (getters, setters, properties, methods) as well
-     * as parameters of constructors.
-     */
-    _stripAngularDecorators(node) {
-        const modifiers = typescript_1.default.canHaveModifiers(node)
-            ? typescript_1.default.getModifiers(node)
-            : undefined;
-        const nonCoreDecorators = typescript_1.default.canHaveDecorators(node)
-            ? this._nonCoreDecoratorsOnly(node)
-            : undefined;
-        const combinedModifiers = [
-            ...(nonCoreDecorators || []),
-            ...(modifiers || []),
-        ];
-        if (typescript_1.default.isParameter(node)) {
-            // Strip decorators from parameters (probably of the constructor).
-            node = typescript_1.default.factory.updateParameterDeclaration(node, combinedModifiers, node.dotDotDotToken, node.name, node.questionToken, node.type, node.initializer);
-        }
-        else if (typescript_1.default.isMethodDeclaration(node)) {
-            // Strip decorators of methods.
-            node = typescript_1.default.factory.updateMethodDeclaration(node, combinedModifiers, node.asteriskToken, node.name, node.questionToken, node.typeParameters, node.parameters, node.type, node.body);
-        }
-        else if (typescript_1.default.isPropertyDeclaration(node)) {
-            // Strip decorators of properties.
-            node = typescript_1.default.factory.updatePropertyDeclaration(node, combinedModifiers, node.name, node.questionToken, node.type, node.initializer);
-        }
-        else if (typescript_1.default.isGetAccessor(node)) {
-            // Strip decorators of getters.
-            node = typescript_1.default.factory.updateGetAccessorDeclaration(node, combinedModifiers, node.name, node.parameters, node.type, node.body);
-        }
-        else if (typescript_1.default.isSetAccessor(node)) {
-            // Strip decorators of setters.
-            node = typescript_1.default.factory.updateSetAccessorDeclaration(node, combinedModifiers, node.name, node.parameters, node.body);
-        }
-        else if (typescript_1.default.isConstructorDeclaration(node)) {
-            // For constructors, strip decorators of the parameters.
-            const parameters = node.parameters.map((param) => this._stripAngularDecorators(param));
-            node = typescript_1.default.factory.updateConstructorDeclaration(node, modifiers, parameters, node.body);
-        }
-        return node;
-    }
-    /**
-     * Return all decorators on a `Declaration` which are from static-injector, or an empty set if none
-     * are.
-     */
-    _angularCoreDecorators(decl) {
-        const decorators = this.reflectionHost.getDecoratorsOfDeclaration(decl);
-        if (decorators === null) {
-            return NO_DECORATORS;
-        }
-        const coreDecorators = decorators
-            .filter((dec) => isFromAngularCore(dec))
-            .map((dec) => dec.node);
-        if (coreDecorators.length > 0) {
-            return new Set(coreDecorators);
-        }
-        else {
-            return NO_DECORATORS;
-        }
-    }
-    /**
-     * Given a `ts.Node`, filter the decorators array and return a version containing only non-Angular
-     * decorators.
-     *
-     * If all decorators are removed (or none existed in the first place), this method returns
-     * `undefined`.
-     */
-    _nonCoreDecoratorsOnly(node) {
-        const decorators = typescript_1.default.getDecorators(node);
-        // Shortcut if the node has no decorators.
-        if (decorators === undefined) {
-            return undefined;
-        }
-        // Build a Set of the decorators on this node from @angular/core.
-        const coreDecorators = this._angularCoreDecorators(node);
-        if (coreDecorators.size === decorators.length) {
-            // If all decorators are to be removed, return `undefined`.
-            return undefined;
-        }
-        else if (coreDecorators.size === 0) {
-            // If no decorators need to be removed, return the original decorators array.
-            return nodeArrayFromDecoratorsArray(decorators);
-        }
-        // Filter out the core decorators.
-        const filtered = decorators.filter((dec) => !coreDecorators.has(dec));
-        // If no decorators survive, return `undefined`. This can only happen if a core decorator is
-        // repeated on the node.
-        if (filtered.length === 0) {
-            return undefined;
-        }
-        // Create a new `NodeArray` with the filtered decorators that sourcemaps back to the original.
-        return nodeArrayFromDecoratorsArray(filtered);
-    }
-    updateStatements(node, importManager) {
-        return (0, transform_1.addImports)(typescript_1.default.factory, importManager, node);
-    }
-}
-exports.InjectableTransformerFactory = InjectableTransformerFactory;
-/**
- * todo 引入
- */
-function isFromAngularCore(decorator) {
-    return (decorator.import !== null && decorator.import.from === 'static-injector');
-}
-/** Creates a `NodeArray` with the correct offsets from an array of decorators. */
-function nodeArrayFromDecoratorsArray(decorators) {
-    const array = typescript_1.default.factory.createNodeArray(decorators);
-    if (array.length > 0) {
-        array.pos = decorators[0].pos;
-        array.end = decorators[decorators.length - 1].end;
-    }
-    return array;
-}
-function maybeFilterDecorator(decorators, toRemove) {
-    if (decorators === undefined) {
-        return undefined;
-    }
-    const filtered = decorators.filter((dec) => toRemove.find((decToRemove) => typescript_1.default.getOriginalNode(dec) === decToRemove) === undefined);
-    if (filtered.length === 0) {
-        return undefined;
-    }
-    return typescript_1.default.factory.createNodeArray(filtered);
-}

package/transform/node-Iteration.d.ts

@@ -1,2 +0,0 @@
-import ts from 'typescript';
-export declare function nodeIteration(node: ts.Node, fn: (node: ts.Node) => any): void;

package/transform/node-Iteration.js

@@ -1,12 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.nodeIteration = void 0;
-const typescript_1 = __importDefault(require("typescript"));
-function nodeIteration(node, fn) {
-    fn(node);
-    typescript_1.default.forEachChild(node, (node) => nodeIteration(node, fn));
-}
-exports.nodeIteration = nodeIteration;