@zwa73/dev-utils 1.0.14 → 1.0.16

package/data/scripts/compile.ps1

@@ -1,5 +1,5 @@
-Write-Output 开始删除原dist
-Remove-Item -Recurse -Force dist
-Write-Output 开始编译
-tsc
-tsc-alias
+Write-Output 开始删除原dist
+Remove-Item -Recurse -Force dist
+Write-Output 开始编译
+tsc -p tsconfig.compile.json
+tsc-alias -p tsconfig.compile.json

package/data/scripts/watch.ps1

@@ -1,10 +1,10 @@
-# 定义一个函数来运行脚本
-function New-Script {
-    param($command)
-    # 在后台运行命令
-    Start-Process -NoNewWindow -FilePath "powershell" -ArgumentList "-Command", $command
-}
-
-# 开始运行脚本
-New-Script "tsc -w"
-New-Script "tsc-alias -w"
+# 定义一个函数来运行脚本
+function New-Script {
+    param($command)
+    # 在后台运行命令
+    Start-Process -NoNewWindow -FilePath "powershell" -ArgumentList "-Command", $command
+}
+
+# 开始运行脚本
+New-Script "tsc -w -p tsconfig.compile.json"
+New-Script "tsc-alias -w -p tsconfig.compile.json"

package/dist/Command/Init.js

