@angular/core 19.1.0-next.0 → 19.1.0-next.2

package/schematics/bundles/inject-migration.js

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v19.1.0-next.0
+ * @license Angular v19.1.0-next.2
  * (c) 2010-2024 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -10,12 +10,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var schematics = require('@angular-devkit/schematics');
 var p = require('path');
-var compiler_host = require('./compiler_host-087c5caa.js');
+var compiler_host = require('./compiler_host-f5d588fe.js');
 var ts = require('typescript');
-var nodes = require('./nodes-0e7d45ca.js');
-var imports = require('./imports-4ac08251.js');
-var leading_space = require('./leading_space-d190b83b.js');
-require('./checker-3cbc9cc1.js');
+var nodes = require('./nodes-88c2157f.js');
+var imports = require('./imports-31a38653.js');
+var leading_space = require('./leading_space-6e7a8ec6.js');
+require('./checker-c58f97d2.js');
 require('os');
 require('fs');
 require('module');
@@ -50,6 +50,15 @@ const DI_PARAM_SYMBOLS = new Set([
     'Host',
     'forwardRef',
 ]);
+/** Kinds of nodes which aren't injectable when set as a type of a parameter. */
+const UNINJECTABLE_TYPE_KINDS = new Set([
+    ts__default["default"].SyntaxKind.TrueKeyword,
+    ts__default["default"].SyntaxKind.FalseKeyword,
+    ts__default["default"].SyntaxKind.NumberKeyword,
+    ts__default["default"].SyntaxKind.StringKeyword,
+    ts__default["default"].SyntaxKind.NullKeyword,
+    ts__default["default"].SyntaxKind.VoidKeyword,
+]);
 /**
  * Finds the necessary information for the `inject` migration in a file.
  * @param sourceFile File which to analyze.
@@ -76,12 +85,23 @@ function analyzeFile(sourceFile, localTypeChecker, options) {
         if (ts__default["default"].isImportDeclaration(node)) {
             return;
         }
-        // Only visit the initializer of parameters, because we won't exclude
-        // their decorators from the identifier counting result below.
         if (ts__default["default"].isParameter(node)) {
+            const closestConstructor = nodes.closestNode(node, ts__default["default"].isConstructorDeclaration);
+            // Visiting the same parameters that we're about to remove can throw off the reference
+            // counting logic below. If we run into an initializer, we always visit its initializer
+            // and optionally visit the modifiers/decorators if it's not due to be deleted. Note that
+            // here we technically aren't dealing with the the full list of classes, but the parent class
+            // will have been visited by the time we reach the parameters.
             if (node.initializer) {
                 walk(node.initializer);
             }
+            if (closestConstructor === null ||
+                // This is meant to avoid the case where this is a
+                // parameter inside a function placed in a constructor.
+                !closestConstructor.parameters.includes(node) ||
+                !classes.some((c) => c.constructor === closestConstructor)) {
+                node.modifiers?.forEach(walk);
+            }
             return;
         }
         if (ts__default["default"].isIdentifier(node) && importsToSpecifiers.size > 0) {
@@ -111,9 +131,21 @@ function analyzeFile(sourceFile, localTypeChecker, options) {
             const constructorNode = node.members.find((member) => ts__default["default"].isConstructorDeclaration(member) &&
                 member.body != null &&
                 member.parameters.length > 0);
+            // Basic check to determine if all parameters are injectable. This isn't exhaustive, but it
+            // should catch the majority of cases. An exhaustive check would require a full type checker
+            // which we don't have in this migration.
+            const allParamsInjectable = !!constructorNode?.parameters.every((param) => {
+                if (!param.type || !UNINJECTABLE_TYPE_KINDS.has(param.type.kind)) {
+                    return true;
+                }
+                return nodes.getAngularDecorators(localTypeChecker, ts__default["default"].getDecorators(param) || []).some((dec) => dec.name === 'Inject' || dec.name === 'Attribute');
+            });
             // Don't migrate abstract classes by default, because
             // their parameters aren't guaranteed to be injectable.
-            if (supportsDI && constructorNode && (!isAbstract || options.migrateAbstractClasses)) {
+            if (supportsDI &&
+                constructorNode &&
+                allParamsInjectable &&
+                (!isAbstract || options.migrateAbstractClasses)) {
                 classes.push({
                     node,
                     constructor: constructorNode,
@@ -314,7 +346,7 @@ function findSuperCall(root) {
  * Finds class property declarations without initializers whose constructor-based initialization
  * can be inlined into the declaration spot after migrating to `inject`. For example:
  *
- * ```
+ * ```ts
  * private foo: number;
  *
  * constructor(private service: MyService) {
@@ -381,7 +413,7 @@ function findUninitializedPropertiesToCombine(node, constructor, localTypeChecke
  * The internal-specific migration will combine such properties which will result in a compilation
  * error, for example:
  *
- * ```
+ * ```ts
  * class MyClass {
  *   foo: Foo;
  *   bar: Bar;
@@ -395,7 +427,7 @@ function findUninitializedPropertiesToCombine(node, constructor, localTypeChecke
  *
  * Will become:
  *
- * ```
+ * ```ts
  * class MyClass {
  *   foo: Foo = this.bar.getFoo();
  *   bar: Bar = inject(Bar);
@@ -449,7 +481,7 @@ function shouldCombineInInitializationOrder(toCombine, constructor) {
 /**
  * Finds the expressions from the constructor that initialize class members, for example:
  *
- * ```
+ * ```ts
  * private foo: number;
  *
  * constructor() {
@@ -666,7 +698,7 @@ function migrateClass(node, constructor, superCall, options, memberIndentation,
         // the text if the statement after the `super` call is being deleted. This appears to be because
         // the full start of the next statement appears to always be the end of the `super` call plus 1.
         const nextStatement = getNextPreservedStatement(superCall, removedStatements);
-        tracker.insertText(sourceFile, nextStatement ? nextStatement.getFullStart() : superCall.getEnd() + 1, `\n${afterSuper.join('\n')}\n`);
+        tracker.insertText(sourceFile, nextStatement ? nextStatement.getFullStart() : constructor.getEnd() - 1, `\n${afterSuper.join('\n')}\n` + (nextStatement ? '' : memberIndentation));
     }
     // Need to resolve this once all constructor signatures have been removed.
     const memberReference = node.members.find((m) => !removedMembers.has(m)) || node.members[0];
@@ -688,7 +720,12 @@ function migrateClass(node, constructor, superCall, options, memberIndentation,
     prependToClass.push(...afterInjectCalls);
     if (prependToClass.length > 0) {
         if (removedMembers.size === node.members.length) {
-            tracker.insertText(sourceFile, constructor.getEnd() + 1, `${prependToClass.join('\n')}\n`);
+            tracker.insertText(sourceFile, 
+            // If all members were deleted, insert after the last one.
+            // This allows us to preserve the indentation.
+            node.members.length > 0
+                ? node.members[node.members.length - 1].getEnd() + 1
+                : node.getEnd() - 1, `${prependToClass.join('\n')}\n`);
         }
         else {
             // Insert the new properties after the first member that hasn't been deleted.
@@ -902,15 +939,10 @@ function migrateInjectDecorator(firstArg, type, localTypeChecker) {
             }
         }
     }
-    else if (
-    // Pass the type for cases like `@Inject(FOO_TOKEN) foo: Foo`, because:
-    // 1. It guarantees that the type stays the same as before.
-    // 2. Avoids leaving unused imports behind.
-    // We only do this for type references since the `@Inject` pattern above is fairly common and
-    // apps don't necessarily type their injection tokens correctly, whereas doing it for literal
-    // types will add a lot of noise to the generated code.
-    type &&
+    else if (type &&
         (ts__default["default"].isTypeReferenceNode(type) ||
+            ts__default["default"].isTypeLiteralNode(type) ||
+            ts__default["default"].isTupleTypeNode(type) ||
             (ts__default["default"].isUnionTypeNode(type) && type.types.some(ts__default["default"].isTypeReferenceNode)))) {
         typeArguments = [type];
     }
@@ -932,28 +964,17 @@ function stripConstructorParameters(node, tracker) {
     const constructorText = node.getText();
     const lastParamText = node.parameters[node.parameters.length - 1].getText();
     const lastParamStart = constructorText.indexOf(lastParamText);
-    const whitespacePattern = /\s/;
-    let trailingCharacters = 0;
-    if (lastParamStart > -1) {
-        let lastParamEnd = lastParamStart + lastParamText.length;
-        let closeParenIndex = -1;
-        for (let i = lastParamEnd; i < constructorText.length; i++) {
-            const char = constructorText[i];
-            if (char === ')') {
-                closeParenIndex = i;
-                break;
-            }
-            else if (!whitespacePattern.test(char)) {
-                // The end of the last parameter won't include
-                // any trailing commas which we need to account for.
-                lastParamEnd = i + 1;
-            }
-        }
-        if (closeParenIndex > -1) {
-            trailingCharacters = closeParenIndex - lastParamEnd;
+    // This shouldn't happen, but bail out just in case so we don't mangle the code.
+    if (lastParamStart === -1) {
+        return;
+    }
+    for (let i = lastParamStart + lastParamText.length; i < constructorText.length; i++) {
+        const char = constructorText[i];
+        if (char === ')') {
+            tracker.replaceText(node.getSourceFile(), node.parameters.pos, node.getStart() + i - node.parameters.pos, '');
+            break;
         }
     }
-    tracker.replaceText(node.getSourceFile(), node.parameters.pos, node.parameters.end - node.parameters.pos + trailingCharacters, '');
 }
 /**
  * Creates a type checker scoped to a specific file.

package/schematics/bundles/{leading_space-d190b83b.js → leading_space-6e7a8ec6.js}

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v19.1.0-next.0
+ * @license Angular v19.1.0-next.2
  * (c) 2010-2024 Google LLC. https://angular.io/
  * License: MIT
  */

