@vue/language-core 3.1.4 → 3.1.6

package/lib/codegen/script/index.js

@@ -1,49 +1,79 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateScript = generate;
-exports.generateConstExport = generateConstExport;
 const path = require("path-browserify");
 const codeFeatures_1 = require("../codeFeatures");
+const names = require("../names");
 const utils_1 = require("../utils");
-const wrapWith_1 = require("../utils/wrapWith");
+const boundary_1 = require("../utils/boundary");
 const context_1 = require("./context");
 const scriptSetup_1 = require("./scriptSetup");
 const src_1 = require("./src");
 const template_1 = require("./template");
+const exportExpression = `{} as typeof ${names._export}`;
 function generate(options) {
-    const context = (0, context_1.createScriptCodegenContext)(options);
-    const codegen = generateScript(options, context);
-    return {
-        ...context,
-        codes: [...codegen],
-    };
+    const ctx = (0, context_1.createScriptCodegenContext)(options);
+    const codeGenerator = generateWorker(options, ctx);
+    return { ...ctx, codes: [...codeGenerator] };
 }
-function* generateScript(options, ctx) {
+function* generateWorker(options, ctx) {
     yield* generateGlobalTypesReference(options);
-    if (options.sfc.scriptSetup && options.scriptSetupRanges) {
-        yield* (0, scriptSetup_1.generateScriptSetupImports)(options.sfc.scriptSetup, options.scriptSetupRanges);
+    const { script, scriptRanges, scriptSetup, scriptSetupRanges, vueCompilerOptions } = options;
+    if (scriptSetup && scriptSetupRanges) {
+        yield* (0, scriptSetup_1.generateScriptSetupImports)(scriptSetup, scriptSetupRanges);
     }
-    if (options.sfc.script && options.scriptRanges) {
-        const { exportDefault, componentOptions } = options.scriptRanges;
-        if (options.sfc.scriptSetup && options.scriptSetupRanges) {
-            if (exportDefault) {
-                yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, 0, exportDefault.start, codeFeatures_1.codeFeatures.all);
-                yield* (0, scriptSetup_1.generateScriptSetup)(options, ctx, options.sfc.scriptSetup, options.scriptSetupRanges);
-            }
-            else {
-                yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, 0, options.sfc.script.content.length, codeFeatures_1.codeFeatures.all);
-                yield* (0, scriptSetup_1.generateScriptSetup)(options, ctx, options.sfc.scriptSetup, options.scriptSetupRanges);
-            }
+    if (script?.src) {
+        yield* (0, src_1.generateSrc)(script.src);
+    }
+    // <script> + <script setup>
+    if (script && scriptRanges && scriptSetup && scriptSetupRanges) {
+        // <script>
+        const { exportDefault, componentOptions } = scriptRanges;
+        if (exportDefault) {
+            const { expression: options } = componentOptions ?? exportDefault;
+            yield* (0, utils_1.generateSfcBlockSection)(script, 0, options.start, codeFeatures_1.codeFeatures.all);
+            yield exportExpression;
+            yield* (0, utils_1.generateSfcBlockSection)(script, options.end, script.content.length, codeFeatures_1.codeFeatures.all, true);
+        }
+        else {
+            yield* (0, utils_1.generateSfcBlockSection)(script, 0, script.content.length, codeFeatures_1.codeFeatures.all, true);
+            yield `export default ${exportExpression}${utils_1.endOfLine}`;
+        }
+        // <script setup>
+        yield* generateExportDeclareEqual(scriptSetup);
+        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)));
+        }
+        else {
+            yield `await (async () => {${utils_1.newLine}`;
+            yield* (0, scriptSetup_1.generateSetupFunction)(options, ctx, scriptSetup, scriptSetupRanges, (0, template_1.generateTemplate)(options, ctx), [`return `]);
+            yield `})()${utils_1.endOfLine}`;
+        }
+    }
+    // only <script setup>
+    else if (scriptSetup && scriptSetupRanges) {
+        if (scriptSetup.generic) {
+            yield* generateExportDeclareEqual(scriptSetup);
+            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));
         }
