@vue/language-core 3.2.7 → 3.2.8

package/index.d.ts

@@ -10,6 +10,6 @@ export * from './lib/utils/forEachTemplateNode';
 export * from './lib/utils/parseSfc';
 export * from './lib/utils/shared';
 export * from './lib/virtualCode';
-export * as names from './lib/codegen/names';
+export { names } from './lib/codegen/names';
 export { tsCodegen } from './lib/plugins/vue-tsx';
 export * from '@volar/language-core';

package/index.js

@@ -10,31 +10,9 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tsCodegen = exports.names = void 0;
 __exportStar(require("./lib/codegen/template"), exports);
@@ -49,7 +27,8 @@ __exportStar(require("./lib/utils/forEachTemplateNode"), exports);
 __exportStar(require("./lib/utils/parseSfc"), exports);
 __exportStar(require("./lib/utils/shared"), exports);
 __exportStar(require("./lib/virtualCode"), exports);
-exports.names = __importStar(require("./lib/codegen/names"));
+var names_1 = require("./lib/codegen/names");
+Object.defineProperty(exports, "names", { enumerable: true, get: function () { return names_1.names; } });
 var vue_tsx_1 = require("./lib/plugins/vue-tsx");
 Object.defineProperty(exports, "tsCodegen", { enumerable: true, get: function () { return vue_tsx_1.tsCodegen; } });
 __exportStar(require("@volar/language-core"), exports);

package/lib/codegen/names.d.ts

@@ -1,26 +1,73 @@
-export declare const ctx = "__VLS_ctx";
-export declare const dollars = "__VLS_dollars";
-export declare const slots = "__VLS_slots";
-export declare const props = "__VLS_props";
-export declare const defaults = "__VLS_defaults";
-export declare const defaultModels = "__VLS_defaultModels";
-export declare const modelEmit = "__VLS_modelEmit";
-export declare const emit = "__VLS_emit";
-export declare const exposed = "__VLS_exposed";
-export declare const setup = "__VLS_setup";
-export declare const components = "__VLS_components";
-export declare const directives = "__VLS_directives";
-export declare const intrinsics = "__VLS_intrinsics";
-export declare const _export = "__VLS_export";
-export declare const ModelProps = "__VLS_ModelProps";
-export declare const Props = "__VLS_Props";
-export declare const Slots = "__VLS_Slots";
-export declare const InheritedAttrs = "__VLS_InheritedAttrs";
-export declare const TemplateRefs = "__VLS_TemplateRefs";
-export declare const RootEl = "__VLS_RootEl";
-export declare const ModelEmit = "__VLS_ModelEmit";
-export declare const EmitProps = "__VLS_EmitProps";
-export declare const Emit = "__VLS_Emit";
-export declare const SetupExposed = "__VLS_SetupExposed";
-export declare const PublicProps = "__VLS_PublicProps";
-export declare const StyleModules = "__VLS_StyleModules";
+declare const raw: {
+    base: string;
+    export: string;
+    components: string;
+    componentsOption: string;
+    ctx: string;
+    defaultModels: string;
+    defaults: string;
+    directives: string;
+    directivesOption: string;
+    dollars: string;
+    emit: string;
+    exposed: string;
+    intrinsics: string;
+    modelEmit: string;
+    props: string;
+    propsOption: string;
+    self: string;
+    setup: string;
+    slots: string;
+    src: string;
+    Emit: string;
+    EmitProps: string;
+    GlobalComponents: string;
+    InheritedAttrs: string;
+    LocalComponents: string;
+    LocalDirectives: string;
+    ModelEmit: string;
+    ModelProps: string;
+    Props: string;
+    PublicProps: string;
+    RootEl: string;
+    SetupExposed: string;
+    Slots: string;
+    StyleModules: string;
+    StyleScopedClasses: string;
+    TemplateRefs: string;
+    asFunctionalComponent0: string;
+    asFunctionalComponent1: string;
+    asFunctionalDirective: string;
+    asFunctionalElement0: string;
+    asFunctionalElement1: string;
+    asFunctionalSlot: string;
+    directiveBindingRestFields: string;
+    functionalComponentArgsRest: string;
+    tryAsConstant: string;
+    vFor: string;
+    vSlot: string;
+    ConstructorOverloads: string;
+    Elements: string;
+    EmitsToProps: string;
+    FunctionalComponent0: string;
+    FunctionalComponent1: string;
+    FunctionalComponentCtx: string;
+    FunctionalComponentProps: string;
+    IsAny: string;
+    IsFunction: string;
+    NormalizeComponentEvent: string;
+    NormalizeEmits: string;
+    OverloadUnion: string;
+    OverloadUnionInner: string;
+    PickNotAny: string;
+    PrettifyGlobal: string;
+    ResolveDirectives: string;
+    ResolveEmits: string;
+    ShortEmits: string;
+    ShortEmitsToObject: string;
+    SpreadMerge: string;
+    UnionToIntersection: string;
+    WithComponent: string;
+};
+export declare const names: typeof raw;
+export {};

