@zwa73/dev-utils 1.0.58 → 1.0.59

package/dist/Command/GenSchema.js

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

package/dist/Command/Init.js

@@ -49,11 +49,21 @@ async function copyData() {
 /**安装npm包 */
 async function installPackage() {
     const install = async (name) => await utils_1.UtilFunc.exec(`npm i --registry ${RouteInterface_1.MIRROR_SOURCE} ${name}`);
+    const installdev = async (name) => await utils_1.UtilFunc.exec(`npm i --registry ${RouteInterface_1.MIRROR_SOURCE} --save-dev ${name}`);
     const packageList = ['@zwa73/utils'];
+    const devPackList = [
+        '@zwa73/dev-utils',
+        '@types/fluent-ffmpeg',
+        '@types/node',
+    ];
     for (const name of packageList) {
         utils_1.SLogger.info(`正在安装 ${name}`);
         await install(name);
     }
+    for (const name of devPackList) {
+        utils_1.SLogger.info(`正在安装 ${name}`);
+        await installdev(name);
+    }
 }
 /**对项目进行初始化 */
 const CmdInit = (program) => program

package/dist/Command/MapPath.js

@@ -7,7 +7,8 @@ exports.CmdMapPath = void 0;
 const utils_1 = require("@zwa73/utils");
 const fs_1 = __importDefault(require("fs"));
 const pathe_1 = __importDefault(require("pathe"));
-const DupMethodList = ["no-rename", "overwrite", "move"];
+const DupMethodList = ["skip", "overwrite", "move"];
+const DupMethodWithoutMove = DupMethodList.filter(t => t != 'move');
 /**重命名文件或路径 */
 const CmdMapPath = (program) => program
     .command("Map-Path")
@@ -16,10 +17,12 @@ const CmdMapPath = (program) => 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);
@@ -38,10 +41,10 @@ const CmdMapPath = (program) => program
         await utils_1.UtilFT.ensurePathExists(dir, { dir: true });
         if (options.test)
             return utils_1.SLogger.info(`${source} -> ${target}`);
-        if (options.copy)
-            await fs_1.default.promises.copyFile(source, target);
-        else
+        if (options.move)
             await fs_1.default.promises.rename(source, target);
