@zwa73/utils 1.0.191 → 1.0.193

package/dist/LiteFunction.d.ts

@@ -0,0 +1,9 @@
+/**立即执行传入的函数
+ * @param fn - 需要立即执行的函数。
+ * @returns 返回 fn 函数的执行结果。
+ */
+export declare function ivk<T extends () => any>(fn: T): ReturnType<T>;
+/**一个可供sort使用的从小到大排序的函数 */
+export declare function s2l(a: number, b: number): number;
+/**一个可供sort使用的从大到小排序的函数 */
+export declare function l2s(a: number, b: number): number;

package/dist/LiteFunction.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ivk = ivk;
+exports.s2l = s2l;
+exports.l2s = l2s;
+/**立即执行传入的函数
+ * @param fn - 需要立即执行的函数。
+ * @returns 返回 fn 函数的执行结果。
+ */
+function ivk(fn) {
+    return fn();
+}
+/**一个可供sort使用的从小到大排序的函数 */
+function s2l(a, b) {
+    return a - b;
+}
+/**一个可供sort使用的从大到小排序的函数 */
+function l2s(a, b) {
+    return b - a;
+}

package/dist/QuickFunction.d.ts

@@ -1,4 +1,4 @@
 import { UtilFT } from "./UtilFileTools";
 import { UtilFunc } from "./UtilFunctions";
-export declare const outcome: typeof UtilFunc.outcome, matchProc: typeof UtilFunc.matchProc, sucesProc: typeof UtilFunc.sucesProc, isFailed: typeof UtilFunc.isFailed, isSafeNumber: typeof UtilFunc.isSafeNumber, isSuccess: typeof UtilFunc.isSuccess, likeNone: typeof UtilFunc.likeNone, expect: typeof UtilFunc.expect, assertType: typeof UtilFunc.assertType, assertLiteral: typeof UtilFunc.assertLiteral, deepClone: typeof UtilFunc.deepClone, sleep: typeof UtilFunc.sleep, stringifyJToken: typeof UtilFunc.stringifyJToken, getTime: typeof UtilFunc.getTime, mapEntries: typeof UtilFunc.mapEntries, dedent: typeof UtilFunc.dedent, throwError: typeof UtilFunc.throwError, eitherize: typeof UtilFunc.eitherize, taskEitherize: typeof UtilFunc.taskEitherize, memoize: typeof UtilFunc.memoize, ivk: typeof UtilFunc.ivk;
+export declare const outcome: typeof UtilFunc.outcome, matchProc: typeof UtilFunc.matchProc, sucesProc: typeof UtilFunc.sucesProc, isFailed: typeof UtilFunc.isFailed, isSafeNumber: typeof UtilFunc.isSafeNumber, isSuccess: typeof UtilFunc.isSuccess, likeNone: typeof UtilFunc.likeNone, expect: typeof UtilFunc.expect, assertType: typeof UtilFunc.assertType, assertLiteral: typeof UtilFunc.assertLiteral, deepClone: typeof UtilFunc.deepClone, sleep: typeof UtilFunc.sleep, stringifyJToken: typeof UtilFunc.stringifyJToken, getTime: typeof UtilFunc.getTime, mapEntries: typeof UtilFunc.mapEntries, dedent: typeof UtilFunc.dedent, throwError: typeof UtilFunc.throwError, eitherize: typeof UtilFunc.eitherize, taskEitherize: typeof UtilFunc.taskEitherize, memoize: typeof UtilFunc.memoize;
 export declare const stylizePath: typeof UtilFT.stylizePath, posixizePath: typeof UtilFT.posixizePath, win32izePath: typeof UtilFT.win32izePath, currosizePath: typeof UtilFT.currosizePath;

package/dist/QuickFunction.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.currosizePath = exports.win32izePath = exports.posixizePath = exports.stylizePath = exports.ivk = exports.memoize = exports.taskEitherize = exports.eitherize = exports.throwError = exports.dedent = exports.mapEntries = exports.getTime = exports.stringifyJToken = exports.sleep = exports.deepClone = exports.assertLiteral = exports.assertType = exports.expect = exports.likeNone = exports.isSuccess = exports.isSafeNumber = exports.isFailed = exports.sucesProc = exports.matchProc = exports.outcome = void 0;
+exports.currosizePath = exports.win32izePath = exports.posixizePath = exports.stylizePath = exports.memoize = exports.taskEitherize = exports.eitherize = exports.throwError = exports.dedent = exports.mapEntries = exports.getTime = exports.stringifyJToken = exports.sleep = exports.deepClone = exports.assertLiteral = exports.assertType = exports.expect = exports.likeNone = exports.isSuccess = exports.isSafeNumber = exports.isFailed = exports.sucesProc = exports.matchProc = exports.outcome = void 0;
 const UtilFileTools_1 = require("./UtilFileTools");
 const UtilFunctions_1 = require("./UtilFunctions");
 const UtilSymbol_1 = require("./UtilSymbol");
