ddan-js 3.4.0 → 3.5.0

package/bin/modules/qs/index.d.ts

@@ -1,4 +1,11 @@
 import { Ddan } from '../../typings';
+/**
+ * 安全可靠的 URL 拼接函数
+ * 支持协议域名、相对路径、绝对路径 (macOS/Unix) 等场景
+ * @param parts URL 各个部分
+ * @returns 拼接后的完整 URL 字符串
+ */
+export declare const urlJoin: (...parts: string[]) => string;
 declare const _default: {
     parse: (qs: any, { sep, eq, max, multiple, uri, parseNumber, parseBoolean }?: {
         sep?: string | undefined;
@@ -44,6 +51,7 @@ declare const _default: {
     };
     parseHost: (url: string) => Ddan.IHttpHost;
     join: (...args: string[]) => string;
+    urlJoin: (...parts: string[]) => string;
     shExpMatch: (text: string, pattern: string) => boolean;
     isLocalIPAddress: (addr: string) => boolean;
     parseFileUrl: (url: string) => {

package/bin/tiny/hook.d.ts

@@ -44,6 +44,7 @@ declare const dHook: {
         };
         parseHost: (url: string) => import("..").Ddan.IHttpHost;
         join: (...args: string[]) => string;
+        urlJoin: (...parts: string[]) => string;
         shExpMatch: (text: string, pattern: string) => boolean;
         isLocalIPAddress: (addr: string) => boolean;
         parseFileUrl: (url: string) => {
@@ -65,6 +66,14 @@ declare const dHook: {
         readonly I: T;
     };
     getset: <T_1 = any>(t?: T_1 | undefined) => import("..").Ddan.IGetset<T_1>;
+    singletonFactory: <T_2 extends new (...args: any[]) => any>(constructor: T_2) => {
+        new (...args: any[]): {
+            [x: string]: any;
+        };
+        __instance__: InstanceType<T_2>;
+        getInstance(): InstanceType<T_2>;
+        readonly I: InstanceType<T_2>;
+    } & T_2;
     random: (max: number) => number;
     randomRange: (min: number, max: number) => number;
     lerp: (start: number, end: number, t: number) => number;
@@ -102,7 +111,7 @@ declare const dHook: {
     jsonFormat: (jsonString: string) => string;
     toLines: (content: string, separator?: string | RegExp) => string[];
     sleep: (ms?: number) => Promise<unknown>;
-    run: <T_2 = any>(task?: import("..").Ddan.PFunction<T_2> | undefined, wait?: number) => Promise<[any, undefined] | [null, T_2]>;
+    run: <T_3 = any>(task?: import("..").Ddan.PFunction<T_3> | undefined, wait?: number) => Promise<[any, undefined] | [null, T_3]>;
     exec: (func: import("..").Ddan.Function, taskId?: string) => import("..").Ddan.PSafeResult<any>;
     debounce: typeof import("../modules/hook/modules/debounce").default;
     throttle: typeof import("../modules/hook/modules/throttle").default;
@@ -113,10 +122,10 @@ declare const dHook: {
     pipeline: (max?: number) => import("../modules/hook/modules/pipeline").default;
     safeTask: (func: import("..").Ddan.Function, callback?: ((result: import("..").Ddan.SafeResult<any>) => void) | undefined) => import("../modules/hook/modules/safeTask").default;
     pipeAsync: (func: import("..").Ddan.Function) => import("..").Ddan.PSafeResult<any>;
-    runAsync: <T_3 = any>(func: any, opts?: {
+    runAsync: <T_4 = any>(func: any, opts?: {
         pipe?: boolean | undefined;
         mutex?: string | undefined;
-    }) => Promise<T_3 | undefined>;
+    }) => Promise<T_4 | undefined>;
     anySuccess: (promises: Promise<any>[]) => Promise<boolean>;
     bezier1: (p0: import("..").Ddan.IPoint, p1: import("..").Ddan.IPoint, t: number) => import("..").Ddan.IPoint;
     bezier2: (p0: import("..").Ddan.IPoint, p1: import("..").Ddan.IPoint, p2: import("..").Ddan.IPoint, t: number) => import("..").Ddan.IPoint;
@@ -129,14 +138,14 @@ declare const dHook: {
     logParse: (logStr: string) => string;
     logRString: (data: any) => Promise<string>;
     logRParse: (logStr: string) => Promise<string>;
-    to: <T_4 = any, U extends object = any>(promise: Promise<T_4>, errorExt?: object | undefined, fn?: import("..").Ddan.noop | undefined) => Promise<[null, T_4] | [U, undefined]>;
-    go: <T_5 = any>(task?: import("..").Ddan.PFunction<T_5> | undefined, fn?: import("..").Ddan.noop | undefined) => Promise<[any, undefined] | [null, T_5]>;
+    to: <T_5 = any, U extends object = any>(promise: Promise<T_5>, errorExt?: object | undefined, fn?: import("..").Ddan.noop | undefined) => Promise<[null, T_5] | [U, undefined]>;
+    go: <T_6 = any>(task?: import("..").Ddan.PFunction<T_6> | undefined, fn?: import("..").Ddan.noop | undefined) => Promise<[any, undefined] | [null, T_6]>;
     delay: (ms?: number) => Promise<unknown>;
-    safeRun: <T_6 = any>(func: any, fn?: import("..").Ddan.noop | undefined) => Promise<[any, undefined] | [null, T_6]>;
+    safeRun: <T_7 = any>(func: any, fn?: import("..").Ddan.noop | undefined) => Promise<[any, undefined] | [null, T_7]>;
     toError: (value: any) => any;
-    timeout: <T_7 = any>(task?: import("..").Ddan.PFunction<T_7> | undefined, ms?: number, desc?: string) => Promise<[any, undefined] | [null, T_7]>;
-    getValueIf: <T_8 = any, F = any>(condition: boolean | (() => boolean), trueValue: T_8 | (() => T_8), falseValue?: F | (() => F) | undefined) => T_8 | F | undefined;
-    resolveValue: <T_9 = any>(value: T_9 | (() => T_9)) => T_9;
+    timeout: <T_8 = any>(task?: import("..").Ddan.PFunction<T_8> | undefined, ms?: number, desc?: string) => Promise<[any, undefined] | [null, T_8]>;
+    getValueIf: <T_9 = any, F = any>(condition: boolean | (() => boolean), trueValue: T_9 | (() => T_9), falseValue?: F | (() => F) | undefined) => T_9 | F | undefined;
+    resolveValue: <T_10 = any>(value: T_10 | (() => T_10)) => T_10;
     base64: {
         encode: (input: string) => string;
         decode: (base64Str: string) => string;
@@ -192,7 +201,7 @@ declare const dHook: {
     bytes2hex: (bytes: Uint8Array) => string;
     toUint32: (str: string) => Uint32Array;
     fromUint32: (uint32: Uint32Array) => string;
-    flatten: <T_10>(data: T_10[], recursive?: boolean, list?: T_10[]) => T_10[];
+    flatten: <T_11>(data: T_11[], recursive?: boolean, list?: T_11[]) => T_11[];
     flattenPath: (data: Record<string, any>) => Record<string, any>;
     normalizeStructure: (data: any, prevData: any) => void;
     diffPath: (data: Record<string, any>, prevData: Record<string, any>) => Record<string, any>;
@@ -208,12 +217,12 @@ declare const dHook: {
         ignoreEmptyString?: boolean | undefined;
     }) => any;
     clone: (source: any, weakMap?: WeakMap<object, any>) => any;
-    cloneClass: <T_11>(source: T_11) => T_11;
-    isEqual: <T_12 = any>(value: T_12, other: T_12, depth?: number) => boolean;
+    cloneClass: <T_12>(source: T_12) => T_12;
+    isEqual: <T_13 = any>(value: T_13, other: T_13, depth?: number) => boolean;
     isEqualArray: (value: any[], other: any[], depth?: number) => boolean;
     isEqualObject: (value: Record<string, any>, other: Record<string, any>, depth?: number) => boolean;
-    isEqualValue: <T_13>(value: T_13, other: T_13, type: string) => boolean;
+    isEqualValue: <T_14>(value: T_14, other: T_14, type: string) => boolean;
     isEqualAB: (value: ArrayBuffer, other: ArrayBuffer) => boolean;
-    isEqualDeep: <T_14>(value: T_14, other: T_14) => boolean;
+    isEqualDeep: <T_15>(value: T_15, other: T_15) => boolean;
 };
 export default dHook;

package/bin/tiny/mini.d.ts

@@ -63,6 +63,7 @@ declare const dMini: {
         };
         parseHost: (url: string) => import("..").Ddan.IHttpHost;
         join: (...args: string[]) => string;
+        urlJoin: (...parts: string[]) => string;
         shExpMatch: (text: string, pattern: string) => boolean;
         isLocalIPAddress: (addr: string) => boolean;
         parseFileUrl: (url: string) => {

package/bin/tiny/utils.d.ts

@@ -10,6 +10,14 @@ declare const dUtil: {
         readonly I: T;
     };
     getset: <T_1 = any>(t?: T_1 | undefined) => import("..").Ddan.IGetset<T_1>;
+    singletonFactory: <T_2 extends new (...args: any[]) => any>(constructor: T_2) => {
+        new (...args: any[]): {
+            [x: string]: any;
+        };
+        __instance__: InstanceType<T_2>;
+        getInstance(): InstanceType<T_2>;
+        readonly I: InstanceType<T_2>;
+    } & T_2;
     copy: (source: any, options?: {
         fields?: string[] | undefined;
         camel?: boolean | undefined;
@@ -22,7 +30,7 @@ declare const dUtil: {
         number?: boolean | undefined;
         boolean?: boolean | undefined;
     }) => any;
-    cloneClass: <T_2>(source: T_2) => T_2;
+    cloneClass: <T_3>(source: T_3) => T_3;
     combine: (target: any, source: any, options?: import("..").Ddan.IIgnoreParams) => any;
     combines: (objs: any[], options?: import("..").Ddan.IIgnoreParams) => {};
     observe: (obj: any, key: any, watchFun: any, owner: any, deep?: boolean) => void;
@@ -108,7 +116,7 @@ declare const dUtil: {
     bytes2hex: (bytes: Uint8Array) => string;
     toUint32: (str: string) => Uint32Array;
     fromUint32: (uint32: Uint32Array) => string;
-    flatten: <T_3>(data: T_3[], recursive?: boolean, list?: T_3[]) => T_3[];
+    flatten: <T_4>(data: T_4[], recursive?: boolean, list?: T_4[]) => T_4[];
     gbk: {
         gbkLength: (str: string) => number;
         gbkCut: (source: string, len: number) => string;
@@ -135,16 +143,16 @@ declare const dUtil: {
         };
     };
     list: {
-        stepAction: <T_4>(list: T_4[], func: import("..").Ddan.Task<T_4, void>, stepCount?: number) => void;
-        skip: <T_5>(list: T_5[], count: number) => T_5[];
-        take: <T_6>(list: T_6[], count: number, skip?: number) => T_6[];
-        distinct: <T_7>(list: T_7[]) => T_7[];
-        randoms: <T_8>(list: T_8[], count?: number, repeat?: boolean) => T_8[];
+        stepAction: <T_5>(list: T_5[], func: import("..").Ddan.Task<T_5, void>, stepCount?: number) => void;
+        skip: <T_6>(list: T_6[], count: number) => T_6[];
+        take: <T_7>(list: T_7[], count: number, skip?: number) => T_7[];
+        distinct: <T_8>(list: T_8[]) => T_8[];
+        randoms: <T_9>(list: T_9[], count?: number, repeat?: boolean) => T_9[];
         toKV: (list: import("..").Ddan.KV<any>[], key: string, value: string) => import("..").Ddan.KV<any>;
-        groupBy: <T_9>(list: T_9[], key: string) => Record<string, T_9[]>;
-        first: <T_10>(list: T_10[]) => T_10 | undefined;
-        last: <T_11>(list: T_11[]) => T_11 | undefined;
-        toList: <T_12>(val: T_12 | T_12[]) => T_12[];
+        groupBy: <T_10>(list: T_10[], key: string) => Record<string, T_10[]>;
+        first: <T_11>(list: T_11[]) => T_11 | undefined;
+        last: <T_12>(list: T_12[]) => T_12 | undefined;
+        toList: <T_13>(val: T_13 | T_13[]) => T_13[];
     };
     string: {
         toString: (value: any) => any;
@@ -206,7 +214,7 @@ declare const dUtil: {
             number?: boolean | undefined;
             boolean?: boolean | undefined;
         }) => any;
-        cloneClass: <T_2>(source: T_2) => T_2;
+        cloneClass: <T_3>(source: T_3) => T_3;
         combine: (target: any, source: any, options?: import("..").Ddan.IIgnoreParams) => any;
         combines: (objs: any[], options?: import("..").Ddan.IIgnoreParams) => {};
         observe: (obj: any, key: any, watchFun: any, owner: any, deep?: boolean) => void;

package/bin/tiny/web.d.ts

@@ -72,6 +72,7 @@ declare const dWeb: {
         };
         parseHost: (url: string) => import("..").Ddan.IHttpHost;
         join: (...args: string[]) => string;
+        urlJoin: (...parts: string[]) => string;
         shExpMatch: (text: string, pattern: string) => boolean;
         isLocalIPAddress: (addr: string) => boolean;
         parseFileUrl: (url: string) => {

package/bin/util/function.d.ts

@@ -1,4 +1,4 @@
-import { Ddan } from "../typings";
+import { Ddan } from '../typings';
 /**
  * 设置单例模式
  * @returns
@@ -9,9 +9,18 @@ declare function singleton<T>(): {
     readonly Instance: T;
     readonly I: T;
 };
+declare function singletonFactory<T extends new (...args: any[]) => any>(constructor: T): {
+    new (...args: any[]): {
+        [x: string]: any;
+    };
+    __instance__: InstanceType<T>;
+    getInstance(): InstanceType<T>;
+    readonly I: InstanceType<T>;
+} & T;
 declare function getset<T = any>(t?: T): Ddan.IGetset<T>;
 declare const _default: {
     singleton: typeof singleton;
     getset: typeof getset;
+    singletonFactory: typeof singletonFactory;
 };
 export default _default;

package/bin/util/index.d.ts

@@ -9,6 +9,14 @@ declare const _default: {
         readonly I: T;
     };
     getset: <T_1 = any>(t?: T_1 | undefined) => import("..").Ddan.IGetset<T_1>;
+    singletonFactory: <T_2 extends new (...args: any[]) => any>(constructor: T_2) => {
+        new (...args: any[]): {
+            [x: string]: any;
+        };
+        __instance__: InstanceType<T_2>;
+        getInstance(): InstanceType<T_2>;
+        readonly I: InstanceType<T_2>;
+    } & T_2;
     copy: (source: any, options?: {
         fields?: string[] | undefined;
         camel?: boolean | undefined;
@@ -21,7 +29,7 @@ declare const _default: {
         number?: boolean | undefined;
         boolean?: boolean | undefined;
     }) => any;
-    cloneClass: <T_2>(source: T_2) => T_2;
+    cloneClass: <T_3>(source: T_3) => T_3;
     combine: (target: any, source: any, options?: import("..").Ddan.IIgnoreParams) => any;
     combines: (objs: any[], options?: import("..").Ddan.IIgnoreParams) => {};
     observe: (obj: any, key: any, watchFun: any, owner: any, deep?: boolean) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ddan-js",
-  "version": "3.4.0",
+  "version": "3.5.0",
   "description": "",
   "keywords": [
     "ddan-js",