-        else if (exportDefault) {
+        yield `export default ${exportExpression}${utils_1.endOfLine}`;
+    }
+    // only <script>
+    else if (script && scriptRanges) {
+        const { exportDefault, componentOptions } = scriptRanges;
+        if (exportDefault) {
             const { expression } = componentOptions ?? exportDefault;
             let wrapLeft;
             let wrapRight;
-            if (options.sfc.script.content[expression.start] === '{'
-                && options.vueCompilerOptions.optionsWrapper.length) {
-                [wrapLeft, wrapRight] = options.vueCompilerOptions.optionsWrapper;
+            if (script.content[expression.start] === '{'
+                && vueCompilerOptions.optionsWrapper.length) {
+                [wrapLeft, wrapRight] = vueCompilerOptions.optionsWrapper;
                 ctx.inlayHints.push({
-                    blockName: options.sfc.script.name,
+                    blockName: script.name,
                     offset: expression.start,
                     setting: 'vue.inlayHints.optionsWrapper',
                     label: wrapLeft || '[Missing optionsWrapper[0]]',
@@ -52,36 +82,35 @@ function* generateScript(options, ctx) {
                         'To hide it, you can set `"vue.inlayHints.optionsWrapper": false` in IDE settings.',
                     ].join('\n\n'),
                 }, {
-                    blockName: options.sfc.script.name,
+                    blockName: script.name,
                     offset: expression.end,
                     setting: 'vue.inlayHints.optionsWrapper',
                     label: wrapRight || '[Missing optionsWrapper[1]]',
                 });
             }
-            yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, 0, exportDefault.start, codeFeatures_1.codeFeatures.all);
-            yield* generateConstExport(options, options.sfc.script);
+            yield* (0, utils_1.generateSfcBlockSection)(script, 0, exportDefault.start, codeFeatures_1.codeFeatures.all, true);
+            yield* generateExportDeclareEqual(script);
             if (wrapLeft) {
                 yield wrapLeft;
             }
-            yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, expression.start, expression.end, codeFeatures_1.codeFeatures.all);
+            yield* (0, utils_1.generateSfcBlockSection)(script, expression.start, expression.end, codeFeatures_1.codeFeatures.all);
             if (wrapRight) {
                 yield wrapRight;
             }
             yield utils_1.endOfLine;
+            yield* (0, template_1.generateTemplate)(options, ctx);
+            yield* (0, utils_1.generateSfcBlockSection)(script, exportDefault.start, expression.start, codeFeatures_1.codeFeatures.all);
+            yield exportExpression;
+            yield* (0, utils_1.generateSfcBlockSection)(script, expression.end, script.content.length, codeFeatures_1.codeFeatures.all);
         }
         else {
-            yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, 0, options.sfc.script.content.length, codeFeatures_1.codeFeatures.all);
-            yield* generateConstExport(options, options.sfc.script);
-            yield `(await import('${options.vueCompilerOptions.lib}')).defineComponent({})${utils_1.endOfLine}`;
+            yield* (0, utils_1.generateSfcBlockSection)(script, 0, script.content.length, codeFeatures_1.codeFeatures.all, true);
+            yield* generateExportDeclareEqual(script);
+            yield `(await import('${vueCompilerOptions.lib}')).defineComponent({})${utils_1.endOfLine}`;
+            yield* (0, template_1.generateTemplate)(options, ctx);
+            yield `export default ${exportExpression}${utils_1.endOfLine}`;
         }
     }
-    else if (options.sfc.scriptSetup && options.scriptSetupRanges) {
-        yield* (0, scriptSetup_1.generateScriptSetup)(options, ctx, options.sfc.scriptSetup, options.scriptSetupRanges);
-    }
-    if (!ctx.generatedTemplate) {
-        yield* (0, template_1.generateTemplate)(options, ctx);
-    }
-    yield* generateExportDefault(options);
     yield* ctx.localTypes.generate();
 }
 function* generateGlobalTypesReference(options) {
@@ -102,39 +131,11 @@ function* generateGlobalTypesReference(options) {
         yield `/// <reference types="${globalTypesPath}" />${utils_1.newLine}`;
     }
 }
-function* generateConstExport(options, block) {
-    if (options.sfc.script) {
-        yield* (0, utils_1.generatePartiallyEnding)(options.sfc.script.name, options.scriptRanges?.exportDefault?.start ?? options.sfc.script.content.length, '#3632/script.vue');
-    }
+function* generateExportDeclareEqual(block) {
     yield `const `;
-    yield* (0, wrapWith_1.wrapWith)(0, block.content.length, block.name, codeFeatures_1.codeFeatures.doNotReportTs6133, `__VLS_export`);
+    const token = yield* (0, boundary_1.startBoundary)(block.name, 0, codeFeatures_1.codeFeatures.doNotReportTs6133);
+    yield names._export;
+    yield (0, boundary_1.endBoundary)(token, block.content.length);
     yield ` = `;
 }
-function* generateExportDefault(options) {
-    if (options.sfc.script?.src) {
-        yield* (0, src_1.generateSrc)(options.sfc.script.src);
-        return;
-    }
-    const expression = `{} as typeof __VLS_export`;
-    if (options.sfc.script && options.scriptRanges?.exportDefault) {
-        const { exportDefault, componentOptions } = options.scriptRanges;
-        yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, exportDefault.start, (componentOptions ?? exportDefault).expression.start, codeFeatures_1.codeFeatures.all);
-        yield expression;
-        yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, (componentOptions ?? exportDefault).expression.end, options.sfc.script.content.length, codeFeatures_1.codeFeatures.all);
-    }
-    else {
-        yield `export `;
-        if (options.sfc.template) {
-            for (let i = 0; i < 'template'.length + 1; i++) {
-                yield [
-                    ``,
-                    'main',
-                    options.sfc.template.start + 1 + i,
-                    i ? { __combineOffset: i } : codeFeatures_1.codeFeatures.navigationWithoutRename,
-                ];
-            }
-        }
-        yield `default ${expression}${utils_1.endOfLine}`;
-    }
-}
 //# sourceMappingURL=index.js.map

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

@@ -1,6 +1,7 @@
 import type { ScriptSetupRanges } from '../../parsers/scriptSetupRanges';
 import type { Code, Sfc } from '../../types';
 import type { ScriptCodegenContext } from './context';
-import { type 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>;
+export declare function generateGeneric(options: ScriptCodegenOptions, ctx: ScriptCodegenContext, scriptSetup: NonNullable<Sfc['scriptSetup']>, scriptSetupRanges: ScriptSetupRanges, generic: NonNullable<NonNullable<Sfc['scriptSetup']>['generic']>, body: Iterable<Code>): Generator<Code>;
+export declare function generateSetupFunction(options: ScriptCodegenOptions, ctx: ScriptCodegenContext, scriptSetup: NonNullable<Sfc['scriptSetup']>, scriptSetupRanges: ScriptSetupRanges, body: Iterable<Code>, output?: Iterable<Code>): Generator<Code>;