package/schematics/bundles/{migrate_ts_type_references-efb52bf2.js → migrate_ts_type_references-a8676ec1.js}

@@ -1,18 +1,18 @@
 'use strict';
 /**
- * @license Angular v19.1.0-next.0
+ * @license Angular v19.1.0-next.2
  * (c) 2010-2024 Google LLC. https://angular.io/
  * License: MIT
  */
 'use strict';
 
-var checker = require('./checker-3cbc9cc1.js');
+var checker = require('./checker-c58f97d2.js');
 var ts = require('typescript');
 require('os');
 var assert = require('assert');
-var combine_units = require('./combine_units-ab03aca8.js');
-var leading_space = require('./leading_space-d190b83b.js');
-require('./program-ed10d149.js');
+var combine_units = require('./combine_units-8b29b7f6.js');
+var leading_space = require('./leading_space-6e7a8ec6.js');
+require('./program-30e02255.js');
 require('path');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -816,7 +816,7 @@ class GroupedTsAstVisitor {
  * Phase that propagates incompatibilities to derived classes or
  * base classes. For example, consider:
  *
- * ```
+ * ```ts
  * class Base {
  *   bla = true;
  * }
@@ -1556,7 +1556,7 @@ function getFlowNode(node) {
  *
  * E.g. consider the following snippet:
  *
- * ```
+ * ```ts
  * someMethod() {
  *   if (this.bla) {
  *     this.bla.charAt(0);
@@ -1837,7 +1837,7 @@ function migrateStandardTsReference(tsReferencesWithNarrowing, checker, info, re
  * The phase takes care of control flow analysis and generates temporary variables
  * where needed to ensure narrowing continues to work. E.g.
  *
- * ```
+ * ```ts
  * someMethod() {
  *   if (this.input) {
  *     this.input.charAt(0);
@@ -1847,7 +1847,7 @@ function migrateStandardTsReference(tsReferencesWithNarrowing, checker, info, re
  *
  * will be transformed into:
  *
- * ```
+ * ```ts
  * someMethod() {
  *   const input_1 = this.input();
  *   if (input_1) {

package/schematics/bundles/{nodes-0e7d45ca.js → nodes-88c2157f.js}

@@ -1,13 +1,13 @@
 'use strict';
 /**
- * @license Angular v19.1.0-next.0
+ * @license Angular v19.1.0-next.2
  * (c) 2010-2024 Google LLC. https://angular.io/
  * License: MIT
  */
 'use strict';
 
 var ts = require('typescript');
-var imports = require('./imports-4ac08251.js');
+var imports = require('./imports-31a38653.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 

package/schematics/bundles/output-migration.js

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v19.1.0-next.0
+ * @license Angular v19.1.0-next.2
  * (c) 2010-2024 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -9,12 +9,12 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var schematics = require('@angular-devkit/schematics');
-var project_tsconfig_paths = require('./project_tsconfig_paths-e9ccccbf.js');
-var combine_units = require('./combine_units-ab03aca8.js');
+var project_tsconfig_paths = require('./project_tsconfig_paths-6c9cde78.js');
+var combine_units = require('./combine_units-8b29b7f6.js');
 require('os');
 var ts = require('typescript');
-var checker = require('./checker-3cbc9cc1.js');
-var program = require('./program-ed10d149.js');
+var checker = require('./checker-c58f97d2.js');
+var program = require('./program-30e02255.js');
 require('path');
 require('@angular-devkit/core');
 require('node:path/posix');

package/schematics/bundles/pending-tasks.js

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v19.1.0-next.0
+ * @license Angular v19.1.0-next.2
  * (c) 2010-2024 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -10,12 +10,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var schematics = require('@angular-devkit/schematics');
 var p = require('path');
-var project_tsconfig_paths = require('./project_tsconfig_paths-e9ccccbf.js');
-var compiler_host = require('./compiler_host-087c5caa.js');
+var project_tsconfig_paths = require('./project_tsconfig_paths-6c9cde78.js');
+var compiler_host = require('./compiler_host-f5d588fe.js');
 var ts = require('typescript');
-var imports = require('./imports-4ac08251.js');
+var imports = require('./imports-31a38653.js');
 require('@angular-devkit/core');
-require('./checker-3cbc9cc1.js');
+require('./checker-c58f97d2.js');
 require('os');
 require('fs');
 require('module');

package/schematics/bundles/{program-ed10d149.js → program-30e02255.js}

@@ -1,12 +1,12 @@
 'use strict';
 /**
- * @license Angular v19.1.0-next.0
+ * @license Angular v19.1.0-next.2
  * (c) 2010-2024 Google LLC. https://angular.io/
  * License: MIT
  */
 'use strict';
 
-var checker = require('./checker-3cbc9cc1.js');
+var checker = require('./checker-c58f97d2.js');
 var ts = require('typescript');
 var p = require('path');
 require('os');
@@ -809,7 +809,7 @@ function internalCompileClassMetadata(metadata) {
  * loads dependencies from `@defer` blocks.
  *
  * Generates a call like this:
- * ```
+ * ```ts
  * setClassMetadataAsync(type, () => [
  *   import('./cmp-a').then(m => m.CmpA);
  *   import('./cmp-b').then(m => m.CmpB);
@@ -900,12 +900,15 @@ function compileHmrInitializer(meta) {
     const dataName = 'd';
     const timestampName = 't';
     const importCallbackName = `${meta.className}_HmrLoad`;
-    const locals = meta.locals.map((localName) => checker.variable(localName));
+    const locals = meta.localDependencies.map((localName) => checker.variable(localName));
+    const namespaces = meta.namespaceDependencies.map((dep) => {
+        return new checker.ExternalExpr({ moduleName: dep.moduleName, name: null });
+    });
     // m.default
     const defaultRead = checker.variable(moduleName).prop('default');
-    // ɵɵreplaceMetadata(Comp, m.default, [...]);
+    // ɵɵreplaceMetadata(Comp, m.default, [...namespaces], [...locals]);
     const replaceCall = checker.importExpr(checker.Identifiers.replaceMetadata)
-        .callFn([meta.type, defaultRead, new checker.ExternalExpr(checker.Identifiers.core), checker.literalArr(locals)]);
+        .callFn([meta.type, defaultRead, checker.literalArr(namespaces), checker.literalArr(locals)]);
     // (m) => m.default && ɵɵreplaceMetadata(...)
     const replaceCallback = checker.arrowFn([new checker.FnParam(moduleName)], defaultRead.and(replaceCall));
     // '<urlPartial>' + encodeURIComponent(t)
@@ -958,9 +961,14 @@ function compileHmrInitializer(meta) {
  * @param meta HMR metadata extracted from the class.
  */
 function compileHmrUpdateCallback(definitions, constantStatements, meta) {
-    // The class name should always be first and core should be second.
-    const params = [meta.className, meta.coreName, ...meta.locals].map((name) => new checker.FnParam(name, checker.DYNAMIC_TYPE));
-    const body = [...constantStatements];
+    const namespaces = 'ɵɵnamespaces';
+    const params = [meta.className, namespaces, ...meta.localDependencies].map((name) => new checker.FnParam(name, checker.DYNAMIC_TYPE));
+    const body = [];
+    // Declare variables that read out the individual namespaces.
+    for (let i = 0; i < meta.namespaceDependencies.length; i++) {
+        body.push(new checker.DeclareVarStmt(meta.namespaceDependencies[i].assignedName, checker.variable(namespaces).key(checker.literal(i)), checker.DYNAMIC_TYPE, checker.StmtModifier.Final));
+    }
+    body.push(...constantStatements);
     for (const field of definitions) {
         if (field.initializer !== null) {
             body.push(checker.variable(meta.className).prop(field.name).set(field.initializer).toStmt());
@@ -987,7 +995,7 @@ const MINIMUM_PARTIAL_LINKER_DEFER_SUPPORT_VERSION = '18.0.0';
 function compileDeclareClassMetadata(metadata) {
     const definitionMap = new checker.DefinitionMap();
     definitionMap.set('minVersion', checker.literal(MINIMUM_PARTIAL_LINKER_VERSION$5));
-    definitionMap.set('version', checker.literal('19.1.0-next.0'));
+    definitionMap.set('version', checker.literal('19.1.0-next.2'));
     definitionMap.set('ngImport', checker.importExpr(checker.Identifiers.core));
     definitionMap.set('type', metadata.type);
     definitionMap.set('decorators', metadata.decorators);
@@ -1005,7 +1013,7 @@ function compileComponentDeclareClassMetadata(metadata, dependencies) {
     callbackReturnDefinitionMap.set('ctorParameters', metadata.ctorParameters ?? checker.literal(null));
     callbackReturnDefinitionMap.set('propDecorators', metadata.propDecorators ?? checker.literal(null));
     definitionMap.set('minVersion', checker.literal(MINIMUM_PARTIAL_LINKER_DEFER_SUPPORT_VERSION));
-    definitionMap.set('version', checker.literal('19.1.0-next.0'));
+    definitionMap.set('version', checker.literal('19.1.0-next.2'));
     definitionMap.set('ngImport', checker.importExpr(checker.Identifiers.core));
     definitionMap.set('type', metadata.type);
     definitionMap.set('resolveDeferredDeps', compileComponentMetadataAsyncResolver(dependencies));
@@ -1100,7 +1108,7 @@ function createDirectiveDefinitionMap(meta) {
     const definitionMap = new checker.DefinitionMap();
     const minVersion = getMinimumVersionForPartialOutput(meta);
     definitionMap.set('minVersion', checker.literal(minVersion));
-    definitionMap.set('version', checker.literal('19.1.0-next.0'));
+    definitionMap.set('version', checker.literal('19.1.0-next.2'));
     // e.g. `type: MyDirective`
     definitionMap.set('type', meta.type.value);
     if (meta.isStandalone !== undefined) {
@@ -1516,7 +1524,7 @@ const MINIMUM_PARTIAL_LINKER_VERSION$4 = '12.0.0';
 function compileDeclareFactoryFunction(meta) {
     const definitionMap = new checker.DefinitionMap();
     definitionMap.set('minVersion', checker.literal(MINIMUM_PARTIAL_LINKER_VERSION$4));
-    definitionMap.set('version', checker.literal('19.1.0-next.0'));
+    definitionMap.set('version', checker.literal('19.1.0-next.2'));
     definitionMap.set('ngImport', checker.importExpr(checker.Identifiers.core));
     definitionMap.set('type', meta.type.value);
     definitionMap.set('deps', compileDependencies(meta.deps));
@@ -1551,7 +1559,7 @@ function compileDeclareInjectableFromMetadata(meta) {
 function createInjectableDefinitionMap(meta) {
     const definitionMap = new checker.DefinitionMap();
     definitionMap.set('minVersion', checker.literal(MINIMUM_PARTIAL_LINKER_VERSION$3));
-    definitionMap.set('version', checker.literal('19.1.0-next.0'));
+    definitionMap.set('version', checker.literal('19.1.0-next.2'));
     definitionMap.set('ngImport', checker.importExpr(checker.Identifiers.core));
     definitionMap.set('type', meta.type.value);
     // Only generate providedIn property if it has a non-null value
@@ -1602,7 +1610,7 @@ function compileDeclareInjectorFromMetadata(meta) {
 function createInjectorDefinitionMap(meta) {
     const definitionMap = new checker.DefinitionMap();
     definitionMap.set('minVersion', checker.literal(MINIMUM_PARTIAL_LINKER_VERSION$2));
-    definitionMap.set('version', checker.literal('19.1.0-next.0'));
+    definitionMap.set('version', checker.literal('19.1.0-next.2'));
     definitionMap.set('ngImport', checker.importExpr(checker.Identifiers.core));
     definitionMap.set('type', meta.type.value);
     definitionMap.set('providers', meta.providers);
@@ -1635,7 +1643,7 @@ function createNgModuleDefinitionMap(meta) {
         throw new Error('Invalid path! Local compilation mode should not get into the partial compilation path');
     }
     definitionMap.set('minVersion', checker.literal(MINIMUM_PARTIAL_LINKER_VERSION$1));
-    definitionMap.set('version', checker.literal('19.1.0-next.0'));
+    definitionMap.set('version', checker.literal('19.1.0-next.2'));
     definitionMap.set('ngImport', checker.importExpr(checker.Identifiers.core));
     definitionMap.set('type', meta.type.value);
     // We only generate the keys in the metadata if the arrays contain values.
@@ -1686,7 +1694,7 @@ function compileDeclarePipeFromMetadata(meta) {
 function createPipeDefinitionMap(meta) {
     const definitionMap = new checker.DefinitionMap();
     definitionMap.set('minVersion', checker.literal(MINIMUM_PARTIAL_LINKER_VERSION));
-    definitionMap.set('version', checker.literal('19.1.0-next.0'));
+    definitionMap.set('version', checker.literal('19.1.0-next.2'));
     definitionMap.set('ngImport', checker.importExpr(checker.Identifiers.core));
     // e.g. `type: MyPipe`
     definitionMap.set('type', meta.type.value);
@@ -10120,15 +10128,14 @@ class TsCreateProgramDriver {
  * found in the LICENSE file at https://angular.dev/license
  */
 /**
- * Determines the names of the file-level locals that the HMR
- * initializer needs to capture and pass along.
+ * Determines the file-level dependencies that the HMR initializer needs to capture and pass along.
  * @param sourceFile File in which the file is being compiled.
  * @param definition Compiled component definition.
  * @param factory Compiled component factory.
  * @param classMetadata Compiled `setClassMetadata` expression, if any.
  * @param debugInfo Compiled `setClassDebugInfo` expression, if any.
  */
-function extractHmrLocals(node, definition, factory, classMetadata, debugInfo) {
+function extractHmrDependencies(node, definition, factory, classMetadata, debugInfo) {
     const name = ts__default["default"].isClassDeclaration(node) && node.name ? node.name.text : null;
     const visitor = new PotentialTopLevelReadsVisitor();
     const sourceFile = node.getSourceFile();
@@ -10144,7 +10151,13 @@ function extractHmrLocals(node, definition, factory, classMetadata, debugInfo) {
     // variables inside of functions. Note that we filter out the class name since it is always
     // defined and it saves us having to repeat this logic wherever the locals are consumed.
     const availableTopLevel = getTopLevelDeclarationNames(sourceFile);
-    return Array.from(visitor.allReads).filter((r) => r !== name && availableTopLevel.has(r));
+    return {
+        local: Array.from(visitor.allReads).filter((r) => r !== name && availableTopLevel.has(r)),
+        external: Array.from(visitor.namespaceReads, (name, index) => ({
+            moduleName: name,
+            assignedName: `ɵhmr${index}`,
+        })),
+    };
 }
 /**
  * Gets the names of all top-level declarations within the file (imports, declared classes etc).
@@ -10227,6 +10240,13 @@ function trackBindingName(node, results) {
  */
 class PotentialTopLevelReadsVisitor extends checker.RecursiveAstVisitor {
     allReads = new Set();
+    namespaceReads = new Set();
+    visitExternalExpr(ast, context) {
+        if (ast.value.moduleName !== null) {
+            this.namespaceReads.add(ast.value.moduleName);
+        }
+        super.visitExternalExpr(ast, context);
+    }
     visitReadVarExpr(ast, context) {
         this.allReads.add(ast.name);
         super.visitReadVarExpr(ast, context);
@@ -10326,12 +10346,13 @@ function extractHmrMetatadata(clazz, reflection, compilerHost, rootDirs, definit
     const sourceFile = clazz.getSourceFile();
     const filePath = getProjectRelativePath(sourceFile, rootDirs, compilerHost) ||
         compilerHost.getCanonicalFileName(sourceFile.fileName);
+    const dependencies = extractHmrDependencies(clazz, definition, factory, classMetadata, debugInfo);
     const meta = {
         type: new checker.WrappedNodeExpr(clazz.name),
         className: clazz.name.text,
         filePath,
-        locals: extractHmrLocals(clazz, definition, factory, classMetadata, debugInfo),
-        coreName: '__ngCore__',
+        localDependencies: dependencies.local,
+        namespaceDependencies: dependencies.external,
     };
     return meta;
 }
@@ -10350,7 +10371,11 @@ function extractHmrMetatadata(clazz, reflection, compilerHost, rootDirs, definit
  * @param sourceFile File in which the class is defined.
  */
 function getHmrUpdateDeclaration(compilationResults, constantStatements, meta, sourceFile) {
-    const importRewriter = new HmrModuleImportRewriter(meta.coreName);
+    const namespaceSpecifiers = meta.namespaceDependencies.reduce((result, current) => {
+        result.set(current.moduleName, current.assignedName);
+        return result;
+    }, new Map());
+    const importRewriter = new HmrModuleImportRewriter(namespaceSpecifiers);
     const importManager = new checker.ImportManager({
         ...checker.presetImportManagerForceNamespaceImports,
         rewriter: importRewriter,
@@ -10364,14 +10389,13 @@ function getHmrUpdateDeclaration(compilationResults, constantStatements, meta, s
         ts__default["default"].factory.createToken(ts__default["default"].SyntaxKind.DefaultKeyword),
     ], node.asteriskToken, node.name, node.typeParameters, node.parameters, node.type, node.body);
 }
-/** Rewriter that replaces namespace imports to `@angular/core` with a specifier identifier. */
 class HmrModuleImportRewriter {
-    coreName;
-    constructor(coreName) {
-        this.coreName = coreName;
+    lookup;
+    constructor(lookup) {
+        this.lookup = lookup;
     }
     rewriteNamespaceImportIdentifier(specifier, moduleName) {
-        return moduleName === '@angular/core' ? this.coreName : specifier;
+        return this.lookup.has(moduleName) ? this.lookup.get(moduleName) : specifier;
     }
     rewriteSymbol(symbol) {
         return symbol;
@@ -20138,7 +20162,7 @@ var semver = /*@__PURE__*/getDefaultExportFromCjs(semverExports);
  * @param minVersion Minimum required version for the feature.
  */
 function coreVersionSupportsFeature(coreVersion, minVersion) {
-    // A version of `19.1.0-next.0` usually means that core is at head so it supports
+    // A version of `19.1.0-next.2` usually means that core is at head so it supports
     // all features. Use string interpolation prevent the placeholder from being replaced
     // with the current version during build time.
     if (coreVersion === `0.0.0-${'PLACEHOLDER'}`) {

package/schematics/bundles/{project_tsconfig_paths-e9ccccbf.js → project_tsconfig_paths-6c9cde78.js}

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v19.1.0-next.0
+ * @license Angular v19.1.0-next.2
  * (c) 2010-2024 Google LLC. https://angular.io/
  * License: MIT
  */

package/schematics/bundles/provide-initializer.js

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v19.1.0-next.0
+ * @license Angular v19.1.0-next.2
  * (c) 2010-2024 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -10,12 +10,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var schematics = require('@angular-devkit/schematics');
 var p = require('path');
-var project_tsconfig_paths = require('./project_tsconfig_paths-e9ccccbf.js');
-var compiler_host = require('./compiler_host-087c5caa.js');
+var project_tsconfig_paths = require('./project_tsconfig_paths-6c9cde78.js');
+var compiler_host = require('./compiler_host-f5d588fe.js');
 var ts = require('typescript');
-var imports = require('./imports-4ac08251.js');
+var imports = require('./imports-31a38653.js');
 require('@angular-devkit/core');
-require('./checker-3cbc9cc1.js');
+require('./checker-c58f97d2.js');
 require('os');
 require('fs');
 require('module');

package/schematics/bundles/route-lazy-loading.js

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v19.1.0-next.0
+ * @license Angular v19.1.0-next.2
  * (c) 2010-2024 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -11,10 +11,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var schematics = require('@angular-devkit/schematics');
 var fs = require('fs');
 var p = require('path');
-var compiler_host = require('./compiler_host-087c5caa.js');
-var project_tsconfig_paths = require('./project_tsconfig_paths-e9ccccbf.js');
+var compiler_host = require('./compiler_host-f5d588fe.js');
+var project_tsconfig_paths = require('./project_tsconfig_paths-6c9cde78.js');
 var ts = require('typescript');
-var checker = require('./checker-3cbc9cc1.js');
+var checker = require('./checker-c58f97d2.js');
 require('os');
 require('@angular-devkit/core');
 require('module');