@naverpay/nurl 0.0.10 → 0.0.11

package/dist/cjs/nurl.d.ts

@@ -1,6 +1,7 @@
+import { Query } from './utils';
 interface URLOptions extends Partial<Pick<URL, 'href' | 'protocol' | 'host' | 'hostname' | 'port' | 'pathname' | 'search' | 'hash' | 'username' | 'password'>> {
     baseUrl?: string;
-    query?: Record<string, string>;
+    query?: Query;
     basePath?: string;
 }
 export default class NURL implements URL {

package/dist/cjs/nurl.js

@@ -1 +1 @@
-"use strict";const i=require("./punycode.js"),r=require("./utils.js");class a{constructor(t){if(this._href="",this._protocol="",this._host="",this._hostname="",this._port="",this._pathname="",this._search="",this._hash="",this._origin="",this._username="",this._password="",this._baseUrl="",this._searchParams=new URLSearchParams,this._basePath="",this.punycodePrefix="xn--",this._searchParams=new URLSearchParams,typeof t=="string"||t instanceof URL)this.href=t.toString();else if(t){if(t.basePath&&(this._basePath=t.basePath.startsWith("/")?t.basePath:`/${t.basePath}`),t.baseUrl&&(this.baseUrl=t.baseUrl),t.href&&(this.href=t.href),t.protocol&&(this.protocol=t.protocol),t.host&&(this.host=t.host),t.hostname&&(this.hostname=t.hostname),t.port&&(this.port=t.port),t.pathname){const s=this._basePath;let e=t.pathname;s&&!e.startsWith(s)&&(e=`${s}${e.startsWith("/")?"":"/"}${e}`),this.pathname=r.refinePathnameWithQuery(e,t.query??{})}if(t.search&&(this.search=t.search),t.hash&&(this.hash=t.hash),t.username&&(this.username=t.username),t.password&&(this.password=t.password),t.query){const s=r.refineQueryWithPathname(t.pathname??"",t.query);Object.keys(s).length>0&&(this.search=new URLSearchParams(s).toString())}this.updateHref()}}static withBasePath(t){return s=>typeof s=="string"||s instanceof URL?new a({href:s.toString(),basePath:t}):new a({...s,basePath:t})}static create(t){return new a(t)}static canParse(t){if(t.startsWith("/"))return/^\/[^?#]*(\?[^#]*)?(#.*)?$/.test(t);try{return new URL(t),!0}catch{return/^[^:/?#]+(\.[^:/?#]+)+(\/[^?#]*(\?[^#]*)?(#.*)?)?$/.test(t)}}get baseUrl(){return this._baseUrl}set baseUrl(t){this._baseUrl=t;try{const s=new URL(t);this._protocol=s.protocol,this._host=s.host,this._hostname=s.hostname,this._port=s.port,this._origin=s.origin,this._username=s.username,this._password=s.password,s.pathname!=="/"&&(this._pathname=s.pathname),s.search&&(this._search=s.search,this._searchParams=new URLSearchParams(s.search)),s.hash&&(this._hash=s.hash),this.updateHref()}catch(s){console.warn(`Invalid baseUrl: ${t}`,s)}}get href(){return this.pathname.length===1?`${this._href}/`:this._href}set href(t){try{const s=new URL(t);this._href=s.href,this._protocol=s.protocol,this._host=s.host,this._hostname=s.hostname,this._port=s.port,this._pathname=s.pathname,this._search=s.search,this._hash=s.hash,this._origin=s.origin,this._username=s.username,this._password=s.password,this._searchParams=s.searchParams}catch(s){console.warn(`Can not parse ${t}`,s)}}get protocol(){return this._protocol}set protocol(t){this._protocol=t,this.updateHref()}get host(){return this._host}set host(t){const[s,e]=t.split(":"),h=this.encodeHostname(s);this._host=e?`${h}:${e}`:h,this._hostname=h,this._port=e||"",this.updateHref()}get hostname(){return this._hostname}set hostname(t){const s=this.encodeHostname(t);this._hostname=s,this._host=this._port?`${s}:${this._port}`:s,this.updateHref()}get port(){return this._port}set port(t){this._port=t,this._host=`${this._hostname}${t?":"+t:""}`,this.updateHref()}get pathname(){return this._pathname}set pathname(t){let s=t;this._basePath&&!s.startsWith(this._basePath)&&(s=`${this._basePath}${s.startsWith("/")?"":"/"}${s}`);const e=s.split("/").map(h=>r.isDynamicPath(h)?h:encodeURI(h)).join("/");this._pathname=e.startsWith("/")?e:`/${e}`,this.updateHref()}get search(){return this._search}set search(t){this._search=t.startsWith("?")?t:`?${t}`,this._searchParams=new URLSearchParams(t),this.updateHref()}setSearchParams(t){const s=new URLSearchParams(t);this._search=s.toString()?`?${s.toString()}`:"",this._searchParams=s,this.updateHref()}appendSearchParams(t){const s=new URLSearchParams(this._searchParams),e=r.getDynamicPaths(this._pathname).map(r.extractPathKey);Object.keys(t).forEach(h=>{e.includes(h)?this._pathname=r.refinePathnameWithQuery(this._pathname,{[h]:t[h]}):s.append(h,t[h])}),this._search=s.toString()?`?${s.toString()}`:"",this._searchParams=s,this.updateHref()}removeSearchParams(...t){const s=new URLSearchParams(this._searchParams);t.forEach(e=>{s.delete(e)}),this._search=s.toString()?`?${s.toString()}`:"",this._searchParams=s,this.updateHref()}get searchParams(){return new Proxy(this._searchParams,{get:(t,s,e)=>{const h=Reflect.get(t,s,e);return typeof h=="function"?(...o)=>{const n=h.apply(t,o);return this._search=this._searchParams.toString()?`?${this._searchParams.toString()}`:"",this.updateHref(),n}:h}})}get hash(){return this._hash}set hash(t){this._hash=t.startsWith("#")?t:`#${t}`,this.updateHref()}get origin(){return this._origin}get username(){return this._username}set username(t){this._username=t,this.updateHref()}get password(){return this._password}set password(t){this._password=t,this.updateHref()}updateHref(){if(this._baseUrl){const t=new URL(this._baseUrl);t.pathname=this._pathname,t.search=this._search,t.hash=this._hash,this._href=t.href,this._origin=t.origin}else this._href=`${this._protocol}${this._protocol&&"//"}${this._username}${this._password?":"+this._password:""}${this._username||this._password?"@":""}${this._hostname}${this._port?":"+this._port:""}${this._pathname==="/"?"":this._pathname}${this._search}${this._hash}`,this._origin=`${this._protocol}//${this._hostname}${this._port?":"+this._port:""}`}toString(){return this.href}toJSON(){return this.href}encodeHostname(t){return t.split(".").map(s=>{for(const e of s)if(r.isASCIICodeChar(e))return`${this.punycodePrefix}${i.encode(s)}`;return s}).join(".")}get decodedIDN(){let t=this._href;return this._hostname.split(".").forEach(s=>{t=t.replace(s,i.decode(s.replace(this.punycodePrefix,"")))}),t}get decodedHostname(){return this._hostname.split(".").map(t=>i.decode(t.replace(this.punycodePrefix,""))).join(".")}}module.exports=a;
+"use strict";const i=require("./punycode.js"),r=require("./utils.js");class a{constructor(t){if(this._href="",this._protocol="",this._host="",this._hostname="",this._port="",this._pathname="",this._search="",this._hash="",this._origin="",this._username="",this._password="",this._baseUrl="",this._searchParams=new URLSearchParams,this._basePath="",this.punycodePrefix="xn--",this._searchParams=new URLSearchParams,typeof t=="string"||t instanceof URL)this.href=t.toString();else if(t){if(t.basePath&&(this._basePath=t.basePath.startsWith("/")?t.basePath:`/${t.basePath}`),t.baseUrl&&(this.baseUrl=t.baseUrl),t.href&&(this.href=t.href),t.protocol&&(this.protocol=t.protocol),t.host&&(this.host=t.host),t.hostname&&(this.hostname=t.hostname),t.port&&(this.port=t.port),t.pathname){const s=this._basePath;let e=t.pathname;s&&!e.startsWith(s)&&(e=`${s}${e.startsWith("/")?"":"/"}${e}`),this.pathname=r.refinePathnameWithQuery(e,t.query??{})}if(t.search&&(this.search=t.search),t.hash&&(this.hash=t.hash),t.username&&(this.username=t.username),t.password&&(this.password=t.password),t.query){const s=r.refineQueryWithPathname(t.pathname??"",t.query);Object.keys(s).length>0&&(this.search=new URLSearchParams(r.convertQueryToArray(s)).toString())}this.updateHref()}}static withBasePath(t){return s=>typeof s=="string"||s instanceof URL?new a({href:s.toString(),basePath:t}):new a({...s,basePath:t})}static create(t){return new a(t)}static canParse(t){if(t.startsWith("/"))return/^\/[^?#]*(\?[^#]*)?(#.*)?$/.test(t);try{return new URL(t),!0}catch{return/^[^:/?#]+(\.[^:/?#]+)+(\/[^?#]*(\?[^#]*)?(#.*)?)?$/.test(t)}}get baseUrl(){return this._baseUrl}set baseUrl(t){this._baseUrl=t;try{const s=new URL(t);this._protocol=s.protocol,this._host=s.host,this._hostname=s.hostname,this._port=s.port,this._origin=s.origin,this._username=s.username,this._password=s.password,s.pathname!=="/"&&(this._pathname=s.pathname),s.search&&(this._search=s.search,this._searchParams=new URLSearchParams(s.search)),s.hash&&(this._hash=s.hash),this.updateHref()}catch(s){console.warn(`Invalid baseUrl: ${t}`,s)}}get href(){return this.pathname.length===1?`${this._href}/`:this._href}set href(t){try{const s=new URL(t);this._href=s.href,this._protocol=s.protocol,this._host=s.host,this._hostname=s.hostname,this._port=s.port,this._pathname=s.pathname,this._search=s.search,this._hash=s.hash,this._origin=s.origin,this._username=s.username,this._password=s.password,this._searchParams=s.searchParams}catch(s){console.warn(`Can not parse ${t}`,s)}}get protocol(){return this._protocol}set protocol(t){this._protocol=t,this.updateHref()}get host(){return this._host}set host(t){const[s,e]=t.split(":"),h=this.encodeHostname(s);this._host=e?`${h}:${e}`:h,this._hostname=h,this._port=e||"",this.updateHref()}get hostname(){return this._hostname}set hostname(t){const s=this.encodeHostname(t);this._hostname=s,this._host=this._port?`${s}:${this._port}`:s,this.updateHref()}get port(){return this._port}set port(t){this._port=t,this._host=`${this._hostname}${t?":"+t:""}`,this.updateHref()}get pathname(){return this._pathname}set pathname(t){let s=t;this._basePath&&!s.startsWith(this._basePath)&&(s=`${this._basePath}${s.startsWith("/")?"":"/"}${s}`);const e=s.split("/").map(h=>r.isDynamicPath(h)?h:encodeURI(h)).join("/");this._pathname=e.startsWith("/")?e:`/${e}`,this.updateHref()}get search(){return this._search}set search(t){this._search=t.startsWith("?")?t:`?${t}`,this._searchParams=new URLSearchParams(t),this.updateHref()}setSearchParams(t){const s=new URLSearchParams(t);this._search=s.toString()?`?${s.toString()}`:"",this._searchParams=s,this.updateHref()}appendSearchParams(t){const s=new URLSearchParams(this._searchParams),e=r.getDynamicPaths(this._pathname).map(r.extractPathKey);Object.keys(t).forEach(h=>{e.includes(h)?this._pathname=r.refinePathnameWithQuery(this._pathname,{[h]:t[h]}):s.append(h,t[h])}),this._search=s.toString()?`?${s.toString()}`:"",this._searchParams=s,this.updateHref()}removeSearchParams(...t){const s=new URLSearchParams(this._searchParams);t.forEach(e=>{s.delete(e)}),this._search=s.toString()?`?${s.toString()}`:"",this._searchParams=s,this.updateHref()}get searchParams(){return new Proxy(this._searchParams,{get:(t,s,e)=>{const h=Reflect.get(t,s,e);return typeof h=="function"?(...o)=>{const n=h.apply(t,o);return this._search=this._searchParams.toString()?`?${this._searchParams.toString()}`:"",this.updateHref(),n}:h}})}get hash(){return this._hash}set hash(t){this._hash=t.startsWith("#")?t:`#${t}`,this.updateHref()}get origin(){return this._origin}get username(){return this._username}set username(t){this._username=t,this.updateHref()}get password(){return this._password}set password(t){this._password=t,this.updateHref()}updateHref(){if(this._baseUrl){const t=new URL(this._baseUrl);t.pathname=this._pathname,t.search=this._search,t.hash=this._hash,this._href=t.href,this._origin=t.origin}else this._href=`${this._protocol}${this._protocol&&"//"}${this._username}${this._password?":"+this._password:""}${this._username||this._password?"@":""}${this._hostname}${this._port?":"+this._port:""}${this._pathname==="/"?"":this._pathname}${this._search}${this._hash}`,this._origin=`${this._protocol}//${this._hostname}${this._port?":"+this._port:""}`}toString(){return this.href}toJSON(){return this.href}encodeHostname(t){return t.split(".").map(s=>{for(const e of s)if(r.isASCIICodeChar(e))return`${this.punycodePrefix}${i.encode(s)}`;return s}).join(".")}get decodedIDN(){let t=this._href;return this._hostname.split(".").forEach(s=>{t=t.replace(s,i.decode(s.replace(this.punycodePrefix,"")))}),t}get decodedHostname(){return this._hostname.split(".").map(t=>i.decode(t.replace(this.punycodePrefix,""))).join(".")}}module.exports=a;

package/dist/cjs/utils.d.ts

@@ -1,18 +1,26 @@
+export type Query = Record<string, string | number | boolean | (string | number | boolean)[]>;
 export declare function isDynamicPath(path: string): boolean;
 export declare function getDynamicPaths(pathname: string): string[];
 export declare function extractPathKey(path: string): string;
 /**
  * Replaces dynamic paths in the pathname with values from the query
  * @param {string} pathname
- * @param {Record<string, string>} query
+ * @param {Query} query
  * @returns {string} refined pathname
  */
-export declare function refinePathnameWithQuery(pathname: string, query: Record<string, string>): string;
+export declare function refinePathnameWithQuery(pathname: string, query: Query): string;
 /**
  * Removes queries that have already been used in the pathname.
  * @param {string} pathname
- * @param {Record<string, string>} query
- * @returns {Record<string, string>} refined query
+ * @param {Query} query
+ * @returns {Query} refined query
  */
-export declare function refineQueryWithPathname(pathname: string, query: Record<string, string>): Record<string, string>;
+export declare function refineQueryWithPathname(pathname: string, query: Query): Query;
 export declare function isASCIICodeChar(char: string): boolean;
+/**
+ * Convert queries to array, if they are not of the defined primitive types, they will not be included in the array.
+ * @param {string} pathname
+ * @param {Query} query
+ * @returns {string[][]} refined query
+ */
+export declare function convertQueryToArray(query: Query): string[][];

package/dist/cjs/utils.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=/^:/,h=/^\[.*\]$/;function o(e){return c.test(e)||h.test(e)}function u(e){return e.split("/").filter(o)}function a(e){return e.slice(1,c.test(e)?void 0:-1)}function P(e,t){return u(e).reduce((n,r)=>{const i=a(r);return t[i]?n.replace(r,t[i]):n},e)}function y(e,t){return u(e).reduce((n,r)=>{const i=a(r),{[i]:A,...s}=n;return s},t)}const f=127;function C(e){return e.charCodeAt(0)>f}exports.extractPathKey=a;exports.getDynamicPaths=u;exports.isASCIICodeChar=C;exports.isDynamicPath=o;exports.refinePathnameWithQuery=P;exports.refineQueryWithPathname=y;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=/^:/,P=/^\[.*\]$/;function y(e){return c.test(e)||P.test(e)}function o(e){return e.split("/").filter(y)}function a(e){return e.slice(1,c.test(e)?void 0:-1)}function h(e,r){return o(e).reduce((t,n)=>{const i=a(n),u=r[i];return u&&typeof u=="string"?t.replace(n,u):t},e)}function A(e,r){return o(e).reduce((t,n)=>{const i=a(n);if(typeof t[i]!="string")return t;const{[i]:g,...f}=t;return f},r)}const C=127;function m(e){return e.charCodeAt(0)>C}function s(e){return["string","number","boolean"].includes(typeof e)}function d(e){return Object.entries(e).flatMap(([r,t])=>s(t)?[[r,String(t)]]:Array.isArray(t)&&t.every(s)?t.map(n=>[r,String(n)]):[])}exports.convertQueryToArray=d;exports.extractPathKey=a;exports.getDynamicPaths=o;exports.isASCIICodeChar=m;exports.isDynamicPath=y;exports.refinePathnameWithQuery=h;exports.refineQueryWithPathname=A;

package/dist/esm/nurl.d.mts

@@ -1,6 +1,7 @@
+import { Query } from './utils';
 interface URLOptions extends Partial<Pick<URL, 'href' | 'protocol' | 'host' | 'hostname' | 'port' | 'pathname' | 'search' | 'hash' | 'username' | 'password'>> {
     baseUrl?: string;
-    query?: Record<string, string>;
+    query?: Query;
     basePath?: string;
 }
 export default class NURL implements URL {

package/dist/esm/nurl.mjs

@@ -1,5 +1,5 @@
 import { encode as c, decode as a } from "./punycode.mjs";
-import { refinePathnameWithQuery as i, refineQueryWithPathname as _, isDynamicPath as m, getDynamicPaths as f, extractPathKey as p, isASCIICodeChar as d } from "./utils.mjs";
+import { refinePathnameWithQuery as i, refineQueryWithPathname as _, convertQueryToArray as m, isDynamicPath as f, getDynamicPaths as p, extractPathKey as d, isASCIICodeChar as P } from "./utils.mjs";
 class r {
   constructor(t) {
     if (this._href = "", this._protocol = "", this._host = "", this._hostname = "", this._port = "", this._pathname = "", this._search = "", this._hash = "", this._origin = "", this._username = "", this._password = "", this._baseUrl = "", this._searchParams = new URLSearchParams(), this._basePath = "", this.punycodePrefix = "xn--", this._searchParams = new URLSearchParams(), typeof t == "string" || t instanceof URL)
@@ -12,7 +12,7 @@ class r {
       }
       if (t.search && (this.search = t.search), t.hash && (this.hash = t.hash), t.username && (this.username = t.username), t.password && (this.password = t.password), t.query) {
         const s = _(t.pathname ?? "", t.query);
-        Object.keys(s).length > 0 && (this.search = new URLSearchParams(s).toString());
+        Object.keys(s).length > 0 && (this.search = new URLSearchParams(m(s)).toString());
       }
       this.updateHref();
     }
@@ -93,7 +93,7 @@ class r {
   set pathname(t) {
     let s = t;
     this._basePath && !s.startsWith(this._basePath) && (s = `${this._basePath}${s.startsWith("/") ? "" : "/"}${s}`);
-    const e = s.split("/").map((h) => m(h) ? h : encodeURI(h)).join("/");
+    const e = s.split("/").map((h) => f(h) ? h : encodeURI(h)).join("/");
     this._pathname = e.startsWith("/") ? e : `/${e}`, this.updateHref();
   }
   get search() {
@@ -107,7 +107,7 @@ class r {
     this._search = s.toString() ? `?${s.toString()}` : "", this._searchParams = s, this.updateHref();
   }
   appendSearchParams(t) {
-    const s = new URLSearchParams(this._searchParams), e = f(this._pathname).map(p);
+    const s = new URLSearchParams(this._searchParams), e = p(this._pathname).map(d);
     Object.keys(t).forEach((h) => {
       e.includes(h) ? this._pathname = i(this._pathname, {
         [h]: t[h]
@@ -168,7 +168,7 @@ class r {
   encodeHostname(t) {
     return t.split(".").map((s) => {
       for (const e of s)
-        if (d(e))
+        if (P(e))
           return `${this.punycodePrefix}${c(s)}`;
       return s;
     }).join(".");

package/dist/esm/utils.d.mts

@@ -1,18 +1,26 @@
+export type Query = Record<string, string | number | boolean | (string | number | boolean)[]>;
 export declare function isDynamicPath(path: string): boolean;
 export declare function getDynamicPaths(pathname: string): string[];
 export declare function extractPathKey(path: string): string;
 /**
  * Replaces dynamic paths in the pathname with values from the query
  * @param {string} pathname
- * @param {Record<string, string>} query
+ * @param {Query} query
  * @returns {string} refined pathname
  */
-export declare function refinePathnameWithQuery(pathname: string, query: Record<string, string>): string;
+export declare function refinePathnameWithQuery(pathname: string, query: Query): string;
 /**
  * Removes queries that have already been used in the pathname.
  * @param {string} pathname
- * @param {Record<string, string>} query
- * @returns {Record<string, string>} refined query
+ * @param {Query} query
+ * @returns {Query} refined query
  */
-export declare function refineQueryWithPathname(pathname: string, query: Record<string, string>): Record<string, string>;
+export declare function refineQueryWithPathname(pathname: string, query: Query): Query;
 export declare function isASCIICodeChar(char: string): boolean;
+/**
+ * Convert queries to array, if they are not of the defined primitive types, they will not be included in the array.
+ * @param {string} pathname
+ * @param {Query} query
+ * @returns {string[][]} refined query
+ */
+export declare function convertQueryToArray(query: Query): string[][];

package/dist/esm/utils.mjs

@@ -1,37 +1,47 @@
-const u = /^:/, a = /^\[.*\]$/;
-function f(t) {
-  return u.test(t) || a.test(t);
-}
-function c(t) {
-  return t.split("/").filter(f);
-}
-function o(t) {
-  return t.slice(1, u.test(t) ? void 0 : -1);
-}
-function P(t, e) {
-  return c(t).reduce((n, r) => {
-    const i = o(r);
-    return e[i] ? n.replace(r, e[i]) : n;
-  }, t);
-}
-function _(t, e) {
-  return c(t).reduce((n, r) => {
-    const i = o(r), {
-      [i]: A,
-      ...s
-    } = n;
-    return s;
+const s = /^:/, a = /^\[.*\]$/;
+function A(r) {
+  return s.test(r) || a.test(r);
+}
+function c(r) {
+  return r.split("/").filter(A);
+}
+function f(r) {
+  return r.slice(1, s.test(r) ? void 0 : -1);
+}
+function _(r, e) {
+  return c(r).reduce((t, n) => {
+    const i = f(n), u = e[i];
+    return u && typeof u == "string" ? t.replace(n, u) : t;
+  }, r);
+}
+function d(r, e) {
+  return c(r).reduce((t, n) => {
+    const i = f(n);
+    if (typeof t[i] != "string")
+      return t;
+    const {
+      [i]: P,
+      ...y
+    } = t;
+    return y;
   }, e);
 }
 const C = 127;
-function h(t) {
-  return t.charCodeAt(0) > C;
+function g(r) {
+  return r.charCodeAt(0) > C;
+}
+function o(r) {
+  return ["string", "number", "boolean"].includes(typeof r);
+}
+function h(r) {
+  return Object.entries(r).flatMap(([e, t]) => o(t) ? [[e, String(t)]] : Array.isArray(t) && t.every(o) ? t.map((n) => [e, String(n)]) : []);
 }
 export {
-  o as extractPathKey,
+  h as convertQueryToArray,
+  f as extractPathKey,
   c as getDynamicPaths,
-  h as isASCIICodeChar,
-  f as isDynamicPath,
-  P as refinePathnameWithQuery,
-  _ as refineQueryWithPathname
+  g as isASCIICodeChar,
+  A as isDynamicPath,
+  _ as refinePathnameWithQuery,
+  d as refineQueryWithPathname
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naverpay/nurl",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "URL build library",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.mjs",