@zwa73/utils 1.0.194 → 1.0.195

package/dist/UtilClass.d.ts

@@ -1,4 +1,4 @@
-import { Keyable, Literal } from "./UtilInterfaces";
+import { Keyable, Literal, MPromise } from "./UtilInterfaces";
 import Handlebars from 'handlebars';
 /**函数管道器 */
 export declare class Piper<Arg, Result = Arg> {
@@ -18,7 +18,7 @@ export declare class Piper<Arg, Result = Arg> {
     /**直接调用 */
     invoke(arg: Arg): Result;
 }
-type StreamOperation<T, U> = (item: T) => Promise<U> | U;
+type StreamOperation<T, U> = (item: T) => MPromise<U>;
 /**并行流 */
 export declare class Stream<T> implements Iterable<T> {
     /**并发数*/
@@ -27,8 +27,11 @@ export declare class Stream<T> implements Iterable<T> {
     /**加工函数列表*/
     private _operation;
     private constructor();
-    /**从arraylike创建流 */
-    static from<T>(args: Parameters<typeof Array.from<T>>[0], concurrent?: number): Stream<T>;
+    /**从arraylike创建流
+     * @param args - arraylike
+     * @param concurrent - 并发数 默认 1
+     */
+    static from<T>(args: ArrayLike<T>, concurrent?: number): Stream<T>;
     /**从数组创建流 */
     static of<T>(...args: T[]): Stream<T>;
     /**设置并发数 */

package/dist/UtilClass.js

@@ -49,7 +49,10 @@ class Stream {
             this._list = new Array(...base);
         this._concurrent = concurrent;
     }
-    /**从arraylike创建流 */
+    /**从arraylike创建流
+     * @param args - arraylike
+     * @param concurrent - 并发数 默认 1
+     */
     static from(args, concurrent = 1) {
         return new Stream(Array.from(args), concurrent);
     }

package/dist/UtilFunctions.d.ts

@@ -1,4 +1,4 @@
-import { PRecord, AnyFunc, ExtractOutcome, IJData, JObject, JToken, Keyable, Literal, Matchable, MatchableFlag, Outcome, ReqVerifyFn, ProperSubsetCheck, UnionToIntersection, AnyRecord, AllExtends, SrtSegment } from "./UtilInterfaces";
+import { PRecord, AnyFunc, ExtractOutcome, IJData, JObject, JToken, Keyable, Literal, Matchable, MatchableFlag, Outcome, ReqVerifyFn, ProperSubsetCheck, UnionToIntersection, AnyRecord, AllExtends, SrtSegment, MPromise } from "./UtilInterfaces";
 import { LogLevel } from "./UtilLogger";
 import { Failed, FailedLike, None, StatusSymbol, Success, SuccessLike, Timeout } from "./UtilSymbol";
 declare const HashMethodList: readonly ["md5", "sha1", "sha256", "sha512", "sha3", "blake2", "blake3"];
@@ -119,7 +119,7 @@ export declare class UtilFunc {
      * @param timeLimit - 毫秒限时
      * @returns 超时则返回 处理函数委托 完成则返回结果
      */
-    static timelimitPromise<T>(func: () => Promise<T> | T, timeLimit?: number): Promise<SuccessOut<T> | TimeoutOut<T>>;
+    static timelimitPromise<T>(func: () => MPromise<T>, timeLimit?: number): Promise<SuccessOut<T> | TimeoutOut<T>>;
     /**对对象的每个属性应用映射函数，并返回一个新的对象。
      * @template T      - 对象的类型
      * @param obj       - 要处理的对象

package/dist/UtilInterfaces.d.ts

@@ -154,8 +154,10 @@ export type NeedInit = {
     /**完成初始化的标记 */
     inited: Promise<any>;
 };
-/**可选的record */
+/**可选的record PartialRecord */
 export type PRecord<K extends Keyable, V> = Partial<Record<K, V>>;
+/** 可以是Promise MaybePromise*/
+export type MPromise<T> = T | Promise<T>;
 /**任何Record */
 export type AnyRecord = Record<Keyable, any>;
 /**注释元组

package/package.json

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

package/src/UtilClass.ts

@@ -1,5 +1,5 @@
 import { matchProc } from "./QuickExport";
-import { Keyable, Literal } from "./UtilInterfaces";
+import { Keyable, Literal, MPromise } from "./UtilInterfaces";
 import Handlebars from 'handlebars';
 import { SLogger } from "./UtilLogger";
 
@@ -38,7 +38,7 @@ export class Piper<Arg, Result = Arg> {
 }
 
 
-type StreamOperation<T, U> = (item: T)=>Promise<U>|U;
+type StreamOperation<T, U> = (item: T)=>MPromise<U>;
 /**并行流 */
 export class Stream<T> implements Iterable<T>{
     /**并发数*/
@@ -52,13 +52,16 @@ export class Stream<T> implements Iterable<T>{
         else this._list = new Array(...base);
         this._concurrent = concurrent;
     }
-    /**从arraylike创建流 */
-    static from<T>(args:Parameters<typeof Array.from<T>>[0],concurrent:number=1){
-        return new Stream<T>(Array.from(args),concurrent);
+    /**从arraylike创建流
+     * @param args - arraylike
+     * @param concurrent - 并发数 默认 1
+     */
+    static from<T>(args:ArrayLike<T>,concurrent:number=1){
+        return new Stream(Array.from(args),concurrent);
     }
     /**从数组创建流 */
     static of<T>(...args:T[]){
-        return new Stream<T>(args);
+        return new Stream(args);
     }
     /**设置并发数 */
     concurrent(count: number): Stream<T> {

package/src/UtilFunctions.ts

@@ -1,5 +1,5 @@
 import * as crypto from "crypto";
-import { PRecord, AnyFunc, ExtractOutcome, IJData, JObject, JToken, Keyable, Literal, Matchable, MatchableFlag, Outcome, ReqStat, ReqVerifyFn, ProperSubsetCheck, UnionToIntersection, AnyRecord, AllExtends, SrtSegment } from "@/src/UtilInterfaces";
+import { PRecord, AnyFunc, ExtractOutcome, IJData, JObject, JToken, Keyable, Literal, Matchable, MatchableFlag, Outcome, ReqStat, ReqVerifyFn, ProperSubsetCheck, UnionToIntersection, AnyRecord, AllExtends, SrtSegment, MPromise } from "@/src/UtilInterfaces";
 import * as cp from "child_process";
 import { LogLevel, SLogger } from "@/src/UtilLogger";
 import { Completed, Failed, FailedLike, None, StatusSymbol, Success, SuccessLike, Terminated, Timeout } from "./UtilSymbol";
@@ -356,7 +356,7 @@ Promise<RepeatPromiseResult<T>>{
  * @returns 超时则返回 处理函数委托 完成则返回结果
  */
 static timelimitPromise<T>
-    (func:()=>Promise<T>|T,timeLimit?:number):Promise<SuccessOut<T>|TimeoutOut<T>>{
+    (func:()=>MPromise<T>,timeLimit?:number):Promise<SuccessOut<T>|TimeoutOut<T>>{
     return new Promise<SuccessOut<T>|TimeoutOut<T>>((reslove)=>{
         let clearTimer:(()=>void)| null = null;
         const procer = (async ()=>await func())();

package/src/UtilInterfaces.ts

@@ -236,8 +236,10 @@ export type NeedInit = {
     inited: Promise<any>;
 };
 
-/**可选的record */
+/**可选的record PartialRecord */
 export type PRecord<K extends Keyable,V> = Partial<Record<K,V>>;
+/** 可以是Promise MaybePromise*/
+export type MPromise<T> = T | Promise<T>;
 /**任何Record */
 export type AnyRecord = Record<Keyable,any>;