@wagq/wa-cli 0.6.21 → 0.6.23

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";
 
@@ -13,6 +14,13 @@ const initQuestions = () => [
     choices: [true, false],
     default: true,
   },
+  {
+    type: "list",
+    name: "prettier",
+    message: "是否使用prettier格式化代码",
+    choices: [true, false],
+    default: true,
+  },
 ];
 
 const handleIgnore = async (ignore, catalogue) => {
@@ -85,7 +93,15 @@ const getList = async (origin, appId, branchid, token) => {
   }
 };
 
-const getDaml = async (lists, origin, appId, branchid, token, dirName) => {
+const getDaml = async ({
+  lists,
+  origin,
+  appId,
+  branchid,
+  token,
+  basePath,
+  prettier,
+}) => {
   try {
     lists.forEach(async ({ name, id }) => {
       const request = () =>
@@ -119,8 +135,8 @@ const getDaml = async (lists, origin, appId, branchid, token, dirName) => {
         .then((res) => res.json())
         .then(async (res) => {
           const daml = JSON.parse(res.data.daml);
-          await generateLogic(dirName, daml, name);
-          await generateVariable(dirName, daml, name);
+          await generateLogic(basePath, daml, name, prettier);
+          await generateVariable(basePath, daml, name);
         });
     });
   } catch (err) {
@@ -128,7 +144,37 @@ const getDaml = async (lists, origin, appId, branchid, token, dirName) => {
   }
 };
 
-const generateLogic = async (dirName, daml, name) => {
+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, prettier) => {
   try {
     log.loading(`正在同步${name}的逻辑器`);
     const logicDir = `${dirName}/${name}/logic`;
@@ -141,20 +187,16 @@ const generateLogic = async (dirName, daml, name) => {
       }
     );
     const pages = daml.app.subapps[0]?.actions?.actionList || [];
-    pages.forEach(({ content, name: fileName }) => {
-      const hasFileJsDoc = content.includes("@file");
-      // 添加标识
-      content = hasFileJsDoc
-        ? content
-        : `/** @file ${name}(逻辑名称:${fileName}) */
-        
-        
-        /**
-         * @type {import("../../../../sass").CustomAction}
-         */
-        ${content}`;
+    pages.forEach(async ({ content, name: fileName }) => {
+      const filePath = `${logicDir}/${fileName}.js`;
+      if (prettier) {
+        // 添加标识
+        content = addJsDoc(content, name, fileName);
+        // 格式化
+        content = await formatContent(content, filePath);
+      }
 
-      fs.writeFileSync(`${logicDir}/${fileName}.js`, content, {
+      fs.writeFileSync(filePath, content, {
         cwd: process.cwd(),
       });
     });
@@ -232,7 +274,7 @@ const checkDamlrc = async () => {
 const main = async () => {
   await checkDamlrc();
   const settings = require(`${process.cwd()}/.damlrc.json`) || [];
-  const { ignore } = await Prompt.default.prompt(initQuestions());
+  const { ignore, prettier } = await Prompt.default.prompt(initQuestions());
   settings.forEach(async ({ appName, origin, token, appId, branchid }) => {
     const basePath = `${appName}/${catalogue}`;
     const exist = await fs.existsSync(basePath);
@@ -253,7 +295,15 @@ const main = async () => {
     await handleIgnore(ignore, basePath);
     const lists = await getList(origin, appId, branchid, token);
     log.info(`请求${appName}页面列表成功,条数为${lists.length}`);
-    await getDaml(lists, origin, appId, branchid, token, basePath);
+    await getDaml({
+      lists,
+      origin,
+      appId,
+      branchid,
+      token,
+      basePath,
+      prettier,
+    });
   });
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wagq/wa-cli",
-  "version": "0.6.21",
+  "version": "0.6.23",
   "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 };