static-injector 1.0.10 → 2.1.0

package/transform/compiler/src/output/output_ast.js

@@ -7,19 +7,20 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LiteralArrayExpr = exports.ReadKeyExpr = exports.ReadPropExpr = exports.BinaryOperatorExpr = exports.UnaryOperatorExpr = exports.FunctionExpr = exports.FnParam = exports.CastExpr = exports.AssertNotNull = exports.NotExpr = exports.ConditionalExpr = exports.ExternalReference = exports.ExternalExpr = exports.PlaceholderPiece = exports.LiteralPiece = exports.MessagePiece = exports.TemplateLiteralElement = exports.TemplateLiteral = exports.LiteralExpr = exports.InstantiateExpr = exports.InvokeFunctionExpr = exports.InvokeMethodExpr = exports.BuiltinMethod = exports.WritePropExpr = exports.WriteKeyExpr = exports.WriteVarExpr = exports.WrappedNodeExpr = exports.TypeofExpr = exports.ReadVarExpr = exports.BuiltinVar = exports.Expression = exports.areAllEquivalent = exports.nullSafeIsEquivalent = exports.BinaryOperator = exports.UnaryOperator = exports.NONE_TYPE = exports.FUNCTION_TYPE = exports.STRING_TYPE = exports.NUMBER_TYPE = exports.INT_TYPE = exports.BOOL_TYPE = exports.INFERRED_TYPE = exports.DYNAMIC_TYPE = exports.MapType = exports.ArrayType = exports.ExpressionType = exports.BuiltinType = exports.BuiltinTypeName = exports.Type = exports.TypeModifier = void 0;
-exports.isNull = exports.literal = exports.ifStmt = exports.fn = exports.assertNotNull = exports.not = exports.unary = exports.literalMap = exports.literalArr = exports.typeofExpr = exports.expressionType = exports.importExpr = exports.variable = exports.IfStmt = exports.ClassStmt = exports.ClassGetter = exports.ClassMethod = exports.ClassField = exports.AbstractClassPart = exports.ReturnStatement = exports.ExpressionStatement = exports.DeclareFunctionStmt = exports.DeclareVarStmt = exports.Statement = exports.JSDocComment = exports.LeadingComment = exports.StmtModifier = exports.TYPED_NULL_EXPR = exports.NULL_EXPR = exports.CATCH_STACK_VAR = exports.CATCH_ERROR_VAR = exports.SUPER_EXPR = exports.THIS_EXPR = exports.CommaExpr = exports.LiteralMapExpr = exports.LiteralMapEntry = void 0;
+exports.LeadingComment = exports.StmtModifier = exports.TYPED_NULL_EXPR = exports.NULL_EXPR = exports.CommaExpr = exports.LiteralMapExpr = exports.LiteralMapEntry = exports.LiteralArrayExpr = exports.ReadKeyExpr = exports.ReadPropExpr = exports.BinaryOperatorExpr = exports.UnaryOperatorExpr = exports.FunctionExpr = exports.FnParam = exports.NotExpr = exports.ConditionalExpr = exports.ExternalReference = exports.ExternalExpr = exports.LiteralPiece = exports.TemplateLiteralElement = exports.TemplateLiteral = exports.LiteralExpr = exports.InstantiateExpr = exports.InvokeFunctionExpr = exports.WritePropExpr = exports.WriteKeyExpr = exports.WriteVarExpr = exports.WrappedNodeExpr = exports.TypeofExpr = exports.ReadVarExpr = exports.Expression = exports.areAllEquivalent = exports.nullSafeIsEquivalent = exports.BinaryOperator = exports.UnaryOperator = exports.NONE_TYPE = exports.FUNCTION_TYPE = exports.STRING_TYPE = exports.NUMBER_TYPE = exports.INT_TYPE = exports.BOOL_TYPE = exports.INFERRED_TYPE = exports.DYNAMIC_TYPE = exports.MapType = exports.ArrayType = exports.ExpressionType = exports.BuiltinType = exports.BuiltinTypeName = exports.Type = exports.TypeModifier = void 0;
+exports.isNull = exports.literal = exports.ifStmt = exports.fn = exports.not = exports.unary = exports.literalMap = exports.literalArr = exports.typeofExpr = exports.expressionType = exports.importType = exports.importExpr = exports.variable = exports.jsDocComment = exports.leadingComment = exports.IfStmt = exports.ReturnStatement = exports.ExpressionStatement = exports.DeclareFunctionStmt = exports.DeclareVarStmt = exports.Statement = exports.JSDocComment = void 0;
 //// Types
 var TypeModifier;
 (function (TypeModifier) {
-    TypeModifier[TypeModifier["Const"] = 0] = "Const";
+    TypeModifier[TypeModifier["None"] = 0] = "None";
+    TypeModifier[TypeModifier["Const"] = 1] = "Const";
 })(TypeModifier = exports.TypeModifier || (exports.TypeModifier = {}));
 class Type {
-    constructor(modifiers = []) {
+    constructor(modifiers = TypeModifier.None) {
         this.modifiers = modifiers;
     }
     hasModifier(modifier) {
-        return this.modifiers.indexOf(modifier) !== -1;
+        return (this.modifiers & modifier) !== 0;
     }
 }
 exports.Type = Type;
@@ -140,8 +141,8 @@ class Expression {
     prop(name, sourceSpan) {
         return new ReadPropExpr(this, name, null, sourceSpan);
     }
-    callMethod(name, params, sourceSpan) {
-        return new InvokeMethodExpr(this, name, params, null, sourceSpan);
+    key(index, type, sourceSpan) {
+        return new ReadKeyExpr(this, index, type, sourceSpan);
     }
     callFn(params, sourceSpan, pure) {
         return new InvokeFunctionExpr(this, params, null, sourceSpan, pure);
@@ -151,29 +152,13 @@ class Expression {
     }
 }
 exports.Expression = Expression;
-var BuiltinVar;
-(function (BuiltinVar) {
-    BuiltinVar[BuiltinVar["This"] = 0] = "This";
-    BuiltinVar[BuiltinVar["Super"] = 1] = "Super";
-    BuiltinVar[BuiltinVar["CatchError"] = 2] = "CatchError";
-    BuiltinVar[BuiltinVar["CatchStack"] = 3] = "CatchStack";
-})(BuiltinVar = exports.BuiltinVar || (exports.BuiltinVar = {}));
 class ReadVarExpr extends Expression {
     constructor(name, type, sourceSpan) {
         super(type, sourceSpan);
-        if (typeof name === 'string') {
-            this.name = name;
-            this.builtin = null;
-        }
-        else {
-            this.name = null;
-            this.builtin = name;
-        }
+        this.name = name;
     }
     isEquivalent(e) {
-        return (e instanceof ReadVarExpr &&
-            this.name === e.name &&
-            this.builtin === e.builtin);
+        return e instanceof ReadVarExpr && this.name === e.name;
     }
     isConstant() {
         return false;
@@ -182,9 +167,6 @@ class ReadVarExpr extends Expression {
         return visitor.visitReadVarExpr(this, context);
     }
     set(value) {
-        if (!this.name) {
-            throw new Error(`Built in variable ${this.builtin} can not be assigned to.`);
-        }
         return new WriteVarExpr(this.name, value, null, this.sourceSpan);
     }
 }
@@ -242,7 +224,7 @@ class WriteVarExpr extends Expression {
         return new DeclareVarStmt(this.name, this.value, type, modifiers, this.sourceSpan);
     }
     toConstDecl() {
-        return this.toDeclStmt(exports.INFERRED_TYPE, [StmtModifier.Final]);
+        return this.toDeclStmt(exports.INFERRED_TYPE, StmtModifier.Final);
     }
 }
 exports.WriteVarExpr = WriteVarExpr;
@@ -288,41 +270,6 @@ class WritePropExpr extends Expression {
     }
 }
 exports.WritePropExpr = WritePropExpr;
-var BuiltinMethod;
-(function (BuiltinMethod) {
-    BuiltinMethod[BuiltinMethod["ConcatArray"] = 0] = "ConcatArray";
-    BuiltinMethod[BuiltinMethod["SubscribeObservable"] = 1] = "SubscribeObservable";
-    BuiltinMethod[BuiltinMethod["Bind"] = 2] = "Bind";
-})(BuiltinMethod = exports.BuiltinMethod || (exports.BuiltinMethod = {}));
-class InvokeMethodExpr extends Expression {
-    constructor(receiver, method, args, type, sourceSpan) {
-        super(type, sourceSpan);
-        this.receiver = receiver;
-        this.args = args;
-        if (typeof method === 'string') {
-            this.name = method;
-            this.builtin = null;
-        }
-        else {
-            this.name = null;
-            this.builtin = method;
-        }
-    }
-    isEquivalent(e) {
-        return (e instanceof InvokeMethodExpr &&
-            this.receiver.isEquivalent(e.receiver) &&
-            this.name === e.name &&
-            this.builtin === e.builtin &&
-            areAllEquivalent(this.args, e.args));
-    }
-    isConstant() {
-        return false;
-    }
-    visitExpression(visitor, context) {
-        return visitor.visitInvokeMethodExpr(this, context);
-    }
-}
-exports.InvokeMethodExpr = InvokeMethodExpr;
 class InvokeFunctionExpr extends Expression {
     constructor(fn, args, type, sourceSpan, pure = false) {
         super(type, sourceSpan);
@@ -402,23 +349,47 @@ class TemplateLiteralElement {
     }
 }
 exports.TemplateLiteralElement = TemplateLiteralElement;
-class MessagePiece {
+class LiteralPiece {
     constructor(text, sourceSpan) {
         this.text = text;
         this.sourceSpan = sourceSpan;
     }
 }
-exports.MessagePiece = MessagePiece;
-class LiteralPiece extends MessagePiece {
-}
 exports.LiteralPiece = LiteralPiece;
-class PlaceholderPiece extends MessagePiece {
-}
-exports.PlaceholderPiece = PlaceholderPiece;
 const escapeSlashes = (str) => str.replace(/\\/g, '\\\\');
 const escapeStartingColon = (str) => str.replace(/^:/, '\\:');
 const escapeColons = (str) => str.replace(/:/g, '\\:');
 const escapeForTemplateLiteral = (str) => str.replace(/`/g, '\\`').replace(/\${/g, '$\\{');
+/**
+ * Creates a `{cooked, raw}` object from the `metaBlock` and `messagePart`.
+ *
+ * The `raw` text must have various character sequences escaped:
+ * * "\" would otherwise indicate that the next character is a control character.
+ * * "`" and "${" are template string control sequences that would otherwise prematurely indicate
+ *   the end of a message part.
+ * * ":" inside a metablock would prematurely indicate the end of the metablock.
+ * * ":" at the start of a messagePart with no metablock would erroneously indicate the start of a
+ *   metablock.
+ *
+ * @param metaBlock Any metadata that should be prepended to the string
+ * @param messagePart The message part of the string
+ */
+function createCookedRawString(metaBlock, messagePart, range) {
+    if (metaBlock === '') {
+        return {
+            cooked: messagePart,
+            raw: escapeForTemplateLiteral(escapeStartingColon(escapeSlashes(messagePart))),
+            range,
+        };
+    }
+    else {
+        return {
+            cooked: `:${metaBlock}:${messagePart}`,
+            raw: escapeForTemplateLiteral(`:${escapeColons(escapeSlashes(metaBlock))}:${escapeSlashes(messagePart)}`),
+            range,
+        };
+    }
+}
 class ExternalExpr extends Expression {
     constructor(value, type, typeParams = null, sourceSpan) {
         super(type, sourceSpan);
@@ -484,38 +455,6 @@ class NotExpr extends Expression {
     }
 }
 exports.NotExpr = NotExpr;
-class AssertNotNull extends Expression {
-    constructor(condition, sourceSpan) {
-        super(condition.type, sourceSpan);
-        this.condition = condition;
-    }
-    isEquivalent(e) {
-        return (e instanceof AssertNotNull && this.condition.isEquivalent(e.condition));
-    }
-    isConstant() {
-        return false;
-    }
-    visitExpression(visitor, context) {
-        return visitor.visitAssertNotNullExpr(this, context);
-    }
-}
-exports.AssertNotNull = AssertNotNull;
-class CastExpr extends Expression {
-    constructor(value, type, sourceSpan) {
-        super(type, sourceSpan);
-        this.value = value;
-    }
-    isEquivalent(e) {
-        return e instanceof CastExpr && this.value.isEquivalent(e.value);
-    }
-    isConstant() {
-        return false;
-    }
-    visitExpression(visitor, context) {
-        return visitor.visitCastExpr(this, context);
-    }
-}
-exports.CastExpr = CastExpr;
 class FnParam {
     constructor(name, type = null) {
         this.name = name;
@@ -698,19 +637,16 @@ class CommaExpr extends Expression {
     }
 }
 exports.CommaExpr = CommaExpr;
-exports.THIS_EXPR = new ReadVarExpr(BuiltinVar.This, null, null);
-exports.SUPER_EXPR = new ReadVarExpr(BuiltinVar.Super, null, null);
-exports.CATCH_ERROR_VAR = new ReadVarExpr(BuiltinVar.CatchError, null, null);
-exports.CATCH_STACK_VAR = new ReadVarExpr(BuiltinVar.CatchStack, null, null);
 exports.NULL_EXPR = new LiteralExpr(null, null, null);
 exports.TYPED_NULL_EXPR = new LiteralExpr(null, exports.INFERRED_TYPE, null);
 //// Statements
 var StmtModifier;
 (function (StmtModifier) {
-    StmtModifier[StmtModifier["Final"] = 0] = "Final";
-    StmtModifier[StmtModifier["Private"] = 1] = "Private";
-    StmtModifier[StmtModifier["Exported"] = 2] = "Exported";
-    StmtModifier[StmtModifier["Static"] = 3] = "Static";
+    StmtModifier[StmtModifier["None"] = 0] = "None";
+    StmtModifier[StmtModifier["Final"] = 1] = "Final";
+    StmtModifier[StmtModifier["Private"] = 2] = "Private";
+    StmtModifier[StmtModifier["Exported"] = 4] = "Exported";
+    StmtModifier[StmtModifier["Static"] = 8] = "Static";
 })(StmtModifier = exports.StmtModifier || (exports.StmtModifier = {}));
 class LeadingComment {
     constructor(text, multiline, trailingNewline) {
@@ -734,13 +670,13 @@ class JSDocComment extends LeadingComment {
 }
 exports.JSDocComment = JSDocComment;
 class Statement {
-    constructor(modifiers = [], sourceSpan = null, leadingComments) {
+    constructor(modifiers = StmtModifier.None, sourceSpan = null, leadingComments) {
         this.modifiers = modifiers;
         this.sourceSpan = sourceSpan;
         this.leadingComments = leadingComments;
     }
     hasModifier(modifier) {
-        return this.modifiers.indexOf(modifier) !== -1;
+        return (this.modifiers & modifier) !== 0;
     }
     addLeadingComment(leadingComment) {
         var _a;
@@ -788,7 +724,7 @@ class DeclareFunctionStmt extends Statement {
 exports.DeclareFunctionStmt = DeclareFunctionStmt;
 class ExpressionStatement extends Statement {
     constructor(expr, sourceSpan, leadingComments) {
-        super([], sourceSpan, leadingComments);
+        super(StmtModifier.None, sourceSpan, leadingComments);
         this.expr = expr;
     }
     isEquivalent(stmt) {
@@ -801,7 +737,7 @@ class ExpressionStatement extends Statement {
 exports.ExpressionStatement = ExpressionStatement;
 class ReturnStatement extends Statement {
     constructor(value, sourceSpan = null, leadingComments) {
-        super([], sourceSpan, leadingComments);
+        super(StmtModifier.None, sourceSpan, leadingComments);
         this.value = value;
     }
     isEquivalent(stmt) {
@@ -812,77 +748,9 @@ class ReturnStatement extends Statement {
     }
 }
 exports.ReturnStatement = ReturnStatement;
-class AbstractClassPart {
-    constructor(type = null, modifiers = []) {
-        this.type = type;
-        this.modifiers = modifiers;
-    }
-    hasModifier(modifier) {
-        return this.modifiers.indexOf(modifier) !== -1;
-    }
-}
-exports.AbstractClassPart = AbstractClassPart;
-class ClassField extends AbstractClassPart {
-    constructor(name, type, modifiers, initializer) {
-        super(type, modifiers);
-        this.name = name;
-        this.initializer = initializer;
-    }
-    isEquivalent(f) {
-        return this.name === f.name;
-    }
-}
-exports.ClassField = ClassField;
-class ClassMethod extends AbstractClassPart {
-    constructor(name, params, body, type, modifiers) {
-        super(type, modifiers);
-        this.name = name;
-        this.params = params;
-        this.body = body;
-    }
-    isEquivalent(m) {
-        return this.name === m.name && areAllEquivalent(this.body, m.body);
-    }
-}
-exports.ClassMethod = ClassMethod;
-class ClassGetter extends AbstractClassPart {
-    constructor(name, body, type, modifiers) {
-        super(type, modifiers);
-        this.name = name;
-        this.body = body;
-    }
-    isEquivalent(m) {
-        return this.name === m.name && areAllEquivalent(this.body, m.body);
-    }
-}
-exports.ClassGetter = ClassGetter;
-class ClassStmt extends Statement {
-    constructor(name, parent, fields, getters, constructorMethod, methods, modifiers, sourceSpan, leadingComments) {
-        super(modifiers, sourceSpan, leadingComments);
-        this.name = name;
-        this.parent = parent;
-        this.fields = fields;
-        this.getters = getters;
-        this.constructorMethod = constructorMethod;
-        this.methods = methods;
-    }
-    isEquivalent(stmt) {
-        return (stmt instanceof ClassStmt &&
-            this.name === stmt.name &&
-            nullSafeIsEquivalent(this.parent, stmt.parent) &&
-            areAllEquivalent(this.fields, stmt.fields) &&
-            areAllEquivalent(this.getters, stmt.getters) &&
-            this.constructorMethod.isEquivalent(stmt.constructorMethod) &&
-            areAllEquivalent(this.methods, stmt.methods));
-    }
-    visitStatement(visitor, context) {
-        return visitor.visitDeclareClassStmt(this, context);
-    }
-}
-exports.ClassStmt = ClassStmt;
 class IfStmt extends Statement {
     constructor(condition, trueCase, falseCase = [], sourceSpan, leadingComments) {
-        super([], sourceSpan, leadingComments);
+        super(StmtModifier.None, sourceSpan, leadingComments);
         this.condition = condition;
         this.trueCase = trueCase;
         this.falseCase = falseCase;
@@ -898,6 +766,14 @@ class IfStmt extends Statement {
     }
 }
 exports.IfStmt = IfStmt;
+function leadingComment(text, multiline = false, trailingNewline = true) {
+    return new LeadingComment(text, multiline, trailingNewline);
+}
+exports.leadingComment = leadingComment;
+function jsDocComment(tags = []) {
+    return new JSDocComment(tags);
+}
+exports.jsDocComment = jsDocComment;
 function variable(name, type, sourceSpan) {
     return new ReadVarExpr(name, type, sourceSpan);
 }
@@ -906,6 +782,12 @@ function importExpr(id, typeParams = null, sourceSpan) {
     return new ExternalExpr(id, null, typeParams, sourceSpan);
 }
 exports.importExpr = importExpr;
+function importType(id, typeParams, typeModifiers) {
+    return id != null
+        ? expressionType(importExpr(id, typeParams, null), typeModifiers)
+        : null;
+}
+exports.importType = importType;
 function expressionType(expr, typeModifiers, typeParams) {
     return new ExpressionType(expr, typeModifiers, typeParams);
 }
@@ -930,10 +812,6 @@ function not(expr, sourceSpan) {
     return new NotExpr(expr, sourceSpan);
 }
 exports.not = not;
-function assertNotNull(expr, sourceSpan) {
-    return new AssertNotNull(expr, sourceSpan);
-}
-exports.assertNotNull = assertNotNull;
 function fn(params, body, type, sourceSpan, name) {
     return new FunctionExpr(params, body, type, sourceSpan, name);
 }

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

@@ -17,7 +17,7 @@ export interface R3PartialDeclaration {
      */
     version: string;
     /**
-     * A reference to the `static-injector` ES module, which allows access
+     * A reference to the `@angular/core` ES module, which allows access
      * to all Angular exports, including Ivy instructions.
      */
     ngImport: o.Expression;

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

@@ -1,4 +1,11 @@
 "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
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FactoryTarget = void 0;
 var FactoryTarget;

package/transform/compiler/src/render3/r3_factory.d.ts

@@ -1,11 +1,4 @@
-/**
- * @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 outputAst from '../output/output_ast';
+import * as o from '../output/output_ast';
 import { R3CompiledExpression, R3Reference } from './util';
 /**
  * Metadata required by the factory generator to generate a `factory` function for a type.
@@ -26,7 +19,7 @@ export interface R3ConstructorFactoryMetadata {
      * This can differ from the outer `type` if the class is being compiled by ngcc and is inside
      * an IIFE structure that uses a different name internally.
      */
-    internalType: outputAst.Expression;
+    internalType: o.Expression;
     /** Number of arguments for the `type`. */
     typeArgumentCount: number;
     /**
@@ -48,14 +41,14 @@ export declare enum R3FactoryDelegateType {
     Function = 1
 }
 export interface R3DelegatedFnOrClassMetadata extends R3ConstructorFactoryMetadata {
-    delegate: outputAst.Expression;
+    delegate: o.Expression;
     delegateType: R3FactoryDelegateType;
     delegateDeps: R3DependencyMetadata[];
 }
 export interface R3ExpressionFactoryMetadata extends R3ConstructorFactoryMetadata {
-    expression: outputAst.Expression;
+    expression: o.Expression;
 }
-export declare type R3FactoryMetadata = R3ConstructorFactoryMetadata | R3DelegatedFnOrClassMetadata | R3ExpressionFactoryMetadata;
+export type R3FactoryMetadata = R3ConstructorFactoryMetadata | R3DelegatedFnOrClassMetadata | R3ExpressionFactoryMetadata;
 export declare enum FactoryTarget {
     Directive = 0,
     Component = 1,
@@ -68,13 +61,13 @@ export interface R3DependencyMetadata {
      * An expression representing the token or value to be injected.
      * Or `null` if the dependency could not be resolved - making it invalid.
      */
-    token: outputAst.Expression | null;
+    token: o.Expression | null;
     /**
      * If an @Attribute decorator is present, this is the literal type of the attribute name, or
      * the unknown type if no literal type is available (e.g. the attribute name is an expression).
      * Otherwise it is null;
      */
-    attributeNameType: outputAst.Expression | null;
+    attributeNameType: o.Expression | null;
     /**
      * Whether the dependency has an @Optional qualifier.
      */
@@ -92,6 +85,6 @@ export interface R3DependencyMetadata {
  * Construct a factory function expression for the given `R3FactoryMetadata`.
  */
 export declare function compileFactoryFunction(meta: R3FactoryMetadata): R3CompiledExpression;
-export declare function createFactoryType(meta: R3FactoryMetadata): outputAst.ExpressionType;
+export declare function createFactoryType(meta: R3FactoryMetadata): o.ExpressionType;
 export declare function isDelegatedFactoryMetadata(meta: R3FactoryMetadata): meta is R3DelegatedFnOrClassMetadata;
 export declare function isExpressionFactoryMetadata(meta: R3FactoryMetadata): meta is R3ExpressionFactoryMetadata;