@xyo-network/core 2.20.45 → 2.20.46

package/dist/esm/lib/dns/index.d.ts

@@ -1,8 +1,8 @@
-export * from './DnsRecordType';
-export * from './DnsReturnCode';
-export * from './domainExists';
-export * from './domainResolve';
-export * from './googleDnsOverHttps';
-export * from './GoogleDnsResult';
-export * from './GoogleDnsResultAnswer';
-export * from './GoogleDnsResultQuestion';
+export * from './DnsRecordType';
+export * from './DnsReturnCode';
+export * from './domainExists';
+export * from './domainResolve';
+export * from './googleDnsOverHttps';
+export * from './GoogleDnsResult';
+export * from './GoogleDnsResultAnswer';
+export * from './GoogleDnsResultQuestion';

package/dist/esm/lib/dns/index.js

@@ -1,9 +1,9 @@
-export * from './DnsRecordType';
-export * from './DnsReturnCode';
-export * from './domainExists';
-export * from './domainResolve';
-export * from './googleDnsOverHttps';
-export * from './GoogleDnsResult';
-export * from './GoogleDnsResultAnswer';
-export * from './GoogleDnsResultQuestion';
+export * from './DnsRecordType';
+export * from './DnsReturnCode';
+export * from './domainExists';
+export * from './domainResolve';
+export * from './googleDnsOverHttps';
+export * from './GoogleDnsResult';
+export * from './GoogleDnsResultAnswer';
+export * from './GoogleDnsResultQuestion';
 //# sourceMappingURL=index.js.map

package/dist/esm/lib/dumpErrors.d.ts

@@ -1,2 +1,2 @@
-declare const dumpErrors: (errors: Error[]) => void;
-export { dumpErrors };
+declare const dumpErrors: (errors: Error[]) => void;
+export { dumpErrors };

package/dist/esm/lib/dumpErrors.js

@@ -1,7 +1,7 @@
-const dumpErrors = (errors) => {
-    errors.forEach((error) => {
-        console.log(error);
-    });
-};
-export { dumpErrors };
+const dumpErrors = (errors) => {
+    errors.forEach((error) => {
+        console.log(error);
+    });
+};
+export { dumpErrors };
 //# sourceMappingURL=dumpErrors.js.map

package/dist/esm/lib/exists.d.ts

@@ -1 +1 @@
-export declare const exists: <T>(x: T | null | undefined) => x is T;
+export declare const exists: <T>(x: T | null | undefined) => x is T;

package/dist/esm/lib/exists.js

@@ -1,4 +1,4 @@
-export const exists = (x) => {
-    return !!x;
-};
+export const exists = (x) => {
+    return !!x;
+};
 //# sourceMappingURL=exists.js.map

package/dist/esm/lib/index.d.ts

@@ -1,4 +1,4 @@
-export * from './dns';
-export * from './dumpErrors';
-export * from './isBrowser';
-export * from './typeOf';
+export * from './dns';
+export * from './dumpErrors';
+export * from './isBrowser';
+export * from './typeOf';

package/dist/esm/lib/index.js

@@ -1,5 +1,5 @@
-export * from './dns';
-export * from './dumpErrors';
-export * from './isBrowser';
-export * from './typeOf';
+export * from './dns';
+export * from './dumpErrors';
+export * from './isBrowser';
+export * from './typeOf';
 //# sourceMappingURL=index.js.map

package/dist/esm/lib/isBrowser.d.ts

@@ -1 +1 @@
-export declare const isBrowser: () => boolean;
+export declare const isBrowser: () => boolean;

package/dist/esm/lib/isBrowser.js

@@ -1,4 +1,4 @@
-export const isBrowser = () => {
-    return typeof process === 'undefined';
-};
+export const isBrowser = () => {
+    return typeof process === 'undefined';
+};
 //# sourceMappingURL=isBrowser.js.map

package/dist/esm/lib/isXyoPayloadOfSchemaType.d.ts

