@angular/core 19.0.0-next.8 → 19.0.0-rc.0

package/schematics/bundles/{compiler_host-9a4d0c2b.js → compiler_host-f54f8309.js}

@@ -1,13 +1,13 @@
 'use strict';
 /**
- * @license Angular v19.0.0-next.8
+ * @license Angular v19.0.0-rc.0
  * (c) 2010-2024 Google LLC. https://angular.io/
  * License: MIT
  */
 'use strict';
 
 var ts = require('typescript');
-var checker = require('./checker-e68dd7ce.js');
+var checker = require('./checker-2451e7c5.js');
 require('os');
 var p = require('path');
 

package/schematics/bundles/control-flow-migration.js

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v19.0.0-next.8
+ * @license Angular v19.0.0-rc.0
  * (c) 2010-2024 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -10,8 +10,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var schematics = require('@angular-devkit/schematics');
 var p = require('path');
-var compiler_host = require('./compiler_host-9a4d0c2b.js');
-var checker = require('./checker-e68dd7ce.js');
+var compiler_host = require('./compiler_host-f54f8309.js');
+var checker = require('./checker-2451e7c5.js');
 var ts = require('typescript');
 require('os');
 require('fs');

package/schematics/bundles/explicit-standalone-flag.js

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v19.0.0-next.8
+ * @license Angular v19.0.0-rc.0
  * (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-9a4d0c2b.js');
+var project_tsconfig_paths = require('./project_tsconfig_paths-6c9cde78.js');
+var compiler_host = require('./compiler_host-f54f8309.js');
 var ts = require('typescript');
-var imports = require('./imports-4ac08251.js');
+var imports = require('./imports-44987700.js');
 require('@angular-devkit/core');
-require('./checker-e68dd7ce.js');
+require('./checker-2451e7c5.js');
 require('os');
 require('fs');
 require('module');
@@ -77,16 +77,23 @@ function migrateFile(sourceFile, rewriteFn) {
             }
             const properties = decoratorArgument.properties;
             const standaloneProp = getStandaloneProperty(properties);
-            // Need to take care of 3 cases
-            // - standalone: true  => remove the property
+            const hasImports = decoratorHasImports(decoratorArgument);
+            // We'll use the presence of imports to keep the migration idempotent
+            // We need to take care of 3 cases
+            // - standalone: true  => remove the property if we have imports
             // - standalone: false => nothing
-            // - No standalone property => add a standalone: false property
+            // - No standalone property => add a standalone: false property if there are no imports
             let newProperties;
             if (!standaloneProp) {
-                const standaloneFalseProperty = ts__default["default"].factory.createPropertyAssignment('standalone', ts__default["default"].factory.createFalse());
-                newProperties = [...properties, standaloneFalseProperty];
+                if (!hasImports) {
+                    const standaloneFalseProperty = ts__default["default"].factory.createPropertyAssignment('standalone', ts__default["default"].factory.createFalse());
+                    newProperties = [...properties, standaloneFalseProperty];
+                }
+            }
+            else if (standaloneProp.value === ts__default["default"].SyntaxKind.TrueKeyword && hasImports) {
+                // To keep the migration idempotent, we'll only remove the standalone prop when there are imports
+                newProperties = properties.filter((p) => p !== standaloneProp.property);
             }
-            else if (standaloneProp.value === ts__default["default"].SyntaxKind.TrueKeyword) ;
             if (newProperties) {
                 // At this point we know that we need to add standalone: false or
                 // remove an existing standalone: true property.
@@ -123,6 +130,19 @@ function getStandaloneProperty(properties) {
 function isStandaloneProperty(prop) {
     return (ts__default["default"].isPropertyAssignment(prop) && ts__default["default"].isIdentifier(prop.name) && prop.name.text === 'standalone');
 }
+function decoratorHasImports(decoratorArgument) {
+    for (const prop of decoratorArgument.properties) {
+        if (ts__default["default"].isPropertyAssignment(prop) &&
+            ts__default["default"].isIdentifier(prop.name) &&
+            prop.name.text === 'imports') {
+            if (prop.initializer.kind === ts__default["default"].SyntaxKind.ArrayLiteralExpression ||
+                prop.initializer.kind === ts__default["default"].SyntaxKind.Identifier) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
 
 function migrate() {
     return async (tree) => {

package/schematics/bundles/{imports-4ac08251.js → imports-44987700.js}

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

package/schematics/bundles/inject-migration.js

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v19.0.0-next.8
+ * @license Angular v19.0.0-rc.0
  * (c) 2010-2024 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -10,12 +10,13 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var schematics = require('@angular-devkit/schematics');
 var p = require('path');
-var compiler_host = require('./compiler_host-9a4d0c2b.js');
+var compiler_host = require('./compiler_host-f54f8309.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-e68dd7ce.js');
+var ng_decorators = require('./ng_decorators-3ad437d2.js');
+var imports = require('./imports-44987700.js');
+var nodes = require('./nodes-ffdce442.js');
+var leading_space = require('./leading_space-6e7a8ec6.js');
+require('./checker-2451e7c5.js');
 require('os');
 require('fs');
 require('module');
@@ -105,7 +106,7 @@ function analyzeFile(sourceFile, localTypeChecker) {
             }
         }
         else if (ts__default["default"].isClassDeclaration(node)) {
-            const decorators = nodes.getAngularDecorators(localTypeChecker, ts__default["default"].getDecorators(node) || []);
+            const decorators = ng_decorators.getAngularDecorators(localTypeChecker, ts__default["default"].getDecorators(node) || []);
             const supportsDI = decorators.some((dec) => DECORATORS_SUPPORTING_DI.has(dec.name));
             const constructorNode = node.members.find((member) => ts__default["default"].isConstructorDeclaration(member) &&
                 member.body != null &&
@@ -145,7 +146,7 @@ function getConstructorUnusedParameters(declaration, localTypeChecker, removedSt
     }
     declaration.body.forEachChild(function walk(node) {
         // Don't descend into statements that were removed already.
-        if (removedStatements && ts__default["default"].isStatement(node) && removedStatements.has(node)) {
+        if (ts__default["default"].isStatement(node) && removedStatements.has(node)) {
             return;
         }
         if (!ts__default["default"].isIdentifier(node) || !topLevelParameterNames.has(node.text)) {
@@ -286,7 +287,8 @@ function findSuperCall(root) {
  * @param localTypeChecker Type checker scoped to the current file.
  */
 function findUninitializedPropertiesToCombine(node, constructor, localTypeChecker) {
-    let result = null;
+    let toCombine = null;
+    let toHoist = [];
     const membersToDeclarations = new Map();
     for (const member of node.members) {
         if (ts__default["default"].isPropertyDeclaration(member) &&
@@ -296,20 +298,40 @@ function findUninitializedPropertiesToCombine(node, constructor, localTypeChecke
         }
     }
     if (membersToDeclarations.size === 0) {
-        return result;
+        return null;
     }
     const memberInitializers = getMemberInitializers(constructor);
     if (memberInitializers === null) {
-        return result;
+        return null;
     }
-    for (const [name, initializer] of memberInitializers.entries()) {
-        if (membersToDeclarations.has(name) &&
-            !hasLocalReferences(initializer, constructor, localTypeChecker)) {
-            result = result || new Map();
-            result.set(membersToDeclarations.get(name), initializer);
+    for (const [name, decl] of membersToDeclarations.entries()) {
+        if (memberInitializers.has(name)) {
+            const initializer = memberInitializers.get(name);
+            if (!hasLocalReferences(initializer, constructor, localTypeChecker)) {
+                toCombine = toCombine || new Map();
+                toCombine.set(membersToDeclarations.get(name), initializer);
+            }
         }
-    }
-    return result;
+        else {
+            // Mark members that have no initializers and can't be combined to be hoisted above the
+            // injected members. This is either a no-op or it allows us to avoid some patterns internally
+            // like the following:
+            // ```
+            // class Foo {
+            //   publicFoo: Foo;
+            //   private privateFoo: Foo;
+            //
+            //   constructor() {
+            //     this.initializePrivateFooSomehow();
+            //     this.publicFoo = this.privateFoo;
+            //   }
+            // }
+            // ```
+            toHoist.push(decl);
+        }
+    }
+    // If no members need to be combined, none need to be hoisted either.
+    return toCombine === null ? null : { toCombine, toHoist };
 }
 /**
  * Finds the expressions from the constructor that initialize class members, for example:
@@ -366,7 +388,7 @@ function getMemberInitializers(constructor) {
 function hasLocalReferences(root, constructor, localTypeChecker) {
     const sourceFile = root.getSourceFile();
     let hasLocalRefs = false;
-    root.forEachChild(function walk(node) {
+    const walk = (node) => {
         // Stop searching if we know that it has local references.
         if (hasLocalRefs) {
             return;
@@ -396,7 +418,8 @@ function hasLocalReferences(root, constructor, localTypeChecker) {
         if (!hasLocalRefs) {
             node.forEachChild(walk);
         }
-    });
+    };
+    walk(root);
     return hasLocalRefs;
 }
 /**
@@ -444,21 +467,13 @@ function migrateFile(sourceFile, options) {
     const printer = ts__default["default"].createPrinter();
     const tracker = new compiler_host.ChangeTracker(printer);
     analysis.classes.forEach(({ node, constructor, superCall }) => {
-        let removedStatements = null;
+        const memberIndentation = leading_space.getLeadingLineWhitespaceOfNode(node.members[0]);
+        const prependToClass = [];
+        const removedStatements = new Set();
         if (options._internalCombineMemberInitializers) {
-            findUninitializedPropertiesToCombine(node, constructor, localTypeChecker)?.forEach((initializer, property) => {
-                const statement = nodes.closestNode(initializer, ts__default["default"].isStatement);
-                if (!statement) {
-                    return;
-                }
-                const newProperty = ts__default["default"].factory.createPropertyDeclaration(cloneModifiers(property.modifiers), cloneName(property.name), property.questionToken, property.type, initializer);
-                tracker.replaceText(statement.getSourceFile(), statement.getFullStart(), statement.getFullWidth(), '');
-                tracker.replaceNode(property, newProperty);
-                removedStatements = removedStatements || new Set();
-                removedStatements.add(statement);
-            });
+            applyInternalOnlyChanges(node, constructor, localTypeChecker, tracker, printer, removedStatements, prependToClass, memberIndentation);
         }
-        migrateClass(node, constructor, superCall, options, removedStatements, localTypeChecker, printer, tracker);
+        migrateClass(node, constructor, superCall, options, memberIndentation, prependToClass, removedStatements, localTypeChecker, printer, tracker);
     });
     DI_PARAM_SYMBOLS.forEach((name) => {
         // Both zero and undefined are fine here.
@@ -474,12 +489,14 @@ function migrateFile(sourceFile, options) {
  * @param constructor Reference to the class' constructor node.
  * @param superCall Reference to the constructor's `super()` call, if any.
  * @param options Options used to configure the migration.
+ * @param memberIndentation Indentation string of the members of the class.
+ * @param prependToClass Text that should be prepended to the class.
  * @param removedStatements Statements that have been removed from the constructor already.
  * @param localTypeChecker Type checker set up for the specific file.
  * @param printer Printer used to output AST nodes as strings.
  * @param tracker Object keeping track of the changes made to the file.
  */
-function migrateClass(node, constructor, superCall, options, removedStatements, localTypeChecker, printer, tracker) {
+function migrateClass(node, constructor, superCall, options, memberIndentation, prependToClass, removedStatements, localTypeChecker, printer, tracker) {
     const isAbstract = !!node.modifiers?.some((m) => m.kind === ts__default["default"].SyntaxKind.AbstractKeyword);
     // Don't migrate abstract classes by default, because
     // their parameters aren't guaranteed to be injectable.
@@ -491,20 +508,17 @@ function migrateClass(node, constructor, superCall, options, removedStatements,
     const superParameters = superCall
         ? getSuperParameters(constructor, superCall, localTypeChecker)
         : null;
-    const memberIndentation = leading_space.getLeadingLineWhitespaceOfNode(node.members[0]);
-    const removedStatementCount = removedStatements?.size || 0;
-    const innerReference = superCall ||
-        constructor.body?.statements.find((statement) => !removedStatements?.has(statement)) ||
-        constructor;
+    const removedStatementCount = removedStatements.size;
+    const firstConstructorStatement = constructor.body?.statements.find((statement) => !removedStatements.has(statement));
+    const innerReference = superCall || firstConstructorStatement || constructor;
     const innerIndentation = leading_space.getLeadingLineWhitespaceOfNode(innerReference);
-    const propsToAdd = [];
     const prependToConstructor = [];
     const afterSuper = [];
     const removedMembers = new Set();
     for (const param of constructor.parameters) {
         const usedInSuper = superParameters !== null && superParameters.has(param);
         const usedInConstructor = !unusedParameters.has(param);
-        migrateParameter(param, options, localTypeChecker, printer, tracker, superCall, usedInSuper, usedInConstructor, memberIndentation, innerIndentation, prependToConstructor, propsToAdd, afterSuper);
+        migrateParameter(param, options, localTypeChecker, printer, tracker, superCall, usedInSuper, usedInConstructor, memberIndentation, innerIndentation, prependToConstructor, prependToClass, afterSuper);
     }
     // Delete all of the constructor overloads since below we're either going to
     // remove the implementation, or we're going to delete all of the parameters.
@@ -524,11 +538,16 @@ function migrateClass(node, constructor, superCall, options, removedStatements,
         // We always do this no matter what is passed into `backwardsCompatibleConstructors`.
         stripConstructorParameters(constructor, tracker);
         if (prependToConstructor.length > 0) {
-            tracker.insertText(sourceFile, innerReference.getFullStart(), `\n${prependToConstructor.join('\n')}\n`);
+            tracker.insertText(sourceFile, (firstConstructorStatement || innerReference).getFullStart(), `\n${prependToConstructor.join('\n')}\n`);
         }
     }
     if (afterSuper.length > 0 && superCall !== null) {
-        tracker.insertText(sourceFile, superCall.getEnd() + 1, `\n${afterSuper.join('\n')}\n`);
+        // Note that if we can, we should insert before the next statement after the `super` call,
+        // rather than after the end of it. Otherwise the string buffering implementation may drop
+        // 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`);
     }
     // Need to resolve this once all constructor signatures have been removed.
     const memberReference = node.members.find((m) => !removedMembers.has(m)) || node.members[0];
@@ -539,19 +558,19 @@ function migrateClass(node, constructor, superCall, options, removedStatements,
             `${memberIndentation}constructor(...args: unknown[]);`;
         // The new signature always has to be right before the constructor implementation.
         if (memberReference === constructor) {
-            propsToAdd.push(extraSignature);
+            prependToClass.push(extraSignature);
         }
         else {
             tracker.insertText(sourceFile, constructor.getFullStart(), '\n' + extraSignature);
         }
     }
-    if (propsToAdd.length > 0) {
+    if (prependToClass.length > 0) {
         if (removedMembers.size === node.members.length) {
-            tracker.insertText(sourceFile, constructor.getEnd() + 1, `${propsToAdd.join('\n')}\n`);
+            tracker.insertText(sourceFile, constructor.getEnd() + 1, `${prependToClass.join('\n')}\n`);
         }
         else {
             // Insert the new properties after the first member that hasn't been deleted.
-            tracker.insertText(sourceFile, memberReference.getFullStart(), `\n${propsToAdd.join('\n')}\n`);
+            tracker.insertText(sourceFile, memberReference.getFullStart(), `\n${prependToClass.join('\n')}\n`);
         }
     }
 }
@@ -635,7 +654,7 @@ function migrateParameter(node, options, localTypeChecker, printer, tracker, sup
 function createInjectReplacementCall(param, options, localTypeChecker, printer, tracker) {
     const moduleName = '@angular/core';
     const sourceFile = param.getSourceFile();
-    const decorators = nodes.getAngularDecorators(localTypeChecker, ts__default["default"].getDecorators(param) || []);
+    const decorators = ng_decorators.getAngularDecorators(localTypeChecker, ts__default["default"].getDecorators(param) || []);
     const literalProps = [];
     const type = param.type;
     let injectedType = '';
@@ -877,6 +896,61 @@ function canRemoveConstructor(options, constructor, removedStatementCount, super
     return (statementCount === 0 ||
         (statementCount === 1 && superCall !== null && superCall.arguments.length === 0));
 }
+/**
+ * Gets the next statement after a node that *won't* be deleted by the migration.
+ * @param startNode Node from which to start the search.
+ * @param removedStatements Statements that have been removed by the migration.
+ * @returns
+ */
+function getNextPreservedStatement(startNode, removedStatements) {
+    const body = nodes.closestNode(startNode, ts__default["default"].isBlock);
+    const closestStatement = nodes.closestNode(startNode, ts__default["default"].isStatement);
+    if (body === null || closestStatement === null) {
+        return null;
+    }
+    const index = body.statements.indexOf(closestStatement);
+    if (index === -1) {
+        return null;
+    }
+    for (let i = index + 1; i < body.statements.length; i++) {
+        if (!removedStatements.has(body.statements[i])) {
+            return body.statements[i];
+        }
+    }
+    return null;
+}
+/**
+ * Applies the internal-specific migrations to a class.
+ * @param node Class being migrated.
+ * @param constructor The migrated class' constructor.
+ * @param localTypeChecker File-specific type checker.
+ * @param tracker Object keeping track of the changes.
+ * @param printer Printer used to output AST nodes as text.
+ * @param removedStatements Statements that have been removed by the migration.
+ * @param prependToClass Text that will be prepended to a class.
+ * @param memberIndentation Indentation string of the class' members.
+ */
+function applyInternalOnlyChanges(node, constructor, localTypeChecker, tracker, printer, removedStatements, prependToClass, memberIndentation) {
+    const result = findUninitializedPropertiesToCombine(node, constructor, localTypeChecker);
+    result?.toCombine.forEach((initializer, property) => {
+        const statement = nodes.closestNode(initializer, ts__default["default"].isStatement);
+        if (!statement) {
+            return;
+        }
+        const newProperty = ts__default["default"].factory.createPropertyDeclaration(cloneModifiers(property.modifiers), cloneName(property.name), property.questionToken, property.type, initializer);
+        tracker.replaceText(statement.getSourceFile(), statement.getFullStart(), statement.getFullWidth(), '');
+        tracker.replaceNode(property, newProperty);
+        removedStatements.add(statement);
+    });
+    result?.toHoist.forEach((decl) => {
+        prependToClass.push(memberIndentation + printer.printNode(ts__default["default"].EmitHint.Unspecified, decl, decl.getSourceFile()));
+        tracker.replaceText(decl.getSourceFile(), decl.getFullStart(), decl.getFullWidth(), '');
+    });
+    // If we added any hoisted properties, separate them visually with a new line.
+    if (prependToClass.length > 0) {
+        prependToClass.push('');
+    }
+}
 
 function migrate(options) {
     return async (tree) => {

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

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