@zwa73/dev-utils 1.0.58 → 1.0.61

package/src/Command/CreateElectronFrame.ts

@@ -0,0 +1,40 @@
+import { Command } from 'commander';
+import * as fs from 'fs';
+import path from 'pathe';
+
+import { SLogger, UtilFT, UtilFunc } from '@zwa73/utils';
+
+import { checkProject, DATA_PATH, MIRROR_SOURCE, PROJECT_PATH } from './RouteInterface';
+
+
+const InitDataPath = path.join(DATA_PATH,'CreateElectronFrame');
+
+/**复制基础文件 */
+async function copyData() {
+    const filelist = await fs.promises.readdir(InitDataPath);
+    const plist = filelist.map(async (fileName)=>{
+        SLogger.info(`正在复制 ${fileName}`);
+        const filePath = path.join(InitDataPath,fileName);
+        const targetPath = path.join(PROJECT_PATH,fileName);
+        if(!await UtilFT.pathExists(targetPath))
+            await fs.promises.cp(filePath,targetPath,{recursive:true});
+        else
+            SLogger.info(`${fileName} 已存在 跳过`);
+        return null;
+    })
+    await Promise.all(plist);
+}
+
+/**对项目进行初始化 */
+export const CmdCreateElectronFrame = (program:Command)=>program
+    .command('CreateElectronFrame')
+    .command('createelectronframe')
+    .description('对当前目录进行项目初始化')
+    .action(async (opt) => {
+        checkProject();
+        SLogger.info(`开始初始化设置当前目录 ${PROJECT_PATH}`);
+        await Promise.all([
+            copyData(),
+            UtilFunc.exec(`npm install --registry ${MIRROR_SOURCE}`)
+        ]);
+    });

package/src/Command/GenSchema.ts

@@ -17,7 +17,7 @@ export const CmdGenSchema = (program:Command) => program
             include : opt.include,
             exclude : opt.exclude,
             project : opt.project,
-            outDir  : opt.outDir,
+            outDir  : opt.out,
             includeTypes: opt.includeTypes,
             excludeTypes: opt.excludeTypes
         });

package/src/Command/Init.ts

@@ -6,12 +6,18 @@ import { SLogger, UtilFT, UtilFunc } from '@zwa73/utils';
 
 import { checkProject, DATA_PATH, MIRROR_SOURCE, PROJECT_PATH } from './RouteInterface';
 
