@zwa73/dev-utils 1.0.26 → 1.0.28

package/dist/Command/BuildMacro.d.ts

@@ -0,0 +1,3 @@
+import { Command } from "commander";
+/**构造macro */
+export declare const CmdBuildMacro: (program: Command) => Command;

package/dist/Command/BuildMacro.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CmdBuildMacro = void 0;
+const UtilDevTool_1 = require("../UtilDevTool");
+/**构造macro */
+const CmdBuildMacro = (program) => program
+    .command("Build-Macro")
+    .alias("buildmacro")
+    .description("生成根据macro生成代码")
+    .option("-i, --include <glob>", "包含的glob 默认 src/**/*.macro.ts", "src/**/*.macro.ts")
+    .option("-g, --exclude <glob>", "忽略的glob")
+    .option("-p, --project <path>", "tsconfig路径 默认tsconfig.json", "tsconfig.json")
+    .action(async (opt) => {
+    await UtilDevTool_1.UtilDT.matchNode(process.cwd(), {
+        include: opt.include,
+        exclude: opt.ignore,
+        project: opt.project,
+    });
+});
+exports.CmdBuildMacro = CmdBuildMacro;

package/dist/Command/BuildSchema.d.ts

@@ -0,0 +1,3 @@
+import { Command } from "commander";
+/**生成schema */
+export declare const CmdBuildSchema: (program: Command) => Command;

package/dist/Command/BuildSchema.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CmdBuildSchema = void 0;
+const UtilDevTool_1 = require("../UtilDevTool");
+/**生成schema */
+const CmdBuildSchema = (program) => program
+    .command("Build-Schema")
+    .alias("buildschema")
+    .description("生成匹配的文件的所有type的schema")
+    .option("-i, --include <glob>", "包含的glob 默认 src/**/*.schema.ts", "src/**/*.schema.ts")
+    .option("-g, --exclude <glob>", "忽略的glob")
+    .option("-p, --project <path>", "tsconfig路径 默认tsconfig.json", "tsconfig.json")
+    .option("-o, --outDir <dir>", "schema输出路径目录 默认 ./schema/")
+    .action(async (opt) => {
+    await UtilDevTool_1.UtilDT.buildSchema(process.cwd(), {
+        include: opt.include,
+        exclude: opt.ignore,
+        project: opt.project,
+        outDir: opt.outDir,
+    });
+});
+exports.CmdBuildSchema = CmdBuildSchema;

package/dist/Command/Init.js

@@ -54,6 +54,7 @@ async function installPackage() {
 }
 /**对项目进行初始化 */
 const CmdInit = (program) => program
+    .command('Init')
     .command('init')
     .description('对当前目录进行项目初始化')
     .action(async (opt) => {

package/dist/Command/Node.js

@@ -4,14 +4,15 @@ exports.CmdNode = void 0;
 const utils_1 = require("@zwa73/utils");
 /**编译并运行某个文件 */
 const CmdNode = (program) => program
-    .command('node <path>')
+    .command('Node <path|path[]>')
+    .alias('node')
     .option('-p, --project <path>', 'tsconfig的目录')
     .description('编译并运行某个文件')
     .action(async (arg, opt) => {
     utils_1.SLogger.info(`编译并运行: ${arg}`);
     let cmd = `ts-node -r tsconfig-paths/register ${arg}`;
     if (opt.project)
-        cmd += `-p ${opt.project}`;
+        cmd += `-P ${opt.project}`;
     await utils_1.UtilFunc.exec(cmd, { outlvl: 'info', errlvl: 'error' });
 });
 exports.CmdNode = CmdNode;

package/dist/Command/Release.js

@@ -47,7 +47,8 @@ async function updateVersion(newVersion) {
 }
 /**更新版本号并发布npm包 */
 const CmdRelease = (program) => program
-    .command("release")
+    .command("Release")
+    .alias("release")
     .description("更新版本号并发布包")
     .option("-v, --version <version>", "指定发布的版本号 `${number}.${number}.${number}`")
     .option("-a, --access <access>", "npm publish 的 access 参数", "public")

package/dist/Command/Route.js

@@ -7,12 +7,16 @@ const Node_1 = require("./Node");
 const Release_1 = require("./Release");
 const MapPath_1 = require("./MapPath");
 const ScanDups_1 = require("./ScanDups");
+const BuildSchema_1 = require("./BuildSchema");
+const BuildMacro_1 = require("./BuildMacro");
 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);
     (0, ScanDups_1.CmdScanDups)(commander_1.program);
+    (0, BuildSchema_1.CmdBuildSchema)(commander_1.program);
+    (0, BuildMacro_1.CmdBuildMacro)(commander_1.program);
     commander_1.program.parse(process.argv);
 }
 exports.cliRoute = cliRoute;

