@zwa73/dev-utils 1.0.39 → 1.0.41

package/dist/UtilDevTool.d.ts

@@ -57,6 +57,8 @@ export declare namespace UtilDT {
     type CodeTextOpt = {
         /**匹配的region/comment id */
         matchId: string;
+        /**region/comment id正则的执行结果*/
+        execArr: RegExpExecArray;
         /**展开宏的目标文件 */
         filePath: string;
         /**展开宏区域的原文本 */
@@ -86,6 +88,6 @@ export declare namespace UtilDT {
      * @param opt.filePath - 目标文件 默认为去除".macro"的同名文件
      * @param opt.glob     - 使用glob匹配而非文件路径
      */
-    export function fileMacro(codeText: string | ((opt: CodeTextOpt) => string | Promise<string>), opt?: MacroOpt): Promise<void>;
+    export function fileMacro(codeText: string | ((opt: Omit<CodeTextOpt, 'ident' | 'matchId' | 'execArr'>) => string | Promise<string>), opt?: MacroOpt): Promise<void>;
     export {};
 }

package/dist/UtilDevTool.js

@@ -192,6 +192,7 @@ var UtilDT;
                     const ol = fileText.length;
                     const parseCode = await parseCodeText(codeText, {
                         matchId: idmatch[0],
+                        execArr: idmatch,
                         text: (0, utils_1.dedent)(content),
                         inent,
                         filePath
@@ -245,6 +246,7 @@ var UtilDT;
                     const ol = fileText.length;
                     const parseCode = await parseCodeText(codeText, {
                         matchId: idmatch[0],
+                        execArr: idmatch,
                         text: (0, utils_1.dedent)(content),
                         inent,
                         filePath
@@ -279,7 +281,13 @@ var UtilDT;
             const queuefunc = async () => {
                 await utils_1.UtilFT.ensurePathExists(filePath);
                 const text = await readFile(filePath);
-                const parseCode = await parseCodeText(codeText, { matchId: '', text, inent: '', filePath });
+                const parseCode = await parseCodeText(codeText, {
+                    matchId: '',
+                    execArr: /''/.exec(''),
+                    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.js

@@ -14,16 +14,15 @@ var UtilMacro;
      * @example
      */
     function exportComment(glob) {
-        (0, QuickFunc_1.commentMacro)(/export (\S*)/, ({ filePath, matchId }) => {
-            const globp = /export (\S*)/.exec(matchId)[1];
+        (0, QuickFunc_1.commentMacro)(/export (\S*)/, ({ filePath, matchId, execArr }) => {
             const basedir = path_1.default.dirname(filePath).replaceAll('\\', '/');
-            const result = utils_1.UtilFT.fileSearchGlob(basedir, globp, { normalize: 'posix' })
+            const result = utils_1.UtilFT.fileSearchGlob(basedir, execArr[1], { 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;
+            return result.length > 0 ? `${result};` : result;
         }, { glob: true, filePath: glob });
     }
     UtilMacro.exportComment = exportComment;

package/dist/index.d.ts

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

package/dist/index.js

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

package/package.json

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

package/src/UtilDevTool.ts

@@ -142,6 +142,8 @@ type MacroOpt = Partial<{
 type CodeTextOpt = {
     /**匹配的region/comment id */
     matchId:string;
+    /**region/comment id正则的执行结果*/
+    execArr:RegExpExecArray;
     /**展开宏的目标文件 */
     filePath:string;
     /**展开宏区域的原文本 */
@@ -212,6 +214,7 @@ export async function regionMacro(regionId:string|RegExp,codeText:string|((opt:C
                 const ol = fileText.length;
                 const parseCode = await parseCodeText(codeText,{
                     matchId :idmatch[0],
+                    execArr :idmatch,
                     text    :dedent(content),
                     inent   ,
                     filePath
@@ -265,6 +268,7 @@ export async function commentMacro(commentId:string|RegExp,codeText:string|((opt
                 const ol = fileText.length;
                 const parseCode = await parseCodeText(codeText,{
                     matchId :idmatch[0],
+                    execArr :idmatch,
                     text    :dedent(content),
                     inent   ,
                     filePath
@@ -290,14 +294,20 @@ export async function commentMacro(commentId:string|RegExp,codeText:string|((opt
  * @param opt.filePath - 目标文件 默认为去除".macro"的同名文件
  * @param opt.glob     - 使用glob匹配而非文件路径
  */
-export async function fileMacro(codeText:string|((opt:CodeTextOpt)=>string|Promise<string>),opt?:MacroOpt){
+export async function fileMacro(codeText:string|((opt:Omit<CodeTextOpt,'ident'|'matchId'|'execArr'>)=>string|Promise<string>),opt?:MacroOpt){
     const plist:Promise<void>[] = [];
     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,{matchId:'',text,inent:'',filePath});
+            const parseCode = await parseCodeText(codeText,{
+                matchId:'',
+                execArr:/''/.exec('')!,
+                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

@@ -9,16 +9,15 @@ export namespace UtilMacro{
      * @example
      */
     export function exportComment(glob:string){
-        commentMacro(/export (\S*)/,({filePath,matchId})=>{
-            const globp = /export (\S*)/.exec(matchId)![1];
+        commentMacro(/export (\S*)/,({filePath,matchId,execArr})=>{
             const basedir = path.dirname(filePath).replaceAll('\\','/');
-            const result = UtilFT.fileSearchGlob(basedir,globp,{normalize:'posix'})
+            const result = UtilFT.fileSearchGlob(basedir,execArr[1],{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;
+            return result.length>0? `${result};` : result;
         },{glob:true,filePath:glob});
     }
 }

package/src/index.ts

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