keq 1.7.2 → 1.7.3

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 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.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)
 
 

package/es/package.json

@@ -2,7 +2,7 @@
   "name": "keq",
   "main": "lib/index.js",
   "module": "es/index.js",
-  "version": "1.7.2",
+  "version": "1.7.3",
   "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.js

@@ -61,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";

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/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/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/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.2",
+  "version": "1.7.3",
   "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.js

@@ -73,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");
@@ -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/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/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/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.2",
+  "version": "1.7.3",
   "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",