@vue/language-core 2.1.10 → 2.2.2

package/lib/codegen/script/componentSelf.js

@@ -2,15 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateComponentSelf = generateComponentSelf;
 const path = require("path-browserify");
-const common_1 = require("../common");
+const codeFeatures_1 = require("../codeFeatures");
+const utils_1 = require("../utils");
 const component_1 = require("./component");
-const index_1 = require("./index");
 const template_1 = require("./template");
 function* generateComponentSelf(options, ctx, templateCodegenCtx) {
     if (options.sfc.scriptSetup && options.scriptSetupRanges) {
-        yield `const __VLS_self = (await import('${options.vueCompilerOptions.lib}')).defineComponent({${common_1.newLine}`;
-        yield `setup() {${common_1.newLine}`;
-        yield `return {${common_1.newLine}`;
+        yield `const __VLS_self = (await import('${options.vueCompilerOptions.lib}')).defineComponent({${utils_1.newLine}`;
+        yield `setup() {${utils_1.newLine}`;
+        yield `return {${utils_1.newLine}`;
         if (ctx.bypassDefineComponent) {
             yield* (0, component_1.generateComponentSetupReturns)(options.scriptSetupRanges);
         }
@@ -22,15 +22,15 @@ function* generateComponentSelf(options, ctx, templateCodegenCtx) {
                 ? [options.sfc.script.content, options.scriptRanges.bindings]
                 : ['', []],
         ]) {
-            for (const expose of bindings) {
-                const varName = content.substring(expose.start, expose.end);
+            for (const { range } of bindings) {
+                const varName = content.slice(range.start, range.end);
                 if (!templateUsageVars.has(varName) && !templateCodegenCtx.accessExternalVariables.has(varName)) {
                     continue;
                 }
                 const templateOffset = options.getGeneratedLength();
                 yield `${varName}: ${varName} as typeof `;
                 const scriptOffset = options.getGeneratedLength();
-                yield `${varName},${common_1.newLine}`;
+                yield `${varName},${utils_1.newLine}`;
                 options.linkedCodeMappings.push({
                     sourceOffsets: [scriptOffset],
                     generatedOffsets: [templateOffset],
@@ -39,8 +39,8 @@ function* generateComponentSelf(options, ctx, templateCodegenCtx) {
                 });
             }
         }
-        yield `}${common_1.endOfLine}`; // return {
-        yield `},${common_1.newLine}`; // setup() {
+        yield `}${utils_1.endOfLine}`; // return {
+        yield `},${utils_1.newLine}`; // setup() {
         if (options.sfc.scriptSetup && options.scriptSetupRanges && !ctx.bypassDefineComponent) {
             const emitOptionCodes = [...(0, component_1.generateEmitsOption)(options, options.scriptSetupRanges)];
             for (const code of emitOptionCodes) {
@@ -50,15 +50,15 @@ function* generateComponentSelf(options, ctx, templateCodegenCtx) {
         }
         if (options.sfc.script && options.scriptRanges?.exportDefault?.args) {
             const { args } = options.scriptRanges.exportDefault;
-            yield (0, common_1.generateSfcBlockSection)(options.sfc.script, args.start + 1, args.end - 1, index_1.codeFeatures.all);
+            yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, args.start + 1, args.end - 1, codeFeatures_1.codeFeatures.all);
         }
-        yield `})${common_1.endOfLine}`; // defineComponent {
+        yield `})${utils_1.endOfLine}`; // defineComponent {
     }
     else if (options.sfc.script) {
-        yield `let __VLS_self!: typeof import('./${path.basename(options.fileName)}').default${common_1.endOfLine}`;
+        yield `let __VLS_self!: typeof import('./${path.basename(options.fileName)}').default${utils_1.endOfLine}`;
     }
     else {
-        yield `const __VLS_self = (await import('${options.vueCompilerOptions.lib}')).defineComponent({})${common_1.endOfLine}`;
+        yield `const __VLS_self = (await import('${options.vueCompilerOptions.lib}')).defineComponent({})${utils_1.endOfLine}`;
     }
 }
 //# sourceMappingURL=componentSelf.js.map

package/lib/codegen/script/context.d.ts

@@ -19,7 +19,7 @@ export declare function createScriptCodegenContext(options: ScriptCodegenOptions
         readonly PrettifyLocal: string;
         readonly OmitKeepDiscriminatedUnion: string;
         readonly WithDefaults: string;
-        readonly WithTemplateSlots: string;
+        readonly WithSlots: string;
         readonly PropsChildren: string;
         readonly TypePropsToOption: string;
         readonly OmitIndexSignature: string;

package/lib/codegen/script/context.js

@@ -11,8 +11,8 @@ function createScriptCodegenContext(options) {
         scriptSetupGeneratedOffset: undefined,
         bypassDefineComponent: options.lang === 'js' || options.lang === 'jsx',
         bindingNames: new Set([
-            ...options.scriptRanges?.bindings.map(range => options.sfc.script.content.substring(range.start, range.end)) ?? [],
-            ...options.scriptSetupRanges?.bindings.map(range => options.sfc.scriptSetup.content.substring(range.start, range.end)) ?? [],
+            ...options.scriptRanges?.bindings.map(({ range }) => options.sfc.script.content.slice(range.start, range.end)) ?? [],
+            ...options.scriptSetupRanges?.bindings.map(({ range }) => options.sfc.scriptSetup.content.slice(range.start, range.end)) ?? [],
         ]),
         localTypes,
         inlayHints,

package/lib/codegen/script/index.d.ts

@@ -2,32 +2,27 @@ import type { Mapping } from '@volar/language-core';
 import type * as ts from 'typescript';
 import type { ScriptRanges } from '../../parsers/scriptRanges';
 import type { ScriptSetupRanges } from '../../parsers/scriptSetupRanges';
-import type { Code, Sfc, VueCodeInformation, VueCompilerOptions } from '../../types';
+import type { Code, Sfc, VueCompilerOptions } from '../../types';
 import type { TemplateCodegenContext } from '../template/context';
 import { ScriptCodegenContext } from './context';
-export declare const codeFeatures: {
-    all: VueCodeInformation;
-    none: VueCodeInformation;
-    verification: VueCodeInformation;
-    navigation: VueCodeInformation;
-    navigationWithoutRename: VueCodeInformation;
-};
 export interface ScriptCodegenOptions {
-    fileName: string;
     ts: typeof ts;
     compilerOptions: ts.CompilerOptions;
     vueCompilerOptions: VueCompilerOptions;
     sfc: Sfc;
+    edited: boolean;
+    fileName: string;
     lang: string;
     scriptRanges: ScriptRanges | undefined;
     scriptSetupRanges: ScriptSetupRanges | undefined;
     templateCodegen: TemplateCodegenContext & {
         codes: Code[];
     } | undefined;
-    edited: boolean;
-    appendGlobalTypes: boolean;
+    destructuredPropNames: Set<string>;
+    templateRefNames: Set<string>;
     getGeneratedLength: () => number;
     linkedCodeMappings: Mapping[];
+    appendGlobalTypes: boolean;
 }
 export declare function generateScript(options: ScriptCodegenOptions): Generator<Code, ScriptCodegenContext>;
 export declare function generateScriptSectionPartiallyEnding(source: string, end: number, mark: string): Generator<Code>;

package/lib/codegen/script/index.js

@@ -1,39 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.codeFeatures = void 0;
 exports.generateScript = generateScript;
 exports.generateScriptSectionPartiallyEnding = generateScriptSectionPartiallyEnding;
 const path = require("path-browserify");
-const common_1 = require("../common");
+const codeFeatures_1 = require("../codeFeatures");
 const globalTypes_1 = require("../globalTypes");
+const utils_1 = require("../utils");
 const componentSelf_1 = require("./componentSelf");
 const context_1 = require("./context");
 const scriptSetup_1 = require("./scriptSetup");
 const src_1 = require("./src");
 const styleModulesType_1 = require("./styleModulesType");
 const template_1 = require("./template");
-exports.codeFeatures = {
-    all: {
-        verification: true,
-        completion: true,
-        semantic: true,
-        navigation: true,
-    },
-    none: {},
-    verification: {
-        verification: true,
-    },
-    navigation: {
-        navigation: true,
-    },
-    navigationWithoutRename: {
-        navigation: {
-            shouldRename() {
-                return false;
-            },
-        },
-    },
-};
 function* generateScript(options) {
     const ctx = (0, context_1.createScriptCodegenContext)(options);
     if (options.vueCompilerOptions.__setupedGlobalTypes) {
@@ -43,10 +21,10 @@ function* generateScript(options) {
             if (relativePath !== globalTypes.absolutePath && !relativePath.startsWith('./') && !relativePath.startsWith('../')) {
                 relativePath = './' + relativePath;
             }
-            yield `/// <reference types="${relativePath}" />${common_1.newLine}`;
+            yield `/// <reference types="${relativePath}" />${utils_1.newLine}`;
         }
         else {
-            yield `/// <reference types=".vue-global-types/${options.vueCompilerOptions.lib}_${options.vueCompilerOptions.target}_${options.vueCompilerOptions.strictTemplates}.d.ts" />${common_1.newLine}`;
+            yield `/// <reference types=".vue-global-types/${(0, globalTypes_1.getGlobalTypesFileName)(options.vueCompilerOptions)}" />${utils_1.newLine}`;
         }
     }
     else {
@@ -61,14 +39,13 @@ function* generateScript(options) {
             && options.sfc.script.content[exportDefault.expression.start] === '{';
         if (options.sfc.scriptSetup && options.scriptSetupRanges) {
             yield* (0, scriptSetup_1.generateScriptSetupImports)(options.sfc.scriptSetup, options.scriptSetupRanges);
-            yield* generateDefineProp(options, options.sfc.scriptSetup);
             if (exportDefault) {
-                yield (0, common_1.generateSfcBlockSection)(options.sfc.script, 0, exportDefault.expression.start, exports.codeFeatures.all);
+                yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, 0, exportDefault.expression.start, codeFeatures_1.codeFeatures.all);
                 yield* (0, scriptSetup_1.generateScriptSetup)(options, ctx, options.sfc.scriptSetup, options.scriptSetupRanges);
-                yield (0, common_1.generateSfcBlockSection)(options.sfc.script, exportDefault.expression.end, options.sfc.script.content.length, exports.codeFeatures.all);
+                yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, exportDefault.expression.end, options.sfc.script.content.length, codeFeatures_1.codeFeatures.all);
             }
             else {
-                yield (0, common_1.generateSfcBlockSection)(options.sfc.script, 0, options.sfc.script.content.length, exports.codeFeatures.all);
+                yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, 0, options.sfc.script.content.length, codeFeatures_1.codeFeatures.all);
                 yield* generateScriptSectionPartiallyEnding(options.sfc.script.name, options.sfc.script.content.length, '#3632/both.vue');
                 yield* (0, scriptSetup_1.generateScriptSetup)(options, ctx, options.sfc.scriptSetup, options.scriptSetupRanges);
             }
@@ -93,32 +70,31 @@ function* generateScript(options) {
                     ? options.vueCompilerOptions.optionsWrapper[1]
                     : '[Missing optionsWrapper[1]]',
             });
-            yield (0, common_1.generateSfcBlockSection)(options.sfc.script, 0, exportDefault.expression.start, exports.codeFeatures.all);
+            yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, 0, exportDefault.expression.start, codeFeatures_1.codeFeatures.all);
             yield options.vueCompilerOptions.optionsWrapper[0];
-            yield (0, common_1.generateSfcBlockSection)(options.sfc.script, exportDefault.expression.start, exportDefault.expression.end, exports.codeFeatures.all);
+            yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, exportDefault.expression.start, exportDefault.expression.end, codeFeatures_1.codeFeatures.all);
             yield options.vueCompilerOptions.optionsWrapper[1];
-            yield (0, common_1.generateSfcBlockSection)(options.sfc.script, exportDefault.expression.end, options.sfc.script.content.length, exports.codeFeatures.all);
+            yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, exportDefault.expression.end, options.sfc.script.content.length, codeFeatures_1.codeFeatures.all);
         }
         else if (classBlockEnd !== undefined) {
             if (options.vueCompilerOptions.skipTemplateCodegen) {
-                yield (0, common_1.generateSfcBlockSection)(options.sfc.script, 0, options.sfc.script.content.length, exports.codeFeatures.all);
+                yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, 0, options.sfc.script.content.length, codeFeatures_1.codeFeatures.all);
             }
             else {
-                yield (0, common_1.generateSfcBlockSection)(options.sfc.script, 0, classBlockEnd, exports.codeFeatures.all);
-                yield `__VLS_template = () => {${common_1.newLine}`;
+                yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, 0, classBlockEnd, codeFeatures_1.codeFeatures.all);
+                yield `__VLS_template = () => {${utils_1.newLine}`;
                 const templateCodegenCtx = yield* (0, template_1.generateTemplate)(options, ctx);
                 yield* (0, componentSelf_1.generateComponentSelf)(options, ctx, templateCodegenCtx);
