@zwa73/dev-utils 1.0.38 → 1.0.39

package/dist/Macro.macro.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/Macro.macro.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//UtilMacro.exportComment('src/**/*.ts');

package/dist/UtilDevTool.d.ts

@@ -53,13 +53,25 @@ export declare namespace UtilDT {
         /**使用glob匹配而非文件路径 */
         glob: boolean;
     }>;
+    /**codeText的参数 */
+    type CodeTextOpt = {
+        /**匹配的region/comment id */
+        matchId: string;
+        /**展开宏的目标文件 */
+        filePath: string;
+        /**展开宏区域的原文本 */
+        text: string;
+        /**缩进 会自动应用 */
+        inent: string;
+    };
     /**将codeText写入对应region
      * @param regionId   - 区域id \`//#region ${id}\`
      * @param codeText   - 文本
      * @param opt        - 可选参数
-     * @param opt.targetPath - 目标文件 默认为去除".macro"的同名文件
+     * @param opt.filePath - 目标文件 默认为去除".macro"的同名文件
+     * @param opt.glob     - 使用glob匹配而非文件路径
      */
-    export function regionMacro(regionId: string, codeText: string | (() => string | Promise<string>), opt?: MacroOpt): Promise<void>;
+    export function regionMacro(regionId: string | RegExp, codeText: string | ((opt: CodeTextOpt) => string | Promise<string>), opt?: MacroOpt): Promise<void>;
     /**将codeText写入对应注释下
      * @param commentId - 注释id \`// ${id}\`
      * @param codeText  - 文本
@@ -67,13 +79,13 @@ export declare namespace UtilDT {
      * @param opt.filePath - 目标文件 默认为去除".macro"的同名文件
      * @param opt.glob     - 使用glob匹配而非文件路径
      */
-    export function commentMacro(commentId: string, codeText: string | (() => string | Promise<string>), opt?: MacroOpt): Promise<void>;
+    export function commentMacro(commentId: string | RegExp, codeText: string | ((opt: CodeTextOpt) => string | Promise<string>), opt?: MacroOpt): Promise<void>;
     /**将codeText写入对应文件 不存在则创建
      * @param codeText  - 文本
      * @param opt       - 可选参数
      * @param opt.filePath - 目标文件 默认为去除".macro"的同名文件
      * @param opt.glob     - 使用glob匹配而非文件路径
      */
-    export function fileMacro(codeText: string | (() => string | Promise<string>), opt?: MacroOpt): Promise<void>;
+    export function fileMacro(codeText: string | ((opt: CodeTextOpt) => string | Promise<string>), opt?: MacroOpt): Promise<void>;
     export {};
 }

package/dist/UtilDevTool.js

@@ -126,59 +126,83 @@ var UtilDT;
         // 将所有的相对路径转换为绝对路径
         const absolutePaths = filepath.map(fp => path.resolve(process.cwd(), fp).replaceAll("\\", "/"));
         // 创建一个字符串，其中包含所有文件的 require 语句
-        const requires = absolutePaths.map(fp => `require('${fp}');`).join('\n');
+        const requires = absolutePaths.map(fp => `require('${fp}')`).join(';');
         // 创建并执行 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;
     //#region macro工具
