@vue/compiler-core 3.4.0-beta.3 → 3.4.0-rc.1

package/dist/compiler-core.cjs.js

@@ -1516,12 +1516,23 @@ function walkIdentifiers(root, onIdentifier, includeAll = false, parentStack = [
       } else if (node.type === "ObjectProperty" && parent.type === "ObjectPattern") {
         node.inPattern = true;
       } else if (isFunctionType(node)) {
-        walkFunctionParams(node, (id) => markScopeIdentifier(node, id, knownIds));
+        if (node.scopeIds) {
+          node.scopeIds.forEach((id) => markKnownIds(id, knownIds));
+        } else {
+          walkFunctionParams(
+            node,
+            (id) => markScopeIdentifier(node, id, knownIds)
+          );
+        }
       } else if (node.type === "BlockStatement") {
-        walkBlockDeclarations(
-          node,
-          (id) => markScopeIdentifier(node, id, knownIds)
-        );
+        if (node.scopeIds) {
+          node.scopeIds.forEach((id) => markKnownIds(id, knownIds));
+        } else {
+          walkBlockDeclarations(
+            node,
+            (id) => markScopeIdentifier(node, id, knownIds)
+          );
+        }
       }
     },
     leave(node, parent) {
@@ -1640,16 +1651,19 @@ function extractIdentifiers(param, nodes = []) {
   }
   return nodes;
 }
-function markScopeIdentifier(node, child, knownIds) {
-  const { name } = child;
-  if (node.scopeIds && node.scopeIds.has(name)) {
-    return;
-  }
+function markKnownIds(name, knownIds) {
   if (name in knownIds) {
     knownIds[name]++;
   } else {
     knownIds[name] = 1;
   }
+}
+function markScopeIdentifier(node, child, knownIds) {
+  const { name } = child;
+  if (node.scopeIds && node.scopeIds.has(name)) {
+    return;
+  }
+  markKnownIds(name, knownIds);
   (node.scopeIds || (node.scopeIds = /* @__PURE__ */ new Set())).add(name);
 }
 const isFunctionType = (node) => {
@@ -1854,7 +1868,7 @@ const isMemberExpressionNode = (path, context) => {
       plugins: context.expressionPlugins
     });
     ret = unwrapTSNode(ret);
-    return ret.type === "MemberExpression" || ret.type === "OptionalMemberExpression" || ret.type === "Identifier";
+    return ret.type === "MemberExpression" || ret.type === "OptionalMemberExpression" || ret.type === "Identifier" && ret.name !== "undefined";
   } catch (e) {
     return false;
   }
