@vue/compiler-sfc 3.5.14 → 3.5.15

package/dist/compiler-sfc.cjs.js

@@ -1,5 +1,5 @@
 /**
-* @vue/compiler-sfc v3.5.14
+* @vue/compiler-sfc v3.5.15
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -8039,6 +8039,7 @@ function processRule(id, rule) {
 }
 function rewriteSelector(id, rule, selector, selectorRoot, deep, slotted = false) {
   let node = null;
+  let starNode = null;
   let shouldInject = !deep;
   selector.each((n) => {
     if (n.type === "combinator" && (n.value === ">>>" || n.value === "/deep/")) {
@@ -8123,10 +8124,11 @@ function rewriteSelector(id, rule, selector, selectorRoot, deep, slotted = false
           return false;
         }
       }
-      if (node) return;
+      starNode = n;
     }
-    if (n.type !== "pseudo" && n.type !== "combinator" || n.type === "pseudo" && (n.value === ":is" || n.value === ":where") && !node) {
+    if (n.type !== "pseudo" && n.type !== "combinator" && n.type !== "universal" || n.type === "pseudo" && (n.value === ":is" || n.value === ":where") && !node) {
       node = n;
+      starNode = null;
     }
   });
   if (rule.nodes.some((node2) => node2.type === "rule")) {
@@ -8167,6 +8169,18 @@ function rewriteSelector(id, rule, selector, selectorRoot, deep, slotted = false
         quoteMark: `"`
       })
     );
+    if (starNode) {
+      selector.insertBefore(
+        starNode,
+        selectorParser.attribute({
+          attribute: idToAdd,
+          value: idToAdd,
+          raws: {},
+          quoteMark: `"`
+        })
+      );
+      selector.removeChild(starNode);
+    }
   }
 }
 function isSpaceCombinator(node) {
@@ -22568,13 +22582,13 @@ function resolveFS(ctx) {
   }
   return ctx.fs = {
     fileExists(file) {
-      if (file.endsWith(".vue.ts")) {
+      if (file.endsWith(".vue.ts") && !file.endsWith(".d.vue.ts")) {
         file = file.replace(/\.ts$/, "");
       }
       return fs.fileExists(file);
     },
     readFile(file) {
-      if (file.endsWith(".vue.ts")) {
+      if (file.endsWith(".vue.ts") && !file.endsWith(".d.vue.ts")) {
         file = file.replace(/\.ts$/, "");
       }
       return fs.readFile(file);
@@ -22702,7 +22716,7 @@ function resolveWithTS(containingFile, source, ts2, fs) {
   );
   if (res.resolvedModule) {
     let filename = res.resolvedModule.resolvedFileName;
-    if (filename.endsWith(".vue.ts")) {
+    if (filename.endsWith(".vue.ts") && !filename.endsWith(".d.vue.ts")) {
       filename = filename.replace(/\.ts$/, "");
     }
     return fs.realpath ? fs.realpath(filename) : filename;
@@ -22746,13 +22760,13 @@ function fileToScope(ctx, filename, asGlobal = false) {
   }
   const fs = resolveFS(ctx);
   const source = fs.readFile(filename) || "";
-  const body = parseFile(filename, source, ctx.options.babelParserPlugins);
+  const body = parseFile(filename, source, fs, ctx.options.babelParserPlugins);
   const scope = new TypeScope(filename, source, 0, recordImports(body));
   recordTypes(ctx, body, scope, asGlobal);
   fileToScopeCache.set(filename, scope);
   return scope;
 }
-function parseFile(filename, content, parserPlugins) {
+function parseFile(filename, content, fs, parserPlugins) {
   const ext = path$1.extname(filename);
   if (ext === ".ts" || ext === ".mts" || ext === ".tsx" || ext === ".mtsx") {
     return parser$2.parse(content, {
@@ -22763,7 +22777,17 @@ function parseFile(filename, content, parserPlugins) {
       ),
       sourceType: "module"
     }).program.body;
-  } else if (ext === ".vue") {
+  }
+  const isUnknownTypeSource = !/\.[cm]?[tj]sx?$/.test(filename);
+  const arbitraryTypeSource = `${filename.slice(0, -ext.length)}.d${ext}.ts`;
+  const hasArbitraryTypeDeclaration = isUnknownTypeSource && fs.fileExists(arbitraryTypeSource);
+  if (hasArbitraryTypeDeclaration) {
+    return parser$2.parse(fs.readFile(arbitraryTypeSource), {
+      plugins: resolveParserPlugins("ts", parserPlugins, true),
+      sourceType: "module"
+    }).program.body;
+  }
+  if (ext === ".vue") {
     const {
       descriptor: { script, scriptSetup }
     } = parse$1(content);
@@ -23084,6 +23108,14 @@ function inferRuntimeType(ctx, node, scope = node._ownerScope || ctxToScope(ctx)
       case "TSTypeReference": {
         const resolved = resolveTypeReference(ctx, node, scope);
         if (resolved) {
+          if (resolved.type === "TSTypeAliasDeclaration") {
+            return inferRuntimeType(
+              ctx,
+              resolved.typeAnnotation,
+              resolved._ownerScope,
+              isKeyOf
+            );
+          }
           return inferRuntimeType(ctx, resolved, resolved._ownerScope, isKeyOf);
         }
         if (node.typeName.type === "Identifier") {
@@ -23398,6 +23430,12 @@ function processDefineModel(ctx, node, declId) {
   if (!isCallOf(node, DEFINE_MODEL)) {
     return false;
   }
+  if (!declId) {
+    ctx.error(
+      "defineModel() must be assigned to a variable. For example: const model = defineModel()",
+      node
+    );
+  }
   ctx.hasDefineModelCall = true;
   const type = node.typeParameters && node.typeParameters.params[0] || void 0;
   let modelName;
@@ -24608,6 +24646,7 @@ let __temp${any}, __restore${any}
   if (destructureElements.length) {
     args += `, { ${destructureElements.join(", ")} }`;
   }
+  let templateMap;
   let returned;
   if (!options.inlineTemplate || !sfc.template && ctx.hasDefaultExportRender) {
     const allBindings = {
@@ -24636,7 +24675,7 @@ let __temp${any}, __restore${any}
       if (options.templateOptions && options.templateOptions.ssr) {
         hasInlinedSsrRenderFn = true;
       }
-      const { code, ast, preamble, tips, errors } = compileTemplate({
+      const { code, ast, preamble, tips, errors, map: map2 } = compileTemplate({
         filename,
         ast: sfc.template.ast,
         source: sfc.template.content,
@@ -24653,6 +24692,7 @@ let __temp${any}, __restore${any}
           bindingMetadata: ctx.bindingMetadata
         }
       });
+      templateMap = map2;
       if (tips.length) {
         tips.forEach(warnOnce);
       }
@@ -24769,16 +24809,23 @@ ${exposeCall}`
 `
     );
   }
+  const content = ctx.s.toString();
+  let map = options.sourceMap !== false ? ctx.s.generateMap({
+    source: filename,
+    hires: true,
+    includeContent: true
+  }) : void 0;
+  if (templateMap && map) {
+    const offset = content.indexOf(returned);
+    const templateLineOffset = content.slice(0, offset).split(/\r?\n/).length - 1;
+    map = mergeSourceMaps(map, templateMap, templateLineOffset);
+  }
   return {
     ...scriptSetup,
     bindings: ctx.bindingMetadata,
     imports: ctx.userImports,
-    content: ctx.s.toString(),
-    map: options.sourceMap !== false ? ctx.s.generateMap({
-      source: filename,
-      hires: true,
-      includeContent: true
-    }) : void 0,
+    content,
+    map,
     scriptAst: scriptAst == null ? void 0 : scriptAst.body,
     scriptSetupAst: scriptSetupAst == null ? void 0 : scriptSetupAst.body,
     deps: ctx.deps ? [...ctx.deps] : void 0
@@ -24941,8 +24988,41 @@ function isStaticNode(node) {
   }
   return false;
 }
+function mergeSourceMaps(scriptMap, templateMap, templateLineOffset) {
+  const generator = new sourceMapJs.SourceMapGenerator();
+  const addMapping = (map, lineOffset = 0) => {
+    const consumer = new sourceMapJs.SourceMapConsumer(map);
+    consumer.sources.forEach((sourceFile) => {
+      generator._sources.add(sourceFile);
+      const sourceContent = consumer.sourceContentFor(sourceFile);
+      if (sourceContent != null) {
+        generator.setSourceContent(sourceFile, sourceContent);
+      }
+    });
+    consumer.eachMapping((m) => {
+      if (m.originalLine == null) return;
+      generator.addMapping({
+        generated: {
+          line: m.generatedLine + lineOffset,
+          column: m.generatedColumn
+        },
+        original: {
+          line: m.originalLine,
+          column: m.originalColumn
+        },
+        source: m.source,
+        name: m.name
+      });
+    });
+  };
+  addMapping(scriptMap);
+  addMapping(templateMap, templateLineOffset);
+  generator._sourceRoot = scriptMap.sourceRoot;
+  generator._file = scriptMap.file;
+  return generator.toJSON();
+}
 
-const version = "3.5.14";
+const version = "3.5.15";
 const parseCache = parseCache$1;
 const errorMessages = {
   ...CompilerDOM.errorMessages,

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

@@ -1,5 +1,5 @@
 /**
-* @vue/compiler-sfc v3.5.14
+* @vue/compiler-sfc v3.5.15
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -22555,7 +22555,9 @@ function createCodegenContext(ast, {
               name = content;
             }
           }
-          addMapping(node.loc.start, name);
+          if (node.loc.source) {
+            addMapping(node.loc.start, name);
+          }
         }
         if (newlineIndex === -3 /* Unknown */) {
           advancePositionWithMutation(context, code);
@@ -22571,7 +22573,7 @@ function createCodegenContext(ast, {
             context.column = code.length - newlineIndex;
           }
         }
-        if (node && node.loc !== locStub) {
+        if (node && node.loc !== locStub && node.loc.source) {
           addMapping(node.loc.end);
         }
       }
@@ -26050,6 +26052,9 @@ const ignoreSideEffectTags = (node, context) => {
 };
 
 function isValidHTMLNesting(parent, child) {
+  if (parent === "template") {
+    return true;
+  }
   if (parent in onlyValidChildren) {
     return onlyValidChildren[parent].has(child);
   }
@@ -41785,6 +41790,7 @@ function processRule(id, rule) {
 }
 function rewriteSelector(id, rule, selector, selectorRoot, deep, slotted = false) {
   let node = null;
+  let starNode = null;
   let shouldInject = !deep;
   selector.each((n) => {
     if (n.type === "combinator" && (n.value === ">>>" || n.value === "/deep/")) {
@@ -41869,10 +41875,11 @@ function rewriteSelector(id, rule, selector, selectorRoot, deep, slotted = false
           return false;
         }
       }
-      if (node) return;
+      starNode = n;
     }
-    if (n.type !== "pseudo" && n.type !== "combinator" || n.type === "pseudo" && (n.value === ":is" || n.value === ":where") && !node) {
+    if (n.type !== "pseudo" && n.type !== "combinator" && n.type !== "universal" || n.type === "pseudo" && (n.value === ":is" || n.value === ":where") && !node) {
       node = n;
+      starNode = null;
     }
   });
   if (rule.nodes.some((node2) => node2.type === "rule")) {
@@ -41913,6 +41920,18 @@ function rewriteSelector(id, rule, selector, selectorRoot, deep, slotted = false
         quoteMark: `"`
       })
     );
+    if (starNode) {
+      selector.insertBefore(
+        starNode,
+        selectorParser.attribute({
+          attribute: idToAdd,
+          value: idToAdd,
+          raws: {},
+          quoteMark: `"`
+        })
+      );
+      selector.removeChild(starNode);
+    }
   }
 }
 function isSpaceCombinator(node) {
@@ -47875,13 +47894,13 @@ function resolveFS(ctx) {
   }
   return ctx.fs = {
     fileExists(file) {
-      if (file.endsWith(".vue.ts")) {
+      if (file.endsWith(".vue.ts") && !file.endsWith(".d.vue.ts")) {
         file = file.replace(/\.ts$/, "");
       }
       return fs.fileExists(file);
     },
     readFile(file) {
-      if (file.endsWith(".vue.ts")) {
+      if (file.endsWith(".vue.ts") && !file.endsWith(".d.vue.ts")) {
         file = file.replace(/\.ts$/, "");
       }
       return fs.readFile(file);
@@ -47965,13 +47984,13 @@ function fileToScope(ctx, filename, asGlobal = false) {
   }
   const fs = resolveFS(ctx);
   const source = fs.readFile(filename) || "";
-  const body = parseFile(filename, source, ctx.options.babelParserPlugins);
+  const body = parseFile(filename, source, fs, ctx.options.babelParserPlugins);
   const scope = new TypeScope(filename, source, 0, recordImports(body));
   recordTypes(ctx, body, scope, asGlobal);
   fileToScopeCache.set(filename, scope);
   return scope;
 }
-function parseFile(filename, content, parserPlugins) {
+function parseFile(filename, content, fs, parserPlugins) {
   const ext = extname(filename);
   if (ext === ".ts" || ext === ".mts" || ext === ".tsx" || ext === ".mtsx") {
     return libExports.parse(content, {
@@ -47982,7 +48001,17 @@ function parseFile(filename, content, parserPlugins) {
       ),
       sourceType: "module"
     }).program.body;
-  } else if (ext === ".vue") {
+  }
+  const isUnknownTypeSource = !/\.[cm]?[tj]sx?$/.test(filename);
+  const arbitraryTypeSource = `${filename.slice(0, -ext.length)}.d${ext}.ts`;
+  const hasArbitraryTypeDeclaration = isUnknownTypeSource && fs.fileExists(arbitraryTypeSource);
+  if (hasArbitraryTypeDeclaration) {
+    return libExports.parse(fs.readFile(arbitraryTypeSource), {
+      plugins: resolveParserPlugins("ts", parserPlugins, true),
+      sourceType: "module"
+    }).program.body;
+  }
+  if (ext === ".vue") {
     const {
       descriptor: { script, scriptSetup }
     } = parse$2(content);
@@ -48303,6 +48332,14 @@ function inferRuntimeType(ctx, node, scope = node._ownerScope || ctxToScope(ctx)
       case "TSTypeReference": {
         const resolved = resolveTypeReference(ctx, node, scope);
         if (resolved) {
+          if (resolved.type === "TSTypeAliasDeclaration") {
+            return inferRuntimeType(
+              ctx,
+              resolved.typeAnnotation,
+              resolved._ownerScope,
+              isKeyOf
+            );
+          }
           return inferRuntimeType(ctx, resolved, resolved._ownerScope, isKeyOf);
         }
         if (node.typeName.type === "Identifier") {
@@ -48617,6 +48654,12 @@ function processDefineModel(ctx, node, declId) {
   if (!isCallOf(node, DEFINE_MODEL)) {
     return false;
   }
+  if (!declId) {
+    ctx.error(
+      "defineModel() must be assigned to a variable. For example: const model = defineModel()",
+      node
+    );
+  }
   ctx.hasDefineModelCall = true;
   const type = node.typeParameters && node.typeParameters.params[0] || void 0;
   let modelName;
@@ -49846,6 +49889,7 @@ let __temp${any}, __restore${any}
   if (destructureElements.length) {
     args += `, { ${destructureElements.join(", ")} }`;
   }
+  let templateMap;
   let returned;
   if (!options.inlineTemplate || !sfc.template && ctx.hasDefaultExportRender) {
     const allBindings = __spreadValues$1(__spreadValues$1({}, scriptBindings), setupBindings);
@@ -49871,7 +49915,7 @@ let __temp${any}, __restore${any}
       if (options.templateOptions && options.templateOptions.ssr) {
         hasInlinedSsrRenderFn = true;
       }
-      const { code, ast, preamble, tips, errors } = compileTemplate(__spreadProps(__spreadValues$1({
+      const { code, ast, preamble, tips, errors, map: map2 } = compileTemplate(__spreadProps(__spreadValues$1({
         filename,
         ast: sfc.template.ast,
         source: sfc.template.content,
@@ -49887,6 +49931,7 @@ let __temp${any}, __restore${any}
           bindingMetadata: ctx.bindingMetadata
         })
       }));
+      templateMap = map2;
       if (tips.length) {
         tips.forEach(warnOnce$1);
       }
@@ -50003,15 +50048,22 @@ ${exposeCall}`
 `
     );
   }
+  const content = ctx.s.toString();
+  let map = options.sourceMap !== false ? ctx.s.generateMap({
+    source: filename,
+    hires: true,
+    includeContent: true
+  }) : void 0;
+  if (templateMap && map) {
+    const offset = content.indexOf(returned);
+    const templateLineOffset = content.slice(0, offset).split(/\r?\n/).length - 1;
+    map = mergeSourceMaps(map, templateMap, templateLineOffset);
+  }
   return __spreadProps(__spreadValues$1({}, scriptSetup), {
     bindings: ctx.bindingMetadata,
     imports: ctx.userImports,
-    content: ctx.s.toString(),
-    map: options.sourceMap !== false ? ctx.s.generateMap({
-      source: filename,
-      hires: true,
-      includeContent: true
-    }) : void 0,
+    content,
+    map,
     scriptAst: scriptAst == null ? void 0 : scriptAst.body,
     scriptSetupAst: scriptSetupAst == null ? void 0 : scriptSetupAst.body,
     deps: ctx.deps ? [...ctx.deps] : void 0
@@ -50174,6 +50226,39 @@ function isStaticNode(node) {
   }
   return false;
 }
+function mergeSourceMaps(scriptMap, templateMap, templateLineOffset) {
+  const generator = new sourceMapExports.SourceMapGenerator();
+  const addMapping = (map, lineOffset = 0) => {
+    const consumer = new sourceMapExports.SourceMapConsumer(map);
+    consumer.sources.forEach((sourceFile) => {
+      generator._sources.add(sourceFile);
+      const sourceContent = consumer.sourceContentFor(sourceFile);
+      if (sourceContent != null) {
+        generator.setSourceContent(sourceFile, sourceContent);
+      }
+    });
+    consumer.eachMapping((m) => {
+      if (m.originalLine == null) return;
+      generator.addMapping({
+        generated: {
+          line: m.generatedLine + lineOffset,
+          column: m.generatedColumn
+        },
+        original: {
+          line: m.originalLine,
+          column: m.originalColumn
+        },
+        source: m.source,
+        name: m.name
+      });
+    });
+  };
+  addMapping(scriptMap);
+  addMapping(templateMap, templateLineOffset);
+  generator._sourceRoot = scriptMap.sourceRoot;
+  generator._file = scriptMap.file;
+  return generator.toJSON();
+}
 
 var __defProp = Object.defineProperty;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
@@ -50191,7 +50276,7 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
-const version = "3.5.14";
+const version = "3.5.15";
 const parseCache = parseCache$1;
 const errorMessages = __spreadValues(__spreadValues({}, errorMessages$1), DOMErrorMessages);
 const walk = walk$2;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/compiler-sfc",
-  "version": "3.5.14",
+  "version": "3.5.15",
   "description": "@vue/compiler-sfc",
   "main": "dist/compiler-sfc.cjs.js",
   "module": "dist/compiler-sfc.esm-browser.js",
@@ -47,10 +47,10 @@
     "magic-string": "^0.30.17",
     "postcss": "^8.5.3",
     "source-map-js": "^1.2.1",
-    "@vue/compiler-core": "3.5.14",
-    "@vue/compiler-dom": "3.5.14",
-    "@vue/compiler-ssr": "3.5.14",
-    "@vue/shared": "3.5.14"
+    "@vue/compiler-dom": "3.5.15",
+    "@vue/compiler-ssr": "3.5.15",
+    "@vue/compiler-core": "3.5.15",
+    "@vue/shared": "3.5.15"
   },
   "devDependencies": {
     "@babel/types": "^7.27.1",
@@ -62,6 +62,6 @@
     "postcss-modules": "^6.0.1",
     "postcss-selector-parser": "^7.1.0",
     "pug": "^3.0.3",
-    "sass": "^1.86.3"
+    "sass": "^1.89.0"
   }
 }