extra-request 8.1.2 → 8.1.4

package/README.md

@@ -72,7 +72,7 @@ function pipeRequestOptionsTransformers(
 ### Transformers
 #### url
 ```ts
-function url(...urls: [string, ...string[]]): IRequestOptionsTransformer
+function url(url: string, ...baseUrls: string[]): IRequestOptionsTransformer
 ```
 
 ### text
@@ -154,7 +154,7 @@ function appendSearchParam(
 ### searchParams
 ```ts
 function searchParams(
-  searchParams: { [name: string]: string | number }
+  searchParams: Record<string, string | number>
 ): IRequestOptionsTransformer
 ```
 

package/lib/transformers/append-pathname.js

@@ -1,19 +1,9 @@
-import { go } from '@blackglory/prelude';
+import URL from 'url-operator';
 export function appendPathname(pathname) {
     return (options) => {
-        const base = go(() => {
-            const url = new URL(options.url.href);
-            url.pathname = url.pathname.endsWith('/')
-                ? url.pathname
-                : `${url.pathname}/`;
-            return url;
-        });
-        const url = new URL(pathname.replace(/^\/*/, ''), base);
-        url.search = base.search;
-        url.hash = base.hash;
         return {
             ...options,
-            url
+            url: URL.appendPathname(options.url, pathname)
         };
     };
 }

package/lib/transformers/append-pathname.js.map

@@ -1 +1 @@
-{"version":3,"file":"append-pathname.js","sourceRoot":"","sources":["../../src/transformers/append-pathname.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,qBAAqB,CAAA;AAExC,MAAM,UAAU,cAAc,CAAC,QAAgB;IAC7C,OAAO,CAAC,OAAwB,EAAE,EAAE;QAClC,MAAM,IAAI,GAAG,EAAE,CAAC,GAAG,EAAE;YACnB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;YACrC,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC;gBAC5B,CAAC,CAAC,GAAG,CAAC,QAAQ;gBACd,CAAC,CAAC,GAAG,GAAG,CAAC,QAAQ,GAAG,CAAA;YAEjC,OAAO,GAAG,CAAA;QACZ,CAAC,CAAC,CAAA;QAEF,MAAM,GAAG,GAAG,IAAI,GAAG,CACjB,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,EAC5B,IAAI,CACL,CAAA;QACD,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAA;QACxB,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;QAEpB,OAAO;YACL,GAAG,OAAO;YACV,GAAG;SACJ,CAAA;IACH,CAAC,CAAA;AACH,CAAC"}
+{"version":3,"file":"append-pathname.js","sourceRoot":"","sources":["../../src/transformers/append-pathname.ts"],"names":[],"mappings":"AACA,OAAO,GAAG,MAAM,cAAc,CAAA;AAE9B,MAAM,UAAU,cAAc,CAAC,QAAgB;IAC7C,OAAO,CAAC,OAAwB,EAAE,EAAE;QAClC,OAAO;YACL,GAAG,OAAO;YACV,GAAG,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC;SAC/C,CAAA;IACH,CAAC,CAAA;AACH,CAAC"}

package/lib/transformers/append-search-param.js

@@ -1,12 +1,9 @@
+import URL from 'url-operator';
 export function appendSearchParam(name, value) {
     return (options) => {
-        const url = new URL(options.url.href);
-        const newSearchParams = new URLSearchParams(url.searchParams);
-        newSearchParams.append(name, value.toString());
-        url.search = newSearchParams.toString();
         return {
             ...options,
-            url
+            url: URL.appendSearchParam(options.url, name, value)
         };
     };
 }

package/lib/transformers/append-search-param.js.map

@@ -1 +1 @@
-{"version":3,"file":"append-search-param.js","sourceRoot":"","sources":["../../src/transformers/append-search-param.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,iBAAiB,CAC/B,IAAY,EACZ,KAAsB;IAEtB,OAAO,CAAC,OAAwB,EAAE,EAAE;QAClC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACrC,MAAM,eAAe,GAAG,IAAI,eAAe,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;QAC7D,eAAe,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC9C,GAAG,CAAC,MAAM,GAAG,eAAe,CAAC,QAAQ,EAAE,CAAA;QAEvC,OAAO;YACL,GAAG,OAAO;YACV,GAAG;SACJ,CAAA;IACH,CAAC,CAAA;AACH,CAAC"}
+{"version":3,"file":"append-search-param.js","sourceRoot":"","sources":["../../src/transformers/append-search-param.ts"],"names":[],"mappings":"AACA,OAAO,GAAG,MAAM,cAAc,CAAA;AAE9B,MAAM,UAAU,iBAAiB,CAC/B,IAAY,EACZ,KAAsB;IAEtB,OAAO,CAAC,OAAwB,EAAE,EAAE;QAClC,OAAO;YACL,GAAG,OAAO;YACV,GAAG,EAAE,GAAG,CAAC,iBAAiB,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC;SACrD,CAAA;IACH,CAAC,CAAA;AACH,CAAC"}

package/lib/transformers/host.js

@@ -1,10 +1,9 @@
+import { setHost } from 'url-operator';
 export function host(host) {
     return (options) => {
-        const url = new URL(options.url.href);
-        url.host = host;
         return {
             ...options,
-            url
+            url: setHost(options.url, host)
         };
     };
 }

package/lib/transformers/host.js.map

@@ -1 +1 @@
-{"version":3,"file":"host.js","sourceRoot":"","sources":["../../src/transformers/host.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,IAAI,CAAC,IAAY;IAC/B,OAAO,CAAC,OAAwB,EAAE,EAAE;QAClC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACrC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAA;QAEf,OAAO;YACL,GAAG,OAAO;YACV,GAAG;SACJ,CAAA;IACH,CAAC,CAAA;AACH,CAAC"}
+{"version":3,"file":"host.js","sourceRoot":"","sources":["../../src/transformers/host.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAEtC,MAAM,UAAU,IAAI,CAAC,IAAY;IAC/B,OAAO,CAAC,OAAwB,EAAE,EAAE;QAClC,OAAO;YACL,GAAG,OAAO;YACV,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC;SAChC,CAAA;IACH,CAAC,CAAA;AACH,CAAC"}

package/lib/transformers/pathname.js

@@ -1,10 +1,9 @@
+import { setPathname } from 'url-operator';
 export function pathname(pathname) {
     return (options) => {
-        const url = new URL(options.url.href);
-        url.pathname = pathname;
         return {
             ...options,
-            url
+            url: setPathname(options.url, pathname)
         };
     };
 }

package/lib/transformers/pathname.js.map

@@ -1 +1 @@
-{"version":3,"file":"pathname.js","sourceRoot":"","sources":["../../src/transformers/pathname.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,QAAQ,CAAC,QAAgB;IACvC,OAAO,CAAC,OAAwB,EAAE,EAAE;QAClC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACrC,GAAG,CAAC,QAAQ,GAAG,QAAQ,CAAA;QAEvB,OAAO;YACL,GAAG,OAAO;YACV,GAAG;SACJ,CAAA;IACH,CAAC,CAAA;AACH,CAAC"}
+{"version":3,"file":"pathname.js","sourceRoot":"","sources":["../../src/transformers/pathname.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAE1C,MAAM,UAAU,QAAQ,CAAC,QAAgB;IACvC,OAAO,CAAC,OAAwB,EAAE,EAAE;QAClC,OAAO;YACL,GAAG,OAAO;YACV,GAAG,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC;SACxC,CAAA;IACH,CAAC,CAAA;AACH,CAAC"}

package/lib/transformers/port.js

@@ -1,10 +1,9 @@
+import { setPort } from 'url-operator';
 export function port(port) {
     return (options) => {
-        const url = new URL(options.url.href);
-        url.port = port.toString();
         return {
             ...options,
-            url
+            url: setPort(options.url, port)
         };
     };
 }

package/lib/transformers/port.js.map

@@ -1 +1 @@
-{"version":3,"file":"port.js","sourceRoot":"","sources":["../../src/transformers/port.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,IAAI,CAAC,IAAY;IAC/B,OAAO,CAAC,OAAwB,EAAE,EAAE;QAClC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACrC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAA;QAE1B,OAAO;YACL,GAAG,OAAO;YACV,GAAG;SACJ,CAAA;IACH,CAAC,CAAA;AACH,CAAC"}
+{"version":3,"file":"port.js","sourceRoot":"","sources":["../../src/transformers/port.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAEtC,MAAM,UAAU,IAAI,CAAC,IAAY;IAC/B,OAAO,CAAC,OAAwB,EAAE,EAAE;QAClC,OAAO;YACL,GAAG,OAAO;YACV,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC;SAChC,CAAA;IACH,CAAC,CAAA;AACH,CAAC"}

package/lib/transformers/search-param.js

@@ -1,12 +1,9 @@
+import { setSearchParam } from 'url-operator';
 export function searchParam(name, value) {
     return (options) => {
-        const url = new URL(options.url.href);
-        const newSearchParams = new URLSearchParams(url.searchParams);
-        newSearchParams.set(name, value.toString());
-        url.search = newSearchParams.toString();
         return {
             ...options,
-            url
+            url: setSearchParam(options.url, name, value)
         };
     };
 }

package/lib/transformers/search-param.js.map

@@ -1 +1 @@
-{"version":3,"file":"search-param.js","sourceRoot":"","sources":["../../src/transformers/search-param.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,WAAW,CACzB,IAAY,EACZ,KAAsB;IAEtB,OAAO,CAAC,OAAwB,EAAE,EAAE;QAClC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACrC,MAAM,eAAe,GAAG,IAAI,eAAe,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;QAC7D,eAAe,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC3C,GAAG,CAAC,MAAM,GAAG,eAAe,CAAC,QAAQ,EAAE,CAAA;QAEvC,OAAO;YACL,GAAG,OAAO;YACV,GAAG;SACJ,CAAA;IACH,CAAC,CAAA;AACH,CAAC"}
+{"version":3,"file":"search-param.js","sourceRoot":"","sources":["../../src/transformers/search-param.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAE7C,MAAM,UAAU,WAAW,CACzB,IAAY,EACZ,KAAsB;IAEtB,OAAO,CAAC,OAAwB,EAAE,EAAE;QAClC,OAAO;YACL,GAAG,OAAO;YACV,GAAG,EAAE,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC;SAC9C,CAAA;IACH,CAAC,CAAA;AACH,CAAC"}

package/lib/transformers/search-params.d.ts

@@ -1,4 +1,2 @@
 import { IRequestOptionsTransformer } from "../types.js";
-export declare function searchParams(searchParams: {
-    [name: string]: string | number;
-}): IRequestOptionsTransformer;
+export declare function searchParams(searchParams: Record<string, string | number>): IRequestOptionsTransformer;

package/lib/transformers/search-params.js

@@ -1,14 +1,9 @@
+import { setSearchParams } from 'url-operator';
 export function searchParams(searchParams) {
     return (options) => {
-        const url = new URL(options.url.href);
-        const newSearchParams = new URLSearchParams(url.searchParams);
-        for (const [name, value] of Object.entries(searchParams)) {
-            newSearchParams.set(name, value.toString());
-        }
-        url.search = newSearchParams.toString();
         return {
             ...options,
-            url
+            url: setSearchParams(options.url, searchParams)
         };
     };
 }

package/lib/transformers/search-params.js.map

@@ -1 +1 @@
-{"version":3,"file":"search-params.js","sourceRoot":"","sources":["../../src/transformers/search-params.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,YAAY,CAC1B,YAAiD;IAEjD,OAAO,CAAC,OAAwB,EAAE,EAAE;QAClC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACrC,MAAM,eAAe,GAAG,IAAI,eAAe,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;QAC7D,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;YACxD,eAAe,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;SAC5C;QACD,GAAG,CAAC,MAAM,GAAG,eAAe,CAAC,QAAQ,EAAE,CAAA;QAEvC,OAAO;YACL,GAAG,OAAO;YACV,GAAG;SACJ,CAAA;IACH,CAAC,CAAA;AACH,CAAC"}
+{"version":3,"file":"search-params.js","sourceRoot":"","sources":["../../src/transformers/search-params.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAE9C,MAAM,UAAU,YAAY,CAC1B,YAA6C;IAE7C,OAAO,CAAC,OAAwB,EAAE,EAAE;QAClC,OAAO;YACL,GAAG,OAAO;YACV,GAAG,EAAE,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE,YAAY,CAAC;SAChD,CAAA;IACH,CAAC,CAAA;AACH,CAAC"}

package/lib/transformers/search.js

@@ -1,10 +1,9 @@
+import { setSearch } from 'url-operator';
 export function search(search) {
     return (options) => {
-        const url = new URL(options.url.href);
-        url.search = search;
         return {
             ...options,
-            url
+            url: setSearch(options.url, search)
         };
     };
 }

package/lib/transformers/search.js.map

@@ -1 +1 @@
-{"version":3,"file":"search.js","sourceRoot":"","sources":["../../src/transformers/search.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,MAAM,CAAC,MAAc;IACnC,OAAO,CAAC,OAAwB,EAAE,EAAE;QAClC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACrC,GAAG,CAAC,MAAM,GAAG,MAAM,CAAA;QAEnB,OAAO;YACL,GAAG,OAAO;YACV,GAAG;SACJ,CAAA;IACH,CAAC,CAAA;AACH,CAAC"}
+{"version":3,"file":"search.js","sourceRoot":"","sources":["../../src/transformers/search.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAExC,MAAM,UAAU,MAAM,CAAC,MAAc;IACnC,OAAO,CAAC,OAAwB,EAAE,EAAE;QAClC,OAAO;YACL,GAAG,OAAO;YACV,GAAG,EAAE,SAAS,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC;SACpC,CAAA;IACH,CAAC,CAAA;AACH,CAAC"}

package/lib/transformers/url.d.ts

@@ -1,2 +1,2 @@
 import { IRequestOptionsTransformer } from "../types.js";
-export declare function url(...urls: [string, ...string[]]): IRequestOptionsTransformer;
+export declare function url(url: string, ...baseUrls: string[]): IRequestOptionsTransformer;

package/lib/transformers/url.js

@@ -1,9 +1,10 @@
-export function url(...urls) {
+export function url(url, ...baseUrls) {
     return (options) => {
-        const url = new URL(urls.reduce((acc, cur) => new URL(cur, acc).href));
+        const urls = [url, ...baseUrls];
+        const newURL = new URL(urls.reduce((acc, cur) => new URL(cur, acc).href));
         return {
             ...options,
-            url
+            url: newURL
         };
     };
 }

package/lib/transformers/url.js.map

@@ -1 +1 @@
-{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/transformers/url.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,GAAG,CAAC,GAAG,IAA0B;IAC/C,OAAO,CAAC,OAAwB,EAAE,EAAE;QAClC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;QAEtE,OAAO;YACL,GAAG,OAAO;YACV,GAAG;SACJ,CAAA;IACH,CAAC,CAAA;AACH,CAAC"}
+{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/transformers/url.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,GAAG,CAAC,GAAW,EAAE,GAAG,QAAkB;IACpD,OAAO,CAAC,OAAwB,EAAE,EAAE;QAClC,MAAM,IAAI,GAAG,CAAC,GAAG,EAAE,GAAG,QAAQ,CAAC,CAAA;QAC/B,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;QAEzE,OAAO;YACL,GAAG,OAAO;YACV,GAAG,EAAE,MAAM;SACZ,CAAA;IACH,CAAC,CAAA;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "extra-request",
-  "version": "8.1.2",
+  "version": "8.1.4",
   "description": "Utilities for Request",
   "type": "module",
   "sideEffects": false,
@@ -44,15 +44,15 @@
   "devDependencies": {
     "@blackglory/jest-matchers": "^0.4.1",
     "@blackglory/jest-resolver": "^0.2.1",
-    "@commitlint/cli": "^17.0.2",
-    "@commitlint/config-conventional": "^17.0.2",
+    "@commitlint/cli": "^17.2.0",
+    "@commitlint/config-conventional": "^17.2.0",
     "@types/jest": "^28.1.1",
     "@types/papaparse": "^5.3.2",
-    "@typescript-eslint/eslint-plugin": "^5.27.1",
-    "@typescript-eslint/parser": "^5.27.1",
+    "@typescript-eslint/eslint-plugin": "^5.42.0",
+    "@typescript-eslint/parser": "^5.42.0",
     "cross-env": "^7.0.3",
-    "eslint": "^8.17.0",
-    "extra-fetch": "^4.0.0",
+    "eslint": "^8.26.0",
+    "extra-fetch": "^4.0.1",
     "husky": "4",
     "jest": "^28.1.1",
     "jest-resolve": "^28.1.1",
@@ -66,9 +66,10 @@
     "typescript-transform-paths": "^3.3.1"
   },
   "dependencies": {
-    "@blackglory/prelude": "^0.1.5",
-    "@blackglory/types": "^1.1.0",
-    "papaparse": "^5.3.2"
+    "@blackglory/prelude": "^0.1.7",
+    "@blackglory/types": "^1.4.0",
+    "papaparse": "^5.3.2",
+    "url-operator": "^0.1.0"
   },
   "peerDependencies": {
     "extra-fetch": "^3.0.0 || ^4.0.0"