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

package/dist/compiler-sfc.cjs.js

@@ -17767,21 +17767,24 @@ class TypeScope {
     this.imports = imports;
     this.types = types;
     this.declares = declares;
+    this.isGenericScope = false;
     this.resolvedImportSources = /* @__PURE__ */ Object.create(null);
     this.exportedTypes = /* @__PURE__ */ Object.create(null);
     this.exportedDeclares = /* @__PURE__ */ Object.create(null);
   }
 }
 function resolveTypeElements(ctx, node, scope, typeParameters) {
-  if (node._resolvedElements) {
+  const canCache = !typeParameters;
+  if (canCache && node._resolvedElements) {
     return node._resolvedElements;
   }
-  return node._resolvedElements = innerResolveTypeElements(
+  const resolved = innerResolveTypeElements(
     ctx,
     node,
     node._ownerScope || scope || ctxToScope(ctx),
     typeParameters
   );
+  return canCache ? node._resolvedElements = resolved : resolved;
 }
 function innerResolveTypeElements(ctx, node, scope, typeParameters) {
   var _a, _b;
@@ -17832,8 +17835,9 @@ function innerResolveTypeElements(ctx, node, scope, typeParameters) {
       }
       const resolved = resolveTypeReference(ctx, node, scope);
       if (resolved) {
-        const typeParams = /* @__PURE__ */ Object.create(null);
+        let typeParams;
         if ((resolved.type === "TSTypeAliasDeclaration" || resolved.type === "TSInterfaceDeclaration") && resolved.typeParameters && node.typeParameters) {
+          typeParams = /* @__PURE__ */ Object.create(null);
           resolved.typeParameters.params.forEach((p, i) => {
             let param = typeParameters && typeParameters[p.name];
             if (!param)
@@ -17922,6 +17926,7 @@ function typeElementsToMap(ctx, elements, scope = ctxToScope(ctx), typeParameter
     if (e.type === "TSPropertySignature" || e.type === "TSMethodSignature") {
       if (typeParameters) {
         scope = createChildScope(scope);
+        scope.isGenericScope = true;
         Object.assign(scope.types, typeParameters);
       }
       e._ownerScope = scope;
@@ -18219,16 +18224,18 @@ function resolveBuiltin(ctx, node, name, scope, typeParameters) {
   }
 }
 function resolveTypeReference(ctx, node, scope, name, onlyExported = false) {
-  if (node._resolvedReference) {
+  const canCache = !(scope == null ? void 0 : scope.isGenericScope);
+  if (canCache && node._resolvedReference) {
     return node._resolvedReference;
   }
-  return node._resolvedReference = innerResolveTypeReference(
+  const resolved = innerResolveTypeReference(
     ctx,
     scope || ctxToScope(ctx),
     name || getReferenceName(node),
     node,
     onlyExported
   );
+  return canCache ? node._resolvedReference = resolved : resolved;
 }
 function innerResolveTypeReference(ctx, scope, name, node, onlyExported) {
   if (typeof name === "string") {
@@ -20258,6 +20265,7 @@ let __temp${any}, __restore${any}
       }
       const { code, ast, preamble, tips, errors } = compileTemplate({
         filename,
+        ast: sfc.template.ast,
         source: sfc.template.content,
         inMap: sfc.template.map,
         ...options.templateOptions,
@@ -20559,7 +20567,7 @@ function isStaticNode(node) {
   return false;
 }
 
-const version = "3.4.0-beta.3";
+const version = "3.4.0-rc.1";
 const parseCache = parseCache$1;
 const walk = estreeWalker.walk;
 const shouldTransformRef = () => false;

package/dist/compiler-sfc.d.ts

@@ -432,6 +432,7 @@ declare class TypeScope {
     types: Record<string, ScopeTypeNode>;
     declares: Record<string, ScopeTypeNode>;
     constructor(filename: string, source: string, offset?: number, imports?: Record<string, Import>, types?: Record<string, ScopeTypeNode>, declares?: Record<string, ScopeTypeNode>);
+    isGenericScope: boolean;
     resolvedImportSources: Record<string, string>;
     exportedTypes: Record<string, ScopeTypeNode>;
     exportedDeclares: Record<string, ScopeTypeNode>;

package/dist/compiler-sfc.esm-browser.js

@@ -17032,12 +17032,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) {
@@ -17156,16 +17167,19 @@ function extractIdentifiers$1(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) => {
@@ -17370,7 +17384,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;
   }
@@ -17655,12 +17669,6 @@ const tokenizer$2 = new Tokenizer$1(stack, {
       loc: getLoc(start - 1, end),
       codegenNode: void 0
     };
-    if (tokenizer$2.inSFCRoot) {
-      currentOpenTag.innerLoc = getLoc(
-        end + fastForward(end) + 1,
-        end
-      );
-    }
   },
   onopentagend(end) {
     endOpenTag(end);
@@ -17978,6 +17986,9 @@ function getSlice(start, end) {
   return currentInput.slice(start, end);
 }
 function endOpenTag(end) {
+  if (tokenizer$2.inSFCRoot) {
+    currentOpenTag.innerLoc = getLoc(end + 1, end + 1);
+  }
   addNode(currentOpenTag);
   const { tag, ns } = currentOpenTag;
   if (ns === 0 && currentOptions.isPreTag(tag)) {
@@ -18011,7 +18022,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$2.inSFCRoot) {
     if (el.children.length) {
@@ -18048,13 +18059,6 @@ function onCloseTag(el, end, isImplied = false) {
     tokenizer$2.inXML = 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)
@@ -45823,21 +45827,24 @@ class TypeScope {
     this.imports = imports;
     this.types = types;
     this.declares = declares;
+    this.isGenericScope = false;
     this.resolvedImportSources = /* @__PURE__ */ Object.create(null);
     this.exportedTypes = /* @__PURE__ */ Object.create(null);
     this.exportedDeclares = /* @__PURE__ */ Object.create(null);
   }
 }
 function resolveTypeElements(ctx, node, scope, typeParameters) {
-  if (node._resolvedElements) {
+  const canCache = !typeParameters;
+  if (canCache && node._resolvedElements) {
     return node._resolvedElements;
   }
-  return node._resolvedElements = innerResolveTypeElements(
+  const resolved = innerResolveTypeElements(
     ctx,
     node,
     node._ownerScope || scope || ctxToScope(ctx),
     typeParameters
   );
+  return canCache ? node._resolvedElements = resolved : resolved;
 }
 function innerResolveTypeElements(ctx, node, scope, typeParameters) {
   var _a, _b;
@@ -45888,8 +45895,9 @@ function innerResolveTypeElements(ctx, node, scope, typeParameters) {
       }
       const resolved = resolveTypeReference(ctx, node, scope);
       if (resolved) {
-        const typeParams = /* @__PURE__ */ Object.create(null);
+        let typeParams;
         if ((resolved.type === "TSTypeAliasDeclaration" || resolved.type === "TSInterfaceDeclaration") && resolved.typeParameters && node.typeParameters) {
+          typeParams = /* @__PURE__ */ Object.create(null);
           resolved.typeParameters.params.forEach((p, i) => {
             let param = typeParameters && typeParameters[p.name];
             if (!param)
@@ -45978,6 +45986,7 @@ function typeElementsToMap(ctx, elements, scope = ctxToScope(ctx), typeParameter
     if (e.type === "TSPropertySignature" || e.type === "TSMethodSignature") {
       if (typeParameters) {
         scope = createChildScope(scope);
+        scope.isGenericScope = true;
         Object.assign(scope.types, typeParameters);
       }
       e._ownerScope = scope;
@@ -46274,16 +46283,18 @@ function resolveBuiltin(ctx, node, name, scope, typeParameters) {
   }
 }
 function resolveTypeReference(ctx, node, scope, name, onlyExported = false) {
-  if (node._resolvedReference) {
+  const canCache = !(scope == null ? void 0 : scope.isGenericScope);
+  if (canCache && node._resolvedReference) {
     return node._resolvedReference;
   }
-  return node._resolvedReference = innerResolveTypeReference(
+  const resolved = innerResolveTypeReference(
     ctx,
     scope || ctxToScope(ctx),
     name || getReferenceName(node),
     node,
     onlyExported
   );
+  return canCache ? node._resolvedReference = resolved : resolved;
 }
 function innerResolveTypeReference(ctx, scope, name, node, onlyExported) {
   if (typeof name === "string") {
@@ -48245,6 +48256,7 @@ let __temp${any}, __restore${any}
       }
       const { code, ast, preamble, tips, errors } = compileTemplate(__spreadProps(__spreadValues({
         filename,
+        ast: sfc.template.ast,
         source: sfc.template.content,
         inMap: sfc.template.map
       }, options.templateOptions), {
@@ -48544,7 +48556,7 @@ function isStaticNode(node) {
   return false;
 }
 
-const version = "3.4.0-beta.3";
+const version = "3.4.0-rc.1";
 const parseCache = parseCache$1;
 const walk = walk$2;
 const shouldTransformRef = () => false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/compiler-sfc",
-  "version": "3.4.0-beta.3",
+  "version": "3.4.0-rc.1",
   "description": "@vue/compiler-sfc",
   "main": "dist/compiler-sfc.cjs.js",
   "module": "dist/compiler-sfc.esm-browser.js",
@@ -32,18 +32,18 @@
   },
   "homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-sfc#readme",
   "dependencies": {
-    "@babel/parser": "^7.23.5",
+    "@babel/parser": "^7.23.6",
     "estree-walker": "^2.0.2",
     "magic-string": "^0.30.5",
     "postcss": "^8.4.32",
     "source-map-js": "^1.0.2",
-    "@vue/compiler-dom": "3.4.0-beta.3",
-    "@vue/compiler-core": "3.4.0-beta.3",
-    "@vue/shared": "3.4.0-beta.3",
-    "@vue/compiler-ssr": "3.4.0-beta.3"
+    "@vue/compiler-core": "3.4.0-rc.1",
+    "@vue/compiler-ssr": "3.4.0-rc.1",
+    "@vue/compiler-dom": "3.4.0-rc.1",
+    "@vue/shared": "3.4.0-rc.1"
   },
   "devDependencies": {
-    "@babel/types": "^7.23.5",
+    "@babel/types": "^7.23.6",
     "@vue/consolidate": "^0.17.3",
     "hash-sum": "^2.0.0",
     "lru-cache": "^10.1.0",