@zwa73/utils 1.0.247 → 1.0.249

package/dist/UtilClass/index.d.ts

@@ -1,3 +1,3 @@
 export * from './Hbs';
-export type { PromoseQueueOption, EventData, DListMiddleNode, DListHeadNode, DListTailNode, DListNode, DListMaybeNode, BridgeInterface } from "@zwa73/js-utils";
-export { Stream, Spool, SmartCache, PromiseQueue, Piper, EventSystem, DLinkedList, Bridge } from "@zwa73/js-utils";
+export type { PromoseQueueOption, EventData, DListMiddleNode, DListHeadNode, DListTailNode, DListNode, DListMaybeNode, BridgeInterface, BridgeOpt } from "@zwa73/js-utils";
+export { Stream, Spool, SmartCache, SequenceQueue, PromiseQueue, Piper, EventSystem, DLinkedList, Bridge } from "@zwa73/js-utils";

package/dist/UtilClass/index.js

@@ -14,12 +14,13 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Bridge = exports.DLinkedList = exports.EventSystem = exports.Piper = exports.PromiseQueue = exports.SmartCache = exports.Spool = exports.Stream = void 0;
+exports.Bridge = exports.DLinkedList = exports.EventSystem = exports.Piper = exports.PromiseQueue = exports.SequenceQueue = exports.SmartCache = exports.Spool = exports.Stream = void 0;
 __exportStar(require("./Hbs"), exports);
 var js_utils_1 = require("@zwa73/js-utils");
 Object.defineProperty(exports, "Stream", { enumerable: true, get: function () { return js_utils_1.Stream; } });
 Object.defineProperty(exports, "Spool", { enumerable: true, get: function () { return js_utils_1.Spool; } });
 Object.defineProperty(exports, "SmartCache", { enumerable: true, get: function () { return js_utils_1.SmartCache; } });
+Object.defineProperty(exports, "SequenceQueue", { enumerable: true, get: function () { return js_utils_1.SequenceQueue; } });
 Object.defineProperty(exports, "PromiseQueue", { enumerable: true, get: function () { return js_utils_1.PromiseQueue; } });
 Object.defineProperty(exports, "Piper", { enumerable: true, get: function () { return js_utils_1.Piper; } });
 Object.defineProperty(exports, "EventSystem", { enumerable: true, get: function () { return js_utils_1.EventSystem; } });

package/dist/UtilFunctions.d.ts

@@ -45,5 +45,5 @@ declare class _UtilFunc {
     /**获取当前公网ipv4 */
     static getPublicIpv4(): Promise<string>;
 }
-export declare const UtilFunc: import("@zwa73/modular-mixer").ComposedClass<typeof _UtilFunc, typeof JsFunc, "__jsUtils", "match" | "failed" | "success" | "prototype" | "genUUID" | "range" | "getTime" | "initField" | "initObject" | "afterward" | "sleep" | "getNeverResolvedPromise" | "retryPromise" | "timelimitPromise" | "mapEntries" | "eachField" | "stringifyJToken" | "assertType" | "assertLiteral" | "deepClone" | "isSafeNumber" | "dedent" | "throwError" | "getFuncLoc" | "cachePool" | "memoize" | "asyncize" | "lazyFunction" | "splitToChunk" | "mergeFromChunk" | "structEqual" | "concurrent" | "dynamicImport" | "createInjectable" | "outcome" | "isStatus" | "eitherize" | "parseSrtTime" | "formatSrtTime" | "parseSrt" | "createSrt" | "ivk" | "s2l" | "l2s">;
+export declare const UtilFunc: import("@zwa73/modular-mixer").ComposedClass<typeof _UtilFunc, typeof JsFunc, "__jsUtils", "match" | "failed" | "success" | "prototype" | "genUUID" | "range" | "getTime" | "initField" | "initObject" | "afterward" | "sleep" | "getNeverResolvedPromise" | "retryPromise" | "timelimitPromise" | "mapEntries" | "eachField" | "stringifyJToken" | "assertType" | "assertLiteral" | "deepClone" | "isSafeNumber" | "dedent" | "throwError" | "getFuncLoc" | "cachePool" | "memoize" | "asyncize" | "lazyFunction" | "splitToChunk" | "mergeFromChunk" | "structEqual" | "concurrent" | "dynamicImport" | "createInjectable" | "checkSharpSchema" | "outcome" | "isStatus" | "eitherize" | "parseSrtTime" | "formatSrtTime" | "parseSrt" | "createSrt" | "ivk" | "s2l" | "l2s">;
 export type UtilFunc = typeof UtilFunc;

package/dist/UtilHttp.d.ts

@@ -237,15 +237,6 @@ export declare class UtilHttp<D extends Partial<RequestOption> & Required<Pick<R
         /**附加的查询表单数据 */
         query: QueryRequestData;
     }) => MPromise<SendProcData>, A>;
-    /**发送form-data包提供的表单数据  */
-    sendFormData(): UtilHttp<D & {
-        headers: {
-            "Content-Type": "multipart/form-data";
-        };
-    }, (opt: RequestOption, arg: {
-        /**form-data包提供的FormData表单数据 */
-        formdata: FormData;
-    }) => MPromise<SendProcData>, A>;
     /**发送表单 */
     sendForm(): UtilHttp<D & {
         headers: {
@@ -255,6 +246,15 @@ export declare class UtilHttp<D extends Partial<RequestOption> & Required<Pick<R
         /**表单 */
         form: QueryRequestData;
     }) => MPromise<SendProcData>, A>;
