@angular/core 19.0.0 → 19.0.2

package/schematics/bundles/{checker-e3da3b0a.js → checker-a00b735e.js}

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v19.0.0
+ * @license Angular v19.0.2
  * (c) 2010-2024 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -6466,10 +6466,23 @@ class ParseError {
     span;
     msg;
     level;
-    constructor(span, msg, level = ParseErrorLevel.ERROR) {
+    relatedError;
+    constructor(
+    /** Location of the error. */
+    span, 
+    /** Error message. */
+    msg, 
+    /** Severity level of the error. */
+    level = ParseErrorLevel.ERROR, 
+    /**
+     * Error that caused the error to be surfaced. For example, an error in a sub-expression that
+     * couldn't be parsed. Not guaranteed to be defined, but can be used to provide more context.
+     */
+    relatedError) {
         this.span = span;
         this.msg = msg;
         this.level = level;
+        this.relatedError = relatedError;
     }
     contextualMessage() {
         const ctx = this.span.start.getContext(100, 3);
@@ -10680,6 +10693,7 @@ function createDeferOp(xref, main, mainSlot, ownResolverFn, resolverFn, sourceSp
         errorSlot: null,
         ownResolverFn,
         resolverFn,
+        flags: null,
         sourceSpan,
         ...NEW_OP,
         ...TRAIT_CONSUMES_SLOT,
@@ -22097,7 +22111,7 @@ function text(slot, initialValue, sourceSpan) {
     }
     return call(Identifiers.text, args, sourceSpan);
 }
-function defer(selfSlot, primarySlot, dependencyResolverFn, loadingSlot, placeholderSlot, errorSlot, loadingConfig, placeholderConfig, enableTimerScheduling, sourceSpan) {
+function defer(selfSlot, primarySlot, dependencyResolverFn, loadingSlot, placeholderSlot, errorSlot, loadingConfig, placeholderConfig, enableTimerScheduling, sourceSpan, flags) {
     const args = [
         literal$1(selfSlot),
         literal$1(primarySlot),
@@ -22108,6 +22122,7 @@ function defer(selfSlot, primarySlot, dependencyResolverFn, loadingSlot, placeho
         loadingConfig ?? literal$1(null),
         placeholderConfig ?? literal$1(null),
         enableTimerScheduling ? importExpr(Identifiers.deferEnableTimerScheduling) : literal$1(null),
+        literal$1(flags),
     ];
     let expr;
     while ((expr = args[args.length - 1]) !== null &&
@@ -22701,7 +22716,7 @@ function reifyCreateOperations(unit, ops) {
                 break;
             case OpKind.Defer:
                 const timerScheduling = !!op.loadingMinimumTime || !!op.loadingAfterTime || !!op.placeholderMinimumTime;
-                OpList.replace(op, defer(op.handle.slot, op.mainSlot.slot, op.resolverFn, op.loadingSlot?.slot ?? null, op.placeholderSlot?.slot ?? null, op.errorSlot?.slot ?? null, op.loadingConfig, op.placeholderConfig, timerScheduling, op.sourceSpan));
+                OpList.replace(op, defer(op.handle.slot, op.mainSlot.slot, op.resolverFn, op.loadingSlot?.slot ?? null, op.placeholderSlot?.slot ?? null, op.errorSlot?.slot ?? null, op.loadingConfig, op.placeholderConfig, timerScheduling, op.sourceSpan, op.flags));
                 break;
             case OpKind.DeferOn:
                 let args = [];
@@ -25280,6 +25295,7 @@ function ingestDeferBlock(unit, deferBlock) {
     deferOp.placeholderMinimumTime = deferBlock.placeholder?.minimumTime ?? null;
     deferOp.loadingMinimumTime = deferBlock.loading?.minimumTime ?? null;
     deferOp.loadingAfterTime = deferBlock.loading?.afterTime ?? null;
+    deferOp.flags = calcDeferBlockFlags(deferBlock);
     unit.create.push(deferOp);
     // Configure all defer `on` conditions.
     // TODO: refactor prefetch triggers to use a separate op type, with a shared superclass. This will
@@ -25299,6 +25315,12 @@ function ingestDeferBlock(unit, deferBlock) {
     unit.create.push(deferOnOps);
     unit.update.push(deferWhenOps);
 }
+function calcDeferBlockFlags(deferBlockDetails) {
+    if (Object.keys(deferBlockDetails.hydrateTriggers).length > 0) {
+        return 1 /* ir.TDeferDetailsFlags.HasHydrateTriggers */;
+    }
+    return null;
+}
 function ingestDeferTriggers(modifier, triggers, onOps, whenOps, unit, deferXref) {
     if (triggers.idle !== undefined) {
         const deferOnOp = createDeferOnOp(deferXref, { kind: DeferTriggerKind.Idle }, modifier, triggers.idle.sourceSpan);
@@ -26148,13 +26170,11 @@ class BindingParser {
     _interpolationConfig;
     _schemaRegistry;
     errors;
-    _allowInvalidAssignmentEvents;
-    constructor(_exprParser, _interpolationConfig, _schemaRegistry, errors, _allowInvalidAssignmentEvents = false) {
+    constructor(_exprParser, _interpolationConfig, _schemaRegistry, errors) {
         this._exprParser = _exprParser;
         this._interpolationConfig = _interpolationConfig;
         this._schemaRegistry = _schemaRegistry;
         this.errors = errors;
-        this._allowInvalidAssignmentEvents = _allowInvalidAssignmentEvents;
     }
     get interpolationConfig() {
         return this._interpolationConfig;
@@ -26503,12 +26523,12 @@ class BindingParser {
             return this._exprParser.wrapLiteralPrimitive('ERROR', sourceInfo, absoluteOffset);
         }
     }
-    _reportError(message, sourceSpan, level = ParseErrorLevel.ERROR) {
-        this.errors.push(new ParseError(sourceSpan, message, level));
+    _reportError(message, sourceSpan, level = ParseErrorLevel.ERROR, relatedError) {
+        this.errors.push(new ParseError(sourceSpan, message, level, relatedError));
     }
     _reportExpressionParserErrors(errors, sourceSpan) {
         for (const error of errors) {
-            this._reportError(error.message, sourceSpan);
+            this._reportError(error.message, sourceSpan, undefined, error);
         }
     }
     /**
@@ -26538,16 +26558,7 @@ class BindingParser {
         if (ast instanceof PropertyRead || ast instanceof KeyedRead) {
             return true;
         }
-        // TODO(crisbeto): this logic is only here to support the automated migration away
-        // from invalid bindings. It should be removed once the migration is deleted.
-        if (!this._allowInvalidAssignmentEvents) {
-            return false;
-        }
-        if (ast instanceof Binary) {
-            return ((ast.operation === '&&' || ast.operation === '||' || ast.operation === '??') &&
-                (ast.right instanceof PropertyRead || ast.right instanceof KeyedRead));
-        }
-        return ast instanceof Conditional || ast instanceof PrefixNot;
+        return false;
     }
 }
 function isAnimationLabel(name) {
@@ -28171,8 +28182,8 @@ const LEADING_TRIVIA_CHARS = [' ', '\n', '\r', '\t'];
  * @param options options to modify how the template is parsed
  */
 function parseTemplate(template, templateUrl, options = {}) {
-    const { interpolationConfig, preserveWhitespaces, enableI18nLegacyMessageIdFormat, allowInvalidAssignmentEvents, } = options;
-    const bindingParser = makeBindingParser(interpolationConfig, allowInvalidAssignmentEvents);
+    const { interpolationConfig, preserveWhitespaces, enableI18nLegacyMessageIdFormat } = options;
+    const bindingParser = makeBindingParser(interpolationConfig);
     const htmlParser = new HtmlParser();
     const parseResult = htmlParser.parse(template, templateUrl, {
         leadingTriviaChars: LEADING_TRIVIA_CHARS,
@@ -28278,8 +28289,8 @@ const elementRegistry = new DomElementSchemaRegistry();
 /**
  * Construct a `BindingParser` with a default configuration.
  */
-function makeBindingParser(interpolationConfig = DEFAULT_INTERPOLATION_CONFIG, allowInvalidAssignmentEvents = false) {
-    return new BindingParser(new Parser(new Lexer()), interpolationConfig, elementRegistry, [], allowInvalidAssignmentEvents);
+function makeBindingParser(interpolationConfig = DEFAULT_INTERPOLATION_CONFIG) {
+    return new BindingParser(new Parser(new Lexer()), interpolationConfig, elementRegistry, []);
 }
 
 const COMPONENT_VARIABLE = '%COMP%';
@@ -30310,7 +30321,7 @@ function publishFacade(global) {
  * @description
  * Entry point for all public APIs of the compiler package.
  */
-new Version('19.0.0');
+new Version('19.0.2');
 
 const _I18N_ATTR = 'i18n';
 const _I18N_ATTR_PREFIX = 'i18n-';
@@ -31718,7 +31729,7 @@ class NodeJSPathManipulation {
 // G3-ESM-MARKER: G3 uses CommonJS, but externally everything in ESM.
 // CommonJS/ESM interop for determining the current file name and containing dir.
 const isCommonJS = typeof __filename !== 'undefined';
-const currentFileUrl = isCommonJS ? null : (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.tagName.toUpperCase() === 'SCRIPT' && document.currentScript.src || new URL('checker-e3da3b0a.js', document.baseURI).href));
+const currentFileUrl = isCommonJS ? null : (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.tagName.toUpperCase() === 'SCRIPT' && document.currentScript.src || new URL('checker-a00b735e.js', document.baseURI).href));
 const currentFileName = isCommonJS ? __filename : url.fileURLToPath(currentFileUrl);
 /**
  * A wrapper around the Node.js file-system that supports readonly operations and path manipulation.
@@ -32327,7 +32338,7 @@ const patchedReferencedAliasesSymbol = Symbol('patchedReferencedAliases');
  * results in a slow-down due to the type checker being involved multiple times. The CLI worked
  * around this import preserving issue by having another complex post-process step that detects and
  * elides unused imports. Note that these unused imports could cause unused chunks being generated
- * by Webpack if the application or library is not marked as side-effect free.
+ * by webpack if the application or library is not marked as side-effect free.
  *
  * This is not ideal though, as we basically re-implement the complex import usage resolution
  * from TypeScript. We can do better by letting TypeScript do the import eliding, but providing
@@ -38505,6 +38516,9 @@ class SourceMap {
 		if (typeof properties.x_google_ignoreList !== 'undefined') {
 			this.x_google_ignoreList = properties.x_google_ignoreList;
 		}
+		if (typeof properties.debugId !== 'undefined') {
+			this.debugId = properties.debugId;
+		}
 	}
 
 	toString() {
@@ -45799,6 +45813,7 @@ exports.DEFAULT_INTERPOLATION_CONFIG = DEFAULT_INTERPOLATION_CONFIG;
 exports.DYNAMIC_TYPE = DYNAMIC_TYPE;
 exports.Declaration = Declaration;
 exports.DeclareFunctionStmt = DeclareFunctionStmt;
+exports.DeclareVarStmt = DeclareVarStmt;
 exports.DefaultImportTracker = DefaultImportTracker;
 exports.DefinitionMap = DefinitionMap;
 exports.DomElementSchemaRegistry = DomElementSchemaRegistry;
@@ -45840,6 +45855,7 @@ exports.ParseLocation = ParseLocation;
 exports.ParseSourceFile = ParseSourceFile;
 exports.ParseSourceSpan = ParseSourceSpan;
 exports.Parser = Parser$1;
+exports.ParserError = ParserError;
 exports.Placeholder = Placeholder;
 exports.PropertyRead = PropertyRead;
 exports.PropertyWrite = PropertyWrite;

package/schematics/bundles/{combine_units-2adebceb.js → combine_units-60865867.js}

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v19.0.0
+ * @license Angular v19.0.2
  * (c) 2010-2024 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -10,8 +10,8 @@ var core = require('@angular-devkit/core');
 var posixPath = require('node:path/posix');
 var os = require('os');
 var ts = require('typescript');
-var checker = require('./checker-e3da3b0a.js');
-var program = require('./program-f984ab63.js');
+var checker = require('./checker-a00b735e.js');
+var program = require('./program-a6be5d4a.js');
 require('path');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -435,6 +435,8 @@ const defaultMigrationTsOptions = {
     skipLibCheck: true,
     skipDefaultLibCheck: true,
     noEmit: true,
+    // Does not apply to g3 and externally is enforced when the app is built by the compiler.
+    disableTypeScriptVersionCheck: true,
 };
 /**
  * Creates an instance of a TypeScript program for the given project.

package/schematics/bundles/{compiler_host-d642e87e.js → compiler_host-3e96c3f7.js}

@@ -1,13 +1,13 @@
 'use strict';
 /**
- * @license Angular v19.0.0
+ * @license Angular v19.0.2
  * (c) 2010-2024 Google LLC. https://angular.io/
  * License: MIT
  */
 'use strict';
 
 var ts = require('typescript');
-var checker = require('./checker-e3da3b0a.js');
+var checker = require('./checker-a00b735e.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
+ * @license Angular v19.0.2
  * (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-d642e87e.js');
-var checker = require('./checker-e3da3b0a.js');
+var compiler_host = require('./compiler_host-3e96c3f7.js');
+var checker = require('./checker-a00b735e.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
+ * @license Angular v19.0.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-d642e87e.js');
+var project_tsconfig_paths = require('./project_tsconfig_paths-6c9cde78.js');
+var compiler_host = require('./compiler_host-3e96c3f7.js');
 var ts = require('typescript');
-var imports = require('./imports-4ac08251.js');
+var imports = require('./imports-44987700.js');
 require('@angular-devkit/core');
-require('./checker-e3da3b0a.js');
+require('./checker-a00b735e.js');
 require('os');
 require('fs');
 require('module');

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

@@ -1,6 +1,6 @@
 'use strict';
 /**
- * @license Angular v19.0.0
+ * @license Angular v19.0.2
  * (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
+ * @license Angular v19.0.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-d642e87e.js');
+var compiler_host = require('./compiler_host-3e96c3f7.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-e3da3b0a.js');
+var nodes = require('./nodes-b12e919a.js');
+var imports = require('./imports-44987700.js');
+var leading_space = require('./leading_space-6e7a8ec6.js');
+require('./checker-a00b735e.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,
@@ -146,13 +178,13 @@ function getConstructorUnusedParameters(declaration, localTypeChecker, removedSt
     if (!declaration.body) {
         return topLevelParameters;
     }
-    declaration.body.forEachChild(function walk(node) {
+    const analyze = (node) => {
         // Don't descend into statements that were removed already.
         if (ts__default["default"].isStatement(node) && removedStatements.has(node)) {
             return;
         }
         if (!ts__default["default"].isIdentifier(node) || !topLevelParameterNames.has(node.text)) {
-            node.forEachChild(walk);
+            node.forEachChild(analyze);
             return;
         }
         // Don't consider `this.<name>` accesses as being references to
@@ -171,7 +203,13 @@ function getConstructorUnusedParameters(declaration, localTypeChecker, removedSt
                 }
             }
         });
+    };
+    declaration.parameters.forEach((param) => {
+        if (param.initializer) {
+            analyze(param.initializer);
+        }
     });
+    declaration.body.forEachChild(analyze);
     for (const param of topLevelParameters) {
         if (!accessedTopLevelParameters.has(param)) {
             unusedParams.add(param);
@@ -210,6 +248,41 @@ function getSuperParameters(declaration, superCall, localTypeChecker) {
     });
     return usedParams;
 }
+/**
+ * Determines if a specific parameter has references to other parameters.
+ * @param param Parameter to check.
+ * @param allParameters All parameters of the containing function.
+ * @param localTypeChecker Type checker scoped to the current file.
+ */
+function parameterReferencesOtherParameters(param, allParameters, localTypeChecker) {
+    // A parameter can only reference other parameters through its initializer.
+    if (!param.initializer || allParameters.length < 2) {
+        return false;
+    }
+    const paramNames = new Set();
+    for (const current of allParameters) {
+        if (current !== param && ts__default["default"].isIdentifier(current.name)) {
+            paramNames.add(current.name.text);
+        }
+    }
+    let result = false;
+    const analyze = (node) => {
+        if (ts__default["default"].isIdentifier(node) && paramNames.has(node.text) && !isAccessedViaThis(node)) {
+            const symbol = localTypeChecker.getSymbolAtLocation(node);
+            const referencesOtherParam = symbol?.declarations?.some((decl) => {
+                return allParameters.includes(decl);
+            });
+            if (referencesOtherParam) {
+                result = true;
+            }
+        }
+        if (!result) {
+            node.forEachChild(analyze);
+        }
+    };
+    analyze(param.initializer);
+    return result;
+}
 /** Checks whether a parameter node declares a property on its class. */
 function parameterDeclaresProperty(node) {
     return !!node.modifiers?.some(({ kind }) => kind === ts__default["default"].SyntaxKind.PublicKeyword ||
@@ -587,7 +660,8 @@ function migrateClass(node, constructor, superCall, options, memberIndentation,
     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, prependToClass, afterSuper);
+        const usesOtherParams = parameterReferencesOtherParameters(param, constructor.parameters, localTypeChecker);
+        migrateParameter(param, options, localTypeChecker, printer, tracker, superCall, usedInSuper, usedInConstructor, usesOtherParams, 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.
@@ -597,7 +671,7 @@ function migrateClass(node, constructor, superCall, options, memberIndentation,
             tracker.removeNode(member, true);
         }
     }
-    if (canRemoveConstructor(options, constructor, removedStatementCount, superCall)) {
+    if (canRemoveConstructor(options, constructor, removedStatementCount, prependToConstructor, superCall)) {
         // Drop the constructor if it was empty.
         removedMembers.add(constructor);
         tracker.removeNode(constructor, true);
@@ -607,7 +681,15 @@ function migrateClass(node, constructor, superCall, options, memberIndentation,
         // We always do this no matter what is passed into `backwardsCompatibleConstructors`.
         stripConstructorParameters(constructor, tracker);
         if (prependToConstructor.length > 0) {
-            tracker.insertText(sourceFile, (firstConstructorStatement || innerReference).getFullStart(), `\n${prependToConstructor.join('\n')}\n`);
+            if (firstConstructorStatement ||
+                (innerReference !== constructor &&
+                    innerReference.getStart() >= constructor.getStart() &&
+                    innerReference.getEnd() <= constructor.getEnd())) {
+                tracker.insertText(sourceFile, (firstConstructorStatement || innerReference).getFullStart(), `\n${prependToConstructor.join('\n')}\n`);
+            }
+            else {
+                tracker.insertText(sourceFile, constructor.body.getStart() + 1, `\n${prependToConstructor.map((p) => innerIndentation + p).join('\n')}\n${innerIndentation}`);
+            }
         }
     }
     if (afterSuper.length > 0 && superCall !== null) {
@@ -616,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];
@@ -638,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.
@@ -662,7 +749,7 @@ function migrateClass(node, constructor, superCall, options, memberIndentation,
  * @param propsToAdd Properties to be added to the class.
  * @param afterSuper Statements to be added after the `super` call.
  */
-function migrateParameter(node, options, localTypeChecker, printer, tracker, superCall, usedInSuper, usedInConstructor, memberIndentation, innerIndentation, prependToConstructor, propsToAdd, afterSuper) {
+function migrateParameter(node, options, localTypeChecker, printer, tracker, superCall, usedInSuper, usedInConstructor, usesOtherParams, memberIndentation, innerIndentation, prependToConstructor, propsToAdd, afterSuper) {
     if (!ts__default["default"].isIdentifier(node.name)) {
         return;
     }
@@ -671,6 +758,9 @@ function migrateParameter(node, options, localTypeChecker, printer, tracker, sup
     const declaresProp = parameterDeclaresProperty(node);
     // If the parameter declares a property, we need to declare it (e.g. `private foo: Foo`).
     if (declaresProp) {
+        // We can't initialize the property if it's referenced within a `super` call or  it references
+        // other parameters. See the logic further below for the initialization.
+        const canInitialize = !usedInSuper && !usesOtherParams;
         const prop = ts__default["default"].factory.createPropertyDeclaration(cloneModifiers(node.modifiers?.filter((modifier) => {
             // Strip out the DI decorators, as well as `public` which is redundant.
             return !ts__default["default"].isDecorator(modifier) && modifier.kind !== ts__default["default"].SyntaxKind.PublicKeyword;
@@ -678,10 +768,7 @@ function migrateParameter(node, options, localTypeChecker, printer, tracker, sup
         // Don't add the question token to private properties since it won't affect interface implementation.
         node.modifiers?.some((modifier) => modifier.kind === ts__default["default"].SyntaxKind.PrivateKeyword)
             ? undefined
-            : node.questionToken, 
-        // We can't initialize the property if it's referenced within a `super` call.
-        // See the logic further below for the initialization.
-        usedInSuper ? node.type : undefined, usedInSuper ? undefined : ts__default["default"].factory.createIdentifier(PLACEHOLDER));
+            : node.questionToken, canInitialize ? undefined : node.type, canInitialize ? ts__default["default"].factory.createIdentifier(PLACEHOLDER) : undefined);
         propsToAdd.push(memberIndentation +
             replaceNodePlaceholder(node.getSourceFile(), prop, replacementCall, printer));
     }
@@ -714,6 +801,15 @@ function migrateParameter(node, options, localTypeChecker, printer, tracker, sup
             prependToConstructor.push(`${innerIndentation}const ${name} = ${replacementCall};`);
         }
     }
+    else if (usesOtherParams && declaresProp) {
+        const toAdd = `${innerIndentation}this.${name} = ${replacementCall};`;
+        if (superCall === null) {
+            prependToConstructor.push(toAdd);
+        }
+        else {
+            afterSuper.push(toAdd);
+        }
+    }
 }
 /**
  * Creates a replacement `inject` call from a function parameter.
@@ -800,6 +896,10 @@ function createInjectReplacementCall(param, options, localTypeChecker, printer,
             expression = ts__default["default"].factory.createNonNullExpression(expression);
         }
     }
+    // If the parameter is initialized, add the initializer as a fallback.
+    if (param.initializer) {
+        expression = ts__default["default"].factory.createBinaryExpression(expression, ts__default["default"].SyntaxKind.QuestionQuestionToken, param.initializer);
+    }
     return replaceNodePlaceholder(param.getSourceFile(), expression, injectedType, printer);
 }
 /**
@@ -839,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];
     }
@@ -869,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.
@@ -956,10 +1040,11 @@ function cloneName(node) {
  * @param options Options used to configure the migration.
  * @param constructor Node representing the constructor.
  * @param removedStatementCount Number of statements that were removed by the migration.
+ * @param prependToConstructor Statements that should be prepended to the constructor.
  * @param superCall Node representing the `super()` call within the constructor.
  */
-function canRemoveConstructor(options, constructor, removedStatementCount, superCall) {
-    if (options.backwardsCompatibleConstructors) {
+function canRemoveConstructor(options, constructor, removedStatementCount, prependToConstructor, superCall) {
+    if (options.backwardsCompatibleConstructors || prependToConstructor.length > 0) {
         return false;
     }
     const statementCount = constructor.body
@@ -1039,6 +1124,7 @@ function applyInternalOnlyChanges(node, constructor, localTypeChecker, tracker,
     result.toHoist.forEach((decl) => {
         prependToClass.push(memberIndentation + printer.printNode(ts__default["default"].EmitHint.Unspecified, decl, decl.getSourceFile()));
         tracker.removeNode(decl, true);
+        removedMembers.add(decl);
     });
     // If we added any hoisted properties, separate them visually with a new line.
     if (prependToClass.length > 0) {