-    const parseMacroPaths = (basePath, opt) => {
+    const parseMacroPaths = (opt) => {
+        const loc = utils_1.UtilFunc.getFuncLoc(3);
+        if (!loc && !opt?.filePath)
+            (0, utils_1.throwError)(`parseMacroPaths 未能找到函数位置`);
+        const basePath = loc?.filePath;
         return opt?.filePath
             ? opt.glob
-                ? utils_1.UtilFT.fileSearchGlob(process.cwd(), opt.filePath)
-                : typeof opt?.filePath === "string" ? [opt?.filePath] : opt?.filePath
-            : [basePath.replace(/(.+)\.macro\.(js|ts|cjs|mjs)$/, "$1.$2")];
+                ? utils_1.UtilFT.fileSearchGlob(process.cwd(), opt.filePath, { normalize: "posix" })
+                : typeof opt?.filePath === "string"
+                    ? [opt?.filePath.replaceAll('\\', '/')]
+                    : opt?.filePath.map((filepath) => filepath.replaceAll('\\', '/'))
+            : [basePath.replace(/(.+)\.macro\.(js|ts|cjs|mjs)$/, "$1.$2").replaceAll('\\', '/')];
     };
     const readFile = async (basePath) => (await fs.promises.readFile(basePath, 'utf-8')).replaceAll("\r\n", "\n");
     const parseCodeText = async (codeText, opt) => {
         const strText = typeof codeText === "function" ? await codeText(opt) : codeText;
         return strText.split('\n').map((line) => `${opt.inent}${line}`).join('\n');
     };
+    const literalRegex = (str) => new RegExp(`^${str.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&')}(?!\\S)`);
     //#endregion
     /**将codeText写入对应region
      * @param regionId   - 区域id \`//#region ${id}\`
      * @param codeText   - 文本
      * @param opt        - 可选参数
-     * @param opt.targetPath - 目标文件 默认为去除".macro"的同名文件
+     * @param opt.filePath - 目标文件 默认为去除".macro"的同名文件
+     * @param opt.glob     - 使用glob匹配而非文件路径
      */
     async function regionMacro(regionId, codeText, opt) {
-        const loc = utils_1.UtilFunc.getFuncLoc(2);
-        if (!loc) {
-            utils_1.SLogger.error(`UtilDT.regionMacro 未能找到函数位置`);
-            return;
-        }
         const plist = [];
-        const filePaths = parseMacroPaths(loc.filePath, opt);
+        const filePaths = parseMacroPaths(opt);
         for (const filePath of filePaths) {
             const queuefunc = async () => {
                 if (!(await utils_1.UtilFT.pathExists(filePath))) {
                     utils_1.SLogger.error(`UtilDT.regionMacro ${filePath} 不存在`);
                     return;
                 }
-                const text = await readFile(filePath);
-                const getregex = () => new RegExp(`([^\\S\\n]*)(//#region ${regionId}(?!\\S).*\\n)` +
+                let fileText = await readFile(filePath);
+                const regex = new RegExp(/(^|\n)([^\S\n]*)(\/\/#region (.*)\n)/.source +
                     /([\s\S]*?)/.source +
                     /([^\S\n]*\/\/#endregion(?!\S).*)/.source, "g");
-                if (!getregex().test(text)) {
-                    if (!opt?.glob)
-                        utils_1.SLogger.error(`UtilDT.regionMacro 无法找到区域 ${regionId}`);
-                    return;
+                regex.lastIndex = 0;
+                let match;
+                let hasMatch = false;
+                while (match = regex.exec(fileText)) {
+                    const id = match[4];
+                    const prefix = match[1];
+                    const content = match[5];
+                    const inent = match[2];
+                    const comment = match[3];
+                    const endcomment = match[6];
+                    const idregex = typeof regionId === "string"
+                        ? literalRegex(regionId) : regionId;
+                    let idmatch = idregex.exec(id);
+                    if (idmatch == null)
+                        continue;
+                    hasMatch = true;
+                    const ol = fileText.length;
+                    const parseCode = await parseCodeText(codeText, {
+                        matchId: idmatch[0],
+                        text: (0, utils_1.dedent)(content),
+                        inent,
+                        filePath
+                    });
+                    fileText = fileText.replace(match[0], `${prefix}${inent}${comment}${parseCode}\n${endcomment}`);
+                    regex.lastIndex += fileText.length - ol;
                 }
-                const match = getregex().exec(text);
-                const parseCode = await parseCodeText(codeText, { text: (0, utils_1.dedent)(match[3]), inent: match[1], filePath });
-                const ntext = text.replace(getregex(), `$1$2${parseCode}\n$4`);
-                await fs.promises.writeFile(filePath, ntext, 'utf-8');
+                if (hasMatch)
+                    await fs.promises.writeFile(filePath, fileText, 'utf-8');
+                else if (!opt?.glob)
+                    utils_1.SLogger.error(`UtilDT.regionMacro 无法找到区域 ${regionId}`);
             };
             plist.push(utils_1.UtilFunc.queueProc(path.posix.normalize(filePath.replaceAll("\\", "/")), queuefunc));
         }
@@ -193,36 +217,49 @@ var UtilDT;
      * @param opt.glob     - 使用glob匹配而非文件路径
      */
     async function commentMacro(commentId, codeText, opt) {
-        const loc = utils_1.UtilFunc.getFuncLoc(2);
-        if (!loc) {
-            utils_1.SLogger.error(`UtilDT.commentMacro 未能找到函数位置`);
-            return;
-        }
         const plist = [];
-        const filePaths = parseMacroPaths(loc.filePath, opt);
+        const filePaths = parseMacroPaths(opt);
         for (const filePath of filePaths) {
             const queuefunc = async () => {
                 if (!(await utils_1.UtilFT.pathExists(filePath))) {
                     utils_1.SLogger.error(`UtilDT.commentMacro ${filePath} 不存在`);
                     return;
                 }
-                const text = await readFile(filePath);
-                const getregex = () => new RegExp(`([^\\S\\n]*)(// ${commentId}(?!\\S).*)` +
-                    /(\n|)/.source +
+                let fileText = await readFile(filePath);
+                const regex = new RegExp(/(^|\n)([^\S\n]*)(\/\/ (.*))(\n|)/.source +
                     /([^\n]*)/.source, "g");
-                if (!getregex().test(text)) {
-                    if (!opt?.glob)
-                        utils_1.SLogger.error(`UtilDT.commentMacro 无法找到注释 ${commentId}`);
-                    return;
+                let match;
+                let hasMatch = false;
+                while (match = regex.exec(fileText)) {
+                    const id = match[4];
+                    const prefix = match[1];
+                    const content = match[6];
+                    const inent = match[2];
+                    const comment = match[3];
+                    const idregex = typeof commentId === "string"
+                        ? literalRegex(commentId) : commentId;
+                    let idmatch = idregex.exec(id);
+                    if (idmatch == null)
+                        continue;
+                    hasMatch = true;
+                    const ol = fileText.length;
+                    const parseCode = await parseCodeText(codeText, {
+                        matchId: idmatch[0],
+                        text: (0, utils_1.dedent)(content),
+                        inent,
+                        filePath
+                    });
+                    if (parseCode.includes('\n')) {
+                        utils_1.SLogger.error(`UtilDT.commentMacro 无法使用多行文本, 考虑使用regionMacro ${codeText}`);
+                        return;
+                    }
+                    fileText = fileText.replace(match[0], `${prefix}${inent}${comment}\n${parseCode}`);
+                    regex.lastIndex += fileText.length - ol;
                 }
-                const match = getregex().exec(text);
-                const parseCode = await parseCodeText(codeText, { text: match[3], inent: match[1], filePath });
-                if (parseCode.includes('\n')) {
-                    utils_1.SLogger.error(`UtilDT.commentMacro 无法使用多行文本, 考虑使用regionMacro ${codeText}`);
-                    return;
-                }
-                const ntext = text.replace(getregex(), `$1$2\n${parseCode}`);
-                await fs.promises.writeFile(filePath, ntext, 'utf-8');
+                if (hasMatch)
+                    await fs.promises.writeFile(filePath, fileText, 'utf-8');
+                else if (!opt?.glob)
+                    utils_1.SLogger.error(`UtilDT.commentMacro 无法找到注释 ${commentId}`);
             };
             plist.push(utils_1.UtilFunc.queueProc(path.posix.normalize(filePath.replaceAll("\\", "/")), queuefunc));
         }
@@ -236,18 +273,13 @@ var UtilDT;
      * @param opt.glob     - 使用glob匹配而非文件路径
      */
     async function fileMacro(codeText, opt) {
-        const loc = utils_1.UtilFunc.getFuncLoc(2);
-        if (!loc) {
-            utils_1.SLogger.error(`UtilDT.fileMacro 未能找到函数位置`);
-            return;
-        }
         const plist = [];
-        const filePaths = parseMacroPaths(loc.filePath, opt);
+        const filePaths = parseMacroPaths(opt);
         for (const filePath of filePaths) {
             const queuefunc = async () => {
                 await utils_1.UtilFT.ensurePathExists(filePath);
                 const text = await readFile(filePath);
-                const parseCode = await parseCodeText(codeText, { text, inent: '', filePath });
+                const parseCode = await parseCodeText(codeText, { matchId: '', text, inent: '', filePath });
                 await fs.promises.writeFile(filePath, parseCode, 'utf-8');
             };
             plist.push(utils_1.UtilFunc.queueProc(path.posix.normalize(filePath.replaceAll("\\", "/")), queuefunc));

package/dist/UtilMacro.d.ts

@@ -0,0 +1,7 @@
+export declare namespace UtilMacro {
+    /**根据注释批量生成导出
+     * @param glob - 应用的golb
+     * @example
+     */
+    function exportComment(glob: string): void;
+}

package/dist/UtilMacro.js

@@ -0,0 +1,30 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UtilMacro = void 0;
+const utils_1 = require("@zwa73/utils");
+const QuickFunc_1 = require("./QuickFunc");
+const path_1 = __importDefault(require("path"));
+var UtilMacro;
+(function (UtilMacro) {
+    /**根据注释批量生成导出
+     * @param glob - 应用的golb
+     * @example
+     */
+    function exportComment(glob) {
+        (0, QuickFunc_1.commentMacro)(/export (\S*)/, ({ filePath, matchId }) => {
+            const globp = /export (\S*)/.exec(matchId)[1];
+            const basedir = path_1.default.dirname(filePath).replaceAll('\\', '/');
+            const result = utils_1.UtilFT.fileSearchGlob(basedir, globp, { normalize: 'posix' })
+                .map((file) => path_1.default.posix.relative(basedir, file))
+                .map((file) => path_1.default.parse(file).name)
+                .filter((file) => file != path_1.default.parse(filePath).name)
+                .map((file) => `export * from './${file}'`)
+                .join(';');
+            return result;
+        }, { glob: true, filePath: glob });
+    }
+    UtilMacro.exportComment = exportComment;
+})(UtilMacro || (exports.UtilMacro = UtilMacro = {}));

package/dist/index.js

@@ -17,3 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./UtilDevTool"), exports);
 __exportStar(require("./Command"), exports);
 __exportStar(require("./QuickFunc"), exports);
+//export *

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/dev-utils",
-	"version": "1.0.38",
+	"version": "1.0.39",
 	"description": "编译与调试工具",
 	"main": "index.js",
 	"scripts": {

package/src/Macro.macro.ts

@@ -0,0 +1,4 @@
+import { UtilMacro } from "./UtilMacro";
+
+
+//UtilMacro.exportComment('src/**/*.ts');

package/src/UtilDevTool.ts

@@ -1,7 +1,7 @@
 import * as path from 'path';
 import * as TJS from 'typescript-json-schema';
 import * as fs from 'fs';
-import { JObject, SLogger, UtilFT, UtilFunc, dedent } from '@zwa73/utils';
+import { JObject, SLogger, UtilFT, UtilFunc, dedent, throwError } from '@zwa73/utils';
 
 export namespace UtilDT{
 
@@ -125,7 +125,7 @@ export async function batchNode(filepath:string|string[],opt?:BatchNodeOpt) {
     // 将所有的相对路径转换为绝对路径
     const absolutePaths = filepath.map(fp => path.resolve(process.cwd(), fp).replaceAll("\\","/"));
     // 创建一个字符串，其中包含所有文件的 require 语句
-    const requires = absolutePaths.map(fp => `require('${fp}');`).join('\n');
+    const requires = absolutePaths.map(fp => `require('${fp}')`).join(';');
     // 创建并执行 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' });
@@ -139,7 +139,9 @@ type MacroOpt = Partial<{
     glob:boolean;
 }>
 /**codeText的参数 */
-type CdeeTextOpt = {
+type CodeTextOpt = {
+    /**匹配的region/comment id */
+    matchId:string;
     /**展开宏的目标文件 */
     filePath:string;
     /**展开宏区域的原文本 */
@@ -148,54 +150,78 @@ type CdeeTextOpt = {
     inent:string;
 }
 //#region macro工具
-const parseMacroPaths = (basePath:string,opt?:MacroOpt)=>{
+const parseMacroPaths = (opt?:MacroOpt)=>{
+    const loc = UtilFunc.getFuncLoc(3);
+    if(!loc && !opt?.filePath) throwError(`parseMacroPaths 未能找到函数位置`);
+    const basePath = loc?.filePath!;
     return opt?.filePath
         ? opt.glob
-            ? UtilFT.fileSearchGlob(process.cwd(),opt.filePath)
-            : typeof opt?.filePath==="string" ? [opt?.filePath] : opt?.filePath
-        : [basePath.replace(/(.+)\.macro\.(js|ts|cjs|mjs)$/,"$1.$2")];
+            ? UtilFT.fileSearchGlob(process.cwd(),opt.filePath,{normalize:"posix"})
+            : typeof opt?.filePath==="string"
+                ? [opt?.filePath.replaceAll('\\','/')]
+                : opt?.filePath.map((filepath)=>filepath.replaceAll('\\','/'))
+        : [basePath.replace(/(.+)\.macro\.(js|ts|cjs|mjs)$/,"$1.$2").replaceAll('\\','/')];
 }
 const readFile = async (basePath:string)=>
     (await fs.promises.readFile(basePath,'utf-8')).replaceAll("\r\n","\n");
-const parseCodeText = async (codeText:string|((opt:CdeeTextOpt)=>string|Promise<string>),opt:CdeeTextOpt)=>{
+const parseCodeText = async (codeText:string|((opt:CodeTextOpt)=>string|Promise<string>),opt:CodeTextOpt)=>{
     const strText = typeof codeText === "function" ? await codeText(opt) : codeText;
     return strText.split('\n').map((line)=>`${opt.inent}${line}`).join('\n');
 }
+const literalRegex = (str:string)=>new RegExp(
+    `^${str.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&')}(?!\\S)`);
 //#endregion
 /**将codeText写入对应region  
  * @param regionId   - 区域id \`//#region ${id}\`
  * @param codeText   - 文本
  * @param opt        - 可选参数
- * @param opt.targetPath - 目标文件 默认为去除".macro"的同名文件
+ * @param opt.filePath - 目标文件 默认为去除".macro"的同名文件
+ * @param opt.glob     - 使用glob匹配而非文件路径
  */
-export async function regionMacro(regionId:string,codeText:string|(()=>string|Promise<string>),opt?:MacroOpt){
-    const loc = UtilFunc.getFuncLoc(2);
-    if(!loc){
-        SLogger.error(`UtilDT.regionMacro 未能找到函数位置`);
-        return
-    }
+export async function regionMacro(regionId:string|RegExp,codeText:string|((opt:CodeTextOpt)=>string|Promise<string>),opt?:MacroOpt){
     const plist:Promise<void>[] = [];
-    const filePaths = parseMacroPaths(loc.filePath,opt);
+    const filePaths = parseMacroPaths(opt);
     for(const filePath of filePaths){
         const queuefunc = async ()=>{
             if(!(await UtilFT.pathExists(filePath))) {
                 SLogger.error(`UtilDT.regionMacro ${filePath} 不存在`);
                 return
             }
-            const text = await readFile(filePath);
-            const getregex = ()=>new RegExp(
-                `([^\\S\\n]*)(//#region ${regionId}(?!\\S).*\\n)`+
-                /([\s\S]*?)/.source+
-                /([^\S\n]*\/\/#endregion(?!\S).*)/.source
-                ,"g");
-            if (!getregex().test(text)) {
-                if(!opt?.glob) SLogger.error(`UtilDT.regionMacro 无法找到区域 ${regionId}`);
-                return;
+            let fileText = await readFile(filePath);
+            const regex = new RegExp(
+                    /(^|\n)([^\S\n]*)(\/\/#region (.*)\n)/.source+
+                    /([\s\S]*?)/.source+
+                    /([^\S\n]*\/\/#endregion(?!\S).*)/.source
+                    ,"g")
+            regex.lastIndex=0;
+            let match:RegExpExecArray|null;
+            let hasMatch = false;
+            while(match = regex.exec(fileText)){
+                const id = match[4];
+                const prefix = match[1];
+                const content = match[5];
+                const inent = match[2];
+                const comment = match[3];
+                const endcomment = match[6];
+
+                const idregex = typeof regionId === "string"
+                    ? literalRegex(regionId) : regionId;
+                let idmatch = idregex.exec(id);
+                if(idmatch==null) continue;
+                hasMatch=true;
+                const ol = fileText.length;
+                const parseCode = await parseCodeText(codeText,{
+                    matchId :idmatch[0],
+                    text    :dedent(content),
+                    inent   ,
+                    filePath
+                });
+                fileText = fileText.replace(match[0], `${prefix}${inent}${comment}${parseCode}\n${endcomment}`);
+                regex.lastIndex += fileText.length - ol;
             }
-            const match = getregex().exec(text)!;
-            const parseCode = await parseCodeText(codeText,{text:dedent(match[3]),inent:match[1],filePath});
-            const ntext = text.replace(getregex(), `$1$2${parseCode}\n$4`);
-            await fs.promises.writeFile(filePath, ntext, 'utf-8');
+            if(hasMatch)
+                await fs.promises.writeFile(filePath, fileText, 'utf-8');
+            else if(!opt?.glob) SLogger.error(`UtilDT.regionMacro 无法找到区域 ${regionId}`);
         }
         plist.push(UtilFunc.queueProc(path.posix.normalize(filePath.replaceAll("\\","/")),queuefunc))
     }
@@ -208,38 +234,51 @@ export async function regionMacro(regionId:string,codeText:string|(()=>string|Pr
  * @param opt.filePath - 目标文件 默认为去除".macro"的同名文件
  * @param opt.glob     - 使用glob匹配而非文件路径
  */
-export async function commentMacro(commentId:string,codeText:string|(()=>string|Promise<string>),opt?:MacroOpt){
-    const loc = UtilFunc.getFuncLoc(2);
-    if(!loc){
-        SLogger.error(`UtilDT.commentMacro 未能找到函数位置`);
-        return
-    }
+export async function commentMacro(commentId:string|RegExp,codeText:string|((opt:CodeTextOpt)=>string|Promise<string>),opt?:MacroOpt){
     const plist:Promise<void>[] = [];
-    const filePaths = parseMacroPaths(loc.filePath,opt);
+    const filePaths = parseMacroPaths(opt);
     for(const filePath of filePaths){
         const queuefunc = async ()=>{
             if(!(await UtilFT.pathExists(filePath))) {
                 SLogger.error(`UtilDT.commentMacro ${filePath} 不存在`);
                 return
             }
-            const text = await readFile(filePath);
-            const getregex = ()=>new RegExp(
-                `([^\\S\\n]*)(// ${commentId}(?!\\S).*)`+
-                /(\n|)/.source +
-                /([^\n]*)/.source
-                ,"g");
-            if (!getregex().test(text)) {
-                if(!opt?.glob) SLogger.error(`UtilDT.commentMacro 无法找到注释 ${commentId}`);
-                return;
-            }
-            const match = getregex().exec(text)!;
-            const parseCode = await parseCodeText(codeText,{text:match[3],inent:match[1],filePath});
-            if(parseCode.includes('\n')){
-                SLogger.error(`UtilDT.commentMacro 无法使用多行文本, 考虑使用regionMacro ${codeText}`);
-                return;
+            let fileText = await readFile(filePath);
+            const regex = new RegExp(
+                    /(^|\n)([^\S\n]*)(\/\/ (.*))(\n|)/.source+
+                    /([^\n]*)/.source
+                    ,"g")
+            let match:RegExpExecArray|null;
+            let hasMatch = false;
+            while(match = regex.exec(fileText)){
+                const id = match[4];
+                const prefix = match[1];
+                const content = match[6];
+                const inent = match[2];
+                const comment = match[3];
+
+                const idregex = typeof commentId === "string"
+                    ? literalRegex(commentId) : commentId;
+                let idmatch = idregex.exec(id);
+                if(idmatch==null) continue;
+                hasMatch=true;
+                const ol = fileText.length;
+                const parseCode = await parseCodeText(codeText,{
+                    matchId :idmatch[0],
+                    text    :dedent(content),
+                    inent   ,
+                    filePath
+                });
+                if(parseCode.includes('\n')){
+                    SLogger.error(`UtilDT.commentMacro 无法使用多行文本, 考虑使用regionMacro ${codeText}`);
+                    return;
+                }
+                fileText = fileText.replace(match[0], `${prefix}${inent}${comment}\n${parseCode}`);
+                regex.lastIndex += fileText.length - ol;
             }
-            const ntext = text.replace(getregex(), `$1$2\n${parseCode}`);
-            await fs.promises.writeFile(filePath, ntext, 'utf-8');
+            if(hasMatch)
+                await fs.promises.writeFile(filePath, fileText, 'utf-8');
+            else if(!opt?.glob) SLogger.error(`UtilDT.commentMacro 无法找到注释 ${commentId}`);
         }
         plist.push(UtilFunc.queueProc(path.posix.normalize(filePath.replaceAll("\\","/")),queuefunc))
     }
@@ -251,19 +290,14 @@ export async function commentMacro(commentId:string,codeText:string|(()=>string|
  * @param opt.filePath - 目标文件 默认为去除".macro"的同名文件
  * @param opt.glob     - 使用glob匹配而非文件路径
  */
-export async function fileMacro(codeText:string|(()=>string|Promise<string>),opt?:MacroOpt){
-    const loc = UtilFunc.getFuncLoc(2);
-    if(!loc){
-        SLogger.error(`UtilDT.fileMacro 未能找到函数位置`);
-        return
-    }
+export async function fileMacro(codeText:string|((opt:CodeTextOpt)=>string|Promise<string>),opt?:MacroOpt){
     const plist:Promise<void>[] = [];
-    const filePaths = parseMacroPaths(loc.filePath,opt);
+    const filePaths = parseMacroPaths(opt);
     for(const filePath of filePaths){
         const queuefunc = async ()=>{
             await UtilFT.ensurePathExists(filePath);
             const text = await readFile(filePath);
-            const parseCode = await parseCodeText(codeText,{text,inent:'',filePath});
+            const parseCode = await parseCodeText(codeText,{matchId:'',text,inent:'',filePath});
             await fs.promises.writeFile(filePath, parseCode, 'utf-8');
         }
         plist.push(UtilFunc.queueProc(path.posix.normalize(filePath.replaceAll("\\","/")),queuefunc))

package/src/UtilMacro.ts

@@ -0,0 +1,24 @@
+import { UtilFT } from "@zwa73/utils";
+import { commentMacro } from "./QuickFunc"
+import path from "path";
+
+
+export namespace UtilMacro{
+    /**根据注释批量生成导出
+     * @param glob - 应用的golb
+     * @example
+     */
+    export function exportComment(glob:string){
+        commentMacro(/export (\S*)/,({filePath,matchId})=>{
+            const globp = /export (\S*)/.exec(matchId)![1];
+            const basedir = path.dirname(filePath).replaceAll('\\','/');
+            const result = UtilFT.fileSearchGlob(basedir,globp,{normalize:'posix'})
+                .map((file)=>path.posix.relative(basedir,file))
+                .map((file)=>path.parse(file).name)
+                .filter((file)=>file!=path.parse(filePath).name)
+                .map((file)=>`export * from './${file}'`)
+                .join(';');
+            return result;
+        },{glob:true,filePath:glob});
+    }
+}

package/src/index.ts

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