@zwa73/dev-utils 1.0.50 → 1.0.52

package/dist/Command/MapPath.js

@@ -29,7 +29,7 @@ const CmdMapPath = (program) => program
     const duplicateHandling = options.duplicateHandling;
     const basePath = process.cwd();
     // 遍历当前目录下的所有文件
-    const filePaths = utils_1.UtilFT.fileSearchRegex(basePath, regex.source, { relative: options.recursive })
+    const filePaths = (await utils_1.UtilFT.fileSearchRegex(basePath, regex.source, { relative: options.recursive }))
         .map((filePath) => pathe_1.default.relative(basePath, filePath))
         .filter((filePath) => excludeRegex ? (!excludeRegex.test(filePath)) : true);
     //对单个路径映射

package/dist/Command/ScanDups.js

@@ -28,9 +28,9 @@ const CmdScanDups = (program) => program
     .action(async (options) => {
     const regex = new RegExp(options.regex);
     const basePath = process.cwd();
-    const pList = utils_1.UtilFT.fileSearchRegex(basePath, regex.source, {
+    const pList = (await utils_1.UtilFT.fileSearchRegex(basePath, regex.source, {
         relative: options.recursive,
-    }).map(async (filePath) => ({ filePath, hash: await calculateHash(filePath) }));
+    })).map(async (filePath) => ({ filePath, hash: await calculateHash(filePath) }));
     const hashMap = (await Promise.all(pList)).reduce((obj, cur) => {
         obj[cur.hash] = (obj[cur.hash] ?? []).concat(cur.filePath);
         return obj;

package/dist/UtilDevTool.js

@@ -55,7 +55,7 @@ var UtilDT;
         };
         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 files = await 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 ?? pathe_1.default.join(process.cwd(), 'schema');
@@ -112,7 +112,7 @@ var UtilDT;
      * @param opt.project     - tsconfig路径
      */
     async function matchNode(dir, opt) {
-        const files = utils_1.UtilFT.fileSearchGlob(dir, opt?.include ?? "index.ts", { ingore: opt?.exclude });
+        const files = await utils_1.UtilFT.fileSearchGlob(dir, opt?.include ?? "index.ts", { ingore: opt?.exclude });
         await batchNode(files, opt);
     }
     UtilDT.matchNode = matchNode;
@@ -165,7 +165,7 @@ var UtilDT;
      */
     async function regionMacro(regionId, codeText, opt) {
         const plist = [];
-        const filePaths = parseMacroPaths(opt);
+        const filePaths = await parseMacroPaths(opt);
         for (const filePath of filePaths) {
             const queuefunc = async () => {
                 if (!(await utils_1.UtilFT.pathExists(filePath))) {
@@ -222,7 +222,7 @@ var UtilDT;
      */
     async function commentMacro(commentId, codeText, opt) {
         const plist = [];
-        const filePaths = parseMacroPaths(opt);
+        const filePaths = await parseMacroPaths(opt);
         for (const filePath of filePaths) {
             const queuefunc = async () => {
                 if (!(await utils_1.UtilFT.pathExists(filePath))) {
@@ -279,7 +279,7 @@ var UtilDT;
      */
     async function fileMacro(codeText, opt) {
         const plist = [];
-        const filePaths = parseMacroPaths(opt);
+        const filePaths = await parseMacroPaths(opt);
         for (const filePath of filePaths) {
             const queuefunc = async () => {
                 await utils_1.UtilFT.ensurePathExists(filePath);

package/dist/UtilMacro.js

@@ -14,9 +14,9 @@ var UtilMacro;
      * @example
      */
     function exportComment(glob) {
-        (0, QuickFunc_1.commentMacro)(/export (\S*)/, ({ filePath, matchId, execArr }) => {
+        (0, QuickFunc_1.commentMacro)(/export (\S*)/, async ({ filePath, matchId, execArr }) => {
             const basedir = pathe_1.default.dirname(filePath);
-            const result = utils_1.UtilFT.fileSearchGlob(basedir, execArr[1])
+            const result = (await utils_1.UtilFT.fileSearchGlob(basedir, execArr[1]))
                 .map((file) => pathe_1.default.relative(basedir, file))
                 .map((file) => pathe_1.default.parse(file).name)
                 .filter((file) => file != pathe_1.default.parse(filePath).name)

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/dev-utils",
-	"version": "1.0.50",
+	"version": "1.0.52",
 	"description": "编译与调试工具",
 	"main": "index.js",
 	"scripts": {
@@ -16,7 +16,7 @@
 	"author": "zwa73",
 	"license": "ISC",
 	"dependencies": {
-		"@zwa73/utils": "^1.0.125",
+		"@zwa73/utils": "^1.0.128",
 		"commander": "^11.1.0",
 		"pathe": "^1.1.2",
 		"ts-node": "^10.9.2",

package/src/Command/MapPath.ts

@@ -27,7 +27,7 @@ export const CmdMapPath = (program: Command) => program
         const duplicateHandling = options.duplicateHandling as DupMethod;
         const basePath = process.cwd();
         // 遍历当前目录下的所有文件
-        const filePaths = UtilFT.fileSearchRegex(basePath, regex.source,{relative:options.recursive})
+        const filePaths = (await UtilFT.fileSearchRegex(basePath, regex.source,{relative:options.recursive}))
             .map((filePath)=>path.relative(basePath, filePath))
             .filter((filePath)=>excludeRegex ? (!excludeRegex.test(filePath)) : true);
 

package/src/Command/ScanDups.ts

@@ -26,9 +26,9 @@ export const CmdScanDups = (program: Command) => program
     .action(async (options) => {
         const regex = new RegExp(options.regex);
         const basePath = process.cwd();
-        const pList = UtilFT.fileSearchRegex(basePath, regex.source, {
+        const pList = (await UtilFT.fileSearchRegex(basePath, regex.source, {
             relative: options.recursive,
-        }).map(async (filePath) => ({ filePath, hash: await calculateHash(filePath) }));
+        })).map(async (filePath) => ({ filePath, hash: await calculateHash(filePath) }));
 
         const hashMap = (await Promise.all(pList)).reduce((obj,cur)=>{
             obj[cur.hash] = (obj[cur.hash]??[]).concat(cur.filePath);

package/src/UtilDevTool.ts

@@ -50,7 +50,7 @@ export async function generateSchema(dir:string,opt?:BuildSchemaOpt){
         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 files = await UtilFT.fileSearchGlob(dir,opt?.include ?? "**/*.schema.ts",{ingore:opt?.exclude});
 
     const program = TJS.getProgramFromFiles(
         files,
@@ -110,7 +110,7 @@ function coverObj(base:JObject,cover:JObject){
  * @param opt.project     - tsconfig路径
  */
 export async function matchNode(dir:string,opt?:BuildMatchOpt) {
-    const files = UtilFT.fileSearchGlob(dir,opt?.include ?? "index.ts",{ingore:opt?.exclude});
+    const files = await UtilFT.fileSearchGlob(dir,opt?.include ?? "index.ts",{ingore:opt?.exclude});
     await batchNode(files,opt);
 }
 /**运行所有js/ts文件  
@@ -182,7 +182,7 @@ const literalRegex = (str:string)=>new RegExp(
  */
 export async function regionMacro(regionId:string|RegExp,codeText:string|((opt:CodeTextOpt)=>string|Promise<string>),opt?:MacroOpt){
     const plist:Promise<void>[] = [];
-    const filePaths = parseMacroPaths(opt);
+    const filePaths = await parseMacroPaths(opt);
     for(const filePath of filePaths){
         const queuefunc = async ()=>{
             if(!(await UtilFT.pathExists(filePath))) {
@@ -239,7 +239,7 @@ export async function regionMacro(regionId:string|RegExp,codeText:string|((opt:C
  */
 export async function commentMacro(commentId:string|RegExp,codeText:string|((opt:CodeTextOpt)=>string|Promise<string>),opt?:MacroOpt){
     const plist:Promise<void>[] = [];
-    const filePaths = parseMacroPaths(opt);
+    const filePaths = await parseMacroPaths(opt);
     for(const filePath of filePaths){
         const queuefunc = async ()=>{
             if(!(await UtilFT.pathExists(filePath))) {
@@ -296,7 +296,7 @@ export async function commentMacro(commentId:string|RegExp,codeText:string|((opt
  */
 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);
+    const filePaths = await parseMacroPaths(opt);
     for(const filePath of filePaths){
         const queuefunc = async ()=>{
             await UtilFT.ensurePathExists(filePath);

package/src/UtilMacro.ts

@@ -9,9 +9,9 @@ export namespace UtilMacro{
      * @example
      */
     export function exportComment(glob:string){
-        commentMacro(/export (\S*)/,({filePath,matchId,execArr})=>{
+        commentMacro(/export (\S*)/,async ({filePath,matchId,execArr})=>{
             const basedir = path.dirname(filePath);
-            const result = UtilFT.fileSearchGlob(basedir,execArr[1])
+            const result = (await UtilFT.fileSearchGlob(basedir,execArr[1]))
                 .map((file)=>path.relative(basedir,file))
                 .map((file)=>path.parse(file).name)
                 .filter((file)=>file!=path.parse(filePath).name)