@vue/compiler-sfc 3.3.8 → 3.3.10

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

@@ -11,8 +11,8 @@ const EMPTY_OBJ = Object.freeze({}) ;
 const NOOP = () => {
 };
 const NO = () => false;
-const onRE = /^on[^a-z]/;
-const isOn = (key) => onRE.test(key);
+const isOn = (key) => key.charCodeAt(0) === 111 && key.charCodeAt(1) === 110 && // uppercase letter
+(key.charCodeAt(2) > 122 || key.charCodeAt(2) < 97);
 const extend = Object.assign;
 const hasOwnProperty$3 = Object.prototype.hasOwnProperty;
 const hasOwn = (val, key) => hasOwnProperty$3.call(val, key);
@@ -66,7 +66,7 @@ const PatchFlagNames = {
   [4]: `STYLE`,
   [8]: `PROPS`,
   [16]: `FULL_PROPS`,
-  [32]: `HYDRATE_EVENTS`,
+  [32]: `NEED_HYDRATION`,
   [64]: `STABLE_FRAGMENT`,
   [128]: `KEYED_FRAGMENT`,
   [256]: `UNKEYED_FRAGMENT`,
@@ -4162,11 +4162,6 @@ function newAsyncArrowScope() {
 function newExpressionScope() {
   return new ExpressionScope();
 }
-const PARAM = 0b0000,
-  PARAM_YIELD = 0b0001,
-  PARAM_AWAIT = 0b0010,
-  PARAM_RETURN = 0b0100,
-  PARAM_IN = 0b1000;
 class ProductionParameterHandler {
   constructor() {
     this.stacks = [];
@@ -4181,20 +4176,20 @@ class ProductionParameterHandler {
     return this.stacks[this.stacks.length - 1];
   }
   get hasAwait() {
-    return (this.currentFlags() & PARAM_AWAIT) > 0;
+    return (this.currentFlags() & 2) > 0;
   }
   get hasYield() {
-    return (this.currentFlags() & PARAM_YIELD) > 0;
+    return (this.currentFlags() & 1) > 0;
   }
   get hasReturn() {
-    return (this.currentFlags() & PARAM_RETURN) > 0;
+    return (this.currentFlags() & 4) > 0;
   }
   get hasIn() {
-    return (this.currentFlags() & PARAM_IN) > 0;
+    return (this.currentFlags() & 8) > 0;
   }
 }
 function functionFlags(isAsync, isGenerator) {
-  return (isAsync ? PARAM_AWAIT : 0) | (isGenerator ? PARAM_YIELD : 0);
+  return (isAsync ? 2 : 0) | (isGenerator ? 1 : 0);
 }
 class UtilParser extends Tokenizer {
   addExtra(node, key, value, enumerable = true) {
@@ -4391,9 +4386,9 @@ class UtilParser extends Tokenizer {
     };
   }
   enterInitialScopes() {
-    let paramFlags = PARAM;
+    let paramFlags = 0;
     if (this.inModule) {
-      paramFlags |= PARAM_AWAIT;
+      paramFlags |= 2;
     }
     this.scope.enter(1);
     this.prodParam.enter(paramFlags);
@@ -9436,7 +9431,7 @@ var typescript = superClass => class TypeScriptParserMixin extends superClass {
       node.body = inner;
     } else {
       this.scope.enter(256);
-      this.prodParam.enter(PARAM);
+      this.prodParam.enter(0);
       node.body = this.tsParseModuleBlock();
       this.prodParam.exit();
       this.scope.exit();
@@ -9454,7 +9449,7 @@ var typescript = superClass => class TypeScriptParserMixin extends superClass {
     }
     if (this.match(5)) {
       this.scope.enter(256);
-      this.prodParam.enter(PARAM);
+      this.prodParam.enter(0);
       node.body = this.tsParseModuleBlock();
       this.prodParam.exit();
       this.scope.exit();
@@ -9581,7 +9576,7 @@ var typescript = superClass => class TypeScriptParserMixin extends superClass {
       case "global":
         if (this.match(5)) {
           this.scope.enter(256);
-          this.prodParam.enter(PARAM);
+          this.prodParam.enter(0);
           const mod = node;
           mod.global = true;
           mod.id = expr;
@@ -12012,7 +12007,7 @@ class ExpressionParser extends LValParser {
     const oldLabels = this.state.labels;
     this.state.labels = [];
     if (isAsync) {
-      this.prodParam.enter(PARAM_AWAIT);
+      this.prodParam.enter(2);
       node.body = this.parseBlock();
       this.prodParam.exit();
     } else {
@@ -12576,7 +12571,7 @@ class ExpressionParser extends LValParser {
     this.scope.enter(2 | 4);
     let flags = functionFlags(isAsync, false);
     if (!this.match(5) && this.prodParam.hasIn) {
-      flags |= PARAM_IN;
+      flags |= 8;
     }
     this.prodParam.enter(flags);
     this.initFunction(node, isAsync);
@@ -12610,7 +12605,7 @@ class ExpressionParser extends LValParser {
       const oldStrict = this.state.strict;
       const oldLabels = this.state.labels;
       this.state.labels = [];
-      this.prodParam.enter(this.prodParam.currentFlags() | PARAM_RETURN);
+      this.prodParam.enter(this.prodParam.currentFlags() | 4);
       node.body = this.parseBlock(true, false, hasStrictModeDirective => {
         const nonSimple = !this.isSimpleParamList(node.params);
         if (hasStrictModeDirective && nonSimple) {
@@ -12951,9 +12946,9 @@ class ExpressionParser extends LValParser {
   }
   allowInAnd(callback) {
     const flags = this.prodParam.currentFlags();
-    const prodParamToSet = PARAM_IN & ~flags;
+    const prodParamToSet = 8 & ~flags;
     if (prodParamToSet) {
-      this.prodParam.enter(flags | PARAM_IN);
+      this.prodParam.enter(flags | 8);
       try {
         return callback();
       } finally {
@@ -12964,9 +12959,9 @@ class ExpressionParser extends LValParser {
   }
   disallowInAnd(callback) {
     const flags = this.prodParam.currentFlags();
-    const prodParamToClear = PARAM_IN & flags;
+    const prodParamToClear = 8 & flags;
     if (prodParamToClear) {
-      this.prodParam.enter(flags & ~PARAM_IN);
+      this.prodParam.enter(flags & ~8);
       try {
         return callback();
       } finally {
@@ -13881,7 +13876,7 @@ class StatementParser extends ExpressionParser {
       }
       body.push(stmt);
     }
-    afterBlockParse == null ? void 0 : afterBlockParse.call(this, hasStrictModeDirective);
+    afterBlockParse == null || afterBlockParse.call(this, hasStrictModeDirective);
     if (!oldStrict) {
       this.setStrict(false);
     }
@@ -14257,7 +14252,7 @@ class StatementParser extends ExpressionParser {
     this.scope.enter(64 | 128 | 16);
     const oldLabels = this.state.labels;
     this.state.labels = [];
-    this.prodParam.enter(PARAM);
+    this.prodParam.enter(0);
     const body = member.body = [];
     this.parseBlockOrModuleBlockBody(body, undefined, false, 8);
     this.prodParam.exit();
@@ -14329,7 +14324,7 @@ class StatementParser extends ExpressionParser {
   parseInitializer(node) {
     this.scope.enter(64 | 16);
     this.expressionScope.enter(newExpressionScope());
-    this.prodParam.enter(PARAM);
+    this.prodParam.enter(0);
     node.value = this.eat(29) ? this.parseMaybeAssignAllowIn() : null;
     this.expressionScope.exit();
     this.prodParam.exit();
@@ -15450,6 +15445,7 @@ function getMemoedVNodeCall(node) {
     return node;
   }
 }
+const forAliasRE = /([\s\S]*?)\s+(?:in|of)\s+([\s\S]*)/;
 
 const deprecationData = {
   ["COMPILER_IS_ON_ELEMENT"]: {
@@ -21124,6 +21120,15 @@ function walkBlockDeclarations(block, onIdent) {
       if (stmt.declare || !stmt.id)
         continue;
       onIdent(stmt.id);
+    } else if (stmt.type === "ForOfStatement" || stmt.type === "ForInStatement" || stmt.type === "ForStatement") {
+      const variable = stmt.type === "ForStatement" ? stmt.init : stmt.left;
+      if (variable && variable.type === "VariableDeclaration") {
+        for (const decl of variable.declarations) {
+          for (const id of extractIdentifiers(decl.id)) {
+            onIdent(id);
+          }
+        }
+      }
     }
   }
 }
@@ -21911,13 +21916,12 @@ function processFor(node, dir, context, processCodegen) {
       onExit();
   };
 }
-const forAliasRE$1 = /([\s\S]*?)\s+(?:in|of)\s+([\s\S]*)/;
 const forIteratorRE = /,([^,\}\]]*)(?:,([^,\}\]]*))?$/;
 const stripParensRE = /^\(|\)$/g;
 function parseForExpression(input, context) {
   const loc = input.loc;
   const exp = input.content;
-  const inMatch = exp.match(forAliasRE$1);
+  const inMatch = exp.match(forAliasRE);
   if (!inMatch)
     return;
   const [, LHS, RHS] = inMatch;
@@ -22479,6 +22483,10 @@ function resolveSetupReference(name, context) {
       `${context.helperString(UNREF)}(${fromMaybeRef})`
     ) : `$setup[${JSON.stringify(fromMaybeRef)}]`;
   }
+  const fromProps = checkType("props");
+  if (fromProps) {
+    return `${context.helperString(UNREF)}(${context.inline ? "__props" : "$props"}[${JSON.stringify(fromProps)}])`;
+  }
 }
 function buildProps(node, context, props = node.props, isComponent, isDynamicComponent, ssr = false) {
   const { tag, loc: elementLoc, children } = node;
@@ -22519,6 +22527,9 @@ function buildProps(node, context, props = node.props, isComponent, isDynamicCom
       if (isEventHandler && isReservedProp(name)) {
         hasVnodeHook = true;
       }
+      if (isEventHandler && value.type === 14) {
+        value = value.arguments[0];
+      }
       if (value.type === 20 || (value.type === 4 || value.type === 8) && getConstantType(value, context) > 0) {
         return;
       }
@@ -22584,7 +22595,7 @@ function buildProps(node, context, props = node.props, isComponent, isDynamicCom
         )
       );
     } else {
-      const { name, arg, exp, loc } = prop;
+      const { name, arg, exp, loc, modifiers } = prop;
       const isVBind = name === "bind";
       const isVOn = name === "on";
       if (name === "slot") {
@@ -22644,6 +22655,9 @@ function buildProps(node, context, props = node.props, isComponent, isDynamicCom
         }
         continue;
       }
+      if (isVBind && modifiers.includes("prop")) {
+        patchFlag |= 32;
+      }
       const directiveTransform = context.directiveTransforms[name];
       if (directiveTransform) {
         const { props: props2, needRuntime } = directiveTransform(prop, node, context);
@@ -25906,8 +25920,8 @@ const transformModel = (dir, node, context) => {
     );
   }
   function checkDuplicatedValue() {
-    const value = findProp(node, "value");
-    if (value) {
+    const value = findDir(node, "bind");
+    if (value && isStaticArgOf(value.arg, "value")) {
       context.onError(
         createDOMCompilerError(
           60,
@@ -26477,6 +26491,7 @@ var CompilerDOM = /*#__PURE__*/Object.freeze({
   extractIdentifiers: extractIdentifiers,
   findDir: findDir,
   findProp: findProp,
+  forAliasRE: forAliasRE,
   generate: generate,
   generateCodeFrame: generateCodeFrame,
   getBaseTransformPreset: getBaseTransformPreset,
@@ -26829,9 +26844,16 @@ function normalizePath(p) {
   return normalize(p.replace(windowsSlashRE, "/"));
 }
 const joinPaths = (path.posix || path).join;
-const escapeSymbolsRE = /[ !"#$%&'()*+,./:;<=>?@[\\\]^`{|}~]/g;
-function getEscapedKey(key) {
-  return escapeSymbolsRE.test(key) ? JSON.stringify(key) : key;
+const propNameEscapeSymbolsRE = /[ !"#$%&'()*+,./:;<=>?@[\\\]^`{|}~\-]/;
+function getEscapedPropName(key) {
+  return propNameEscapeSymbolsRE.test(key) ? JSON.stringify(key) : key;
+}
+const cssVarNameEscapeSymbolsRE = /[ !"#$%&'()*+,./:;<=>?@[\\\]^`{|}~]/g;
+function getEscapedCssVarName(key, doubleEscape) {
+  return key.replace(
+    cssVarNameEscapeSymbolsRE,
+    (s) => doubleEscape ? `\\\\${s}` : `\\${s}`
+  );
 }
 
 function pad$1 (hash, len) {
@@ -26908,15 +26930,15 @@ const CSS_VARS_HELPER = `useCssVars`;
 function genCssVarsFromList(vars, id, isProd, isSSR = false) {
   return `{
   ${vars.map(
-    (key) => `"${isSSR ? `--` : ``}${genVarName(id, key, isProd)}": (${key})`
+    (key) => `"${isSSR ? `--` : ``}${genVarName(id, key, isProd, isSSR)}": (${key})`
   ).join(",\n  ")}
 }`;
 }
-function genVarName(id, raw, isProd) {
+function genVarName(id, raw, isProd, isSSR = false) {
   if (isProd) {
     return hash(id + raw);
   } else {
-    return `${id}-${raw.replace(escapeSymbolsRE, (s) => `\\${s}`)}`;
+    return `${id}-${getEscapedCssVarName(raw, isSSR)}`;
   }
 }
 function normalizeExpression(exp) {
@@ -27326,7 +27348,6 @@ function resolveTemplateUsageCheckString(sfc) {
   templateUsageCheckCache.set(content, code);
   return code;
 }
-const forAliasRE = /([\s\S]*?)\s+(?:in|of)\s+([\s\S]*)/;
 function processExp(exp, dir) {
   if (/ as\s+\w|<.*>|:/.test(exp)) {
     if (dir === "slot") {
@@ -27505,22 +27526,29 @@ function parse$7(source, {
       descriptor.script = null;
     }
   }
+  let templateColumnOffset = 0;
+  if (descriptor.template && (descriptor.template.lang === "pug" || descriptor.template.lang === "jade")) {
+    [descriptor.template.content, templateColumnOffset] = dedent(
+      descriptor.template.content
+    );
+  }
   if (sourceMap) {
-    const genMap = (block) => {
+    const genMap = (block, columnOffset = 0) => {
       if (block && !block.src) {
         block.map = generateSourceMap(
           filename,
           source,
           block.content,
           sourceRoot,
-          !pad || block.type === "template" ? block.loc.start.line - 1 : 0
+          !pad || block.type === "template" ? block.loc.start.line - 1 : 0,
+          columnOffset
         );
       }
     };
-    genMap(descriptor.template);
+    genMap(descriptor.template, templateColumnOffset);
     genMap(descriptor.script);
-    descriptor.styles.forEach(genMap);
-    descriptor.customBlocks.forEach(genMap);
+    descriptor.styles.forEach((s) => genMap(s));
+    descriptor.customBlocks.forEach((s) => genMap(s));
   }
   descriptor.cssVars = parseCssVars(descriptor);
   const slottedRE = /(?:::v-|:)slotted\(/;
@@ -27598,7 +27626,7 @@ function createBlock(node, source, pad) {
 const splitRE = /\r?\n/g;
 const emptyRE = /^(?:\/\/)?\s*$/;
 const replaceRE = /./g;
-function generateSourceMap(filename, source, generated, sourceRoot, lineOffset) {
+function generateSourceMap(filename, source, generated, sourceRoot, lineOffset, columnOffset) {
   const map = new SourceMapGenerator$6({
     file: filename.replace(/\\/g, "/"),
     sourceRoot: sourceRoot.replace(/\\/g, "/")
@@ -27614,7 +27642,7 @@ function generateSourceMap(filename, source, generated, sourceRoot, lineOffset)
             source: filename,
             original: {
               line: originalLine,
-              column: i
+              column: i + columnOffset
             },
             generated: {
               line: generatedLine,
@@ -27665,6 +27693,26 @@ function hmrShouldReload(prevImports, next) {
   }
   return false;
 }
+function dedent(s) {
+  const lines = s.split("\n");
+  const minIndent = lines.reduce(function(minIndent2, line) {
+    var _a, _b;
+    if (line.trim() === "") {
+      return minIndent2;
+    }
+    const indent = ((_b = (_a = line.match(/^\s*/)) == null ? void 0 : _a[0]) == null ? void 0 : _b.length) || 0;
+    return Math.min(indent, minIndent2);
+  }, Infinity);
+  if (minIndent === 0) {
+    return [s, minIndent];
+  }
+  return [
+    lines.map(function(line) {
+      return line.slice(minIndent);
+    }).join("\n"),
+    minIndent
+  ];
+}
 
 /*! https://mths.be/punycode v1.4.1 by @mathias */
 
@@ -33189,7 +33237,7 @@ function compile(template, options = {}) {
       // reusing core v-bind
       bind: transformBind,
       on: transformOn$1,
-      // model and show has dedicated SSR handling
+      // model and show have dedicated SSR handling
       model: ssrTransformModel,
       show: ssrTransformShow,
       // the following are ignored during SSR
@@ -37591,7 +37639,7 @@ let Root$2 = root$2;
 
 let Processor$1 = class Processor {
   constructor(plugins = []) {
-    this.version = '8.4.31';
+    this.version = '8.4.32';
     this.plugins = this.normalize(plugins);
   }
 
@@ -41383,10 +41431,19 @@ function rewriteSelector(id, selector, selectorRoot, slotted = false) {
         return false;
       }
     }
-    if (n.type !== "pseudo" && n.type !== "combinator") {
+    if (n.type !== "pseudo" && n.type !== "combinator" || n.type === "pseudo" && (n.value === ":is" || n.value === ":where")) {
       node = n;
     }
   });
+  if (node) {
+    const { type, value } = node;
+    if (type === "pseudo" && (value === ":is" || value === ":where")) {
+      node.nodes.forEach(
+        (value2) => rewriteSelector(id, value2, selectorRoot, slotted)
+      );
+      shouldInject = false;
+    }
+  }
   if (node) {
     node.spaces.after = "";
   } else {
@@ -47073,7 +47130,7 @@ function resolveParserPlugins(lang, userPlugins, dts = false) {
   }
   if (lang === "ts" || lang === "tsx") {
     plugins.push(["typescript", { dts }]);
-    if (!plugins.includes("decorators")) {
+    if (!userPlugins || !userPlugins.includes("decorators")) {
       plugins.push("decorators-legacy");
     }
   }
@@ -47115,33 +47172,39 @@ class TypeScope {
     this.exportedDeclares = /* @__PURE__ */ Object.create(null);
   }
 }
-function resolveTypeElements(ctx, node, scope) {
+function resolveTypeElements(ctx, node, scope, typeParameters) {
   if (node._resolvedElements) {
     return node._resolvedElements;
   }
   return node._resolvedElements = innerResolveTypeElements(
     ctx,
     node,
-    node._ownerScope || scope || ctxToScope(ctx)
+    node._ownerScope || scope || ctxToScope(ctx),
+    typeParameters
   );
 }
-function innerResolveTypeElements(ctx, node, scope) {
+function innerResolveTypeElements(ctx, node, scope, typeParameters) {
   var _a, _b;
   switch (node.type) {
     case "TSTypeLiteral":
-      return typeElementsToMap(ctx, node.members, scope);
+      return typeElementsToMap(ctx, node.members, scope, typeParameters);
     case "TSInterfaceDeclaration":
-      return resolveInterfaceMembers(ctx, node, scope);
+      return resolveInterfaceMembers(ctx, node, scope, typeParameters);
     case "TSTypeAliasDeclaration":
     case "TSParenthesizedType":
-      return resolveTypeElements(ctx, node.typeAnnotation, scope);
+      return resolveTypeElements(
+        ctx,
+        node.typeAnnotation,
+        scope,
+        typeParameters
+      );
     case "TSFunctionType": {
       return { props: {}, calls: [node] };
     }
     case "TSUnionType":
     case "TSIntersectionType":
       return mergeElements(
-        node.types.map((t) => resolveTypeElements(ctx, t, scope)),
+        node.types.map((t) => resolveTypeElements(ctx, t, scope, typeParameters)),
         node.type
       );
     case "TSMappedType":
@@ -47158,20 +47221,53 @@ function innerResolveTypeElements(ctx, node, scope) {
       const typeName = getReferenceName(node);
       if ((typeName === "ExtractPropTypes" || typeName === "ExtractPublicPropTypes") && node.typeParameters && ((_a = scope.imports[typeName]) == null ? void 0 : _a.source) === "vue") {
         return resolveExtractPropTypes(
-          resolveTypeElements(ctx, node.typeParameters.params[0], scope),
+          resolveTypeElements(
+            ctx,
+            node.typeParameters.params[0],
+            scope,
+            typeParameters
+          ),
           scope
         );
       }
       const resolved = resolveTypeReference(ctx, node, scope);
       if (resolved) {
-        return resolveTypeElements(ctx, resolved, resolved._ownerScope);
+        const typeParams = /* @__PURE__ */ Object.create(null);
+        if ((resolved.type === "TSTypeAliasDeclaration" || resolved.type === "TSInterfaceDeclaration") && resolved.typeParameters && node.typeParameters) {
+          resolved.typeParameters.params.forEach((p, i) => {
+            let param = typeParameters && typeParameters[p.name];
+            if (!param)
+              param = node.typeParameters.params[i];
+            typeParams[p.name] = param;
+          });
+        }
+        return resolveTypeElements(
+          ctx,
+          resolved,
+          resolved._ownerScope,
+          typeParams
+        );
       } else {
         if (typeof typeName === "string") {
+          if (typeParameters && typeParameters[typeName]) {
+            return resolveTypeElements(
+              ctx,
+              typeParameters[typeName],
+              scope,
+              typeParameters
+            );
+          }
           if (
             // @ts-ignore
             SupportedBuiltinsSet.has(typeName)
           ) {
-            return resolveBuiltin(ctx, node, typeName, scope);
+            return resolveBuiltin(
+              ctx,
+              node,
+              typeName,
+              scope,
+              typeParameters
+            );
           } else if (typeName === "ReturnType" && node.typeParameters) {
             const ret = resolveReturnType(
               ctx,
@@ -47220,10 +47316,14 @@ function innerResolveTypeElements(ctx, node, scope) {
   }
   return ctx.error(`Unresolvable type: ${node.type}`, node, scope);
 }
-function typeElementsToMap(ctx, elements, scope = ctxToScope(ctx)) {
+function typeElementsToMap(ctx, elements, scope = ctxToScope(ctx), typeParameters) {
   const res = { props: {} };
   for (const e of elements) {
     if (e.type === "TSPropertySignature" || e.type === "TSMethodSignature") {
+      if (typeParameters) {
+        scope = createChildScope(scope);
+        Object.assign(scope.types, typeParameters);
+      }
       e._ownerScope = scope;
       const name = getId(e.key);
       if (name && !e.computed) {
@@ -47286,20 +47386,29 @@ function createProperty(key, typeAnnotation, scope, optional) {
     _ownerScope: scope
   };
 }
-function resolveInterfaceMembers(ctx, node, scope) {
-  const base = typeElementsToMap(ctx, node.body.body, node._ownerScope);
+function resolveInterfaceMembers(ctx, node, scope, typeParameters) {
+  const base = typeElementsToMap(
+    ctx,
+    node.body.body,
+    node._ownerScope,
+    typeParameters
+  );
   if (node.extends) {
     for (const ext of node.extends) {
       if (ext.leadingComments && ext.leadingComments.some((c) => c.value.includes("@vue-ignore"))) {
         continue;
       }
       try {
-        const { props } = resolveTypeElements(ctx, ext, scope);
+        const { props, calls } = resolveTypeElements(ctx, ext, scope);
         for (const key in props) {
           if (!hasOwn(base.props, key)) {
             base.props[key] = props[key];
           }
         }
+        if (calls) {
+          ;
+          (base.calls || (base.calls = [])).push(...calls);
+        }
       } catch (e) {
         ctx.error(
           `Failed to resolve extends base type.
@@ -47457,8 +47566,13 @@ const SupportedBuiltinsSet = /* @__PURE__ */ new Set([
   "Pick",
   "Omit"
 ]);
-function resolveBuiltin(ctx, node, name, scope) {
-  const t = resolveTypeElements(ctx, node.typeParameters.params[0], scope);
+function resolveBuiltin(ctx, node, name, scope, typeParameters) {
+  const t = resolveTypeElements(
+    ctx,
+    node.typeParameters.params[0],
+    scope,
+    typeParameters
+  );
   switch (name) {
     case "Partial": {
       const res2 = { props: {}, calls: t.calls };
@@ -47586,7 +47700,21 @@ function resolveGlobalScope(ctx) {
 let ts;
 let loadTS;
 function registerTS(_loadTS) {
-  loadTS = _loadTS;
+  loadTS = () => {
+    try {
+      return _loadTS();
+    } catch (err) {
+      if (typeof err.message === "string" && err.message.includes("Cannot find module")) {
+        throw new Error(
+          'Failed to load TypeScript, which is required for resolving imported types. Please make sure "typescript" is installed as a project dependency.'
+        );
+      } else {
+        throw new Error(
+          "Failed to load TypeScript for resolving imported types."
+        );
+      }
+    }
+  };
 }
 function resolveFS(ctx) {
   if (ctx.fs) {
@@ -47620,7 +47748,12 @@ function resolveTypeFromImport(ctx, node, name, scope) {
   return resolveTypeReference(ctx, node, sourceScope, imported, true);
 }
 function importSourceToScope(ctx, node, scope, source) {
-  const fs = resolveFS(ctx);
+  let fs;
+  try {
+    fs = resolveFS(ctx);
+  } catch (err) {
+    return ctx.error(err.message, node, scope);
+  }
   if (!fs) {
     return ctx.error(
       `No fs option provided to \`compileScript\` in non-Node environment. File system access is required for resolving imported types.`,
@@ -47630,7 +47763,11 @@ function importSourceToScope(ctx, node, scope, source) {
   }
   let resolved = scope.resolvedImportSources[source];
   if (!resolved) {
-    if (source.startsWith(".")) {
+    if (source.startsWith("..")) {
+      const osSpecificJoinFn = joinPaths;
+      const filename = osSpecificJoinFn(dirname$2(scope.filename), source);
+      resolved = resolveExt(filename, fs);
+    } else if (source.startsWith(".")) {
       const filename = joinPaths(dirname$2(scope.filename), source);
       resolved = resolveExt(filename, fs);
     } else {
@@ -47741,14 +47878,7 @@ function moduleDeclToScope(ctx, node, parentScope) {
   if (node._resolvedChildScope) {
     return node._resolvedChildScope;
   }
-  const scope = new TypeScope(
-    parentScope.filename,
-    parentScope.source,
-    parentScope.offset,
-    Object.create(parentScope.imports),
-    Object.create(parentScope.types),
-    Object.create(parentScope.declares)
-  );
+  const scope = createChildScope(parentScope);
   if (node.body.type === "TSModuleDeclaration") {
     const decl = node.body;
     decl._ownerScope = scope;
@@ -47759,6 +47889,16 @@ function moduleDeclToScope(ctx, node, parentScope) {
   }
   return node._resolvedChildScope = scope;
 }
+function createChildScope(parentScope) {
+  return new TypeScope(
+    parentScope.filename,
+    parentScope.source,
+    parentScope.offset,
+    Object.create(parentScope.imports),
+    Object.create(parentScope.types),
+    Object.create(parentScope.declares)
+  );
+}
 const importExportRE = /^Import|^Export/;
 function recordTypes(ctx, body, scope, asGlobal = false) {
   const { types, declares, exportedTypes, exportedDeclares, imports } = scope;
@@ -47880,7 +48020,7 @@ function recordType(node, types, declares, overwriteId) {
         types[overwriteId || getId(node.id)] = node;
       break;
     case "TSTypeAliasDeclaration":
-      types[node.id.name] = node.typeAnnotation;
+      types[node.id.name] = node.typeParameters ? node : node.typeAnnotation;
       break;
     case "TSDeclareFunction":
       if (node.id)
@@ -48413,14 +48553,14 @@ function genRuntimeProps(ctx) {
       const defaults = [];
       for (const key in ctx.propsDestructuredBindings) {
         const d = genDestructuredDefaultValue(ctx, key);
-        const finalKey = getEscapedKey(key);
+        const finalKey = getEscapedPropName(key);
         if (d)
           defaults.push(
             `${finalKey}: ${d.valueString}${d.needSkipFactory ? `, __skip_${finalKey}: true` : ``}`
           );
       }
       if (defaults.length) {
-        propsDecls = `${ctx.helper(
+        propsDecls = `/*#__PURE__*/${ctx.helper(
           `mergeDefaults`
         )}(${propsDecls}, {
   ${defaults.join(",\n  ")}
@@ -48432,7 +48572,9 @@ function genRuntimeProps(ctx) {
   }
   const modelsDecls = genModelProps(ctx);
   if (propsDecls && modelsDecls) {
-    return `${ctx.helper("mergeModels")}(${propsDecls}, ${modelsDecls})`;
+    return `/*#__PURE__*/${ctx.helper(
+      "mergeModels"
+    )}(${propsDecls}, ${modelsDecls})`;
   } else {
     return modelsDecls || propsDecls;
   }
@@ -48454,9 +48596,9 @@ function genRuntimePropsFromTypes(ctx) {
     ${propStrings.join(",\n    ")}
   }`;
   if (ctx.propsRuntimeDefaults && !hasStaticDefaults) {
-    propsDecls = `${ctx.helper("mergeDefaults")}(${propsDecls}, ${ctx.getString(
-      ctx.propsRuntimeDefaults
-    )})`;
+    propsDecls = `/*#__PURE__*/${ctx.helper(
+      "mergeDefaults"
+    )}(${propsDecls}, ${ctx.getString(ctx.propsRuntimeDefaults)})`;
   }
   return propsDecls;
 }
@@ -48505,7 +48647,7 @@ function genRuntimePropFromType(ctx, { key, required, type, skipCheck }, hasStat
       }
     }
   }
-  const finalKey = getEscapedKey(key);
+  const finalKey = getEscapedPropName(key);
   if (!ctx.options.isProd) {
     return `${finalKey}: { ${concatStrings([
       `type: ${toRuntimeTypeString(type)}`,
@@ -48793,7 +48935,9 @@ function genRuntimeEmits(ctx) {
   }
   if (ctx.hasDefineModelCall) {
     let modelEmitsDecl = `[${Object.keys(ctx.modelDecls).map((n) => JSON.stringify(`update:${n}`)).join(", ")}]`;
-    emitsDecl = emitsDecl ? `${ctx.helper("mergeModels")}(${emitsDecl}, ${modelEmitsDecl})` : modelEmitsDecl;
+    emitsDecl = emitsDecl ? `/*#__PURE__*/${ctx.helper(
+      "mergeModels"
+    )}(${emitsDecl}, ${modelEmitsDecl})` : modelEmitsDecl;
   }
   return emitsDecl;
 }
@@ -49777,7 +49921,7 @@ function isStaticNode(node) {
   return false;
 }
 
-const version = "3.3.8";
+const version = "3.3.10";
 const parseCache = parseCache$1;
 const walk = walk$1;