package/lib/codegen/names.js

@@ -1,30 +1,78 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StyleModules = exports.PublicProps = exports.SetupExposed = exports.Emit = exports.EmitProps = exports.ModelEmit = exports.RootEl = exports.TemplateRefs = exports.InheritedAttrs = exports.Slots = exports.Props = exports.ModelProps = exports._export = exports.intrinsics = exports.directives = exports.components = exports.setup = exports.exposed = exports.emit = exports.modelEmit = exports.defaultModels = exports.defaults = exports.props = exports.slots = exports.dollars = exports.ctx = void 0;
-exports.ctx = '__VLS_ctx';
-exports.dollars = '__VLS_dollars';
-exports.slots = '__VLS_slots';
-exports.props = '__VLS_props';
-exports.defaults = '__VLS_defaults';
-exports.defaultModels = '__VLS_defaultModels';
-exports.modelEmit = '__VLS_modelEmit';
-exports.emit = '__VLS_emit';
-exports.exposed = '__VLS_exposed';
-exports.setup = '__VLS_setup';
-exports.components = '__VLS_components';
-exports.directives = '__VLS_directives';
-exports.intrinsics = '__VLS_intrinsics';
-exports._export = '__VLS_export';
-exports.ModelProps = '__VLS_ModelProps';
-exports.Props = '__VLS_Props';
-exports.Slots = '__VLS_Slots';
-exports.InheritedAttrs = '__VLS_InheritedAttrs';
-exports.TemplateRefs = '__VLS_TemplateRefs';
-exports.RootEl = '__VLS_RootEl';
-exports.ModelEmit = '__VLS_ModelEmit';
-exports.EmitProps = '__VLS_EmitProps';
-exports.Emit = '__VLS_Emit';
-exports.SetupExposed = '__VLS_SetupExposed';
-exports.PublicProps = '__VLS_PublicProps';
-exports.StyleModules = '__VLS_StyleModules';
+exports.names = void 0;
+const raw = {
+    base: '',
+    export: '',
+    components: '',
+    componentsOption: '',
+    ctx: '',
+    defaultModels: '',
+    defaults: '',
+    directives: '',
+    directivesOption: '',
+    dollars: '',
+    emit: '',
+    exposed: '',
+    intrinsics: '',
+    modelEmit: '',
+    props: '',
+    propsOption: '',
+    self: '',
+    setup: '',
+    slots: '',
+    src: '',
+    Emit: '',
+    EmitProps: '',
+    GlobalComponents: '',
+    InheritedAttrs: '',
+    LocalComponents: '',
+    LocalDirectives: '',
+    ModelEmit: '',
+    ModelProps: '',
+    Props: '',
+    PublicProps: '',
+    RootEl: '',
+    SetupExposed: '',
+    Slots: '',
+    StyleModules: '',
+    StyleScopedClasses: '',
+    TemplateRefs: '',
+    // #region template helpers
+    asFunctionalComponent0: '',
+    asFunctionalComponent1: '',
+    asFunctionalDirective: '',
+    asFunctionalElement0: '',
+    asFunctionalElement1: '',
+    asFunctionalSlot: '',
+    directiveBindingRestFields: '',
+    functionalComponentArgsRest: '',
+    tryAsConstant: '',
+    vFor: '',
+    vSlot: '',
+    ConstructorOverloads: '',
+    Elements: '',
+    EmitsToProps: '',
+    FunctionalComponent0: '',
+    FunctionalComponent1: '',
+    FunctionalComponentCtx: '',
+    FunctionalComponentProps: '',
+    IsAny: '',
+    IsFunction: '',
+    NormalizeComponentEvent: '',
+    NormalizeEmits: '',
+    OverloadUnion: '',
+    OverloadUnionInner: '',
+    PickNotAny: '',
+    PrettifyGlobal: '',
+    ResolveDirectives: '',
+    ResolveEmits: '',
+    ShortEmits: '',
+    ShortEmitsToObject: '',
+    SpreadMerge: '',
+    UnionToIntersection: '',
+    WithComponent: '',
+    // #endregion
+};
+exports.names = Object.fromEntries(Object.keys(raw).map(key => [key, `__VLS_${key}`]));
 //# sourceMappingURL=names.js.map

