@angular/core 18.0.0-next.4 → 18.0.0-next.5

package/schematics/migrations/invalid-two-way-bindings/bundle.js

@@ -6411,11 +6411,10 @@ function createAdvanceOp(delta, sourceSpan) {
     sourceSpan
   }, NEW_OP);
 }
-function createConditionalOp(target, targetSlot, test, conditions, sourceSpan) {
+function createConditionalOp(target, test, conditions, sourceSpan) {
   return __spreadValues(__spreadValues(__spreadValues({
     kind: OpKind.Conditional,
     target,
-    targetSlot,
     test,
     conditions,
     processed: null,
@@ -16637,19 +16636,7 @@ function pipeBindV(slot, varOffset, args) {
   ]);
 }
 function textInterpolate(strings, expressions, sourceSpan) {
-  if (strings.length < 1 || expressions.length !== strings.length - 1) {
-    throw new Error(`AssertionError: expected specific shape of args for strings/expressions in interpolation`);
-  }
-  const interpolationArgs = [];
-  if (expressions.length === 1 && strings[0] === "" && strings[1] === "") {
-    interpolationArgs.push(expressions[0]);
-  } else {
-    let idx;
-    for (idx = 0; idx < expressions.length; idx++) {
-      interpolationArgs.push(literal(strings[idx]), expressions[idx]);
-    }
-    interpolationArgs.push(literal(strings[idx]));
-  }
+  const interpolationArgs = collateInterpolationArgs(strings, expressions);
   return callVariadicInstruction(TEXT_INTERPOLATE_CONFIG, [], interpolationArgs, [], sourceSpan);
 }
 function i18nExp(expr, sourceSpan) {
@@ -16726,8 +16713,8 @@ function call(instruction, args, sourceSpan) {
   const expr = importExpr(instruction).callFn(args, sourceSpan);
   return createStatementOp(new ExpressionStatement(expr, sourceSpan));
 }
-function conditional(slot, condition, contextValue, sourceSpan) {
-  const args = [literal(slot), condition];
+function conditional(condition, contextValue, sourceSpan) {
+  const args = [condition];
   if (contextValue !== null) {
     args.push(contextValue);
   }
@@ -17153,10 +17140,7 @@ function reifyUpdateOperations(_unit, ops) {
         if (op.processed === null) {
           throw new Error(`Conditional test was not set.`);
         }
-        if (op.targetSlot.slot === null) {
-          throw new Error(`Conditional slot was not set.`);
-        }
-        OpList.replace(op, conditional(op.targetSlot.slot, op.processed, op.contextValue, op.sourceSpan));
+        OpList.replace(op, conditional(op.processed, op.contextValue, op.sourceSpan));
         break;
       case OpKind.Repeater:
         OpList.replace(op, repeater(op.collection, op.sourceSpan));
@@ -17738,49 +17722,22 @@ function transformTwoWayBindingSet(job) {
     for (const op of unit.create) {
       if (op.kind === OpKind.TwoWayListener) {
         transformExpressionsInOp(op, (expr) => {
-          if (expr instanceof TwoWayBindingSetExpr) {
-            return wrapAction(expr.target, expr.value);
+          if (!(expr instanceof TwoWayBindingSetExpr)) {
+            return expr;
           }
-          return expr;
+          const { target, value } = expr;
+          if (target instanceof ReadPropExpr || target instanceof ReadKeyExpr) {
+            return twoWayBindingSet(target, value).or(target.set(value));
+          }
+          if (target instanceof ReadVariableExpr) {
+            return twoWayBindingSet(target, value);
+          }
+          throw new Error(`Unsupported expression in two-way action binding.`);
         }, VisitorContextFlag.InChildOperation);
       }
     }
   }
 }
-function wrapSetOperation(target, value) {
-  if (target instanceof ReadVariableExpr) {
-    return twoWayBindingSet(target, value);
-  }
-  return twoWayBindingSet(target, value).or(target.set(value));
-}
-function isReadExpression(value) {
-  return value instanceof ReadPropExpr || value instanceof ReadKeyExpr || value instanceof ReadVariableExpr;
-}
-function wrapAction(target, value) {
-  if (isReadExpression(target)) {
-    return wrapSetOperation(target, value);
-  }
-  if (target instanceof BinaryOperatorExpr && isReadExpression(target.rhs)) {
-    return new BinaryOperatorExpr(target.operator, target.lhs, wrapSetOperation(target.rhs, value));
-  }
-  if (target instanceof ConditionalExpr && isReadExpression(target.falseCase)) {
-    return new ConditionalExpr(target.condition, target.trueCase, wrapSetOperation(target.falseCase, value));
-  }
-  if (target instanceof NotExpr) {
-    let expr = target.condition;
-    while (true) {
-      if (expr instanceof NotExpr) {
-        expr = expr.condition;
-      } else {
-        if (isReadExpression(expr)) {
-          return wrapSetOperation(expr, value);
-        }
-        break;
-      }
-    }
-  }
-  throw new Error(`Unsupported expression in two-way action binding.`);
-}
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/save_restore_view.mjs
 function saveAndRestoreView(job) {
@@ -18791,7 +18748,6 @@ function ingestBoundText(unit, text2, icuPlaceholder) {
 function ingestIfBlock(unit, ifBlock) {
   var _a2;
   let firstXref = null;
-  let firstSlotHandle = null;
   let conditions = [];
   for (let i = 0; i < ifBlock.branches.length; i++) {
     const ifCase = ifBlock.branches[i];
@@ -18811,15 +18767,13 @@ function ingestIfBlock(unit, ifBlock) {
     unit.create.push(templateOp);
     if (firstXref === null) {
       firstXref = cView.xref;
-      firstSlotHandle = templateOp.handle;
     }
     const caseExpr = ifCase.expression ? convertAst(ifCase.expression, unit.job, null) : null;
     const conditionalCaseExpr = new ConditionalCaseExpr(caseExpr, templateOp.xref, templateOp.handle, ifCase.expressionAlias);
     conditions.push(conditionalCaseExpr);
     ingestNodes(cView, ifCase.children);
   }
-  const conditional2 = createConditionalOp(firstXref, firstSlotHandle, null, conditions, ifBlock.sourceSpan);
-  unit.update.push(conditional2);
+  unit.update.push(createConditionalOp(firstXref, null, conditions, ifBlock.sourceSpan));
 }
 function ingestSwitchBlock(unit, switchBlock) {
   var _a2;
@@ -18827,7 +18781,6 @@ function ingestSwitchBlock(unit, switchBlock) {
     return;
   }
   let firstXref = null;
-  let firstSlotHandle = null;
   let conditions = [];
   for (const switchCase of switchBlock.cases) {
     const cView = unit.job.allocateView(unit.xref);
@@ -18843,15 +18796,13 @@ function ingestSwitchBlock(unit, switchBlock) {
     unit.create.push(templateOp);
     if (firstXref === null) {
       firstXref = cView.xref;
-      firstSlotHandle = templateOp.handle;
     }
     const caseExpr = switchCase.expression ? convertAst(switchCase.expression, unit.job, switchBlock.startSourceSpan) : null;
     const conditionalCaseExpr = new ConditionalCaseExpr(caseExpr, templateOp.xref, templateOp.handle);
     conditions.push(conditionalCaseExpr);
     ingestNodes(cView, switchCase.children);
   }
-  const conditional2 = createConditionalOp(firstXref, firstSlotHandle, convertAst(switchBlock.expression, unit.job, null), conditions, switchBlock.sourceSpan);
-  unit.update.push(conditional2);
+  unit.update.push(createConditionalOp(firstXref, convertAst(switchBlock.expression, unit.job, null), conditions, switchBlock.sourceSpan));
 }
 function ingestDeferView(unit, suffix, i18nMeta, children, sourceSpan) {
   if (i18nMeta !== void 0 && !(i18nMeta instanceof BlockPlaceholder)) {
@@ -19546,11 +19497,12 @@ var STYLE_PREFIX = "style";
 var TEMPLATE_ATTR_PREFIX = "*";
 var ANIMATE_PROP_PREFIX = "animate-";
 var BindingParser = class {
-  constructor(_exprParser, _interpolationConfig, _schemaRegistry, errors) {
+  constructor(_exprParser, _interpolationConfig, _schemaRegistry, errors, _allowInvalidAssignmentEvents = false) {
     this._exprParser = _exprParser;
     this._interpolationConfig = _interpolationConfig;
     this._schemaRegistry = _schemaRegistry;
     this.errors = errors;
+    this._allowInvalidAssignmentEvents = _allowInvalidAssignmentEvents;
   }
   get interpolationConfig() {
     return this._interpolationConfig;
@@ -19854,6 +19806,9 @@ var BindingParser = class {
     if (ast instanceof PropertyRead || ast instanceof KeyedRead) {
       return true;
     }
+    if (!this._allowInvalidAssignmentEvents) {
+      return false;
+    }
     if (ast instanceof Binary) {
       return (ast.operation === "&&" || ast.operation === "||" || ast.operation === "??") && (ast.right instanceof PropertyRead || ast.right instanceof KeyedRead);
     }
@@ -21099,8 +21054,8 @@ function textContents(node) {
 var LEADING_TRIVIA_CHARS = [" ", "\n", "\r", "	"];
 function parseTemplate(template2, templateUrl, options = {}) {
   var _a2;
-  const { interpolationConfig, preserveWhitespaces, enableI18nLegacyMessageIdFormat } = options;
-  const bindingParser = makeBindingParser(interpolationConfig);
+  const { interpolationConfig, preserveWhitespaces, enableI18nLegacyMessageIdFormat, allowInvalidAssignmentEvents } = options;
+  const bindingParser = makeBindingParser(interpolationConfig, allowInvalidAssignmentEvents);
   const htmlParser = new HtmlParser();
   const parseResult = htmlParser.parse(template2, templateUrl, __spreadProps(__spreadValues({
     leadingTriviaChars: LEADING_TRIVIA_CHARS
@@ -21165,8 +21120,8 @@ function parseTemplate(template2, templateUrl, options = {}) {
   return parsedTemplate;
 }
 var elementRegistry = new DomElementSchemaRegistry();
-function makeBindingParser(interpolationConfig = DEFAULT_INTERPOLATION_CONFIG) {
-  return new BindingParser(new Parser(new Lexer()), interpolationConfig, elementRegistry, []);
+function makeBindingParser(interpolationConfig = DEFAULT_INTERPOLATION_CONFIG, allowInvalidAssignmentEvents = false) {
+  return new BindingParser(new Parser(new Lexer()), interpolationConfig, elementRegistry, [], allowInvalidAssignmentEvents);
 }
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/render3/view/compiler.mjs
@@ -22730,7 +22685,7 @@ function publishFacade(global) {
 }
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/version.mjs
-var VERSION2 = new Version("18.0.0-next.4");
+var VERSION2 = new Version("18.0.0-next.5");
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/i18n/extractor_merger.mjs
 var _VisitorMode;
@@ -22782,7 +22737,7 @@ function migrateTemplate(template2) {
   }
   let rootNodes = null;
   try {
-    const parsed = parseTemplate(template2, "");
+    const parsed = parseTemplate(template2, "", { allowInvalidAssignmentEvents: true });
     if (parsed.errors === null) {
       rootNodes = parsed.nodes;
     }
@@ -22821,9 +22776,9 @@ function migrateTwoWayEvent(value, binding, printer) {
     return null;
   }
   let migrated = null;
-  if (import_typescript4.default.isBinaryExpression(expression) && isReadExpression2(expression.right)) {
+  if (import_typescript4.default.isBinaryExpression(expression) && isReadExpression(expression.right)) {
     migrated = import_typescript4.default.factory.updateBinaryExpression(expression, expression.left, expression.operatorToken, wrapInEventAssignment(expression.right));
-  } else if (import_typescript4.default.isConditionalExpression(expression) && isReadExpression2(expression.whenFalse)) {
+  } else if (import_typescript4.default.isConditionalExpression(expression) && isReadExpression(expression.whenFalse)) {
     migrated = import_typescript4.default.factory.updateConditionalExpression(expression, expression.condition, expression.questionToken, expression.whenTrue, expression.colonToken, wrapInEventAssignment(expression.whenFalse));
   } else if (isPrefixNot(expression)) {
     let innerExpression = expression.operand;
@@ -22831,7 +22786,7 @@ function migrateTwoWayEvent(value, binding, printer) {
       if (isPrefixNot(innerExpression)) {
         innerExpression = innerExpression.operand;
       } else {
-        if (isReadExpression2(innerExpression)) {
+        if (isReadExpression(innerExpression)) {
           migrated = wrapInEventAssignment(innerExpression);
         }
         break;
@@ -22847,7 +22802,7 @@ function migrateTwoWayEvent(value, binding, printer) {
 function wrapInEventAssignment(node) {
   return import_typescript4.default.factory.createBinaryExpression(node, import_typescript4.default.factory.createToken(import_typescript4.default.SyntaxKind.EqualsToken), import_typescript4.default.factory.createIdentifier("$event"));
 }
-function isReadExpression2(node) {
+function isReadExpression(node) {
   return import_typescript4.default.isIdentifier(node) || import_typescript4.default.isPropertyAccessExpression(node) || import_typescript4.default.isElementAccessExpression(node);
 }
 function isPrefixNot(node) {