+        else
+            await fs_1.default.promises.copyFile(source, target);
     };
     for (const filePath of filePaths) {
         // 重命名文件
@@ -51,11 +54,15 @@ const CmdMapPath = (program) => program
             continue;
         //如果文件已存在
         if (await utils_1.UtilFT.pathExists(newFilePath)) {
-            await (0, utils_1.matchProc)(duplicateHandling, {
-                'move': () => mapPath(filePath, pathe_1.default.join(options.duplicateOutput, newFilePath)),
-                'no-rename': () => utils_1.SLogger.info(`重名文件存在，跳过：${newFilePath}`),
-                'overwrite': () => mapPath(filePath, newFilePath),
-            });
+            if (DupMethodWithoutMove.includes(options.duplicateHandling)) {
+                const fixhd = duplicateHandling;
+                await (0, utils_1.matchProc)(fixhd, {
+                    'skip': () => utils_1.SLogger.info(`重名文件存在，跳过：${newFilePath}`),
+                    'overwrite': () => mapPath(filePath, newFilePath),
+                });
+            }
+            else
+                await mapPath(filePath, pathe_1.default.join(duplicateHandling, newFilePath));
         }
         else
             await mapPath(filePath, newFilePath);

package/dist/Command/Route.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cliRoute = void 0;
+exports.cliRoute = cliRoute;
 const commander_1 = require("commander");
 const Init_1 = require("./Init");
 const Node_1 = require("./Node");
@@ -21,4 +21,3 @@ async function cliRoute() {
     (0, GenI18n_1.CmdGenI18n)(commander_1.program);
     commander_1.program.parse(process.argv);
 }
-exports.cliRoute = cliRoute;

package/dist/Command/RouteInterface.js

@@ -3,7 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkProject = exports.withOfficialSource = exports.withMirrorSource = exports.parseBoolean = exports.parseNumber = exports.parseInteger = exports.PROJECT_PATH = exports.DATA_PATH = exports.OFFICIAL_SOURCE = exports.MIRROR_SOURCE = void 0;
+exports.PROJECT_PATH = exports.DATA_PATH = exports.OFFICIAL_SOURCE = exports.MIRROR_SOURCE = void 0;
+exports.parseInteger = parseInteger;
+exports.parseNumber = parseNumber;
+exports.parseBoolean = parseBoolean;
+exports.withMirrorSource = withMirrorSource;
+exports.withOfficialSource = withOfficialSource;
+exports.checkProject = checkProject;
 const pathe_1 = __importDefault(require("pathe"));
 const utils_1 = require("@zwa73/utils");
 /**npm镜像源 */
@@ -21,7 +27,6 @@ function parseInteger(value) {
         (0, utils_1.throwError)(`${value} 不是有效的整数数字`);
     return num;
 }
-exports.parseInteger = parseInteger;
 /** 检测任意数字类型 */
 function parseNumber(value) {
     const num = Number(value);
@@ -29,12 +34,10 @@ function parseNumber(value) {
         (0, utils_1.throwError)(`${value} 不是有效的数字`);
     return num;
 }
-exports.parseNumber = parseNumber;
 /** 检测布尔类型 */
 function parseBoolean(value) {
     return value ? true : false;
 }
-exports.parseBoolean = parseBoolean;
 /**在镜像源内镜像操作 */
 async function withMirrorSource(func) {
     const out = await utils_1.UtilFunc.exec('npm config get registry');
@@ -45,7 +48,6 @@ async function withMirrorSource(func) {
     utils_1.SLogger.info(`正在修改npm源为 原始源: ${OriginSource}`);
     await utils_1.UtilFunc.exec(`npm config set registry ${OriginSource}`);
 }
-exports.withMirrorSource = withMirrorSource;
 /**在官方源内镜像操作 */
 async function withOfficialSource(func) {
     const out = await utils_1.UtilFunc.exec('npm config get registry');
@@ -56,11 +58,9 @@ async function withOfficialSource(func) {
     utils_1.SLogger.info(`正在修改npm源为 原始源: ${OriginSource}`);
     await utils_1.UtilFunc.exec(`npm config set registry ${OriginSource}`);
 }
-exports.withOfficialSource = withOfficialSource;
 /**检查目录是否为项目 */
 async function checkProject() {
     const filePath = pathe_1.default.join(exports.PROJECT_PATH, "package.json");
     if (!(await utils_1.UtilFT.pathExists(filePath)))
         (0, utils_1.throwError)(`当前目录: ${exports.PROJECT_PATH} 不是npm项目目录, 请先使用 npm init`);
 }
-exports.checkProject = checkProject;

package/dist/UtilDevTool.js

@@ -66,11 +66,10 @@ var UtilDT;
         const it = opt?.includeTypes?.map(t => new RegExp(t)) ?? [/.*/];
         const et = opt?.excludeTypes?.map(t => new RegExp(t)) ?? [];
         const p = new ts_morph_1.Project();
-        const types = files.map(fp => {
-            const sf = p.addSourceFileAtPath(fp);
-            const ds = sf.getDescendantsOfKind(ts_morph_1.SyntaxKind.TypeAliasDeclaration);
-            return ds.map(d => d.getName());
-        }).flat();
+        const types = files.map(fp => p
+            .addSourceFileAtPath(fp)
+            .getDescendantsOfKind(ts_morph_1.SyntaxKind.TypeAliasDeclaration)
+            .map(d => d.getName())).flat();
         //console.log(types)
         const list = gener.getUserSymbols()
             .filter(t => types.some(i => i === t))
@@ -84,7 +83,7 @@ var UtilDT;
         //预处理
         const proced = procSchema(schema, opt?.coverDefine ?? {});
         await Promise.all([
-            utils_1.UtilFT.writeJSONFile(schemasPath, schema),
+            utils_1.UtilFT.writeJSONFile(schemasPath, proced),
             //展开
             expandSchema(proced, schemasPath),
         ]);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/dev-utils",
-	"version": "1.0.58",
+	"version": "1.0.59",
 	"description": "编译与调试工具",
 	"main": "index.js",
 	"scripts": {
@@ -16,7 +16,8 @@
 	"author": "zwa73",
 	"license": "ISC",
 	"dependencies": {
-		"@zwa73/utils": "^1.0.144",
+		"@deepkit/type-compiler": "^1.0.1-alpha.150",
+		"@zwa73/utils": "^1.0.146",
 		"commander": "^11.1.0",
 		"pathe": "^1.1.2",
 		"ts-morph": "^23.0.0",
@@ -27,7 +28,7 @@
 	"devDependencies": {
 		"@types/fluent-ffmpeg": "^2.1.24",
 		"@types/jest": "^29.5.12",
-		"@types/node": "^20.11.19",
+		"@types/node": "^20.14.11",
 		"jest": "^29.7.0",
 		"ts-jest": "^29.1.2",
 		"tsc-alias": "^1.8.8",

package/scripts/postinstall.js

@@ -10,6 +10,8 @@ const INFO_TABLE = {
     "1.0.36":"$macro 更名为 regionMacro"
 }
 
+const PKG_NAME = "dev-utils";
+
 // 将版本号转换为可以比较的数字
 function versionToNumber(version) {
     if(version==undefined) return 0;
@@ -24,6 +26,7 @@ function showUpgradeMessages(prevVersion, currentVersion) {
     // 遍历infoTable中的所有版本
     for (const version in INFO_TABLE) {
         const versionNumber = versionToNumber(version);
+        //console.log(versionNumber,prevVersionNumber,currentVersionNumber)
         // 如果用户的上一个版本低于这个版本，而当前版本高于或等于这个版本
         if (versionNumber > prevVersionNumber && versionNumber <= currentVersionNumber) {
             // 显示这个版本的提示信息
@@ -35,22 +38,19 @@ function showUpgradeMessages(prevVersion, currentVersion) {
 }
 
 
-
 async function main(){
     const packageTable = await UtilFT.loadJSONFile(PACKAGE_PATH);
     const currentVersion = packageTable.version;
     await UtilFT.ensurePathExists(VERSION_PATH);
-    const versionTable = Object.assign({},
-        await UtilFT.loadJSONFile(VERSION_PATH,{}),
-        {"dev-utils":{version:currentVersion}});
-    const prevVersion = versionTable.utils.version;
+    const versionTable = await UtilFT.loadJSONFile(VERSION_PATH,{default:{}});
+    const prevVersion = versionTable[PKG_NAME]?.version ?? "0.0.0";
 
     console.log(`${currentVersion} 版本已安装`);
     // 使用这个函数来显示升级信息
     const hasOut = showUpgradeMessages(prevVersion, currentVersion);
 
-    versionTable.utils.version = currentVersion;
-    await UtilFT.writeJSONFile(VERSION_PATH, versionTable);
+    const ntable = Object.assign({},versionTable,{[PKG_NAME]:{version:currentVersion}});
+    await UtilFT.writeJSONFile(VERSION_PATH, ntable);
 
     if(!hasOut) return;
     const rl = readline.createInterface({

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

@@ -26,11 +26,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}