package/lib/codegen/script/component.js

@@ -1,66 +1,27 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateComponent = generateComponent;
 const codeFeatures_1 = require("../codeFeatures");
-const names = __importStar(require("../names"));
+const names_1 = require("../names");
 const utils_1 = require("../utils");
 const merge_1 = require("../utils/merge");
 function* generateComponent(options, ctx, scriptSetup, scriptSetupRanges) {
     yield `(await import('${options.vueCompilerOptions.lib}')).defineComponent({${utils_1.newLine}`;
-    const returns = [];
     if (scriptSetupRanges.defineExpose) {
-        returns.push([names.exposed]);
-    }
-    if (returns.length) {
-        yield `setup: () => (`;
-        yield* (0, merge_1.generateSpreadMerge)(returns);
-        yield `),${utils_1.newLine}`;
+        yield `setup: () => ${names_1.names.exposed},${utils_1.newLine}`;
     }
     const emitOptionCodes = [...generateEmitsOption(options, scriptSetupRanges)];
     yield* emitOptionCodes;
     yield* generatePropsOption(options, ctx, scriptSetup, scriptSetupRanges, !!emitOptionCodes.length);
     if (options.vueCompilerOptions.target >= 3.5
         && options.vueCompilerOptions.inferComponentDollarRefs
-        && options.templateAndStyleTypes.has(names.TemplateRefs)) {
-        yield `__typeRefs: {} as ${names.TemplateRefs},${utils_1.newLine}`;
+        && options.templateAndStyleTypes.has(names_1.names.TemplateRefs)) {
+        yield `__typeRefs: {} as ${names_1.names.TemplateRefs},${utils_1.newLine}`;
     }
     if (options.vueCompilerOptions.target >= 3.5
         && options.vueCompilerOptions.inferComponentDollarEl
-        && options.templateAndStyleTypes.has(names.RootEl)) {
-        yield `__typeEl: {} as ${names.RootEl},${utils_1.newLine}`;
+        && options.templateAndStyleTypes.has(names_1.names.RootEl)) {
+        yield `__typeEl: {} as ${names_1.names.RootEl},${utils_1.newLine}`;
     }
     yield `})`;
 }