@@ -2139,12 +2153,6 @@ const tokenizer = new Tokenizer(stack, {
       loc: getLoc(start - 1, end),
       codegenNode: void 0
     };
-    if (tokenizer.inSFCRoot) {
-      currentOpenTag.innerLoc = getLoc(
-        end + fastForward(end) + 1,
-        end
-      );
-    }
   },
   onopentagend(end) {
     endOpenTag(end);
@@ -2472,6 +2480,9 @@ function getSlice(start, end) {
   return currentInput.slice(start, end);
 }
 function endOpenTag(end) {
+  if (tokenizer.inSFCRoot) {
+    currentOpenTag.innerLoc = getLoc(end + 1, end + 1);
+  }
   addNode(currentOpenTag);
   const { tag, ns } = currentOpenTag;
   if (ns === 0 && currentOptions.isPreTag(tag)) {
@@ -2505,7 +2516,7 @@ function onCloseTag(el, end, isImplied = false) {
   if (isImplied) {
     setLocEnd(el.loc, backTrack(end, 60));
   } else {
-    setLocEnd(el.loc, end + fastForward(end) + 1);
+    setLocEnd(el.loc, end + 1);
   }
   if (tokenizer.inSFCRoot) {
     if (el.children.length) {
@@ -2600,13 +2611,6 @@ function onCloseTag(el, end, isImplied = false) {
     }
   }
 }
-function fastForward(start, c) {
-  let offset = 0;
-  while (currentInput.charCodeAt(start + offset) !== 62 && start + offset < currentInput.length) {
-    offset++;
-  }
-  return offset;
-}
 function backTrack(index, c) {
   let i = index;
   while (currentInput.charCodeAt(i) !== c && i >= 0)

package/dist/compiler-core.cjs.prod.js

@@ -1512,12 +1512,23 @@ function walkIdentifiers(root, onIdentifier, includeAll = false, parentStack = [
       } else if (node.type === "ObjectProperty" && parent.type === "ObjectPattern") {
         node.inPattern = true;
       } else if (isFunctionType(node)) {
-        walkFunctionParams(node, (id) => markScopeIdentifier(node, id, knownIds));
+        if (node.scopeIds) {
+          node.scopeIds.forEach((id) => markKnownIds(id, knownIds));
+        } else {
+          walkFunctionParams(
+            node,
+            (id) => markScopeIdentifier(node, id, knownIds)
+          );
+        }
       } else if (node.type === "BlockStatement") {
-        walkBlockDeclarations(
-          node,
-          (id) => markScopeIdentifier(node, id, knownIds)
-        );
+        if (node.scopeIds) {
+          node.scopeIds.forEach((id) => markKnownIds(id, knownIds));
+        } else {
+          walkBlockDeclarations(
+            node,
+            (id) => markScopeIdentifier(node, id, knownIds)
+          );
+        }
       }
     },
     leave(node, parent) {
@@ -1636,16 +1647,19 @@ function extractIdentifiers(param, nodes = []) {
   }
   return nodes;
 }
-function markScopeIdentifier(node, child, knownIds) {
-  const { name } = child;
-  if (node.scopeIds && node.scopeIds.has(name)) {
-    return;
-  }
+function markKnownIds(name, knownIds) {
   if (name in knownIds) {
     knownIds[name]++;
   } else {
     knownIds[name] = 1;
   }
+}
+function markScopeIdentifier(node, child, knownIds) {
+  const { name } = child;
+  if (node.scopeIds && node.scopeIds.has(name)) {
+    return;
+  }
+  markKnownIds(name, knownIds);
   (node.scopeIds || (node.scopeIds = /* @__PURE__ */ new Set())).add(name);
 }
 const isFunctionType = (node) => {
@@ -1850,7 +1864,7 @@ const isMemberExpressionNode = (path, context) => {
       plugins: context.expressionPlugins
     });
     ret = unwrapTSNode(ret);
-    return ret.type === "MemberExpression" || ret.type === "OptionalMemberExpression" || ret.type === "Identifier";
+    return ret.type === "MemberExpression" || ret.type === "OptionalMemberExpression" || ret.type === "Identifier" && ret.name !== "undefined";
   } catch (e) {
     return false;
   }
@@ -2135,12 +2149,6 @@ const tokenizer = new Tokenizer(stack, {
       loc: getLoc(start - 1, end),
       codegenNode: void 0
     };
-    if (tokenizer.inSFCRoot) {
-      currentOpenTag.innerLoc = getLoc(
-        end + fastForward(end) + 1,
-        end
-      );
-    }
   },
   onopentagend(end) {
     endOpenTag(end);
@@ -2468,6 +2476,9 @@ function getSlice(start, end) {
   return currentInput.slice(start, end);
 }
 function endOpenTag(end) {
+  if (tokenizer.inSFCRoot) {
+    currentOpenTag.innerLoc = getLoc(end + 1, end + 1);
+  }
   addNode(currentOpenTag);
   const { tag, ns } = currentOpenTag;
   if (ns === 0 && currentOptions.isPreTag(tag)) {
@@ -2501,7 +2512,7 @@ function onCloseTag(el, end, isImplied = false) {
   if (isImplied) {
     setLocEnd(el.loc, backTrack(end, 60));
   } else {
-    setLocEnd(el.loc, end + fastForward(end) + 1);
+    setLocEnd(el.loc, end + 1);
   }
   if (tokenizer.inSFCRoot) {
     if (el.children.length) {
@@ -2566,13 +2577,6 @@ function onCloseTag(el, end, isImplied = false) {
     }
   }
 }
-function fastForward(start, c) {
-  let offset = 0;
-  while (currentInput.charCodeAt(start + offset) !== 62 && start + offset < currentInput.length) {
-    offset++;
-  }
-  return offset;
-}
 function backTrack(index, c) {
   let i = index;
   while (currentInput.charCodeAt(i) !== c && i >= 0)

package/dist/compiler-core.esm-bundler.js

@@ -1914,12 +1914,6 @@ const tokenizer = new Tokenizer(stack, {
       loc: getLoc(start - 1, end),
       codegenNode: void 0
     };
-    if (tokenizer.inSFCRoot) {
-      currentOpenTag.innerLoc = getLoc(
-        end + fastForward(end) + 1,
-        end
-      );
-    }
   },
   onopentagend(end) {
     endOpenTag(end);
@@ -2244,6 +2238,9 @@ function getSlice(start, end) {
   return currentInput.slice(start, end);
 }
 function endOpenTag(end) {
+  if (tokenizer.inSFCRoot) {
+    currentOpenTag.innerLoc = getLoc(end + 1, end + 1);
+  }
   addNode(currentOpenTag);
   const { tag, ns } = currentOpenTag;
   if (ns === 0 && currentOptions.isPreTag(tag)) {
@@ -2284,7 +2281,7 @@ function onCloseTag(el, end, isImplied = false) {
   if (isImplied) {
     setLocEnd(el.loc, backTrack(end, 60));
   } else {
-    setLocEnd(el.loc, end + fastForward(end) + 1);
+    setLocEnd(el.loc, end + 1);
   }
   if (tokenizer.inSFCRoot) {
     if (el.children.length) {
@@ -2379,13 +2376,6 @@ function onCloseTag(el, end, isImplied = false) {
     }
   }
 }
-function fastForward(start, c) {
-  let offset = 0;
-  while (currentInput.charCodeAt(start + offset) !== 62 && start + offset < currentInput.length) {
-    offset++;
-  }
-  return offset;
-}
 function backTrack(index, c) {
   let i = index;
   while (currentInput.charCodeAt(i) !== c && i >= 0)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/compiler-core",
-  "version": "3.4.0-beta.3",
+  "version": "3.4.0-rc.1",
   "description": "@vue/compiler-core",
   "main": "index.js",
   "module": "dist/compiler-core.esm-bundler.js",
@@ -32,13 +32,13 @@
   },
   "homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-core#readme",
   "dependencies": {
-    "@babel/parser": "^7.23.5",
+    "@babel/parser": "^7.23.6",
     "entities": "^4.5.0",
     "estree-walker": "^2.0.2",
     "source-map-js": "^1.0.2",
-    "@vue/shared": "3.4.0-beta.3"
+    "@vue/shared": "3.4.0-rc.1"
   },
   "devDependencies": {
-    "@babel/types": "^7.23.5"
+    "@babel/types": "^7.23.6"
   }
 }