keq 1.7.1 → 1.8.0

package/CHANGELOG.md

@@ -2,6 +2,28 @@
 
 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.
 
+## [1.8.0](https://www.github.com/keq-request/keq/compare/v1.7.3...v1.8.0) (2022-03-22)
+
+
+### Features
+
+* support custom request instance ([2c05dec](https://www.github.com/keq-request/keq/commit/2c05dec6d779861112507b7365822ecff175dbc3))
+
+### [1.7.3](https://www.github.com/keq-request/keq/compare/v1.7.2...v1.7.3) (2022-03-08)
+
+
+### Bug Fixes
+
+* unable to send formdate request with file ([a4ed415](https://www.github.com/keq-request/keq/commit/a4ed41560aacb67a49d8159b453ddf69bce56799))
+
+### [1.7.2](https://www.github.com/keq-request/keq/compare/v1.7.1...v1.7.2) (2022-02-25)
+
+
+### Bug Fixes
+
+* calling response.json() in middleware will cause garbled chinese characters ([40ffe02](https://www.github.com/keq-request/keq/commit/40ffe0238628c106a06eafe349e6d33b856fbf8f))
+* throw error when not set url origin ([9040396](https://www.github.com/keq-request/keq/commit/9040396ba23edc1642abf27a203b39efe53fb130))
+
 ### [1.7.1](https://www.github.com/keq-request/keq/compare/v1.7.0...v1.7.1) (2022-02-24)
 
 

package/README.md

@@ -440,6 +440,24 @@ This is the utils used to mount middleware.
  `mount.pathname(matcher: string \| Regexp)`  | Mount to the pathname that match the `matcher`. `string` can be [`glob`](https://www.npmjs.com/package/picomatch).
  `mount.host(host: string)`                   | Mount to the Host.
 
+### Create Request
+
+ If you want to create a request instance, you can invoke `request.create()`:
+
+
+```typescript
+import { request } from 'keq'
+
+const customRequest = request.create()
+
+// Middleware only takes effect on customRequests
+customRequest.use(/** some middleware */)
+
+const body = await customRequest
+  .get('http://example.com')
+```
+
+ > The gloabl request instance is created by `request.create()` too.
 
 <!-- usage -->
 

package/doc/zh-cn/readme.md

@@ -425,6 +425,26 @@ keq.end()
 
 更重要的是，在`NodeJS`里面，`node-fetch`库没有实现`Response`的`.formData()`方法，在`NodeJS`环境中，`Keq`在克隆`ctx.res`后会自动添加`.formData()`实现。
 
+### 创建可自定义的请求实例
+
+如果你打算自己创建一个请求实例，而不使用全局的`request`实例，可以调用`request.create()`方法：
+
+```typescript
+import { request } from 'keq'
+
+const customRequest = request.create()
+
+// Middleware only takes effect on customRequests
+customRequest.use(/** some middleware */)
+
+const body = await customRequest
+  .get('http://example.com')
+```
+
+ > 全局的`request`实例也是调用`request.create()`方法创建的。
+ > 因此，自定义的`request`实例也具备全局`request`的所有特性。
+
+
 
 ## 更多信息
 

package/es/package.json

@@ -2,7 +2,7 @@
   "name": "keq",
   "main": "lib/index.js",
   "module": "es/index.js",
-  "version": "1.7.1",
+  "version": "1.8.0",
   "license": "MIT",
   "types": "lib/index.d.ts",
   "scripts": {
@@ -64,6 +64,7 @@
     "formidable": "^2.0.1",
     "mime-types": "^2.1.27",
     "nanoid": "^3.1.10",
+    "object.fromentries": "^2.0.5",
     "path-to-regexp": "^6.2.0",
     "picomatch": "^2.2.2",
     "querystring": "^0.2.0",

package/es/src/keq-url.d.ts

@@ -1,5 +1,6 @@
 import { URL } from 'whatwg-url';
 export declare class KeqURL extends URL {
+    constructor(url: string, base?: string | URL);
     params: {};
     get query(): Record<string, any>;
     set query(value: Record<string, any>);

package/es/src/keq-url.js

@@ -2,9 +2,10 @@ import { URL } from 'whatwg-url';
 import { compile } from 'path-to-regexp';
 import { Exception } from "./exception";
 import * as R from 'ramda';
+import { isBrowser } from "./util";
 export class KeqURL extends URL {
-    constructor() {
-        super(...arguments);
+    constructor(url, base = isBrowser() ? window.location.origin : 'http://localhost') {
+        super(url, base);
         this.params = {};
     }
     get query() {
@@ -60,14 +61,13 @@ export class KeqURL extends URL {
         }
     }
     toPath() {
-        var _a;
         const uri = new URL(this.href);
         try {
             const toPath = compile(uri.pathname, { encode: encodeURIComponent });
             uri.pathname = toPath(this.params);
         }
         catch (e) {
-            throw new Exception(`Cannot compile the params in ${uri.pathname}, Because ${(_a = e) === null || _a === void 0 ? void 0 : _a.message}.`);
+            throw new Exception(`Cannot compile the params in ${uri.pathname}, Because ${e === null || e === void 0 ? void 0 : e.message}.`);
         }
         return uri.href;
     }

package/es/src/keq.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import fetch, { Headers } from 'cross-fetch';
-import * as clone from 'clone';
+import { clone } from "./util/clone";
 import { Exception, FileExpectedException, OverwriteArrayBodyException, UnknowContentTypeException, } from "./exception";
 import { isFormData, isFile, isBrowser, encodeBase64, sleep, inferContentTypeByBody, fixContentType, getBoundaryByContentType, parseFormData, serializeBody, } from "./util";
 import { matchHost, matchMiddleware, compose } from "./middleware";
@@ -255,7 +255,7 @@ export class Keq {
                     return () => __awaiter(this, void 0, void 0, function* () {
                         if (!cache)
                             cache = yield target.arrayBuffer();
-                        const res = new Response(cache, { headers: target.headers });
+                        const res = new Response(new TextDecoder().decode(cache), { headers: target.headers });
                         res.formData = resFromData.bind(res);
                         return yield res[property]();
                     });

package/es/src/mount.d.ts

@@ -1,4 +1,8 @@
 import { Mounter } from "./types";
+/**
+ * NOTE: Not work in NodeJS
+ *       Unable to get the host and port of the service
+ */
 export declare function location(): Mounter;
 /**
  * @param matcher glob or regexp

package/es/src/mount.js

@@ -1,5 +1,6 @@
 import { Exception } from "./exception";
 import * as picomatch from 'picomatch';
+import { isBrowser } from "./util";
 function createMounter(matcher) {
     const mounter = ctx => matcher(ctx);
     mounter.pathname = arg => compose(mounter, pathname(arg));
@@ -8,8 +9,20 @@ function createMounter(matcher) {
     mounter.module = arg => compose(mounter, module(arg));
     return mounter;
 }
+/**
+ * NOTE: Not work in NodeJS
+ *       Unable to get the host and port of the service
+ */
 export function location() {
-    return createMounter((ctx) => !ctx.request.url.host);
+    return createMounter((ctx) => {
+        if (!ctx.request.url.host)
+            return true;
+        if (isBrowser()) {
+            if (ctx.request.url.host === window.location.host)
+                return true;
+        }
+        return false;
+    });
 }
 /**
  * @param matcher glob or regexp

package/es/src/request.d.ts

@@ -1,2 +1 @@
-import { RequestCreator } from "./types";
-export declare const request: RequestCreator;
+export declare const request: import("./types").RequestCreator;

package/es/src/request.js

@@ -1,44 +1,2 @@
-import { Keq } from "./keq";
-import * as clone from 'clone';
-import { matchMiddleware, matchHost } from "./middleware";
-import { KeqURL } from "./keq-url";
-const defaultOptions = {};
-const middlewares = [];
-export const request = function (params, options = defaultOptions) {
-    const request = new Keq(new KeqURL(params.url), 'get', middlewares);
-    return request.options(options);
-};
-request.get = function (href) {
-    const request = new Keq(new KeqURL(href), 'get', clone(middlewares));
-    return request;
-};
-request.put = function (href) {
-    const request = new Keq(new KeqURL(href), 'put', middlewares);
-    return request;
-};
-request.delete = function (href) {
-    const request = new Keq(new KeqURL(href), 'delete', middlewares);
-    return request;
-};
-request.del = request.delete;
-request.post = function (href) {
-    const request = new Keq(new KeqURL(href), 'post', middlewares);
-    return request;
-};
-request.head = function (href) {
-    const request = new Keq(new KeqURL(href), 'head', middlewares);
-    return request;
-};
-request.patch = function (href) {
-    const request = new Keq(new KeqURL(href), 'patch', middlewares);
-    return request;
-};
-request.use = function use(m, middleware) {
-    if (!middleware)
-        middlewares.push(m);
-    else if (typeof m === 'string')
-        middlewares.push(matchMiddleware(matchHost(m), middleware));
-    else
-        middlewares.push(matchMiddleware(m, middleware));
-    return request;
-};
+import { createRequest } from "./util/create-request";
+export const request = createRequest();

package/es/src/types/context.d.ts

@@ -14,7 +14,7 @@ export interface Context {
     res?: Response;
     /** the result get by user */
     output: any;
-    options: Required<Options>;
+    options: Required<Pick<Options, 'fetchAPI'>> & Options;
     /** delegate res */
     response?: Response;
     /** delegate request */

package/es/src/types/request-creator.d.ts

@@ -17,6 +17,7 @@ export interface RequestCreator {
     put: CreateReqeustPromiseF;
     patch: CreateReqeustPromiseF;
     head: CreateReqeustPromiseF;
+    create(): RequestCreator;
     use(middleware: Middleware): RequestCreator;
     use(matcher: string, middleware: Middleware): RequestCreator;
     use(matcher: MiddlewareMatcher, middleware: Middleware): RequestCreator;

package/es/src/util/clone.d.ts

@@ -0,0 +1 @@
+export declare function clone<T>(obj: T): T;

package/es/src/util/clone.js

@@ -0,0 +1,14 @@
+import * as deepClone from 'clone';
+import { isBlob } from "./is";
+import * as fromEntries from 'object.fromentries';
+export function clone(obj) {
+    if (typeof obj === 'object' && !Array.isArray(obj)) {
+        const entries = Object.entries(obj)
+            .map(([key, value]) => ([
+            key,
+            isBlob(value) ? value : deepClone(value),
+        ]));
+        return fromEntries(entries);
+    }
+    return deepClone(obj);
+}

package/es/src/util/create-request.d.ts

@@ -0,0 +1,2 @@
+import { RequestCreator } from "../types";
+export declare function createRequest(): RequestCreator;

package/es/src/util/create-request.js

@@ -0,0 +1,48 @@
+import { Keq } from "../keq";
+import * as clone from 'clone';
+import { matchMiddleware, matchHost } from "../middleware";
+import { KeqURL } from "../keq-url";
+const defaultOptions = {};
+export function createRequest() {
+    const middlewares = [];
+    const request = function (params, options = defaultOptions) {
+        const request = new Keq(new KeqURL(params.url), 'get', middlewares);
+        return request.options(options);
+    };
+    request.get = function (href) {
+        const request = new Keq(new KeqURL(href), 'get', clone(middlewares));
+        return request;
+    };
+    request.put = function (href) {
+        const request = new Keq(new KeqURL(href), 'put', middlewares);
+        return request;
+    };
+    request.delete = function (href) {
+        const request = new Keq(new KeqURL(href), 'delete', middlewares);
+        return request;
+    };
+    request.del = request.delete;
+    request.post = function (href) {
+        const request = new Keq(new KeqURL(href), 'post', middlewares);
+        return request;
+    };
+    request.head = function (href) {
+        const request = new Keq(new KeqURL(href), 'head', middlewares);
+        return request;
+    };
+    request.patch = function (href) {
+        const request = new Keq(new KeqURL(href), 'patch', middlewares);
+        return request;
+    };
+    request.use = function use(m, middleware) {
+        if (!middleware)
+            middlewares.push(m);
+        else if (typeof m === 'string')
+            middlewares.push(matchMiddleware(matchHost(m), middleware));
+        else
+            middlewares.push(matchMiddleware(m, middleware));
+        return request;
+    };
+    request.create = createRequest;
+    return request;
+}

package/lib/index.js

@@ -1,6 +1,10 @@
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/package.json

@@ -2,7 +2,7 @@
   "name": "keq",
   "main": "lib/index.js",
   "module": "es/index.js",
-  "version": "1.7.1",
+  "version": "1.8.0",
   "license": "MIT",
   "types": "lib/index.d.ts",
   "scripts": {
@@ -64,6 +64,7 @@
     "formidable": "^2.0.1",
     "mime-types": "^2.1.27",
     "nanoid": "^3.1.10",
+    "object.fromentries": "^2.0.5",
     "path-to-regexp": "^6.2.0",
     "picomatch": "^2.2.2",
     "querystring": "^0.2.0",

package/lib/src/exception/index.js

@@ -1,6 +1,10 @@
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/src/index.js

@@ -1,6 +1,10 @@
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/src/keq-url.d.ts

@@ -1,5 +1,6 @@
 import { URL } from 'whatwg-url';
 export declare class KeqURL extends URL {
+    constructor(url: string, base?: string | URL);
     params: {};
     get query(): Record<string, any>;
     set query(value: Record<string, any>);

package/lib/src/keq-url.js

@@ -4,7 +4,7 @@
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "whatwg-url", "path-to-regexp", "./exception", "ramda"], factory);
+        define(["require", "exports", "whatwg-url", "path-to-regexp", "./exception", "ramda", "./util"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -14,9 +14,10 @@
     const path_to_regexp_1 = require("path-to-regexp");
     const exception_1 = require("./exception");
     const R = require("ramda");
+    const util_1 = require("./util");
     class KeqURL extends whatwg_url_1.URL {
-        constructor() {
-            super(...arguments);
+        constructor(url, base = (0, util_1.isBrowser)() ? window.location.origin : 'http://localhost') {
+            super(url, base);
             this.params = {};
         }
         get query() {
@@ -72,14 +73,13 @@
             }
         }
         toPath() {
-            var _a;
             const uri = new whatwg_url_1.URL(this.href);
             try {
                 const toPath = (0, path_to_regexp_1.compile)(uri.pathname, { encode: encodeURIComponent });
                 uri.pathname = toPath(this.params);
             }
             catch (e) {
-                throw new exception_1.Exception(`Cannot compile the params in ${uri.pathname}, Because ${(_a = e) === null || _a === void 0 ? void 0 : _a.message}.`);
+                throw new exception_1.Exception(`Cannot compile the params in ${uri.pathname}, Because ${e === null || e === void 0 ? void 0 : e.message}.`);
             }
             return uri.href;
         }

package/lib/src/keq.js

@@ -13,14 +13,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "cross-fetch", "clone", "./exception", "./util", "./middleware", "./polyfill"], factory);
+        define(["require", "exports", "cross-fetch", "./util/clone", "./exception", "./util", "./middleware", "./polyfill"], factory);
     }
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.Keq = void 0;
     const cross_fetch_1 = require("cross-fetch");
-    const clone = require("clone");
+    const clone_1 = require("./util/clone");
     const exception_1 = require("./exception");
     const util_1 = require("./util");
     const middleware_1 = require("./middleware");
@@ -267,7 +267,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                         return () => __awaiter(this, void 0, void 0, function* () {
                             if (!cache)
                                 cache = yield target.arrayBuffer();
-                            const res = new polyfill_1.Response(cache, { headers: target.headers });
+                            const res = new polyfill_1.Response(new TextDecoder().decode(cache), { headers: target.headers });
                             res.formData = resFromData.bind(res);
                             return yield res[property]();
                         });
@@ -314,14 +314,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                         urlObj.params = value.params;
                     },
                     headers,
-                    body: clone(this.body),
+                    body: (0, clone_1.clone)(this.body),
                     options: {},
                 };
                 if (this.opts.redirect)
                     request.options.redirect = this.opts.redirect;
                 const ctx = {
                     request,
-                    options: clone(Object.assign(Object.assign({}, this.opts), { fetchAPI: this.opts.fetchAPI || cross_fetch_1.default })),
+                    options: (0, clone_1.clone)(Object.assign(Object.assign({}, this.opts), { fetchAPI: this.opts.fetchAPI || cross_fetch_1.default })),
                     output: undefined,
                     get url() {
                         return this.request.url;

package/lib/src/mount.d.ts

@@ -1,4 +1,8 @@
 import { Mounter } from "./types";
+/**
+ * NOTE: Not work in NodeJS
+ *       Unable to get the host and port of the service
+ */
 export declare function location(): Mounter;
 /**
  * @param matcher glob or regexp

package/lib/src/mount.js

@@ -4,7 +4,7 @@
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "./exception", "picomatch"], factory);
+        define(["require", "exports", "./exception", "picomatch", "./util"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -12,6 +12,7 @@
     exports.module = exports.host = exports.pathname = exports.location = void 0;
     const exception_1 = require("./exception");
     const picomatch = require("picomatch");
+    const util_1 = require("./util");
     function createMounter(matcher) {
         const mounter = ctx => matcher(ctx);
         mounter.pathname = arg => compose(mounter, pathname(arg));
@@ -20,8 +21,20 @@
         mounter.module = arg => compose(mounter, module(arg));
         return mounter;
     }
+    /**
+     * NOTE: Not work in NodeJS
+     *       Unable to get the host and port of the service
+     */
     function location() {
-        return createMounter((ctx) => !ctx.request.url.host);
+        return createMounter((ctx) => {
+            if (!ctx.request.url.host)
+                return true;
+            if ((0, util_1.isBrowser)()) {
+                if (ctx.request.url.host === window.location.host)
+                    return true;
+            }
+            return false;
+        });
     }
     exports.location = location;
     /**

package/lib/src/request.d.ts

@@ -1,2 +1 @@
-import { RequestCreator } from "./types";
-export declare const request: RequestCreator;
+export declare const request: import("./types").RequestCreator;

package/lib/src/request.js

@@ -4,55 +4,12 @@
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "./keq", "clone", "./middleware", "./keq-url"], factory);
+        define(["require", "exports", "./util/create-request"], factory);
     }
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.request = void 0;
-    const keq_1 = require("./keq");
-    const clone = require("clone");
-    const middleware_1 = require("./middleware");
-    const keq_url_1 = require("./keq-url");
-    const defaultOptions = {};
-    const middlewares = [];
-    const request = function (params, options = defaultOptions) {
-        const request = new keq_1.Keq(new keq_url_1.KeqURL(params.url), 'get', middlewares);
-        return request.options(options);
-    };
-    exports.request = request;
-    exports.request.get = function (href) {
-        const request = new keq_1.Keq(new keq_url_1.KeqURL(href), 'get', clone(middlewares));
-        return request;
-    };
-    exports.request.put = function (href) {
-        const request = new keq_1.Keq(new keq_url_1.KeqURL(href), 'put', middlewares);
-        return request;
-    };
-    exports.request.delete = function (href) {
-        const request = new keq_1.Keq(new keq_url_1.KeqURL(href), 'delete', middlewares);
-        return request;
-    };
-    exports.request.del = exports.request.delete;
-    exports.request.post = function (href) {
-        const request = new keq_1.Keq(new keq_url_1.KeqURL(href), 'post', middlewares);
-        return request;
-    };
-    exports.request.head = function (href) {
-        const request = new keq_1.Keq(new keq_url_1.KeqURL(href), 'head', middlewares);
-        return request;
-    };
-    exports.request.patch = function (href) {
-        const request = new keq_1.Keq(new keq_url_1.KeqURL(href), 'patch', middlewares);
-        return request;
-    };
-    exports.request.use = function use(m, middleware) {
-        if (!middleware)
-            middlewares.push(m);
-        else if (typeof m === 'string')
-            middlewares.push((0, middleware_1.matchMiddleware)((0, middleware_1.matchHost)(m), middleware));
-        else
-            middlewares.push((0, middleware_1.matchMiddleware)(m, middleware));
-        return exports.request;
-    };
+    const create_request_1 = require("./util/create-request");
+    exports.request = (0, create_request_1.createRequest)();
 });

package/lib/src/types/context.d.ts

@@ -14,7 +14,7 @@ export interface Context {
     res?: Response;
     /** the result get by user */
     output: any;
-    options: Required<Options>;
+    options: Required<Pick<Options, 'fetchAPI'>> & Options;
     /** delegate res */
     response?: Response;
     /** delegate request */

package/lib/src/types/index.js

@@ -1,6 +1,10 @@
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/src/types/request-creator.d.ts

@@ -17,6 +17,7 @@ export interface RequestCreator {
     put: CreateReqeustPromiseF;
     patch: CreateReqeustPromiseF;
     head: CreateReqeustPromiseF;
+    create(): RequestCreator;
     use(middleware: Middleware): RequestCreator;
     use(matcher: string, middleware: Middleware): RequestCreator;
     use(matcher: MiddlewareMatcher, middleware: Middleware): RequestCreator;

package/lib/src/util/clone.d.ts

@@ -0,0 +1 @@
+export declare function clone<T>(obj: T): T;

package/lib/src/util/clone.js

@@ -0,0 +1,28 @@
+(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", "clone", "./is", "object.fromentries"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.clone = void 0;
+    const deepClone = require("clone");
+    const is_1 = require("./is");
+    const fromEntries = require("object.fromentries");
+    function clone(obj) {
+        if (typeof obj === 'object' && !Array.isArray(obj)) {
+            const entries = Object.entries(obj)
+                .map(([key, value]) => ([
+                key,
+                (0, is_1.isBlob)(value) ? value : deepClone(value),
+            ]));
+            return fromEntries(entries);
+        }
+        return deepClone(obj);
+    }
+    exports.clone = clone;
+});

package/lib/src/util/create-request.d.ts

@@ -0,0 +1,2 @@
+import { RequestCreator } from "../types";
+export declare function createRequest(): RequestCreator;

package/lib/src/util/create-request.js

@@ -0,0 +1,62 @@
+(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", "../keq", "clone", "../middleware", "../keq-url"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.createRequest = void 0;
+    const keq_1 = require("../keq");
+    const clone = require("clone");
+    const middleware_1 = require("../middleware");
+    const keq_url_1 = require("../keq-url");
+    const defaultOptions = {};
+    function createRequest() {
+        const middlewares = [];
+        const request = function (params, options = defaultOptions) {
+            const request = new keq_1.Keq(new keq_url_1.KeqURL(params.url), 'get', middlewares);
+            return request.options(options);
+        };
+        request.get = function (href) {
+            const request = new keq_1.Keq(new keq_url_1.KeqURL(href), 'get', clone(middlewares));
+            return request;
+        };
+        request.put = function (href) {
+            const request = new keq_1.Keq(new keq_url_1.KeqURL(href), 'put', middlewares);
+            return request;
+        };
+        request.delete = function (href) {
+            const request = new keq_1.Keq(new keq_url_1.KeqURL(href), 'delete', middlewares);
+            return request;
+        };
+        request.del = request.delete;
+        request.post = function (href) {
+            const request = new keq_1.Keq(new keq_url_1.KeqURL(href), 'post', middlewares);
+            return request;
+        };
+        request.head = function (href) {
+            const request = new keq_1.Keq(new keq_url_1.KeqURL(href), 'head', middlewares);
+            return request;
+        };
+        request.patch = function (href) {
+            const request = new keq_1.Keq(new keq_url_1.KeqURL(href), 'patch', middlewares);
+            return request;
+        };
+        request.use = function use(m, middleware) {
+            if (!middleware)
+                middlewares.push(m);
+            else if (typeof m === 'string')
+                middlewares.push((0, middleware_1.matchMiddleware)((0, middleware_1.matchHost)(m), middleware));
+            else
+                middlewares.push((0, middleware_1.matchMiddleware)(m, middleware));
+            return request;
+        };
+        request.create = createRequest;
+        return request;
+    }
+    exports.createRequest = createRequest;
+});

package/lib/src/util/index.js

@@ -1,6 +1,10 @@
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/src/util/is/index.js

@@ -1,6 +1,10 @@
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/package.json

@@ -2,7 +2,7 @@
   "name": "keq",
   "main": "lib/index.js",
   "module": "es/index.js",
-  "version": "1.7.1",
+  "version": "1.8.0",
   "license": "MIT",
   "types": "lib/index.d.ts",
   "scripts": {
@@ -64,6 +64,7 @@
     "formidable": "^2.0.1",
     "mime-types": "^2.1.27",
     "nanoid": "^3.1.10",
+    "object.fromentries": "^2.0.5",
     "path-to-regexp": "^6.2.0",
     "picomatch": "^2.2.2",
     "querystring": "^0.2.0",