static-injector 1.0.10 → 2.1.0

package/transform/injectable-transform.js

@@ -1,26 +1,10 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+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 = __importStar(require("typescript"));
+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");
@@ -48,8 +32,18 @@ class InjectableTransformerFactory {
         return typescript_1.default.visitEachChild(node, (node) => {
             let result = map.get(node);
             if (result) {
-                let decoratorList = node.decorators.filter((item) => item !== result.decorator);
-                return typescript_1.factory.updateClassDeclaration(node, decoratorList.length ? decoratorList : undefined, node.modifiers, node.name, node.typeParameters, node.heritageClauses, [
+                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 === null || filteredDecorators === void 0 ? void 0 : filteredDecorators.length) || (nodeModifiers === null || nodeModifiers === void 0 ? void 0 : 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,
                 ]);
@@ -68,9 +62,9 @@ class InjectableTransformerFactory {
         let classMetadataMap = new Map();
         let write = new imports_1.NoopImportRewriter();
         let importManager = new translator_1.ImportManager(write);
-        node_Iteration_1.nodeIteration(sf, (node) => {
+        (0, node_Iteration_1.nodeIteration)(sf, (node) => {
             if (typescript_1.default.isClassDeclaration(node) &&
-                node.decorators &&
+                typescript_1.default.getDecorators(node) &&
                 this.reflectionHost.isClass(node)) {
                 const decorators = this.reflectionHost.getDecoratorsOfDeclaration(node);
                 let result = this.handler.detect(node, decorators);
@@ -95,9 +89,9 @@ class InjectableTransformerFactory {
         const members = [];
         for (const field of compileResult) {
             // Translate the initializer for the field into TS nodes.
-            const exprNode = translator_1.translateExpression(field.initializer, importManager);
+            const exprNode = (0, translator_1.translateExpression)(field.initializer, importManager);
             // Create a static property declaration for the new field.
-            const property = typescript_1.default.createProperty(undefined, [typescript_1.default.createToken(typescript_1.default.SyntaxKind.StaticKeyword)], field.name, undefined, undefined, exprNode);
+            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.
@@ -107,7 +101,7 @@ class InjectableTransformerFactory {
                 /* hasTrailingNewLine */ false);
             }
             field.statements
-                .map((stmt) => translator_1.translateStatement(stmt, importManager))
+                .map((stmt) => (0, translator_1.translateStatement)(stmt, importManager))
                 .forEach((stmt) => statements.push(stmt));
             members.push(property);
         }
@@ -120,14 +114,24 @@ class InjectableTransformerFactory {
      * 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.updateParameter(node, this._nonCoreDecoratorsOnly(node), node.modifiers, node.dotDotDotToken, node.name, node.questionToken, node.type, node.initializer);
+            node = typescript_1.default.factory.updateParameterDeclaration(node, combinedModifiers, node.dotDotDotToken, node.name, node.questionToken, node.type, node.initializer);
         }
         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.updateConstructor(node, node.decorators, node.modifiers, parameters, node.body);
+            node = typescript_1.default.factory.updateConstructorDeclaration(node, modifiers, parameters, node.body);
         }
         return node;
     }
@@ -158,35 +162,33 @@ class InjectableTransformerFactory {
      * `undefined`.
      */
     _nonCoreDecoratorsOnly(node) {
+        const decorators = typescript_1.default.getDecorators(node);
         // Shortcut if the node has no decorators.
-        if (node.decorators === undefined) {
+        if (decorators === undefined) {
             return undefined;
         }
-        // Build a Set of the decorators on this node from static-injector.
+        // Build a Set of the decorators on this node from @angular/core.
         const coreDecorators = this._angularCoreDecorators(node);
-        if (coreDecorators.size === node.decorators.length) {
+        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 node.decorators;
+            return nodeArrayFromDecoratorsArray(decorators);
         }
         // Filter out the core decorators.
-        const filtered = node.decorators.filter((dec) => !coreDecorators.has(dec));
+        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.
-        const array = typescript_1.default.createNodeArray(filtered);
-        array.pos = node.decorators.pos;
-        array.end = node.decorators.end;
-        return array;
+        return nodeArrayFromDecoratorsArray(filtered);
     }
     updateStatements(node, importManager) {
-        return transform_1.addImports(importManager, node);
+        return (0, transform_1.addImports)(importManager, node);
     }
 }
 exports.InjectableTransformerFactory = InjectableTransformerFactory;
@@ -196,3 +198,22 @@ exports.InjectableTransformerFactory = InjectableTransformerFactory;
 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/import/typings/decorator/interface/provider.d.ts

@@ -1,312 +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 { Type } from '../../interface/type';
-/**
- * Configures the `Injector` to return a value for a token.
- * Base for `ValueProvider` decorator.
- *
- * @publicApi
- */
-export interface ValueSansProvider {
-    /**
-     * The value to inject.
-     */
-    useValue: any;
-}
-/**
- * Configures the `Injector` to return a value for a token.
- * @see ["Dependency Injection Guide"](guide/dependency-injection).
- *
- * @usageNotes
- *
- * ### Example
- *
- * {@example core/di/ts/provider_spec.ts region='ValueProvider'}
- *
- * ### Multi-value example
- *
- * {@example core/di/ts/provider_spec.ts region='MultiProviderAspect'}
- *
- * @publicApi
- */
-export interface ValueProvider extends ValueSansProvider {
-    /**
-     * An injection token. Typically an instance of `Type` or `InjectionToken`, but can be `any`.
-     */
-    provide: any;
-    /**
-     * When true, injector returns an array of instances. This is useful to allow multiple
-     * providers spread across many files to provide configuration information to a common token.
-     */
-    multi?: boolean;
-}
-/**
- * Configures the `Injector` to return an instance of `useClass` for a token.
- * Base for `StaticClassProvider` decorator.
- *
- * @publicApi
- */
-export interface StaticClassSansProvider {
-    /**
-     * An optional class to instantiate for the `token`. By default, the `provide`
-     * class is instantiated.
-     */
-    useClass: Type<any>;
-    /**
-     * A list of `token`s to be resolved by the injector. The list of values is then
-     * used as arguments to the `useClass` constructor.
-     */
-    deps: any[];
-}
-/**
- * Configures the `Injector` to return an instance of `useClass` for a token.
- * @see ["Dependency Injection Guide"](guide/dependency-injection).
- *
- * @usageNotes
- *
- * {@example core/di/ts/provider_spec.ts region='StaticClassProvider'}
- *
- * Note that following two providers are not equal:
- *
- * {@example core/di/ts/provider_spec.ts region='StaticClassProviderDifference'}
- *
- * ### Multi-value example
- *
- * {@example core/di/ts/provider_spec.ts region='MultiProviderAspect'}
- *
- * @publicApi
- */
-export interface StaticClassProvider extends StaticClassSansProvider {
-    /**
-     * An injection token. Typically an instance of `Type` or `InjectionToken`, but can be `any`.
-     */
-    provide: any;
-    /**
-     * When true, injector returns an array of instances. This is useful to allow multiple
-     * providers spread across many files to provide configuration information to a common token.
-     */
-    multi?: boolean;
-}
-/**
- * Configures the `Injector` to return an instance of a token.
- *
- * @see ["Dependency Injection Guide"](guide/dependency-injection).
- *
- * @usageNotes
- *
- * ```ts
- * @Injectable(SomeModule, {deps: []})
- * class MyService {}
- * ```
- *
- * @publicApi
- */
-export interface ConstructorSansProvider {
-    /**
-     * A list of `token`s to be resolved by the injector.
-     */
-    deps?: any[];
-}
-/**
- * Configures the `Injector` to return an instance of a token.
- *
- * @see ["Dependency Injection Guide"](guide/dependency-injection).
- *
- * @usageNotes
- *
- * {@example core/di/ts/provider_spec.ts region='ConstructorProvider'}
- *
- * ### Multi-value example
- *
- * {@example core/di/ts/provider_spec.ts region='MultiProviderAspect'}
- *
- * @publicApi
- */
-export interface ConstructorProvider extends ConstructorSansProvider {
-    /**
-     * An injection token. Typically an instance of `Type` or `InjectionToken`, but can be `any`.
-     */
-    provide: Type<any>;
-    /**
-     * When true, injector returns an array of instances. This is useful to allow multiple
-     * providers spread across many files to provide configuration information to a common token.
-     */
-    multi?: boolean;
-}
-/**
- * Configures the `Injector` to return a value of another `useExisting` token.
- *
- * @see `ExistingProvider`
- * @see ["Dependency Injection Guide"](guide/dependency-injection).
- *
- * @publicApi
- */
-export interface ExistingSansProvider {
-    /**
-     * Existing `token` to return. (Equivalent to `injector.get(useExisting)`)
-     */
-    useExisting: any;
-}
-/**
- * Configures the `Injector` to return a value of another `useExisting` token.
- *
- * @see ["Dependency Injection Guide"](guide/dependency-injection).
- *
- * @usageNotes
- *
- * {@example core/di/ts/provider_spec.ts region='ExistingProvider'}
- *
- * ### Multi-value example
- *
- * {@example core/di/ts/provider_spec.ts region='MultiProviderAspect'}
- *
- * @publicApi
- */
-export interface ExistingProvider extends ExistingSansProvider {
-    /**
-     * An injection token. Typically an instance of `Type` or `InjectionToken`, but can be `any`.
-     */
-    provide: any;
-    /**
-     * When true, injector returns an array of instances. This is useful to allow multiple
-     * providers spread across many files to provide configuration information to a common token.
-     */
-    multi?: boolean;
-}
-/**
- * Configures the `Injector` to return a value by invoking a `useFactory` function.
- *
- * @see `FactoryProvider`
- * @see ["Dependency Injection Guide"](guide/dependency-injection).
- *
- * @publicApi
- */
-export interface FactorySansProvider {
-    /**
-     * A function to invoke to create a value for this `token`. The function is invoked with
-     * resolved values of `token`s in the `deps` field.
-     */
-    useFactory: Function;
-    /**
-     * A list of `token`s to be resolved by the injector. The list of values is then
-     * used as arguments to the `useFactory` function.
-     */
-    deps?: any[];
-}
-/**
- * Configures the `Injector` to return a value by invoking a `useFactory` function.
- * @see ["Dependency Injection Guide"](guide/dependency-injection).
- *
- * @usageNotes
- *
- * {@example core/di/ts/provider_spec.ts region='FactoryProvider'}
- *
- * Dependencies can also be marked as optional:
- *
- * {@example core/di/ts/provider_spec.ts region='FactoryProviderOptionalDeps'}
- *
- * ### Multi-value example
- *
- * {@example core/di/ts/provider_spec.ts region='MultiProviderAspect'}
- *
- * @publicApi
- */
-export interface FactoryProvider extends FactorySansProvider {
-    /**
-     * An injection token. (Typically an instance of `Type` or `InjectionToken`, but can be `any`).
-     */
-    provide: any;
-    /**
-     * When true, injector returns an array of instances. This is useful to allow multiple
-     * providers spread across many files to provide configuration information to a common token.
-     */
-    multi?: boolean;
-}
-/**
- * Describes how an `Injector` should be configured as static (that is, without reflection).
- * A static provider provides tokens to an injector for various types of dependencies.
- *
- * @see `Injector.create()`.
- * @see ["Dependency Injection Guide"](guide/dependency-injection-providers).
- *
- * @publicApi
- */
-export declare type StaticProvider = ValueProvider | ExistingProvider | StaticClassProvider | ConstructorProvider | FactoryProvider | any[];
-/**
- * Configures the `Injector` to return an instance of `Type` when `Type' is used as the token.
- *
- * Create an instance by invoking the `new` operator and supplying additional arguments.
- * This form is a short form of `TypeProvider`;
- *
- * For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
- *
- * @usageNotes
- *
- * {@example core/di/ts/provider_spec.ts region='TypeProvider'}
- *
- * @publicApi
- */
-export interface TypeProvider extends Type<any> {
-}
-/**
- * Configures the `Injector` to return a value by invoking a `useClass` function.
- * Base for `ClassProvider` decorator.
- *
- * @see ["Dependency Injection Guide"](guide/dependency-injection).
- *
- * @publicApi
- */
-export interface ClassSansProvider {
-    /**
-     * Class to instantiate for the `token`.
-     */
-    useClass: Type<any>;
-}
-/**
- * Configures the `Injector` to return an instance of `useClass` for a token.
- * @see ["Dependency Injection Guide"](guide/dependency-injection).
- *
- * @usageNotes
- *
- * {@example core/di/ts/provider_spec.ts region='ClassProvider'}
- *
- * Note that following two providers are not equal:
- *
- * {@example core/di/ts/provider_spec.ts region='ClassProviderDifference'}
- *
- * ### Multi-value example
- *
- * {@example core/di/ts/provider_spec.ts region='MultiProviderAspect'}
- *
- * @publicApi
- */
-export interface ClassProvider extends ClassSansProvider {
-    /**
-     * An injection token. (Typically an instance of `Type` or `InjectionToken`, but can be `any`).
-     */
-    provide: any;
-    /**
-     * When true, injector returns an array of instances. This is useful to allow multiple
-     * providers spread across many files to provide configuration information to a common token.
-     */
-    multi?: boolean;
-}
-/**
- * Describes how the `Injector` should be configured.
- * @see ["Dependency Injection Guide"](guide/dependency-injection).
- *
- * @see `StaticProvider`
- *
- * @publicApi
- */
-export declare type Provider = TypeProvider | ValueProvider | ClassProvider | ConstructorProvider | ExistingProvider | FactoryProvider | any[];
-/**
- * Describes a function that is used to process provider lists (such as provider
- * overrides).
- */
-export declare type ProcessProvidersFunction = (providers: Provider[]) => Provider[];

package/transform/compiler/src/render3/partial/util.d.ts

@@ -1,16 +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 * as o from "../../output/output_ast";
-/**
- * Generate an expression that has the given `expr` wrapped in the following form:
- *
- * ```
- * forwardRef(() => expr)
- * ```
- */
-export declare function generateForwardRef(expr: o.Expression): o.Expression;

package/transform/compiler/src/render3/partial/util.js

@@ -1,44 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateForwardRef = void 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
- */
-const o = __importStar(require("../../output/output_ast"));
-const r3_identifiers_1 = require("../r3_identifiers");
-/**
- * Generate an expression that has the given `expr` wrapped in the following form:
- *
- * ```
- * forwardRef(() => expr)
- * ```
- */
-function generateForwardRef(expr) {
-    return o
-        .importExpr(r3_identifiers_1.Identifiers.forwardRef)
-        .callFn([o.fn([], [new o.ReturnStatement(expr)])]);
-}
-exports.generateForwardRef = generateForwardRef;