@zwa73/utils 1.0.115 → 1.0.116

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/utils",
-	"version": "1.0.115",
+	"version": "1.0.116",
 	"description": "my utils",
 	"main": "index.js",
 	"scripts": {
@@ -33,7 +33,7 @@
 		"@types/fluent-ffmpeg": "^2.1.21",
 		"@types/jest": "^29.5.12",
 		"@types/node": "^18.16.3",
-		"@zwa73/dev-utils": "^1.0.33",
+		"@zwa73/dev-utils": "^1.0.37",
 		"jest": "^29.7.0",
 		"ts-jest": "^29.1.2",
 		"tsc-alias": "^1.8.8",

package/scripts/postinstall.js

@@ -63,7 +63,7 @@ async function main(){
         input: process.stdin,
         output: process.stdout
     });
-    setTimeout(()=>rl.close(),20000);
+    setTimeout(()=>rl.close(),5000);
     rl.question('按任意键继续...', () => rl.close());
 }
 main()

package/src/UtilFP.macro.ts

@@ -1,11 +1,11 @@
-import {$macro} from '@zwa73/dev-utils';
+import {regionMacro} from '@zwa73/dev-utils';
 
 const N = 20;
 const R = (n:number)=>n===0?`I`:`R${n}`;
 const prefix = (str:string,prefix?:string)=> str.length>0?`${prefix}${str}`:str;
 const suffix = (str:string,suffix?:string)=> str.length>0?`${str}${suffix}`:str;
 
-$macro("flow重载",(()=>{
+regionMacro("flow重载",()=>{
     let result = ``;
     for (let i = 0; i <= N; i++) {
         const template = Array.from({length: i+1}, (_, k) => R(k)).join(', ');
@@ -15,8 +15,8 @@ $macro("flow重载",(()=>{
         result += `export function flow<${template}>(${args}...fs: CompFunc<${R(i)}, ${R(i)}>[]): CompFunc<I, ${R(i)}>;\n`;
     }
     return result.trim();
-})());
-$macro("pipe重载",(()=>{
+});
+regionMacro("pipe重载",()=>{
     let result = ``;
     for (let i = 0; i <= N; i++) {
         const template = Array.from({length: i+1}, (_, k) => R(k)).join(', ');
@@ -26,4 +26,4 @@ $macro("pipe重载",(()=>{
         result += `export function pipe<${template}>(input: I, ${args}...fs: CompFunc<${R(i)}, ${R(i)}>[]): ${R(i)};\n`;
     }
     return result.trim();
-})());
+});

package/tsconfig.compile.json

@@ -1,4 +1,5 @@
 {
     "extends": "./tsconfig.json",
-    "include": ["./src/**/*.ts", "./src/**/*.js"]
+    "include": ["./src/**/*.ts", "./src/**/*.js"],
+    "exclude": ["./node_modules/**/*","./src/**/*.macro.ts"]
 }

package/dist/UtilFP.macro.d.ts

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

package/dist/UtilFP.macro.js

@@ -1,25 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const dev_utils_1 = require("@zwa73/dev-utils");
-const N = 20;
-const R = (n) => n === 0 ? `I` : `R${n}`;
-const prefix = (str, prefix) => str.length > 0 ? `${prefix}${str}` : str;
-const suffix = (str, suffix) => str.length > 0 ? `${str}${suffix}` : str;
-(0, dev_utils_1.$macro)("flow重载", (() => {
-    let result = ``;
-    for (let i = 0; i <= N; i++) {
-        const template = Array.from({ length: i + 1 }, (_, k) => R(k)).join(', ');
-        const args = suffix(Array.from({ length: i }, (_, k) => `f${k + 1}: CompFunc<${R(k)}, ${R(k + 1)}>`).join(', '), ", ");
-        result += `export function flow<${template}>(${args}...fs: CompFunc<${R(i)}, ${R(i)}>[]): CompFunc<I, ${R(i)}>;\n`;
-    }
-    return result.trim();
-})());
-(0, dev_utils_1.$macro)("pipe重载", (() => {
-    let result = ``;
-    for (let i = 0; i <= N; i++) {
-        const template = Array.from({ length: i + 1 }, (_, k) => R(k)).join(', ');
-        const args = suffix(Array.from({ length: i }, (_, k) => `f${k + 1}: CompFunc<${R(k)}, ${R(k + 1)}>`).join(', '), ", ");
-        result += `export function pipe<${template}>(input: I, ${args}...fs: CompFunc<${R(i)}, ${R(i)}>[]): ${R(i)};\n`;
-    }
-    return result.trim();
-})());