@varlet/cli 2.7.3-alpha.1675176726761 → 2.7.3-alpha.1675189320554

package/lib/node/compiler/compileSFC.d.ts

@@ -1,2 +1,5 @@
+export declare function replaceExportToDeclare(script: string): string;
+export declare function injectExport(script: string): string;
+export declare function injectScopeId(script: string, scopeId: string): string;
 export declare function injectRender(script: string, render: string): string;
 export declare function compileSFC(sfc: string): Promise<void>;

package/lib/node/compiler/compileSFC.js

@@ -1,58 +1,71 @@
 import fse from 'fs-extra';
 import hash from 'hash-sum';
 import { parse, resolve } from 'path';
-import { parse as parseSFC, compileTemplate, compileStyle } from '@vue/compiler-sfc';
+import { parse as parseSFC, compileTemplate, compileStyle, compileScript as compileScriptSFC } from '@vue/compiler-sfc';
 import { replaceExt, smartAppendFileSync } from '../shared/fsUtils.js';
 import { compileScript, getScriptExtname } from './compileScript.js';
 import { clearEmptyLine, compileLess, extractStyleDependencies, normalizeStyleDependency, STYLE_IMPORT_RE, } from './compileStyle.js';
-import logger from '../shared/logger.js';
 const { readFile, writeFileSync } = fse;
-const NORMAL_EXPORT_START_RE = /export\s+default\s+{/;
-const DEFINE_EXPORT_START_RE = /export\s+default\s+defineComponent\s*\(\s*{/;
+const EXPORT = 'export default';
+const SFC = '__sfc__';
+const SFC_DECLARE = `const ${SFC} = `;
+const RENDER = '__render__';
+export function replaceExportToDeclare(script) {
+    return script.replace(EXPORT, SFC_DECLARE);
+}
+export function injectExport(script) {
+    script += `\n${EXPORT} ${SFC}`;
+    return script;
+}
+export function injectScopeId(script, scopeId) {
+    script += `\n${SFC}.__scopeId = '${scopeId}'`;
+    return script;
+}
 export function injectRender(script, render) {
-    if (DEFINE_EXPORT_START_RE.test(script.trim())) {
-        return script.trim().replace(DEFINE_EXPORT_START_RE, `${render}\nexport default defineComponent({
-  render,\
-    `);
-    }
-    if (NORMAL_EXPORT_START_RE.test(script.trim())) {
-        return script.trim().replace(NORMAL_EXPORT_START_RE, `${render}\nexport default {
-  render,\
-    `);
-    }
+    script = script.trim();
+    render = render.replace('export function render', `function ${RENDER}`);
+    script = script.replace(SFC_DECLARE, `${render}\n${SFC_DECLARE}`);
+    script += `\n${SFC}.render = ${RENDER}`;
     return script;
 }
 export async function compileSFC(sfc) {
     const sources = await readFile(sfc, 'utf-8');
+    const id = hash(sources);
     const { descriptor } = parseSFC(sources, { sourceMap: false });
     const { script, scriptSetup, template, styles } = descriptor;
-    if (scriptSetup) {
-        logger.warning(`\n Varlet Cli does not support compiling script setup syntax\
-       \n  The error in ${sfc}`);
-        return;
-    }
-    // scoped
-    const hasScope = styles.some((style) => style.scoped);
-    const id = hash(sources);
-    const scopeId = hasScope ? `data-v-${id}` : '';
-    if (script) {
-        // template
-        const render = template &&
-            compileTemplate({
+    if (script || scriptSetup) {
+        let scriptContent;
+        let bindingMetadata;
+        if (scriptSetup) {
+            const { content, bindings } = compileScriptSFC(descriptor, { id });
+            scriptContent = content;
+            bindingMetadata = bindings;
+        }
+        else {
+            // script only
+            scriptContent = script.content;
+        }
+        scriptContent = replaceExportToDeclare(scriptContent);
+        // scoped
+        const hasScope = styles.some((style) => style.scoped);
+        const scopeId = hasScope ? `data-v-${id}` : '';
+        if (template) {
+            const render = compileTemplate({
                 id,
                 source: template.content,
                 filename: sfc,
                 compilerOptions: {
                     scopeId,
+                    bindingMetadata,
                 },
-            });
-        let { content } = script;
-        if (render) {
-            const { code } = render;
-            content = injectRender(content, code);
+            }).code;
+            scriptContent = injectRender(scriptContent, render);
+        }
+        if (scopeId) {
+            scriptContent = injectScopeId(scriptContent, scopeId);
         }
-        // script
-        await compileScript(content, sfc);
+        scriptContent = injectExport(scriptContent);
+        await compileScript(scriptContent, sfc);
         // style
         for (let index = 0; index < styles.length; index++) {
             const style = styles[index];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/cli",
-  "version": "2.7.3-alpha.1675176726761",
+  "version": "2.7.3-alpha.1675189320554",
   "type": "module",
   "description": "cli of varlet",
   "bin": {
@@ -68,8 +68,8 @@
     "vite": "4.0.4",
     "vue": "3.2.25",
     "vue-jest": "^5.0.0-alpha.8",
-    "@varlet/vite-plugins": "2.7.3-alpha.1675176726761",
-    "@varlet/shared": "2.7.3-alpha.1675176726761"
+    "@varlet/vite-plugins": "2.7.3-alpha.1675189320554",
+    "@varlet/shared": "2.7.3-alpha.1675189320554"
   },
   "devDependencies": {
     "@types/babel__core": "^7.1.12",
@@ -82,8 +82,8 @@
     "@types/semver": "^7.3.9",
     "@types/inquirer": "^9.0.2",
     "@types/sharp": "0.31.1",
-    "@varlet/icons": "2.7.3-alpha.1675176726761",
-    "@varlet/touch-emulator": "2.7.3-alpha.1675176726761"
+    "@varlet/icons": "2.7.3-alpha.1675189320554",
+    "@varlet/touch-emulator": "2.7.3-alpha.1675189320554"
   },
   "peerDependencies": {
     "@vue/runtime-core": "3.2.16",
@@ -93,8 +93,8 @@
     "lodash-es": "^4.17.21",
     "vue": "3.2.25",
     "vue-router": "4.0.12",
-    "@varlet/icons": "2.7.3-alpha.1675176726761",
-    "@varlet/touch-emulator": "2.7.3-alpha.1675176726761"
+    "@varlet/icons": "2.7.3-alpha.1675189320554",
+    "@varlet/touch-emulator": "2.7.3-alpha.1675189320554"
   },
   "scripts": {
     "dev": "tsc --watch",