-exports.outcome = UtilFunctions_1.UtilFunc.outcome, exports.matchProc = UtilFunctions_1.UtilFunc.matchProc, exports.sucesProc = UtilFunctions_1.UtilFunc.sucesProc, exports.isFailed = UtilFunctions_1.UtilFunc.isFailed, exports.isSafeNumber = UtilFunctions_1.UtilFunc.isSafeNumber, exports.isSuccess = UtilFunctions_1.UtilFunc.isSuccess, exports.likeNone = UtilFunctions_1.UtilFunc.likeNone, exports.expect = UtilFunctions_1.UtilFunc.expect, exports.assertType = UtilFunctions_1.UtilFunc.assertType, exports.assertLiteral = UtilFunctions_1.UtilFunc.assertLiteral, exports.deepClone = UtilFunctions_1.UtilFunc.deepClone, exports.sleep = UtilFunctions_1.UtilFunc.sleep, exports.stringifyJToken = UtilFunctions_1.UtilFunc.stringifyJToken, exports.getTime = UtilFunctions_1.UtilFunc.getTime, exports.mapEntries = UtilFunctions_1.UtilFunc.mapEntries, exports.dedent = UtilFunctions_1.UtilFunc.dedent, exports.throwError = UtilFunctions_1.UtilFunc.throwError, exports.eitherize = UtilFunctions_1.UtilFunc.eitherize, exports.taskEitherize = UtilFunctions_1.UtilFunc.taskEitherize, exports.memoize = UtilFunctions_1.UtilFunc.memoize, exports.ivk = UtilFunctions_1.UtilFunc.ivk;
+exports.outcome = UtilFunctions_1.UtilFunc.outcome, exports.matchProc = UtilFunctions_1.UtilFunc.matchProc, exports.sucesProc = UtilFunctions_1.UtilFunc.sucesProc, exports.isFailed = UtilFunctions_1.UtilFunc.isFailed, exports.isSafeNumber = UtilFunctions_1.UtilFunc.isSafeNumber, exports.isSuccess = UtilFunctions_1.UtilFunc.isSuccess, exports.likeNone = UtilFunctions_1.UtilFunc.likeNone, exports.expect = UtilFunctions_1.UtilFunc.expect, exports.assertType = UtilFunctions_1.UtilFunc.assertType, exports.assertLiteral = UtilFunctions_1.UtilFunc.assertLiteral, exports.deepClone = UtilFunctions_1.UtilFunc.deepClone, exports.sleep = UtilFunctions_1.UtilFunc.sleep, exports.stringifyJToken = UtilFunctions_1.UtilFunc.stringifyJToken, exports.getTime = UtilFunctions_1.UtilFunc.getTime, exports.mapEntries = UtilFunctions_1.UtilFunc.mapEntries, exports.dedent = UtilFunctions_1.UtilFunc.dedent, exports.throwError = UtilFunctions_1.UtilFunc.throwError, exports.eitherize = UtilFunctions_1.UtilFunc.eitherize, exports.taskEitherize = UtilFunctions_1.UtilFunc.taskEitherize, exports.memoize = UtilFunctions_1.UtilFunc.memoize;
 exports.stylizePath = UtilFileTools_1.UtilFT.stylizePath, exports.posixizePath = UtilFileTools_1.UtilFT.posixizePath, exports.win32izePath = UtilFileTools_1.UtilFT.win32izePath, exports.currosizePath = UtilFileTools_1.UtilFT.currosizePath;
 if (false) {
     let aaser = (0, exports.assertLiteral)({ a: 1 });

package/dist/UtilClass.d.ts

@@ -28,7 +28,9 @@ export declare class Stream<T> implements Iterable<T> {
     private _operation;
     private constructor();
     /**从arraylike创建流 */
-    static from<T>(...args: Parameters<typeof Array.from<T>>): Stream<T>;
+    static from<T>(args: Parameters<typeof Array.from<T>>[0], concurrent?: number): Stream<T>;
+    /**从数组创建流 */
+    static of<T>(...args: T[]): Stream<T>;
     /**设置并发数 */
     concurrent(count: number): Stream<T>;
     /**平分数组

package/dist/UtilClass.js

@@ -50,8 +50,12 @@ class Stream {
         this._concurrent = concurrent;
     }
     /**从arraylike创建流 */
-    static from(...args) {
-        return new Stream(Array.from(...args));
+    static from(args, concurrent = 1) {
+        return new Stream(Array.from(args), concurrent);
+    }
+    /**从数组创建流 */
+    static of(...args) {
+        return new Stream(args);
     }
     /**设置并发数 */
     concurrent(count) {
@@ -131,22 +135,16 @@ class Stream {
     async append() {
         if (this._operation.length == 0)
             return this;
-        const pList = [];
         //均分处理
-        this.divide(this._concurrent).forEach((subList) => {
-            if (!subList)
-                return;
-            pList.push(new Promise(async (reslove) => {
-                const result = [];
-                for (let item of subList) {
-                    if (!item)
-                        continue;
-                    for (const operation of this._operation)
-                        item = await operation(item);
-                    result.push(item);
-                }
-                reslove(result);
-            }));
+        const pList = this.divide(this._concurrent)
+            .map(async (subList) => {
+            const result = [];
+            for (let item of subList) {
+                for (const operation of this._operation)
+                    item = await operation(item);
+                result.push(item);
+            }
+            return (result);
         });
         const rlist = await Promise.all(pList);
         //拼接结果 轮询均分

package/dist/UtilFunctions.d.ts

@@ -291,11 +291,6 @@ export declare class UtilFunc {
         result: any;
         timestamp: number;
     }>>;
-    /**立即执行传入的函数
-     * @param fn - 需要立即执行的函数。
-     * @returns 返回 fn 函数的执行结果。
-     */
-    static ivk<T extends () => any>(fn: T): ReturnType<T>;
     /**创建一个带有缓存有效期的memoize函数
      * 只在传入值均为JToken时有效
      * @param fn     - 需要被memoize的函数

package/dist/UtilFunctions.js

@@ -44,6 +44,7 @@ const UtilDecorators_1 = require("./UtilDecorators");
 const path_1 = __importDefault(require("path"));
 const UtilFileTools_1 = require("./UtilFileTools");
 const util_1 = require("util");
+const LiteFunction_1 = require("./LiteFunction");
 const HashMethodList = ["md5", "sha1", "sha256", "sha512", "sha3", "blake2", "blake3"];
 /**永不完成的Promise单例 */
 const NeverResolvedPromise = new Promise(() => { });
@@ -697,13 +698,6 @@ class UtilFunc {
     }
     /**缓存池 */
     static cachePool = new WeakMap();
-    /**立即执行传入的函数
-     * @param fn - 需要立即执行的函数。
-     * @returns 返回 fn 函数的执行结果。
-     */
-    static ivk(fn) {
-        return fn();
-    }
     /**创建一个带有缓存有效期的memoize函数
      * 只在传入值均为JToken时有效
      * @param fn     - 需要被memoize的函数
@@ -711,7 +705,7 @@ class UtilFunc {
      * @returns 返回一个新的函数，这个函数在调用时会尝试从缓存中获取结果，如果缓存不存在或已过期，就会调用原函数并缓存其结果。
      */
     static memoize(fn, expiry = Infinity) {
-        const cache = UtilFunc.cachePool.get(fn) ?? UtilFunc.ivk(() => {
+        const cache = UtilFunc.cachePool.get(fn) ?? (0, LiteFunction_1.ivk)(() => {
             const c = new Map();
             UtilFunc.cachePool.set(fn, c);
             return c;

package/dist/index.d.ts

@@ -11,3 +11,4 @@ export * from './UtilLogger';
 export * from './UtilFP';
 export * from './QuickFunction';
 export * from './UtilI18n';
+export * from './LiteFunction';

package/dist/index.js

@@ -27,3 +27,4 @@ __exportStar(require("./UtilLogger"), exports);
 __exportStar(require("./UtilFP"), exports);
 __exportStar(require("./QuickFunction"), exports);
 __exportStar(require("./UtilI18n"), exports);
+__exportStar(require("./LiteFunction"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/utils",
-	"version": "1.0.191",
+	"version": "1.0.193",
 	"description": "my utils",
 	"main": "index.js",
 	"scripts": {

package/src/LiteFunction.ts

@@ -0,0 +1,18 @@
+
+
+
+/**立即执行传入的函数  
+ * @param fn - 需要立即执行的函数。
+ * @returns 返回 fn 函数的执行结果。
+ */
+export function ivk<T extends ()=>any>(fn:T): ReturnType<T> {
+    return fn();
+}
+/**一个可供sort使用的从小到大排序的函数 */
+export function s2l(a:number,b:number) {
+    return a-b;
+}
+/**一个可供sort使用的从大到小排序的函数 */
+export function l2s(a:number,b:number) {
+    return b-a;
+}

package/src/QuickFunction.ts

@@ -24,7 +24,6 @@ export const {
     eitherize,
     taskEitherize,
     memoize,
-    ivk,
 } = UtilFunc;
 
 export const {
@@ -67,5 +66,4 @@ if(false){
     let matt = matchProc(null as any as Outcome<symbol,123>,{
 
     })
-}
-
+}

package/src/UtilClass.ts

@@ -53,8 +53,12 @@ export class Stream<T> implements Iterable<T>{
         this._concurrent = concurrent;
     }
     /**从arraylike创建流 */
-    static from<T>(...args:Parameters<typeof Array.from<T>>){
-        return new Stream<T>(Array.from(...args));
+    static from<T>(args:Parameters<typeof Array.from<T>>[0],concurrent:number=1){
+        return new Stream<T>(Array.from(args),concurrent);
+    }
+    /**从数组创建流 */
+    static of<T>(...args:T[]){
+        return new Stream<T>(args);
     }
     /**设置并发数 */
     concurrent(count: number): Stream<T> {
@@ -133,23 +137,17 @@ export class Stream<T> implements Iterable<T>{
     async append(): Promise<Stream<T>> {
         if (this._operation.length == 0) return this;
 
-        const pList: Promise<T[]>[] = [];
         //均分处理
-        this.divide(this._concurrent).forEach((subList)=>{
-            if (!subList) return;
-            pList.push(
-                new Promise(async (reslove) => {
+        const pList = this.divide(this._concurrent)
+            .map(async (subList)=>{
                     const result:T[] = [];
                     for (let item of subList) {
-                        if (!item) continue;
                         for (const operation of this._operation)
                             item = await operation(item);
                         result.push(item);
                     }
-                    reslove(result);
-                })
-            );
-        })
+                    return (result);
+                });
         const rlist = await Promise.all(pList);
 
         //拼接结果 轮询均分

package/src/UtilFunctions.ts

@@ -8,6 +8,7 @@ import opath from 'path';
 import { UtilFT } from "./UtilFileTools";
 import {inspect} from 'util';
 import type * as publicIp from 'public-ip';
+import { ivk } from "./LiteFunction";
 
 const HashMethodList = ["md5","sha1","sha256","sha512","sha3","blake2","blake3"] as const;
 type HashMethod = typeof HashMethodList[number];
@@ -817,16 +818,6 @@ static async dynamicImport(moduleName:string):Promise<any> {
 /**缓存池 */
 static cachePool = new WeakMap<Function, Map<string, { result: any, timestamp: number }>>();
 
-
-
-/**立即执行传入的函数  
- * @param fn - 需要立即执行的函数。
- * @returns 返回 fn 函数的执行结果。
- */
-static ivk<T extends ()=>any>(fn:T): ReturnType<T> {
-    return fn();
-}
-
 /**创建一个带有缓存有效期的memoize函数  
  * 只在传入值均为JToken时有效
  * @param fn     - 需要被memoize的函数
@@ -837,7 +828,7 @@ static memoize<T extends (...args:any[])=>any> (fn: T, expiry = Infinity):
     T extends (...args:infer In)=>any
         ? AllExtends<In,JToken> extends true ? T : never
         : never {
-    const cache = UtilFunc.cachePool.get(fn) ?? UtilFunc.ivk(()=>{
+    const cache = UtilFunc.cachePool.get(fn) ?? ivk(()=>{
         const c = new Map();
         UtilFunc.cachePool.set(fn, c);
         return c;

package/src/index.ts

@@ -10,4 +10,5 @@ export * from './UtilFileTools';
 export * from './UtilLogger';
 export * from './UtilFP';
 export * from './QuickFunction';
-export * from './UtilI18n';
+export * from './UtilI18n';
+export * from './LiteFunction';

package/dist/ServiceManager.js

@@ -1 +0,0 @@
-"use strict";