+    /**发送form-data包提供的表单数据  */
+    sendFormData(): UtilHttp<D & {
+        headers: {
+            "Content-Type": "multipart/form-data";
+        };
+    }, (opt: RequestOption, arg: {
+        /**form-data包提供的FormData表单数据 */
+        formdata: FormData;
+    }) => MPromise<SendProcData>, A>;
     /**发送文件 */
     sendFile(): UtilHttp<D & {
         headers: {
@@ -268,7 +268,7 @@ export declare class UtilHttp<D extends Partial<RequestOption> & Required<Pick<R
     }) => MPromise<SendProcData>, A>;
     sendNone(): UtilHttp<D, typeof SendNoneProc, A>;
     /**自定的发送数据类型 */
-    sendRaw<T extends any[]>(proc: SendProcCtor<T>): UtilHttp<D, typeof proc, A>;
+    sendRaw<T extends {}>(proc: SendProcCtor<T>): UtilHttp<D, typeof proc, A>;
     /**发送请求
      * @param datas  - 数据对象
      */

package/dist/UtilHttp.js

@@ -268,26 +268,6 @@ class UtilHttp {
         this._send = sendProc;
         return this;
     }
-    /**发送form-data包提供的表单数据  */
-    sendFormData() {
-        const sendProc = (opt, arg) => {
-            const { method } = opt;
-            const isPost = (method == "POST");
-            opt.headers = arg.formdata.getHeaders();
-            return {
-                proc: (req) => {
-                    if (isPost)
-                        arg.formdata.pipe(req);
-                    else
-                        req.end();
-                }
-            };
-        };
-        this._send = sendProc;
-        this._data.headers ??= {};
-        this._data.headers['Content-Type'] = 'multipart/form-data';
-        return this;
-    }
     /**发送表单 */
     sendForm() {
         const snedProc = (opt, arg) => {
@@ -312,6 +292,29 @@ class UtilHttp {
         this._data.headers['Content-Type'] = 'application/x-www-form-urlencoded';
         return this;
     }
+    /**发送form-data包提供的表单数据  */
+    sendFormData() {
+        const sendProc = (opt, arg) => {
+            const { method } = opt;
+            const isPost = (method == "POST");
+            opt.headers = {
+                ...arg.formdata.getHeaders(),
+                ...opt.headers,
+            };
+            return {
+                proc: (req) => {
+                    if (isPost)
+                        arg.formdata.pipe(req);
+                    else
+                        req.end();
+                }
+            };
+        };
+        this._send = sendProc;
+        this._data.headers ??= {};
+        this._data.headers['Content-Type'] = 'multipart/form-data';
+        return this;
+    }
     /**发送文件 */
     sendFile() {
         const proc = (opt, arg) => {
@@ -321,7 +324,10 @@ class UtilHttp {
             const formData = new form_data_1.default();
             filename = filename ?? pathe_1.default.basename(filepath);
             formData.append(filename, fs_1.default.createReadStream(filepath));
-            opt.headers = formData.getHeaders();
+            opt.headers = {
+                ...formData.getHeaders(),
+                ...opt.headers
+            };
             return {
                 proc: req => {
                     if (isPost)

package/dist/UtilInterfaces.d.ts

@@ -1 +1 @@
-export type { JToken, JValue, JArray, JObject, IJData, AnyFunc, Keyable, DeepReadonly, PartialOption, ProperSubset, ProperSubsetCheck, IncludeCheck, UnionCheck, Literal, LiteralCheck, AllExtends, AssignObject, Writeable, Inverted, FixedLengthTuple, Increment, RangeTuple, AnyString, UnionToIntersection, ExclusiveRecord, ExclusiveJObject, PromiseStatus, StatusVerifyFn, Await, FuncPropNames, ExtendThen, RequiredOnly, WithPrefix, Outcome, Either, Matchable, MatchableFlag, ExtractOutcome, ExtractMatchable, NeedInit, PRecord, MPromise, SPromise, SMPromise, NotPromise, AnyRecord, MReturnType, CmtTuple, Flasy, SrtSegment, ILogger, LogLevel, Asyncize } from "@zwa73/js-utils";
+export type { JToken, JValue, JArray, JObject, IJData, AnyFunc, Keyable, DeepReadonly, PartialOption, ProperSubset, ProperSubsetCheck, IncludeCheck, UnionCheck, Literal, LiteralCheck, AllExtends, AssignObject, Writeable, Inverted, FixedLengthTuple, Increment, RangeTuple, AnyString, UnionToIntersection, ExclusiveRecord, ExclusiveJObject, PromiseStatus, StatusVerifyFn, Await, FuncPropNames, ExtendThen, RequiredOnly, WithPrefix, Outcome, Either, Matchable, MatchableFlag, ExtractOutcome, ExtractMatchable, NeedInit, PRecord, MPromise, SPromise, SMPromise, NotPromise, AnyRecord, MReturnType, CmtTuple, Flasy, SrtSegment, ILogger, LogLevel, Asyncize, SharpSchema, ExpandSharpSchema } from "@zwa73/js-utils";

package/package.json

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