@angular/core 18.1.0-next.4 → 18.1.0

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

@@ -5692,7 +5692,7 @@ var scopedAtRuleIdentifiers = [
 ];
 var ShadowCss = class {
   constructor() {
-    this._animationDeclarationKeyframesRe = /(^|\s+)(?:(?:(['"])((?:\\\\|\\\2|(?!\2).)+)\2)|(-?[A-Za-z][\w\-]*))(?=[,\s]|$)/g;
+    this._animationDeclarationKeyframesRe = /(^|\s+|,)(?:(?:(['"])((?:\\\\|\\\2|(?!\2).)+)\2)|(-?[A-Za-z][\w\-]*))(?=[,\s]|$)/g;
   }
   shimCssText(cssText, selector, hostSelector = "") {
     const comments = [];
@@ -5735,7 +5735,7 @@ var ShadowCss = class {
     });
   }
   _scopeAnimationRule(rule, scopeSelector, unscopedKeyframesSet) {
-    let content = rule.content.replace(/((?:^|\s+|;)(?:-webkit-)?animation(?:\s*):(?:\s*))([^;]+)/g, (_, start, animationDeclarations) => start + animationDeclarations.replace(this._animationDeclarationKeyframesRe, (original, leadingSpaces, quote = "", quotedName, nonQuotedName) => {
+    let content = rule.content.replace(/((?:^|\s+|;)(?:-webkit-)?animation\s*:\s*),*([^;]+)/g, (_, start, animationDeclarations) => start + animationDeclarations.replace(this._animationDeclarationKeyframesRe, (original, leadingSpaces, quote = "", quotedName, nonQuotedName) => {
       if (quotedName) {
         return `${leadingSpaces}${this._scopeAnimationKeyframe(`${quote}${quotedName}${quote}`, scopeSelector, unscopedKeyframesSet)}`;
       } else {
@@ -9424,7 +9424,8 @@ function getScopeForView(view, parent) {
     scope.contextVariables.set(identifier, {
       kind: SemanticVariableKind.Identifier,
       name: null,
-      identifier
+      identifier,
+      local: false
     });
   }
   for (const op of view.create) {
@@ -9443,7 +9444,8 @@ function getScopeForView(view, parent) {
             variable: {
               kind: SemanticVariableKind.Identifier,
               name: null,
-              identifier: op.localRefs[offset].name
+              identifier: op.localRefs[offset].name,
+              local: false
             }
           });
         }
@@ -9455,7 +9457,8 @@ function getScopeForView(view, parent) {
           variable: {
             kind: SemanticVariableKind.Identifier,
             name: null,
-            identifier: op.declaredName
+            identifier: op.declaredName,
+            local: false
           }
         });
         break;
@@ -14255,7 +14258,7 @@ var _Tokenizer = class {
     const nameCursor = this._cursor.clone();
     let allowDigit = false;
     this._attemptCharCodeUntilFn((code) => {
-      if (isAsciiLetter(code) || code === $_ || allowDigit && isDigit(code)) {
+      if (isAsciiLetter(code) || code == $$ || code === $_ || allowDigit && isDigit(code)) {
         allowDigit = true;
         return false;
       }
@@ -17998,11 +18001,22 @@ function resolveNames(job) {
 }
 function processLexicalScope2(unit, ops, savedView) {
   const scope = /* @__PURE__ */ new Map();
+  const localDefinitions = /* @__PURE__ */ new Map();
   for (const op of ops) {
     switch (op.kind) {
       case OpKind.Variable:
         switch (op.variable.kind) {
           case SemanticVariableKind.Identifier:
+            if (op.variable.local) {
+              if (localDefinitions.has(op.variable.identifier)) {
+                continue;
+              }
+              localDefinitions.set(op.variable.identifier, op.xref);
+            } else if (scope.has(op.variable.identifier)) {
+              continue;
+            }
+            scope.set(op.variable.identifier, op.xref);
+            break;
           case SemanticVariableKind.Alias:
             if (scope.has(op.variable.identifier)) {
               continue;
@@ -18029,7 +18043,9 @@ function processLexicalScope2(unit, ops, savedView) {
     }
     transformExpressionsInOp(op, (expr) => {
       if (expr instanceof LexicalReadExpr) {
-        if (scope.has(expr.name)) {
+        if (localDefinitions.has(expr.name)) {
+          return new ReadVariableExpr(localDefinitions.get(expr.name));
+        } else if (scope.has(expr.name)) {
           return new ReadVariableExpr(scope.get(expr.name));
         } else {
           return new ReadPropExpr(new ContextExpr(unit.job.root.xref), expr.name);
@@ -18850,7 +18866,8 @@ function generateLocalLetReferences(job) {
       const variable2 = {
         kind: SemanticVariableKind.Identifier,
         name: null,
-        identifier: op.declaredName
+        identifier: op.declaredName,
+        local: true
       };
       OpList.replace(op, createVariableOp(job.allocateXrefId(), variable2, new StoreLetExpr(op.target, op.value, op.sourceSpan), VariableFlags.None));
     }
@@ -23260,7 +23277,7 @@ function publishFacade(global) {
 }
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/version.mjs
-var VERSION2 = new Version("18.1.0-next.4");
+var VERSION2 = new Version("18.1.0");
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/i18n/extractor_merger.mjs
 var _VisitorMode;
@@ -23392,8 +23409,17 @@ var ElementToMigrate = class {
     this.forAttrs = forAttrs;
     this.aliasAttrs = aliasAttrs;
   }
+  normalizeConditionString(value) {
+    value = this.insertSemicolon(value, value.indexOf(" else "));
+    value = this.insertSemicolon(value, value.indexOf(" then "));
+    value = this.insertSemicolon(value, value.indexOf(" let "));
+    return value.replace(";;", ";");
+  }
+  insertSemicolon(str, ix) {
+    return ix > -1 ? `${str.slice(0, ix)};${str.slice(ix)}` : str;
+  }
   getCondition() {
-    const chunks = this.attr.value.split(";");
+    const chunks = this.normalizeConditionString(this.attr.value).split(";");
     let condition = chunks[0];
     const elseIx = condition.indexOf(" else ");
     const thenIx = condition.indexOf(" then ");