mphttpx 1.0.2 → 1.0.4

package/dist/types/XMLHttpRequestEventTargetP.d.ts

@@ -1,5 +1,6 @@
-import { state } from "./isPolyfill";
 import { EventTargetP } from "./EventTargetP";
+declare const state: unique symbol;
+export { state as xhrEventTargetState };
 export declare class XMLHttpRequestEventTargetP extends EventTargetP implements XMLHttpRequestEventTarget {
     constructor();
     [state]: XMLHttpRequestEventTargetState;
@@ -23,25 +24,27 @@ export declare class XMLHttpRequestEventTargetP extends EventTargetP implements
         hierarchy: string[];
     };
 }
+declare const _handlers: unique symbol;
 export declare class XMLHttpRequestEventTargetState {
     /**
      * @param _target XMLHttpRequestEventTargetP
      */
     constructor(_target: unknown);
     target: XMLHttpRequest;
-    attach(type: keyof XMLHttpRequestEventTargetEventMap): void;
+    [_handlers]: {
+        onabort: (ev: ProgressEvent) => void;
+        onerror: (ev: ProgressEvent) => void;
+        onload: (ev: ProgressEvent) => void;
+        onloadend: (ev: ProgressEvent) => void;
+        onloadstart: (ev: ProgressEvent) => void;
+        onprogress: (ev: ProgressEvent) => void;
+        ontimeout: (ev: ProgressEvent) => void;
+    };
     onabort: ((this: XMLHttpRequest, ev: ProgressEvent) => any) | null;
-    _onabort: (ev: ProgressEvent) => void;
     onerror: ((this: XMLHttpRequest, ev: ProgressEvent) => any) | null;
-    _onerror: (ev: ProgressEvent) => void;
     onload: ((this: XMLHttpRequest, ev: ProgressEvent) => any) | null;
-    _onload: (ev: ProgressEvent) => void;
     onloadend: ((this: XMLHttpRequest, ev: ProgressEvent) => any) | null;
-    _onloadend: (ev: ProgressEvent) => void;
     onloadstart: ((this: XMLHttpRequest, ev: ProgressEvent) => any) | null;
-    _onloadstart: (ev: ProgressEvent) => void;
     onprogress: ((this: XMLHttpRequest, ev: ProgressEvent) => any) | null;
-    _onprogress: (ev: ProgressEvent) => void;
     ontimeout: ((this: XMLHttpRequest, ev: ProgressEvent) => any) | null;
-    _ontimeout: (ev: ProgressEvent) => void;
 }

package/dist/types/XMLHttpRequestP.d.ts

@@ -1,6 +1,6 @@
 import { XMLHttpRequestEventTargetP } from "./XMLHttpRequestEventTargetP";
 import { XMLHttpRequestUploadP } from "./XMLHttpRequestUploadP";
-import type { IRequestTask, IRequestSuccessCallbackBaseResult, IRequestFailCallbackResult, IAliRequestFailCallbackResult } from "./request";
+import type { IRequestTask, IRequestSuccessCallbackBaseResult } from "./request";
 declare const state: unique symbol;
 export { state as xhrState };
 export declare class XMLHttpRequestP extends XMLHttpRequestEventTargetP implements XMLHttpRequest {
@@ -27,7 +27,7 @@ export declare class XMLHttpRequestP extends XMLHttpRequestEventTargetP implemen
     get statusText(): string;
     get timeout(): number;
     set timeout(value: number);
-    get upload(): XMLHttpRequestUploadP;
+    get upload(): XMLHttpRequestUpload;
     get withCredentials(): boolean;
     set withCredentials(value: boolean);
     abort(): void;
@@ -45,6 +45,16 @@ export declare class XMLHttpRequestP extends XMLHttpRequestEventTargetP implemen
         hierarchy: string[];
     };
 }
