static-injector 3.0.0 → 4.0.1

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

@@ -20,8 +20,10 @@ const util_1 = require("./util");
  */
 class TypeScriptReflectionHost {
     checker;
-    constructor(checker) {
+    isLocalCompilation;
+    constructor(checker, isLocalCompilation = false) {
         this.checker = checker;
+        this.isLocalCompilation = isLocalCompilation;
     }
     getDecoratorsOfDeclaration(declaration) {
         const decorators = typescript_1.default.canHaveDecorators(declaration)
@@ -70,7 +72,7 @@ class TypeScriptReflectionHost {
                     typeNode = childTypeNodes[0];
                 }
             }
-            const typeValueReference = (0, type_to_value_1.typeToValue)(typeNode, this.checker);
+            const typeValueReference = (0, type_to_value_1.typeToValue)(typeNode, this.checker, this.isLocalCompilation);
             return {
                 name,
                 nameNode: node.name,
@@ -280,6 +282,18 @@ class TypeScriptReflectionHost {
             isStatic,
         };
     }
+    _viaModule(declaration, originalId, importInfo) {
+        if (importInfo === null &&
+            originalId !== null &&
+            declaration.getSourceFile() !== originalId.getSourceFile()) {
+            return host_1.AmbientImport;
+        }
+        return importInfo !== null &&
+            importInfo.from !== null &&
+            !importInfo.from.startsWith('.')
+            ? importInfo.from
+            : null;
+    }
 }
 exports.TypeScriptReflectionHost = TypeScriptReflectionHost;
 function reflectObjectLiteral(node) {
@@ -353,15 +367,17 @@ function getFarLeftIdentifier(propertyAccess) {
         : null;
 }
 /**
- * Return the ImportDeclaration for the given `node` if it is either an `ImportSpecifier` or a
- * `NamespaceImport`. If not return `null`.
+ * Gets the closest ancestor `ImportDeclaration` to a node.
  */
 function getContainingImportDeclaration(node) {
-    return typescript_1.default.isImportSpecifier(node)
-        ? node.parent.parent.parent
-        : typescript_1.default.isNamespaceImport(node)
-            ? node.parent.parent
-            : null;
+    let parent = node.parent;
+    while (parent && !typescript_1.default.isSourceFile(parent)) {
+        if (typescript_1.default.isImportDeclaration(parent)) {
+            return parent;
+        }
+        parent = parent.parent;
+    }
+    return null;
 }
 exports.getContainingImportDeclaration = getContainingImportDeclaration;
 /**

package/transform/compiler-cli/src/ngtsc/transform/index.d.ts

@@ -1,9 +1,2 @@
-/**
- * @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
- */
 export * from './src/api';
 export * from './src/utils';

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

@@ -1,11 +1,4 @@
 "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);

package/transform/compiler-cli/src/ngtsc/transform/src/utils.d.ts

@@ -12,4 +12,4 @@ import { ImportManager } from '../../translator';
  * and before the module body.
  * Can optionally add extra statements (e.g. new constants) before the body as well.
  */
-export declare function addImports(importManager: ImportManager, sf: ts.SourceFile, extraStatements?: ts.Statement[]): ts.SourceFile;
+export declare function addImports(factory: ts.NodeFactory | undefined, importManager: ImportManager, sf: ts.SourceFile, extraStatements?: ts.Statement[]): ts.SourceFile;

package/transform/compiler-cli/src/ngtsc/transform/src/utils.js

@@ -17,29 +17,13 @@ const typescript_1 = __importDefault(require("typescript"));
  * and before the module body.
  * Can optionally add extra statements (e.g. new constants) before the body as well.
  */
-function addImports(importManager, sf, extraStatements = []) {
+function addImports(factory = typescript_1.default.factory, importManager, sf, extraStatements = []) {
     // Generate the import statements to prepend.
-    const addedImports = importManager.getAllImports(sf.fileName).map((i) => {
-        const qualifier = typescript_1.default.factory.createIdentifier(i.qualifier.text);
-        const importClause = typescript_1.default.factory.createImportClause(
-        /* isTypeOnly */ false, 
-        /* name */ undefined, 
-        /* namedBindings */ typescript_1.default.factory.createNamespaceImport(qualifier));
-        const decl = typescript_1.default.factory.createImportDeclaration(
-        /* modifiers */ undefined, 
-        /* importClause */ importClause, 
-        /* moduleSpecifier */ typescript_1.default.factory.createStringLiteral(i.specifier));
-        // Set the qualifier's original TS node to the `ts.ImportDeclaration`. This allows downstream
-        // transforms such as tsickle to properly process references to this import.
-        //
-        // This operation is load-bearing in g3 as some imported modules contain special metadata
-        // generated by clutz, which tsickle uses to transform imports and references to those imports.
-        //
-        // TODO(alxhub): add a test for this when tsickle is updated externally to depend on this
-        // behavior.
-        typescript_1.default.setOriginalNode(i.qualifier, decl);
-        return decl;
-    });
+    const addedImports = importManager
+        .getAllImports(sf.fileName)
+        .map((i) => i.qualifier !== null
+        ? createNamespaceImportDecl(i, factory)
+        : createSideEffectImportDecl(i, factory));
     // Filter out the existing imports and the source file body. All new statements
     // will be inserted between them.
     const existingImports = sf.statements.filter((stmt) => isImportStatement(stmt));
@@ -49,8 +33,8 @@ function addImports(importManager, sf, extraStatements = []) {
         // If we prepend imports, we also prepend NotEmittedStatement to use it as an anchor
         // for @fileoverview Closure annotation. If there is no @fileoverview annotations, this
         // statement would be a noop.
-        const fileoverviewAnchorStmt = typescript_1.default.factory.createNotEmittedStatement(sf);
-        return typescript_1.default.factory.updateSourceFile(sf, typescript_1.default.factory.createNodeArray([
+        const fileoverviewAnchorStmt = factory.createNotEmittedStatement(sf);
+        return factory.updateSourceFile(sf, factory.createNodeArray([
             fileoverviewAnchorStmt,
             ...existingImports,
             ...addedImports,
@@ -61,6 +45,33 @@ function addImports(importManager, sf, extraStatements = []) {
     return sf;
 }
 exports.addImports = addImports;
+function createNamespaceImportDecl(i, factory) {
+    const qualifier = factory.createIdentifier(i.qualifier.text);
+    const importClause = factory.createImportClause(
+    /* isTypeOnly */ false, 
+    /* name */ undefined, 
+    /* namedBindings */ factory.createNamespaceImport(qualifier));
+    const decl = factory.createImportDeclaration(
+    /* modifiers */ undefined, 
+    /* importClause */ importClause, 
+    /* moduleSpecifier */ factory.createStringLiteral(i.specifier));
+    // Set the qualifier's original TS node to the `ts.ImportDeclaration`. This allows downstream
+    // transforms such as tsickle to properly process references to this import.
+    //
+    // This operation is load-bearing in g3 as some imported modules contain special metadata
+    // generated by clutz, which tsickle uses to transform imports and references to those imports.
+    //
+    // TODO(alxhub): add a test for this when tsickle is updated externally to depend on this
+    // behavior.
+    typescript_1.default.setOriginalNode(i.qualifier, decl);
+    return decl;
+}
+function createSideEffectImportDecl(i, factory) {
+    return factory.createImportDeclaration(
+    /* modifiers */ undefined, 
+    /* importClause */ undefined, 
+    /* moduleSpecifier */ typescript_1.default.factory.createStringLiteral(i.specifier));
+}
 function isImportStatement(stmt) {
     return (typescript_1.default.isImportDeclaration(stmt) ||
         typescript_1.default.isImportEqualsDeclaration(stmt) ||

package/transform/compiler-cli/src/ngtsc/translator/index.d.ts

@@ -1,10 +1,3 @@
-/**
- * @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
- */
 export * from './src/context';
 export * from './src/translator';
 export * from './src/typescript_ast_factory';

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

@@ -1,11 +1,4 @@
 "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);

package/transform/compiler-cli/src/ngtsc/translator/src/api/ast_factory.d.ts

@@ -221,7 +221,7 @@ export type UnaryOperator = '+' | '-' | '!';
 /**
  * The binary operators supported by the `AstFactory`.
  */
-export type BinaryOperator = '&&' | '>' | '>=' | '&' | '/' | '==' | '===' | '<' | '<=' | '-' | '%' | '*' | '!=' | '!==' | '||' | '+' | '??';
+export type BinaryOperator = '&&' | '>' | '>=' | '&' | '|' | '/' | '==' | '===' | '<' | '<=' | '-' | '%' | '*' | '!=' | '!==' | '||' | '+' | '??';
 /**
  * The original location of the start or end of a node created by the `AstFactory`.
  */

package/transform/compiler-cli/src/ngtsc/translator/src/import_manager.d.ts

@@ -9,21 +9,39 @@ import ts from 'typescript';
 import { ImportRewriter } from '../../imports';
 import { ImportGenerator, NamedImport } from './api/import_generator';
 /**
- * Information about an import that has been added to a module.
+ * Information about a namespace import that has been added to a module.
  */
-export interface Import {
+export interface NamespaceImport {
     /** The name of the module that has been imported. */
     specifier: string;
     /** The `ts.Identifier` by which the imported module is known. */
     qualifier: ts.Identifier;
 }
+/**
+ * Information about a side effect import that has been added to a module.
+ */
+export interface SideEffectImport {
+    /** The name of the module that has been imported. */
+    specifier: string;
+    /**
+     * The qualifier of a side effect import is always non-existent, and that can be used to check
+     * whether the import is side effect or not.
+     */
+    qualifier: null;
+}
+/**
+ * Information about an import that has been added to a module.
+ */
+export type Import = NamespaceImport | SideEffectImport;
 export declare class ImportManager implements ImportGenerator<ts.Identifier> {
     protected rewriter: ImportRewriter;
     private prefix;
+    private factory;
     private specifierToIdentifier;
     private nextIndex;
-    constructor(rewriter?: ImportRewriter, prefix?: string);
+    constructor(rewriter?: ImportRewriter, prefix?: string, factory?: ts.NodeFactory);
     generateNamespaceImport(moduleName: string): ts.Identifier;
     generateNamedImport(moduleName: string, originalSymbol: string): NamedImport<ts.Identifier>;
+    generateSideEffectImport(moduleName: string): void;
     getAllImports(contextPath: string): Import[];
 }

package/transform/compiler-cli/src/ngtsc/translator/src/import_manager.js

@@ -16,15 +16,20 @@ const imports_1 = require("../../imports");
 class ImportManager {
     rewriter;
     prefix;
+    factory;
     specifierToIdentifier = new Map();
     nextIndex = 0;
-    constructor(rewriter = new imports_1.NoopImportRewriter(), prefix = 'i') {
+    constructor(rewriter = new imports_1.NoopImportRewriter(), prefix = 'i', factory = typescript_1.default.factory) {
         this.rewriter = rewriter;
         this.prefix = prefix;
+        this.factory = factory;
     }
     generateNamespaceImport(moduleName) {
-        if (!this.specifierToIdentifier.has(moduleName)) {
-            this.specifierToIdentifier.set(moduleName, typescript_1.default.factory.createIdentifier(`${this.prefix}${this.nextIndex++}`));
+        // The case `specifierToIdentifier.get(moduleName) === null` is also considered to overwrite the
+        // side effect import since namedspace import is enough.
+        if (!this.specifierToIdentifier.has(moduleName) ||
+            this.specifierToIdentifier.get(moduleName) === null) {
+            this.specifierToIdentifier.set(moduleName, this.factory.createIdentifier(`${this.prefix}${this.nextIndex++}`));
         }
         return this.specifierToIdentifier.get(moduleName);
     }
@@ -41,6 +46,11 @@ class ImportManager {
         const moduleImport = this.generateNamespaceImport(moduleName);
         return { moduleImport, symbol };
     }
+    generateSideEffectImport(moduleName) {
+        if (!this.specifierToIdentifier.has(moduleName)) {
+            this.specifierToIdentifier.set(moduleName, null);
+        }
+    }
     getAllImports(contextPath) {
         const imports = [];
         for (const [originalSpecifier, qualifier] of this.specifierToIdentifier) {

package/transform/compiler-cli/src/ngtsc/translator/src/translator.js

@@ -41,6 +41,7 @@ const BINARY_OPERATORS = new Map([
     [o.BinaryOperator.Bigger, '>'],
     [o.BinaryOperator.BiggerEquals, '>='],
     [o.BinaryOperator.BitwiseAnd, '&'],
+    [o.BinaryOperator.BitwiseOr, '|'],
     [o.BinaryOperator.Divide, '/'],
     [o.BinaryOperator.Equals, '=='],
     [o.BinaryOperator.Identical, '==='],

package/transform/compiler-cli/src/ngtsc/translator/src/ts_util.d.ts

@@ -0,0 +1,12 @@
+/*!
+ * @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';
+/**
+ * Creates a TypeScript node representing a numeric value.
+ */
+export declare function tsNumericExpression(value: number): ts.NumericLiteral | ts.PrefixUnaryExpression;

package/transform/compiler-cli/src/ngtsc/translator/src/ts_util.js

@@ -0,0 +1,27 @@
+"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.tsNumericExpression = void 0;
+const typescript_1 = __importDefault(require("typescript"));
+/**
+ * Creates a TypeScript node representing a numeric value.
+ */
+function tsNumericExpression(value) {
+    // As of TypeScript 5.3 negative numbers are represented as `prefixUnaryOperator` and passing a
+    // negative number (even as a string) into `createNumericLiteral` will result in an error.
+    if (value < 0) {
+        const operand = typescript_1.default.factory.createNumericLiteral(Math.abs(value));
+        return typescript_1.default.factory.createPrefixUnaryExpression(typescript_1.default.SyntaxKind.MinusToken, operand);
+    }
+    return typescript_1.default.factory.createNumericLiteral(value);
+}
+exports.tsNumericExpression = tsNumericExpression;

package/transform/compiler-cli/src/ngtsc/translator/src/typescript_ast_factory.js

@@ -12,6 +12,7 @@ exports.attachComments = exports.createTemplateTail = exports.createTemplateMidd
  * found in the LICENSE file at https://angular.io/license
  */
 const typescript_1 = __importDefault(require("typescript"));
+const ts_util_1 = require("./ts_util");
 /**
  * Different optimizers use different annotations on a function or method call to indicate its pure
  * status.
@@ -36,6 +37,7 @@ const BINARY_OPERATORS = {
     '>': typescript_1.default.SyntaxKind.GreaterThanToken,
     '>=': typescript_1.default.SyntaxKind.GreaterThanEqualsToken,
     '&': typescript_1.default.SyntaxKind.AmpersandToken,
+    '|': typescript_1.default.SyntaxKind.BarToken,
     '/': typescript_1.default.SyntaxKind.SlashToken,
     '==': typescript_1.default.SyntaxKind.EqualsEqualsToken,
     '===': typescript_1.default.SyntaxKind.EqualsEqualsEqualsToken,
@@ -127,7 +129,7 @@ class TypeScriptAstFactory {
             return value ? typescript_1.default.factory.createTrue() : typescript_1.default.factory.createFalse();
         }
         else if (typeof value === 'number') {
-            return typescript_1.default.factory.createNumericLiteral(value);
+            return (0, ts_util_1.tsNumericExpression)(value);
         }
         else {
             return typescript_1.default.factory.createStringLiteral(value);

package/transform/injectable-transform.js

@@ -214,7 +214,7 @@ class InjectableTransformerFactory {
         return nodeArrayFromDecoratorsArray(filtered);
     }
     updateStatements(node, importManager) {
-        return (0, transform_1.addImports)(importManager, node);
+        return (0, transform_1.addImports)(typescript_1.default.factory, importManager, node);
     }
 }
 exports.InjectableTransformerFactory = InjectableTransformerFactory;