+
+
+
+
+const InitDataPath = path.join(DATA_PATH,'init');
+
 /**复制基础文件 */
 async function copyData() {
-    const filelist = await fs.promises.readdir(DATA_PATH);
+    const filelist = await fs.promises.readdir(InitDataPath);
     const plist = filelist.map(async (fileName)=>{
         SLogger.info(`正在复制 ${fileName}`);
-        const filePath = path.join(DATA_PATH,fileName);
+        const filePath = path.join(InitDataPath,fileName);
         const targetPath = path.join(PROJECT_PATH,fileName);
         if(!await UtilFT.pathExists(targetPath))
             await fs.promises.cp(filePath,targetPath,{recursive:true});
@@ -26,11 +32,22 @@ async function copyData() {
 async function installPackage() {
     const install = async (name:string)=>
         await UtilFunc.exec(`npm i --registry ${MIRROR_SOURCE} ${name}`);
+    const installdev = async (name:string)=>
+        await UtilFunc.exec(`npm i --registry ${MIRROR_SOURCE} --save-dev ${name}`);
     const packageList = ['@zwa73/utils'];
+    const devPackList = [
+        '@zwa73/dev-utils',
+        '@types/fluent-ffmpeg',
+        '@types/node',
+    ];
     for(const name of packageList){
         SLogger.info(`正在安装 ${name}`);
         await install(name);
     }
+    for(const name of devPackList){
+        SLogger.info(`正在安装 ${name}`);
+        await installdev(name);
+    }
 }
 
 /**对项目进行初始化 */

package/src/Command/MapPath.ts

@@ -3,8 +3,9 @@ import { Command } from "commander";
 import fs from "fs";
 import path from "pathe";
 
-const DupMethodList = ["no-rename","overwrite","move"] as const;
+const DupMethodList = ["skip","overwrite","move"] as const;
 type DupMethod = typeof DupMethodList[number];
+const DupMethodWithoutMove = DupMethodList.filter(t=>t!='move') as Exclude<DupMethod,'move'>[];
 
 /**重命名文件或路径 */
 export const CmdMapPath = (program: Command) => program
@@ -14,10 +15,14 @@ export const CmdMapPath = (program: Command) => program
     .argument("<regex>", "要匹配的正则表达式, posix风格路径")
     .argument("<replacement>", "替换字符串")
     .option("-e, --exclude <regex>", "排除文件的正则表达式")
-    .option(`-d, --duplicate-handling <${DupMethodList.join('|')}>`, "处理重名文件的方式", "no-rename")
-    .option("-do, --duplicate-output <dir>", "移动重命名的重名文件的目录", "Duplicates")
+    .option(`-d, --duplicate-handling <${DupMethodWithoutMove.join('|')}|[path:string]>`,
+`处理重名文件的方式:
+skip 不进行处理
+overwrite 覆盖重名
+其他字符串 将重名部分映射到指定目录下的对应位置, 再次重复将会覆盖`,
+        "skip")
     .option("-r, --recursive", "是否处理子目录", false)
-    .option("-c, --copy", "复制而不是重命名文件", false)
+    .option("-m, --move", "重命名而不是复制文件", false)
     .option("-t, --test", "不对文件进行实际操作, 在控制台输出映射结果", false)
     .action(async (regexStr, replacement, options) => {
         const regex = new RegExp(regexStr);
@@ -36,10 +41,8 @@ export const CmdMapPath = (program: Command) => program
             const dir = path.parse(target).dir;
             await UtilFT.ensurePathExists(dir,{dir:true});
             if(options.test) return SLogger.info(`${source} -> ${target}`);
-            if (options.copy)
-                await fs.promises.copyFile(source, target);
-            else
-                await fs.promises.rename(source, target);
+            if (options.move) await fs.promises.rename(source, target);
+            else await fs.promises.copyFile(source, target);
         }
 
         for(const filePath of filePaths){
@@ -49,11 +52,13 @@ export const CmdMapPath = (program: Command) => program
             if (newFilePath === filePath) continue;
             //如果文件已存在
             if(await UtilFT.pathExists(newFilePath)){
-                await matchProc(duplicateHandling,{
-                    'move': ()=> mapPath(filePath, path.join(options.duplicateOutput, newFilePath)),
-                    'no-rename': ()=> SLogger.info(`重名文件存在，跳过：${newFilePath}`),
-                    'overwrite': ()=> mapPath(filePath,newFilePath),
-                })
+                if(DupMethodWithoutMove.includes(options.duplicateHandling)){
+                    const fixhd = duplicateHandling as Exclude<DupMethod,'move'>;
+                    await matchProc(fixhd,{
+                        'skip': ()=> SLogger.info(`重名文件存在，跳过：${newFilePath}`),
+                        'overwrite': ()=> mapPath(filePath,newFilePath),
+                    });
+                }else await mapPath(filePath, path.join(duplicateHandling, newFilePath));
             } else await mapPath(filePath,newFilePath);
         }
     });

package/src/UtilDevTool.ts

@@ -69,11 +69,11 @@ export async function generateSchema(dir:string,opt?:BuildSchemaOpt){
     const it = opt?.includeTypes?.map(t=>new RegExp(t))??[/.*/];
     const et = opt?.excludeTypes?.map(t=>new RegExp(t))??[];
     const p = new Project();
-    const types = files.map(fp=>{
-        const sf = p.addSourceFileAtPath(fp);
-        const ds = sf.getDescendantsOfKind(SyntaxKind.TypeAliasDeclaration);
-        return ds.map(d=>d.getName());
-    }).flat();
+    const types = files.map(fp => p
+        .addSourceFileAtPath(fp)
+        .getDescendantsOfKind(SyntaxKind.TypeAliasDeclaration)
+        .map(d=>d.getName())
+    ).flat();
     //console.log(types)
     const list = gener.getUserSymbols()
             .filter(t=>types.some(i=>i===t))
@@ -87,7 +87,7 @@ export async function generateSchema(dir:string,opt?:BuildSchemaOpt){
     //预处理
     const proced = procSchema(schema,opt?.coverDefine??{});
     await Promise.all([
-        UtilFT.writeJSONFile(schemasPath,schema),
+        UtilFT.writeJSONFile(schemasPath,proced),
         //展开
         expandSchema(proced,schemasPath),
     ]);

package/dist/b.schema.d.ts

@@ -1,4 +0,0 @@
-export type ASD<A, B> = {
-    a: 123;
-    b: 223;
-};

package/dist/b.schema.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-let c = null;

package/src/b.schema.ts

@@ -1,5 +0,0 @@
-import { PartialOption } from "@zwa73/utils";
-
-let c:PartialOption<{},{}>=null as any;
-
-export type ASD<A,B> = {a:123,b:223}