@wagq/wa-cli 0.6.22 → 0.6.23

package/lib/daml/asyncByApp.js

@@ -14,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) => {
@@ -86,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 = () =>
@@ -120,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) {
@@ -159,7 +174,7 @@ const formatContent = async (content, filepath) => {
   }
 };
 
-const generateLogic = async (dirName, daml, name) => {
+const generateLogic = async (dirName, daml, name, prettier) => {
   try {
     log.loading(`正在同步${name}的逻辑器`);
     const logicDir = `${dirName}/${name}/logic`;
@@ -174,10 +189,12 @@ const generateLogic = async (dirName, daml, name) => {
     const pages = daml.app.subapps[0]?.actions?.actionList || [];
     pages.forEach(async ({ content, name: fileName }) => {
       const filePath = `${logicDir}/${fileName}.js`;
-      // 添加标识
-      content = addJsDoc(content, name, fileName);
-      // 格式化
-      content = await formatContent(content, filePath);
+      if (prettier) {
+        // 添加标识
+        content = addJsDoc(content, name, fileName);
+        // 格式化
+        content = await formatContent(content, filePath);
+      }
 
       fs.writeFileSync(filePath, content, {
         cwd: process.cwd(),
@@ -257,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);
@@ -278,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.22",
+  "version": "0.6.23",
   "description": "wa的脚手架",
   "main": "index.js",
   "scripts": {