@vue/compiler-sfc 3.5.13 → 3.5.15

package/dist/compiler-sfc.cjs.js

@@ -1,5 +1,5 @@
 /**
-* @vue/compiler-sfc v3.5.13
+* @vue/compiler-sfc v3.5.15
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -4882,29 +4882,39 @@ function requireContainer$1 () {
 		    return this.removeAll();
 		  };
 		  _proto.insertAfter = function insertAfter(oldNode, newNode) {
+		    var _this$nodes;
 		    newNode.parent = this;
 		    var oldIndex = this.index(oldNode);
-		    this.nodes.splice(oldIndex + 1, 0, newNode);
+		    var resetNode = [];
+		    for (var i = 2; i < arguments.length; i++) {
+		      resetNode.push(arguments[i]);
+		    }
+		    (_this$nodes = this.nodes).splice.apply(_this$nodes, [oldIndex + 1, 0, newNode].concat(resetNode));
 		    newNode.parent = this;
 		    var index;
 		    for (var id in this.indexes) {
 		      index = this.indexes[id];
 		      if (oldIndex < index) {
-		        this.indexes[id] = index + 1;
+		        this.indexes[id] = index + arguments.length - 1;
 		      }
 		    }
 		    return this;
 		  };
 		  _proto.insertBefore = function insertBefore(oldNode, newNode) {
+		    var _this$nodes2;
 		    newNode.parent = this;
 		    var oldIndex = this.index(oldNode);
-		    this.nodes.splice(oldIndex, 0, newNode);
+		    var resetNode = [];
+		    for (var i = 2; i < arguments.length; i++) {
+		      resetNode.push(arguments[i]);
+		    }
+		    (_this$nodes2 = this.nodes).splice.apply(_this$nodes2, [oldIndex, 0, newNode].concat(resetNode));
 		    newNode.parent = this;
 		    var index;
 		    for (var id in this.indexes) {
 		      index = this.indexes[id];
 		      if (index >= oldIndex) {
-		        this.indexes[id] = index + 1;
+		        this.indexes[id] = index + arguments.length - 1;
 		      }
 		    }
 		    return this;
@@ -4930,7 +4940,7 @@ function requireContainer$1 () {
 		   * Return the most specific node at the line and column number given.
 		   * The source location is based on the original parsed location, locations aren't
 		   * updated as selector nodes are mutated.
-		   * 
+		   *
 		   * Note that this location is relative to the location of the first character
 		   * of the selector, and not the location of the selector in the overall document
 		   * when used in conjunction with postcss.
@@ -8029,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/")) {
@@ -8113,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")) {
@@ -8157,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) {
@@ -12056,8 +12080,6 @@ var hasRequiredLodash_camelcase;
 function requireLodash_camelcase () {
 	if (hasRequiredLodash_camelcase) return lodash_camelcase;
 	hasRequiredLodash_camelcase = 1;
-	/** Used as references for various `Number` constants. */
-	var INFINITY = 1 / 0;
 
 	/** `Object#toString` result references. */
 	var symbolTag = '[object Symbol]';
@@ -12393,7 +12415,7 @@ function requireLodash_camelcase () {
 	    return symbolToString ? symbolToString.call(value) : '';
 	  }
 	  var result = (value + '');
