@zwa73/dev-utils 1.0.27 → 1.0.28

package/dist/UtilDevTool.js

@@ -147,21 +147,24 @@ var UtilDT;
         const baseFilePath = targetPath
             ? path.resolve(process.cwd(), targetPath)
             : loc.filePath.replace(/(.+)\.macro\.(js|ts|cjs|mjs)$/, "$1.$2");
-        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}(\\n|\\s+?))([\\s\\S]+?)(\\n|)(//#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}$4$5`);
-        await fs.promises.writeFile(baseFilePath, ntext, 'utf-8');
+        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/package.json

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

package/src/UtilDevTool.ts

@@ -56,16 +56,16 @@ export async function buildSchema(dir:string,opt?:BuildSchemaOpt){
         files,
         compilerOptions,
     );
-    const schema = TJS.generateSchema(program, "*", settings) as any;
+    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:any,coverDefine:JObject){
+async function expandSchema(schemasPath:string,schema:JObject,coverDefine:JObject){
     //覆盖
-    coverObj(schema["definitions"],coverDefine);
+    coverObj(schema["definitions"] as JObject,coverDefine);
     //替换SchemaString标识符
     schema = JSON.parse(JSON.stringify(schema).replace(/\^\.\*SchemaString\$/g,'^.*$'));
     const plist:Promise<void>[] = [];
@@ -131,6 +131,7 @@ export async function batchNode(filepath:string|string[],opt?:BatchNodeOpt) {
     await UtilFunc.exec(cmd, { outlvl: 'info', errlvl: 'warn' });
 }
 
+
 /**将codeText写入对应region  
  * @param regionId   - 区域id
  * @param codeText   - 文本
@@ -145,19 +146,22 @@ export async function $macro(regionId:string,codeText:string,targetPath?:string)
     const baseFilePath = targetPath
         ? path.resolve(process.cwd(),targetPath)
         : loc.filePath.replace(/(.+)\.macro\.(js|ts|cjs|mjs)$/,"$1.$2");
-    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}(\\n|\\s+?))([\\s\\S]+?)(\\n|)(//#endregion)`);
-    //console.log(text)
-    //console.log(regex)
-    if (!regex.test(text)) {
-        SLogger.error(`UtilDT.$macro 无法找到区域 ${regionId}`);
-        return;
+    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');
     }
-    const ntext = text.replace(regex, `$1${codeText}$4$5`);
-    await fs.promises.writeFile(baseFilePath, ntext, 'utf-8');
+    await UtilFunc.queueProc(path.posix.normalize(baseFilePath.replaceAll("\\","/")),queuefunc);
 }
 }