+declare const _handlers: unique symbol;
+declare const _inAfterOpenBeforeSend: unique symbol;
+declare const _resetPending: unique symbol;
+declare const _timeoutId: unique symbol;
+declare const _requestURL: unique symbol;
+declare const _method: unique symbol;
+declare const _requestHeaders: unique symbol;
+export declare const _responseHeaders: unique symbol;
+declare const _responseContentLength: unique symbol;
+declare const _requestTask: unique symbol;
 declare class XMLHttpRequestState {
     constructor(target: XMLHttpRequestP);
     target: XMLHttpRequestP;
@@ -57,30 +67,22 @@ declare class XMLHttpRequestState {
     timeout: number;
     upload: XMLHttpRequestUploadP;
     withCredentials: boolean;
-    _reqCanSend: boolean;
-    _resetPending: boolean;
-    _timeoutId: number;
-    _reqURL: string;
-    _method: string;
-    _reqHeaders: Record<string, string>;
-    _resHeaders: Record<string, string> | null;
-    _resContLen: number;
-    _requestTask: IRequestTask | null;
-    execRequest(body?: Document | XMLHttpRequestBodyInit | null): void;
-    requestSuccess({ statusCode, header, data }: IRequestSuccessCallbackBaseResult): void;
-    requestFail(err: IRequestFailCallbackResult | IAliRequestFailCallbackResult): void;
-    requestComplete(): void;
-    clearRequest(delay?: boolean): void;
-    checkRequestTimeout(): void;
-    resetXHR(): void;
-    resetRequestTimeout(): void;
-    emitProcessEvent(type: string, loaded?: number, total?: number, target?: XMLHttpRequestEventTargetP): void;
-    setReadyStateAndNotify(value: number): void;
+    [_handlers]: {
+        onreadystatechange: (ev: Event) => void;
+    };
     onreadystatechange: ((this: XMLHttpRequest, ev: Event) => any) | null;
-    _onreadystatechange: (ev: Event) => void;
+    [_inAfterOpenBeforeSend]: boolean;
+    [_resetPending]: boolean;
+    [_timeoutId]: number;
+    [_requestURL]: string;
+    [_method]: string;
+    [_requestHeaders]: Record<string, string>;
+    [_responseHeaders]: Record<string, string> | null;
+    [_responseContentLength]: number | (() => number);
+    [_requestTask]: IRequestTask | null;
 }
 export declare function normalizeMethod(method: string): string;
-export declare function convert(body?: Parameters<XMLHttpRequest["send"]>[0], setContentType?: (str: string) => void, setContentLength?: (num: number) => void): string | ArrayBuffer;
+export declare function convert(body?: Parameters<XMLHttpRequest["send"]>[0], setContentType?: (str: string) => void, setContentLength?: (num: number | (() => number)) => void): string | ArrayBuffer;
 export declare function convertBack(type: XMLHttpRequestResponseType, data?: IRequestSuccessCallbackBaseResult["data"]): string | object | ArrayBuffer | Blob;
 declare const XMLHttpRequestE: {
     new (): XMLHttpRequest;

package/dist/types/isPolyfill.d.ts

@@ -1,5 +1,4 @@
 export declare const polyfill: unique symbol;
-export declare const state: unique symbol;
 export declare const g: typeof globalThis;
 export declare function isObjectType<T>(name: string, value: unknown): value is T;
 export declare function isPolyfillType<T>(name: string, value: unknown): value is T;
@@ -7,3 +6,5 @@ export declare class MPException extends Error {
     constructor(message?: string, name?: string);
 }
 export declare function defineStringTag(targetFunc: Function, stringTag: string): void;
+export declare function objectValues<T extends object>(obj: T): Array<T[keyof T]>;
+export declare function objectEntries<T extends object>(obj: T): Array<[keyof T & string, T[keyof T]]>;

package/dist/types/request.d.ts

@@ -30,8 +30,9 @@ export interface IRequestOptions {
      * 合法值：
      * - json(默认值): 返回的数据为 JSON，返回后会对返回的数据进行一次 JSON.parse
      * - 其他: 不对返回的内容进行 JSON.parse
+     * - 支付宝（额外类型）："json_or_text" | "base64" | "arraybuffer"
      */
-    dataType?: "json" | "text";
+    dataType?: "json" | "text" | "json_or_text" | "base64" | "arraybuffer";
     /**
      * 响应的数据类型
      * 合法值：

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mphttpx",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "type": "module",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",