@@ -68,14 +29,14 @@ function* generateEmitsOption(options, scriptSetupRanges) {
     const optionCodes = [];
     const typeOptionCodes = [];
     if (scriptSetupRanges.defineModel.length) {
-        optionCodes.push([`{} as __VLS_NormalizeEmits<typeof ${names.modelEmit}>`]);
-        typeOptionCodes.push([names.ModelEmit]);
+        optionCodes.push([`{} as ${names_1.names.NormalizeEmits}<typeof ${names_1.names.modelEmit}>`]);
+        typeOptionCodes.push([names_1.names.ModelEmit]);
     }
     if (scriptSetupRanges.defineEmits) {
         const { name, typeArg, hasUnionTypeArg } = scriptSetupRanges.defineEmits;
-        optionCodes.push([`{} as __VLS_NormalizeEmits<typeof ${name ?? names.emit}>`]);
+        optionCodes.push([`{} as ${names_1.names.NormalizeEmits}<typeof ${name ?? names_1.names.emit}>`]);
         if (typeArg && !hasUnionTypeArg) {
-            typeOptionCodes.push([names.Emit]);
+            typeOptionCodes.push([names_1.names.Emit]);
         }
         else {
             typeOptionCodes.length = 0;
@@ -95,12 +56,12 @@ function* generateEmitsOption(options, scriptSetupRanges) {
 function* generatePropsOption(options, ctx, scriptSetup, scriptSetupRanges, hasEmitsOption) {
     const optionGenerates = [];
     const typeOptionGenerates = [];
-    if (options.templateAndStyleTypes.has(names.InheritedAttrs)) {
+    if (options.templateAndStyleTypes.has(names_1.names.InheritedAttrs)) {
         const attrsType = hasEmitsOption
-            ? `Omit<${names.InheritedAttrs}, keyof ${names.EmitProps}>`
-            : names.InheritedAttrs;
+            ? `Omit<${names_1.names.InheritedAttrs}, keyof ${names_1.names.EmitProps}>`
+            : names_1.names.InheritedAttrs;
         optionGenerates.push(function* () {
-            const propsType = `__VLS_PickNotAny<${ctx.localTypes.OmitIndexSignature}<${attrsType}>, {}>`;
+            const propsType = `${names_1.names.PickNotAny}<${ctx.localTypes.OmitIndexSignature}<${attrsType}>, {}>`;
             const optionType = `${ctx.localTypes.TypePropsToOption}<${propsType}>`;
             yield `{} as ${optionType}`;
         });
@@ -108,18 +69,18 @@ function* generatePropsOption(options, ctx, scriptSetup, scriptSetupRanges, hasE
             yield `{} as ${attrsType}`;
         });
     }
-    if (ctx.generatedTypes.has(names.PublicProps)) {
+    if (ctx.generatedTypes.has(names_1.names.PublicProps)) {
         if (options.vueCompilerOptions.target < 3.6) {
             optionGenerates.push(function* () {
-                let propsType = `${ctx.localTypes.TypePropsToOption}<${names.PublicProps}>`;
+                let propsType = `${ctx.localTypes.TypePropsToOption}<${names_1.names.PublicProps}>`;
                 if (scriptSetupRanges.withDefaults?.arg) {
-                    propsType = `${ctx.localTypes.WithDefaults}<${propsType}, typeof ${names.defaults}>`;
+                    propsType = `${ctx.localTypes.WithDefaults}<${propsType}, typeof ${names_1.names.defaults}>`;
                 }
                 yield `{} as ${propsType}`;
             });
         }
         typeOptionGenerates.push(function* () {
-            yield `{} as ${names.PublicProps}`;
+            yield `{} as ${names_1.names.PublicProps}`;
         });
     }
     if (scriptSetupRanges.defineProps?.arg) {
@@ -132,7 +93,7 @@ function* generatePropsOption(options, ctx, scriptSetup, scriptSetupRanges, hasE
     if (useTypeOption) {
         if (options.vueCompilerOptions.target >= 3.6
             && scriptSetupRanges.withDefaults?.arg) {
-            yield `__defaults: ${names.defaults},${utils_1.newLine}`;
+            yield `__defaults: ${names_1.names.defaults},${utils_1.newLine}`;
         }
         yield `__typeProps: `;
         yield* (0, merge_1.generateSpreadMerge)(typeOptionGenerates.map(g => g()));

package/lib/codegen/script/index.js

@@ -36,13 +36,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateScript = generate;
 const path = __importStar(require("path-browserify"));
 const codeFeatures_1 = require("../codeFeatures");
-const names = __importStar(require("../names"));
+const names_1 = require("../names");
 const utils_1 = require("../utils");
 const boundary_1 = require("../utils/boundary");
 const context_1 = require("./context");
 const scriptSetup_1 = require("./scriptSetup");
 const template_1 = require("./template");
-const exportExpression = `{} as typeof ${names._export}`;
+const exportExpression = `{} as typeof ${names_1.names.export}`;
 function generate(options) {
     const ctx = (0, context_1.createScriptCodegenContext)(options);
     const codeGenerator = generateWorker(options, ctx);
@@ -60,7 +60,7 @@ function* generateWorker(options, ctx) {
         else if (src.endsWith('.tsx')) {
             src = src.slice(0, -'.tsx'.length) + '.jsx';
         }
-        yield `import __VLS_default from `;
+        yield `import ${names_1.names.src} from `;
         const token = yield* (0, boundary_1.startBoundary)('main', script.src.offset, {
             ...codeFeatures_1.codeFeatures.all,
             ...src !== script.src.text ? codeFeatures_1.codeFeatures.navigationWithoutRename : {},
@@ -71,8 +71,8 @@ function* generateWorker(options, ctx) {
         yield `'`;
         yield (0, boundary_1.endBoundary)(token, script.src.offset + script.src.text.length);
         yield utils_1.endOfLine;
-        yield `export default __VLS_default;${utils_1.endOfLine}`;
-        yield* (0, template_1.generateTemplate)(options, ctx, '__VLS_default');
+        yield `export default ${names_1.names.src}${utils_1.endOfLine}`;
+        yield* (0, template_1.generateTemplate)(options, ctx, names_1.names.src);
     }
     // <script> + <script setup>
     else if (script && scriptRanges && scriptSetup && scriptSetupRanges) {
@@ -81,14 +81,14 @@ function* generateWorker(options, ctx) {
         let selfType;
         const { exportDefault } = scriptRanges;
         if (exportDefault) {
-            yield* generateScriptWithExportDefault(ctx, script, scriptRanges, exportDefault, vueCompilerOptions, selfType = '__VLS_self');
+            yield* generateScriptWithExportDefault(ctx, script, scriptRanges, exportDefault, vueCompilerOptions, selfType = names_1.names.self);
         }
         else {
             yield* (0, utils_1.generateSfcBlockSection)(script, 0, script.content.length, codeFeatures_1.codeFeatures.all);
             yield `export default ${exportExpression}${utils_1.endOfLine}`;
         }
         // <script setup>
-        yield* generateExportDeclareEqual(scriptSetup, names._export);
+        yield* generateExportDeclareEqual(scriptSetup, names_1.names.export);
         if (scriptSetup.generic) {
             yield* (0, scriptSetup_1.generateGeneric)(options, ctx, scriptSetup, scriptSetupRanges, scriptSetup.generic, (0, scriptSetup_1.generateSetupFunction)(options, ctx, scriptSetup, scriptSetupRanges, (0, template_1.generateTemplate)(options, ctx, selfType)));
         }
@@ -102,12 +102,12 @@ function* generateWorker(options, ctx) {
     else if (scriptSetup && scriptSetupRanges) {
         yield* (0, scriptSetup_1.generateScriptSetupImports)(scriptSetup, scriptSetupRanges);
         if (scriptSetup.generic) {
-            yield* generateExportDeclareEqual(scriptSetup, names._export);
+            yield* generateExportDeclareEqual(scriptSetup, names_1.names.export);
             yield* (0, scriptSetup_1.generateGeneric)(options, ctx, scriptSetup, scriptSetupRanges, scriptSetup.generic, (0, scriptSetup_1.generateSetupFunction)(options, ctx, scriptSetup, scriptSetupRanges, (0, template_1.generateTemplate)(options, ctx)));
         }
         else {
             // no script block, generate script setup code at root
-            yield* (0, scriptSetup_1.generateSetupFunction)(options, ctx, scriptSetup, scriptSetupRanges, (0, template_1.generateTemplate)(options, ctx), generateExportDeclareEqual(scriptSetup, names._export));
+            yield* (0, scriptSetup_1.generateSetupFunction)(options, ctx, scriptSetup, scriptSetupRanges, (0, template_1.generateTemplate)(options, ctx), generateExportDeclareEqual(scriptSetup, names_1.names.export));
         }
         yield `export default ${exportExpression}${utils_1.endOfLine}`;
     }
@@ -115,13 +115,13 @@ function* generateWorker(options, ctx) {
     else if (script && scriptRanges) {
         const { exportDefault } = scriptRanges;
         if (exportDefault) {
-            yield* generateScriptWithExportDefault(ctx, script, scriptRanges, exportDefault, vueCompilerOptions, names._export, (0, template_1.generateTemplate)(options, ctx, names._export));
+            yield* generateScriptWithExportDefault(ctx, script, scriptRanges, exportDefault, vueCompilerOptions, names_1.names.export, (0, template_1.generateTemplate)(options, ctx, names_1.names.export));
         }
         else {
             yield* (0, utils_1.generateSfcBlockSection)(script, 0, script.content.length, codeFeatures_1.codeFeatures.all);
-            yield* generateExportDeclareEqual(script, names._export);
+            yield* generateExportDeclareEqual(script, names_1.names.export);
             yield `(await import('${vueCompilerOptions.lib}')).defineComponent({})${utils_1.endOfLine}`;
-            yield* (0, template_1.generateTemplate)(options, ctx, names._export);
+            yield* (0, template_1.generateTemplate)(options, ctx, names_1.names.export);
             yield `export default ${exportExpression}${utils_1.endOfLine}`;
         }
     }