@@ -1,6 +1,6 @@
-import { XyoBoundWitness } from '../BoundWitness';
-import { XyoPayload } from '../Payload';
-import { XyoSchemaPayload } from '../Schema';
-export declare const isXyoPayloadOfSchemaType: <T extends import("../Payload").XyoPayloadFull>(schema: string) => (x: XyoPayload) => x is T;
-export declare const isXyoSchemaPayload: (x: XyoPayload) => x is XyoSchemaPayload;
-export declare const isXyoBoundWitnessPayload: (x: XyoPayload) => x is XyoBoundWitness;
+import { XyoBoundWitness } from '../BoundWitness';
+import { XyoPayload } from '../Payload';
+import { XyoSchemaPayload } from '../Schema';
+export declare const isXyoPayloadOfSchemaType: <T extends import("../Payload").XyoPayloadFull>(schema: string) => (x: XyoPayload) => x is T;
+export declare const isXyoSchemaPayload: (x: XyoPayload) => x is XyoSchemaPayload;
+export declare const isXyoBoundWitnessPayload: (x: XyoPayload) => x is XyoBoundWitness;

package/dist/esm/lib/isXyoPayloadOfSchemaType.js

@@ -1,6 +1,6 @@
-export const isXyoPayloadOfSchemaType = (schema) => {
-    return (x) => x.schema === schema;
-};
-export const isXyoSchemaPayload = isXyoPayloadOfSchemaType('network.xyo.schema');
-export const isXyoBoundWitnessPayload = isXyoPayloadOfSchemaType('network.xyo.boundwitness');
+export const isXyoPayloadOfSchemaType = (schema) => {
+    return (x) => x.schema === schema;
+};
+export const isXyoSchemaPayload = isXyoPayloadOfSchemaType('network.xyo.schema');
+export const isXyoBoundWitnessPayload = isXyoPayloadOfSchemaType('network.xyo.boundwitness');
 //# sourceMappingURL=isXyoPayloadOfSchemaType.js.map

package/dist/esm/lib/typeOf/TypeOfTypes.d.ts

@@ -1 +1 @@
-export declare type TypeOfTypes = 'string' | 'number' | 'object' | 'array' | 'buffer' | 'null' | 'undefined' | 'bigint' | 'boolean' | 'function' | 'symbol';
+export declare type TypeOfTypes = 'string' | 'number' | 'object' | 'array' | 'buffer' | 'null' | 'undefined' | 'bigint' | 'boolean' | 'function' | 'symbol';

package/dist/esm/lib/typeOf/TypeOfTypes.js

@@ -1,2 +1,2 @@
-export {};
+export {};
 //# sourceMappingURL=TypeOfTypes.js.map

package/dist/esm/lib/typeOf/ifDefined.d.ts

@@ -1 +1 @@
-export declare const ifDefined: <T>(value: T, func: (value: T) => void) => T | undefined;
+export declare const ifDefined: <T>(value: T, func: (value: T) => void) => T | undefined;

package/dist/esm/lib/typeOf/ifDefined.js

@@ -1,12 +1,12 @@
-import { typeOf } from './typeOf';
-export const ifDefined = (value, func) => {
-    switch (typeOf(value)) {
-        case 'undefined':
-        case 'null':
-            break;
-        default:
-            func(value);
-            return value;
-    }
-};
+import { typeOf } from './typeOf';
+export const ifDefined = (value, func) => {
+    switch (typeOf(value)) {
+        case 'undefined':
+        case 'null':
+            break;
+        default:
+            func(value);
+            return value;
+    }
+};
 //# sourceMappingURL=ifDefined.js.map

package/dist/esm/lib/typeOf/ifTypeOf.d.ts

@@ -1,2 +1,2 @@
-import { TypeOfTypes } from './TypeOfTypes';
-export declare const ifTypeOf: <T, R>(typeName: TypeOfTypes, value: unknown, trueFunc: (value: T) => R, isFunc?: ((value: T) => boolean) | undefined) => R | undefined;
+import { TypeOfTypes } from './TypeOfTypes';
+export declare const ifTypeOf: <T, R>(typeName: TypeOfTypes, value: unknown, trueFunc: (value: T) => R, isFunc?: ((value: T) => boolean) | undefined) => R | undefined;

package/dist/esm/lib/typeOf/ifTypeOf.js

