@wagq/wa-cli 0.6.31 → 0.6.32-beta.2

package/config/command.js

@@ -6,6 +6,7 @@ const asyncDamlByApp = require("../lib/daml/asyncByApp");
 const batchUpdate = require("../lib/batchUpdate");
 const web2exe = require("../lib/exe");
 const skill = require("../lib/skill");
+const { generateIcon2Tsx } = require("../lib/generateIcon/tsx");
 
 const command = [
   {
@@ -26,12 +27,11 @@ const command = [
   },
   {
     name: "damls",
-    description: `从应用同步所有页面的逻辑器与变量值,
-    可将appId,branchid,token配置到~/.damlrc文件中,
-    格式为{"origin":string,"appId":string,"branchid":string,"token":string, "appName": string}[]
-    其中origin为请求域名(/api/assembler/page/list(页面列表)接口域名),
-    appId,branchid,token为请求参数,
-    appName为应用名称,也是你区分不同应用的标识,所有生成的文件都会放在appName文件夹下`,
+    description: `
+    - 同步低码文件,
+    - 可将appId,branchid,token,origin配置到~/.damlrc文件中,
+    - 其中origin为域名,格式为低码应用的location.origin
+    - 初次执行没有配置文件会自动创建`,
     alias: "da",
     action: () => {
       asyncDamlByApp();
@@ -96,7 +96,7 @@ const command = [
   },
   {
     name: "web2exe [name] [path] [icon]",
-    alias: 'we',
+    alias: "we",
     description: "将网页打包成exe",
     positional: [
       {
@@ -122,6 +122,28 @@ const command = [
     description: "openskills指令快速导航",
     action: skill,
   },
+  {
+    name: "generateIcon2Tsx [svgPath]",
+    alias: "gitsx",
+    description: `
+    - svg配置文件将生成在svg文件夹同级下的svgConfig中
+    - txs将生成在svg文件夹统计下的icons中
+    - 同时将所有icon导出到路径下index.ts文件中
+    - 将svg文件生成为数据配置与TSX文件
+    - 请谨遵 outline、multipleTone、fill 方式分类管理icon源文件,并规范icon命名后缀
+    - like AuctionMenuMultipleTone.svg AuctionMenuMultipleTone.svg AddCircleOutlined.svg
+    `,
+    positional: [
+      {
+        key: "svgPath",
+        option: {
+          describe: "svg文件夹地址",
+          type: "string",
+        },
+      },
+    ],
+    action: generateIcon2Tsx,
+  },
 ];
 
 module.exports = command;

package/lib/generateIcon/prettier.js

@@ -0,0 +1,11 @@
+const prettier = require('prettier')
+
+const format = async (content) => {
+  const prettierConfig = await prettier.resolveConfig(process.cwd())
+
+  const result = await prettier.format(content, { ...prettierConfig, parser: 'typescript' })
+
+  return result
+}
+
+module.exports = format

package/lib/generateIcon/synchoronousSvgConfig.js

@@ -0,0 +1,26 @@
+/**
+ * @file synchoronousSvgConfig
+ * @description 读取svgConfig并生成config配置文件到packages\cartech-library\packages\icon\src\svgConfig
+ * */
+const fs = require('fs')
+const path = require('path')
+const svgson = require('svgson')
+const format = require('./prettier.js')
+
+const synchoronousSvgConfig = async (fileName, content, isMultiple, configPath) => {
+  const config = svgson.parseSync(content)
+  const filePath = path.join(configPath, `/${fileName}.ts`)
+  if (isMultiple) {
+    config.isMultiple = true
+  }
+
+  const fileContent = await format(`
+        const ${fileName} = ${JSON.stringify(config)}
+
+        export default ${fileName}
+    `)
+
+  fs.writeFileSync(filePath, fileContent)
+}
+
+module.exports = synchoronousSvgConfig

package/lib/generateIcon/tsx.js

@@ -0,0 +1,92 @@
+const { execSync } = require("child_process");
+const fs = require("fs");
+const path = require("path");
+const { promisify } = require("util");
+const format = require("./prettier.js");
+const synchoronousSvgConfig = require("./synchoronousSvgConfig.js");
+
+const generateIcon2Tsx = async (svgPath) => {
+  const cwd = process.cwd();
+  const iconDir = path.join(cwd, svgPath);
+  const indexPath = path.join(iconDir, "../index.ts");
+  const reactIconDir = path.join(iconDir, "../icons");
+  const configPath = path.join(iconDir, "../svgConfig");
+  // 线框风格
+  const outlineIconDir = path.join(iconDir, "/outline");
+  // 实底风格
+  const fillIconDir = path.join(iconDir, "/fill");
+  // 多色风格
+  const twoToneIconDir = path.join(iconDir, "/multipleTone");
+  let indexContent = "";
+
+  execSync(`rimraf ${reactIconDir}`, {
+    stdio: "inherit",
+    cwd: cwd,
+    shell: true,
+  });
+
+  const createIconDir = async () => {
+    try {
+      await promisify(fs.access)(reactIconDir);
+    } catch (err) {
+      await promisify(fs.mkdir)(reactIconDir);
+    }
+  };
+
+  const createConfigDir = async () => {
+    try {
+      await promisify(fs.access)(configPath);
+    } catch (err) {
+      await promisify(fs.mkdir)(configPath);
+    }
+  };
+
+  await createIconDir();
+  await createConfigDir();
+
+  const outlineFiles = fs.readdirSync(outlineIconDir);
+  const fillFiles = fs.readdirSync(fillIconDir);
+  const twoToneFiles = fs.readdirSync(twoToneIconDir);
+
+  const createTsx = async (files, dirName) => {
+    for (const file of files) {
+      const fileName = file?.replace(".svg", "");
+      // synchronousDoc(dirName, fileName)
+      const svgFilePath = path.join(iconDir, `../svgs/${dirName}/${file}`);
+      const fileContent = fs.readFileSync(svgFilePath, {
+        encoding: "utf-8",
+      });
+      const isMultiple = dirName === "multipleTone";
+      synchoronousSvgConfig(fileName, fileContent, isMultiple, configPath);
+
+      indexContent += `;export { default as ${fileName} } from './icons/${fileName}'`;
+
+      const reactContent = `
+            import IconBase from '../components/IconBase'
+            import icon from '../svgConfig/${fileName}'
+            import { IconProps } from '@/types'
+
+            const ${fileName} = (props: IconProps) => {
+                
+                return <IconBase { ...props } icon={icon} />
+            }
+
+            export default ${fileName}
+            `;
+
+      const content = await format(reactContent);
+      const tsxFilePath = `${reactIconDir}/${fileName}.tsx`;
+
+      fs.writeFileSync(tsxFilePath, content);
+    }
+
+    fs.writeFileSync(indexPath, await format(indexContent));
+  };
+  createTsx(outlineFiles, "outline");
+  createTsx(fillFiles, "fill");
+  createTsx(twoToneFiles, "multipleTone");
+};
+
+module.exports = {
+  generateIcon2Tsx,
+};

package/package.json

@@ -1,48 +1,53 @@
-{
-  "name": "@wagq/wa-cli",
-  "version": "0.6.31",
-  "description": "wa的脚手架",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "pub": "npm publish --access public --registry=https://registry.npmjs.org",
-    "dev": "node ./bin/wa.js"
-  },
-  "exports": {
-    "cert": "./config/cert.pem",
-    "key": "./config/key.pem"
-  },
-  "keywords": [
-    "wa的脚手架"
-  ],
-  "bin": {
-    "wa": "bin/wa.js"
-  },
-  "author": "GQ-og",
-  "license": "ISC",
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/sdmu-gaoqi/wa-cli"
-  },
-  "dependencies": {
-    "chalk": "^3.0.0",
-    "child_process": "^1.0.2",
-    "commander": "^13.1.0",
-    "compare-versions": "^6.1.1",
-    "download-git-repo": "^3.0.2",
-    "glob": "^11.0.1",
-    "http-server": "^14.1.1",
-    "inquirer": "^12.4.1",
-    "minimist": "^1.2.8",
-    "ora": "^4.0.3",
-    "prettier": "^3.5.3",
-    "xlsx": "^0.18.5"
-  },
-  "directories": {
-    "lib": "lib"
-  }
-}
+{
+  "name": "@wagq/wa-cli",
+  "version": "0.6.32-beta.2",
+  "description": "wa的脚手架",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "pub": "npm publish --access public --registry=https://registry.npmjs.org",
+    "pub:beta": "npm publish --tag beta --access public --registry=https://registry.npmjs.org",
+    "dev": "node ./bin/wa.js"
+  },
+  "exports": {
+    "cert": "./config/cert.pem",
+    "key": "./config/key.pem"
+  },
+  "keywords": [
+    "wa的脚手架"
+  ],
+  "bin": {
+    "wa": "bin/wa.js"
+  },
+  "author": "GQ-og",
+  "license": "ISC",
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/sdmu-gaoqi/wa-cli"
+  },
+  "dependencies": {
+    "chalk": "^3.0.0",
+    "child_process": "^1.0.2",
+    "commander": "^13.1.0",
+    "compare-versions": "^6.1.1",
+    "download-git-repo": "^3.0.2",
+    "glob": "^11.0.1",
+    "http-server": "^14.1.1",
+    "inquirer": "^12.4.1",
+    "minimist": "^1.2.8",
+    "ora": "^4.0.3",
+    "prettier": "^3.5.3",
+    "xlsx": "^0.18.5"
+  },
+  "directories": {
+    "lib": "lib"
+  },
+  "devDependencies": {
+    "rimraf": "^6.1.3",
+    "svgson": "^5.3.1"
+  }
+}