keq 2.8.11 → 2.8.12

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [2.8.12](https://github.com/keq-request/keq/compare/v2.8.11...v2.8.12) (2025-12-16)
+
 ## [2.8.11](https://github.com/keq-request/keq/compare/v2.8.10...v2.8.11) (2025-06-05)
 
 

package/dist/esm/src/core.js

@@ -6,6 +6,7 @@ import { ABORT_PROPERTY, OUTPUT_PROPERTY } from './constant.js';
 import { composeMiddleware } from './util/compose-middleware.js';
 import { shallowClone } from './util/shallow-clone.js';
 import { compileUrl } from './util/compile-url.js';
+import { unwrap } from './util/fork.js';
 /**
  * @description Keq 核心 API，发送请求必要的原子化的API
  */
@@ -109,7 +110,7 @@ export class Core {
         await middleware(ctx, async function emptyNext() { });
         const output = ctx[OUTPUT_PROPERTY];
         if (ctx.options.resolveWithFullResponse || ctx.options.resolveWith === 'response') {
-            return ctx.response;
+            return ctx.response?.clone();
         }
         const response = ctx.response;
         if (!response) {
@@ -119,7 +120,7 @@ export class Core {
             return await response.text();
         }
         else if (ctx.options.resolveWith === 'json') {
-            return await response.json();
+            return unwrap(await response.json());
         }
         else if (ctx.options.resolveWith === 'form-data') {
             return await response.formData();
@@ -140,7 +141,7 @@ export class Core {
         const contentType = response.headers.get('content-type') || '';
         try {
             if (contentType.includes('application/json')) {
-                return await response.json();
+                return unwrap(await response.json());
             }
             else if (contentType.includes('multipart/form-data')) {
                 return await response.formData();

package/dist/esm/src/util/create-response-proxy.d.ts

@@ -1 +1 @@
-export declare function createResponseProxy(res: Response): Response;
+export declare function createResponseProxy(response: Response): Response;

package/dist/esm/src/util/create-response-proxy.js

@@ -1,20 +1,50 @@
-export function createResponseProxy(res) {
-    return new Proxy(res, {
+import { fork } from './fork.js';
+const JsonCachePropertyKey = Symbol('KeqResponseProxyJsonCachePropertyKey');
+const TextCachePropertyKey = Symbol('KeqResponseProxyTextCachePropertyKey');
+export function createResponseProxy(response) {
+    return new Proxy(response, {
         get(res, prop) {
             if (typeof prop === 'string') {
-                if (['json', 'text', 'arrayBuffer', 'blob', 'buffer', 'formData'].includes(prop)) {
+                if (prop === 'json') {
+                    return new Proxy(res[prop], {
+                        apply() {
+                            if (res[JsonCachePropertyKey]) {
+                                return fork(res[JsonCachePropertyKey]);
+                            }
+                            return res.clone().json()
+                                .then((body) => {
+                                res[JsonCachePropertyKey] = body;
+                                return fork(body);
+                            });
+                        },
+                    });
+                }
+                else if (prop === 'text') {
+                    return new Proxy(res[prop], {
+                        apply() {
+                            if (res[TextCachePropertyKey]) {
+                                return fork(res[TextCachePropertyKey]);
+                            }
+                            return res.clone().text()
+                                .then((body) => {
+                                res[TextCachePropertyKey] = body;
+                                return body;
+                            });
+                        },
+                    });
+                }
+                else if (['arrayBuffer', 'blob', 'buffer', 'formData'].includes(prop)) {
                     /**
                      * clone when invoking body, json, text, arrayBuffer, blob, buffer, formData
                      * to avoid time-consuming cloning
                      */
                     return new Proxy(res[prop], {
                         apply(target, thisArg, argArray) {
-                            const mirror = res.clone();
-                            return mirror[prop](...argArray);
+                            return res.clone()[prop](...argArray);
                         },
                     });
                 }
-                if (prop === 'body') {
+                else if (prop === 'body') {
                     const mirror = res.clone();
                     return mirror.body;
                 }

package/dist/esm/src/util/fork.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Fork an json object, using copy-on-write strategy to avoid unnecessary deep cloning.
+ */
+export declare function fork<T>(original: T): T;
+export declare function unwrap<T>(proxy: T): T;

package/dist/esm/src/util/fork.js

@@ -0,0 +1,76 @@
+/* eslint-disable @typescript-eslint/no-unsafe-return */
+import { klona } from 'klona/json';
+const UnWrapPropertyKey = Symbol('UnWrapPropertyKey');
+const ARRAY_MUTATORS = new Set([
+    'push',
+    'pop',
+    'shift',
+    'unshift',
+    'splice',
+    'sort',
+    'reverse',
+    'fill',
+    'copyWithin',
+]);
+function objectPath(obj, path) {
+    return path.reduce((o, k) => o[k], obj);
+}
+/**
+ * Fork an json object, using copy-on-write strategy to avoid unnecessary deep cloning.
+ */
+export function fork(original) {
+    if (original === null || typeof original !== 'object') {
+        // primitive value, return directly
+        return original;
+    }
+    let current = original;
+    const ensureCopy = () => {
+        if (current === original) {
+            current = klona(original);
+        }
+        return current;
+    };
+    const createProxy = (path = []) => {
+        return new Proxy({}, {
+            get(_, prop) {
+                const target = objectPath(current, path);
+                if (prop === UnWrapPropertyKey)
+                    return target;
+                const value = target[prop];
+                // return value directly if already copied
+                if (current !== original) {
+                    return value;
+                }
+                // handle array mutator methods
+                if (Array.isArray(target) && ARRAY_MUTATORS.has(prop)) {
+                    return new Proxy(value, {
+                        apply(fn, thisArg, args) {
+                            ensureCopy();
+                            const t = objectPath(current, path);
+                            return Reflect.apply(t[prop], t, args);
+                        },
+                    });
+                }
+                // 未复制，嵌套对象需要继续代理
+                if (typeof value === 'object' && value !== null) {
+                    return createProxy([...path, prop]);
+                }
+                return value;
+            },
+            set(_, prop, value) {
+                ensureCopy();
+                objectPath(current, path)[prop] = value;
+                return true;
+            },
+            deleteProperty(_, prop) {
+                ensureCopy();
+                delete objectPath(current, path)[prop];
+                return true;
+            },
+        });
+    };
+    return createProxy();
+}
+export function unwrap(proxy) {
+    return proxy && proxy[UnWrapPropertyKey] ? proxy[UnWrapPropertyKey] : proxy;
+}

package/dist/umd/src/core.js

@@ -7,7 +7,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "mitt", "./exception/exception.js", "./util/clone-body.js", "./constant.js", "./util/compose-middleware.js", "./util/shallow-clone.js", "./util/compile-url.js"], factory);
+        define(["require", "exports", "mitt", "./exception/exception.js", "./util/clone-body.js", "./constant.js", "./util/compose-middleware.js", "./util/shallow-clone.js", "./util/compile-url.js", "./util/fork.js"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -21,6 +21,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     const compose_middleware_js_1 = require("./util/compose-middleware.js");
     const shallow_clone_js_1 = require("./util/shallow-clone.js");
     const compile_url_js_1 = require("./util/compile-url.js");
+    const fork_js_1 = require("./util/fork.js");
     /**
      * @description Keq 核心 API，发送请求必要的原子化的API
      */
@@ -124,7 +125,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
             await middleware(ctx, async function emptyNext() { });
             const output = ctx[constant_js_1.OUTPUT_PROPERTY];
             if (ctx.options.resolveWithFullResponse || ctx.options.resolveWith === 'response') {
-                return ctx.response;
+                return ctx.response?.clone();
             }
             const response = ctx.response;
             if (!response) {
@@ -134,7 +135,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                 return await response.text();
             }
             else if (ctx.options.resolveWith === 'json') {
-                return await response.json();
+                return (0, fork_js_1.unwrap)(await response.json());
             }
             else if (ctx.options.resolveWith === 'form-data') {
                 return await response.formData();
@@ -155,7 +156,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
             const contentType = response.headers.get('content-type') || '';
             try {
                 if (contentType.includes('application/json')) {
-                    return await response.json();
+                    return (0, fork_js_1.unwrap)(await response.json());
                 }
                 else if (contentType.includes('multipart/form-data')) {
                     return await response.formData();

package/dist/umd/src/util/create-response-proxy.d.ts

@@ -1 +1 @@
-export declare function createResponseProxy(res: Response): Response;
+export declare function createResponseProxy(response: Response): Response;

package/dist/umd/src/util/create-response-proxy.js

@@ -4,29 +4,59 @@
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports"], factory);
+        define(["require", "exports", "./fork.js"], factory);
     }
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.createResponseProxy = void 0;
-    function createResponseProxy(res) {
-        return new Proxy(res, {
+    const fork_js_1 = require("./fork.js");
+    const JsonCachePropertyKey = Symbol('KeqResponseProxyJsonCachePropertyKey');
+    const TextCachePropertyKey = Symbol('KeqResponseProxyTextCachePropertyKey');
+    function createResponseProxy(response) {
+        return new Proxy(response, {
             get(res, prop) {
                 if (typeof prop === 'string') {
-                    if (['json', 'text', 'arrayBuffer', 'blob', 'buffer', 'formData'].includes(prop)) {
+                    if (prop === 'json') {
+                        return new Proxy(res[prop], {
+                            apply() {
+                                if (res[JsonCachePropertyKey]) {
+                                    return (0, fork_js_1.fork)(res[JsonCachePropertyKey]);
+                                }
+                                return res.clone().json()
+                                    .then((body) => {
+                                    res[JsonCachePropertyKey] = body;
+                                    return (0, fork_js_1.fork)(body);
+                                });
+                            },
+                        });
+                    }
+                    else if (prop === 'text') {
+                        return new Proxy(res[prop], {
+                            apply() {
+                                if (res[TextCachePropertyKey]) {
+                                    return (0, fork_js_1.fork)(res[TextCachePropertyKey]);
+                                }
+                                return res.clone().text()
+                                    .then((body) => {
+                                    res[TextCachePropertyKey] = body;
+                                    return body;
+                                });
+                            },
+                        });
+                    }
+                    else if (['arrayBuffer', 'blob', 'buffer', 'formData'].includes(prop)) {
                         /**
                          * clone when invoking body, json, text, arrayBuffer, blob, buffer, formData
                          * to avoid time-consuming cloning
                          */
                         return new Proxy(res[prop], {
                             apply(target, thisArg, argArray) {
-                                const mirror = res.clone();
-                                return mirror[prop](...argArray);
+                                return res.clone()[prop](...argArray);
                             },
                         });
                     }
-                    if (prop === 'body') {
+                    else if (prop === 'body') {
                         const mirror = res.clone();
                         return mirror.body;
                     }

package/dist/umd/src/util/fork.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Fork an json object, using copy-on-write strategy to avoid unnecessary deep cloning.
+ */
+export declare function fork<T>(original: T): T;
+export declare function unwrap<T>(proxy: T): T;

package/dist/umd/src/util/fork.js

@@ -0,0 +1,91 @@
+(function (factory) {
+    if (typeof module === "object" && typeof module.exports === "object") {
+        var v = factory(require, exports);
+        if (v !== undefined) module.exports = v;
+    }
+    else if (typeof define === "function" && define.amd) {
+        define(["require", "exports", "klona/json"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.unwrap = exports.fork = void 0;
+    /* eslint-disable @typescript-eslint/no-unsafe-return */
+    const json_1 = require("klona/json");
+    const UnWrapPropertyKey = Symbol('UnWrapPropertyKey');
+    const ARRAY_MUTATORS = new Set([
+        'push',
+        'pop',
+        'shift',
+        'unshift',
+        'splice',
+        'sort',
+        'reverse',
+        'fill',
+        'copyWithin',
+    ]);
+    function objectPath(obj, path) {
+        return path.reduce((o, k) => o[k], obj);
+    }
+    /**
+     * Fork an json object, using copy-on-write strategy to avoid unnecessary deep cloning.
+     */
+    function fork(original) {
+        if (original === null || typeof original !== 'object') {
+            // primitive value, return directly
+            return original;
+        }
+        let current = original;
+        const ensureCopy = () => {
+            if (current === original) {
+                current = (0, json_1.klona)(original);
+            }
+            return current;
+        };
+        const createProxy = (path = []) => {
+            return new Proxy({}, {
+                get(_, prop) {
+                    const target = objectPath(current, path);
+                    if (prop === UnWrapPropertyKey)
+                        return target;
+                    const value = target[prop];
+                    // return value directly if already copied
+                    if (current !== original) {
+                        return value;
+                    }
+                    // handle array mutator methods
+                    if (Array.isArray(target) && ARRAY_MUTATORS.has(prop)) {
+                        return new Proxy(value, {
+                            apply(fn, thisArg, args) {
+                                ensureCopy();
+                                const t = objectPath(current, path);
+                                return Reflect.apply(t[prop], t, args);
+                            },
+                        });
+                    }
+                    // 未复制，嵌套对象需要继续代理
+                    if (typeof value === 'object' && value !== null) {
+                        return createProxy([...path, prop]);
+                    }
+                    return value;
+                },
+                set(_, prop, value) {
+                    ensureCopy();
+                    objectPath(current, path)[prop] = value;
+                    return true;
+                },
+                deleteProperty(_, prop) {
+                    ensureCopy();
+                    delete objectPath(current, path)[prop];
+                    return true;
+                },
+            });
+        };
+        return createProxy();
+    }
+    exports.fork = fork;
+    function unwrap(proxy) {
+        return proxy && proxy[UnWrapPropertyKey] ? proxy[UnWrapPropertyKey] : proxy;
+    }
+    exports.unwrap = unwrap;
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "keq",
-  "version": "2.8.11",
+  "version": "2.8.12",
   "description": "Request API write by Typescript for flexibility, readability, and a low learning curve.",
   "keywords": [
     "request",
@@ -31,18 +31,9 @@
     "type": "git",
     "url": "git+https://github.com/keq-request/keq.git"
   },
-  "scripts": {
-    "build": "npm run clean && ./build/build.sh",
-    "clean": "rm -rf ./dist/*",
-    "dev": "npm run clean && ./build/watch.sh",
-    "prepare": "ts-patch install -s && is-ci || husky",
-    "prepublishOnly": "npm run build",
-    "release": "standard-version",
-    "release:alpha": "standard-version --prerelease alpha",
-    "test": "jest"
-  },
   "dependencies": {
     "fastq": "^1.17.1",
+    "klona": "^2.0.6",
     "minimatch": "^9.0.4",
     "mitt": "^3.0.1",
     "ts-custom-error": "^3.3.1"
@@ -68,8 +59,15 @@
     "typescript": "5.4.5",
     "typescript-transform-paths": "^3.5.1"
   },
-  "packageManager": "pnpm@9.15.1",
   "engines": {
     "node": ">=18.0.0"
+  },
+  "scripts": {
+    "build": "npm run clean && ./build/build.sh",
+    "clean": "rm -rf ./dist/*",
+    "dev": "npm run clean && ./build/watch.sh",
+    "release": "standard-version",
+    "release:alpha": "standard-version --prerelease alpha",
+    "test": "jest"
   }
-}
+}