@vtj/local 0.17.7 → 0.18.0

package/dist/index.cjs

@@ -26,7 +26,7 @@ const success = (data) => {
 const fail = (msg, data = null, stack = null) => {
   return {
     code: 1 /* Fail */,
-    msg,
+    msg: msg?.message || msg,
     data,
     stack,
     success: false
@@ -359,6 +359,16 @@ class UniRepository {
     const { pagesJson = {} } = project.uniConfig || {};
     const filePath = path.resolve("src/pages.json");
     pagesJson.pages = pages;
+    const easycomDeps = (project.dependencies || []).filter(
+      (dep) => dep.easycom
+    );
+    if (easycomDeps.length) {
+      const easycom = pagesJson.easycom || (pagesJson.easycom = {});
+      const custom = easycom.custom || (easycom.custom = {});
+      for (const dep of easycomDeps) {
+        custom[dep.easycom.key] = dep.easycom.value;
+      }
+    }
     node.writeJsonSync(filePath, pagesJson, {
       spaces: 2,
       EOL: "\n"
@@ -1531,7 +1541,7 @@ async function parseVue(options) {
     errors = e;
     return null;
   });
-  return success(errors ? errors : dsl);
+  return errors ? fail(errors) : success(dsl);
 }
 async function createRawPage(file, opts) {
   const repository = new VueRepository({
@@ -2104,7 +2114,7 @@ function createDevTools(options = {}) {
     copyDevtools: true,
     ...options
   };
-  const plugins = [aliasPlugin(opts)];
+  const plugins = [aliasPlugin(opts), createCompositionFixPlugin()];
   const proPath = `${opts.nodeModulesDir}/${opts.packageName}/dist`;
   const materialsPath1 = `${opts.nodeModulesDir}/@vtj/materials/dist`;
   const materialsPath2 = `${opts.nodeModulesDir}/${opts.packageName}/${materialsPath1}`;
@@ -2225,7 +2235,47 @@ function createDevTools(options = {}) {
   }
   return plugins;
 }
+function fixAxiosAdapterUploadConflict() {
+  const UPLOAD_VAR_PATTERN = /const upload = \(/g;
+  const UPLOAD_RETURN_PATTERN = /return upload;/g;
+  const LET_TASK_TDZ_PATTERN = /(let task = )((uni|index)\.(downloadFile|request|uploadFile)\()/g;
+  return {
+    name: "vtj-axios-adapter-upload-fix",
+    enforce: "pre",
+    transform(code, id) {
+      if (id.includes("@uni-helper/axios-adapter")) {
+        const transformed = code.replace(UPLOAD_VAR_PATTERN, "const uploadRequest = (").replace(UPLOAD_RETURN_PATTERN, "return uploadRequest;").replace(LET_TASK_TDZ_PATTERN, "let task = null; task = $2");
+        if (transformed !== code) {
+          return { code: transformed, map: null };
+        }
+      }
+    }
+  };
+}
+function createCompositionFixPlugin() {
+  return {
+    name: "vtj-composition-fix",
+    enforce: "pre",
+    transform(code, id) {
+      if (!id.endsWith(".vue"))
+        return;
+      if (!code.includes("useProvider") && !code.includes("__provider"))
+        return;
+      if (!code.includes("const __props") && !code.includes("const __emit"))
+        return;
+      return code.replace(
+        /(<script[^>]*\bsetup\b[^>]*>)([\s\S]*?)(<\/script>)/,
+        (_, open, body, close) => {
+          const fixed = body.replace(/\bconst\s+__props\b/g, "const props").replace(/\bconst\s+__emit\b/g, "const emit").replace(/__props\./g, "props.").replace(/__emit\s*\(/g, "emit(");
+          return open + fixed + close;
+        }
+      );
+    }
+  };
+}
 
+exports.createCompositionFixPlugin = createCompositionFixPlugin;
 exports.createDevTools = createDevTools;
+exports.fixAxiosAdapterUploadConflict = fixAxiosAdapterUploadConflict;
 exports.parsePresetPlugins = parsePresetPlugins;
 exports.vtjModulesPlugin = vtjModulesPlugin;

package/dist/index.d.cts

@@ -46,6 +46,44 @@ declare function parsePresetPlugins(options: DevToolsOptions): {
     staticDirs: StaticPluginOption[];
 };
 declare function createDevTools(options?: Partial<DevToolsOptions>): Plugin<any>[];
+/**
+ * 修复 @uni-helper/axios-adapter 的两个问题：
+ * 1. const upload 变量名与微信小程序引擎冲突（引擎将 prototype.upload 属性赋值误判为变量声明）
+ * 2. let task = uni.xxxFile({...}) 的 TDZ 问题：若 fail 回调在赋值完成前同步触发，task 尚未初始化
+ *
+ * 必须在 uni() 插件之前注册（enforce: 'pre'）。
+ *
+ * @example
+ * // vite.config.ts
+ * import { fixAxiosAdapterUploadConflict } from '@vtj/local';
+ * export default createUniappViteConfig({
+ *   plugins: [
+ *     fixAxiosAdapterUploadConflict(),  // ← 在 uni() 之前
+ *     uni(),
+ *   ]
+ * });
+ */
+declare function fixAxiosAdapterUploadConflict(): Plugin;
+/**
+ * 修复 uni-app <script setup> 中 __props/__emit 变量名与编译器内部保留名冲突的问题。
+ *
+ * uni-app 编译器在处理 defineProps/defineEmits 宏时会在内部生成 __props/__emit 变量，
+ * 若 VTJ 生成的代码也使用 const __props = defineProps(...) 则会导致重复声明编译错误。
+ *
+ * 此插件应在 uni() 插件之前（enforce: 'pre'）注册，将代码中的 __props/__emit
+ * 重命名为 props/emit，避免与编译器内部变量名冲突。
+ *
+ * @example
+ * // vite.config.ts
+ * import { createCompositionFixPlugin } from '@vtj/local';
+ * export default createUniappViteConfig({
+ *   plugins: [
+ *     createCompositionFixPlugin(),  // ← 在 uni() 之前
+ *     uni(),
+ *   ]
+ * });
+ */
+declare function createCompositionFixPlugin(): Plugin;
 
-export { createDevTools, parsePresetPlugins, vtjModulesPlugin };
+export { createCompositionFixPlugin, createDevTools, fixAxiosAdapterUploadConflict, parsePresetPlugins, vtjModulesPlugin };
 export type { DevToolsOptions, EnhanceOptions, LinkOptions };

package/dist/index.d.mts

@@ -46,6 +46,44 @@ declare function parsePresetPlugins(options: DevToolsOptions): {
     staticDirs: StaticPluginOption[];
 };
 declare function createDevTools(options?: Partial<DevToolsOptions>): Plugin<any>[];
+/**
+ * 修复 @uni-helper/axios-adapter 的两个问题：
+ * 1. const upload 变量名与微信小程序引擎冲突（引擎将 prototype.upload 属性赋值误判为变量声明）
+ * 2. let task = uni.xxxFile({...}) 的 TDZ 问题：若 fail 回调在赋值完成前同步触发，task 尚未初始化
+ *
+ * 必须在 uni() 插件之前注册（enforce: 'pre'）。
+ *
+ * @example
+ * // vite.config.ts
+ * import { fixAxiosAdapterUploadConflict } from '@vtj/local';
+ * export default createUniappViteConfig({
+ *   plugins: [
+ *     fixAxiosAdapterUploadConflict(),  // ← 在 uni() 之前
+ *     uni(),
+ *   ]
+ * });
+ */
+declare function fixAxiosAdapterUploadConflict(): Plugin;
+/**
+ * 修复 uni-app <script setup> 中 __props/__emit 变量名与编译器内部保留名冲突的问题。
+ *
+ * uni-app 编译器在处理 defineProps/defineEmits 宏时会在内部生成 __props/__emit 变量，
+ * 若 VTJ 生成的代码也使用 const __props = defineProps(...) 则会导致重复声明编译错误。
+ *
+ * 此插件应在 uni() 插件之前（enforce: 'pre'）注册，将代码中的 __props/__emit
+ * 重命名为 props/emit，避免与编译器内部变量名冲突。
+ *
+ * @example
+ * // vite.config.ts
+ * import { createCompositionFixPlugin } from '@vtj/local';
+ * export default createUniappViteConfig({
+ *   plugins: [
+ *     createCompositionFixPlugin(),  // ← 在 uni() 之前
+ *     uni(),
+ *   ]
+ * });
+ */
+declare function createCompositionFixPlugin(): Plugin;
 
-export { createDevTools, parsePresetPlugins, vtjModulesPlugin };
+export { createCompositionFixPlugin, createDevTools, fixAxiosAdapterUploadConflict, parsePresetPlugins, vtjModulesPlugin };
 export type { DevToolsOptions, EnhanceOptions, LinkOptions };

package/dist/index.d.ts

@@ -46,6 +46,44 @@ declare function parsePresetPlugins(options: DevToolsOptions): {
     staticDirs: StaticPluginOption[];
 };
 declare function createDevTools(options?: Partial<DevToolsOptions>): Plugin<any>[];
+/**
+ * 修复 @uni-helper/axios-adapter 的两个问题：
+ * 1. const upload 变量名与微信小程序引擎冲突（引擎将 prototype.upload 属性赋值误判为变量声明）
+ * 2. let task = uni.xxxFile({...}) 的 TDZ 问题：若 fail 回调在赋值完成前同步触发，task 尚未初始化
+ *
+ * 必须在 uni() 插件之前注册（enforce: 'pre'）。
+ *
+ * @example
+ * // vite.config.ts
+ * import { fixAxiosAdapterUploadConflict } from '@vtj/local';
+ * export default createUniappViteConfig({
+ *   plugins: [
+ *     fixAxiosAdapterUploadConflict(),  // ← 在 uni() 之前
+ *     uni(),
+ *   ]
+ * });
+ */
+declare function fixAxiosAdapterUploadConflict(): Plugin;
+/**
+ * 修复 uni-app <script setup> 中 __props/__emit 变量名与编译器内部保留名冲突的问题。
+ *
+ * uni-app 编译器在处理 defineProps/defineEmits 宏时会在内部生成 __props/__emit 变量，
+ * 若 VTJ 生成的代码也使用 const __props = defineProps(...) 则会导致重复声明编译错误。
+ *
+ * 此插件应在 uni() 插件之前（enforce: 'pre'）注册，将代码中的 __props/__emit
+ * 重命名为 props/emit，避免与编译器内部变量名冲突。
+ *
+ * @example
+ * // vite.config.ts
+ * import { createCompositionFixPlugin } from '@vtj/local';
+ * export default createUniappViteConfig({
+ *   plugins: [
+ *     createCompositionFixPlugin(),  // ← 在 uni() 之前
+ *     uni(),
+ *   ]
+ * });
+ */
+declare function createCompositionFixPlugin(): Plugin;
 
-export { createDevTools, parsePresetPlugins, vtjModulesPlugin };
+export { createCompositionFixPlugin, createDevTools, fixAxiosAdapterUploadConflict, parsePresetPlugins, vtjModulesPlugin };
 export type { DevToolsOptions, EnhanceOptions, LinkOptions };

package/dist/index.mjs

@@ -19,7 +19,7 @@ const success = (data) => {
 const fail = (msg, data = null, stack = null) => {
   return {
     code: 1 /* Fail */,
-    msg,
+    msg: msg?.message || msg,
     data,
     stack,
     success: false
@@ -352,6 +352,16 @@ class UniRepository {
     const { pagesJson = {} } = project.uniConfig || {};
     const filePath = resolve("src/pages.json");
     pagesJson.pages = pages;
+    const easycomDeps = (project.dependencies || []).filter(
+      (dep) => dep.easycom
+    );
+    if (easycomDeps.length) {
+      const easycom = pagesJson.easycom || (pagesJson.easycom = {});
+      const custom = easycom.custom || (easycom.custom = {});
+      for (const dep of easycomDeps) {
+        custom[dep.easycom.key] = dep.easycom.value;
+      }
+    }
     writeJsonSync(filePath, pagesJson, {
       spaces: 2,
       EOL: "\n"
@@ -1524,7 +1534,7 @@ async function parseVue(options) {
     errors = e;
     return null;
   });
-  return success(errors ? errors : dsl);
+  return errors ? fail(errors) : success(dsl);
 }
 async function createRawPage(file, opts) {
   const repository = new VueRepository({
@@ -2097,7 +2107,7 @@ function createDevTools(options = {}) {
     copyDevtools: true,
     ...options
   };
-  const plugins = [aliasPlugin(opts)];
+  const plugins = [aliasPlugin(opts), createCompositionFixPlugin()];
   const proPath = `${opts.nodeModulesDir}/${opts.packageName}/dist`;
   const materialsPath1 = `${opts.nodeModulesDir}/@vtj/materials/dist`;
   const materialsPath2 = `${opts.nodeModulesDir}/${opts.packageName}/${materialsPath1}`;
@@ -2218,5 +2228,43 @@ function createDevTools(options = {}) {
   }
   return plugins;
 }
+function fixAxiosAdapterUploadConflict() {
+  const UPLOAD_VAR_PATTERN = /const upload = \(/g;
+  const UPLOAD_RETURN_PATTERN = /return upload;/g;
+  const LET_TASK_TDZ_PATTERN = /(let task = )((uni|index)\.(downloadFile|request|uploadFile)\()/g;
+  return {
+    name: "vtj-axios-adapter-upload-fix",
+    enforce: "pre",
+    transform(code, id) {
+      if (id.includes("@uni-helper/axios-adapter")) {
+        const transformed = code.replace(UPLOAD_VAR_PATTERN, "const uploadRequest = (").replace(UPLOAD_RETURN_PATTERN, "return uploadRequest;").replace(LET_TASK_TDZ_PATTERN, "let task = null; task = $2");
+        if (transformed !== code) {
+          return { code: transformed, map: null };
+        }
+      }
+    }
+  };
+}
+function createCompositionFixPlugin() {
+  return {
+    name: "vtj-composition-fix",
+    enforce: "pre",
+    transform(code, id) {
+      if (!id.endsWith(".vue"))
+        return;
+      if (!code.includes("useProvider") && !code.includes("__provider"))
+        return;
+      if (!code.includes("const __props") && !code.includes("const __emit"))
+        return;
+      return code.replace(
+        /(<script[^>]*\bsetup\b[^>]*>)([\s\S]*?)(<\/script>)/,
+        (_, open, body, close) => {
+          const fixed = body.replace(/\bconst\s+__props\b/g, "const props").replace(/\bconst\s+__emit\b/g, "const emit").replace(/__props\./g, "props.").replace(/__emit\s*\(/g, "emit(");
+          return open + fixed + close;
+        }
+      );
+    }
+  };
+}
 
-export { createDevTools, parsePresetPlugins, vtjModulesPlugin };
+export { createCompositionFixPlugin, createDevTools, fixAxiosAdapterUploadConflict, parsePresetPlugins, vtjModulesPlugin };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vtj/local",
   "private": false,
-  "version": "0.17.7",
+  "version": "0.18.0",
   "type": "module",
   "keywords": [
     "低代码引擎",
@@ -22,16 +22,16 @@
   "license": "MIT",
   "dependencies": {
     "formidable": "~3.5.1",
-    "@vtj/coder": "~0.17.7",
-    "@vtj/node": "~0.12.7",
-    "@vtj/parser": "~0.17.7",
-    "@vtj/core": "~0.17.7"
+    "@vtj/coder": "~0.18.0",
+    "@vtj/node": "~0.13.0",
+    "@vtj/parser": "~0.18.0",
+    "@vtj/core": "~0.18.0"
   },
   "devDependencies": {
     "@types/formidable": "~3.4.5",
     "unbuild": "~2.0.0",
     "vite": "~6.3.0",
-    "@vtj/cli": "~0.12.20"
+    "@vtj/cli": "~0.13.0"
   },
   "exports": {
     ".": {