static-injector 1.0.10 → 2.1.0

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

@@ -5,9 +5,9 @@
  * 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 { Expression, Statement, Type } from "../../../../../compiler";
-import * as ts from "typescript";
-import { ClassDeclaration, Decorator } from "../../reflection";
+import { Expression, Statement, Type } from 'static-injector/transform/compiler';
+import ts from 'typescript';
+import { ClassDeclaration, Decorator } from '../../reflection';
 /**
  * A set of options which can be passed to a `DecoratorHandler` by a consumer, to tailor the output
  * of compilation beyond the decorators themselves.
@@ -39,7 +39,7 @@ export declare enum HandlerFlags {
  * @param `A` The type of analysis metadata produced by `analyze`.
  * @param `R` The type of resolution metadata produced by `resolve`.
  */
-export interface DecoratorHandler<D, A, S extends null, R> {
+export interface DecoratorHandler<D, A, R> {
     /**
      * Scan a set of reflected decorators and determine if this handler is responsible for compilation
      * of one of them.

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

@@ -5,8 +5,8 @@
  * 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";
-import { ImportManager } from "../../translator";
+import ts from 'typescript';
+import { ImportManager } from '../../translator';
 /**
  * Adds extra imports in the import manage for this source file, after the existing imports
  * and before the module body.

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

@@ -1,22 +1,6 @@
 "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.addImports = void 0;
@@ -27,7 +11,8 @@ exports.addImports = void 0;
  * 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 ts = __importStar(require("typescript"));
+const typescript_1 = __importDefault(require("typescript"));
+const ts_compatibility_1 = require("../../ts_compatibility");
 /**
  * Adds extra imports in the import manage for this source file, after the existing imports
  * and before the module body.
@@ -36,15 +21,15 @@ const ts = __importStar(require("typescript"));
 function addImports(importManager, sf, extraStatements = []) {
     // Generate the import statements to prepend.
     const addedImports = importManager.getAllImports(sf.fileName).map((i) => {
-        const qualifier = ts.createIdentifier(i.qualifier.text);
-        const importClause = ts.createImportClause(
+        const qualifier = typescript_1.default.factory.createIdentifier(i.qualifier.text);
+        const importClause = typescript_1.default.factory.createImportClause(
+        /* isTypeOnly */ false, 
         /* name */ undefined, 
-        /* namedBindings */ ts.createNamespaceImport(qualifier));
-        const decl = ts.createImportDeclaration(
-        /* decorators */ undefined, 
+        /* namedBindings */ typescript_1.default.factory.createNamespaceImport(qualifier));
+        const decl = (0, ts_compatibility_1.createImportDeclaration)(
         /* modifiers */ undefined, 
         /* importClause */ importClause, 
-        /* moduleSpecifier */ ts.createLiteral(i.specifier));
+        /* 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.
         //
@@ -53,7 +38,7 @@ function addImports(importManager, sf, extraStatements = []) {
         //
         // TODO(alxhub): add a test for this when tsickle is updated externally to depend on this
         // behavior.
-        ts.setOriginalNode(i.qualifier, decl);
+        typescript_1.default.setOriginalNode(i.qualifier, decl);
         return decl;
     });
     // Filter out the existing imports and the source file body. All new statements
@@ -65,8 +50,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 = ts.createNotEmittedStatement(sf);
-        return ts.updateSourceFileNode(sf, ts.createNodeArray([
+        const fileoverviewAnchorStmt = typescript_1.default.factory.createNotEmittedStatement(sf);
+        return typescript_1.default.factory.updateSourceFile(sf, typescript_1.default.factory.createNodeArray([
             fileoverviewAnchorStmt,
             ...existingImports,
             ...addedImports,
@@ -78,7 +63,7 @@ function addImports(importManager, sf, extraStatements = []) {
 }
 exports.addImports = addImports;
 function isImportStatement(stmt) {
-    return (ts.isImportDeclaration(stmt) ||
-        ts.isImportEqualsDeclaration(stmt) ||
-        ts.isNamespaceImport(stmt));
+    return (typescript_1.default.isImportDeclaration(stmt) ||
+        typescript_1.default.isImportEqualsDeclaration(stmt) ||
+        typescript_1.default.isNamespaceImport(stmt));
 }

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

@@ -1,5 +1,12 @@
-export * from "./src/context";
-export * from "./src/translator";
-export * from "./src/typescript_ast_factory";
-export * from "./src/typescript_translator";
-export * from "./src/import_manager";
+/**
+ * @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';
+export * from './src/typescript_translator';
+export * from './src/import_manager';

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

@@ -1,7 +1,18 @@
 "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;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

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

@@ -21,7 +21,7 @@ export interface AstFactory<TStatement, TExpression> {
      */
     attachComments(statement: TStatement, leadingComments: LeadingComment[]): void;
     /**
-     * Create a literal array expresion (e.g. `[expr1, expr2]`).
+     * Create a literal array expression (e.g. `[expr1, expr2]`).
      *
      * @param elements a collection of the expressions to appear in each array slot.
      */
@@ -51,7 +51,7 @@ export interface AstFactory<TStatement, TExpression> {
      * Create an expression that is calling the `callee` with the given `args`.
      *
      * @param callee an expression that evaluates to a function to be called.
-     * @param args the arugments to be passed to the call.
+     * @param args the arguments to be passed to the call.
      * @param pure whether to mark the call as pure (having no side-effects).
      */
     createCallExpression(callee: TExpression, args: TExpression[], pure: boolean): TExpression;
@@ -198,15 +198,15 @@ export interface AstFactory<TStatement, TExpression> {
 /**
  * The type of a variable declaration.
  */
-export declare type VariableDeclarationType = "const" | "let" | "var";
+export type VariableDeclarationType = 'const' | 'let' | 'var';
 /**
  * The unary operators supported by the `AstFactory`.
  */
-export declare type UnaryOperator = "+" | "-" | "!";
+export type UnaryOperator = '+' | '-' | '!';
 /**
  * The binary operators supported by the `AstFactory`.
  */
-export declare 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

@@ -5,16 +5,16 @@
  * 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";
-import { ImportRewriter } from "../../imports";
-import { ImportGenerator, NamedImport } from "./api/import_generator";
+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.
  */
 export interface Import {
     /** The name of the module that has been imported. */
     specifier: string;
-    /** The `ts.Identifer` by which the imported module is known. */
+    /** The `ts.Identifier` by which the imported module is known. */
     qualifier: ts.Identifier;
 }
 export declare class ImportManager implements ImportGenerator<ts.Identifier> {

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

@@ -1,22 +1,6 @@
 "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.ImportManager = void 0;
@@ -27,10 +11,10 @@ exports.ImportManager = void 0;
  * 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 ts = __importStar(require("typescript"));
+const typescript_1 = __importDefault(require("typescript"));
 const imports_1 = require("../../imports");
 class ImportManager {
-    constructor(rewriter = new imports_1.NoopImportRewriter(), prefix = "i") {
+    constructor(rewriter = new imports_1.NoopImportRewriter(), prefix = 'i') {
         this.rewriter = rewriter;
         this.prefix = prefix;
         this.specifierToIdentifier = new Map();
@@ -38,7 +22,7 @@ class ImportManager {
     }
     generateNamespaceImport(moduleName) {
         if (!this.specifierToIdentifier.has(moduleName)) {
-            this.specifierToIdentifier.set(moduleName, ts.createIdentifier(`${this.prefix}${this.nextIndex++}`));
+            this.specifierToIdentifier.set(moduleName, typescript_1.default.factory.createIdentifier(`${this.prefix}${this.nextIndex++}`));
         }
         return this.specifierToIdentifier.get(moduleName);
     }

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

@@ -5,11 +5,11 @@
  * 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 '../../../../../compiler';
+import * as o from 'static-injector/transform/compiler';
 import { AstFactory } from './api/ast_factory';
 import { ImportGenerator } from './api/import_generator';
 import { Context } from './context';
-export declare type RecordWrappedNodeFn<TExpression> = (node: o.WrappedNodeExpr<TExpression>) => void;
+export type RecordWrappedNodeFn<TExpression> = (node: o.WrappedNodeExpr<TExpression>) => void;
 export interface TranslatorOptions<TExpression> {
     downlevelTaggedTemplates?: boolean;
     downlevelVariableDeclarations?: boolean;
@@ -27,21 +27,17 @@ export declare class ExpressionTranslatorVisitor<TStatement, TExpression> implem
     visitDeclareFunctionStmt(stmt: o.DeclareFunctionStmt, context: Context): TStatement;
     visitExpressionStmt(stmt: o.ExpressionStatement, context: Context): TStatement;
     visitReturnStmt(stmt: o.ReturnStatement, context: Context): TStatement;
-    visitDeclareClassStmt(_stmt: o.ClassStmt, _context: Context): never;
     visitIfStmt(stmt: o.IfStmt, context: Context): TStatement;
     visitReadVarExpr(ast: o.ReadVarExpr, _context: Context): TExpression;
     visitWriteVarExpr(expr: o.WriteVarExpr, context: Context): TExpression;
     visitWriteKeyExpr(expr: o.WriteKeyExpr, context: Context): TExpression;
     visitWritePropExpr(expr: o.WritePropExpr, context: Context): TExpression;
-    visitInvokeMethodExpr(ast: o.InvokeMethodExpr, context: Context): TExpression;
     visitInvokeFunctionExpr(ast: o.InvokeFunctionExpr, context: Context): TExpression;
     visitInstantiateExpr(ast: o.InstantiateExpr, context: Context): TExpression;
     visitLiteralExpr(ast: o.LiteralExpr, _context: Context): TExpression;
     visitExternalExpr(ast: o.ExternalExpr, _context: Context): TExpression;
     visitConditionalExpr(ast: o.ConditionalExpr, context: Context): TExpression;
     visitNotExpr(ast: o.NotExpr, context: Context): TExpression;
-    visitAssertNotNullExpr(ast: o.AssertNotNull, context: Context): TExpression;
-    visitCastExpr(ast: o.CastExpr, context: Context): TExpression;
     visitFunctionExpr(ast: o.FunctionExpr, context: Context): TExpression;
     visitBinaryOperatorExpr(ast: o.BinaryOperatorExpr, context: Context): TExpression;
     visitReadPropExpr(ast: o.ReadPropExpr, context: Context): TExpression;

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

@@ -1,7 +1,11 @@
 "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]; } });
+    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];
@@ -27,7 +31,7 @@ exports.ExpressionTranslatorVisitor = void 0;
  * 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("../../../../../compiler"));
+const o = __importStar(require("static-injector/transform/compiler"));
 const UNARY_OPERATORS = new Map([
     [o.UnaryOperator.Minus, '-'],
     [o.UnaryOperator.Plus, '+'],
@@ -78,9 +82,6 @@ class ExpressionTranslatorVisitor {
     visitReturnStmt(stmt, context) {
         return this.attachComments(this.factory.createReturnStatement(stmt.value.visitExpression(this, context.withExpressionMode)), stmt.leadingComments);
     }
-    visitDeclareClassStmt(_stmt, _context) {
-        throw new Error('Method not implemented.');
-    }
     visitIfStmt(stmt, context) {
         return this.attachComments(this.factory.createIfStatement(stmt.condition.visitExpression(this, context), this.factory.createBlock(this.visitStatements(stmt.trueCase, context.withStatementMode)), stmt.falseCase.length > 0
             ? this.factory.createBlock(this.visitStatements(stmt.falseCase, context.withStatementMode))
@@ -109,13 +110,6 @@ class ExpressionTranslatorVisitor {
         const target = this.factory.createPropertyAccess(expr.receiver.visitExpression(this, context), expr.name);
         return this.factory.createAssignment(target, expr.value.visitExpression(this, context));
     }
-    visitInvokeMethodExpr(ast, context) {
-        const target = ast.receiver.visitExpression(this, context);
-        return this.setSourceMapRange(this.factory.createCallExpression(ast.name !== null
-            ? this.factory.createPropertyAccess(target, ast.name)
-            : target, ast.args.map((arg) => arg.visitExpression(this, context)), 
-        /* pure */ false), ast.sourceSpan);
-    }
     visitInvokeFunctionExpr(ast, context) {
         return this.setSourceMapRange(this.factory.createCallExpression(ast.fn.visitExpression(this, context), ast.args.map((arg) => arg.visitExpression(this, context)), ast.pure), ast.sourceSpan);
     }
@@ -182,12 +176,6 @@ class ExpressionTranslatorVisitor {
     visitNotExpr(ast, context) {
         return this.factory.createUnaryExpression('!', ast.condition.visitExpression(this, context));
     }
-    visitAssertNotNullExpr(ast, context) {
-        return ast.condition.visitExpression(this, context);
-    }
-    visitCastExpr(ast, context) {
-        return ast.value.visitExpression(this, context);
-    }
     visitFunctionExpr(ast, context) {
         var _a;
         return this.factory.createFunctionExpression((_a = ast.name) !== null && _a !== void 0 ? _a : null, ast.params.map((param) => param.name), this.factory.createBlock(this.visitStatements(ast.statements, context)));

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

@@ -5,8 +5,8 @@
  * 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";
-import { AstFactory, BinaryOperator, LeadingComment, ObjectLiteralProperty, SourceMapRange, TemplateLiteral, UnaryOperator, VariableDeclarationType } from "./api/ast_factory";
+import ts from 'typescript';
+import { AstFactory, BinaryOperator, LeadingComment, ObjectLiteralProperty, SourceMapRange, TemplateLiteral, UnaryOperator, VariableDeclarationType } from './api/ast_factory';
 /**
  * A TypeScript flavoured implementation of the AstFactory.
  */
@@ -20,10 +20,7 @@ export declare class TypeScriptAstFactory implements AstFactory<ts.Statement, ts
     createBinaryExpression(leftOperand: ts.Expression, operator: BinaryOperator, rightOperand: ts.Expression): ts.Expression;
     createBlock(body: ts.Statement[]): ts.Statement;
     createCallExpression(callee: ts.Expression, args: ts.Expression[], pure: boolean): ts.Expression;
-    createConditional: {
-        (condition: ts.Expression, whenTrue: ts.Expression, whenFalse: ts.Expression): ts.ConditionalExpression;
-        (condition: ts.Expression, questionToken: ts.QuestionToken, whenTrue: ts.Expression, colonToken: ts.ColonToken, whenFalse: ts.Expression): ts.ConditionalExpression;
-    };
+    createConditional(condition: ts.Expression, whenTrue: ts.Expression, whenFalse: ts.Expression): ts.Expression;
     createElementAccess: (expression: ts.Expression, index: number | ts.Expression) => ts.ElementAccessExpression;
     createExpressionStatement: (expression: ts.Expression) => ts.ExpressionStatement;
     createFunctionDeclaration(functionName: string, parameters: string[], body: ts.Statement): ts.Statement;