@@ -1,8 +1,8 @@
-import { typeOf } from './typeOf';
-export const ifTypeOf = (typeName, value, trueFunc, isFunc) => {
-    switch (typeOf(value)) {
-        case typeName:
-            return !isFunc || isFunc(value) ? trueFunc(value) : undefined;
-    }
-};
+import { typeOf } from './typeOf';
+export const ifTypeOf = (typeName, value, trueFunc, isFunc) => {
+    switch (typeOf(value)) {
+        case typeName:
+            return !isFunc || isFunc(value) ? trueFunc(value) : undefined;
+    }
+};
 //# sourceMappingURL=ifTypeOf.js.map

package/dist/esm/lib/typeOf/index.d.ts

@@ -1,5 +1,5 @@
-export * from './ifDefined';
-export * from './ifTypeOf';
-export * from './typeOf';
-export * from './TypeOfTypes';
-export * from './validateType';
+export * from './ifDefined';
+export * from './ifTypeOf';
+export * from './typeOf';
+export * from './TypeOfTypes';
+export * from './validateType';

package/dist/esm/lib/typeOf/index.js

@@ -1,6 +1,6 @@
-export * from './ifDefined';
-export * from './ifTypeOf';
-export * from './typeOf';
-export * from './TypeOfTypes';
-export * from './validateType';
+export * from './ifDefined';
+export * from './ifTypeOf';
+export * from './typeOf';
+export * from './TypeOfTypes';
+export * from './validateType';
 //# sourceMappingURL=index.js.map

package/dist/esm/lib/typeOf/typeOf.d.ts

@@ -1,2 +1,2 @@
-import { TypeOfTypes } from './TypeOfTypes';
-export declare const typeOf: <T>(item: T) => TypeOfTypes;
+import { TypeOfTypes } from './TypeOfTypes';
+export declare const typeOf: <T>(item: T) => TypeOfTypes;

package/dist/esm/lib/typeOf/typeOf.js

@@ -1,4 +1,4 @@
-export const typeOf = (item) => {
-    return Array.isArray(item) ? 'array' : typeof item;
-};
+export const typeOf = (item) => {
+    return Array.isArray(item) ? 'array' : typeof item;
+};
 //# sourceMappingURL=typeOf.js.map

package/dist/esm/lib/typeOf/validateType.d.ts

@@ -1,2 +1,2 @@
-import { TypeOfTypes } from './TypeOfTypes';
-export declare const validateType: <T>(typeName: TypeOfTypes, value: T, optional?: boolean) => [T | undefined, Error[]];
+import { TypeOfTypes } from './TypeOfTypes';
+export declare const validateType: <T>(typeName: TypeOfTypes, value: T, optional?: boolean) => [T | undefined, Error[]];

package/dist/esm/lib/typeOf/validateType.js

@@ -1,14 +1,14 @@
-import { typeOf } from './typeOf';
-export const validateType = (typeName, value, optional = false) => {
-    switch (typeOf(value)) {
-        case typeName:
-            return [value, []];
-        default: {
-            if (optional && typeOf(value) === 'undefined') {
-                return [value, []];
-            }
-            return [undefined, [Error(`value type is not '${typeName}:${typeof value}'`)]];
-        }
-    }
-};
+import { typeOf } from './typeOf';
+export const validateType = (typeName, value, optional = false) => {
+    switch (typeOf(value)) {
+        case typeName:
+            return [value, []];
+        default: {
+            if (optional && typeOf(value) === 'undefined') {
+                return [value, []];
+            }
+            return [undefined, [Error(`value type is not '${typeName}:${typeof value}'`)]];
+        }
+    }
+};
 //# sourceMappingURL=validateType.js.map

package/dist/esm/models/WithStringIndex.d.ts

@@ -1 +1 @@
-export declare type WithStringIndex<T> = T & Record<string, unknown>;
+export declare type WithStringIndex<T> = T & Record<string, unknown>;

package/dist/esm/models/WithStringIndex.js

@@ -1,2 +1,2 @@
-export {};
+export {};
 //# sourceMappingURL=WithStringIndex.js.map

package/dist/esm/models/index.d.ts

@@ -1 +1 @@
-export * from './WithStringIndex';
+export * from './WithStringIndex';

package/dist/esm/models/index.js

@@ -1,2 +1,2 @@
-export * from './WithStringIndex';
+export * from './WithStringIndex';
 //# sourceMappingURL=index.js.map

package/dist/esm/nodeIndex.d.ts

@@ -1 +1 @@
-export * from './shared';
+export * from './shared';