package/dist/QuickFunc.d.ts

@@ -0,0 +1,2 @@
+import { UtilDT } from "./UtilDevTool";
+export declare const $macro: typeof UtilDT.$macro;

package/dist/QuickFunc.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.$macro = void 0;
+const UtilDevTool_1 = require("./UtilDevTool");
+exports.$macro = UtilDevTool_1.UtilDT.$macro;

package/dist/UtilDevTool.d.ts

@@ -0,0 +1,56 @@
+import { JObject } from '@zwa73/utils';
+export declare namespace UtilDT {
+    /**执行js/ts的可选项 */
+    type BatchNodeOpt = Partial<{
+        /**tsconfig路径 */
+        project: string;
+    }>;
+    /**build任意ts文件的可选项 */
+    type BuildMatchOpt = Partial<{
+        /**包含的glob */
+        include: string | string[];
+        /**忽略的glob */
+        exclude: string | string[];
+    }> & BatchNodeOpt;
+    /**build schema的可选项 */
+    type BuildSchemaOpt = Partial<{
+        /**将会覆盖 definitions 对应内容的表 */
+        coverDefine: JObject;
+        /**schema输出路径目录 如 ./schema/ */
+        outDir: string;
+    }> & BuildMatchOpt;
+    /**生成匹配的文件的所有type的schema
+     * @async
+     * @param dir         - 基础目录
+     * @param opt         - 可选参数
+     * @param opt.include     - 包含的glob 默认 **\/\*.schema.ts
+     * @param opt.exclude     - 忽略的glob
+     * @param opt.coverDefine - 将会覆盖 definitions 对应内容的表
+     * @param opt.project     - tsconfig路径
+     * @param opt.outDir      - schema输出路径目录 默认 ./schema/
+     */
+    export function buildSchema(dir: string, opt?: BuildSchemaOpt): Promise<void>;
+    /**运行所有匹配的的js/ts文件
+     * @async
+     * @param dir         - 基础目录
+     * @param opt         - 可选参数
+     * @param opt.include     - 包含的glob 默认 index.ts
+     * @param opt.exclude     - 忽略的glob
+     * @param opt.project     - tsconfig路径
+     */
+    export function matchNode(dir: string, opt?: BuildMatchOpt): Promise<void>;
+    /**运行所有js/ts文件
+     * @async
+     * @param filepath - 需要运行的文件
+     * @param opt      - 可选参数
+     * @param opt.project     - tsconfig路径
+     */
+    export function batchNode(filepath: string | string[], opt?: BatchNodeOpt): Promise<void>;
+    /**将codeText写入对应region
+     * @param regionId   - 区域id
+     * @param codeText   - 文本
+     * @param targetPath - 目标文件 默认为去除".macro"的同名文件
+     */
+    export function $macro(regionId: string, codeText: string, targetPath?: string): Promise<void>;
+    export {};
+}

package/dist/UtilDevTool.js

