@xyo-network/huri 3.18.4 → 3.18.6

package/dist/browser/index.mjs

@@ -2,6 +2,7 @@
 import { assertEx } from "@xylabs/assert";
 import { axios } from "@xylabs/axios";
 import { isHash } from "@xylabs/hex";
+import { isDefined, isString } from "@xylabs/typeof";
 import { AddressValue } from "@xyo-network/account";
 var Huri = class _Huri {
   archive;
@@ -19,7 +20,7 @@ var Huri = class _Huri {
     const path = assertEx(_Huri.parsePath(huriString), () => "Missing path");
     this.hash = assertEx(this.parsePath(path, protocol !== void 0), () => "Missing hash");
     assertEx(isHash(this.hash), () => `Invalid hash [${this.hash}]`);
-    if (archivistUri) {
+    if (isString(archivistUri)) {
       const archivistUriParts = archivistUri.split("://");
       this.protocol = archivistUriParts[0];
       this.archivist = archivistUriParts[1];
@@ -32,20 +33,20 @@ var Huri = class _Huri {
   */
   get href() {
     const parts = [];
-    if (this.protocol) {
+    if (isDefined(this.protocol)) {
       parts.push(`${this.protocol}:/`);
     }
-    if (this.archive) {
+    if (isDefined(this.archive)) {
       parts.push(`${this.archive}`);
     }
-    if (this.archivist) {
+    if (isDefined(this.archivist)) {
       parts.push(`${this.archivist}`);
     }
     parts.push(this.hash);
     return parts.join("/");
   }
   static async fetch(huri) {
-    const AuthHeader = huri.token ? { Authorization: `Bearer ${huri.token}` } : void 0;
+    const AuthHeader = isDefined(huri.token) ? { Authorization: `Bearer ${huri.token}` } : void 0;
     return (await axios.get(huri.href, { headers: AuthHeader })).data;
   }
   static isHuri(value) {
@@ -67,7 +68,7 @@ var Huri = class _Huri {
     const protocolSplit = huri.split("//");
     assertEx(protocolSplit.length <= 2, () => `Invalid second protocol [${protocolSplit[2]}]`);
     const rawProtocol = protocolSplit.length === 2 ? protocolSplit.shift() : void 0;
-    if (rawProtocol) {
+    if (isString(rawProtocol)) {
       const protocolParts = rawProtocol?.split(":");
       assertEx(protocolParts.length === 2, () => `Invalid protocol format [${rawProtocol}]`);
       assertEx(protocolParts[1].length === 0, () => `Invalid protocol format (post :) [${rawProtocol}]`);
@@ -93,7 +94,7 @@ var Huri = class _Huri {
   validateParse() {
     assertEx(this.archivist?.length !== 0, () => "Invalid archivist length");
     assertEx(this.archive?.length !== 0, () => "Invalid archive length");
-    assertEx(!(this.archive && !this.archivist), () => "If specifying archive, archivist is also required");
+    assertEx(!(isString(this.archive) && !isString(this.archivist)), () => "If specifying archive, archivist is also required");
   }
 };
 export {

package/dist/browser/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Huri.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { axios } from '@xylabs/axios'\nimport type { Address, Hash } from '@xylabs/hex'\nimport { isHash } from '@xylabs/hex'\nimport { AddressValue } from '@xyo-network/account'\nimport type { Payload } from '@xyo-network/payload-model'\n\nexport type ObjectCategory = 'block' | 'payload'\n\nexport type HuriFetchFunction = (huri: Huri) => Promise<Payload | undefined>\n\n/*\n  Valid Huri:\n\n  [<protocol>://][<archivist>/[<archive>/]]<hash>\n\n  defaults:\n    protocol: https\n    archivist: api.archivist.xyo.network\n*/\n\nexport interface HuriOptions {\n  archivistUri?: string\n  token?: string\n}\n\nexport interface FetchedPayload<T extends Payload = Payload> {\n  huri?: Huri\n  payload: T\n}\n\nexport class Huri<T extends Payload = Payload> {\n  archive?: string\n  archivist?: Address | string\n  hash: Hash\n  originalHref: string\n  protocol?: string\n  token?: string\n\n  private isHuri = true\n\n  constructor(huri: Hash | Huri | string, { archivistUri, token }: HuriOptions = {}) {\n    const huriString\n      = Huri.isHuri(huri)?.href\n        ?? (typeof huri === 'string'\n          ? (huri as string)\n          : huri instanceof ArrayBuffer\n            ? new AddressValue(huri).hex\n            : huri.href)\n    this.originalHref = huriString\n\n    const protocol = Huri.parseProtocol(huriString)\n    this.protocol = protocol ?? 'https'\n\n    const path = assertEx(Huri.parsePath(huriString), () => 'Missing path')\n    this.hash = assertEx(this.parsePath(path, protocol !== undefined), () => 'Missing hash') as Hash\n\n    assertEx(isHash(this.hash), () => `Invalid hash [${this.hash}]`)\n\n    // if archivistUri sent, overwrite protocol and archivist\n    if (archivistUri) {\n      const archivistUriParts = archivistUri.split('://')\n      this.protocol = archivistUriParts[0]\n      this.archivist = archivistUriParts[1]\n    }\n\n    this.token = token\n\n    this.validateParse()\n  }\n\n  /*\n  The full href or the hash\n  */\n  get href() {\n    const parts: string[] = []\n    if (this.protocol) {\n      parts.push(`${this.protocol}:/`)\n    }\n    if (this.archive) {\n      parts.push(`${this.archive}`)\n    }\n    if (this.archivist) {\n      parts.push(`${this.archivist}`)\n    }\n    parts.push(this.hash)\n    return parts.join('/')\n  }\n\n  static async fetch<T extends Payload = Payload>(huri: Huri): Promise<T | undefined> {\n    const AuthHeader = huri.token ? { Authorization: `Bearer ${huri.token}` } : undefined\n    return (await axios.get<T>(huri.href, { headers: AuthHeader })).data\n  }\n\n  static isHuri(value: unknown) {\n    if (typeof value === 'object') {\n      return (value as Huri).isHuri ? (value as Huri) : undefined\n    }\n  }\n\n  private static parsePath(huri: string) {\n    const protocolSplit = huri.split('//')\n    assertEx(protocolSplit.length <= 2, () => `Invalid format [${huri}]`)\n    if (protocolSplit.length === 1) {\n      return huri\n    }\n    if (protocolSplit.length === 2) {\n      return protocolSplit[1]\n    }\n  }\n\n  private static parseProtocol(huri: string) {\n    const protocolSplit = huri.split('//')\n    assertEx(protocolSplit.length <= 2, () => `Invalid second protocol [${protocolSplit[2]}]`)\n    const rawProtocol = protocolSplit.length === 2 ? protocolSplit.shift() : undefined\n    if (rawProtocol) {\n      const protocolParts = rawProtocol?.split(':')\n      assertEx(protocolParts.length === 2, () => `Invalid protocol format [${rawProtocol}]`)\n      assertEx(protocolParts[1].length === 0, () => `Invalid protocol format (post :) [${rawProtocol}]`)\n      return protocolParts.shift()\n    }\n  }\n\n  async fetch(): Promise<T | undefined> {\n    return await Huri.fetch<T>(this)\n  }\n\n  toString() {\n    return this.href\n  }\n\n  private parsePath(path: string, hasProtocol: boolean) {\n    const pathParts = path.split('/')\n\n    // if the protocol was found, then there is not allowed to be a leading /\n    assertEx(!(hasProtocol && pathParts[0].length === 0), () => 'Invalid protocol separator')\n\n    // remove leading '/' if needed\n    // eslint-disable-next-line @typescript-eslint/no-unused-expressions\n    pathParts[0].length === 0 ? pathParts.shift() : null\n\n    // hash is assumed to be the last part\n    const hash = assertEx(pathParts.pop(), () => 'No hash specified')\n\n    // archivist is assumed to be the first part\n    this.archivist = pathParts.shift() ?? 'api.archivist.xyo.network'\n\n    // the archive is whatever is left\n    this.archive = pathParts.pop()\n\n    // after we pull off all the path parts, there should be nothing left\n    assertEx(pathParts.length === 0, () => 'Too many path parts')\n\n    return hash\n  }\n\n  private validateParse() {\n    // the archivist should not be zero length\n    assertEx(this.archivist?.length !== 0, () => 'Invalid archivist length')\n\n    // the archivist should not be zero length (can be undefined)\n    assertEx(this.archive?.length !== 0, () => 'Invalid archive length')\n\n    // the archive should not be set if the archivist is not set\n    assertEx(!(this.archive && !this.archivist), () => 'If specifying archive, archivist is also required')\n  }\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../src/Huri.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { axios } from '@xylabs/axios'\nimport type { Address, Hash } from '@xylabs/hex'\nimport { isHash } from '@xylabs/hex'\nimport { isDefined, isString } from '@xylabs/typeof'\nimport { AddressValue } from '@xyo-network/account'\nimport type { Payload } from '@xyo-network/payload-model'\n\nexport type ObjectCategory = 'block' | 'payload'\n\nexport type HuriFetchFunction = (huri: Huri) => Promise<Payload | undefined>\n\n/*\n  Valid Huri:\n\n  [<protocol>://][<archivist>/[<archive>/]]<hash>\n\n  defaults:\n    protocol: https\n    archivist: api.archivist.xyo.network\n*/\n\nexport interface HuriOptions {\n  archivistUri?: string\n  token?: string\n}\n\nexport interface FetchedPayload<T extends Payload = Payload> {\n  huri?: Huri\n  payload: T\n}\n\nexport class Huri<T extends Payload = Payload> {\n  archive?: string\n  archivist?: Address | string\n  hash: Hash\n  originalHref: string\n  protocol?: string\n  token?: string\n\n  private isHuri = true\n\n  constructor(huri: Hash | Huri | string, { archivistUri, token }: HuriOptions = {}) {\n    const huriString\n      = Huri.isHuri(huri)?.href\n        ?? (typeof huri === 'string'\n          ? (huri as string)\n          : huri instanceof ArrayBuffer\n            ? new AddressValue(huri).hex\n            : huri.href)\n    this.originalHref = huriString\n\n    const protocol = Huri.parseProtocol(huriString)\n    this.protocol = protocol ?? 'https'\n\n    const path = assertEx(Huri.parsePath(huriString), () => 'Missing path')\n    this.hash = assertEx(this.parsePath(path, protocol !== undefined), () => 'Missing hash') as Hash\n\n    assertEx(isHash(this.hash), () => `Invalid hash [${this.hash}]`)\n\n    // if archivistUri sent, overwrite protocol and archivist\n    if (isString(archivistUri)) {\n      const archivistUriParts = archivistUri.split('://')\n      this.protocol = archivistUriParts[0]\n      this.archivist = archivistUriParts[1]\n    }\n\n    this.token = token\n\n    this.validateParse()\n  }\n\n  /*\n  The full href or the hash\n  */\n  get href() {\n    const parts: string[] = []\n    if (isDefined(this.protocol)) {\n      parts.push(`${this.protocol}:/`)\n    }\n    if (isDefined(this.archive)) {\n      parts.push(`${this.archive}`)\n    }\n    if (isDefined(this.archivist)) {\n      parts.push(`${this.archivist}`)\n    }\n    parts.push(this.hash)\n    return parts.join('/')\n  }\n\n  static async fetch<T extends Payload = Payload>(huri: Huri): Promise<T | undefined> {\n    const AuthHeader = isDefined(huri.token) ? { Authorization: `Bearer ${huri.token}` } : undefined\n    return (await axios.get<T>(huri.href, { headers: AuthHeader })).data\n  }\n\n  static isHuri(value: unknown) {\n    if (typeof value === 'object') {\n      return (value as Huri).isHuri ? (value as Huri) : undefined\n    }\n  }\n\n  private static parsePath(huri: string) {\n    const protocolSplit = huri.split('//')\n    assertEx(protocolSplit.length <= 2, () => `Invalid format [${huri}]`)\n    if (protocolSplit.length === 1) {\n      return huri\n    }\n    if (protocolSplit.length === 2) {\n      return protocolSplit[1]\n    }\n  }\n\n  private static parseProtocol(huri: string) {\n    const protocolSplit = huri.split('//')\n    assertEx(protocolSplit.length <= 2, () => `Invalid second protocol [${protocolSplit[2]}]`)\n    const rawProtocol = protocolSplit.length === 2 ? protocolSplit.shift() : undefined\n    if (isString(rawProtocol)) {\n      const protocolParts = rawProtocol?.split(':')\n      assertEx(protocolParts.length === 2, () => `Invalid protocol format [${rawProtocol}]`)\n      assertEx(protocolParts[1].length === 0, () => `Invalid protocol format (post :) [${rawProtocol}]`)\n      return protocolParts.shift()\n    }\n  }\n\n  async fetch(): Promise<T | undefined> {\n    return await Huri.fetch<T>(this)\n  }\n\n  toString() {\n    return this.href\n  }\n\n  private parsePath(path: string, hasProtocol: boolean) {\n    const pathParts = path.split('/')\n\n    // if the protocol was found, then there is not allowed to be a leading /\n    assertEx(!(hasProtocol && pathParts[0].length === 0), () => 'Invalid protocol separator')\n\n    // remove leading '/' if needed\n    // eslint-disable-next-line @typescript-eslint/no-unused-expressions\n    pathParts[0].length === 0 ? pathParts.shift() : null\n\n    // hash is assumed to be the last part\n    const hash = assertEx(pathParts.pop(), () => 'No hash specified')\n\n    // archivist is assumed to be the first part\n    this.archivist = pathParts.shift() ?? 'api.archivist.xyo.network'\n\n    // the archive is whatever is left\n    this.archive = pathParts.pop()\n\n    // after we pull off all the path parts, there should be nothing left\n    assertEx(pathParts.length === 0, () => 'Too many path parts')\n\n    return hash\n  }\n\n  private validateParse() {\n    // the archivist should not be zero length\n    assertEx(this.archivist?.length !== 0, () => 'Invalid archivist length')\n\n    // the archivist should not be zero length (can be undefined)\n    assertEx(this.archive?.length !== 0, () => 'Invalid archive length')\n\n    // the archive should not be set if the archivist is not set\n    assertEx(!(isString(this.archive) && !isString(this.archivist)), () => 'If specifying archive, archivist is also required')\n  }\n}\n"],"mappings":"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","names":[]}

package/dist/neutral/index.mjs

@@ -2,6 +2,7 @@
 import { assertEx } from "@xylabs/assert";
 import { axios } from "@xylabs/axios";
 import { isHash } from "@xylabs/hex";
+import { isDefined, isString } from "@xylabs/typeof";
 import { AddressValue } from "@xyo-network/account";
 var Huri = class _Huri {
   archive;
@@ -19,7 +20,7 @@ var Huri = class _Huri {
     const path = assertEx(_Huri.parsePath(huriString), () => "Missing path");
     this.hash = assertEx(this.parsePath(path, protocol !== void 0), () => "Missing hash");
     assertEx(isHash(this.hash), () => `Invalid hash [${this.hash}]`);
-    if (archivistUri) {
+    if (isString(archivistUri)) {
       const archivistUriParts = archivistUri.split("://");
       this.protocol = archivistUriParts[0];
       this.archivist = archivistUriParts[1];
@@ -32,20 +33,20 @@ var Huri = class _Huri {
   */
   get href() {
     const parts = [];
-    if (this.protocol) {
+    if (isDefined(this.protocol)) {
       parts.push(`${this.protocol}:/`);
     }
-    if (this.archive) {
+    if (isDefined(this.archive)) {
       parts.push(`${this.archive}`);
     }
-    if (this.archivist) {
+    if (isDefined(this.archivist)) {
       parts.push(`${this.archivist}`);
     }
     parts.push(this.hash);
     return parts.join("/");
   }
   static async fetch(huri) {
-    const AuthHeader = huri.token ? { Authorization: `Bearer ${huri.token}` } : void 0;
+    const AuthHeader = isDefined(huri.token) ? { Authorization: `Bearer ${huri.token}` } : void 0;
     return (await axios.get(huri.href, { headers: AuthHeader })).data;
   }
   static isHuri(value) {
@@ -67,7 +68,7 @@ var Huri = class _Huri {
     const protocolSplit = huri.split("//");
     assertEx(protocolSplit.length <= 2, () => `Invalid second protocol [${protocolSplit[2]}]`);
     const rawProtocol = protocolSplit.length === 2 ? protocolSplit.shift() : void 0;
-    if (rawProtocol) {
+    if (isString(rawProtocol)) {
       const protocolParts = rawProtocol?.split(":");
       assertEx(protocolParts.length === 2, () => `Invalid protocol format [${rawProtocol}]`);
       assertEx(protocolParts[1].length === 0, () => `Invalid protocol format (post :) [${rawProtocol}]`);
@@ -93,7 +94,7 @@ var Huri = class _Huri {
   validateParse() {
     assertEx(this.archivist?.length !== 0, () => "Invalid archivist length");
     assertEx(this.archive?.length !== 0, () => "Invalid archive length");
-    assertEx(!(this.archive && !this.archivist), () => "If specifying archive, archivist is also required");
+    assertEx(!(isString(this.archive) && !isString(this.archivist)), () => "If specifying archive, archivist is also required");
   }
 };
 export {

package/dist/neutral/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Huri.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { axios } from '@xylabs/axios'\nimport type { Address, Hash } from '@xylabs/hex'\nimport { isHash } from '@xylabs/hex'\nimport { AddressValue } from '@xyo-network/account'\nimport type { Payload } from '@xyo-network/payload-model'\n\nexport type ObjectCategory = 'block' | 'payload'\n\nexport type HuriFetchFunction = (huri: Huri) => Promise<Payload | undefined>\n\n/*\n  Valid Huri:\n\n  [<protocol>://][<archivist>/[<archive>/]]<hash>\n\n  defaults:\n    protocol: https\n    archivist: api.archivist.xyo.network\n*/\n\nexport interface HuriOptions {\n  archivistUri?: string\n  token?: string\n}\n\nexport interface FetchedPayload<T extends Payload = Payload> {\n  huri?: Huri\n  payload: T\n}\n\nexport class Huri<T extends Payload = Payload> {\n  archive?: string\n  archivist?: Address | string\n  hash: Hash\n  originalHref: string\n  protocol?: string\n  token?: string\n\n  private isHuri = true\n\n  constructor(huri: Hash | Huri | string, { archivistUri, token }: HuriOptions = {}) {\n    const huriString\n      = Huri.isHuri(huri)?.href\n        ?? (typeof huri === 'string'\n          ? (huri as string)\n          : huri instanceof ArrayBuffer\n            ? new AddressValue(huri).hex\n            : huri.href)\n    this.originalHref = huriString\n\n    const protocol = Huri.parseProtocol(huriString)\n    this.protocol = protocol ?? 'https'\n\n    const path = assertEx(Huri.parsePath(huriString), () => 'Missing path')\n    this.hash = assertEx(this.parsePath(path, protocol !== undefined), () => 'Missing hash') as Hash\n\n    assertEx(isHash(this.hash), () => `Invalid hash [${this.hash}]`)\n\n    // if archivistUri sent, overwrite protocol and archivist\n    if (archivistUri) {\n      const archivistUriParts = archivistUri.split('://')\n      this.protocol = archivistUriParts[0]\n      this.archivist = archivistUriParts[1]\n    }\n\n    this.token = token\n\n    this.validateParse()\n  }\n\n  /*\n  The full href or the hash\n  */\n  get href() {\n    const parts: string[] = []\n    if (this.protocol) {\n      parts.push(`${this.protocol}:/`)\n    }\n    if (this.archive) {\n      parts.push(`${this.archive}`)\n    }\n    if (this.archivist) {\n      parts.push(`${this.archivist}`)\n    }\n    parts.push(this.hash)\n    return parts.join('/')\n  }\n\n  static async fetch<T extends Payload = Payload>(huri: Huri): Promise<T | undefined> {\n    const AuthHeader = huri.token ? { Authorization: `Bearer ${huri.token}` } : undefined\n    return (await axios.get<T>(huri.href, { headers: AuthHeader })).data\n  }\n\n  static isHuri(value: unknown) {\n    if (typeof value === 'object') {\n      return (value as Huri).isHuri ? (value as Huri) : undefined\n    }\n  }\n\n  private static parsePath(huri: string) {\n    const protocolSplit = huri.split('//')\n    assertEx(protocolSplit.length <= 2, () => `Invalid format [${huri}]`)\n    if (protocolSplit.length === 1) {\n      return huri\n    }\n    if (protocolSplit.length === 2) {\n      return protocolSplit[1]\n    }\n  }\n\n  private static parseProtocol(huri: string) {\n    const protocolSplit = huri.split('//')\n    assertEx(protocolSplit.length <= 2, () => `Invalid second protocol [${protocolSplit[2]}]`)\n    const rawProtocol = protocolSplit.length === 2 ? protocolSplit.shift() : undefined\n    if (rawProtocol) {\n      const protocolParts = rawProtocol?.split(':')\n      assertEx(protocolParts.length === 2, () => `Invalid protocol format [${rawProtocol}]`)\n      assertEx(protocolParts[1].length === 0, () => `Invalid protocol format (post :) [${rawProtocol}]`)\n      return protocolParts.shift()\n    }\n  }\n\n  async fetch(): Promise<T | undefined> {\n    return await Huri.fetch<T>(this)\n  }\n\n  toString() {\n    return this.href\n  }\n\n  private parsePath(path: string, hasProtocol: boolean) {\n    const pathParts = path.split('/')\n\n    // if the protocol was found, then there is not allowed to be a leading /\n    assertEx(!(hasProtocol && pathParts[0].length === 0), () => 'Invalid protocol separator')\n\n    // remove leading '/' if needed\n    // eslint-disable-next-line @typescript-eslint/no-unused-expressions\n    pathParts[0].length === 0 ? pathParts.shift() : null\n\n    // hash is assumed to be the last part\n    const hash = assertEx(pathParts.pop(), () => 'No hash specified')\n\n    // archivist is assumed to be the first part\n    this.archivist = pathParts.shift() ?? 'api.archivist.xyo.network'\n\n    // the archive is whatever is left\n    this.archive = pathParts.pop()\n\n    // after we pull off all the path parts, there should be nothing left\n    assertEx(pathParts.length === 0, () => 'Too many path parts')\n\n    return hash\n  }\n\n  private validateParse() {\n    // the archivist should not be zero length\n    assertEx(this.archivist?.length !== 0, () => 'Invalid archivist length')\n\n    // the archivist should not be zero length (can be undefined)\n    assertEx(this.archive?.length !== 0, () => 'Invalid archive length')\n\n    // the archive should not be set if the archivist is not set\n    assertEx(!(this.archive && !this.archivist), () => 'If specifying archive, archivist is also required')\n  }\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../src/Huri.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { axios } from '@xylabs/axios'\nimport type { Address, Hash } from '@xylabs/hex'\nimport { isHash } from '@xylabs/hex'\nimport { isDefined, isString } from '@xylabs/typeof'\nimport { AddressValue } from '@xyo-network/account'\nimport type { Payload } from '@xyo-network/payload-model'\n\nexport type ObjectCategory = 'block' | 'payload'\n\nexport type HuriFetchFunction = (huri: Huri) => Promise<Payload | undefined>\n\n/*\n  Valid Huri:\n\n  [<protocol>://][<archivist>/[<archive>/]]<hash>\n\n  defaults:\n    protocol: https\n    archivist: api.archivist.xyo.network\n*/\n\nexport interface HuriOptions {\n  archivistUri?: string\n  token?: string\n}\n\nexport interface FetchedPayload<T extends Payload = Payload> {\n  huri?: Huri\n  payload: T\n}\n\nexport class Huri<T extends Payload = Payload> {\n  archive?: string\n  archivist?: Address | string\n  hash: Hash\n  originalHref: string\n  protocol?: string\n  token?: string\n\n  private isHuri = true\n\n  constructor(huri: Hash | Huri | string, { archivistUri, token }: HuriOptions = {}) {\n    const huriString\n      = Huri.isHuri(huri)?.href\n        ?? (typeof huri === 'string'\n          ? (huri as string)\n          : huri instanceof ArrayBuffer\n            ? new AddressValue(huri).hex\n            : huri.href)\n    this.originalHref = huriString\n\n    const protocol = Huri.parseProtocol(huriString)\n    this.protocol = protocol ?? 'https'\n\n    const path = assertEx(Huri.parsePath(huriString), () => 'Missing path')\n    this.hash = assertEx(this.parsePath(path, protocol !== undefined), () => 'Missing hash') as Hash\n\n    assertEx(isHash(this.hash), () => `Invalid hash [${this.hash}]`)\n\n    // if archivistUri sent, overwrite protocol and archivist\n    if (isString(archivistUri)) {\n      const archivistUriParts = archivistUri.split('://')\n      this.protocol = archivistUriParts[0]\n      this.archivist = archivistUriParts[1]\n    }\n\n    this.token = token\n\n    this.validateParse()\n  }\n\n  /*\n  The full href or the hash\n  */\n  get href() {\n    const parts: string[] = []\n    if (isDefined(this.protocol)) {\n      parts.push(`${this.protocol}:/`)\n    }\n    if (isDefined(this.archive)) {\n      parts.push(`${this.archive}`)\n    }\n    if (isDefined(this.archivist)) {\n      parts.push(`${this.archivist}`)\n    }\n    parts.push(this.hash)\n    return parts.join('/')\n  }\n\n  static async fetch<T extends Payload = Payload>(huri: Huri): Promise<T | undefined> {\n    const AuthHeader = isDefined(huri.token) ? { Authorization: `Bearer ${huri.token}` } : undefined\n    return (await axios.get<T>(huri.href, { headers: AuthHeader })).data\n  }\n\n  static isHuri(value: unknown) {\n    if (typeof value === 'object') {\n      return (value as Huri).isHuri ? (value as Huri) : undefined\n    }\n  }\n\n  private static parsePath(huri: string) {\n    const protocolSplit = huri.split('//')\n    assertEx(protocolSplit.length <= 2, () => `Invalid format [${huri}]`)\n    if (protocolSplit.length === 1) {\n      return huri\n    }\n    if (protocolSplit.length === 2) {\n      return protocolSplit[1]\n    }\n  }\n\n  private static parseProtocol(huri: string) {\n    const protocolSplit = huri.split('//')\n    assertEx(protocolSplit.length <= 2, () => `Invalid second protocol [${protocolSplit[2]}]`)\n    const rawProtocol = protocolSplit.length === 2 ? protocolSplit.shift() : undefined\n    if (isString(rawProtocol)) {\n      const protocolParts = rawProtocol?.split(':')\n      assertEx(protocolParts.length === 2, () => `Invalid protocol format [${rawProtocol}]`)\n      assertEx(protocolParts[1].length === 0, () => `Invalid protocol format (post :) [${rawProtocol}]`)\n      return protocolParts.shift()\n    }\n  }\n\n  async fetch(): Promise<T | undefined> {\n    return await Huri.fetch<T>(this)\n  }\n\n  toString() {\n    return this.href\n  }\n\n  private parsePath(path: string, hasProtocol: boolean) {\n    const pathParts = path.split('/')\n\n    // if the protocol was found, then there is not allowed to be a leading /\n    assertEx(!(hasProtocol && pathParts[0].length === 0), () => 'Invalid protocol separator')\n\n    // remove leading '/' if needed\n    // eslint-disable-next-line @typescript-eslint/no-unused-expressions\n    pathParts[0].length === 0 ? pathParts.shift() : null\n\n    // hash is assumed to be the last part\n    const hash = assertEx(pathParts.pop(), () => 'No hash specified')\n\n    // archivist is assumed to be the first part\n    this.archivist = pathParts.shift() ?? 'api.archivist.xyo.network'\n\n    // the archive is whatever is left\n    this.archive = pathParts.pop()\n\n    // after we pull off all the path parts, there should be nothing left\n    assertEx(pathParts.length === 0, () => 'Too many path parts')\n\n    return hash\n  }\n\n  private validateParse() {\n    // the archivist should not be zero length\n    assertEx(this.archivist?.length !== 0, () => 'Invalid archivist length')\n\n    // the archivist should not be zero length (can be undefined)\n    assertEx(this.archive?.length !== 0, () => 'Invalid archive length')\n\n    // the archive should not be set if the archivist is not set\n    assertEx(!(isString(this.archive) && !isString(this.archivist)), () => 'If specifying archive, archivist is also required')\n  }\n}\n"],"mappings":"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","names":[]}

package/dist/node/index.mjs

@@ -2,6 +2,7 @@
 import { assertEx } from "@xylabs/assert";
 import { axios } from "@xylabs/axios";
 import { isHash } from "@xylabs/hex";
+import { isDefined, isString } from "@xylabs/typeof";
 import { AddressValue } from "@xyo-network/account";
 var Huri = class _Huri {
   archive;
@@ -19,7 +20,7 @@ var Huri = class _Huri {
     const path = assertEx(_Huri.parsePath(huriString), () => "Missing path");
     this.hash = assertEx(this.parsePath(path, protocol !== void 0), () => "Missing hash");
     assertEx(isHash(this.hash), () => `Invalid hash [${this.hash}]`);
-    if (archivistUri) {
+    if (isString(archivistUri)) {
       const archivistUriParts = archivistUri.split("://");
       this.protocol = archivistUriParts[0];
       this.archivist = archivistUriParts[1];
@@ -32,20 +33,20 @@ var Huri = class _Huri {
   */
   get href() {
     const parts = [];
-    if (this.protocol) {
+    if (isDefined(this.protocol)) {
       parts.push(`${this.protocol}:/`);
     }
-    if (this.archive) {
+    if (isDefined(this.archive)) {
       parts.push(`${this.archive}`);
     }
-    if (this.archivist) {
+    if (isDefined(this.archivist)) {
       parts.push(`${this.archivist}`);
     }
     parts.push(this.hash);
     return parts.join("/");
   }
   static async fetch(huri) {
-    const AuthHeader = huri.token ? { Authorization: `Bearer ${huri.token}` } : void 0;
+    const AuthHeader = isDefined(huri.token) ? { Authorization: `Bearer ${huri.token}` } : void 0;
     return (await axios.get(huri.href, { headers: AuthHeader })).data;
   }
   static isHuri(value) {
@@ -67,7 +68,7 @@ var Huri = class _Huri {
     const protocolSplit = huri.split("//");
     assertEx(protocolSplit.length <= 2, () => `Invalid second protocol [${protocolSplit[2]}]`);
     const rawProtocol = protocolSplit.length === 2 ? protocolSplit.shift() : void 0;
-    if (rawProtocol) {
+    if (isString(rawProtocol)) {
       const protocolParts = rawProtocol?.split(":");
       assertEx(protocolParts.length === 2, () => `Invalid protocol format [${rawProtocol}]`);
       assertEx(protocolParts[1].length === 0, () => `Invalid protocol format (post :) [${rawProtocol}]`);
@@ -93,7 +94,7 @@ var Huri = class _Huri {
   validateParse() {
     assertEx(this.archivist?.length !== 0, () => "Invalid archivist length");
     assertEx(this.archive?.length !== 0, () => "Invalid archive length");
-    assertEx(!(this.archive && !this.archivist), () => "If specifying archive, archivist is also required");
+    assertEx(!(isString(this.archive) && !isString(this.archivist)), () => "If specifying archive, archivist is also required");
   }
 };
 export {

package/dist/node/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Huri.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { axios } from '@xylabs/axios'\nimport type { Address, Hash } from '@xylabs/hex'\nimport { isHash } from '@xylabs/hex'\nimport { AddressValue } from '@xyo-network/account'\nimport type { Payload } from '@xyo-network/payload-model'\n\nexport type ObjectCategory = 'block' | 'payload'\n\nexport type HuriFetchFunction = (huri: Huri) => Promise<Payload | undefined>\n\n/*\n  Valid Huri:\n\n  [<protocol>://][<archivist>/[<archive>/]]<hash>\n\n  defaults:\n    protocol: https\n    archivist: api.archivist.xyo.network\n*/\n\nexport interface HuriOptions {\n  archivistUri?: string\n  token?: string\n}\n\nexport interface FetchedPayload<T extends Payload = Payload> {\n  huri?: Huri\n  payload: T\n}\n\nexport class Huri<T extends Payload = Payload> {\n  archive?: string\n  archivist?: Address | string\n  hash: Hash\n  originalHref: string\n  protocol?: string\n  token?: string\n\n  private isHuri = true\n\n  constructor(huri: Hash | Huri | string, { archivistUri, token }: HuriOptions = {}) {\n    const huriString\n      = Huri.isHuri(huri)?.href\n        ?? (typeof huri === 'string'\n          ? (huri as string)\n          : huri instanceof ArrayBuffer\n            ? new AddressValue(huri).hex\n            : huri.href)\n    this.originalHref = huriString\n\n    const protocol = Huri.parseProtocol(huriString)\n    this.protocol = protocol ?? 'https'\n\n    const path = assertEx(Huri.parsePath(huriString), () => 'Missing path')\n    this.hash = assertEx(this.parsePath(path, protocol !== undefined), () => 'Missing hash') as Hash\n\n    assertEx(isHash(this.hash), () => `Invalid hash [${this.hash}]`)\n\n    // if archivistUri sent, overwrite protocol and archivist\n    if (archivistUri) {\n      const archivistUriParts = archivistUri.split('://')\n      this.protocol = archivistUriParts[0]\n      this.archivist = archivistUriParts[1]\n    }\n\n    this.token = token\n\n    this.validateParse()\n  }\n\n  /*\n  The full href or the hash\n  */\n  get href() {\n    const parts: string[] = []\n    if (this.protocol) {\n      parts.push(`${this.protocol}:/`)\n    }\n    if (this.archive) {\n      parts.push(`${this.archive}`)\n    }\n    if (this.archivist) {\n      parts.push(`${this.archivist}`)\n    }\n    parts.push(this.hash)\n    return parts.join('/')\n  }\n\n  static async fetch<T extends Payload = Payload>(huri: Huri): Promise<T | undefined> {\n    const AuthHeader = huri.token ? { Authorization: `Bearer ${huri.token}` } : undefined\n    return (await axios.get<T>(huri.href, { headers: AuthHeader })).data\n  }\n\n  static isHuri(value: unknown) {\n    if (typeof value === 'object') {\n      return (value as Huri).isHuri ? (value as Huri) : undefined\n    }\n  }\n\n  private static parsePath(huri: string) {\n    const protocolSplit = huri.split('//')\n    assertEx(protocolSplit.length <= 2, () => `Invalid format [${huri}]`)\n    if (protocolSplit.length === 1) {\n      return huri\n    }\n    if (protocolSplit.length === 2) {\n      return protocolSplit[1]\n    }\n  }\n\n  private static parseProtocol(huri: string) {\n    const protocolSplit = huri.split('//')\n    assertEx(protocolSplit.length <= 2, () => `Invalid second protocol [${protocolSplit[2]}]`)\n    const rawProtocol = protocolSplit.length === 2 ? protocolSplit.shift() : undefined\n    if (rawProtocol) {\n      const protocolParts = rawProtocol?.split(':')\n      assertEx(protocolParts.length === 2, () => `Invalid protocol format [${rawProtocol}]`)\n      assertEx(protocolParts[1].length === 0, () => `Invalid protocol format (post :) [${rawProtocol}]`)\n      return protocolParts.shift()\n    }\n  }\n\n  async fetch(): Promise<T | undefined> {\n    return await Huri.fetch<T>(this)\n  }\n\n  toString() {\n    return this.href\n  }\n\n  private parsePath(path: string, hasProtocol: boolean) {\n    const pathParts = path.split('/')\n\n    // if the protocol was found, then there is not allowed to be a leading /\n    assertEx(!(hasProtocol && pathParts[0].length === 0), () => 'Invalid protocol separator')\n\n    // remove leading '/' if needed\n    // eslint-disable-next-line @typescript-eslint/no-unused-expressions\n    pathParts[0].length === 0 ? pathParts.shift() : null\n\n    // hash is assumed to be the last part\n    const hash = assertEx(pathParts.pop(), () => 'No hash specified')\n\n    // archivist is assumed to be the first part\n    this.archivist = pathParts.shift() ?? 'api.archivist.xyo.network'\n\n    // the archive is whatever is left\n    this.archive = pathParts.pop()\n\n    // after we pull off all the path parts, there should be nothing left\n    assertEx(pathParts.length === 0, () => 'Too many path parts')\n\n    return hash\n  }\n\n  private validateParse() {\n    // the archivist should not be zero length\n    assertEx(this.archivist?.length !== 0, () => 'Invalid archivist length')\n\n    // the archivist should not be zero length (can be undefined)\n    assertEx(this.archive?.length !== 0, () => 'Invalid archive length')\n\n    // the archive should not be set if the archivist is not set\n    assertEx(!(this.archive && !this.archivist), () => 'If specifying archive, archivist is also required')\n  }\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../src/Huri.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { axios } from '@xylabs/axios'\nimport type { Address, Hash } from '@xylabs/hex'\nimport { isHash } from '@xylabs/hex'\nimport { isDefined, isString } from '@xylabs/typeof'\nimport { AddressValue } from '@xyo-network/account'\nimport type { Payload } from '@xyo-network/payload-model'\n\nexport type ObjectCategory = 'block' | 'payload'\n\nexport type HuriFetchFunction = (huri: Huri) => Promise<Payload | undefined>\n\n/*\n  Valid Huri:\n\n  [<protocol>://][<archivist>/[<archive>/]]<hash>\n\n  defaults:\n    protocol: https\n    archivist: api.archivist.xyo.network\n*/\n\nexport interface HuriOptions {\n  archivistUri?: string\n  token?: string\n}\n\nexport interface FetchedPayload<T extends Payload = Payload> {\n  huri?: Huri\n  payload: T\n}\n\nexport class Huri<T extends Payload = Payload> {\n  archive?: string\n  archivist?: Address | string\n  hash: Hash\n  originalHref: string\n  protocol?: string\n  token?: string\n\n  private isHuri = true\n\n  constructor(huri: Hash | Huri | string, { archivistUri, token }: HuriOptions = {}) {\n    const huriString\n      = Huri.isHuri(huri)?.href\n        ?? (typeof huri === 'string'\n          ? (huri as string)\n          : huri instanceof ArrayBuffer\n            ? new AddressValue(huri).hex\n            : huri.href)\n    this.originalHref = huriString\n\n    const protocol = Huri.parseProtocol(huriString)\n    this.protocol = protocol ?? 'https'\n\n    const path = assertEx(Huri.parsePath(huriString), () => 'Missing path')\n    this.hash = assertEx(this.parsePath(path, protocol !== undefined), () => 'Missing hash') as Hash\n\n    assertEx(isHash(this.hash), () => `Invalid hash [${this.hash}]`)\n\n    // if archivistUri sent, overwrite protocol and archivist\n    if (isString(archivistUri)) {\n      const archivistUriParts = archivistUri.split('://')\n      this.protocol = archivistUriParts[0]\n      this.archivist = archivistUriParts[1]\n    }\n\n    this.token = token\n\n    this.validateParse()\n  }\n\n  /*\n  The full href or the hash\n  */\n  get href() {\n    const parts: string[] = []\n    if (isDefined(this.protocol)) {\n      parts.push(`${this.protocol}:/`)\n    }\n    if (isDefined(this.archive)) {\n      parts.push(`${this.archive}`)\n    }\n    if (isDefined(this.archivist)) {\n      parts.push(`${this.archivist}`)\n    }\n    parts.push(this.hash)\n    return parts.join('/')\n  }\n\n  static async fetch<T extends Payload = Payload>(huri: Huri): Promise<T | undefined> {\n    const AuthHeader = isDefined(huri.token) ? { Authorization: `Bearer ${huri.token}` } : undefined\n    return (await axios.get<T>(huri.href, { headers: AuthHeader })).data\n  }\n\n  static isHuri(value: unknown) {\n    if (typeof value === 'object') {\n      return (value as Huri).isHuri ? (value as Huri) : undefined\n    }\n  }\n\n  private static parsePath(huri: string) {\n    const protocolSplit = huri.split('//')\n    assertEx(protocolSplit.length <= 2, () => `Invalid format [${huri}]`)\n    if (protocolSplit.length === 1) {\n      return huri\n    }\n    if (protocolSplit.length === 2) {\n      return protocolSplit[1]\n    }\n  }\n\n  private static parseProtocol(huri: string) {\n    const protocolSplit = huri.split('//')\n    assertEx(protocolSplit.length <= 2, () => `Invalid second protocol [${protocolSplit[2]}]`)\n    const rawProtocol = protocolSplit.length === 2 ? protocolSplit.shift() : undefined\n    if (isString(rawProtocol)) {\n      const protocolParts = rawProtocol?.split(':')\n      assertEx(protocolParts.length === 2, () => `Invalid protocol format [${rawProtocol}]`)\n      assertEx(protocolParts[1].length === 0, () => `Invalid protocol format (post :) [${rawProtocol}]`)\n      return protocolParts.shift()\n    }\n  }\n\n  async fetch(): Promise<T | undefined> {\n    return await Huri.fetch<T>(this)\n  }\n\n  toString() {\n    return this.href\n  }\n\n  private parsePath(path: string, hasProtocol: boolean) {\n    const pathParts = path.split('/')\n\n    // if the protocol was found, then there is not allowed to be a leading /\n    assertEx(!(hasProtocol && pathParts[0].length === 0), () => 'Invalid protocol separator')\n\n    // remove leading '/' if needed\n    // eslint-disable-next-line @typescript-eslint/no-unused-expressions\n    pathParts[0].length === 0 ? pathParts.shift() : null\n\n    // hash is assumed to be the last part\n    const hash = assertEx(pathParts.pop(), () => 'No hash specified')\n\n    // archivist is assumed to be the first part\n    this.archivist = pathParts.shift() ?? 'api.archivist.xyo.network'\n\n    // the archive is whatever is left\n    this.archive = pathParts.pop()\n\n    // after we pull off all the path parts, there should be nothing left\n    assertEx(pathParts.length === 0, () => 'Too many path parts')\n\n    return hash\n  }\n\n  private validateParse() {\n    // the archivist should not be zero length\n    assertEx(this.archivist?.length !== 0, () => 'Invalid archivist length')\n\n    // the archivist should not be zero length (can be undefined)\n    assertEx(this.archive?.length !== 0, () => 'Invalid archive length')\n\n    // the archive should not be set if the archivist is not set\n    assertEx(!(isString(this.archive) && !isString(this.archivist)), () => 'If specifying archive, archivist is also required')\n  }\n}\n"],"mappings":"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","names":[]}

package/dist/types/Huri.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Huri.d.ts","sourceRoot":"","sources":["../../src/Huri.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAGhD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEzD,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,SAAS,CAAA;AAEhD,MAAM,MAAM,iBAAiB,GAAG,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAAA;AAY5E,MAAM,WAAW,WAAW;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,cAAc,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO;IACzD,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,OAAO,EAAE,CAAC,CAAA;CACX;AAED,qBAAa,IAAI,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO;IAC3C,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC5B,IAAI,EAAE,IAAI,CAAA;IACV,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,CAAC,EAAE,MAAM,CAAA;IAEd,OAAO,CAAC,MAAM,CAAO;gBAET,IAAI,EAAE,IAAI,GAAG,IAAI,GAAG,MAAM,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,GAAE,WAAgB;IAiCjF,IAAI,IAAI,WAaP;WAEY,KAAK,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAKnF,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO;IAM5B,OAAO,CAAC,MAAM,CAAC,SAAS;IAWxB,OAAO,CAAC,MAAM,CAAC,aAAa;IAYtB,KAAK,IAAI,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAIrC,QAAQ;IAIR,OAAO,CAAC,SAAS;IAyBjB,OAAO,CAAC,aAAa;CAUtB"}
+{"version":3,"file":"Huri.d.ts","sourceRoot":"","sources":["../../src/Huri.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAIhD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEzD,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,SAAS,CAAA;AAEhD,MAAM,MAAM,iBAAiB,GAAG,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAAA;AAY5E,MAAM,WAAW,WAAW;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,cAAc,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO;IACzD,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,OAAO,EAAE,CAAC,CAAA;CACX;AAED,qBAAa,IAAI,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO;IAC3C,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC5B,IAAI,EAAE,IAAI,CAAA;IACV,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,CAAC,EAAE,MAAM,CAAA;IAEd,OAAO,CAAC,MAAM,CAAO;gBAET,IAAI,EAAE,IAAI,GAAG,IAAI,GAAG,MAAM,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,GAAE,WAAgB;IAiCjF,IAAI,IAAI,WAaP;WAEY,KAAK,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAKnF,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO;IAM5B,OAAO,CAAC,MAAM,CAAC,SAAS;IAWxB,OAAO,CAAC,MAAM,CAAC,aAAa;IAYtB,KAAK,IAAI,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAIrC,QAAQ;IAIR,OAAO,CAAC,SAAS;IAyBjB,OAAO,CAAC,aAAa;CAUtB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/huri",
-  "version": "3.18.4",
+  "version": "3.18.6",
   "description": "Primary SDK for using XYO Protocol 2.0",
   "homepage": "https://xyo.network",
   "bugs": {
@@ -29,19 +29,20 @@
   "module": "dist/neutral/index.mjs",
   "types": "dist/types/index.d.ts",
   "dependencies": {
-    "@xylabs/assert": "^4.11.14",
-    "@xylabs/axios": "^4.11.14",
-    "@xylabs/hex": "^4.11.14",
-    "@xyo-network/account": "^3.18.4",
-    "@xyo-network/payload-model": "^3.18.4"
+    "@xylabs/assert": "^4.11.16",
+    "@xylabs/axios": "^4.11.16",
+    "@xylabs/hex": "^4.11.16",
+    "@xylabs/typeof": "^4.11.16",
+    "@xyo-network/account": "^3.18.6",
+    "@xyo-network/payload-model": "^3.18.6"
   },
   "devDependencies": {
-    "@xylabs/delay": "^4.11.14",
+    "@xylabs/delay": "^4.11.16",
     "@xylabs/ts-scripts-yarn3": "^6.5.8",
     "@xylabs/tsconfig": "^6.5.8",
-    "@xylabs/vitest-extended": "^4.11.14",
+    "@xylabs/vitest-extended": "^4.11.16",
     "typescript": "^5.8.3",
-    "vitest": "^3.2.2"
+    "vitest": "^3.2.3"
   },
   "publishConfig": {
     "access": "public"

package/src/Huri.ts

@@ -2,6 +2,7 @@ import { assertEx } from '@xylabs/assert'
 import { axios } from '@xylabs/axios'
 import type { Address, Hash } from '@xylabs/hex'
 import { isHash } from '@xylabs/hex'
+import { isDefined, isString } from '@xylabs/typeof'
 import { AddressValue } from '@xyo-network/account'
 import type { Payload } from '@xyo-network/payload-model'
 
@@ -58,7 +59,7 @@ export class Huri<T extends Payload = Payload> {
     assertEx(isHash(this.hash), () => `Invalid hash [${this.hash}]`)
 
     // if archivistUri sent, overwrite protocol and archivist
-    if (archivistUri) {
+    if (isString(archivistUri)) {
       const archivistUriParts = archivistUri.split('://')
       this.protocol = archivistUriParts[0]
       this.archivist = archivistUriParts[1]
@@ -74,13 +75,13 @@ export class Huri<T extends Payload = Payload> {
   */
   get href() {
     const parts: string[] = []
-    if (this.protocol) {
+    if (isDefined(this.protocol)) {
       parts.push(`${this.protocol}:/`)
     }
-    if (this.archive) {
+    if (isDefined(this.archive)) {
       parts.push(`${this.archive}`)
     }
-    if (this.archivist) {
+    if (isDefined(this.archivist)) {
       parts.push(`${this.archivist}`)
     }
     parts.push(this.hash)
@@ -88,7 +89,7 @@ export class Huri<T extends Payload = Payload> {
   }
 
   static async fetch<T extends Payload = Payload>(huri: Huri): Promise<T | undefined> {
-    const AuthHeader = huri.token ? { Authorization: `Bearer ${huri.token}` } : undefined
+    const AuthHeader = isDefined(huri.token) ? { Authorization: `Bearer ${huri.token}` } : undefined
     return (await axios.get<T>(huri.href, { headers: AuthHeader })).data
   }
 
@@ -113,7 +114,7 @@ export class Huri<T extends Payload = Payload> {
     const protocolSplit = huri.split('//')
     assertEx(protocolSplit.length <= 2, () => `Invalid second protocol [${protocolSplit[2]}]`)
     const rawProtocol = protocolSplit.length === 2 ? protocolSplit.shift() : undefined
-    if (rawProtocol) {
+    if (isString(rawProtocol)) {
       const protocolParts = rawProtocol?.split(':')
       assertEx(protocolParts.length === 2, () => `Invalid protocol format [${rawProtocol}]`)
       assertEx(protocolParts[1].length === 0, () => `Invalid protocol format (post :) [${rawProtocol}]`)
@@ -162,6 +163,6 @@ export class Huri<T extends Payload = Payload> {
     assertEx(this.archive?.length !== 0, () => 'Invalid archive length')
 
     // the archive should not be set if the archivist is not set
-    assertEx(!(this.archive && !this.archivist), () => 'If specifying archive, archivist is also required')
+    assertEx(!(isString(this.archive) && !isString(this.archivist)), () => 'If specifying archive, archivist is also required')
   }
 }