url-operator 0.3.0 → 0.3.2

package/README.md

@@ -31,6 +31,11 @@ function setPassword(url: URL, password: string): URL
 function setHost(url: URL, host: string): URL
 ```
 
+### setHostname
+```ts
+function setHostname(url: URL, hostname: string): URL
+```
+
 ### setPort
 ```ts
 function setPort(url: URL, port: number): URL

package/lib/decode.js.map

@@ -1 +1 @@
-{"version":3,"file":"decode.js","sourceRoot":"","sources":["../src/decode.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,MAAM,CAAC,GAAW;IAChC,OAAO,SAAS,CAAC,GAAG,CAAC,CAAA;AACvB,CAAC"}
+{"version":3,"file":"decode.js","sourceRoot":"","sources":["../src/decode.ts"],"names":[],"mappings":"AACA,MAAM,UAAU,MAAM,CAAC,GAAW;IAChC,OAAO,SAAS,CAAC,GAAG,CAAC,CAAA;AACvB,CAAC"}

package/lib/encode.js

@@ -1,4 +1,24 @@
+import { decode } from './decode.js';
 export function encode(url) {
-    return encodeURI(decodeURI(url));
+    const decodedURL = decode(url);
+    const encodedURLParts = [];
+    const re = /%[A-F0-9]{2}/gi;
+    let result;
+    let lastMatchedEndIndex = 0;
+    while (result = re.exec(decodedURL), result) {
+        const matched = result[0];
+        const matchedStartIndex = result.index;
+        const matchedEndIndex = matchedStartIndex
+            + matched.length;
+        const rawPart = decodedURL.slice(lastMatchedEndIndex, matchedStartIndex);
+        encodedURLParts.push(encodeURI(rawPart));
+        encodedURLParts.push(matched);
+        lastMatchedEndIndex = matchedEndIndex;
+    }
+    if (lastMatchedEndIndex < decodedURL.length) {
+        const rawPart = decodedURL.slice(lastMatchedEndIndex, decodedURL.length);
+        encodedURLParts.push(encodeURI(rawPart));
+    }
+    return encodedURLParts.join('');
 }
 //# sourceMappingURL=encode.js.map

package/lib/encode.js.map

@@ -1 +1 @@
-{"version":3,"file":"encode.js","sourceRoot":"","sources":["../src/encode.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,MAAM,CAAC,GAAW;IAChC,OAAO,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;AAClC,CAAC"}
+{"version":3,"file":"encode.js","sourceRoot":"","sources":["../src/encode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAGpC,MAAM,UAAU,MAAM,CAAC,GAAW;IAChC,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA;IAE9B,MAAM,eAAe,GAAa,EAAE,CAAA;IAEpC,MAAM,EAAE,GAAG,gBAAgB,CAAA;IAC3B,IAAI,MAA8B,CAAA;IAClC,IAAI,mBAAmB,GAAG,CAAC,CAAA;IAC3B,OAAO,MAAM,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE;QAC3C,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;QACzB,MAAM,iBAAiB,GAAG,MAAM,CAAC,KAAK,CAAA;QACtC,MAAM,eAAe,GAAG,iBAAiB;cACjB,OAAO,CAAC,MAAM,CAAA;QAEtC,MAAM,OAAO,GAAG,UAAU,CAAC,KAAK,CAAC,mBAAmB,EAAE,iBAAiB,CAAC,CAAA;QACxE,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAA;QAExC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAE7B,mBAAmB,GAAG,eAAe,CAAA;KACtC;IAED,IAAI,mBAAmB,GAAG,UAAU,CAAC,MAAM,EAAE;QAC3C,MAAM,OAAO,GAAG,UAAU,CAAC,KAAK,CAAC,mBAAmB,EAAE,UAAU,CAAC,MAAM,CAAC,CAAA;QACxE,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAA;KACzC;IAED,OAAO,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;AACjC,CAAC"}

package/lib/index.d.ts

@@ -2,6 +2,7 @@ export * from './set-protocol.js';
 export * from './set-username.js';
 export * from './set-password.js';
 export * from './set-host.js';
+export * from './set-hostname.js';
 export * from './set-port.js';
 export * from './set-pathname.js';
 export * from './append-pathname.js';

package/lib/index.js

@@ -2,6 +2,7 @@ export * from './set-protocol.js';
 export * from './set-username.js';
 export * from './set-password.js';
 export * from './set-host.js';
+export * from './set-hostname.js';
 export * from './set-port.js';
 export * from './set-pathname.js';
 export * from './append-pathname.js';

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAA;AACjC,cAAc,mBAAmB,CAAA;AACjC,cAAc,mBAAmB,CAAA;AACjC,cAAc,eAAe,CAAA;AAC7B,cAAc,eAAe,CAAA;AAC7B,cAAc,mBAAmB,CAAA;AACjC,cAAc,sBAAsB,CAAA;AACpC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,uBAAuB,CAAA;AACrC,cAAc,wBAAwB,CAAA;AACtC,cAAc,0BAA0B,CAAA;AACxC,cAAc,eAAe,CAAA;AAC7B,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAA;AACjC,cAAc,mBAAmB,CAAA;AACjC,cAAc,mBAAmB,CAAA;AACjC,cAAc,eAAe,CAAA;AAC7B,cAAc,mBAAmB,CAAA;AACjC,cAAc,eAAe,CAAA;AAC7B,cAAc,mBAAmB,CAAA;AACjC,cAAc,sBAAsB,CAAA;AACpC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,uBAAuB,CAAA;AACrC,cAAc,wBAAwB,CAAA;AACtC,cAAc,0BAA0B,CAAA;AACxC,cAAc,eAAe,CAAA;AAC7B,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA"}

package/lib/set-host.js

@@ -1,5 +1,6 @@
 export function setHost(url, host) {
     const newURL = new URL(url);
+    newURL.port = '';
     newURL.host = host;
     return newURL;
 }

package/lib/set-host.js.map

@@ -1 +1 @@
-{"version":3,"file":"set-host.js","sourceRoot":"","sources":["../src/set-host.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,OAAO,CAAC,GAAQ,EAAE,IAAY;IAC5C,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAA;IAE3B,MAAM,CAAC,IAAI,GAAG,IAAI,CAAA;IAElB,OAAO,MAAM,CAAA;AACf,CAAC"}
+{"version":3,"file":"set-host.js","sourceRoot":"","sources":["../src/set-host.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,OAAO,CAAC,GAAQ,EAAE,IAAY;IAC5C,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAA;IAE3B,MAAM,CAAC,IAAI,GAAG,EAAE,CAAA;IAChB,MAAM,CAAC,IAAI,GAAG,IAAI,CAAA;IAElB,OAAO,MAAM,CAAA;AACf,CAAC"}

package/lib/set-hostname.d.ts

@@ -0,0 +1 @@
+export declare function setHostname(url: URL, hostname: string): URL;

package/lib/set-hostname.js

@@ -0,0 +1,6 @@
+export function setHostname(url, hostname) {
+    const newURL = new URL(url);
+    newURL.hostname = hostname;
+    return newURL;
+}
+//# sourceMappingURL=set-hostname.js.map

package/lib/set-hostname.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"set-hostname.js","sourceRoot":"","sources":["../src/set-hostname.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,WAAW,CAAC,GAAQ,EAAE,QAAgB;IACpD,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAA;IAE3B,MAAM,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAE1B,OAAO,MAAM,CAAA;AACf,CAAC"}

package/lib/set-protocol.js

@@ -1,8 +1,8 @@
 export function setProtocol(url, protocol) {
     const oldURL = new URL(url);
-    const newURL = new URL(oldURL.href.replace(/^(\S+:)\/\//, protocol.endsWith(':')
+    const newURL = new URL(oldURL.href.replace(/^\S+:/, protocol.endsWith(':')
         ? protocol
-        : `${protocol}://`));
+        : `${protocol}:`));
     return newURL;
 }
 //# sourceMappingURL=set-protocol.js.map

package/lib/set-protocol.js.map

@@ -1 +1 @@
-{"version":3,"file":"set-protocol.js","sourceRoot":"","sources":["../src/set-protocol.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,WAAW,CAAC,GAAQ,EAAE,QAAgB;IACpD,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAA;IAG3B,MAAM,MAAM,GAAG,IAAI,GAAG,CACpB,MAAM,CAAC,IAAI,CAAC,OAAO,CACjB,aAAa,EACb,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC;QACtB,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,GAAG,QAAQ,KAAK,CACnB,CACF,CAAA;IAED,OAAO,MAAM,CAAA;AACf,CAAC"}
+{"version":3,"file":"set-protocol.js","sourceRoot":"","sources":["../src/set-protocol.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,WAAW,CAAC,GAAQ,EAAE,QAAgB;IACpD,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAA;IAW3B,MAAM,MAAM,GAAG,IAAI,GAAG,CACpB,MAAM,CAAC,IAAI,CAAC,OAAO,CACjB,OAAO,EACP,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC;QACtB,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,GAAG,QAAQ,GAAG,CACjB,CACF,CAAA;IAED,OAAO,MAAM,CAAA;AACf,CAAC"}

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "url-operator",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "",
   "keywords": [],
   "files": [
-    "lib"
+    "lib",
+    "src"
   ],
   "type": "module",
   "main": "lib/index.js",

package/src/append-pathname.ts

@@ -0,0 +1,21 @@
+import { go } from '@blackglory/prelude'
+
+export function appendPathname(url: URL, pathname: string): URL {
+  const baseURL = go(() => {
+    const baseURL = new URL(url)
+    if (!baseURL.pathname.endsWith('/')) {
+      baseURL.pathname = `${baseURL.pathname}/`
+    }
+
+    return baseURL
+  })
+
+  const newURL = new URL(
+    pathname.replace(/^\/*/, '')
+  , baseURL
+  )
+  newURL.search = baseURL.search
+  newURL.hash = baseURL.hash
+
+  return newURL
+}

package/src/append-search-param.ts

@@ -0,0 +1,13 @@
+export function appendSearchParam(
+  url: URL
+, name: string
+, value: string | number
+): URL {
+  const newURL = new URL(url)
+
+  const newSearchParams = new URLSearchParams(newURL.searchParams)
+  newSearchParams.append(name, value.toString())
+  newURL.search = newSearchParams.toString()
+
+  return newURL
+}

package/src/decode.ts

@@ -0,0 +1,4 @@
+// 该函数仅仅是`decodeURI`的别名, 因为`decodeURI`通过了所有测试用例.
+export function decode(url: string): string {
+  return decodeURI(url)
+}

package/src/encode.ts

@@ -0,0 +1,32 @@
+import { decode } from './decode.js'
+
+// 与`encodeURI`不同, 该函数会首先尝试解码URL, 以防止二次编码.
+export function encode(url: string): string {
+  const decodedURL = decode(url)
+
+  const encodedURLParts: string[] = []
+
+  const re = /%[A-F0-9]{2}/gi
+  let result: RegExpExecArray | null
+  let lastMatchedEndIndex = 0
+  while (result = re.exec(decodedURL), result) {
+    const matched = result[0]
+    const matchedStartIndex = result.index
+    const matchedEndIndex = matchedStartIndex
+                          + matched.length
+
+    const rawPart = decodedURL.slice(lastMatchedEndIndex, matchedStartIndex)
+    encodedURLParts.push(encodeURI(rawPart))
+
+    encodedURLParts.push(matched)
+
+    lastMatchedEndIndex = matchedEndIndex
+  }
+
+  if (lastMatchedEndIndex < decodedURL.length) {
+    const rawPart = decodedURL.slice(lastMatchedEndIndex, decodedURL.length)
+    encodedURLParts.push(encodeURI(rawPart))
+  }
+
+  return encodedURLParts.join('')
+}

package/src/index.ts

@@ -0,0 +1,15 @@
+export * from './set-protocol.js'
+export * from './set-username.js'
+export * from './set-password.js'
+export * from './set-host.js'
+export * from './set-hostname.js'
+export * from './set-port.js'
+export * from './set-pathname.js'
+export * from './append-pathname.js'
+export * from './set-search.js'
+export * from './set-search-param.js'
+export * from './set-search-params.js'
+export * from './append-search-param.js'
+export * from './set-hash.js'
+export * from './encode.js'
+export * from './decode.js'

package/src/set-hash.ts

@@ -0,0 +1,7 @@
+export function setHash(url: URL, hash: string): URL {
+  const newURL = new URL(url)
+
+  newURL.hash = hash
+
+  return newURL
+}

package/src/set-host.ts

@@ -0,0 +1,8 @@
+export function setHost(url: URL, host: string): URL {
+  const newURL = new URL(url)
+
+  newURL.port = ''
+  newURL.host = host
+
+  return newURL
+}

package/src/set-hostname.ts

@@ -0,0 +1,7 @@
+export function setHostname(url: URL, hostname: string): URL {
+  const newURL = new URL(url)
+
+  newURL.hostname = hostname
+
+  return newURL
+}

package/src/set-password.ts

@@ -0,0 +1,7 @@
+export function setPassword(url: URL, password: string): URL {
+  const newURL = new URL(url)
+
+  newURL.password = password
+
+  return newURL
+}

package/src/set-pathname.ts

@@ -0,0 +1,7 @@
+export function setPathname(url: URL, pathname: string): URL {
+  const newURL = new URL(url)
+
+  newURL.pathname = pathname
+
+  return newURL
+}

package/src/set-port.ts

@@ -0,0 +1,7 @@
+export function setPort(url: URL, port: number): URL {
+  const newURL = new URL(url)
+
+  newURL.port = port.toString()
+
+  return newURL
+}

package/src/set-protocol.ts

@@ -0,0 +1,23 @@
+export function setProtocol(url: URL, protocol: string): URL {
+  const oldURL = new URL(url)
+
+  // WHATWG URL标准在更改协议时具有怪癖, 会阻止与[Special Scheme]协议相关的修改.
+  // 这意味着协议为`http:`的URL无法更改为`foo:`协议, 协议为`foo:`的URL也无法更改为`http:`协议.
+  // 为了绕过这项限制, 此处直接替换URL字符串.
+  // [Special Scheme]: https://url.spec.whatwg.org/#special-scheme
+
+  // 此外, 还存在一种URL的host为空的情况, 即`mailto:`、`javascript:`等协议,
+  // 这些URL在协议后直接跟pathname而不是host.
+  // 要正确处理相关URL的协议转换, 需要完成host与pathname之间的转换, 而这在URL对象上也无法实现(赋值会静默失败).
+
+  const newURL = new URL(
+    oldURL.href.replace(
+      /^\S+:/
+    , protocol.endsWith(':')
+      ? protocol
+      : `${protocol}:`
+    )
+  )
+
+  return newURL
+}

package/src/set-search-param.ts

@@ -0,0 +1,13 @@
+export function setSearchParam(
+  url: URL
+, name: string
+, value: string | number
+): URL {
+  const newURL = new URL(url)
+
+  const newSearchParams = new URLSearchParams(newURL.searchParams)
+  newSearchParams.set(name, value.toString())
+  newURL.search = newSearchParams.toString()
+
+  return newURL
+}

package/src/set-search-params.ts

@@ -0,0 +1,14 @@
+export function setSearchParams(
+  url: URL
+, searchParams: Record<string, string | number>
+): URL {
+  const newURL = new URL(url)
+
+  const newSearchParams = new URLSearchParams(newURL.searchParams)
+  for (const [name, value] of Object.entries(searchParams)) {
+    newSearchParams.set(name, value.toString())
+  }
+  newURL.search = newSearchParams.toString()
+
+  return newURL
+}

package/src/set-search.ts

@@ -0,0 +1,7 @@
+export function setSearch(url: URL, search: string): URL {
+  const newURL = new URL(url)
+
+  newURL.search = search
+
+  return newURL
+}

package/src/set-username.ts

@@ -0,0 +1,7 @@
+export function setUsername(url: URL, username: string): URL {
+  const newURL = new URL(url)
+
+  newURL.username = username
+
+  return newURL
+}