package/dist/esm/nodeIndex.js

@@ -1,2 +1,2 @@
-export * from './shared';
+export * from './shared';
 //# sourceMappingURL=nodeIndex.js.map

package/dist/esm/shared.d.ts

@@ -1,11 +1,11 @@
-export * from './BoundWitness';
-export * from './Hasher';
-export * from './Huri';
-export * from './lib';
-export * from './models';
-export * from './Payload';
-export * from './Query';
-export * from './Schema';
-export * from './SchemaNameValidator';
-export * from './Wallet';
-export * from './Witness';
+export * from './BoundWitness';
+export * from './Hasher';
+export * from './Huri';
+export * from './lib';
+export * from './models';
+export * from './Payload';
+export * from './Query';
+export * from './Schema';
+export * from './SchemaNameValidator';
+export * from './Wallet';
+export * from './Witness';

package/dist/esm/shared.js

@@ -1,12 +1,12 @@
-export * from './BoundWitness';
-export * from './Hasher';
-export * from './Huri';
-export * from './lib';
-export * from './models';
-export * from './Payload';
-export * from './Query';
-export * from './Schema';
-export * from './SchemaNameValidator';
-export * from './Wallet';
-export * from './Witness';
+export * from './BoundWitness';
+export * from './Hasher';
+export * from './Huri';
+export * from './lib';
+export * from './models';
+export * from './Payload';
+export * from './Query';
+export * from './Schema';
+export * from './SchemaNameValidator';
+export * from './Wallet';
+export * from './Witness';
 //# sourceMappingURL=shared.js.map

package/package.json

@@ -9,7 +9,7 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xylabs/sdk-js": "^2.5.7",
+    "@xylabs/sdk-js": "^2.5.9",
     "axios": "^0.27.2",
     "elliptic": "^6.5.4",
     "keccak256": "^1.0.6",
@@ -19,18 +19,12 @@
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
   "devDependencies": {
-    "@babel/core": "^7.18.2",
-    "@babel/preset-env": "^7.18.2",
     "@types/elliptic": "^6.4.14",
     "@types/lodash": "^4.14.182",
-    "@types/node": "^17.0.41",
+    "@types/node": "^18.0.0",
     "@types/sha.js": "^2.4.0",
     "@types/ua-parser-js": "^0.7.36",
-    "@xylabs/eslint-config": "^2.3.22",
-    "@xylabs/ts-scripts": "^1.0.66",
-    "license-checker": "^25.0.1",
-    "tslib": "^2.4.0",
-    "typescript": "^4.7.3"
+    "tslib": "^2.4.0"
   },
   "browser": "dist/esm/browserIndex.js",
   "docs": "dist/docs.json",
@@ -63,12 +57,8 @@
     "type": "git",
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
-  "scripts": {
-    "lint-pkg": "npmPkgJsonLint .",
-    "license": "yarn license-checker --exclude \"MIT, ISC, Apache-2.0, BSD, BSD-2-Clause, CC-BY-4.0, Unlicense, CC-BY-3.0, CC0-1.0\""
-  },
   "sideEffects": true,
   "types": "dist/esm/index.d.ts",
-  "version": "2.20.45",
+  "version": "2.20.46",
   "packageManager": "yarn@3.1.1"
 }

package/src/Huri/Huri.spec.ts

