@wagq/wa-cli 0.5.12 → 0.6.0

package/lib/daml/async.js

@@ -5,14 +5,15 @@ const string2Data = require("../../utils/string2Data");
 
 const typePath = {
   "逻辑编辑器": "actions.actionList",
-  "变量编辑器": "dataSource.dataList"
+  "变量编辑器": "dataSource.dataList",
+  "变量与逻辑": "变量与逻辑"
 }
 
 const initQuestions = () => [
   {
     type: "input",
     name: "name",
-    message: "请输入备注信息(会将所有逻辑编辑器文件保存在这个文件夹里)",
+    message: "请输入备注信息(会将所有逻辑编辑器文件保存在这个文件夹里,默认值是asyncData)",
     default: "asyncData"
   },
   {
@@ -53,18 +54,34 @@ const getFiles = async () => {
       return res.json();
     })
     .then((res) => {
-      const daml = JSON.parse(res.data.daml);
-      const pages = daml.app.subapps[0].actions.actionList;
-      const variables = daml.app.subapps[0].dataSource.dataList;
-      switch (type) {
-        case "逻辑编辑器":
+      try{
+        const daml = JSON.parse(res.data.daml);
+        const pages = daml.app.subapps[0].actions.actionList || [];
+        const variables = daml.app.subapps[0].dataSource.dataList || [];
+
+        let asyncPage = false
+        let asyncVariable = false
+
+        switch (type) {
+          case "逻辑编辑器":
+            asyncPage = true
+            break;
+          case "变量编辑器":
+            asyncVariable = true
+            break;
+          case "变量与逻辑":
+            asyncPage = true
+            asyncVariable = true
+            break;
+        }
+        if(asyncPage) {
           pages.forEach(({ content, name: fileName }) => {
             fs.writeFileSync(`${name}/${fileName}.js`, content, {
               cwd: process.cwd(),
             });
           });
-          break;
-        case "变量编辑器":
+        }
+        if(asyncVariable) {
           variables.forEach(({ key, value: variableValue }) => {
             fs.writeFileSync(`${name}/${key}.json`, JSON.stringify(variableValue, (key, value) => {
               if (typeof value === "string") {
@@ -75,7 +92,10 @@ const getFiles = async () => {
               cwd: process.cwd(),
             });
           });
-          break
+        }
+      }
+      catch(err) {
+        log.error("解析daml失败,请检查请求是否过期或无法访问")
       }
     });
 };

package/lib/server/index.js

@@ -1,23 +1,24 @@
-const { spawn, exec, execSync } = require("child_process");
-const fs = require("fs");
-// minimist(process.argv.slice(2))
+const { spawn } = require('node:child_process'); // 使用 node: 前缀明确使用核心模块
 
 const server = (filePath, argv) => {
   const https = argv.https ?? false;
   const port = argv.port ?? 3000;
 
   try {
-    const child = spawn(
-      "http-server",
-      [filePath, "-p", port, https ? `-S -C cert.pem -K key.pem` : ""],
-      {
-        cwd: process.cwd(),
-        stdio: "inherit",
-      }
-    );
-    child.on("close", (code) => process.exit(code));
+    const args = [filePath, '-p', port.toString()];
+    if (https) {
+      args.push('-S', '-C', 'cert.pem', '-K', 'key.pem');
+    }
+    
+    const child = spawn('npx', ['http-server', ...args], {
+      cwd: process.cwd(),
+      stdio: 'inherit',
+      shell: true
+    });
+    
+    child.on('close', (code) => process.exit(code));
   } catch (error) {
-    console.log(error);
+    console.error('启动失败:', error.message);
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wagq/wa-cli",
-  "version": "0.5.12",
+  "version": "0.6.0",
   "description": "wa的脚手架",
   "main": "index.js",
   "scripts": {