@bessemer/cornerstone 0.5.52 → 0.5.53

package/dist/uri.js

@@ -1,5 +1,7 @@
 // src/uri.ts
-import { Arrays, Objects, Strings } from "@bessemer/cornerstone";
+import { isEmpty, isString, removeStart, splitFirst, startsWith } from "@bessemer/cornerstone/string";
+import { isNil, isPresent } from "@bessemer/cornerstone/object";
+import { contains } from "@bessemer/cornerstone/array";
 var encode = (uriComponent) => {
   return encodeURIComponent(uriComponent);
 };
@@ -7,11 +9,11 @@ var decode = (uriComponent) => {
   return decodeURIComponent(uriComponent);
 };
 var parseSchemePart = (url) => {
-  const schemeMatch = Strings.splitFirst(url, /(\/\/|:)/);
-  if (Objects.isNil(schemeMatch.selection) || schemeMatch.separator === "//") {
+  const schemeMatch = splitFirst(url, /(\/\/|:)/);
+  if (isNil(schemeMatch.selection) || schemeMatch.separator === "//") {
     return [null, url];
   }
-  if (Strings.isEmpty(schemeMatch.selection)) {
+  if (isEmpty(schemeMatch.selection)) {
     return [null, schemeMatch.rest];
   } else {
     return [schemeMatch.selection, schemeMatch.rest];
@@ -19,58 +21,58 @@ var parseSchemePart = (url) => {
 };
 var parseAuthenticationPart = (url) => {
   let targetPart = url;
-  const queryMatch = Strings.splitFirst(targetPart, "?");
-  const fragmentMatch = Strings.splitFirst(targetPart, "#");
-  if (Objects.isPresent(queryMatch.selection)) {
+  const queryMatch = splitFirst(targetPart, "?");
+  const fragmentMatch = splitFirst(targetPart, "#");
+  if (isPresent(queryMatch.selection)) {
     targetPart = queryMatch.selection;
-  } else if (Objects.isPresent(fragmentMatch.selection)) {
+  } else if (isPresent(fragmentMatch.selection)) {
     targetPart = fragmentMatch.selection;
   }
-  const { selection: authentication } = Strings.splitFirst(targetPart, "@");
-  if (Objects.isNil(authentication)) {
+  const { selection: authentication } = splitFirst(targetPart, "@");
+  if (isNil(authentication)) {
     return [null, url];
   }
-  const { rest } = Strings.splitFirst(url, "@");
-  return [parseAuthentication(Strings.removeStart(authentication, "//")), "//" + rest];
+  const { rest } = splitFirst(url, "@");
+  return [parseAuthentication(removeStart(authentication, "//")), "//" + rest];
 };
 var parseAuthentication = (authentication) => {
-  const { selection: principal, rest: authenticationRest } = Strings.splitFirst(authentication, ":");
-  if (Objects.isNil(principal)) {
+  const { selection: principal, rest: authenticationRest } = splitFirst(authentication, ":");
+  if (isNil(principal)) {
     return { principal: authenticationRest, password: null };
   }
-  if (Strings.isEmpty(principal)) {
+  if (isEmpty(principal)) {
     throw new Error(`Unable to parse Authentication: ${authentication}`);
   }
   return { principal, password: authenticationRest };
 };
 var parseHostPart = (url) => {
-  if (Strings.startsWith(url, "?") || Strings.startsWith(url, "#")) {
+  if (startsWith(url, "?") || startsWith(url, "#")) {
     return [null, url];
   }
-  let hostRequired = Strings.startsWith(url, "//");
+  let hostRequired = startsWith(url, "//");
   if (!hostRequired) {
     return [null, url];
   }
-  url = Strings.removeStart(url, "//");
-  const urlMatch = Strings.splitFirst(url, /[\/?#]/);
+  url = removeStart(url, "//");
+  const urlMatch = splitFirst(url, /[\/?#]/);
   let host = urlMatch.rest;
   let rest = "";
-  if (Objects.isPresent(urlMatch.selection)) {
+  if (isPresent(urlMatch.selection)) {
     host = urlMatch.selection;
     rest = urlMatch.separator + urlMatch.rest;
   }
-  if (Strings.isEmpty(host)) {
+  if (isEmpty(host)) {
     return [null, rest];
   }
   return [parseHost(host), rest];
 };
 var parseHost = (host) => {
-  if (Strings.startsWith(host, "[")) {
-    const ipMatch = Strings.splitFirst(host, "]");
-    if (Objects.isPresent(ipMatch.selection)) {
-      const portMatch = Strings.splitFirst(ipMatch.rest, ":");
-      if (Objects.isPresent(portMatch.selection)) {
-        if (Strings.isEmpty(portMatch.selection)) {
+  if (startsWith(host, "[")) {
+    const ipMatch = splitFirst(host, "]");
+    if (isPresent(ipMatch.selection)) {
+      const portMatch = splitFirst(ipMatch.rest, ":");
+      if (isPresent(portMatch.selection)) {
+        if (isEmpty(portMatch.selection)) {
           return { value: ipMatch.selection + "]", port: Number(portMatch.rest) };
         }
       } else {
@@ -78,11 +80,11 @@ var parseHost = (host) => {
       }
     }
   }
-  let hostMatch = Strings.splitFirst(host, ":");
-  if (Objects.isNil(hostMatch.selection)) {
+  let hostMatch = splitFirst(host, ":");
+  if (isNil(hostMatch.selection)) {
     return { value: hostMatch.rest, port: null };
   }
-  if (Strings.isEmpty(hostMatch.selection)) {
+  if (isEmpty(hostMatch.selection)) {
     throw new Error(`Unable to parse Host: ${host}`);
   }
   const hostName = hostMatch.selection;
@@ -90,12 +92,12 @@ var parseHost = (host) => {
 };
 var parseLocation = (url) => {
   const location = { path: "", query: null, fragment: null };
-  const fragmentMatch = Strings.splitFirst(url, "#");
-  if (Objects.isPresent(fragmentMatch.selection) && !Strings.isEmpty(fragmentMatch.rest)) {
+  const fragmentMatch = splitFirst(url, "#");
+  if (isPresent(fragmentMatch.selection) && !isEmpty(fragmentMatch.rest)) {
     location.fragment = fragmentMatch.rest;
   }
-  const queryMatch = Strings.splitFirst(fragmentMatch.selection ?? fragmentMatch.rest, "?");
-  if (Objects.isPresent(queryMatch.selection) && !Strings.isEmpty(queryMatch.rest)) {
+  const queryMatch = splitFirst(fragmentMatch.selection ?? fragmentMatch.rest, "?");
+  if (isPresent(queryMatch.selection) && !isEmpty(queryMatch.rest)) {
     location.query = queryMatch.rest;
   }
   location.path = queryMatch.selection ?? queryMatch.rest;
@@ -119,8 +121,8 @@ var emptyLocation = () => {
 var build = (builder) => {
   const scheme = builder.scheme ?? null;
   let host = null;
-  if (Objects.isPresent(builder.host)) {
-    if (Strings.isString(builder.host)) {
+  if (isPresent(builder.host)) {
+    if (isString(builder.host)) {
       host = parseHost(builder.host);
     } else {
       host = {
@@ -130,8 +132,8 @@ var build = (builder) => {
     }
   }
   let authentication = null;
-  if (Objects.isPresent(builder.authentication)) {
-    if (Strings.isString(builder.authentication)) {
+  if (isPresent(builder.authentication)) {
+    if (isString(builder.authentication)) {
       authentication = parseAuthentication(builder.authentication);
     } else {
       authentication = {
@@ -141,8 +143,8 @@ var build = (builder) => {
     }
   }
   let location = emptyLocation();
-  if (Objects.isPresent(builder.location)) {
-    if (Strings.isString(builder.location)) {
+  if (isPresent(builder.location)) {
+    if (isString(builder.location)) {
       location = parseLocation(builder.location);
     } else {
       location = {
@@ -167,39 +169,39 @@ var UriComponentType = /* @__PURE__ */ ((UriComponentType2) => {
 })(UriComponentType || {});
 var format = (uri, format2 = Object.values(UriComponentType)) => {
   let urlString = "";
-  if (Objects.isPresent(uri.scheme) && Arrays.contains(format2, "Scheme" /* Scheme */)) {
+  if (isPresent(uri.scheme) && contains(format2, "Scheme" /* Scheme */)) {
     urlString = urlString + uri.scheme;
   }
-  if (Objects.isPresent(uri.host) && Arrays.contains(format2, "Host" /* Host */)) {
-    if (Objects.isPresent(uri.scheme)) {
+  if (isPresent(uri.host) && contains(format2, "Host" /* Host */)) {
+    if (isPresent(uri.scheme)) {
       urlString = urlString + "://";
     }
-    if (Objects.isPresent(uri.authentication)) {
+    if (isPresent(uri.authentication)) {
       urlString = urlString + uri.authentication.principal;
-      if (Objects.isPresent(uri.authentication.password)) {
+      if (isPresent(uri.authentication.password)) {
         urlString = urlString + ":" + uri.authentication.password;
       }
       urlString = urlString + "@";
     }
     urlString = urlString + uri.host.value;
-    if (Objects.isPresent(uri.host.port)) {
+    if (isPresent(uri.host.port)) {
       urlString = urlString + ":" + uri.host.port;
     }
   }
-  if (Arrays.contains(format2, "Location" /* Location */)) {
+  if (contains(format2, "Location" /* Location */)) {
     urlString = urlString + formatLocation(uri.location, format2);
   }
   return urlString;
 };
 var formatLocation = (location, format2) => {
   let urlString = "";
-  if (!Strings.isEmpty(location.path)) {
+  if (!isEmpty(location.path)) {
     urlString = urlString + location.path;
   }
-  if (!Strings.isEmpty(location.query)) {
+  if (!isEmpty(location.query)) {
     urlString = urlString + "?" + location.query;
   }
-  if (!Strings.isEmpty(location.fragment)) {
+  if (!isEmpty(location.fragment)) {
     urlString = urlString + "#" + encode(location.fragment);
   }
   return urlString;

package/dist/uri.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/uri.ts"],"sourcesContent":["import { Arrays, Objects, Strings } from '@bessemer/cornerstone'\nimport { NominalType } from '@bessemer/cornerstone/types'\nimport { StringSplitResult } from '@bessemer/cornerstone/string'\n\nexport const encode = (uriComponent: UriComponent) => {\n  return encodeURIComponent(uriComponent)\n}\n\nexport const decode = (uriComponent: UriComponent) => {\n  return decodeURIComponent(uriComponent)\n}\n\nexport type UriString = NominalType<string, 'UriString'>\nexport type UriComponent = string\n\nexport type UriScheme = string\n\nexport type UriAuthentication = {\n  principal: string\n  password: string | null\n}\n\nexport type UriHost = {\n  value: string\n  port: number | null\n}\n\nexport interface UriLocation {\n  path: string\n  query: string | null\n  fragment: string | null\n}\n\nexport interface Uri {\n  scheme: UriScheme | null\n  host: UriHost | null\n  authentication: UriAuthentication | null\n  location: UriLocation\n}\n\nconst parseSchemePart = (url: UriComponent): [UriScheme | null, UriComponent] => {\n  // Search for the colon or double slash\n  const schemeMatch = Strings.splitFirst(url, /(\\/\\/|:)/)\n\n  // If we don't find either, or we hit the double slash before finding a colon, there is no scheme\n  if (Objects.isNil(schemeMatch.selection) || schemeMatch.separator === '//') {\n    return [null, url]\n  }\n\n  // This means the string started with :, so no protocol. We'll go ahead and remove the : from consideration\n  if (Strings.isEmpty(schemeMatch.selection)) {\n    return [null, schemeMatch.rest]\n  } else {\n    return [schemeMatch.selection, schemeMatch.rest]\n  }\n}\n\nconst parseAuthenticationPart = (url: UriComponent): [UriAuthentication | null, UriComponent] => {\n  let targetPart = url\n  const queryMatch = Strings.splitFirst(targetPart, '?')\n  const fragmentMatch = Strings.splitFirst(targetPart, '#')\n  if (Objects.isPresent(queryMatch.selection)) {\n    targetPart = queryMatch.selection\n  } else if (Objects.isPresent(fragmentMatch.selection)) {\n    targetPart = fragmentMatch.selection\n  }\n\n  const { selection: authentication } = Strings.splitFirst(targetPart, '@')\n\n  // If there is no @, then we don't have an authentication\n  if (Objects.isNil(authentication)) {\n    return [null, url]\n  }\n\n  const { rest } = Strings.splitFirst(url, '@')\n\n  return [parseAuthentication(Strings.removeStart(authentication, '//')), '//' + rest]\n}\n\nconst parseAuthentication = (authentication: UriComponent): UriAuthentication => {\n  const { selection: principal, rest: authenticationRest } = Strings.splitFirst(authentication, ':')\n\n  // If there isn't a colon, then there is no password but there is a username\n  if (Objects.isNil(principal)) {\n    return { principal: authenticationRest, password: null }\n  }\n\n  // The authentication section started with a :, don't know what to make of this... password but no username?\n  if (Strings.isEmpty(principal)) {\n    throw new Error(`Unable to parse Authentication: ${authentication}`)\n  }\n\n  // Otherwise, we have both, so return the complete authentication object and the rest\n  return { principal, password: authenticationRest }\n}\n\nconst parseHostPart = (url: UriComponent): [UriHost | null, UriComponent] => {\n  // Check if the host is starting with reserved characters, if so we should just bail on trying to parse\n  if (Strings.startsWith(url, '?') || Strings.startsWith(url, '#')) {\n    return [null, url]\n  }\n\n  let hostRequired = Strings.startsWith(url, '//')\n  if (!hostRequired) {\n    return [null, url]\n  }\n\n  url = Strings.removeStart(url, '//')\n\n  // Lets grab everything to the left of the first / ? or #, this is the remainder of our authority (if any)\n  const urlMatch = Strings.splitFirst(url, /[\\/?#]/)\n  let host = urlMatch.rest\n  let rest = ''\n\n  if (Objects.isPresent(urlMatch.selection)) {\n    host = urlMatch.selection\n    rest = urlMatch.separator + urlMatch.rest\n  }\n\n  if (Strings.isEmpty(host)) {\n    return [null, rest]\n  }\n\n  return [parseHost(host), rest]\n}\n\nconst parseHost = (host: UriComponent): UriHost => {\n  // Try to see if we have an ipv6 address like the form [2001:db8::7] and handle it\n  if (Strings.startsWith(host, '[')) {\n    const ipMatch = Strings.splitFirst(host, ']')\n\n    if (Objects.isPresent(ipMatch.selection)) {\n      const portMatch = Strings.splitFirst(ipMatch.rest, ':')\n      if (Objects.isPresent(portMatch.selection)) {\n        if (Strings.isEmpty(portMatch.selection)) {\n          return { value: ipMatch.selection + ']', port: Number(portMatch.rest) }\n        }\n      } else {\n        return { value: ipMatch.selection + ']', port: null }\n      }\n    }\n  }\n\n  let hostMatch: StringSplitResult = Strings.splitFirst(host, ':')\n\n  // We have no :, which means no port, so treat the rest as the hostname\n  if (Objects.isNil(hostMatch.selection)) {\n    return { value: hostMatch.rest, port: null }\n  }\n\n  // The host started with a :, this is odd\n  if (Strings.isEmpty(hostMatch.selection)) {\n    throw new Error(`Unable to parse Host: ${host}`)\n  }\n\n  const hostName = hostMatch.selection\n\n  // Otherwise, we have both, so return the complete authentication object and the rest\n  return { value: hostName, port: Number(hostMatch.rest) }\n}\n\nconst parseLocation = (url: UriComponent): UriLocation => {\n  const location: UriLocation = { path: '', query: null, fragment: null }\n\n  // Lets see if we have a fragment and parse it off the end\n  const fragmentMatch = Strings.splitFirst(url, '#')\n  if (Objects.isPresent(fragmentMatch.selection) && !Strings.isEmpty(fragmentMatch.rest)) {\n    location.fragment = fragmentMatch.rest\n  }\n\n  // Lets see if we have a query string and parse it off the remainder\n  const queryMatch = Strings.splitFirst(fragmentMatch.selection ?? fragmentMatch.rest, '?')\n  if (Objects.isPresent(queryMatch.selection) && !Strings.isEmpty(queryMatch.rest)) {\n    location.query = queryMatch.rest\n  }\n\n  location.path = queryMatch.selection ?? queryMatch.rest\n  return location\n}\n\nexport const parse = (urlString: UriString): Uri => {\n  const [scheme, rest1] = parseSchemePart(urlString)\n  const [authentication, rest2] = parseAuthenticationPart(rest1)\n  const [host, rest3] = parseHostPart(rest2)\n  const location = parseLocation(rest3)\n  const url: Uri = { scheme, host, authentication, location }\n  return url\n}\n\nexport const emptyLocation = (): UriLocation => {\n  return {\n    path: '',\n    query: null,\n    fragment: null,\n  }\n}\n\nexport type UriBuilder = {\n  scheme?: string\n  host?:\n    | {\n        value: string\n        port?: number\n      }\n    | string\n  authentication?:\n    | {\n        principal: string\n        password?: string\n      }\n    | string\n  location?:\n    | {\n        path: string\n        query?: string\n        fragment?: string\n      }\n    | string\n}\n\nexport const build = (builder: UriBuilder): Uri => {\n  const scheme = builder.scheme ?? null\n\n  let host: UriHost | null = null\n  if (Objects.isPresent(builder.host)) {\n    if (Strings.isString(builder.host)) {\n      host = parseHost(builder.host)\n    } else {\n      host = {\n        value: builder.host.value,\n        port: builder.host.port ?? null,\n      }\n    }\n  }\n\n  let authentication: UriAuthentication | null = null\n  if (Objects.isPresent(builder.authentication)) {\n    if (Strings.isString(builder.authentication)) {\n      authentication = parseAuthentication(builder.authentication)\n    } else {\n      authentication = {\n        principal: builder.authentication.principal,\n        password: builder.authentication.password ?? null,\n      }\n    }\n  }\n\n  let location: UriLocation = emptyLocation()\n  if (Objects.isPresent(builder.location)) {\n    if (Strings.isString(builder.location)) {\n      location = parseLocation(builder.location)\n    } else {\n      location = {\n        path: builder.location.path,\n        query: builder.location.query ?? null,\n        fragment: builder.location.fragment ?? null,\n      }\n    }\n  }\n\n  return {\n    scheme,\n    host,\n    authentication,\n    location,\n  }\n}\n\nexport enum UriComponentType {\n  Scheme = 'Scheme',\n  Host = 'Host',\n  Location = 'Location',\n}\n\nexport const format = (uri: Uri, format: Array<UriComponentType> = Object.values(UriComponentType)): UriString => {\n  let urlString = ''\n  if (Objects.isPresent(uri.scheme) && Arrays.contains(format, UriComponentType.Scheme)) {\n    urlString = urlString + uri.scheme\n  }\n\n  if (Objects.isPresent(uri.host) && Arrays.contains(format, UriComponentType.Host)) {\n    if (Objects.isPresent(uri.scheme)) {\n      urlString = urlString + '://'\n    }\n\n    if (Objects.isPresent(uri.authentication)) {\n      urlString = urlString + uri.authentication.principal\n\n      if (Objects.isPresent(uri.authentication.password)) {\n        urlString = urlString + ':' + uri.authentication.password\n      }\n\n      urlString = urlString + '@'\n    }\n\n    urlString = urlString + uri.host.value\n\n    if (Objects.isPresent(uri.host.port)) {\n      urlString = urlString + ':' + uri.host.port\n    }\n  }\n\n  if (Arrays.contains(format, UriComponentType.Location)) {\n    urlString = urlString + formatLocation(uri.location, format)\n  }\n  return urlString\n}\n\nconst formatLocation = (location: UriLocation, format: Array<UriComponentType>): string => {\n  let urlString = ''\n\n  if (!Strings.isEmpty(location.path)) {\n    urlString = urlString + location.path\n  }\n\n  if (!Strings.isEmpty(location.query)) {\n    urlString = urlString + '?' + location.query\n  }\n\n  if (!Strings.isEmpty(location.fragment)) {\n    urlString = urlString + '#' + encode(location.fragment!)\n  }\n\n  return urlString\n}\n\nexport const buildString = (builder: UriBuilder): UriString => {\n  return format(build(builder))\n}\n"],"mappings":"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","names":["UriComponentType","format"]}
+{"version":3,"sources":["../src/uri.ts"],"sourcesContent":["import { NominalType } from '@bessemer/cornerstone/types'\nimport { isEmpty, isString, removeStart, splitFirst, startsWith, StringSplitResult } from '@bessemer/cornerstone/string'\nimport { isNil, isPresent } from '@bessemer/cornerstone/object'\nimport { contains } from '@bessemer/cornerstone/array'\n\nexport const encode = (uriComponent: UriComponent) => {\n  return encodeURIComponent(uriComponent)\n}\n\nexport const decode = (uriComponent: UriComponent) => {\n  return decodeURIComponent(uriComponent)\n}\n\nexport type UriString = NominalType<string, 'UriString'>\nexport type UriComponent = string\n\nexport type UriScheme = string\n\nexport type UriAuthentication = {\n  principal: string\n  password: string | null\n}\n\nexport type UriHost = {\n  value: string\n  port: number | null\n}\n\nexport interface UriLocation {\n  path: string\n  query: string | null\n  fragment: string | null\n}\n\nexport interface Uri {\n  scheme: UriScheme | null\n  host: UriHost | null\n  authentication: UriAuthentication | null\n  location: UriLocation\n}\n\nconst parseSchemePart = (url: UriComponent): [UriScheme | null, UriComponent] => {\n  // Search for the colon or double slash\n  const schemeMatch = splitFirst(url, /(\\/\\/|:)/)\n\n  // If we don't find either, or we hit the double slash before finding a colon, there is no scheme\n  if (isNil(schemeMatch.selection) || schemeMatch.separator === '//') {\n    return [null, url]\n  }\n\n  // This means the string started with :, so no protocol. We'll go ahead and remove the : from consideration\n  if (isEmpty(schemeMatch.selection)) {\n    return [null, schemeMatch.rest]\n  } else {\n    return [schemeMatch.selection, schemeMatch.rest]\n  }\n}\n\nconst parseAuthenticationPart = (url: UriComponent): [UriAuthentication | null, UriComponent] => {\n  let targetPart = url\n  const queryMatch = splitFirst(targetPart, '?')\n  const fragmentMatch = splitFirst(targetPart, '#')\n  if (isPresent(queryMatch.selection)) {\n    targetPart = queryMatch.selection\n  } else if (isPresent(fragmentMatch.selection)) {\n    targetPart = fragmentMatch.selection\n  }\n\n  const { selection: authentication } = splitFirst(targetPart, '@')\n\n  // If there is no @, then we don't have an authentication\n  if (isNil(authentication)) {\n    return [null, url]\n  }\n\n  const { rest } = splitFirst(url, '@')\n\n  return [parseAuthentication(removeStart(authentication, '//')), '//' + rest]\n}\n\nconst parseAuthentication = (authentication: UriComponent): UriAuthentication => {\n  const { selection: principal, rest: authenticationRest } = splitFirst(authentication, ':')\n\n  // If there isn't a colon, then there is no password but there is a username\n  if (isNil(principal)) {\n    return { principal: authenticationRest, password: null }\n  }\n\n  // The authentication section started with a :, don't know what to make of this... password but no username?\n  if (isEmpty(principal)) {\n    throw new Error(`Unable to parse Authentication: ${authentication}`)\n  }\n\n  // Otherwise, we have both, so return the complete authentication object and the rest\n  return { principal, password: authenticationRest }\n}\n\nconst parseHostPart = (url: UriComponent): [UriHost | null, UriComponent] => {\n  // Check if the host is starting with reserved characters, if so we should just bail on trying to parse\n  if (startsWith(url, '?') || startsWith(url, '#')) {\n    return [null, url]\n  }\n\n  let hostRequired = startsWith(url, '//')\n  if (!hostRequired) {\n    return [null, url]\n  }\n\n  url = removeStart(url, '//')\n\n  // Lets grab everything to the left of the first / ? or #, this is the remainder of our authority (if any)\n  const urlMatch = splitFirst(url, /[\\/?#]/)\n  let host = urlMatch.rest\n  let rest = ''\n\n  if (isPresent(urlMatch.selection)) {\n    host = urlMatch.selection\n    rest = urlMatch.separator + urlMatch.rest\n  }\n\n  if (isEmpty(host)) {\n    return [null, rest]\n  }\n\n  return [parseHost(host), rest]\n}\n\nconst parseHost = (host: UriComponent): UriHost => {\n  // Try to see if we have an ipv6 address like the form [2001:db8::7] and handle it\n  if (startsWith(host, '[')) {\n    const ipMatch = splitFirst(host, ']')\n\n    if (isPresent(ipMatch.selection)) {\n      const portMatch = splitFirst(ipMatch.rest, ':')\n      if (isPresent(portMatch.selection)) {\n        if (isEmpty(portMatch.selection)) {\n          return { value: ipMatch.selection + ']', port: Number(portMatch.rest) }\n        }\n      } else {\n        return { value: ipMatch.selection + ']', port: null }\n      }\n    }\n  }\n\n  let hostMatch: StringSplitResult = splitFirst(host, ':')\n\n  // We have no :, which means no port, so treat the rest as the hostname\n  if (isNil(hostMatch.selection)) {\n    return { value: hostMatch.rest, port: null }\n  }\n\n  // The host started with a :, this is odd\n  if (isEmpty(hostMatch.selection)) {\n    throw new Error(`Unable to parse Host: ${host}`)\n  }\n\n  const hostName = hostMatch.selection\n\n  // Otherwise, we have both, so return the complete authentication object and the rest\n  return { value: hostName, port: Number(hostMatch.rest) }\n}\n\nconst parseLocation = (url: UriComponent): UriLocation => {\n  const location: UriLocation = { path: '', query: null, fragment: null }\n\n  // Lets see if we have a fragment and parse it off the end\n  const fragmentMatch = splitFirst(url, '#')\n  if (isPresent(fragmentMatch.selection) && !isEmpty(fragmentMatch.rest)) {\n    location.fragment = fragmentMatch.rest\n  }\n\n  // Lets see if we have a query string and parse it off the remainder\n  const queryMatch = splitFirst(fragmentMatch.selection ?? fragmentMatch.rest, '?')\n  if (isPresent(queryMatch.selection) && !isEmpty(queryMatch.rest)) {\n    location.query = queryMatch.rest\n  }\n\n  location.path = queryMatch.selection ?? queryMatch.rest\n  return location\n}\n\nexport const parse = (urlString: UriString): Uri => {\n  const [scheme, rest1] = parseSchemePart(urlString)\n  const [authentication, rest2] = parseAuthenticationPart(rest1)\n  const [host, rest3] = parseHostPart(rest2)\n  const location = parseLocation(rest3)\n  const url: Uri = { scheme, host, authentication, location }\n  return url\n}\n\nexport const emptyLocation = (): UriLocation => {\n  return {\n    path: '',\n    query: null,\n    fragment: null,\n  }\n}\n\nexport type UriBuilder = {\n  scheme?: string\n  host?:\n    | {\n        value: string\n        port?: number\n      }\n    | string\n  authentication?:\n    | {\n        principal: string\n        password?: string\n      }\n    | string\n  location?:\n    | {\n        path: string\n        query?: string\n        fragment?: string\n      }\n    | string\n}\n\nexport const build = (builder: UriBuilder): Uri => {\n  const scheme = builder.scheme ?? null\n\n  let host: UriHost | null = null\n  if (isPresent(builder.host)) {\n    if (isString(builder.host)) {\n      host = parseHost(builder.host)\n    } else {\n      host = {\n        value: builder.host.value,\n        port: builder.host.port ?? null,\n      }\n    }\n  }\n\n  let authentication: UriAuthentication | null = null\n  if (isPresent(builder.authentication)) {\n    if (isString(builder.authentication)) {\n      authentication = parseAuthentication(builder.authentication)\n    } else {\n      authentication = {\n        principal: builder.authentication.principal,\n        password: builder.authentication.password ?? null,\n      }\n    }\n  }\n\n  let location: UriLocation = emptyLocation()\n  if (isPresent(builder.location)) {\n    if (isString(builder.location)) {\n      location = parseLocation(builder.location)\n    } else {\n      location = {\n        path: builder.location.path,\n        query: builder.location.query ?? null,\n        fragment: builder.location.fragment ?? null,\n      }\n    }\n  }\n\n  return {\n    scheme,\n    host,\n    authentication,\n    location,\n  }\n}\n\nexport enum UriComponentType {\n  Scheme = 'Scheme',\n  Host = 'Host',\n  Location = 'Location',\n}\n\nexport const format = (uri: Uri, format: Array<UriComponentType> = Object.values(UriComponentType)): UriString => {\n  let urlString = ''\n  if (isPresent(uri.scheme) && contains(format, UriComponentType.Scheme)) {\n    urlString = urlString + uri.scheme\n  }\n\n  if (isPresent(uri.host) && contains(format, UriComponentType.Host)) {\n    if (isPresent(uri.scheme)) {\n      urlString = urlString + '://'\n    }\n\n    if (isPresent(uri.authentication)) {\n      urlString = urlString + uri.authentication.principal\n\n      if (isPresent(uri.authentication.password)) {\n        urlString = urlString + ':' + uri.authentication.password\n      }\n\n      urlString = urlString + '@'\n    }\n\n    urlString = urlString + uri.host.value\n\n    if (isPresent(uri.host.port)) {\n      urlString = urlString + ':' + uri.host.port\n    }\n  }\n\n  if (contains(format, UriComponentType.Location)) {\n    urlString = urlString + formatLocation(uri.location, format)\n  }\n  return urlString\n}\n\nconst formatLocation = (location: UriLocation, format: Array<UriComponentType>): string => {\n  let urlString = ''\n\n  if (!isEmpty(location.path)) {\n    urlString = urlString + location.path\n  }\n\n  if (!isEmpty(location.query)) {\n    urlString = urlString + '?' + location.query\n  }\n\n  if (!isEmpty(location.fragment)) {\n    urlString = urlString + '#' + encode(location.fragment!)\n  }\n\n  return urlString\n}\n\nexport const buildString = (builder: UriBuilder): UriString => {\n  return format(build(builder))\n}\n"],"mappings":"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","names":["UriComponentType","format"]}

package/dist/url.d.ts

@@ -1,4 +1,3 @@
-import { Uris } from '@bessemer/cornerstone';
 import { Dictionary } from '@bessemer/cornerstone/types';
 import { Uri, UriBuilder, UriComponent, UriLocation, UriString } from '@bessemer/cornerstone/uri';
 export declare const encode: (uriComponent: UriComponent) => string;
@@ -12,7 +11,7 @@ export interface Url extends Uri {
 }
 export type UrlLike = Url | UriString;
 export declare const parse: (urlString: UriString, normalize?: boolean) => Url;
-export declare const format: (uri: Uri, format?: Array<Uris.UriComponentType>) => UriString;
+export declare const format: (uri: Uri, format?: Array<import("@bessemer/cornerstone/uri").UriComponentType>) => UriString;
 export type UrlBuilder = UriBuilder & {
     location?: {
         parameters?: Dictionary<string | Array<string>>;

package/dist/url.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"url.d.ts","sourceRoot":"","sources":["../src/url.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,IAAI,EAAE,MAAM,uBAAuB,CAAA;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AACxD,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AAEjG,eAAO,MAAM,MAAM,wCAAc,CAAA;AAEjC,eAAO,MAAM,MAAM,wCAAc,CAAA;AAEjC,MAAM,WAAW,WAAY,SAAQ,WAAW;IAC9C,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;IAC3B,UAAU,EAAE,UAAU,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;CAC/C;AAED,MAAM,WAAW,GAAI,SAAQ,GAAG;IAC9B,QAAQ,EAAE,WAAW,CAAA;CACtB;AAED,MAAM,MAAM,OAAO,GAAG,GAAG,GAAG,SAAS,CAAA;AA8CrC,eAAO,MAAM,KAAK,GAAI,WAAW,SAAS,EAAE,YAAW,OAAc,KAAG,GAkBvE,CAAA;AAED,eAAO,MAAM,MAAM,gEAAc,CAAA;AAuBjC,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG;IACpC,QAAQ,CAAC,EAAE;QACT,UAAU,CAAC,EAAE,UAAU,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;KAChD,CAAA;CACF,CAAA;AAED,eAAO,MAAM,KAAK,GAAI,SAAS,UAAU,KAAG,GAY3C,CAAA;AAED,eAAO,MAAM,WAAW,GAAI,SAAS,UAAU,KAAG,SAEjD,CAAA;AAED,eAAO,MAAM,KAAK,GAAI,MAAM,OAAO,KAAG,GAMrC,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,KAAK,OAAO,EAAE,MAAM,MAAM,KAAG,MAAM,GAAG,SAWlE,CAAA;AAED,eAAO,MAAM,gBAAgB,GAAI,CAAC,EAAE,KAAK,OAAO,EAAE,MAAM,MAAM,KAAG,CAAC,GAAG,SAGpE,CAAA"}
+{"version":3,"file":"url.d.ts","sourceRoot":"","sources":["../src/url.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AACxD,OAAO,EAML,GAAG,EACH,UAAU,EACV,YAAY,EACZ,WAAW,EACX,SAAS,EACV,MAAM,2BAA2B,CAAA;AAKlC,eAAO,MAAM,MAAM,wCAAY,CAAA;AAE/B,eAAO,MAAM,MAAM,wCAAY,CAAA;AAE/B,MAAM,WAAW,WAAY,SAAQ,WAAW;IAC9C,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;IAC3B,UAAU,EAAE,UAAU,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;CAC/C;AAED,MAAM,WAAW,GAAI,SAAQ,GAAG;IAC9B,QAAQ,EAAE,WAAW,CAAA;CACtB;AAED,MAAM,MAAM,OAAO,GAAG,GAAG,GAAG,SAAS,CAAA;AA8CrC,eAAO,MAAM,KAAK,GAAI,WAAW,SAAS,EAAE,YAAW,OAAc,KAAG,GAkBvE,CAAA;AAED,eAAO,MAAM,MAAM,+FAAY,CAAA;AAuB/B,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG;IACpC,QAAQ,CAAC,EAAE;QACT,UAAU,CAAC,EAAE,UAAU,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;KAChD,CAAA;CACF,CAAA;AAED,eAAO,MAAM,KAAK,GAAI,SAAS,UAAU,KAAG,GAY3C,CAAA;AAED,eAAO,MAAM,WAAW,GAAI,SAAS,UAAU,KAAG,SAEjD,CAAA;AAED,eAAO,MAAM,KAAK,GAAI,MAAM,OAAO,KAAG,GAMrC,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,KAAK,OAAO,EAAE,MAAM,MAAM,KAAG,MAAM,GAAG,SAWlE,CAAA;AAED,eAAO,MAAM,gBAAgB,GAAI,CAAC,EAAE,KAAK,OAAO,EAAE,MAAM,MAAM,KAAG,CAAC,GAAG,SAGpE,CAAA"}

package/dist/url.js

@@ -1,27 +1,36 @@
 // src/url.ts
-import { Arrays, Objects, Strings, Uris } from "@bessemer/cornerstone";
-var encode = Uris.encode;
-var decode = Uris.decode;
+import {
+  build as uriBuild,
+  decode as uriDecode,
+  encode as uriEncode,
+  format as uriFormat,
+  parse as uriParse
+} from "@bessemer/cornerstone/uri";
+import { isBlank, isString, removeStart, startsWith } from "@bessemer/cornerstone/string";
+import { isNil, isPresent } from "@bessemer/cornerstone/object";
+import { first, isEmpty } from "@bessemer/cornerstone/array";
+var encode = uriEncode;
+var decode = uriDecode;
 var augmentUriLocation = (uriLocation, normalize) => {
   const pathSegments = [];
   const parameters = {};
-  if (!Strings.isBlank(uriLocation.path)) {
-    Strings.removeStart(uriLocation.path, "/").split("/").forEach((urlPathPart) => {
-      if (!Strings.isBlank(urlPathPart) || !normalize) {
+  if (!isBlank(uriLocation.path)) {
+    removeStart(uriLocation.path, "/").split("/").forEach((urlPathPart) => {
+      if (!isBlank(urlPathPart) || !normalize) {
         pathSegments.push(decode(urlPathPart));
       }
     });
   }
-  if (Objects.isPresent(uriLocation.query)) {
+  if (isPresent(uriLocation.query)) {
     uriLocation.query.split("&").forEach((parameterPair) => {
       let splitParameters = parameterPair.split("=");
-      if (!Strings.isBlank(Arrays.first(splitParameters))) {
+      if (!isBlank(first(splitParameters))) {
         let key = decode(splitParameters[0]);
         let value = "";
         if (splitParameters.length === 2) {
           value = splitParameters[1];
         }
-        if (Objects.isNil(parameters[key])) {
+        if (isNil(parameters[key])) {
           parameters[key] = decode(value);
         } else if (!Array.isArray(parameters[key])) {
           let paramList = [parameters[key]];
@@ -40,11 +49,11 @@ var augmentUriLocation = (uriLocation, normalize) => {
   };
 };
 var parse = (urlString, normalize = true) => {
-  const uri = Uris.parse(urlString);
+  const uri = uriParse(urlString);
   const location = augmentUriLocation(uri.location, normalize);
   if (normalize) {
-    if (!Arrays.isEmpty(location.pathSegments)) {
-      location.path = (Strings.startsWith(location.path, "/") ? "/" : "") + formatPathSegments(location.pathSegments);
+    if (!isEmpty(location.pathSegments)) {
+      location.path = (startsWith(location.path, "/") ? "/" : "") + formatPathSegments(location.pathSegments);
     } else {
       location.path = "";
     }
@@ -55,13 +64,13 @@ var parse = (urlString, normalize = true) => {
     location
   };
 };
-var format = Uris.format;
+var format = uriFormat;
 var formatPathSegments = (pathSegments) => {
   return pathSegments.map((it) => encode(it)).join("/");
 };
 var formatQueryParameters = (parameters) => {
   const parameterEntries = Object.entries(parameters);
-  if (Arrays.isEmpty(parameterEntries)) {
+  if (isEmpty(parameterEntries)) {
     return null;
   }
   return Object.entries(parameters).flatMap(([key, value]) => {
@@ -73,8 +82,8 @@ var formatQueryParameters = (parameters) => {
   }).join("&");
 };
 var build = (builder) => {
-  const uri = Uris.build(builder);
-  if (Objects.isPresent(builder.location?.parameters)) {
+  const uri = uriBuild(builder);
+  if (isPresent(builder.location?.parameters)) {
     uri.location.query = formatQueryParameters(builder.location.parameters);
   }
   const urlLocation = augmentUriLocation(uri.location, false);
@@ -87,14 +96,14 @@ var buildString = (builder) => {
   return format(build(builder));
 };
 var reify = (blah) => {
-  if (!Strings.isString(blah)) {
+  if (!isString(blah)) {
     return blah;
   }
   return parse(blah);
 };
 var getParameter = (url, name) => {
   const parameter = reify(url).location.parameters[name];
-  if (Objects.isNil(parameter)) {
+  if (isNil(parameter)) {
     return void 0;
   }
   if (Array.isArray(parameter)) {
@@ -104,7 +113,7 @@ var getParameter = (url, name) => {
 };
 var getJsonParameter = (url, name) => {
   const value = getParameter(url, name);
-  return Objects.isPresent(value) ? JSON.parse(value) : void 0;
+  return isPresent(value) ? JSON.parse(value) : void 0;
 };
 export {
   build,

package/dist/url.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/url.ts"],"sourcesContent":["import { Arrays, Objects, Strings, Uris } from '@bessemer/cornerstone'\nimport { Dictionary } from '@bessemer/cornerstone/types'\nimport { Uri, UriBuilder, UriComponent, UriLocation, UriString } from '@bessemer/cornerstone/uri'\n\nexport const encode = Uris.encode\n\nexport const decode = Uris.decode\n\nexport interface UrlLocation extends UriLocation {\n  pathSegments: Array<string>\n  parameters: Dictionary<string | Array<string>>\n}\n\nexport interface Url extends Uri {\n  location: UrlLocation\n}\n\nexport type UrlLike = Url | UriString\n\nconst augmentUriLocation = (uriLocation: UriLocation, normalize: boolean): UrlLocation => {\n  const pathSegments: Array<string> = []\n  const parameters: Dictionary<string | Array<string>> = {}\n\n  if (!Strings.isBlank(uriLocation.path)) {\n    Strings.removeStart(uriLocation.path, '/')\n      .split('/')\n      .forEach((urlPathPart) => {\n        if (!Strings.isBlank(urlPathPart) || !normalize) {\n          pathSegments.push(decode(urlPathPart))\n        }\n      })\n  }\n\n  if (Objects.isPresent(uriLocation.query)) {\n    uriLocation.query.split('&').forEach((parameterPair) => {\n      let splitParameters = parameterPair.split('=')\n\n      if (!Strings.isBlank(Arrays.first(splitParameters))) {\n        let key = decode(splitParameters[0]!)\n        let value = ''\n        if (splitParameters.length === 2) {\n          value = splitParameters[1]!\n        }\n        if (Objects.isNil(parameters[key])) {\n          parameters[key] = decode(value)\n        } else if (!Array.isArray(parameters[key])) {\n          let paramList = [parameters[key]]\n          paramList.push(decode(value))\n          parameters[key] = paramList\n        } else {\n          parameters[key].push(decode(value))\n        }\n      }\n    })\n  }\n\n  return {\n    ...uriLocation,\n    pathSegments,\n    parameters,\n  }\n}\n\nexport const parse = (urlString: UriString, normalize: boolean = true): Url => {\n  const uri = Uris.parse(urlString)\n  const location = augmentUriLocation(uri.location, normalize)\n\n  if (normalize) {\n    if (!Arrays.isEmpty(location.pathSegments)) {\n      location.path = (Strings.startsWith(location.path, '/') ? '/' : '') + formatPathSegments(location.pathSegments)\n    } else {\n      location.path = ''\n    }\n\n    location.query = formatQueryParameters(location.parameters)\n  }\n\n  return {\n    ...uri,\n    location,\n  }\n}\n\nexport const format = Uris.format\n\nconst formatPathSegments = (pathSegments: Array<string>): UriComponent => {\n  return pathSegments.map((it) => encode(it)).join('/')\n}\n\nconst formatQueryParameters = (parameters: Dictionary<string | Array<string>>): UriComponent | null => {\n  const parameterEntries = Object.entries(parameters)\n  if (Arrays.isEmpty(parameterEntries)) {\n    return null\n  }\n\n  return Object.entries(parameters)\n    .flatMap(([key, value]) => {\n      if (Array.isArray(value)) {\n        return value.map((it) => `${encode(key)}=${encode(it)}`)\n      } else {\n        return [`${encode(key)}=${encode(value)}`]\n      }\n    })\n    .join('&')\n}\n\nexport type UrlBuilder = UriBuilder & {\n  location?: {\n    parameters?: Dictionary<string | Array<string>>\n  }\n}\n\nexport const build = (builder: UrlBuilder): Url => {\n  const uri = Uris.build(builder)\n  if (Objects.isPresent(builder.location?.parameters)) {\n    uri.location.query = formatQueryParameters(builder.location.parameters)\n  }\n\n  const urlLocation = augmentUriLocation(uri.location, false)\n\n  return {\n    ...uri,\n    location: urlLocation,\n  }\n}\n\nexport const buildString = (builder: UrlBuilder): UriString => {\n  return format(build(builder))\n}\n\nexport const reify = (blah: UrlLike): Url => {\n  if (!Strings.isString(blah)) {\n    return blah\n  }\n\n  return parse(blah)\n}\n\nexport const getParameter = (url: UrlLike, name: string): string | undefined => {\n  const parameter = reify(url).location.parameters[name]\n  if (Objects.isNil(parameter)) {\n    return undefined\n  }\n\n  if (Array.isArray(parameter)) {\n    throw new Error(`Expected a single parameter value but found multiple for parameter: ${name}`)\n  }\n\n  return parameter\n}\n\nexport const getJsonParameter = <T>(url: UrlLike, name: string): T | undefined => {\n  const value = getParameter(url, name)\n  return Objects.isPresent(value) ? JSON.parse(value) : undefined\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../src/url.ts"],"sourcesContent":["import { Dictionary } from '@bessemer/cornerstone/types'\nimport {\n  build as uriBuild,\n  decode as uriDecode,\n  encode as uriEncode,\n  format as uriFormat,\n  parse as uriParse,\n  Uri,\n  UriBuilder,\n  UriComponent,\n  UriLocation,\n  UriString,\n} from '@bessemer/cornerstone/uri'\nimport { isBlank, isString, removeStart, startsWith } from '@bessemer/cornerstone/string'\nimport { isNil, isPresent } from '@bessemer/cornerstone/object'\nimport { first, isEmpty } from '@bessemer/cornerstone/array'\n\nexport const encode = uriEncode\n\nexport const decode = uriDecode\n\nexport interface UrlLocation extends UriLocation {\n  pathSegments: Array<string>\n  parameters: Dictionary<string | Array<string>>\n}\n\nexport interface Url extends Uri {\n  location: UrlLocation\n}\n\nexport type UrlLike = Url | UriString\n\nconst augmentUriLocation = (uriLocation: UriLocation, normalize: boolean): UrlLocation => {\n  const pathSegments: Array<string> = []\n  const parameters: Dictionary<string | Array<string>> = {}\n\n  if (!isBlank(uriLocation.path)) {\n    removeStart(uriLocation.path, '/')\n      .split('/')\n      .forEach((urlPathPart) => {\n        if (!isBlank(urlPathPart) || !normalize) {\n          pathSegments.push(decode(urlPathPart))\n        }\n      })\n  }\n\n  if (isPresent(uriLocation.query)) {\n    uriLocation.query.split('&').forEach((parameterPair) => {\n      let splitParameters = parameterPair.split('=')\n\n      if (!isBlank(first(splitParameters))) {\n        let key = decode(splitParameters[0]!)\n        let value = ''\n        if (splitParameters.length === 2) {\n          value = splitParameters[1]!\n        }\n        if (isNil(parameters[key])) {\n          parameters[key] = decode(value)\n        } else if (!Array.isArray(parameters[key])) {\n          let paramList = [parameters[key]]\n          paramList.push(decode(value))\n          parameters[key] = paramList\n        } else {\n          parameters[key].push(decode(value))\n        }\n      }\n    })\n  }\n\n  return {\n    ...uriLocation,\n    pathSegments,\n    parameters,\n  }\n}\n\nexport const parse = (urlString: UriString, normalize: boolean = true): Url => {\n  const uri = uriParse(urlString)\n  const location = augmentUriLocation(uri.location, normalize)\n\n  if (normalize) {\n    if (!isEmpty(location.pathSegments)) {\n      location.path = (startsWith(location.path, '/') ? '/' : '') + formatPathSegments(location.pathSegments)\n    } else {\n      location.path = ''\n    }\n\n    location.query = formatQueryParameters(location.parameters)\n  }\n\n  return {\n    ...uri,\n    location,\n  }\n}\n\nexport const format = uriFormat\n\nconst formatPathSegments = (pathSegments: Array<string>): UriComponent => {\n  return pathSegments.map((it) => encode(it)).join('/')\n}\n\nconst formatQueryParameters = (parameters: Dictionary<string | Array<string>>): UriComponent | null => {\n  const parameterEntries = Object.entries(parameters)\n  if (isEmpty(parameterEntries)) {\n    return null\n  }\n\n  return Object.entries(parameters)\n    .flatMap(([key, value]) => {\n      if (Array.isArray(value)) {\n        return value.map((it) => `${encode(key)}=${encode(it)}`)\n      } else {\n        return [`${encode(key)}=${encode(value)}`]\n      }\n    })\n    .join('&')\n}\n\nexport type UrlBuilder = UriBuilder & {\n  location?: {\n    parameters?: Dictionary<string | Array<string>>\n  }\n}\n\nexport const build = (builder: UrlBuilder): Url => {\n  const uri = uriBuild(builder)\n  if (isPresent(builder.location?.parameters)) {\n    uri.location.query = formatQueryParameters(builder.location.parameters)\n  }\n\n  const urlLocation = augmentUriLocation(uri.location, false)\n\n  return {\n    ...uri,\n    location: urlLocation,\n  }\n}\n\nexport const buildString = (builder: UrlBuilder): UriString => {\n  return format(build(builder))\n}\n\nexport const reify = (blah: UrlLike): Url => {\n  if (!isString(blah)) {\n    return blah\n  }\n\n  return parse(blah)\n}\n\nexport const getParameter = (url: UrlLike, name: string): string | undefined => {\n  const parameter = reify(url).location.parameters[name]\n  if (isNil(parameter)) {\n    return undefined\n  }\n\n  if (Array.isArray(parameter)) {\n    throw new Error(`Expected a single parameter value but found multiple for parameter: ${name}`)\n  }\n\n  return parameter\n}\n\nexport const getJsonParameter = <T>(url: UrlLike, name: string): T | undefined => {\n  const value = getParameter(url, name)\n  return isPresent(value) ? JSON.parse(value) : undefined\n}\n"],"mappings":"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","names":[]}

package/dist/uuid.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uuid.d.ts","sourceRoot":"","sources":["../src/uuid.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AAExD,MAAM,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;AAE7C,eAAO,MAAM,QAAQ,QAAO,IAM3B,CAAA;AAED,eAAO,MAAM,QAAQ,GAAI,OAAO,IAAI,KAAG,MAEtC,CAAA;AAED,eAAO,MAAM,cAAc,QAAO,MAEjC,CAAA;AAQD,eAAO,MAAM,EAAE,GAAI,OAAO,MAAM,KAAG,IAGlC,CAAA;AAID,eAAO,MAAM,OAAO,GAAI,OAAO,OAAO,KAAG,KAAK,IAAI,IAEjD,CAAA"}
+{"version":3,"file":"uuid.d.ts","sourceRoot":"","sources":["../src/uuid.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AAKxD,MAAM,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;AAE7C,eAAO,MAAM,QAAQ,QAAO,IAM3B,CAAA;AAED,eAAO,MAAM,QAAQ,GAAI,OAAO,IAAI,KAAG,MAEtC,CAAA;AAED,eAAO,MAAM,cAAc,QAAO,MAEjC,CAAA;AAQD,eAAO,MAAM,EAAE,GAAI,OAAO,MAAM,KAAG,IAGlC,CAAA;AAID,eAAO,MAAM,OAAO,GAAI,OAAO,OAAO,KAAG,KAAK,IAAI,IAEjD,CAAA"}

package/dist/uuid.js

@@ -1,7 +1,9 @@
 // src/uuid.ts
-import { Assertions, Objects, Strings } from "@bessemer/cornerstone";
+import { isNil } from "@bessemer/cornerstone/object";
+import { isString, padStart } from "@bessemer/cornerstone/string";
+import { assertTrue } from "@bessemer/cornerstone/assertion";
 var generate = () => {
-  if (Objects.isNil(crypto.randomUUID)) {
+  if (isNil(crypto.randomUUID)) {
     return `${randomHex(8)}-${randomHex(4)}-${randomHex(4)}-${randomHex(4)}-${randomHex(12)}`;
   } else {
     return crypto.randomUUID();
@@ -15,15 +17,15 @@ var generateString = () => {
 };
 var randomHex = (characters) => {
   const randomNum = Math.floor(Math.random() * (16 ** characters - 1));
-  return Strings.padStart(randomNum.toString(16), characters, "0");
+  return padStart(randomNum.toString(16), characters, "0");
 };
 var of = (value) => {
-  Assertions.assertTrue(isValid(value), () => `Attempted to coerce invalid value to Uuid: ${value}`);
+  assertTrue(isValid(value), () => `Attempted to coerce invalid value to Uuid: ${value}`);
   return value;
 };
 var pattern = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 var isValid = (value) => {
-  return Strings.isString(value) && pattern.test(value);
+  return isString(value) && pattern.test(value);
 };
 export {
   asString,

package/dist/uuid.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/uuid.ts"],"sourcesContent":["import { Assertions, Objects, Strings } from '@bessemer/cornerstone'\nimport { TaggedType } from '@bessemer/cornerstone/types'\n\nexport type Uuid = TaggedType<string, 'Uuid'>\n\nexport const generate = (): Uuid => {\n  if (Objects.isNil(crypto.randomUUID)) {\n    return `${randomHex(8)}-${randomHex(4)}-${randomHex(4)}-${randomHex(4)}-${randomHex(12)}` as Uuid\n  } else {\n    return crypto.randomUUID() as Uuid\n  }\n}\n\nexport const asString = (value: Uuid): string => {\n  return value\n}\n\nexport const generateString = (): string => {\n  return asString(generate())\n}\n\nconst randomHex = (characters: number) => {\n  // Generates a random number between 0x0..0 and 0xF..F for the target number of characters\n  const randomNum = Math.floor(Math.random() * (16 ** characters - 1))\n  return Strings.padStart(randomNum.toString(16), characters, '0')\n}\n\nexport const of = (value: string): Uuid => {\n  Assertions.assertTrue(isValid(value), () => `Attempted to coerce invalid value to Uuid: ${value}`)\n  return value as Uuid\n}\n\nconst pattern = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i\n\nexport const isValid = (value: unknown): value is Uuid => {\n  return Strings.isString(value) && pattern.test(value)\n}\n"],"mappings":";AAAA,SAAS,YAAY,SAAS,eAAe;AAKtC,IAAM,WAAW,MAAY;AAClC,MAAI,QAAQ,MAAM,OAAO,UAAU,GAAG;AACpC,WAAO,GAAG,UAAU,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC,IAAI,UAAU,EAAE,CAAC;AAAA,EACzF,OAAO;AACL,WAAO,OAAO,WAAW;AAAA,EAC3B;AACF;AAEO,IAAM,WAAW,CAAC,UAAwB;AAC/C,SAAO;AACT;AAEO,IAAM,iBAAiB,MAAc;AAC1C,SAAO,SAAS,SAAS,CAAC;AAC5B;AAEA,IAAM,YAAY,CAAC,eAAuB;AAExC,QAAM,YAAY,KAAK,MAAM,KAAK,OAAO,KAAK,MAAM,aAAa,EAAE;AACnE,SAAO,QAAQ,SAAS,UAAU,SAAS,EAAE,GAAG,YAAY,GAAG;AACjE;AAEO,IAAM,KAAK,CAAC,UAAwB;AACzC,aAAW,WAAW,QAAQ,KAAK,GAAG,MAAM,8CAA8C,KAAK,EAAE;AACjG,SAAO;AACT;AAEA,IAAM,UAAU;AAET,IAAM,UAAU,CAAC,UAAkC;AACxD,SAAO,QAAQ,SAAS,KAAK,KAAK,QAAQ,KAAK,KAAK;AACtD;","names":[]}
+{"version":3,"sources":["../src/uuid.ts"],"sourcesContent":["import { TaggedType } from '@bessemer/cornerstone/types'\nimport { isNil } from '@bessemer/cornerstone/object'\nimport { isString, padStart } from '@bessemer/cornerstone/string'\nimport { assertTrue } from '@bessemer/cornerstone/assertion'\n\nexport type Uuid = TaggedType<string, 'Uuid'>\n\nexport const generate = (): Uuid => {\n  if (isNil(crypto.randomUUID)) {\n    return `${randomHex(8)}-${randomHex(4)}-${randomHex(4)}-${randomHex(4)}-${randomHex(12)}` as Uuid\n  } else {\n    return crypto.randomUUID() as Uuid\n  }\n}\n\nexport const asString = (value: Uuid): string => {\n  return value\n}\n\nexport const generateString = (): string => {\n  return asString(generate())\n}\n\nconst randomHex = (characters: number) => {\n  // Generates a random number between 0x0..0 and 0xF..F for the target number of characters\n  const randomNum = Math.floor(Math.random() * (16 ** characters - 1))\n  return padStart(randomNum.toString(16), characters, '0')\n}\n\nexport const of = (value: string): Uuid => {\n  assertTrue(isValid(value), () => `Attempted to coerce invalid value to Uuid: ${value}`)\n  return value as Uuid\n}\n\nconst pattern = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i\n\nexport const isValid = (value: unknown): value is Uuid => {\n  return isString(value) && pattern.test(value)\n}\n"],"mappings":";AACA,SAAS,aAAa;AACtB,SAAS,UAAU,gBAAgB;AACnC,SAAS,kBAAkB;AAIpB,IAAM,WAAW,MAAY;AAClC,MAAI,MAAM,OAAO,UAAU,GAAG;AAC5B,WAAO,GAAG,UAAU,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC,IAAI,UAAU,EAAE,CAAC;AAAA,EACzF,OAAO;AACL,WAAO,OAAO,WAAW;AAAA,EAC3B;AACF;AAEO,IAAM,WAAW,CAAC,UAAwB;AAC/C,SAAO;AACT;AAEO,IAAM,iBAAiB,MAAc;AAC1C,SAAO,SAAS,SAAS,CAAC;AAC5B;AAEA,IAAM,YAAY,CAAC,eAAuB;AAExC,QAAM,YAAY,KAAK,MAAM,KAAK,OAAO,KAAK,MAAM,aAAa,EAAE;AACnE,SAAO,SAAS,UAAU,SAAS,EAAE,GAAG,YAAY,GAAG;AACzD;AAEO,IAAM,KAAK,CAAC,UAAwB;AACzC,aAAW,QAAQ,KAAK,GAAG,MAAM,8CAA8C,KAAK,EAAE;AACtF,SAAO;AACT;AAEA,IAAM,UAAU;AAET,IAAM,UAAU,CAAC,UAAkC;AACxD,SAAO,SAAS,KAAK,KAAK,QAAQ,KAAK,KAAK;AAC9C;","names":[]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bessemer/cornerstone",
   "type": "module",
-  "version": "0.5.52",
+  "version": "0.5.53",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "sideEffects": false,