@wagq/wa-cli 0.6.21 → 0.6.22

package/lib/daml/asyncByApp.js

@@ -2,6 +2,7 @@ const fs = require("fs");
 const Prompt = require("inquirer");
 const log = require("../../utils/log");
 const string2Data = require("../../utils/string2Data");
+const prettier = require("../../node_modules/prettier");
 
 const catalogue = "pages";
 
@@ -128,6 +129,36 @@ const getDaml = async (lists, origin, appId, branchid, token, dirName) => {
   }
 };
 
+const addJsDoc = (content, name, fileName) => {
+  const hasFileJsDoc = content.includes("@file");
+  // 添加标识
+  return hasFileJsDoc
+    ? content
+    : `/** @file ${name}(逻辑名称:${fileName}) */
+    
+    
+    /**
+     * @type {import("../../../../sass").CustomAction}
+     */
+    ${content}`;
+};
+
+const formatContent = async (content, filepath) => {
+  try {
+    const config = await prettier.resolveConfig("path/to/file", {
+      useCache: false,
+    });
+    content = await prettier.format(content, {
+      ...config,
+      semi: false,
+      filepath,
+    });
+    return content;
+  } catch (err) {
+    return content;
+  }
+};
+
 const generateLogic = async (dirName, daml, name) => {
   try {
     log.loading(`正在同步${name}的逻辑器`);
@@ -141,20 +172,14 @@ const generateLogic = async (dirName, daml, name) => {
       }
     );
     const pages = daml.app.subapps[0]?.actions?.actionList || [];
-    pages.forEach(({ content, name: fileName }) => {
-      const hasFileJsDoc = content.includes("@file");
+    pages.forEach(async ({ content, name: fileName }) => {
+      const filePath = `${logicDir}/${fileName}.js`;
       // 添加标识
-      content = hasFileJsDoc
-        ? content
-        : `/** @file ${name}(逻辑名称:${fileName}) */
-        
-        
-        /**
-         * @type {import("../../../../sass").CustomAction}
-         */
-        ${content}`;
+      content = addJsDoc(content, name, fileName);
+      // 格式化
+      content = await formatContent(content, filePath);
 
-      fs.writeFileSync(`${logicDir}/${fileName}.js`, content, {
+      fs.writeFileSync(filePath, content, {
         cwd: process.cwd(),
       });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wagq/wa-cli",
-  "version": "0.6.21",
+  "version": "0.6.22",
   "description": "wa的脚手架",
   "main": "index.js",
   "scripts": {
@@ -35,6 +35,7 @@
     "inquirer": "^12.4.1",
     "minimist": "^1.2.8",
     "ora": "^4.0.3",
+    "prettier": "^3.5.3",
     "xlsx": "^0.18.5"
   },
   "directories": {

package/utils/cwd.js

@@ -0,0 +1,5 @@
+const currentFilePath = __dirname;
+
+const cliCwd = currentFilePath;
+
+module.exports = { cliCwd };