@@ -24,9 +24,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CmdInit = void 0;
+const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const utils_1 = require("@zwa73/utils");
-const fs = __importStar(require("fs"));
 const RouteInterface_1 = require("./RouteInterface");
 /**复制基础文件 */
 async function copyData() {

package/dist/Command/MapPath.d.ts

@@ -0,0 +1,3 @@
+import { Command } from "commander";
+/**重命名文件或路径 */
+export declare const CmdMapPath: (program: Command) => Command;

package/dist/Command/MapPath.js

@@ -0,0 +1,60 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CmdMapPath = void 0;
+const utils_1 = require("@zwa73/utils");
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const DupMethodList = ["no-rename", "overwrite", "move"];
+/**重命名文件或路径 */
+const CmdMapPath = (program) => program
+    .command("mappath")
+    .description("根据正则表达式对文件名进行映射")
+    .argument("<regex>", "要匹配的正则表达式")
+    .argument("<replacement>", "替换字符串")
+    .option("-e, --exclude <regex>", "排除文件的正则表达式")
+    .option(`-d, --duplicate-handling <${DupMethodList.join('|')}>`, "处理重名文件的方式", "no-rename")
+    .option("-do, --duplicate-output <dir>", "移动重命名的重名文件的目录", "Duplicates")
+    .option("-r, --recursive", "是否处理子目录", false)
+    .option("-c, --copy", "复制而不是重命名文件", false)
+    .action(async (regexStr, replacement, options) => {
+    const regex = new RegExp(regexStr);
+    const excludeRegex = options.exclude ? new RegExp(options.exclude) : null;
+    if (!DupMethodList.includes(options.duplicateHandling))
+        (0, utils_1.throwError)(`${options.duplicateHandling} 不是有效的 duplicate-handling`);
+    const duplicateHandling = options.duplicateHandling;
+    const basePath = process.cwd();
+    // 遍历当前目录下的所有文件
+    const filePaths = utils_1.UtilFT.fileSearchRegex(basePath, regex.source, { relative: options.recursive, normalize: "posix" })
+        .map((filePath) => path_1.default.relative(basePath, filePath))
+        .filter((filePath) => excludeRegex ? (!excludeRegex.test(filePath)) : true);
+    //对单个路径映射
+    const mapPath = async (source, target) => {
+        const dir = path_1.default.parse(target).dir;
+        await utils_1.UtilFT.ensurePathExists(dir, { dir: true });
+        if (options.copy)
+            await fs_1.default.promises.copyFile(source, target);
+        else
+            await fs_1.default.promises.rename(source, target);
+    };
+    for (const filePath of filePaths) {
+        // 重命名文件
+        const newFilePath = filePath.replace(regex, replacement);
+        // 如果文件名发生了变化
+        if (newFilePath === filePath)
+            continue;
+        //如果文件已存在
+        if (await utils_1.UtilFT.pathExists(newFilePath)) {
+            await (0, utils_1.matchProc)(duplicateHandling, {
+                'move': () => mapPath(filePath, path_1.default.join(options.duplicateOutput, newFilePath)),
+                'no-rename': () => utils_1.SLogger.info(`重名文件存在，跳过：${newFilePath}`),
+                'overwrite': () => mapPath(filePath, newFilePath),
+            });
+        }
+        else
+            await mapPath(filePath, newFilePath);
+    }
+});
+exports.CmdMapPath = CmdMapPath;

package/dist/Command/Node.d.ts

@@ -1,3 +1,3 @@
-import { Command } from "commander";
+import { Command } from 'commander';
 /**编译并运行某个文件 */
 export declare const CmdNode: (program: Command) => Command;

package/dist/Command/Node.js

@@ -5,7 +5,7 @@ const utils_1 = require("@zwa73/utils");
 /**编译并运行某个文件 */
 const CmdNode = (program) => program
     .command('node <path>')
-    .option('-p, --project [path]', 'tsconfig的目录')
+    .option('-p, --project <path>', 'tsconfig的目录')
     .description('编译并运行某个文件')
     .action(async (arg, opt) => {
     utils_1.SLogger.info(`编译并运行: ${arg}`);

package/dist/Command/Release.d.ts

@@ -1,3 +1,3 @@
-import { Command } from "commander";
+import { Command } from 'commander';
 /**更新版本号并发布npm包 */
 export declare const CmdRelease: (program: Command) => Command;

package/dist/Command/Release.js

@@ -49,8 +49,8 @@ async function updateVersion(newVersion) {
 const CmdRelease = (program) => program
     .command("release")
     .description("更新版本号并发布包")
-    .option("-v, --version [version]", "指定发布的版本号 `${number}.${number}.${number}`")
-    .option("-a, --access [access]", "npm publish 的 access 参数", "public")
+    .option("-v, --version <version>", "指定发布的版本号 `${number}.${number}.${number}`")
+    .option("-a, --access <access>", "npm publish 的 access 参数", "public")
     .action(async (opt) => {
     (0, RouteInterface_1.checkProject)();
     utils_1.SLogger.info(`开始发布项目`);

package/dist/Command/Route.js

@@ -2,13 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cliRoute = void 0;
 const commander_1 = require("commander");
-const Node_1 = require("./Node");
 const Init_1 = require("./Init");
+const Node_1 = require("./Node");
 const Release_1 = require("./Release");
+const MapPath_1 = require("./MapPath");
 async function cliRoute() {
     (0, Init_1.CmdInit)(commander_1.program);
     (0, Node_1.CmdNode)(commander_1.program);
     (0, Release_1.CmdRelease)(commander_1.program);
+    (0, MapPath_1.CmdMapPath)(commander_1.program);
     commander_1.program.parse(process.argv);
 }
 exports.cliRoute = cliRoute;

package/dist/Command/RouteInterface.js

@@ -24,8 +24,8 @@ var __importStar = (this && this.__importStar) || function (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;
-const utils_1 = require("@zwa73/utils");
 const path = __importStar(require("path"));
+const utils_1 = require("@zwa73/utils");
 /**npm镜像源 */
 exports.MIRROR_SOURCE = "https://registry.npmmirror.com/";
 /**npm官方源 */

package/dist/UtilSchemaTool.d.ts

@@ -6,13 +6,23 @@ export declare namespace UtilST {
      * @param outDir      - schema文件夹路径 如 ./schema/
      * @param coverDefine - 将会覆盖 definitions 对应内容的表
      */
-    function builAllSchema(configPath: string, outDir: string, coverDefine?: JObject): Promise<void>;
+    export function builAllSchema(configPath: string, outDir: string, coverDefine?: JObject): Promise<void>;
+    /**buildMatchSchema可选项 */
+    type BuildMatchSchemaOpt = Partial<{
+        /**忽略某些glob */
+        ignore?: string | string[];
+        /** */
+        coverDefine: JObject;
+    }>;
     /**生成匹配的文件的所有type的schema
      * @async
+     * @param dir         - 目录
      * @param globPattern - glob匹配符
      * @param outDir      - schema输出路径目录 如 ./schema/
-     * @param ignore      - glob忽略匹配符
-     * @param coverDefine - 将会覆盖 definitions 对应内容的表
+     * @param opt         - 可选参数
+     * @param opt.ignore      - glob忽略匹配符
+     * @param opt.coverDefine - 将会覆盖 definitions 对应内容的表
      */
-    function buildMatchSchema(globPattern: string | string[], outDir: string, ignore?: string | string[], coverDefine?: JObject): Promise<void>;
+    export function buildMatchSchema(dir: string, globPattern: string | string[], outDir: string, opt?: BuildMatchSchemaOpt): Promise<void>;
+    export {};
 }

package/dist/UtilSchemaTool.js

@@ -24,8 +24,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UtilST = void 0;
-const TJS = __importStar(require("typescript-json-schema"));
 const path = __importStar(require("path"));
+const TJS = __importStar(require("typescript-json-schema"));
 const utils_1 = require("@zwa73/utils");
 var UtilST;
 (function (UtilST) {
@@ -45,12 +45,14 @@ var UtilST;
     UtilST.builAllSchema = builAllSchema;
     /**生成匹配的文件的所有type的schema
      * @async
+     * @param dir         - 目录
      * @param globPattern - glob匹配符
      * @param outDir      - schema输出路径目录 如 ./schema/
-     * @param ignore      - glob忽略匹配符
-     * @param coverDefine - 将会覆盖 definitions 对应内容的表
+     * @param opt         - 可选参数
+     * @param opt.ignore      - glob忽略匹配符
+     * @param opt.coverDefine - 将会覆盖 definitions 对应内容的表
      */
-    async function buildMatchSchema(globPattern, outDir, ignore, coverDefine = {}) {
+    async function buildMatchSchema(dir, globPattern, outDir, opt) {
         //生成
         const settings = {
             required: true,
@@ -59,13 +61,13 @@ var UtilST;
         const compilerOptions = {
             strictNullChecks: true,
         };
-        const files = utils_1.UtilFT.fileSearchGlob(globPattern, ignore);
+        const files = utils_1.UtilFT.fileSearchGlob(dir, globPattern, { ingore: opt?.ignore });
         const program = TJS.getProgramFromFiles(files, compilerOptions);
         const schema = TJS.generateSchema(program, "*", settings);
         outDir = outDir ?? path.join(process.cwd(), 'schema');
         const schemasPath = path.join(outDir, 'schemas.json');
         //进行预处理并展开
-        await expandSchema(schemasPath, schema, coverDefine);
+        await expandSchema(schemasPath, schema, opt?.coverDefine ?? {});
     }
     UtilST.buildMatchSchema = buildMatchSchema;
     /**展开schema以供使用 */

package/package.json

@@ -1,10 +1,10 @@
 {
 	"name": "@zwa73/dev-utils",
-	"version": "1.0.14",
+	"version": "1.0.16",
 	"description": "编译与调试工具",
 	"main": "index.js",
 	"scripts": {
-		"test": "call npm run compile && jest",
+		"test": "jest",
 		"release": "powershell scripts/release",
 		"compile": "powershell scripts/compile",
 		"watch": "powershell scripts/watch"
@@ -15,7 +15,7 @@
 	"author": "zwa73",
 	"license": "ISC",
 	"dependencies": {
-		"@zwa73/utils": "^1.0.101",
+		"@zwa73/utils": "^1.0.109",
 		"commander": "^11.1.0",
 		"ts-node": "^10.9.2",
 		"tsconfig-paths": "^4.2.0",

package/src/Command/Init.ts

@@ -1,10 +1,10 @@
-import * as path from 'path';
-import { SLogger, UtilFT, UtilFunc } from '@zwa73/utils';
-import * as fs from 'fs';
-import { DATA_PATH, MIRROR_SOURCE, PROJECT_PATH, checkProject } from './RouteInterface';
 import { Command } from 'commander';
+import * as fs from 'fs';
+import * as path from 'path';
 
+import { SLogger, UtilFT, UtilFunc } from '@zwa73/utils';
 
+import { checkProject, DATA_PATH, MIRROR_SOURCE, PROJECT_PATH } from './RouteInterface';
 
 /**复制基础文件 */
 async function copyData() {

package/src/Command/MapPath.ts

@@ -0,0 +1,56 @@
+import { SLogger, UtilFT, matchProc, throwError } from "@zwa73/utils";
+import { Command } from "commander";
+import fs from "fs";
+import path from "path";
+
+const DupMethodList = ["no-rename","overwrite","move"] as const;
+type DupMethod = typeof DupMethodList[number];
+
+/**重命名文件或路径 */
+export const CmdMapPath = (program: Command) => program
+    .command("mappath")
+    .description("根据正则表达式对文件名进行映射")
+    .argument("<regex>", "要匹配的正则表达式")
+    .argument("<replacement>", "替换字符串")
+    .option("-e, --exclude <regex>", "排除文件的正则表达式")
+    .option(`-d, --duplicate-handling <${DupMethodList.join('|')}>`, "处理重名文件的方式", "no-rename")
+    .option("-do, --duplicate-output <dir>", "移动重命名的重名文件的目录", "Duplicates")
+    .option("-r, --recursive", "是否处理子目录", false)
+    .option("-c, --copy", "复制而不是重命名文件", false)
+    .action(async (regexStr, replacement, options) => {
+        const regex = new RegExp(regexStr);
+        const excludeRegex = options.exclude ? new RegExp(options.exclude) : null;
+        if(!DupMethodList.includes(options.duplicateHandling))
+            throwError(`${options.duplicateHandling} 不是有效的 duplicate-handling`);
+        const duplicateHandling = options.duplicateHandling as DupMethod;
+        const basePath = process.cwd();
+        // 遍历当前目录下的所有文件
+        const filePaths = UtilFT.fileSearchRegex(basePath, regex.source,{relative:options.recursive,normalize:"posix"})
+            .map((filePath)=>path.relative(basePath, filePath))
+            .filter((filePath)=>excludeRegex ? (!excludeRegex.test(filePath)) : true);
+
+        //对单个路径映射
+        const mapPath = async (source:string,target:string)=>{
+            const dir = path.parse(target).dir;
+            await UtilFT.ensurePathExists(dir,{dir:true});
+            if (options.copy)
+                await fs.promises.copyFile(source, target);
+            else
+                await fs.promises.rename(source, target);
+        }
+
+        for(const filePath of filePaths){
+            // 重命名文件
+            const newFilePath = filePath.replace(regex, replacement);
+            // 如果文件名发生了变化
+            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),
+                })
+            } else await mapPath(filePath,newFilePath);
+        }
+    });

package/src/Command/Node.ts

@@ -1,12 +1,11 @@
-import { SLogger, UtilFunc } from "@zwa73/utils";
-import { Command } from "commander";
-
+import { Command } from 'commander';
 
+import { SLogger, UtilFunc } from '@zwa73/utils';
 
 /**编译并运行某个文件 */
 export const CmdNode = (program:Command)=>program
     .command('node <path>')
-    .option('-p, --project [path]','tsconfig的目录')
+    .option('-p, --project <path>','tsconfig的目录')
     .description('编译并运行某个文件')
     .action(async (arg, opt) => {
         SLogger.info(`编译并运行: ${arg}`);

package/src/Command/Release.ts

@@ -1,8 +1,9 @@
-import { Command } from "commander";
-import fs from "fs";
-import path from "path";
-import { SLogger, UtilFT, UtilFunc, throwError } from "@zwa73/utils";
-import { OFFICIAL_SOURCE, PROJECT_PATH, checkProject, withOfficialSource } from "./RouteInterface";
+import { Command } from 'commander';
+import path from 'path';
+
+import { SLogger, throwError, UtilFT, UtilFunc } from '@zwa73/utils';
+
+import { checkProject, OFFICIAL_SOURCE, PROJECT_PATH } from './RouteInterface';
 
 /**解析版本号为number数组 */
 function parseVersion(version: string){
@@ -45,8 +46,8 @@ async function updateVersion(newVersion?: string): Promise<string> {
 export const CmdRelease = (program: Command) =>program
     .command("release")
     .description("更新版本号并发布包")
-    .option("-v, --version [version]", "指定发布的版本号 `${number}.${number}.${number}`")
-    .option("-a, --access [access]", "npm publish 的 access 参数","public")
+    .option("-v, --version <version>", "指定发布的版本号 `${number}.${number}.${number}`")
+    .option("-a, --access <access>", "npm publish 的 access 参数","public")
     .action(async (opt) => {
         checkProject();
         SLogger.info(`开始发布项目`);

package/src/Command/Route.ts

@@ -1,12 +1,14 @@
-import { program } from "commander";
-import { CmdNode } from "./Node";
-import { CmdInit } from "./Init";
-import { CmdRelease } from "./Release";
+import { program } from 'commander';
 
+import { CmdInit } from './Init';
+import { CmdNode } from './Node';
+import { CmdRelease } from './Release';
+import { CmdMapPath } from './MapPath';
 
 export async function cliRoute(){
     CmdInit(program);
     CmdNode(program);
     CmdRelease(program);
+    CmdMapPath(program);
     program.parse(process.argv);
 }

package/src/Command/RouteInterface.ts

@@ -1,7 +1,6 @@
-import { SLogger, UtilFT, UtilFunc, sleep, throwError } from "@zwa73/utils";
-import { Command, OptionValues } from "commander";
 import * as path from 'path';
 
+import { SLogger, throwError, UtilFT, UtilFunc } from '@zwa73/utils';
 
 /**npm镜像源 */
 export const MIRROR_SOURCE = "https://registry.npmmirror.com/";

package/src/UtilSchemaTool.ts

@@ -1,5 +1,6 @@
-import * as TJS from 'typescript-json-schema';
 import * as path from 'path';
+import * as TJS from 'typescript-json-schema';
+
 import { JObject, SLogger, UtilFT, UtilFunc } from '@zwa73/utils';
 
 export namespace UtilST{
@@ -16,14 +17,24 @@ export async function builAllSchema(configPath:string,outDir:string,coverDefine:
     //进行预处理并展开
     await expandSchema(outDir,schema,coverDefine);
 }
+
+/**buildMatchSchema可选项 */
+type BuildMatchSchemaOpt = Partial<{
+    /**忽略某些glob */
+    ignore?:string|string[],
+    /** */
+    coverDefine:JObject,
+}>
 /**生成匹配的文件的所有type的schema
  * @async
+ * @param dir         - 目录
  * @param globPattern - glob匹配符
  * @param outDir      - schema输出路径目录 如 ./schema/
- * @param ignore      - glob忽略匹配符
- * @param coverDefine - 将会覆盖 definitions 对应内容的表
+ * @param opt         - 可选参数
+ * @param opt.ignore      - glob忽略匹配符
+ * @param opt.coverDefine - 将会覆盖 definitions 对应内容的表
  */
-export async function buildMatchSchema(globPattern:string|string[],outDir:string,ignore?:string|string[],coverDefine:JObject={}){
+export async function buildMatchSchema(dir:string,globPattern:string|string[],outDir:string,opt?:BuildMatchSchemaOpt){
     //生成
     const settings: TJS.PartialArgs = {
         required: true,
@@ -32,7 +43,7 @@ export async function buildMatchSchema(globPattern:string|string[],outDir:string
     const compilerOptions: TJS.CompilerOptions = {
         strictNullChecks: true,
     };
-    const files = UtilFT.fileSearchGlob(globPattern,ignore);
+    const files = UtilFT.fileSearchGlob(dir,globPattern,{ingore:opt?.ignore});
     const program = TJS.getProgramFromFiles(
         files,
         compilerOptions,
@@ -41,7 +52,7 @@ export async function buildMatchSchema(globPattern:string|string[],outDir:string
     outDir = outDir??path.join(process.cwd(),'schema');
     const schemasPath = path.join(outDir,'schemas.json');
     //进行预处理并展开
-    await expandSchema(schemasPath,schema,coverDefine);
+    await expandSchema(schemasPath,schema,opt?.coverDefine??{});
 }
 /**展开schema以供使用 */
 async function expandSchema(schemasPath:string,schema:any,coverDefine:JObject){

package/test.js

@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+const {UtilFT} = require('@zwa73/utils')
+const fs = require('fs');
+const path = require('path');
+async function main(){
+    const root = __filename;
+    const dirpath = path.join(__dirname,'src');
+
+    const ts = await fs.promises.readdir(dirpath,{withFileTypes:true})
+    ts//?
+    const list = await UtilFT.fileSearchRegex(dirpath, '')
+        .map((filePath)=>path.relative(dirpath, filePath));
+
+    console.log(
+        path.parse(root),
+        path.basename(root)
+    );
+    list.forEach((file)=>{
+        console.log(file)
+    })
+}
+main();