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

package/config/command.js

@@ -123,7 +123,7 @@ const command = [
     action: skill,
   },
   {
-    name: "generateIcon2Tsx",
+    name: "generateIcon2Tsx [svgPath]",
     alias: "gitsx",
     description: `
     - svg配置文件将生成在svg文件夹同级下的svgConfig中

package/lib/generateIcon/tsx.js

@@ -1,30 +1,29 @@
 const { execSync } = require("child_process");
 const fs = require("fs");
 const path = require("path");
-const { fileURLToPath } = require("url");
 const { promisify } = require("util");
 const format = require("./prettier.js");
 const synchoronousSvgConfig = require("./synchoronousSvgConfig.js");
 
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-
-export const generateIcon2Tsx = async (svgPath) => {
-  execSync(svgPath, {
-    stdio: "inherit",
-    cwd: process.cwd(),
-    shell: true,
-  });
-
-  const iconDir = path.join(__dirname, svgPath);
-  const indexPath = path.join(__dirname, "../index.ts");
-  const reactIconDir = path.join(__dirname, "../icons")
-  const configPath = path.join(__dirname, "../svgConfig");
+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 {
@@ -34,7 +33,16 @@ export const generateIcon2Tsx = async (svgPath) => {
     }
   };
 
+  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);
@@ -44,7 +52,7 @@ export const generateIcon2Tsx = async (svgPath) => {
     for (const file of files) {
       const fileName = file?.replace(".svg", "");
       // synchronousDoc(dirName, fileName)
-      const svgFilePath = path.join(__srcDir, `/svgs/${dirName}/${file}`);
+      const svgFilePath = path.join(iconDir, `../svgs/${dirName}/${file}`);
       const fileContent = fs.readFileSync(svgFilePath, {
         encoding: "utf-8",
       });
@@ -67,7 +75,7 @@ export const generateIcon2Tsx = async (svgPath) => {
             `;
 
       const content = await format(reactContent);
-      const tsxFilePath = `${iconDir}/${fileName}.tsx`;
+      const tsxFilePath = `${reactIconDir}/${fileName}.tsx`;
 
       fs.writeFileSync(tsxFilePath, content);
     }
@@ -78,3 +86,7 @@ export const generateIcon2Tsx = async (svgPath) => {
   createTsx(fillFiles, "fill");
   createTsx(twoToneFiles, "multipleTone");
 };
+
+module.exports = {
+  generateIcon2Tsx,
+};

package/package.json

@@ -1,53 +1,53 @@
-{
-  "name": "@wagq/wa-cli",
-  "version": "0.6.32-beta.0",
-  "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"
-  }
-}
+{
+  "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"
+  }
+}

package/lib/generateIcon/generate.js

@@ -1,71 +0,0 @@
-const fs = require('fs')
-const path = require('path')
-const { fileURLToPath } = require('url')
-const { promisify } = require('util')
-const format = require('./prettier.js')
-const synchoronousSvgConfig = require('./synchoronousSvgConfig.js')
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url))
-const __srcDir = path.join(__dirname, '../src')
-const iconDir = path.join(__srcDir, '/icons')
-const indexPath = path.join(__srcDir, '/index.ts')
-let indexContent = ''
-
-const createIconDir = async () => {
-  try {
-    await promisify(fs.access)(iconDir)
-  } catch (err) {
-    await promisify(fs.mkdir)(iconDir)
-  }
-}
-
-await createIconDir()
-
-// 线框风格
-const outlineIconDir = path.join(__dirname, '../src/svgs/outline')
-// 实底风格
-const fillIconDir = path.join(__dirname, '../src/svgs/fill')
-// 多色风格
-const twoToneIconDir = path.join(__dirname, '../src/svgs/multipleTone')
-
-const createTsx = async (files, dirName) => {
-  for (const file of files) {
-    const fileName = file?.replace('.svg', '')
-    // synchronousDoc(dirName, fileName)
-    const svgFilePath = path.join(__srcDir, `/svgs/${dirName}/${file}`)
-    const fileContent = fs.readFileSync(svgFilePath, {
-      encoding: 'utf-8',
-    })
-    const isMultiple = dirName === 'multipleTone'
-    synchoronousSvgConfig(fileName, fileContent, isMultiple)
-
-    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 = `${iconDir}/${fileName}.tsx`
-
-    fs.writeFileSync(tsxFilePath, content)
-  }
-
-  fs.writeFileSync(indexPath, await format(indexContent))
-}
-
-const outlineFiles = fs.readdirSync(outlineIconDir)
-const fillFiles = fs.readdirSync(fillIconDir)
-const twoToneFiles = fs.readdirSync(twoToneIconDir)
-createTsx(outlineFiles, 'outline')
-createTsx(fillFiles, 'fill')
-createTsx(twoToneFiles, 'multipleTone')