static-injector 2.2.0 → 3.0.0

package/import/commonjs/index.js

@@ -163,6 +163,21 @@ function stringify(token) {
     const newLineIndex = res.indexOf('\n');
     return newLineIndex === -1 ? res : res.substring(0, newLineIndex);
 }
+/**
+ * Ellipses the string in the middle when longer than the max length
+ *
+ * @param string
+ * @param maxLength of the output string
+ * @returns elispsed string with ... in the middle
+ */
+function truncateMiddle(str, maxLength = 100) {
+    if (!str || maxLength < 1 || str.length <= maxLength)
+        return str;
+    if (maxLength == 1)
+        return str.substring(0, 1) + '...';
+    const halfLimit = Math.round(maxLength / 2);
+    return (str.substring(0, halfLimit) + '...' + str.substring(str.length - halfLimit));
+}
 
 /**
  * @license
@@ -823,11 +838,17 @@ if (false) {
  * `InjectionToken` is parameterized on `T` which is the type of object which will be returned by
  * the `Injector`. This provides an additional level of type safety.
  *
- * ```
- * interface MyInterface {...}
- * const myInterface = injector.get(new InjectionToken<MyInterface>('SomeToken'));
- * // myInterface is inferred to be MyInterface.
- * ```
+ * <div class="alert is-helpful">
+ *
+ * **Important Note**: Ensure that you use the same instance of the `InjectionToken` in both the
+ * provider and the injection call. Creating a new instance of `InjectionToken` in different places,
+ * even with the same description, will be treated as different tokens by Angular's DI system,
+ * leading to a `NullInjectorError`.
+ *
+ * </div>
+ *
+ * <code-example format="typescript" language="typescript" path="injection-token/src/main.ts"
+ * region="InjectionToken"></code-example>
  *
  * When creating an `InjectionToken`, you can optionally specify a factory function which returns
  * (possibly by creating) a default value of the parameterized type `T`. This sets up the
@@ -854,7 +875,6 @@ if (false) {
  *
  * {@example core/di/ts/injector_spec.ts region='ShakableInjectionToken'}
  *
- *
  * @publicApi
  */
 class InjectionToken {
@@ -1161,7 +1181,7 @@ class R3Injector extends EnvironmentInjector {
         if (record != null && typeof record.value === 'string') {
             this.scopes.add(record.value);
         }
-        this.injectorDefTypes = new Set(this.get(INJECTOR_DEF_TYPES.multi, EMPTY_ARRAY, exports.InjectFlags.Self));
+        this.injectorDefTypes = new Set(this.get(INJECTOR_DEF_TYPES, EMPTY_ARRAY, exports.InjectFlags.Self));
     }
     /**
      * Destroy the injector and release references to every instance or provider associated with it.
@@ -1235,6 +1255,8 @@ class R3Injector extends EnvironmentInjector {
                     if (def && this.injectableDefInScope(def)) {
                         // Found an injectable def and it's scoped to this injector. Pretend as if it was here
                         // all along.
+                        if (false) {
+                        }
                         record = makeRecord(injectableDefOrInjectorDefFactory(token), NOT_YET);
                     }
                     else {
@@ -1291,7 +1313,7 @@ class R3Injector extends EnvironmentInjector {
         if (false) {
         }
         try {
-            const initializers = this.get(ENVIRONMENT_INITIALIZER.multi, EMPTY_ARRAY, exports.InjectFlags.Self);
+            const initializers = this.get(ENVIRONMENT_INITIALIZER, EMPTY_ARRAY, exports.InjectFlags.Self);
             if (false) {
             }
             for (const initializer of initializers) {

package/import/es2022/di/injection_token.js

@@ -16,11 +16,17 @@ import { ɵɵdefineInjectable } from './interface/defs';
  * `InjectionToken` is parameterized on `T` which is the type of object which will be returned by
  * the `Injector`. This provides an additional level of type safety.
  *
- * ```
- * interface MyInterface {...}
- * const myInterface = injector.get(new InjectionToken<MyInterface>('SomeToken'));
- * // myInterface is inferred to be MyInterface.
- * ```
+ * <div class="alert is-helpful">
+ *
+ * **Important Note**: Ensure that you use the same instance of the `InjectionToken` in both the
+ * provider and the injection call. Creating a new instance of `InjectionToken` in different places,
+ * even with the same description, will be treated as different tokens by Angular's DI system,
+ * leading to a `NullInjectorError`.
+ *
+ * </div>
+ *
+ * <code-example format="typescript" language="typescript" path="injection-token/src/main.ts"
+ * region="InjectionToken"></code-example>
  *
  * When creating an `InjectionToken`, you can optionally specify a factory function which returns
  * (possibly by creating) a default value of the parameterized type `T`. This sets up the
@@ -47,7 +53,6 @@ import { ɵɵdefineInjectable } from './interface/defs';
  *
  * {@example core/di/ts/injector_spec.ts region='ShakableInjectionToken'}
  *
- *
  * @publicApi
  */
 export class InjectionToken {

package/import/es2022/di/r3_injector.js

@@ -94,7 +94,7 @@ export class R3Injector extends EnvironmentInjector {
         if (record != null && typeof record.value === 'string') {
             this.scopes.add(record.value);
         }
-        this.injectorDefTypes = new Set(this.get(INJECTOR_DEF_TYPES.multi, EMPTY_ARRAY, InjectFlags.Self));
+        this.injectorDefTypes = new Set(this.get(INJECTOR_DEF_TYPES, EMPTY_ARRAY, InjectFlags.Self));
     }
     /**
      * Destroy the injector and release references to every instance or provider associated with it.
@@ -168,6 +168,8 @@ export class R3Injector extends EnvironmentInjector {
                     if (def && this.injectableDefInScope(def)) {
                         // Found an injectable def and it's scoped to this injector. Pretend as if it was here
                         // all along.
+                        if (false) {
+                        }
                         record = makeRecord(injectableDefOrInjectorDefFactory(token), NOT_YET);
                     }
                     else {
@@ -224,7 +226,7 @@ export class R3Injector extends EnvironmentInjector {
         if (false) {
         }
         try {
-            const initializers = this.get(ENVIRONMENT_INITIALIZER.multi, EMPTY_ARRAY, InjectFlags.Self);
+            const initializers = this.get(ENVIRONMENT_INITIALIZER, EMPTY_ARRAY, InjectFlags.Self);
             if (false) {
             }
             for (const initializer of initializers) {

package/import/es2022/render3/util/stringify_utils.js

@@ -22,6 +22,7 @@ export function renderStringify(value) {
 }
 /**
  * Used to stringify a value so that it can be displayed in an error message.
+ *
  * Important! This function contains a megamorphic read and should only be
  * used for error messages.
  */

package/import/es2022/util/stringify.js

@@ -28,3 +28,18 @@ export function stringify(token) {
     const newLineIndex = res.indexOf('\n');
     return newLineIndex === -1 ? res : res.substring(0, newLineIndex);
 }
+/**
+ * Ellipses the string in the middle when longer than the max length
+ *
+ * @param string
+ * @param maxLength of the output string
+ * @returns elispsed string with ... in the middle
+ */
+export function truncateMiddle(str, maxLength = 100) {
+    if (!str || maxLength < 1 || str.length <= maxLength)
+        return str;
+    if (maxLength == 1)
+        return str.substring(0, 1) + '...';
+    const halfLimit = Math.round(maxLength / 2);
+    return (str.substring(0, halfLimit) + '...' + str.substring(str.length - halfLimit));
+}

package/import/fesm2022/index.js

@@ -161,6 +161,21 @@ function stringify(token) {
     const newLineIndex = res.indexOf('\n');
     return newLineIndex === -1 ? res : res.substring(0, newLineIndex);
 }
+/**
+ * Ellipses the string in the middle when longer than the max length
+ *
+ * @param string
+ * @param maxLength of the output string
+ * @returns elispsed string with ... in the middle
+ */
+function truncateMiddle(str, maxLength = 100) {
+    if (!str || maxLength < 1 || str.length <= maxLength)
+        return str;
+    if (maxLength == 1)
+        return str.substring(0, 1) + '...';
+    const halfLimit = Math.round(maxLength / 2);
+    return (str.substring(0, halfLimit) + '...' + str.substring(str.length - halfLimit));
+}
 
 /**
  * @license
@@ -821,11 +836,17 @@ if (false) {
  * `InjectionToken` is parameterized on `T` which is the type of object which will be returned by
  * the `Injector`. This provides an additional level of type safety.
  *
- * ```
- * interface MyInterface {...}
- * const myInterface = injector.get(new InjectionToken<MyInterface>('SomeToken'));
- * // myInterface is inferred to be MyInterface.
- * ```
+ * <div class="alert is-helpful">
+ *
+ * **Important Note**: Ensure that you use the same instance of the `InjectionToken` in both the
+ * provider and the injection call. Creating a new instance of `InjectionToken` in different places,
+ * even with the same description, will be treated as different tokens by Angular's DI system,
+ * leading to a `NullInjectorError`.
+ *
+ * </div>
+ *
+ * <code-example format="typescript" language="typescript" path="injection-token/src/main.ts"
+ * region="InjectionToken"></code-example>
  *
  * When creating an `InjectionToken`, you can optionally specify a factory function which returns
  * (possibly by creating) a default value of the parameterized type `T`. This sets up the
@@ -852,7 +873,6 @@ if (false) {
  *
  * {@example core/di/ts/injector_spec.ts region='ShakableInjectionToken'}
  *
- *
  * @publicApi
  */
 class InjectionToken {
@@ -1159,7 +1179,7 @@ class R3Injector extends EnvironmentInjector {
         if (record != null && typeof record.value === 'string') {
             this.scopes.add(record.value);
         }
-        this.injectorDefTypes = new Set(this.get(INJECTOR_DEF_TYPES.multi, EMPTY_ARRAY, InjectFlags.Self));
+        this.injectorDefTypes = new Set(this.get(INJECTOR_DEF_TYPES, EMPTY_ARRAY, InjectFlags.Self));
     }
     /**
      * Destroy the injector and release references to every instance or provider associated with it.
@@ -1233,6 +1253,8 @@ class R3Injector extends EnvironmentInjector {
                     if (def && this.injectableDefInScope(def)) {
                         // Found an injectable def and it's scoped to this injector. Pretend as if it was here
                         // all along.
+                        if (false) {
+                        }
                         record = makeRecord(injectableDefOrInjectorDefFactory(token), NOT_YET);
                     }
                     else {
@@ -1289,7 +1311,7 @@ class R3Injector extends EnvironmentInjector {
         if (false) {
         }
         try {
-            const initializers = this.get(ENVIRONMENT_INITIALIZER.multi, EMPTY_ARRAY, InjectFlags.Self);
+            const initializers = this.get(ENVIRONMENT_INITIALIZER, EMPTY_ARRAY, InjectFlags.Self);
             if (false) {
             }
             for (const initializer of initializers) {

package/import/typings/di/initializer_token.d.ts

@@ -12,4 +12,4 @@ import { InjectionToken } from './injection_token';
  *
  * @publicApi
  */
-export declare const ENVIRONMENT_INITIALIZER: InjectionToken<() => void>;
+export declare const ENVIRONMENT_INITIALIZER: InjectionToken<readonly (() => void)[]>;

package/import/typings/di/injection_token.d.ts

@@ -16,11 +16,17 @@ import { Type } from '../interface/type';
  * `InjectionToken` is parameterized on `T` which is the type of object which will be returned by
  * the `Injector`. This provides an additional level of type safety.
  *
- * ```
- * interface MyInterface {...}
- * const myInterface = injector.get(new InjectionToken<MyInterface>('SomeToken'));
- * // myInterface is inferred to be MyInterface.
- * ```
+ * <div class="alert is-helpful">
+ *
+ * **Important Note**: Ensure that you use the same instance of the `InjectionToken` in both the
+ * provider and the injection call. Creating a new instance of `InjectionToken` in different places,
+ * even with the same description, will be treated as different tokens by Angular's DI system,
+ * leading to a `NullInjectorError`.
+ *
+ * </div>
+ *
+ * <code-example format="typescript" language="typescript" path="injection-token/src/main.ts"
+ * region="InjectionToken"></code-example>
  *
  * When creating an `InjectionToken`, you can optionally specify a factory function which returns
  * (possibly by creating) a default value of the parameterized type `T`. This sets up the
@@ -47,7 +53,6 @@ import { Type } from '../interface/type';
  *
  * {@example core/di/ts/injector_spec.ts region='ShakableInjectionToken'}
  *
- *
  * @publicApi
  */
 export declare class InjectionToken<T> {

package/import/typings/di/internal_tokens.d.ts

@@ -7,4 +7,4 @@
  */
 import { Type } from '../interface/type';
 import { InjectionToken } from './injection_token';
-export declare const INJECTOR_DEF_TYPES: InjectionToken<Type<unknown>>;
+export declare const INJECTOR_DEF_TYPES: InjectionToken<readonly Type<unknown>[]>;

package/import/typings/errors.d.ts

@@ -27,6 +27,7 @@ export declare const enum RuntimeErrorCode {
     EXPRESSION_CHANGED_AFTER_CHECKED = -100,
     RECURSIVE_APPLICATION_REF_TICK = 101,
     RECURSIVE_APPLICATION_RENDER = 102,
+    INFINITE_CHANGE_DETECTION = 103,
     CYCLIC_DI_DEPENDENCY = -200,
     PROVIDER_NOT_FOUND = -201,
     INVALID_FACTORY_DEPENDENCY = 202,
@@ -46,7 +47,7 @@ export declare const enum RuntimeErrorCode {
     INVALID_EVENT_BINDING = 306,
     HOST_DIRECTIVE_UNRESOLVABLE = 307,
     HOST_DIRECTIVE_NOT_STANDALONE = 308,
-    DUPLICATE_DIRECTITVE = 309,
+    DUPLICATE_DIRECTIVE = 309,
     HOST_DIRECTIVE_COMPONENT = 310,
     HOST_DIRECTIVE_UNDEFINED_BINDING = 311,
     HOST_DIRECTIVE_CONFLICTING_ALIAS = 312,
@@ -69,8 +70,10 @@ export declare const enum RuntimeErrorCode {
     MISSING_SSR_CONTENT_INTEGRITY_MARKER = -507,
     SIGNAL_WRITE_FROM_ILLEGAL_CONTEXT = 600,
     REQUIRE_SYNC_WITHOUT_SYNC_EMIT = 601,
+    ASSERTION_NOT_INSIDE_REACTIVE_CONTEXT = -602,
     INVALID_I18N_STRUCTURE = 700,
     MISSING_LOCALE_DATA = 701,
+    DEFER_LOADING_FAILED = 750,
     IMPORT_PROVIDERS_FROM_STANDALONE = 800,
     INVALID_DIFFER_INPUT = 900,
     NO_SUPPORTING_DIFFER_FACTORY = 901,
@@ -85,7 +88,9 @@ export declare const enum RuntimeErrorCode {
     UNSAFE_IFRAME_ATTRS = -910,
     VIEW_ALREADY_DESTROYED = 911,
     COMPONENT_ID_COLLISION = -912,
-    RUNTIME_DEPS_INVALID_IMPORTED_TYPE = 1000
+    IMAGE_PERFORMANCE_WARNING = -913,
+    RUNTIME_DEPS_INVALID_IMPORTED_TYPE = 1000,
+    RUNTIME_DEPS_ORPHAN_COMPONENT = 1001
 }
 /**
  * Class that represents a runtime error.

package/import/typings/render3/util/stringify_utils.d.ts

@@ -14,6 +14,7 @@
 export declare function renderStringify(value: any): string;
 /**
  * Used to stringify a value so that it can be displayed in an error message.
+ *
  * Important! This function contains a megamorphic read and should only be
  * used for error messages.
  */

package/import/typings/util/stringify.d.ts

@@ -6,3 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 export declare function stringify(token: any): string;
+/**
+ * Ellipses the string in the middle when longer than the max length
+ *
+ * @param string
+ * @param maxLength of the output string
+ * @returns elispsed string with ... in the middle
+ */
+export declare function truncateMiddle(str: string, maxLength?: number): string;

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "static-injector",
-  "version": "2.2.0",
+  "version": "3.0.0",
   "description": "Angular的静态注入器独立使用版本",
   "keywords": [
     "angular",
+    "angular 17.0.4",
     "injector",
     "typescript",
-    "typescript 5.1.6",
+    "typescript 5.2.2",
     "injectable",
     "static-inject"
   ],
@@ -29,7 +30,7 @@
   "author": "wszgrcy",
   "license": "MIT",
   "peerDependencies": {
-    "typescript": "~5.1.6"
+    "typescript": ">=5.0.0"
   },
   "devDependencies": {},
   "sideEffects": false

package/readme.md

@@ -3,9 +3,9 @@
 - 这是 Angualr 依赖注入的独立版本,初始版本逻辑为从 Angular 源码中提取出来,并修复了一些已知 bug
 - 使用方法与 Angular 的依赖注入完全一致
 # 来源
-- Angular 16.2.2
+- Angular 17.0.4
 # 兼容
-- ts 5.1.6
+- ts 5.2.2
 # 使用方法
 
 - 以`Injector.create`创建第一级依赖注入器

package/transform/compiler/src/injectable_compiler_2.js

@@ -88,7 +88,7 @@ function compileInjectable(meta, resolveForwardRefs) {
         else {
             result = {
                 statements: [],
-                expression: o.fn([], [new o.ReturnStatement(meta.useFactory.callFn([]))]),
+                expression: o.arrowFn([], meta.useFactory.callFn([])),
             };
         }
     }
@@ -167,5 +167,5 @@ function delegateToFactory(type, useType, unwrapForwardRefs) {
     return createFactoryFunction(unwrappedType);
 }
 function createFactoryFunction(type) {
-    return o.fn([new o.FnParam('t', o.DYNAMIC_TYPE)], [new o.ReturnStatement(type.prop('ɵfac').callFn([o.variable('t')]))]);
+    return o.arrowFn([new o.FnParam('t', o.DYNAMIC_TYPE)], type.prop('ɵfac').callFn([o.variable('t')]));
 }

package/transform/compiler/src/output/output_ast.d.ts

@@ -280,12 +280,22 @@ export declare class FunctionExpr extends Expression {
     statements: Statement[];
     name?: string | null | undefined;
     constructor(params: FnParam[], statements: Statement[], type?: Type | null, sourceSpan?: ParseSourceSpan | null, name?: string | null | undefined);
-    isEquivalent(e: Expression): boolean;
+    isEquivalent(e: Expression | Statement): boolean;
     isConstant(): boolean;
     visitExpression(visitor: ExpressionVisitor, context: any): any;
     toDeclStmt(name: string, modifiers?: StmtModifier): DeclareFunctionStmt;
     clone(): FunctionExpr;
 }
+export declare class ArrowFunctionExpr extends Expression {
+    params: FnParam[];
+    body: Expression | Statement[];
+    constructor(params: FnParam[], body: Expression | Statement[], type?: Type | null, sourceSpan?: ParseSourceSpan | null);
+    isEquivalent(e: Expression): boolean;
+    isConstant(): boolean;
+    visitExpression(visitor: ExpressionVisitor, context: any): any;
+    clone(): Expression;
+    toDeclStmt(name: string, modifiers?: StmtModifier): DeclareVarStmt;
+}
 export declare class UnaryOperatorExpr extends Expression {
     operator: UnaryOperator;
     expr: Expression;
@@ -383,6 +393,7 @@ export interface ExpressionVisitor {
     visitCommaExpr(ast: CommaExpr, context: any): any;
     visitWrappedNodeExpr(ast: WrappedNodeExpr<any>, context: any): any;
     visitTypeofExpr(ast: TypeofExpr, context: any): any;
+    visitArrowFunctionExpr(ast: ArrowFunctionExpr, context: any): any;
 }
 export declare const NULL_EXPR: LiteralExpr;
 export declare const TYPED_NULL_EXPR: LiteralExpr;
@@ -480,6 +491,7 @@ export declare function literalMap(values: {
 export declare function unary(operator: UnaryOperator, expr: Expression, type?: Type, sourceSpan?: ParseSourceSpan | null): UnaryOperatorExpr;
 export declare function not(expr: Expression, sourceSpan?: ParseSourceSpan | null): NotExpr;
 export declare function fn(params: FnParam[], body: Statement[], type?: Type | null, sourceSpan?: ParseSourceSpan | null, name?: string | null): FunctionExpr;
+export declare function arrowFn(params: FnParam[], body: Expression | Statement[], type?: Type | null, sourceSpan?: ParseSourceSpan | null): ArrowFunctionExpr;
 export declare function ifStmt(condition: Expression, thenClause: Statement[], elseClause?: Statement[], sourceSpan?: ParseSourceSpan, leadingComments?: LeadingComment[]): IfStmt;
 export declare function literal(value: any, type?: Type | null, sourceSpan?: ParseSourceSpan | null): LiteralExpr;
 export declare function isNull(exp: Expression): boolean;

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

@@ -7,8 +7,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-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.DynamicImportExpr = 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.TransplantedType = 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.transplantedType = 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 = exports.LeadingComment = exports.StmtModifier = void 0;
+exports.NULL_EXPR = exports.CommaExpr = exports.LiteralMapExpr = exports.LiteralMapEntry = exports.LiteralArrayExpr = exports.ReadKeyExpr = exports.ReadPropExpr = exports.BinaryOperatorExpr = exports.UnaryOperatorExpr = exports.ArrowFunctionExpr = exports.FunctionExpr = exports.FnParam = exports.NotExpr = exports.DynamicImportExpr = 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.TransplantedType = exports.MapType = exports.ArrayType = exports.ExpressionType = exports.BuiltinType = exports.BuiltinTypeName = exports.Type = exports.TypeModifier = void 0;
+exports.isNull = exports.literal = exports.ifStmt = exports.arrowFn = exports.fn = exports.not = exports.unary = exports.literalMap = exports.literalArr = exports.typeofExpr = exports.transplantedType = 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 = exports.LeadingComment = exports.StmtModifier = exports.TYPED_NULL_EXPR = void 0;
 //// Types
 var TypeModifier;
 (function (TypeModifier) {
@@ -600,7 +600,7 @@ class FunctionExpr extends Expression {
         this.name = name;
     }
     isEquivalent(e) {
-        return (e instanceof FunctionExpr &&
+        return ((e instanceof FunctionExpr || e instanceof DeclareFunctionStmt) &&
             areAllEquivalent(this.params, e.params) &&
             areAllEquivalent(this.statements, e.statements));
     }
@@ -619,6 +619,44 @@ class FunctionExpr extends Expression {
     }
 }
 exports.FunctionExpr = FunctionExpr;
+class ArrowFunctionExpr extends Expression {
+    params;
+    body;
+    // Note that `body: Expression` represents `() => expr` whereas
+    // `body: Statement[]` represents `() => { expr }`.
+    constructor(params, body, type, sourceSpan) {
+        super(type, sourceSpan);
+        this.params = params;
+        this.body = body;
+    }
+    isEquivalent(e) {
+        if (!(e instanceof ArrowFunctionExpr) ||
+            !areAllEquivalent(this.params, e.params)) {
+            return false;
+        }
+        if (this.body instanceof Expression && e.body instanceof Expression) {
+            return this.body.isEquivalent(e.body);
+        }
+        if (Array.isArray(this.body) && Array.isArray(e.body)) {
+            return areAllEquivalent(this.body, e.body);
+        }
+        return false;
+    }
+    isConstant() {
+        return false;
+    }
+    visitExpression(visitor, context) {
+        return visitor.visitArrowFunctionExpr(this, context);
+    }
+    clone() {
+        // TODO: Should we deep clone statements?
+        return new ArrowFunctionExpr(this.params.map((p) => p.clone()), Array.isArray(this.body) ? this.body : this.body.clone(), this.type, this.sourceSpan);
+    }
+    toDeclStmt(name, modifiers) {
+        return new DeclareVarStmt(name, this, exports.INFERRED_TYPE, modifiers, this.sourceSpan);
+    }
+}
+exports.ArrowFunctionExpr = ArrowFunctionExpr;
 class UnaryOperatorExpr extends Expression {
     operator;
     expr;
@@ -1015,6 +1053,10 @@ function fn(params, body, type, sourceSpan, name) {
     return new FunctionExpr(params, body, type, sourceSpan, name);
 }
 exports.fn = fn;
+function arrowFn(params, body, type, sourceSpan) {
+    return new ArrowFunctionExpr(params, body, type, sourceSpan);
+}
+exports.arrowFn = arrowFn;
 function ifStmt(condition, thenClause, elseClause, sourceSpan, leadingComments) {
     return new IfStmt(condition, thenClause, elseClause, sourceSpan, leadingComments);
 }

package/transform/compiler/src/render3/r3_factory.js

@@ -116,7 +116,7 @@ function compileFactoryFunction(meta) {
         // There is a base factory variable so wrap its declaration along with the factory function into
         // an IIFE.
         factoryFn = o
-            .fn([], [
+            .arrowFn([], [
             new o.DeclareVarStmt(baseFactoryVar.name),
             new o.ReturnStatement(factoryFn),
         ])

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

@@ -77,8 +77,6 @@ exports.convertFromMaybeForwardRefExpression = convertFromMaybeForwardRefExpress
  * ```
  */
 function generateForwardRef(expr) {
-    return o
-        .importExpr(r3_identifiers_1.Identifiers.forwardRef)
-        .callFn([o.fn([], [new o.ReturnStatement(expr)])]);
+    return o.importExpr(r3_identifiers_1.Identifiers.forwardRef).callFn([o.arrowFn([], expr)]);
 }
 exports.generateForwardRef = generateForwardRef;

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

@@ -6,6 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import * as o from '../../output/output_ast';
+/** Special value representing a direct access to a template's context. */
+export declare const DIRECT_CONTEXT_REFERENCE = "#context";
 /**
  * A representation for an object literal used during codegen of definition objects. The generic
  * type `T` allows to reference a documented type of the generated structure, such that the

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

@@ -30,8 +30,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DefinitionMap = void 0;
+exports.DefinitionMap = exports.DIRECT_CONTEXT_REFERENCE = void 0;
 const o = __importStar(require("../../output/output_ast"));
+/** Special value representing a direct access to a template's context. */
+exports.DIRECT_CONTEXT_REFERENCE = '#context';
 /**
  * A representation for an object literal used during codegen of definition objects. The generic
  * type `T` allows to reference a documented type of the generated structure, such that the
@@ -41,7 +43,13 @@ class DefinitionMap {
     values = [];
     set(key, value) {
         if (value) {
-            this.values.push({ key: key, value, quoted: false });
+            const existing = this.values.find((value) => value.key === key);
+            if (existing) {
+                existing.value = value;
+            }
+            else {
+                this.values.push({ key: key, value, quoted: false });
+            }
         }
     }
     toLiteralMap() {

package/transform/compiler-cli/src/ngtsc/annotations/common/src/di.d.ts

@@ -7,6 +7,7 @@
  */
 import { R3DependencyMetadata } from 'static-injector/transform/compiler';
 import { ClassDeclaration, CtorParameter, ReflectionHost, UnavailableValue } from '../../../reflection';
+import { CompilationMode } from '../../../transform';
 export type ConstructorDeps = {
     deps: R3DependencyMetadata[];
 } | {
@@ -18,7 +19,7 @@ export interface ConstructorDepError {
     param: CtorParameter;
     reason: UnavailableValue;
 }
-export declare function getConstructorDependencies(clazz: ClassDeclaration, reflector: ReflectionHost, isCore: boolean): ConstructorDeps | null;
+export declare function getConstructorDependencies(clazz: ClassDeclaration, reflector: ReflectionHost, isCore: boolean, compilationMode: CompilationMode): ConstructorDeps | null;
 /**
  * Convert `ConstructorDeps` into the `R3DependencyMetadata` array for those deps if they're valid,
  * or into an `'invalid'` signal if they're not.
@@ -26,7 +27,7 @@ export declare function getConstructorDependencies(clazz: ClassDeclaration, refl
  * This is a companion function to `validateConstructorDependencies` which accepts invalid deps.
  */
 export declare function unwrapConstructorDependencies(deps: ConstructorDeps | null): R3DependencyMetadata[] | 'invalid' | null;
-export declare function getValidConstructorDependencies(clazz: ClassDeclaration, reflector: ReflectionHost, isCore: boolean): R3DependencyMetadata[] | null;
+export declare function getValidConstructorDependencies(clazz: ClassDeclaration, reflector: ReflectionHost, isCore: boolean, compilationMode: CompilationMode): R3DependencyMetadata[] | null;
 /**
  * Validate that `ConstructorDeps` does not have any invalid dependencies and convert them into the
  * `R3DependencyMetadata` array if so, or raise a diagnostic if some deps are invalid.

package/transform/compiler-cli/src/ngtsc/annotations/common/src/di.js

@@ -14,8 +14,9 @@ exports.validateConstructorDependencies = exports.getValidConstructorDependencie
 const compiler_1 = require("static-injector/transform/compiler");
 const typescript_1 = __importDefault(require("typescript"));
 const diagnostics_1 = require("../../../diagnostics");
+const transform_1 = require("../../../transform");
 const util_1 = require("./util");
-function getConstructorDependencies(clazz, reflector, isCore) {
+function getConstructorDependencies(clazz, reflector, isCore, compilationMode) {
     const deps = [];
     const errors = [];
     let ctorParams = reflector.getConstructorParameters(clazz);
@@ -28,7 +29,26 @@ function getConstructorDependencies(clazz, reflector, isCore) {
         }
     }
     ctorParams.forEach((param, idx) => {
-        let token = (0, util_1.valueReferenceToExpression)(param.typeValueReference);
+        let token = null;
+        if (compilationMode === transform_1.CompilationMode.LOCAL &&
+            param.typeValueReference.kind === 2 /* TypeValueReferenceKind.UNAVAILABLE */ &&
+            param.typeValueReference.reason.kind !== 0 /* ValueUnavailableKind.MISSING_TYPE */) {
+            // The case of local compilation where injection token cannot be resolved because it is
+            // "probably" imported from another file
+            const typeNode = param.typeValueReference.reason.typeNode;
+            if (typescript_1.default.isTypeReferenceNode(typeNode)) {
+                // Here we manually create the token out of the typeName without caring about its
+                // references for better TS tracking. This is because in this code path the typeNode is
+                // imported from another file and since we are in local compilation mode (=single file
+                // mode) the reference of this node (or its typeName node) cannot be resolved. So all we
+                // can do is just to create a new expression.
+                token = toQualifiedExpression(typeNode.typeName);
+            }
+        }
+        else {
+            // In all other cases resolve the injection token
+            token = (0, util_1.valueReferenceToExpression)(param.typeValueReference);
+        }
         let attributeNameType = null;
         let optional = false, self = false, skipSelf = false, host = false;
         (param.decorators || [])
@@ -80,6 +100,13 @@ function getConstructorDependencies(clazz, reflector, isCore) {
     }
 }
 exports.getConstructorDependencies = getConstructorDependencies;
+/** Converts a TS qualified name to output expression. */
+function toQualifiedExpression(entity) {
+    if (typescript_1.default.isIdentifier(entity)) {
+        return new compiler_1.WrappedNodeExpr(entity);
+    }
+    return new compiler_1.ReadPropExpr(toQualifiedExpression(entity.left), entity.right.text);
+}
 /**
  * Convert `ConstructorDeps` into the `R3DependencyMetadata` array for those deps if they're valid,
  * or into an `'invalid'` signal if they're not.
@@ -100,8 +127,8 @@ function unwrapConstructorDependencies(deps) {
     }
 }
 exports.unwrapConstructorDependencies = unwrapConstructorDependencies;
-function getValidConstructorDependencies(clazz, reflector, isCore) {
-    return validateConstructorDependencies(clazz, getConstructorDependencies(clazz, reflector, isCore));
+function getValidConstructorDependencies(clazz, reflector, isCore, compilationMode) {
+    return validateConstructorDependencies(clazz, getConstructorDependencies(clazz, reflector, isCore, compilationMode));
 }
 exports.getValidConstructorDependencies = getValidConstructorDependencies;
 /**

package/transform/compiler-cli/src/ngtsc/annotations/src/injectable.d.ts

@@ -7,7 +7,7 @@
  */
 import { R3DependencyMetadata, R3InjectableMetadata } from 'static-injector/transform/compiler';
 import { ClassDeclaration, Decorator, ReflectionHost } from '../../reflection';
-import { AnalysisOutput, CompileResult, DecoratorHandler, DetectResult } from '../../transform';
+import { AnalysisOutput, CompilationMode, CompileResult, DecoratorHandler, DetectResult } from '../../transform';
 export interface InjectableHandlerData {
     meta: R3InjectableMetadata;
     ctorDeps: R3DependencyMetadata[] | 'invalid' | null;
@@ -20,6 +20,7 @@ export declare class InjectableDecoratorHandler implements DecoratorHandler<Deco
     private isCore;
     private strictCtorDeps;
     private includeClassMetadata;
+    private readonly compilationMode;
     /**
      * What to do if the injectable already contains a ɵprov property.
      *
@@ -27,7 +28,7 @@ export declare class InjectableDecoratorHandler implements DecoratorHandler<Deco
      * If false then there is no error and a new ɵprov property is not added.
      */
     private errorOnDuplicateProv;
-    constructor(reflector: ReflectionHost, isCore: boolean, strictCtorDeps: boolean, includeClassMetadata: boolean, 
+    constructor(reflector: ReflectionHost, isCore: boolean, strictCtorDeps: boolean, includeClassMetadata: boolean, compilationMode: CompilationMode, 
     /**
      * What to do if the injectable already contains a ɵprov property.
      *

package/transform/compiler-cli/src/ngtsc/annotations/src/injectable.js

@@ -25,8 +25,9 @@ class InjectableDecoratorHandler {
     isCore;
     strictCtorDeps;
     includeClassMetadata;
+    compilationMode;
     errorOnDuplicateProv;
-    constructor(reflector, isCore, strictCtorDeps, includeClassMetadata, 
+    constructor(reflector, isCore, strictCtorDeps, includeClassMetadata, compilationMode, 
     /**
      * What to do if the injectable already contains a ɵprov property.
      *
@@ -38,6 +39,7 @@ class InjectableDecoratorHandler {
         this.isCore = isCore;
         this.strictCtorDeps = strictCtorDeps;
         this.includeClassMetadata = includeClassMetadata;
+        this.compilationMode = compilationMode;
         this.errorOnDuplicateProv = errorOnDuplicateProv;
     }
     detect(node, decorators) {
@@ -61,7 +63,7 @@ class InjectableDecoratorHandler {
         return {
             analysis: {
                 meta,
-                ctorDeps: extractInjectableCtorDeps(node, meta, decorator, this.reflector, this.isCore, this.strictCtorDeps),
+                ctorDeps: extractInjectableCtorDeps(node, meta, decorator, this.reflector, this.isCore, this.strictCtorDeps, this.compilationMode),
                 // Avoid generating multiple factories if a class has
                 // more Angular decorators, apart from Injectable.
             },
@@ -179,7 +181,7 @@ function getProviderExpression(expression, reflector) {
         ? 2 /* ForwardRefHandling.Unwrapped */
         : 0 /* ForwardRefHandling.None */);
 }
-function extractInjectableCtorDeps(clazz, meta, decorator, reflector, isCore, strictCtorDeps) {
+function extractInjectableCtorDeps(clazz, meta, decorator, reflector, isCore, strictCtorDeps, compilationMode) {
     if (decorator.args === null) {
         throw new diagnostics_1.FatalDiagnosticError(diagnostics_1.ErrorCode.DECORATOR_NOT_CALLED, decorator.node, '@Injectable must be called');
     }
@@ -194,15 +196,15 @@ function extractInjectableCtorDeps(clazz, meta, decorator, reflector, isCore, st
         // constructor signature does not work for DI then a factory definition (ɵfac) that throws is
         // generated.
         if (strictCtorDeps && !(0, common_1.isAbstractClassDeclaration)(clazz)) {
-            ctorDeps = (0, common_2.getValidConstructorDependencies)(clazz, reflector, isCore);
+            ctorDeps = (0, common_2.getValidConstructorDependencies)(clazz, reflector, isCore, compilationMode);
         }
         else {
-            ctorDeps = (0, common_2.unwrapConstructorDependencies)((0, common_2.getConstructorDependencies)(clazz, reflector, isCore));
+            ctorDeps = (0, common_2.unwrapConstructorDependencies)((0, common_2.getConstructorDependencies)(clazz, reflector, isCore, compilationMode));
         }
         return ctorDeps;
     }
     else if (decorator.args.length === 1) {
-        const rawCtorDeps = (0, common_2.getConstructorDependencies)(clazz, reflector, isCore);
+        const rawCtorDeps = (0, common_2.getConstructorDependencies)(clazz, reflector, isCore, compilationMode);
         if (strictCtorDeps &&
             !(0, common_1.isAbstractClassDeclaration)(clazz) &&
             requiresValidCtor(meta)) {

package/transform/compiler-cli/src/ngtsc/diagnostics/error.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 { ErrorCode } from "./error_code";
+import * as ts from 'typescript';
+import { ErrorCode } from './error_code';
 export declare class FatalDiagnosticError {
     readonly code: ErrorCode;
     readonly node: ts.Node;

package/transform/compiler-cli/src/ngtsc/diagnostics/error_code.js

@@ -182,7 +182,7 @@ var ErrorCode;
  * Keep this value in sync with a similar const in
  * `packages/core/src/render3/error_code.ts`.
  */
-exports.ERROR_DETAILS_PAGE_BASE_URL = "https://angular.io/errors";
+exports.ERROR_DETAILS_PAGE_BASE_URL = 'https://angular.io/errors';
 /**
  * @internal
  * Contains a set of error messages that have detailed guides at angular.io.
@@ -201,6 +201,6 @@ exports.COMPILER_ERRORS_WITH_GUIDES = new Set([
  * @internal
  */
 function ngErrorCode(code) {
-    return parseInt("-99" + code);
+    return parseInt('-99' + code);
 }
 exports.ngErrorCode = ngErrorCode;

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

@@ -8,6 +8,24 @@
 import { Expression, Statement, Type } from 'static-injector/transform/compiler';
 import ts from 'typescript';
 import { ClassDeclaration, Decorator } from '../../reflection';
+/**
+ * Specifies the compilation mode that is used for the compilation.
+ */
+export declare enum CompilationMode {
+    /**
+     * Generates fully AOT compiled code using Ivy instructions.
+     */
+    FULL = 0,
+    /**
+     * Generates code using a stable, but intermediate format suitable to be published to NPM.
+     */
+    PARTIAL = 1,
+    /**
+     * Generates code based on each individual source file without using its
+     * dependencies (suitable for local dev edit/refresh workflow).
+     */
+    LOCAL = 2
+}
 /**
  * Provides the interface between a decorator compiler from @angular/compiler and the Typescript
  * compiler/transform.

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

@@ -7,3 +7,23 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.CompilationMode = void 0;
+/**
+ * Specifies the compilation mode that is used for the compilation.
+ */
+var CompilationMode;
+(function (CompilationMode) {
+    /**
+     * Generates fully AOT compiled code using Ivy instructions.
+     */
+    CompilationMode[CompilationMode["FULL"] = 0] = "FULL";
+    /**
+     * Generates code using a stable, but intermediate format suitable to be published to NPM.
+     */
+    CompilationMode[CompilationMode["PARTIAL"] = 1] = "PARTIAL";
+    /**
+     * Generates code based on each individual source file without using its
+     * dependencies (suitable for local dev edit/refresh workflow).
+     */
+    CompilationMode[CompilationMode["LOCAL"] = 2] = "LOCAL";
+})(CompilationMode || (exports.CompilationMode = CompilationMode = {}));

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

@@ -93,6 +93,14 @@ export interface AstFactory<TStatement, TExpression> {
      * @param body a statement (or a block of statements) that are the body of the function.
      */
     createFunctionExpression(functionName: string | null, parameters: string[], body: TStatement): TExpression;
+    /**
+     * Create an expression that represents an arrow function
+     * (e.g. `(param1, param2) => body`).
+     *
+     * @param parameters the names of the function's parameters.
+     * @param body an expression or block of statements that are the body of the function.
+     */
+    createArrowFunctionExpression(parameters: string[], body: TExpression | TStatement): TExpression;
     /**
      * Creates an expression that represents a dynamic import
      * (e.g. `import('./some/path')`)

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

@@ -40,6 +40,7 @@ export declare class ExpressionTranslatorVisitor<TStatement, TExpression> implem
     visitDynamicImportExpr(ast: o.DynamicImportExpr, context: any): TExpression;
     visitNotExpr(ast: o.NotExpr, context: Context): TExpression;
     visitFunctionExpr(ast: o.FunctionExpr, context: Context): TExpression;
+    visitArrowFunctionExpr(ast: o.ArrowFunctionExpr, context: any): TExpression;
     visitBinaryOperatorExpr(ast: o.BinaryOperatorExpr, context: Context): TExpression;
     visitReadPropExpr(ast: o.ReadPropExpr, context: Context): TExpression;
     visitReadKeyExpr(ast: o.ReadKeyExpr, context: Context): TExpression;

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

@@ -186,6 +186,11 @@ class ExpressionTranslatorVisitor {
     visitFunctionExpr(ast, context) {
         return this.factory.createFunctionExpression(ast.name ?? null, ast.params.map((param) => param.name), this.factory.createBlock(this.visitStatements(ast.statements, context)));
     }
+    visitArrowFunctionExpr(ast, context) {
+        return this.factory.createArrowFunctionExpression(ast.params.map((param) => param.name), Array.isArray(ast.body)
+            ? this.factory.createBlock(this.visitStatements(ast.body, context))
+            : ast.body.visitExpression(this, context));
+    }
     visitBinaryOperatorExpr(ast, context) {
         if (!BINARY_OPERATORS.has(ast.operator)) {
             throw new Error(`Unknown binary operator: ${o.BinaryOperator[ast.operator]}`);

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

@@ -26,6 +26,7 @@ export declare class TypeScriptAstFactory implements AstFactory<ts.Statement, ts
     createDynamicImport(url: string): ts.CallExpression;
     createFunctionDeclaration(functionName: string, parameters: string[], body: ts.Statement): ts.Statement;
     createFunctionExpression(functionName: string | null, parameters: string[], body: ts.Statement): ts.Expression;
+    createArrowFunctionExpression(parameters: string[], body: ts.Statement | ts.Expression): ts.Expression;
     createIdentifier: (text: string) => ts.Identifier;
     createIfStatement(condition: ts.Expression, thenStatement: ts.Statement, elseStatement: ts.Statement | null): ts.Statement;
     createLiteral(value: string | number | boolean | null | undefined): ts.Expression;

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

@@ -106,6 +106,12 @@ class TypeScriptAstFactory {
         }
         return typescript_1.default.factory.createFunctionExpression(undefined, undefined, functionName ?? undefined, undefined, parameters.map((param) => typescript_1.default.factory.createParameterDeclaration(undefined, undefined, param)), undefined, body);
     }
+    createArrowFunctionExpression(parameters, body) {
+        if (typescript_1.default.isStatement(body) && !typescript_1.default.isBlock(body)) {
+            throw new Error(`Invalid syntax, expected a block, but got ${typescript_1.default.SyntaxKind[body.kind]}.`);
+        }
+        return typescript_1.default.factory.createArrowFunction(undefined, undefined, parameters.map((param) => typescript_1.default.factory.createParameterDeclaration(undefined, undefined, param)), undefined, undefined, body);
+    }
     createIdentifier = typescript_1.default.factory.createIdentifier;
     createIfStatement(condition, thenStatement, elseStatement) {
         return typescript_1.default.factory.createIfStatement(condition, thenStatement, elseStatement ?? undefined);

package/transform/index.d.ts

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

package/transform/injectable-transform.js

@@ -28,7 +28,7 @@ class InjectableTransformerFactory {
         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);
+        this.handler = new injectable_1.InjectableDecoratorHandler(this.reflectionHost, false, !!this.options.strictCtorDeps, false, transform_1.CompilationMode.FULL);
     }
     getTransform() {
         return (context) => this.transform(context);