@wagq/wa-cli 0.6.22 → 0.6.24

package/config/command.js

@@ -1,8 +1,9 @@
 const init = require("../lib/init");
 const server = require("../lib/server");
 const xlsx2Config = require("../lib/locale/xlsx2Config");
-const asyncDaml = require('../lib/daml/async')
-const asyncDamlByApp = require('../lib/daml/asyncByApp')
+const asyncDaml = require("../lib/daml/async");
+const asyncDamlByApp = require("../lib/daml/asyncByApp");
+const batchUpdate = require("../lib/batchUpdate");
 
 const command = [
   {
@@ -13,6 +14,14 @@ const command = [
       asyncDaml();
     },
   },
+  {
+    name: "batchUpdate",
+    alias: "bu",
+    description: "批量升级依赖包,可以指定组织,只更新组织下的依赖",
+    action: () => {
+      batchUpdate();
+    },
+  },
   {
     name: "damls",
     description: `从应用同步所有页面的逻辑器与变量值,
@@ -23,8 +32,8 @@ const command = [
     appName为应用名称,也是你区分不同应用的标识,所有生成的文件都会放在appName文件夹下`,
     alias: "da",
     action: () => {
-      asyncDamlByApp()
-    }
+      asyncDamlByApp();
+    },
   },
   {
     name: "init",

package/lib/batchUpdate/getUpdateLibs.js

@@ -0,0 +1,18 @@
+const { execSync } = require("child_process");
+const log = require("../../utils/log");
+const { getPackageTxt } = require("../../utils/packages");
+
+const getupdateContent = async (prefix) => {
+  let packageTxt = getPackageTxt();
+  const reg = new RegExp(`"(${prefix}\/[\\w|-]+)".+,`, "g");
+  packageTxt = packageTxt.replace(reg, (_, name) => {
+    let version = execSync(`npm view ${name} version`).toString();
+    version = version.substring(0, version.length - 1);
+    log.info(`${name} => ${version}`);
+    return `"${name}": "^${version}",`;
+  });
+
+  return packageTxt;
+};
+
+module.exports = getupdateContent;

package/lib/batchUpdate/index.js

@@ -0,0 +1,20 @@
+const { writePackageTxt } = require("../../utils/packages");
+const getupdateContent = require("./getUpdateLibs");
+const Prompt = require("inquirer");
+
+const batchUpdate = async () => {
+  const quetionList = [
+    {
+      type: "input",
+      name: "prefix",
+      message: "请输入需要更新的包组织,如只更新@wagq,输入@wagq",
+      default: "@wagq",
+    },
+  ];
+
+  const { prefix } = await Prompt.default.prompt(quetionList);
+  const packageContent = await getupdateContent(prefix);
+  writePackageTxt(packageContent);
+};
+
+module.exports = batchUpdate;

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.24",
   "description": "wa的脚手架",
   "main": "index.js",
   "scripts": {

package/utils/packages.js

@@ -0,0 +1,20 @@
+const fs = require("fs");
+
+const getPackageInfo = () => {
+  const packageJson = require("./package.json");
+  return packageJson;
+};
+
+const getPackageTxt = () => {
+  return fs.readFileSync("./package.json", "utf-8");
+};
+
+const writePackageTxt = (content) => {
+  return fs.writeFileSync("./package.json", content, "utf-8");
+};
+
+module.exports = {
+  getPackageInfo,
+  getPackageTxt,
+  writePackageTxt,
+};