@@ -0,0 +1,170 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UtilDT = void 0;
+const path = __importStar(require("path"));
+const TJS = __importStar(require("typescript-json-schema"));
+const fs = __importStar(require("fs"));
+const utils_1 = require("@zwa73/utils");
+var UtilDT;
+(function (UtilDT) {
+    /**生成匹配的文件的所有type的schema
+     * @async
+     * @param dir         - 基础目录
+     * @param opt         - 可选参数
+     * @param opt.include     - 包含的glob 默认 **\/\*.schema.ts
+     * @param opt.exclude     - 忽略的glob
+     * @param opt.coverDefine - 将会覆盖 definitions 对应内容的表
+     * @param opt.project     - tsconfig路径
+     * @param opt.outDir      - schema输出路径目录 默认 ./schema/
+     */
+    async function buildSchema(dir, opt) {
+        //生成
+        const settings = {
+            required: true,
+            aliasRef: true,
+            tsNodeRegister: true,
+        };
+        const compilerOptions = {
+            strictNullChecks: true,
+        };
+        if (opt?.project)
+            Object.assign(compilerOptions, (await utils_1.UtilFT.loadJSONFile(opt.project)).compilerOptions);
+        const files = utils_1.UtilFT.fileSearchGlob(dir, opt?.include ?? "**/*.schema.ts", { ingore: opt?.exclude });
+        const program = TJS.getProgramFromFiles(files, compilerOptions);
+        const schema = TJS.generateSchema(program, "*", settings);
+        const outDir = opt?.outDir ?? path.join(process.cwd(), 'schema');
+        const schemasPath = path.join(outDir, 'schemas.json');
+        //进行预处理并展开
+        await expandSchema(schemasPath, schema, opt?.coverDefine ?? {});
+    }
+    UtilDT.buildSchema = buildSchema;
+    /**展开schema以供使用 */
+    async function expandSchema(schemasPath, schema, coverDefine) {
+        //覆盖
+        coverObj(schema["definitions"], coverDefine);
+        //替换SchemaString标识符
+        schema = JSON.parse(JSON.stringify(schema).replace(/\^\.\*SchemaString\$/g, '^.*$'));
+        const plist = [];
+        plist.push(utils_1.UtilFT.writeJSONFile(schemasPath, schema));
+        const definitions = schema["definitions"];
+        //展开定义
+        for (const typeName in definitions) {
+            const schema = definitions[typeName];
+            //展开所有object与忽略检测的类型
+            if (!(schema.type == "object" || schema.type == "array" || schema.type == undefined))
+                continue;
+            if ((/^.+_[0-9]/).test(typeName) || (/^{./).test(typeName))
+                continue;
+            const basename = path.basename(schemasPath);
+            const tpath = path.join(path.dirname(schemasPath), `${typeName}.schema.json`);
+            if (!utils_1.UtilFT.isValidFilePath(tpath))
+                continue;
+            plist.push(utils_1.UtilFT.writeJSONFile(tpath, {
+                "$schema": "http://json-schema.org/draft-07/schema#",
+                "$ref": `${basename}#/definitions/${typeName}`
+            }));
+        }
+        await Promise.all(plist);
+    }
+    /**覆盖object */
+    function coverObj(base, cover) {
+        for (const k in cover) {
+            const v = cover[k];
+            if (typeof v === "object" && !Array.isArray(v) &&
+                typeof base[k] === "object" && !Array.isArray(base[k]))
+                coverObj(base[k], v);
+            else
+                base[k] = v;
+        }
+    }
+    /**运行所有匹配的的js/ts文件
+     * @async
+     * @param dir         - 基础目录
+     * @param opt         - 可选参数
+     * @param opt.include     - 包含的glob 默认 index.ts
+     * @param opt.exclude     - 忽略的glob
+     * @param opt.project     - tsconfig路径
+     */
+    async function matchNode(dir, opt) {
+        const files = utils_1.UtilFT.fileSearchGlob(dir, opt?.include ?? "index.ts", { ingore: opt?.exclude });
+        await batchNode(files, opt);
+    }
+    UtilDT.matchNode = matchNode;
+    /**运行所有js/ts文件
+     * @async
+     * @param filepath - 需要运行的文件
+     * @param opt      - 可选参数
+     * @param opt.project     - tsconfig路径
+     */
+    async function batchNode(filepath, opt) {
+        // 确保 filepath 总是一个数组
+        if (!Array.isArray(filepath))
+            filepath = [filepath];
+        // 将所有的相对路径转换为绝对路径
+        const absolutePaths = filepath.map(fp => path.resolve(process.cwd(), fp).replaceAll("\\", "/"));
+        // 创建一个字符串，其中包含所有文件的 require 语句
+        const requires = absolutePaths.map(fp => `require('${fp}');`).join('\n');
+        // 创建并执行 ts-node 命令
+        const cmd = `ts-node -r tsconfig-paths/register -e "${requires}" ${opt?.project ? `-P "${opt.project}"` : ""}`;
+        await utils_1.UtilFunc.exec(cmd, { outlvl: 'info', errlvl: 'warn' });
+    }
+    UtilDT.batchNode = batchNode;
+    /**将codeText写入对应region
+     * @param regionId   - 区域id
+     * @param codeText   - 文本
+     * @param targetPath - 目标文件 默认为去除".macro"的同名文件
+     */
+    async function $macro(regionId, codeText, targetPath) {
+        const loc = (0, utils_1.getFuncLoc)(2);
+        if (!loc) {
+            utils_1.SLogger.error(`UtilDT.$macro 未能找到函数位置`);
+            return;
+        }
+        ;
+        const baseFilePath = targetPath
+            ? path.resolve(process.cwd(), targetPath)
+            : loc.filePath.replace(/(.+)\.macro\.(js|ts|cjs|mjs)$/, "$1.$2");
+        const queuefunc = async () => {
+            if (!(await utils_1.UtilFT.pathExists(baseFilePath))) {
+                utils_1.SLogger.error(`UtilDT.$macro ${baseFilePath} 不存在`);
+                return;
+            }
+            ;
+            const text = await fs.promises.readFile(baseFilePath, 'utf-8');
+            const regex = new RegExp(`(//#region ${regionId}\\s*?\\n)([\\s\\S]+?)(//#endregion)`);
+            //console.log(text)
+            //console.log(regex)
+            if (!regex.test(text)) {
+                utils_1.SLogger.error(`UtilDT.$macro 无法找到区域 ${regionId}`);
+                return;
+            }
+            const ntext = text.replace(regex, `$1${codeText}\n$3`);
+            await fs.promises.writeFile(baseFilePath, ntext, 'utf-8');
+        };
+        await utils_1.UtilFunc.queueProc(path.posix.normalize(baseFilePath.replaceAll("\\", "/")), queuefunc);
+    }
+    UtilDT.$macro = $macro;
+})(UtilDT || (exports.UtilDT = UtilDT = {}));

package/dist/index.d.ts

@@ -1,2 +1,3 @@
-export * from './UtilSchemaTool';
+export * from './UtilDevTool';
 export * from './Command';
+export * from "./QuickFunc";

package/dist/index.js

@@ -14,5 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./UtilSchemaTool"), exports);
+__exportStar(require("./UtilDevTool"), exports);
 __exportStar(require("./Command"), exports);
+__exportStar(require("./QuickFunc"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/dev-utils",
-	"version": "1.0.26",
+	"version": "1.0.28",
 	"description": "编译与调试工具",
 	"main": "index.js",
 	"scripts": {
@@ -15,7 +15,7 @@
 	"author": "zwa73",
 	"license": "ISC",
 	"dependencies": {
-		"@zwa73/utils": "^1.0.113",
+		"@zwa73/utils": "^1.0.114",
 		"commander": "^11.1.0",
 		"ts-node": "^10.9.2",
 		"tsconfig-paths": "^4.2.0",

package/schema/schemas.json

@@ -0,0 +1,4 @@
+{
+	"$schema": "http://json-schema.org/draft-07/schema#",
+	"definitions": {}
+}

package/src/Command/BuildMacro.ts

@@ -0,0 +1,18 @@
+import { Command } from "commander";
+import { UtilDT } from "@src/UtilDevTool";
+
+/**构造macro */
+export const CmdBuildMacro = (program:Command) => program
+    .command("Build-Macro")
+    .alias("buildmacro")
+    .description("生成根据macro生成代码")
+    .option("-i, --include <glob>", "包含的glob 默认 src/**/*.macro.ts","src/**/*.macro.ts")
+    .option("-g, --exclude <glob>", "忽略的glob")
+    .option("-p, --project <path>", "tsconfig路径 默认tsconfig.json","tsconfig.json")
+    .action(async (opt) => {
+        await UtilDT.matchNode(process.cwd(), {
+            include: opt.include,
+            exclude: opt.ignore,
+            project: opt.project,
+        });
+    });

package/src/Command/BuildSchema.ts

@@ -0,0 +1,20 @@
+import { Command } from "commander";
+import { UtilDT } from "@src/UtilDevTool";
+
+/**生成schema */
+export const CmdBuildSchema = (program:Command) => program
+    .command("Build-Schema")
+    .alias("buildschema")
+    .description("生成匹配的文件的所有type的schema")
+    .option("-i, --include <glob>", "包含的glob 默认 src/**/*.schema.ts","src/**/*.schema.ts")
+    .option("-g, --exclude <glob>", "忽略的glob")
+    .option("-p, --project <path>", "tsconfig路径 默认tsconfig.json","tsconfig.json")
+    .option("-o, --outDir <dir>", "schema输出路径目录 默认 ./schema/")
+    .action(async (opt) => {
+        await UtilDT.buildSchema(process.cwd(), {
+            include: opt.include,
+            exclude: opt.ignore,
+            project: opt.project,
+            outDir: opt.outDir,
+        });
+    });

package/src/Command/Init.ts

@@ -35,6 +35,7 @@ async function installPackage() {
 
 /**对项目进行初始化 */
 export const CmdInit = (program:Command)=>program
+    .command('Init')
     .command('init')
     .description('对当前目录进行项目初始化')
     .action(async (opt) => {

package/src/Command/Node.ts

@@ -4,12 +4,13 @@ import { SLogger, UtilFunc } from '@zwa73/utils';
 
 /**编译并运行某个文件 */
 export const CmdNode = (program:Command)=>program
-    .command('node <path>')
+    .command('Node <path|path[]>')
+    .alias('node')
     .option('-p, --project <path>','tsconfig的目录')
     .description('编译并运行某个文件')
     .action(async (arg, opt) => {
         SLogger.info(`编译并运行: ${arg}`);
         let cmd = `ts-node -r tsconfig-paths/register ${arg}`;
-        if(opt.project) cmd+=`-p ${opt.project}`;
+        if(opt.project) cmd+=`-P ${opt.project}`;
         await UtilFunc.exec(cmd,{outlvl:'info',errlvl:'error'});
     });

package/src/Command/Release.ts

@@ -44,7 +44,8 @@ async function updateVersion(newVersion?: string): Promise<string> {
 }
 /**更新版本号并发布npm包 */
 export const CmdRelease = (program: Command) =>program
-    .command("release")
+    .command("Release")
+    .alias("release")
     .description("更新版本号并发布包")
     .option("-v, --version <version>", "指定发布的版本号 `${number}.${number}.${number}`")
     .option("-a, --access <access>", "npm publish 的 access 参数","public")

package/src/Command/Route.ts

@@ -5,6 +5,8 @@ import { CmdNode } from './Node';
 import { CmdRelease } from './Release';
 import { CmdMapPath } from './MapPath';
 import { CmdScanDups } from './ScanDups';
+import { CmdBuildSchema } from './BuildSchema';
+import { CmdBuildMacro } from './BuildMacro';
 
 export async function cliRoute(){
     CmdInit(program);
@@ -12,5 +14,7 @@ export async function cliRoute(){
     CmdRelease(program);
     CmdMapPath(program);
     CmdScanDups(program);
+    CmdBuildSchema(program);
+    CmdBuildMacro(program);
     program.parse(process.argv);
 }

package/src/QuickFunc.ts

@@ -0,0 +1,5 @@
+import { UtilDT } from "./UtilDevTool";
+
+export const {
+    $macro
+} = UtilDT;

package/src/UtilDevTool.ts

@@ -0,0 +1,167 @@
+import * as path from 'path';
+import * as TJS from 'typescript-json-schema';
+import * as fs from 'fs';
+import { JObject, SLogger, UtilFT, UtilFunc, getFuncLoc } from '@zwa73/utils';
+
+export namespace UtilDT{
+
+/**执行js/ts的可选项 */
+type BatchNodeOpt = Partial<{
+    /**tsconfig路径 */
+    project:string;
+}>
+
+/**build任意ts文件的可选项 */
+type BuildMatchOpt = Partial<{
+    /**包含的glob */
+    include:string|string[];
+    /**忽略的glob */
+    exclude:string|string[];
+}>&BatchNodeOpt;
+
+/**build schema的可选项 */
+type BuildSchemaOpt = Partial<{
+    /**将会覆盖 definitions 对应内容的表 */
+    coverDefine:JObject;
+    /**schema输出路径目录 如 ./schema/ */
+    outDir:string;
+}>&BuildMatchOpt;
+
+
+
+/**生成匹配的文件的所有type的schema
+ * @async
+ * @param dir         - 基础目录
+ * @param opt         - 可选参数
+ * @param opt.include     - 包含的glob 默认 **\/\*.schema.ts
+ * @param opt.exclude     - 忽略的glob
+ * @param opt.coverDefine - 将会覆盖 definitions 对应内容的表
+ * @param opt.project     - tsconfig路径
+ * @param opt.outDir      - schema输出路径目录 默认 ./schema/
+ */
+export async function buildSchema(dir:string,opt?:BuildSchemaOpt){
+    //生成
+    const settings: TJS.PartialArgs = {
+        required: true,
+        aliasRef:true,
+        tsNodeRegister:true,
+    };
+    const compilerOptions: TJS.CompilerOptions = {
+        strictNullChecks: true,
+    };
+    if(opt?.project) Object.assign(compilerOptions,(await UtilFT.loadJSONFile(opt.project) as any).compilerOptions);
+    const files = UtilFT.fileSearchGlob(dir,opt?.include ?? "**/*.schema.ts",{ingore:opt?.exclude});
+
+    const program = TJS.getProgramFromFiles(
+        files,
+        compilerOptions,
+    );
+    const schema = TJS.generateSchema(program, "*", settings) as JObject;
+    const outDir = opt?.outDir ?? path.join(process.cwd(),'schema');
+    const schemasPath = path.join(outDir,'schemas.json');
+    //进行预处理并展开
+    await expandSchema(schemasPath,schema,opt?.coverDefine??{});
+}
+/**展开schema以供使用 */
+async function expandSchema(schemasPath:string,schema:JObject,coverDefine:JObject){
+    //覆盖
+    coverObj(schema["definitions"] as JObject,coverDefine);
+    //替换SchemaString标识符
+    schema = JSON.parse(JSON.stringify(schema).replace(/\^\.\*SchemaString\$/g,'^.*$'));
+    const plist:Promise<void>[] = [];
+    plist.push(UtilFT.writeJSONFile(schemasPath,schema));
+
+    const definitions = schema["definitions"] as Record<string,JObject>;
+    //展开定义
+    for(const typeName in definitions){
+        const schema = definitions[typeName];
+        //展开所有object与忽略检测的类型
+        if(!(schema.type == "object" || schema.type == "array" || schema.type == undefined)) continue;
+        if((/^.+_[0-9]/).test(typeName) || (/^{./).test(typeName)) continue;
+
+        const basename = path.basename(schemasPath);
+        const tpath = path.join(path.dirname(schemasPath),`${typeName}.schema.json`);
+        if(!UtilFT.isValidFilePath(tpath)) continue;
+        plist.push(UtilFT.writeJSONFile(tpath,{
+            "$schema": "http://json-schema.org/draft-07/schema#",
+            "$ref": `${basename}#/definitions/${typeName}`
+        }));
+    }
+    await Promise.all(plist);
+}
+/**覆盖object */
+function coverObj(base:JObject,cover:JObject){
+    for(const k in cover){
+        const v = cover[k];
+        if( typeof v === "object" && !Array.isArray(v) &&
+            typeof base[k] === "object" && !Array.isArray(base[k]) )
+            coverObj(base[k] as JObject,v as JObject);
+        else
+            base[k] = v;
+    }
+}
+
+/**运行所有匹配的的js/ts文件
+ * @async
+ * @param dir         - 基础目录
+ * @param opt         - 可选参数
+ * @param opt.include     - 包含的glob 默认 index.ts
+ * @param opt.exclude     - 忽略的glob
+ * @param opt.project     - tsconfig路径
+ */
+export async function matchNode(dir:string,opt?:BuildMatchOpt) {
+    const files = UtilFT.fileSearchGlob(dir,opt?.include ?? "index.ts",{ingore:opt?.exclude});
+    await batchNode(files,opt);
+}
+/**运行所有js/ts文件  
+ * @async
+ * @param filepath - 需要运行的文件
+ * @param opt      - 可选参数
+ * @param opt.project     - tsconfig路径
+ */
+export async function batchNode(filepath:string|string[],opt?:BatchNodeOpt) {
+    // 确保 filepath 总是一个数组
+    if (!Array.isArray(filepath)) filepath = [filepath];
+    // 将所有的相对路径转换为绝对路径
+    const absolutePaths = filepath.map(fp => path.resolve(process.cwd(), fp).replaceAll("\\","/"));
+    // 创建一个字符串，其中包含所有文件的 require 语句
+    const requires = absolutePaths.map(fp => `require('${fp}');`).join('\n');
+    // 创建并执行 ts-node 命令
+    const cmd = `ts-node -r tsconfig-paths/register -e "${requires}" ${opt?.project?`-P "${opt.project}"` : ""}`;
+    await UtilFunc.exec(cmd, { outlvl: 'info', errlvl: 'warn' });
+}
+
+
+/**将codeText写入对应region  
+ * @param regionId   - 区域id
+ * @param codeText   - 文本
+ * @param targetPath - 目标文件 默认为去除".macro"的同名文件
+ */
+export async function $macro(regionId:string,codeText:string,targetPath?:string){
+    const loc = getFuncLoc(2);
+    if(!loc){
+        SLogger.error(`UtilDT.$macro 未能找到函数位置`);
+        return
+    };
+    const baseFilePath = targetPath
+        ? path.resolve(process.cwd(),targetPath)
+        : loc.filePath.replace(/(.+)\.macro\.(js|ts|cjs|mjs)$/,"$1.$2");
+    const queuefunc = async ()=>{
+        if(!(await UtilFT.pathExists(baseFilePath))) {
+            SLogger.error(`UtilDT.$macro ${baseFilePath} 不存在`);
+            return
+        };
+        const text = await fs.promises.readFile(baseFilePath,'utf-8');
+        const regex = new RegExp(`(//#region ${regionId}\\s*?\\n)([\\s\\S]+?)(//#endregion)`);
+        //console.log(text)
+        //console.log(regex)
+        if (!regex.test(text)) {
+            SLogger.error(`UtilDT.$macro 无法找到区域 ${regionId}`);
+            return;
+        }
+        const ntext = text.replace(regex, `$1${codeText}\n$3`);
+        await fs.promises.writeFile(baseFilePath, ntext, 'utf-8');
+    }
+    await UtilFunc.queueProc(path.posix.normalize(baseFilePath.replaceAll("\\","/")),queuefunc);
+}
+}

package/src/index.ts

@@ -1,2 +1,3 @@
-export * from './UtilSchemaTool';
-export * from './Command';
+export * from './UtilDevTool';
+export * from './Command';
+export * from "./QuickFunc";

package/dist/UtilSchemaTool.d.ts

@@ -1,28 +0,0 @@
-import { JObject } from '@zwa73/utils';
-export declare namespace UtilST {
-    /**构造Schema
-     * @async
-     * @param configPath  - tsconfig路径
-     * @param outDir      - schema文件夹路径 如 ./schema/
-     * @param coverDefine - 将会覆盖 definitions 对应内容的表
-     */
-    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 opt         - 可选参数
-     * @param opt.ignore      - glob忽略匹配符
-     * @param opt.coverDefine - 将会覆盖 definitions 对应内容的表
-     */
-    export function buildMatchSchema(dir: string, globPattern: string | string[], outDir: string, opt?: BuildMatchSchemaOpt): Promise<void>;
-    export {};
-}

package/dist/UtilSchemaTool.js

@@ -1,112 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.UtilST = void 0;
-const path = __importStar(require("path"));
-const TJS = __importStar(require("typescript-json-schema"));
-const utils_1 = require("@zwa73/utils");
-var UtilST;
-(function (UtilST) {
-    /**构造Schema
-     * @async
-     * @param configPath  - tsconfig路径
-     * @param outDir      - schema文件夹路径 如 ./schema/
-     * @param coverDefine - 将会覆盖 definitions 对应内容的表
-     */
-    async function builAllSchema(configPath, outDir, coverDefine = {}) {
-        outDir = path.join(outDir, "schemas.json");
-        await utils_1.UtilFunc.exec(`typescript-json-schema ${configPath} * --out ${outDir} --required --strictNullChecks --aliasRefs`, { outlvl: 'info', errlvl: 'error' });
-        const schema = (await utils_1.UtilFT.loadJSONFile(outDir));
-        //进行预处理并展开
-        await expandSchema(outDir, schema, coverDefine);
-    }
-    UtilST.builAllSchema = builAllSchema;
-    /**生成匹配的文件的所有type的schema
-     * @async
-     * @param dir         - 目录
-     * @param globPattern - glob匹配符
-     * @param outDir      - schema输出路径目录 如 ./schema/
-     * @param opt         - 可选参数
-     * @param opt.ignore      - glob忽略匹配符
-     * @param opt.coverDefine - 将会覆盖 definitions 对应内容的表
-     */
-    async function buildMatchSchema(dir, globPattern, outDir, opt) {
-        //生成
-        const settings = {
-            required: true,
-            aliasRef: true,
-        };
-        const compilerOptions = {
-            strictNullChecks: true,
-        };
-        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, opt?.coverDefine ?? {});
-    }
-    UtilST.buildMatchSchema = buildMatchSchema;
-    /**展开schema以供使用 */
-    async function expandSchema(schemasPath, schema, coverDefine) {
-        //覆盖
-        coverObj(schema["definitions"], coverDefine);
-        //替换SchemaString标识符
-        schema = JSON.parse(JSON.stringify(schema).replace(/\^\.\*SchemaString\$/g, '^.*$'));
-        const plist = [];
-        plist.push(utils_1.UtilFT.writeJSONFile(schemasPath, schema));
-        const definitions = schema["definitions"];
-        //展开定义
-        for (const typeName in definitions) {
-            const schema = definitions[typeName];
-            //展开所有object与忽略检测的类型
-            if (!(schema.type == "object" || schema.type == "array" || schema.type == undefined))
-                continue;
-            if ((/^.+_[0-9]/).test(typeName) || (/^{./).test(typeName))
-                continue;
-            const basename = path.basename(schemasPath);
-            const tpath = path.join(path.dirname(schemasPath), `${typeName}.schema.json`);
-            if (!utils_1.UtilFT.isValidFilePath(tpath))
-                continue;
-            plist.push(utils_1.UtilFT.writeJSONFile(tpath, {
-                "$schema": "http://json-schema.org/draft-07/schema#",
-                "$ref": `${basename}#/definitions/${typeName}`
-            }));
-        }
-        await Promise.all(plist);
-    }
-    /**覆盖object */
-    function coverObj(base, cover) {
-        for (const k in cover) {
-            const v = cover[k];
-            if (typeof v === "object" && !Array.isArray(v) &&
-                typeof base[k] === "object" && !Array.isArray(base[k]))
-                coverObj(base[k], v);
-            else
-                base[k] = v;
-        }
-    }
-})(UtilST || (exports.UtilST = UtilST = {}));

package/src/UtilSchemaTool.ts

@@ -1,95 +0,0 @@
-import * as path from 'path';
-import * as TJS from 'typescript-json-schema';
-
-import { JObject, SLogger, UtilFT, UtilFunc } from '@zwa73/utils';
-
-export namespace UtilST{
-/**构造Schema  
- * @async
- * @param configPath  - tsconfig路径
- * @param outDir      - schema文件夹路径 如 ./schema/
- * @param coverDefine - 将会覆盖 definitions 对应内容的表
- */
-export async function builAllSchema(configPath:string,outDir:string,coverDefine:JObject={}){
-    outDir = path.join(outDir,"schemas.json");
-    await UtilFunc.exec(`typescript-json-schema ${configPath} * --out ${outDir} --required --strictNullChecks --aliasRefs`,{outlvl:'info',errlvl:'error'});
-    const schema = (await UtilFT.loadJSONFile(outDir)) as any;
-    //进行预处理并展开
-    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 opt         - 可选参数
- * @param opt.ignore      - glob忽略匹配符
- * @param opt.coverDefine - 将会覆盖 definitions 对应内容的表
- */
-export async function buildMatchSchema(dir:string,globPattern:string|string[],outDir:string,opt?:BuildMatchSchemaOpt){
-    //生成
-    const settings: TJS.PartialArgs = {
-        required: true,
-        aliasRef:true,
-    };
-    const compilerOptions: TJS.CompilerOptions = {
-        strictNullChecks: true,
-    };
-    const files = UtilFT.fileSearchGlob(dir,globPattern,{ingore:opt?.ignore});
-    const program = TJS.getProgramFromFiles(
-        files,
-        compilerOptions,
-    );
-    const schema = TJS.generateSchema(program, "*", settings) as any;
-    outDir = outDir??path.join(process.cwd(),'schema');
-    const schemasPath = path.join(outDir,'schemas.json');
-    //进行预处理并展开
-    await expandSchema(schemasPath,schema,opt?.coverDefine??{});
-}
-/**展开schema以供使用 */
-async function expandSchema(schemasPath:string,schema:any,coverDefine:JObject){
-    //覆盖
-    coverObj(schema["definitions"],coverDefine);
-    //替换SchemaString标识符
-    schema = JSON.parse(JSON.stringify(schema).replace(/\^\.\*SchemaString\$/g,'^.*$'));
-    const plist:Promise<void>[] = [];
-    plist.push(UtilFT.writeJSONFile(schemasPath,schema));
-
-    const definitions = schema["definitions"] as Record<string,JObject>;
-    //展开定义
-    for(const typeName in definitions){
-        const schema = definitions[typeName];
-        //展开所有object与忽略检测的类型
-        if(!(schema.type == "object" || schema.type == "array" || schema.type == undefined)) continue;
-        if((/^.+_[0-9]/).test(typeName) || (/^{./).test(typeName)) continue;
-
-        const basename = path.basename(schemasPath);
-        const tpath = path.join(path.dirname(schemasPath),`${typeName}.schema.json`);
-        if(!UtilFT.isValidFilePath(tpath)) continue;
-        plist.push(UtilFT.writeJSONFile(tpath,{
-            "$schema": "http://json-schema.org/draft-07/schema#",
-            "$ref": `${basename}#/definitions/${typeName}`
-        }));
-    }
-    await Promise.all(plist);
-}
-/**覆盖object */
-function coverObj(base:JObject,cover:JObject){
-    for(const k in cover){
-        const v = cover[k];
-        if( typeof v === "object" && !Array.isArray(v) &&
-            typeof base[k] === "object" && !Array.isArray(base[k]) )
-            coverObj(base[k] as JObject,v as JObject);
-        else
-            base[k] = v;
-    }
-}
-}