@vue/compiler-sfc 3.3.2 → 3.3.4

package/dist/compiler-sfc.cjs.js

@@ -1142,7 +1142,8 @@ function processExp(exp, dir) {
     } else if (dir === "for") {
       const inMatch = exp.match(forAliasRE);
       if (inMatch) {
-        const [, LHS, RHS] = inMatch;
+        let [, LHS, RHS] = inMatch;
+        LHS = LHS.trim().replace(/^\(|\)$/g, "");
         return processExp(`(${LHS})=>{}`) + processExp(RHS);
       }
     }
@@ -18351,7 +18352,7 @@ function qualifiedNameToPath(node) {
 }
 function resolveGlobalScope(ctx) {
   if (ctx.options.globalTypeFiles) {
-    const fs = ctx.options.fs || (ts == null ? void 0 : ts.sys);
+    const fs = resolveFS(ctx);
     if (!fs) {
       throw new Error("[vue/compiler-sfc] globalTypeFiles requires fs access.");
     }
@@ -18364,15 +18365,38 @@ let ts;
 function registerTS(_ts) {
   ts = _ts;
 }
+function resolveFS(ctx) {
+  if (ctx.fs) {
+    return ctx.fs;
+  }
+  const fs = ctx.options.fs || ts.sys;
+  if (!fs) {
+    return;
+  }
+  return ctx.fs = {
+    fileExists(file) {
+      if (file.endsWith(".vue.ts")) {
+        file = file.replace(/\.ts$/, "");
+      }
+      return fs.fileExists(file);
+    },
+    readFile(file) {
+      if (file.endsWith(".vue.ts")) {
+        file = file.replace(/\.ts$/, "");
+      }
+      return fs.readFile(file);
+    }
+  };
+}
 function resolveTypeFromImport(ctx, node, name, scope) {
   const { source, imported } = scope.imports[name];
   const sourceScope = importSourceToScope(ctx, node, scope, source);
   return resolveTypeReference(ctx, node, sourceScope, imported, true);
 }
 function importSourceToScope(ctx, node, scope, source) {
-  const fs = ctx.options.fs || (ts == null ? void 0 : ts.sys);
+  const fs = resolveFS(ctx);
   if (!fs) {
-    ctx.error(
+    return ctx.error(
       `No fs option provided to \`compileScript\` in non-Node environment. File system access is required for resolving imported types.`,
       node,
       scope
@@ -18409,6 +18433,7 @@ function importSourceToScope(ctx, node, scope, source) {
   }
 }
 function resolveExt(filename, fs) {
+  filename = filename.replace(/\.js$/, "");
   const tryResolve = (filename2) => {
     if (fs.fileExists(filename2))
       return filename2;
@@ -18471,7 +18496,11 @@ function resolveWithTS(containingFile, source, fs) {
     tsResolveCache
   );
   if (res.resolvedModule) {
-    return res.resolvedModule.resolvedFileName;
+    let filename = res.resolvedModule.resolvedFileName;
+    if (filename.endsWith(".vue.ts")) {
+      filename = filename.replace(/\.ts$/, "");
+    }
+    return filename;
   }
 }
 function loadTSConfig(configPath, fs) {
@@ -18506,7 +18535,7 @@ function fileToScope(ctx, filename, asGlobal = false) {
   if (cached) {
     return cached;
   }
-  const fs = ctx.options.fs || (ts == null ? void 0 : ts.sys);
+  const fs = resolveFS(ctx);
   const source = fs.readFile(filename) || "";
   const body = parseFile(filename, source, ctx.options.babelParserPlugins);
   const scope = new TypeScope(filename, source, 0, recordImports(body));
@@ -18641,6 +18670,18 @@ function recordTypes(ctx, body, scope, asGlobal = false) {
           stmt.source.value
         );
         Object.assign(scope.exportedTypes, sourceScope.exportedTypes);
+      } else if (stmt.type === "ExportDefaultDeclaration" && stmt.declaration) {
+        if (stmt.declaration.type !== "Identifier") {
+          recordType(stmt.declaration, types, declares, "default");
+          recordType(
+            stmt.declaration,
+            exportedTypes,
+            exportedDeclares,
+            "default"
+          );
+        } else if (types[stmt.declaration.name]) {
+          exportedTypes["default"] = types[stmt.declaration.name];
+        }
       }
     }
   }
@@ -18654,12 +18695,12 @@ function recordTypes(ctx, body, scope, asGlobal = false) {
     declares[key]._ownerScope = scope;
   }
 }
-function recordType(node, types, declares) {
+function recordType(node, types, declares, overwriteId) {
   switch (node.type) {
     case "TSInterfaceDeclaration":
     case "TSEnumDeclaration":
     case "TSModuleDeclaration": {
-      const id = getId(node.id);
+      const id = overwriteId || getId(node.id);
       let existing = types[id];
       if (existing) {
         if (node.type === "TSModuleDeclaration") {
@@ -18689,7 +18730,7 @@ function recordType(node, types, declares) {
       break;
     }
     case "ClassDeclaration":
-      types[getId(node.id)] = node;
+      types[overwriteId || getId(node.id)] = node;
       break;
     case "TSTypeAliasDeclaration":
       types[node.id.name] = node.typeAnnotation;
@@ -19037,6 +19078,20 @@ function resolveReturnType(ctx, arg, scope) {
     return resolved.returnType;
   }
 }
+function resolveUnionType(ctx, node, scope) {
+  if (node.type === "TSTypeReference") {
+    const resolved = resolveTypeReference(ctx, node, scope);
+    if (resolved)
+      node = resolved;
+  }
+  let types;
+  if (node.type === "TSUnionType") {
+    types = node.types.flatMap((node2) => resolveUnionType(ctx, node2, scope));
+  } else {
+    types = [node];
+  }
+  return types;
+}
 
 const DEFINE_MODEL = "defineModel";
 function processDefineModel(ctx, node, declId) {
@@ -19327,7 +19382,7 @@ function genDestructuredDefaultValue(ctx, key, inferredType) {
   if (defaultVal) {
     const value = ctx.getString(defaultVal);
     const unwrapped = unwrapTSNode(defaultVal);
-    if (inferredType && inferredType.length && !inferredType.includes(UNKNOWN_TYPE)) {
+    if (inferredType && inferredType.length && !inferredType.includes("null")) {
       const valueType = inferValueType(unwrapped);
       if (valueType && !inferredType.includes(valueType)) {
         ctx.error(
@@ -19596,7 +19651,7 @@ function extractRuntimeEmits(ctx) {
   const emits = /* @__PURE__ */ new Set();
   const node = ctx.emitsTypeDecl;
   if (node.type === "TSFunctionType") {
-    extractEventNames(node.parameters[0], emits);
+    extractEventNames(ctx, node.parameters[0], emits);
     return emits;
   }
   const { props, calls } = resolveTypeElements(ctx, node);
@@ -19613,22 +19668,18 @@ function extractRuntimeEmits(ctx) {
       );
     }
     for (const call of calls) {
-      extractEventNames(call.parameters[0], emits);
+      extractEventNames(ctx, call.parameters[0], emits);
     }
   }
   return emits;
 }
-function extractEventNames(eventName, emits) {
+function extractEventNames(ctx, eventName, emits) {
   if (eventName.type === "Identifier" && eventName.typeAnnotation && eventName.typeAnnotation.type === "TSTypeAnnotation") {
-    const typeNode = eventName.typeAnnotation.typeAnnotation;
-    if (typeNode.type === "TSLiteralType") {
-      if (typeNode.literal.type !== "UnaryExpression" && typeNode.literal.type !== "TemplateLiteral") {
-        emits.add(String(typeNode.literal.value));
-      }
-    } else if (typeNode.type === "TSUnionType") {
-      for (const t of typeNode.types) {
-        if (t.type === "TSLiteralType" && t.literal.type !== "UnaryExpression" && t.literal.type !== "TemplateLiteral") {
-          emits.add(String(t.literal.value));
+    const types = resolveUnionType(ctx, eventName.typeAnnotation.typeAnnotation);
+    for (const type of types) {
+      if (type.type === "TSLiteralType") {
+        if (type.literal.type !== "UnaryExpression" && type.literal.type !== "TemplateLiteral") {
+          emits.add(String(type.literal.value));
         }
       }
     }
@@ -20531,6 +20582,7 @@ function canNeverBeRef(node, userReactiveImport) {
   }
 }
 function isStaticNode(node) {
+  node = unwrapTSNode(node);
   switch (node.type) {
     case "UnaryExpression":
       return isStaticNode(node.argument);
@@ -20544,19 +20596,18 @@ function isStaticNode(node) {
     case "TemplateLiteral":
       return node.expressions.every((expr) => isStaticNode(expr));
     case "ParenthesizedExpression":
-    case "TSNonNullExpression":
-    case "TSAsExpression":
-    case "TSTypeAssertion":
       return isStaticNode(node.expression);
-    default:
-      if (isLiteralNode(node)) {
-        return true;
-      }
-      return false;
+    case "StringLiteral":
+    case "NumericLiteral":
+    case "BooleanLiteral":
+    case "NullLiteral":
+    case "BigIntLiteral":
+      return true;
   }
+  return false;
 }
 
-const version = "3.3.2";
+const version = "3.3.4";
 const walk = estreeWalker.walk;
 
 exports.babelParse = parser$2.parse;

package/dist/compiler-sfc.d.ts

@@ -394,6 +394,10 @@ export declare class ScriptCompileContext {
      * to be exposed on compiled script block for HMR cache busting
      */
     deps?: Set<string>;
+    /**
+     * cache for resolved fs
+     */
+    fs?: NonNullable<SFCScriptCompileOptions['fs']>;
     constructor(descriptor: SFCDescriptor, options: Partial<SFCScriptCompileOptions>);
     getString(node: Node, scriptSetup?: boolean): string;
     error(msg: string, node: Node, scope?: TypeScope): never;
@@ -414,7 +418,7 @@ export declare class ScriptCompileContext {
  * }
  * ```
  */
-export type SimpleTypeResolveContext = Pick<ScriptCompileContext, 'source' | 'filename' | 'error' | 'options'> & Partial<Pick<ScriptCompileContext, 'scope' | 'globalScopes' | 'deps'>> & {
+export type SimpleTypeResolveContext = Pick<ScriptCompileContext, 'source' | 'filename' | 'error' | 'options'> & Partial<Pick<ScriptCompileContext, 'scope' | 'globalScopes' | 'deps' | 'fs'>> & {
     ast: Statement[];
 };
 export type TypeResolveContext = ScriptCompileContext | SimpleTypeResolveContext;

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

@@ -146,7 +146,7 @@ function normalizeStyle(value) {
 }
 const listDelimiterRE = /;(?![^(]*\))/g;
 const propertyDelimiterRE = /:([^]+)/;
-const styleCommentRE = new RegExp("\\/\\*.*?\\*\\/", "gs");
+const styleCommentRE = /\/\*[^]*?\*\//g;
 function parseStringStyle(cssText) {
   const ret = {};
   cssText.replace(styleCommentRE, "").split(listDelimiterRE).forEach((item) => {
@@ -26963,7 +26963,8 @@ function processExp(exp, dir) {
     } else if (dir === "for") {
       const inMatch = exp.match(forAliasRE);
       if (inMatch) {
-        const [, LHS, RHS] = inMatch;
+        let [, LHS, RHS] = inMatch;
+        LHS = LHS.trim().replace(/^\(|\)$/g, "");
         return processExp(`(${LHS})=>{}`) + processExp(RHS);
       }
     }
@@ -48102,7 +48103,7 @@ function qualifiedNameToPath(node) {
 }
 function resolveGlobalScope(ctx) {
   if (ctx.options.globalTypeFiles) {
-    const fs = ctx.options.fs || (ts == null ? void 0 : ts.sys);
+    const fs = resolveFS(ctx);
     if (!fs) {
       throw new Error("[vue/compiler-sfc] globalTypeFiles requires fs access.");
     }
@@ -48115,15 +48116,38 @@ let ts;
 function registerTS(_ts) {
   ts = _ts;
 }
+function resolveFS(ctx) {
+  if (ctx.fs) {
+    return ctx.fs;
+  }
+  const fs = ctx.options.fs || ts.sys;
+  if (!fs) {
+    return;
+  }
+  return ctx.fs = {
+    fileExists(file) {
+      if (file.endsWith(".vue.ts")) {
+        file = file.replace(/\.ts$/, "");
+      }
+      return fs.fileExists(file);
+    },
+    readFile(file) {
+      if (file.endsWith(".vue.ts")) {
+        file = file.replace(/\.ts$/, "");
+      }
+      return fs.readFile(file);
+    }
+  };
+}
 function resolveTypeFromImport(ctx, node, name, scope) {
   const { source, imported } = scope.imports[name];
   const sourceScope = importSourceToScope(ctx, node, scope, source);
   return resolveTypeReference(ctx, node, sourceScope, imported, true);
 }
 function importSourceToScope(ctx, node, scope, source) {
-  const fs = ctx.options.fs || (ts == null ? void 0 : ts.sys);
+  const fs = resolveFS(ctx);
   if (!fs) {
-    ctx.error(
+    return ctx.error(
       `No fs option provided to \`compileScript\` in non-Node environment. File system access is required for resolving imported types.`,
       node,
       scope
@@ -48167,6 +48191,7 @@ function importSourceToScope(ctx, node, scope, source) {
   }
 }
 function resolveExt(filename, fs) {
+  filename = filename.replace(/\.js$/, "");
   const tryResolve = (filename2) => {
     if (fs.fileExists(filename2))
       return filename2;
@@ -48192,7 +48217,7 @@ function fileToScope(ctx, filename, asGlobal = false) {
   if (cached) {
     return cached;
   }
-  const fs = ctx.options.fs || (ts == null ? void 0 : ts.sys);
+  const fs = resolveFS(ctx);
   const source = fs.readFile(filename) || "";
   const body = parseFile(filename, source, ctx.options.babelParserPlugins);
   const scope = new TypeScope(filename, source, 0, recordImports(body));
@@ -48327,6 +48352,18 @@ function recordTypes(ctx, body, scope, asGlobal = false) {
           stmt.source.value
         );
         Object.assign(scope.exportedTypes, sourceScope.exportedTypes);
+      } else if (stmt.type === "ExportDefaultDeclaration" && stmt.declaration) {
+        if (stmt.declaration.type !== "Identifier") {
+          recordType(stmt.declaration, types, declares, "default");
+          recordType(
+            stmt.declaration,
+            exportedTypes,
+            exportedDeclares,
+            "default"
+          );
+        } else if (types[stmt.declaration.name]) {
+          exportedTypes["default"] = types[stmt.declaration.name];
+        }
       }
     }
   }
@@ -48340,12 +48377,12 @@ function recordTypes(ctx, body, scope, asGlobal = false) {
     declares[key]._ownerScope = scope;
   }
 }
-function recordType(node, types, declares) {
+function recordType(node, types, declares, overwriteId) {
   switch (node.type) {
     case "TSInterfaceDeclaration":
     case "TSEnumDeclaration":
     case "TSModuleDeclaration": {
-      const id = getId(node.id);
+      const id = overwriteId || getId(node.id);
       let existing = types[id];
       if (existing) {
         if (node.type === "TSModuleDeclaration") {
@@ -48375,7 +48412,7 @@ function recordType(node, types, declares) {
       break;
     }
     case "ClassDeclaration":
-      types[getId(node.id)] = node;
+      types[overwriteId || getId(node.id)] = node;
       break;
     case "TSTypeAliasDeclaration":
       types[node.id.name] = node.typeAnnotation;
@@ -48723,6 +48760,20 @@ function resolveReturnType(ctx, arg, scope) {
     return resolved.returnType;
   }
 }
+function resolveUnionType(ctx, node, scope) {
+  if (node.type === "TSTypeReference") {
+    const resolved = resolveTypeReference(ctx, node, scope);
+    if (resolved)
+      node = resolved;
+  }
+  let types;
+  if (node.type === "TSUnionType") {
+    types = node.types.flatMap((node2) => resolveUnionType(ctx, node2, scope));
+  } else {
+    types = [node];
+  }
+  return types;
+}
 
 const DEFINE_MODEL = "defineModel";
 function processDefineModel(ctx, node, declId) {
@@ -49013,7 +49064,7 @@ function genDestructuredDefaultValue(ctx, key, inferredType) {
   if (defaultVal) {
     const value = ctx.getString(defaultVal);
     const unwrapped = unwrapTSNode(defaultVal);
-    if (inferredType && inferredType.length && !inferredType.includes(UNKNOWN_TYPE)) {
+    if (inferredType && inferredType.length && !inferredType.includes("null")) {
       const valueType = inferValueType(unwrapped);
       if (valueType && !inferredType.includes(valueType)) {
         ctx.error(
@@ -49282,7 +49333,7 @@ function extractRuntimeEmits(ctx) {
   const emits = /* @__PURE__ */ new Set();
   const node = ctx.emitsTypeDecl;
   if (node.type === "TSFunctionType") {
-    extractEventNames(node.parameters[0], emits);
+    extractEventNames(ctx, node.parameters[0], emits);
     return emits;
   }
   const { props, calls } = resolveTypeElements(ctx, node);
@@ -49299,22 +49350,18 @@ function extractRuntimeEmits(ctx) {
       );
     }
     for (const call of calls) {
-      extractEventNames(call.parameters[0], emits);
+      extractEventNames(ctx, call.parameters[0], emits);
     }
   }
   return emits;
 }
-function extractEventNames(eventName, emits) {
+function extractEventNames(ctx, eventName, emits) {
   if (eventName.type === "Identifier" && eventName.typeAnnotation && eventName.typeAnnotation.type === "TSTypeAnnotation") {
-    const typeNode = eventName.typeAnnotation.typeAnnotation;
-    if (typeNode.type === "TSLiteralType") {
-      if (typeNode.literal.type !== "UnaryExpression" && typeNode.literal.type !== "TemplateLiteral") {
-        emits.add(String(typeNode.literal.value));
-      }
-    } else if (typeNode.type === "TSUnionType") {
-      for (const t of typeNode.types) {
-        if (t.type === "TSLiteralType" && t.literal.type !== "UnaryExpression" && t.literal.type !== "TemplateLiteral") {
-          emits.add(String(t.literal.value));
+    const types = resolveUnionType(ctx, eventName.typeAnnotation.typeAnnotation);
+    for (const type of types) {
+      if (type.type === "TSLiteralType") {
+        if (type.literal.type !== "UnaryExpression" && type.literal.type !== "TemplateLiteral") {
+          emits.add(String(type.literal.value));
         }
       }
     }
@@ -50231,6 +50278,7 @@ function canNeverBeRef(node, userReactiveImport) {
   }
 }
 function isStaticNode(node) {
+  node = unwrapTSNode(node);
   switch (node.type) {
     case "UnaryExpression":
       return isStaticNode(node.argument);
@@ -50244,19 +50292,18 @@ function isStaticNode(node) {
     case "TemplateLiteral":
       return node.expressions.every((expr) => isStaticNode(expr));
     case "ParenthesizedExpression":
-    case "TSNonNullExpression":
-    case "TSAsExpression":
-    case "TSTypeAssertion":
       return isStaticNode(node.expression);
-    default:
-      if (isLiteralNode(node)) {
-        return true;
-      }
-      return false;
+    case "StringLiteral":
+    case "NumericLiteral":
+    case "BooleanLiteral":
+    case "NullLiteral":
+    case "BigIntLiteral":
+      return true;
   }
+  return false;
 }
 
-const version = "3.3.2";
+const version = "3.3.4";
 const walk = walk$1;
 
 export { MagicString, parse_1$1 as babelParse, compileScript, compileStyle, compileStyleAsync, compileTemplate, extractIdentifiers, generateCodeFrame, inferRuntimeType, invalidateTypeCache, isInDestructureAssignment, isStaticProperty, parse$7 as parse, parseCache, registerTS, resolveTypeElements, rewriteDefault, rewriteDefaultAST, shouldTransform as shouldTransformRef, transform as transformRef, transformAST as transformRefAST, version, walk, walkIdentifiers };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/compiler-sfc",
-  "version": "3.3.2",
+  "version": "3.3.4",
   "description": "@vue/compiler-sfc",
   "main": "dist/compiler-sfc.cjs.js",
   "module": "dist/compiler-sfc.esm-browser.js",
@@ -33,11 +33,11 @@
   "homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-sfc#readme",
   "dependencies": {
     "@babel/parser": "^7.20.15",
-    "@vue/compiler-core": "3.3.2",
-    "@vue/compiler-dom": "3.3.2",
-    "@vue/compiler-ssr": "3.3.2",
-    "@vue/reactivity-transform": "3.3.2",
-    "@vue/shared": "3.3.2",
+    "@vue/compiler-core": "3.3.4",
+    "@vue/compiler-dom": "3.3.4",
+    "@vue/compiler-ssr": "3.3.4",
+    "@vue/reactivity-transform": "3.3.4",
+    "@vue/shared": "3.3.4",
     "estree-walker": "^2.0.2",
     "magic-string": "^0.30.0",
     "postcss": "^8.1.10",