@@ -80,7 +80,6 @@ describe('Huri', () => {
           const payload: XyoPayload = {
             schema: huri.hash,
           }
-          console.log(`Payload: ${JSON.stringify(payload, null, 2)}`)
           return payload
         }
         const huri = new Huri('https://beta.api.archivist.xyo.network/18f97b3e85f5bede65e7c0a85d74aee896de58ead8bc4b1b3d7300646c653057')

package/src/Huri/Huri.ts

@@ -2,6 +2,7 @@ import { assertEx } from '@xylabs/sdk-js'
 import axios from 'axios'
 
 import { XyoPayload } from '../Payload'
+import { XyoAddressValue, XyoDataLike } from '../Wallet'
 
 export type XyoObjectCategory = 'block' | 'payload'
 
@@ -33,13 +34,16 @@ export class Huri {
   public archive?: string
   public hash: string
 
-  constructor(huri: string, { archivistUri }: HuriOptions = {}) {
-    this.originalHref = huri
+  private isHuri = true
 
-    const protocol = Huri.parseProtocol(huri)
+  constructor(huri: XyoDataLike | Huri, { archivistUri }: HuriOptions = {}) {
+    const huriString = Huri.isHuri(huri)?.href ?? typeof huri === 'string' ? (huri as string) : new XyoAddressValue(huri as XyoDataLike).hex
+    this.originalHref = huriString
+
+    const protocol = Huri.parseProtocol(huriString)
     this.protocol = protocol ?? 'https'
 
-    const path = assertEx(Huri.parsePath(huri), 'Missing path')
+    const path = assertEx(Huri.parsePath(huriString), 'Missing path')
     this.hash = this.parsePath(path, protocol !== undefined)
 
     //if archivistUri sent, overwrite protocol and archivist
@@ -140,4 +144,11 @@ export class Huri {
       return protocolSplit[1]
     }
   }
+
+  public static isHuri(value: unknown) {
+    if (typeof value === 'object') {
+      return (value as Huri).isHuri ? (value as Huri) : undefined
+    }
+    return undefined
+  }
 }

package/src/Payload/Wrapper/Wrapper.ts

@@ -1,4 +1,6 @@
 import { deepOmitUnderscoreFields, deepPickUnderscoreFields, XyoAbstractHasher } from '../../Hasher'
+import { Huri } from '../../Huri'
+import { XyoDataLike } from '../../Wallet'
 import { XyoPayload } from '../models'
 
 export class XyoPayloadWrapper<T extends XyoPayload> extends XyoAbstractHasher<T> {
@@ -19,4 +21,11 @@ export class XyoPayloadWrapper<T extends XyoPayload> extends XyoAbstractHasher<T
   public get meta() {
     return deepPickUnderscoreFields(this.payload)
   }
+
+  public static async load(address: XyoDataLike | Huri) {
+    const payload = await new Huri(address).fetch()
+    if (payload) {
+      return new XyoPayloadWrapper(payload)
+    }
+  }
 }

package/src/Witness/LegacyWitness.ts

@@ -1,13 +1,13 @@
 import { XyoPayload, XyoPayloadBuilder } from '../Payload'
 import { XyoWitness } from './Witness'
 
-export interface XyoWitnessConfig<T extends XyoPayload = XyoPayload> {
+export interface XyoSimpleWitnessConfig<T extends XyoPayload = XyoPayload> {
   schema: string
   template?: XyoPayload
   observer?: () => Promise<T> | T
 }
 
-export class XyoLegacyWitness<T extends XyoPayload = XyoPayload, C extends XyoWitnessConfig<T> = XyoWitnessConfig<T>> extends XyoWitness<T> {
+export class XyoSimpleWitness<T extends XyoPayload = XyoPayload, C extends XyoSimpleWitnessConfig<T> = XyoSimpleWitnessConfig<T>> extends XyoWitness<T> {
   public config?: C
   public previousHash?: string
 
@@ -28,3 +28,9 @@ export class XyoLegacyWitness<T extends XyoPayload = XyoPayload, C extends XyoWi
       .build()
   }
 }
+
+/** @deprecated Use XyoSimpleWitness */
+export class XyoLegacyWitness<T extends XyoPayload = XyoPayload, C extends XyoSimpleWitnessConfig<T> = XyoSimpleWitnessConfig<T>> extends XyoSimpleWitness<T, C> {}
+
+/** @deprecated Use XyoSimpleWitnessConfig */
+export type XyoWitnessConfig<T extends XyoPayload = XyoPayload> = XyoSimpleWitnessConfig<T>

package/src/Witness/Witness.spec.ts

@@ -1,11 +1,11 @@
-import { XyoLegacyWitness } from './LegacyWitness'
+import { XyoSimpleWitness } from './LegacyWitness'
 
 describe('XyoWitness', () => {
   test('valid-instantiation', () => {
     const template = {
       schema: 'network.xyo.foo',
     }
-    const witness = new XyoLegacyWitness({ schema: 'network.xyo.payload', template })
+    const witness = new XyoSimpleWitness({ schema: 'network.xyo.payload', template })
     expect(witness).toBeTruthy()
     expect(witness.config?.schema).toBe('network.xyo.payload')
     expect(witness.config?.template).toBe(template)