-	  return (result == '0' && (1 / value) == -INFINITY) ? '-0' : result;
+	  return (result == '0' && (1 / value) == -Infinity) ? '-0' : result;
 	}
 
 	/**
@@ -12408,7 +12430,7 @@ function requireLodash_camelcase () {
 	function castSlice(array, start, end) {
 	  var length = array.length;
 	  end = end === undefined ? length : end;
-	  return (!start && end >= length) ? array : baseSlice(array, start, end);
+	  return (false && end >= length) ? array : baseSlice(array, start, end);
 	}
 
 	/**
@@ -13161,7 +13183,7 @@ function requireWasmHash () {
 	// 64 is the maximum chunk size for every possible wasm hash implementation
 	// 4 is the maximum number of bytes per char for string encoding (max is utf-8)
 	// ~3 makes sure that it's always a block of 4 chars, so avoid partially encoded bytes for base64
-	const MAX_SHORT_STRING = Math.floor((65536 - 64) / 4) & ~3;
+	const MAX_SHORT_STRING = Math.floor((65536 - 64) / 4) & -4;
 
 	class WasmHash {
 	  /**
@@ -19796,7 +19818,7 @@ const ${as} = {}`);
   ast.forEach((node) => {
     if (node.type === "ExportDefaultDeclaration") {
       if (node.declaration.type === "ClassDeclaration" && node.declaration.id) {
-        let start = node.declaration.decorators && node.declaration.decorators.length > 0 ? node.declaration.decorators[node.declaration.decorators.length - 1].end : node.start;
+        const start = node.declaration.decorators && node.declaration.decorators.length > 0 ? node.declaration.decorators[node.declaration.decorators.length - 1].end : node.start;
         s.overwrite(start, node.declaration.id.start, ` class `);
         s.append(`
 const ${as} = ${node.declaration.id.name}`);
@@ -20858,7 +20880,7 @@ class AST {
             return [s, unescape(this.toString()), false, false];
         }
         // XXX abstract out this map method
-        let bodyDotAllowed = !repeated || allowDot || dot || !startNoDot
+        let bodyDotAllowed = !repeated || allowDot || dot || false
             ? ''
             : this.#partsToRegExp(true);
         if (bodyDotAllowed === body) {
@@ -22560,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);
@@ -22694,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;
@@ -22738,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, {
@@ -22755,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);
@@ -23076,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") {
@@ -23390,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;
@@ -23926,7 +23972,7 @@ function transformDestructuredProps(ctx, vueImportAliases) {
     },
     leave(node, parent) {
       parent && parentStack.pop();
-      if (node.type === "BlockStatement" && !CompilerDOM.isFunctionType(parent) || CompilerDOM.isFunctionType(node)) {
+      if (node.type === "BlockStatement" && !CompilerDOM.isFunctionType(parent) || CompilerDOM.isFunctionType(node) || node.type === "CatchClause") {
         popScope();
       }
     }
@@ -24600,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 = {
@@ -24628,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,
@@ -24645,6 +24692,7 @@ let __temp${any}, __restore${any}
           bindingMetadata: ctx.bindingMetadata
         }
       });
+      templateMap = map2;
       if (tips.length) {
         tips.forEach(warnOnce);
       }
@@ -24761,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
@@ -24808,7 +24863,7 @@ function walkDeclaration(from, node, bindings, userImportAliases, hoistStatic, i
         } else if (isConst) {
           if (isCallOf(
             init,
-            (m) => m === userImportAliases["ref"] || m === userImportAliases["computed"] || m === userImportAliases["shallowRef"] || m === userImportAliases["customRef"] || m === userImportAliases["toRef"] || m === DEFINE_MODEL
+            (m) => m === userImportAliases["ref"] || m === userImportAliases["computed"] || m === userImportAliases["shallowRef"] || m === userImportAliases["customRef"] || m === userImportAliases["toRef"] || m === userImportAliases["useTemplateRef"] || m === DEFINE_MODEL
           )) {
             bindingType = "setup-ref";
           } else {
@@ -24933,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.13";
+const version = "3.5.15";
 const parseCache = parseCache$1;
 const errorMessages = {
   ...CompilerDOM.errorMessages,

package/dist/compiler-sfc.d.ts

@@ -1,6 +1,6 @@
 import * as _babel_types from '@babel/types';
 import { Statement, Expression, TSType, Node, Program, CallExpression, ObjectPattern, TSModuleDeclaration, TSPropertySignature, TSMethodSignature, TSCallSignatureDeclaration, TSFunctionType } from '@babel/types';
-import { RootNode, CompilerOptions, CodegenResult, ParserOptions, CompilerError, RawSourceMap, SourceLocation, BindingMetadata as BindingMetadata$1 } from '@vue/compiler-core';
+import { RootNode, CompilerOptions, CodegenResult, ParserOptions, RawSourceMap, CompilerError, SourceLocation, BindingMetadata as BindingMetadata$1 } from '@vue/compiler-core';
 export { BindingMetadata, CompilerError, CompilerOptions, extractIdentifiers, generateCodeFrame, isInDestructureAssignment, isStaticProperty, walkIdentifiers } from '@vue/compiler-core';
 import { ParserPlugin } from '@babel/parser';
 export { parse as babelParse } from '@babel/parser';
@@ -482,3 +482,4 @@ export declare const walk: any;
  */
 export declare const shouldTransformRef: () => boolean;
 
+