@angular/core 17.1.2 → 17.1.3

package/schematics/ng-generate/control-flow-migration/bundle.js

@@ -1752,6 +1752,7 @@ var ConstantPool = class {
     this.literals = /* @__PURE__ */ new Map();
     this.literalFactories = /* @__PURE__ */ new Map();
     this.sharedConstants = /* @__PURE__ */ new Map();
+    this._claimedNames = /* @__PURE__ */ new Map();
     this.nextNameIndex = 0;
   }
   getConstLiteral(literal2, forceShared) {
@@ -1844,8 +1845,12 @@ var ConstantPool = class {
     }
     return { literalFactory, literalFactoryArguments };
   }
-  uniqueName(prefix) {
-    return `${prefix}${this.nextNameIndex++}`;
+  uniqueName(name, alwaysIncludeSuffix = true) {
+    var _a2;
+    const count = (_a2 = this._claimedNames.get(name)) != null ? _a2 : 0;
+    const result = count === 0 && !alwaysIncludeSuffix ? `${name}` : `${name}${count}`;
+    this._claimedNames.set(name, count + 1);
+    return result;
   }
   freshName() {
     return this.uniqueName(CONSTANT_PREFIX);
@@ -9502,7 +9507,10 @@ function createDeferDepsFns(job) {
         const dependencies = [];
         for (const dep of op.metadata.deps) {
           if (dep.isDeferrable) {
-            const innerFn = arrowFn([new FnParam("m", DYNAMIC_TYPE)], variable("m").prop(dep.symbolName));
+            const innerFn = arrowFn(
+              [new FnParam("m", DYNAMIC_TYPE)],
+              variable("m").prop(dep.isDefaultImport ? "default" : dep.symbolName)
+            );
             const importExpr2 = new DynamicImportExpr(dep.importPath).prop("then").callFn([innerFn]);
             dependencies.push(importExpr2);
           } else {
@@ -16580,7 +16588,7 @@ function nameFunctionsAndVariables(job) {
 }
 function addNamesToView(unit, baseName, state, compatibility) {
   if (unit.fnName === null) {
-    unit.fnName = sanitizeIdentifier(`${baseName}_${unit.job.fnSuffix}`);
+    unit.fnName = unit.job.pool.uniqueName(sanitizeIdentifier(`${baseName}_${unit.job.fnSuffix}`), false);
   }
   const varNames = /* @__PURE__ */ new Map();
   for (const op of unit.ops()) {
@@ -19858,11 +19866,18 @@ function asMessage(i18nMeta) {
 function ingestElementBindings(unit, op, element2) {
   var _a2;
   let bindings = new Array();
+  let i18nAttributeBindingNames = /* @__PURE__ */ new Set();
   for (const attr of element2.attributes) {
     const securityContext = domSchema.securityContext(element2.name, attr.name, true);
     bindings.push(createBindingOp(op.xref, BindingKind.Attribute, attr.name, convertAstWithInterpolation(unit.job, attr.value, attr.i18n), null, securityContext, true, false, null, asMessage(attr.i18n), attr.sourceSpan));
+    if (attr.i18n) {
+      i18nAttributeBindingNames.add(attr.name);
+    }
   }
   for (const input of element2.inputs) {
+    if (i18nAttributeBindingNames.has(input.name)) {
+      console.error(`On component ${unit.job.componentName}, the binding ${input.name} is both an i18n attribute and a property. You may want to remove the property binding. This will become a compilation error in future versions of Angular.`);
+    }
     bindings.push(createBindingOp(op.xref, BINDING_KINDS.get(input.type), input.name, convertAstWithInterpolation(unit.job, astOf(input.value), input.i18n), input.unit, input.securityContext, false, false, null, (_a2 = asMessage(input.i18n)) != null ? _a2 : null, input.sourceSpan));
   }
   unit.create.push(bindings.filter((b) => (b == null ? void 0 : b.kind) === OpKind.ExtractedAttribute));
@@ -22651,7 +22666,7 @@ var TemplateDefinitionBuilder = class {
       }
     }
     const contextName = `${this.contextName}${contextNameSuffix}_${index}`;
-    const name = `${contextName}_Template`;
+    const name = this.constantPool.uniqueName(`${contextName}_Template`, false);
     const visitor = new TemplateDefinitionBuilder(this.constantPool, this._bindingScope, this.level + 1, contextName, this.i18n, index, name, this._namespace, this.fileBasedI18nSuffix, this.i18nUseExternalIds, this.deferBlocks, this.elementLocations, this.allDeferrableDepsFn, this._constants);
     this._nestedTemplateFns.push(() => {
       const templateFunctionExpr = visitor.buildTemplateFunction(children, variables, this._ngContentReservedSlots.length + this._ngContentSelectorsOffset, i18nMeta, variableAliases);
@@ -22860,7 +22875,10 @@ var TemplateDefinitionBuilder = class {
     const dependencyExp = [];
     for (const deferredDep of metadata.deps) {
       if (deferredDep.isDeferrable) {
-        const innerFn = arrowFn([new FnParam("m", DYNAMIC_TYPE)], variable("m").prop(deferredDep.symbolName));
+        const innerFn = arrowFn(
+          [new FnParam("m", DYNAMIC_TYPE)],
+          variable("m").prop(deferredDep.isDefaultImport ? "default" : deferredDep.symbolName)
+        );
         const importExpr2 = new DynamicImportExpr(deferredDep.importPath).prop("then").callFn([innerFn]);
         dependencyExp.push(importExpr2);
       } else {
@@ -23857,8 +23875,8 @@ function compileDirectiveFromMetadata(meta, constantPool, bindingParser) {
 }
 function createDeferredDepsFunction(constantPool, name, deps) {
   const dependencyExp = [];
-  for (const [symbolName, importPath] of deps) {
-    const innerFn = arrowFn([new FnParam("m", DYNAMIC_TYPE)], variable("m").prop(symbolName));
+  for (const [symbolName, { importPath, isDefaultImport }] of deps) {
+    const innerFn = arrowFn([new FnParam("m", DYNAMIC_TYPE)], variable("m").prop(isDefaultImport ? "default" : symbolName));
     const importExpr2 = new DynamicImportExpr(importPath).prop("then").callFn([innerFn]);
     dependencyExp.push(importExpr2);
   }
@@ -25604,7 +25622,7 @@ function publishFacade(global) {
 }
 
 // bazel-out/k8-fastbuild/bin/packages/compiler/src/version.mjs
-var VERSION2 = new Version("17.1.2");
+var VERSION2 = new Version("17.1.3");
 
 // bazel-out/k8-fastbuild/bin/packages/compiler/src/i18n/extractor_merger.mjs
 var _VisitorMode;