@zwa73/dev-utils 1.0.28 → 1.0.30

package/dist/UtilDevTool.js

@@ -138,7 +138,7 @@ var UtilDT;
      * @param targetPath - 目标文件 默认为去除".macro"的同名文件
      */
     async function $macro(regionId, codeText, targetPath) {
-        const loc = (0, utils_1.getFuncLoc)(2);
+        const loc = utils_1.UtilFunc.getFuncLoc(2);
         if (!loc) {
             utils_1.SLogger.error(`UtilDT.$macro 未能找到函数位置`);
             return;
@@ -153,15 +153,17 @@ var UtilDT;
                 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)) {
+            const text = (await fs.promises.readFile(baseFilePath, 'utf-8')).replaceAll("\r\n", "\n");
+            const getregex = () => new RegExp(`([^\\S\\n]*)(//#region ${regionId}(?!\\S).*\\n)` +
+                /([\s\S]*?)/.source +
+                /([^\S\n]*\/\/#endregion(?!\S).*)/.source, "g");
+            if (!(getregex().test(text))) {
                 utils_1.SLogger.error(`UtilDT.$macro 无法找到区域 ${regionId}`);
                 return;
             }
-            const ntext = text.replace(regex, `$1${codeText}\n$3`);
+            const match = getregex().exec(text);
+            const mapText = codeText.split('\n').map((line) => `${match[1]}${line}`).join('\n');
+            const ntext = text.replace(getregex(), `$1$2${mapText}\n$4`);
             await fs.promises.writeFile(baseFilePath, ntext, 'utf-8');
         };
         await utils_1.UtilFunc.queueProc(path.posix.normalize(baseFilePath.replaceAll("\\", "/")), queuefunc);

package/package.json

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

package/src/UtilDevTool.ts

@@ -138,7 +138,7 @@ export async function batchNode(filepath:string|string[],opt?:BatchNodeOpt) {
  * @param targetPath - 目标文件 默认为去除".macro"的同名文件
  */
 export async function $macro(regionId:string,codeText:string,targetPath?:string){
-    const loc = getFuncLoc(2);
+    const loc = UtilFunc.getFuncLoc(2);
     if(!loc){
         SLogger.error(`UtilDT.$macro 未能找到函数位置`);
         return
@@ -151,15 +151,19 @@ export async function $macro(regionId:string,codeText:string,targetPath?:string)
             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)) {
+        const text = (await fs.promises.readFile(baseFilePath,'utf-8')).replaceAll("\r\n","\n");
+        const getregex = ()=>new RegExp(
+            `([^\\S\\n]*)(//#region ${regionId}(?!\\S).*\\n)`+
+            /([\s\S]*?)/.source+
+            /([^\S\n]*\/\/#endregion(?!\S).*)/.source
+            ,"g");
+        if (!(getregex().test(text))) {
             SLogger.error(`UtilDT.$macro 无法找到区域 ${regionId}`);
             return;
         }
-        const ntext = text.replace(regex, `$1${codeText}\n$3`);
+        const match = getregex().exec(text)!;
+        const mapText = codeText.split('\n').map((line)=>`${match[1]}${line}`).join('\n');
+        const ntext = text.replace(getregex(), `$1$2${mapText}\n$4`);
         await fs.promises.writeFile(baseFilePath, ntext, 'utf-8');
     }
     await UtilFunc.queueProc(path.posix.normalize(baseFilePath.replaceAll("\\","/")),queuefunc);