-                yield `}${common_1.endOfLine}`;
-                yield (0, common_1.generateSfcBlockSection)(options.sfc.script, classBlockEnd, options.sfc.script.content.length, exports.codeFeatures.all);
+                yield `}${utils_1.endOfLine}`;
+                yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, classBlockEnd, options.sfc.script.content.length, codeFeatures_1.codeFeatures.all);
             }
         }
         else {
-            yield (0, common_1.generateSfcBlockSection)(options.sfc.script, 0, options.sfc.script.content.length, exports.codeFeatures.all);
+            yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, 0, options.sfc.script.content.length, codeFeatures_1.codeFeatures.all);
         }
     }
     else if (options.sfc.scriptSetup && options.scriptSetupRanges) {
         yield* (0, scriptSetup_1.generateScriptSetupImports)(options.sfc.scriptSetup, options.scriptSetupRanges);
-        yield* generateDefineProp(options, options.sfc.scriptSetup);
         yield* (0, scriptSetup_1.generateScriptSetup)(options, ctx, options.sfc.scriptSetup, options.scriptSetupRanges);
     }
     if (options.sfc.script) {
@@ -128,44 +104,26 @@ function* generateScript(options) {
         yield* generateScriptSectionPartiallyEnding(options.sfc.scriptSetup.name, options.sfc.scriptSetup.content.length, '#4569/main.vue');
     }
     if (!ctx.generatedTemplate) {
-        yield `function __VLS_template() {${common_1.newLine}`;
         const templateCodegenCtx = yield* (0, template_1.generateTemplate)(options, ctx);
-        yield `}${common_1.endOfLine}`;
         yield* (0, componentSelf_1.generateComponentSelf)(options, ctx, templateCodegenCtx);
     }
     // #4788
     yield* (0, styleModulesType_1.generateStyleModulesType)(options, ctx);
     if (options.edited) {
-        yield `type __VLS_IntrinsicElementsCompletion = __VLS_IntrinsicElements${common_1.endOfLine}`;
+        yield `type __VLS_IntrinsicElementsCompletion = __VLS_IntrinsicElements${utils_1.endOfLine}`;
     }
     yield* ctx.localTypes.generate([...ctx.localTypes.getUsedNames()]);
     if (options.appendGlobalTypes) {
-        yield (0, globalTypes_1.generateGlobalTypes)(options.vueCompilerOptions.lib, options.vueCompilerOptions.target, options.vueCompilerOptions.strictTemplates);
+        yield (0, globalTypes_1.generateGlobalTypes)(options.vueCompilerOptions);
     }
     if (options.sfc.scriptSetup) {
-        yield ['', 'scriptSetup', options.sfc.scriptSetup.content.length, exports.codeFeatures.verification];
+        yield ['', 'scriptSetup', options.sfc.scriptSetup.content.length, codeFeatures_1.codeFeatures.verification];
     }
     return ctx;
 }
 function* generateScriptSectionPartiallyEnding(source, end, mark) {
     yield `;`;
-    yield ['', source, end, exports.codeFeatures.verification];
-    yield `/* PartiallyEnd: ${mark} */${common_1.newLine}`;
-}
-function* generateDefineProp(options, scriptSetup) {
-    const definePropProposalA = scriptSetup.content.trimStart().startsWith('// @experimentalDefinePropProposal=kevinEdition') || options.vueCompilerOptions.experimentalDefinePropProposal === 'kevinEdition';
-    const definePropProposalB = scriptSetup.content.trimStart().startsWith('// @experimentalDefinePropProposal=johnsonEdition') || options.vueCompilerOptions.experimentalDefinePropProposal === 'johnsonEdition';
-    if (definePropProposalA || definePropProposalB) {
-        yield `type __VLS_PropOptions<T> = Exclude<import('${options.vueCompilerOptions.lib}').Prop<T>, import('${options.vueCompilerOptions.lib}').PropType<T>>${common_1.endOfLine}`;
-        if (definePropProposalA) {
-            yield `declare function defineProp<T>(name: string, options: ({ required: true } | { default: T }) & __VLS_PropOptions<T>): import('${options.vueCompilerOptions.lib}').ComputedRef<T>${common_1.endOfLine}`;
-            yield `declare function defineProp<T>(name?: string, options?: __VLS_PropOptions<T>): import('${options.vueCompilerOptions.lib}').ComputedRef<T | undefined>${common_1.endOfLine}`;
-        }
-        if (definePropProposalB) {
-            yield `declare function defineProp<T>(value: T | (() => T), required?: boolean, options?: __VLS_PropOptions<T>): import('${options.vueCompilerOptions.lib}').ComputedRef<T>${common_1.endOfLine}`;
-            yield `declare function defineProp<T>(value: T | (() => T) | undefined, required: true, options?: __VLS_PropOptions<T>): import('${options.vueCompilerOptions.lib}').ComputedRef<T>${common_1.endOfLine}`;
-            yield `declare function defineProp<T>(value?: T | (() => T), required?: boolean, options?: __VLS_PropOptions<T>): import('${options.vueCompilerOptions.lib}').ComputedRef<T | undefined>${common_1.endOfLine}`;
-        }
-    }
+    yield ['', source, end, codeFeatures_1.codeFeatures.verification];
+    yield `/* PartiallyEnd: ${mark} */${utils_1.newLine}`;
 }
 //# sourceMappingURL=index.js.map

package/lib/codegen/script/scriptSetup.d.ts

@@ -1,6 +1,6 @@
 import type { ScriptSetupRanges } from '../../parsers/scriptSetupRanges';
 import type { Code, Sfc } from '../../types';
 import type { ScriptCodegenContext } from './context';
-import { ScriptCodegenOptions } from './index';
+import { type ScriptCodegenOptions } from './index';
 export declare function generateScriptSetupImports(scriptSetup: NonNullable<Sfc['scriptSetup']>, scriptSetupRanges: ScriptSetupRanges): Generator<Code>;
 export declare function generateScriptSetup(options: ScriptCodegenOptions, ctx: ScriptCodegenContext, scriptSetup: NonNullable<Sfc['scriptSetup']>, scriptSetupRanges: ScriptSetupRanges): Generator<Code>;