@xyo-network/id-payload-plugin 2.31.4 → 2.32.0-rc.2

package/dist/esm/Payload.d.ts

@@ -1,7 +1,7 @@
 import { XyoPayload } from '@xyo-network/payload';
-import { XyoIdPayloadSchema } from './Schema';
+import { XyoIdSchema } from './Schema';
 export declare type XyoIdPayload = XyoPayload<{
-    schema: XyoIdPayloadSchema;
+    schema: XyoIdSchema;
     salt: string;
 }>;
 //# sourceMappingURL=Payload.d.ts.map

package/dist/esm/Payload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Payload.d.ts","sourceRoot":"","sources":["../../src/Payload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAE7C,oBAAY,YAAY,GAAG,UAAU,CAAC;IACpC,MAAM,EAAE,kBAAkB,CAAA;IAC1B,IAAI,EAAE,MAAM,CAAA;CACb,CAAC,CAAA"}
+{"version":3,"file":"Payload.d.ts","sourceRoot":"","sources":["../../src/Payload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAEtC,oBAAY,YAAY,GAAG,UAAU,CAAC;IACpC,MAAM,EAAE,WAAW,CAAA;IACnB,IAAI,EAAE,MAAM,CAAA;CACb,CAAC,CAAA"}

package/dist/esm/Plugin.js

@@ -1,16 +1,16 @@
 import { createXyoPayloadPlugin } from '@xyo-network/payload-plugin';
-import { XyoIdPayloadSchema } from './Schema';
+import { XyoIdSchema } from './Schema';
 import { XyoIdPayloadTemplate } from './Template';
 import { XyoIdWitness, XyoIdWitnessConfigSchema } from './Witness';
 export const XyoIdPayloadPlugin = () => createXyoPayloadPlugin({
     auto: true,
-    schema: XyoIdPayloadSchema,
+    schema: XyoIdSchema,
     template: XyoIdPayloadTemplate,
     witness: (config) => {
         return new XyoIdWitness({
             ...config,
             schema: XyoIdWitnessConfigSchema,
-            targetSchema: XyoIdPayloadSchema,
+            targetSchema: XyoIdSchema,
         });
     },
 });

package/dist/esm/Plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"Plugin.js","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AAGpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AACjD,OAAO,EAAE,YAAY,EAAsB,wBAAwB,EAAE,MAAM,WAAW,CAAA;AAEtF,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,EAAE,CACrC,sBAAsB,CAAmC;IACvD,IAAI,EAAE,IAAI;IACV,MAAM,EAAE,kBAAkB;IAC1B,QAAQ,EAAE,oBAAoB;IAC9B,OAAO,EAAE,CAAC,MAAM,EAAgB,EAAE;QAChC,OAAO,IAAI,YAAY,CAAC;YACtB,GAAG,MAAM;YACT,MAAM,EAAE,wBAAwB;YAChC,YAAY,EAAE,kBAAkB;SACjC,CAAC,CAAA;IACJ,CAAC;CACF,CAAC,CAAA"}
+{"version":3,"file":"Plugin.js","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AAGpE,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AACtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AACjD,OAAO,EAAE,YAAY,EAAsB,wBAAwB,EAAE,MAAM,WAAW,CAAA;AAEtF,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,EAAE,CACrC,sBAAsB,CAAmC;IACvD,IAAI,EAAE,IAAI;IACV,MAAM,EAAE,WAAW;IACnB,QAAQ,EAAE,oBAAoB;IAC9B,OAAO,EAAE,CAAC,MAAM,EAAgB,EAAE;QAChC,OAAO,IAAI,YAAY,CAAC;YACtB,GAAG,MAAM;YACT,MAAM,EAAE,wBAAwB;YAChC,YAAY,EAAE,WAAW;SAC1B,CAAC,CAAA;IACJ,CAAC;CACF,CAAC,CAAA"}

package/dist/esm/Schema.d.ts

@@ -1,3 +1,3 @@
-export declare type XyoIdPayloadSchema = 'network.xyo.id';
-export declare const XyoIdPayloadSchema: XyoIdPayloadSchema;
+export declare type XyoIdSchema = 'network.xyo.id';
+export declare const XyoIdSchema: XyoIdSchema;
 //# sourceMappingURL=Schema.d.ts.map

package/dist/esm/Schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Schema.d.ts","sourceRoot":"","sources":["../../src/Schema.ts"],"names":[],"mappings":"AAAA,oBAAY,kBAAkB,GAAG,gBAAgB,CAAA;AACjD,eAAO,MAAM,kBAAkB,EAAE,kBAAqC,CAAA"}
+{"version":3,"file":"Schema.d.ts","sourceRoot":"","sources":["../../src/Schema.ts"],"names":[],"mappings":"AAAA,oBAAY,WAAW,GAAG,gBAAgB,CAAA;AAC1C,eAAO,MAAM,WAAW,EAAE,WAA8B,CAAA"}

package/dist/esm/Schema.js

@@ -1,2 +1,2 @@
-export const XyoIdPayloadSchema = 'network.xyo.id';
+export const XyoIdSchema = 'network.xyo.id';
 //# sourceMappingURL=Schema.js.map

package/dist/esm/Schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"Schema.js","sourceRoot":"","sources":["../../src/Schema.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,kBAAkB,GAAuB,gBAAgB,CAAA"}
+{"version":3,"file":"Schema.js","sourceRoot":"","sources":["../../src/Schema.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,WAAW,GAAgB,gBAAgB,CAAA"}

package/dist/esm/Template.js

@@ -1,6 +1,6 @@
-import { XyoIdPayloadSchema } from './Schema';
+import { XyoIdSchema } from './Schema';
 export const XyoIdPayloadTemplate = () => ({
     salt: '',
-    schema: XyoIdPayloadSchema,
+    schema: XyoIdSchema,
 });
 //# sourceMappingURL=Template.js.map

package/dist/esm/Template.js.map

@@ -1 +1 @@
-{"version":3,"file":"Template.js","sourceRoot":"","sources":["../../src/Template.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAE7C,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAiB,EAAE,CAAC,CAAC;IACvD,IAAI,EAAE,EAAE;IACR,MAAM,EAAE,kBAAkB;CAC3B,CAAC,CAAA"}
+{"version":3,"file":"Template.js","sourceRoot":"","sources":["../../src/Template.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAEtC,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAiB,EAAE,CAAC,CAAC;IACvD,IAAI,EAAE,EAAE;IACR,MAAM,EAAE,WAAW;CACpB,CAAC,CAAA"}

package/dist/esm/Witness.d.ts

@@ -1,6 +1,6 @@
-import { XyoWitness, XyoWitnessConfig } from '@xyo-network/witness';
+import { PartialWitnessConfig, XyoWitness, XyoWitnessConfig } from '@xyo-network/witness';
 import { XyoIdPayload } from './Payload';
-import { XyoIdPayloadSchema } from './Schema';
+import { XyoIdSchema } from './Schema';
 export declare type XyoIdWitnessConfigSchema = 'network.xyo.id.witness.config';
 export declare const XyoIdWitnessConfigSchema: XyoIdWitnessConfigSchema;
 export declare type XyoIdWitnessConfig = XyoWitnessConfig<XyoIdPayload, {
@@ -8,8 +8,9 @@ export declare type XyoIdWitnessConfig = XyoWitnessConfig<XyoIdPayload, {
     salt: string;
 }>;
 export declare class XyoIdWitness extends XyoWitness<XyoIdPayload, XyoIdWitnessConfig> {
-    get salt(): string;
-    observe(_fields?: Partial<XyoIdPayload>): Promise<XyoIdPayload>;
-    static schema: XyoIdPayloadSchema;
+    constructor(config: PartialWitnessConfig<XyoIdWitnessConfig>);
+    get salt(): string | undefined;
+    observe(fields?: Partial<XyoIdPayload>): Promise<XyoIdPayload>;
+    static schema: XyoIdSchema;
 }
 //# sourceMappingURL=Witness.d.ts.map

package/dist/esm/Witness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAEnE,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAE7C,oBAAY,wBAAwB,GAAG,+BAA+B,CAAA;AACtE,eAAO,MAAM,wBAAwB,EAAE,wBAA0D,CAAA;AAEjG,oBAAY,kBAAkB,GAAG,gBAAgB,CAC/C,YAAY,EACZ;IACE,MAAM,EAAE,wBAAwB,CAAA;IAChC,IAAI,EAAE,MAAM,CAAA;CACb,CACF,CAAA;AAED,qBAAa,YAAa,SAAQ,UAAU,CAAC,YAAY,EAAE,kBAAkB,CAAC;IAC5E,IAAW,IAAI,WAEd;IAEc,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC;IAQ9E,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAqB;CACvD"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAEzF,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAEtC,oBAAY,wBAAwB,GAAG,+BAA+B,CAAA;AACtE,eAAO,MAAM,wBAAwB,EAAE,wBAA0D,CAAA;AAEjG,oBAAY,kBAAkB,GAAG,gBAAgB,CAC/C,YAAY,EACZ;IACE,MAAM,EAAE,wBAAwB,CAAA;IAChC,IAAI,EAAE,MAAM,CAAA;CACb,CACF,CAAA;AAED,qBAAa,YAAa,SAAQ,UAAU,CAAC,YAAY,EAAE,kBAAkB,CAAC;gBAChE,MAAM,EAAE,oBAAoB,CAAC,kBAAkB,CAAC;IAI5D,IAAW,IAAI,uBAEd;IAEc,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC;IAS7E,MAAM,CAAC,MAAM,EAAE,WAAW,CAAc;CACzC"}

package/dist/esm/Witness.js

@@ -1,18 +1,23 @@
+import { assertEx } from '@xylabs/assert';
 import { delay } from '@xylabs/delay';
 import { XyoWitness } from '@xyo-network/witness';
-import { XyoIdPayloadSchema } from './Schema';
+import { XyoIdSchema } from './Schema';
 export const XyoIdWitnessConfigSchema = 'network.xyo.id.witness.config';
 export class XyoIdWitness extends XyoWitness {
+    constructor(config) {
+        super({ schema: XyoIdWitnessConfigSchema, targetSchema: XyoIdSchema, ...config });
+    }
     get salt() {
-        return this.config.salt;
+        return this.config?.salt;
     }
-    async observe(_fields) {
+    async observe(fields) {
         await delay(0);
         return {
-            salt: this.salt,
+            ...fields,
+            salt: assertEx(this.salt ?? fields?.salt, 'Missing salt'),
             schema: 'network.xyo.id',
         };
     }
-    static schema = XyoIdPayloadSchema;
+    static schema = XyoIdSchema;
 }
 //# sourceMappingURL=Witness.js.map

package/dist/esm/Witness.js.map

@@ -1 +1 @@
-{"version":3,"file":"Witness.js","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AACrC,OAAO,EAAE,UAAU,EAAoB,MAAM,sBAAsB,CAAA;AAGnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAG7C,MAAM,CAAC,MAAM,wBAAwB,GAA6B,+BAA+B,CAAA;AAUjG,MAAM,OAAO,YAAa,SAAQ,UAA4C;IAC5E,IAAW,IAAI;QACb,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAA;IACzB,CAAC;IAEQ,KAAK,CAAC,OAAO,CAAC,OAA+B;QACpD,MAAM,KAAK,CAAC,CAAC,CAAC,CAAA;QACd,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,MAAM,EAAE,gBAAgB;SACzB,CAAA;IACH,CAAC;IAED,MAAM,CAAC,MAAM,GAAuB,kBAAkB,CAAA"}
+{"version":3,"file":"Witness.js","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AACrC,OAAO,EAAwB,UAAU,EAAoB,MAAM,sBAAsB,CAAA;AAGzF,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAGtC,MAAM,CAAC,MAAM,wBAAwB,GAA6B,+BAA+B,CAAA;AAUjG,MAAM,OAAO,YAAa,SAAQ,UAA4C;IAC5E,YAAY,MAAgD;QAC1D,KAAK,CAAC,EAAE,MAAM,EAAE,wBAAwB,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,MAAM,EAAE,CAAC,CAAA;IACnF,CAAC;IAED,IAAW,IAAI;QACb,OAAO,IAAI,CAAC,MAAM,EAAE,IAAI,CAAA;IAC1B,CAAC;IAEQ,KAAK,CAAC,OAAO,CAAC,MAA8B;QACnD,MAAM,KAAK,CAAC,CAAC,CAAC,CAAA;QACd,OAAO;YACL,GAAG,MAAM;YACT,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,MAAM,EAAE,IAAI,EAAE,cAAc,CAAC;YACzD,MAAM,EAAE,gBAAgB;SACzB,CAAA;IACH,CAAC;IAED,MAAM,CAAC,MAAM,GAAgB,WAAW,CAAA"}

package/package.json

@@ -10,10 +10,11 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
+    "@xylabs/assert": "^2.6.7",
     "@xylabs/delay": "^2.6.7",
-    "@xyo-network/payload": "^2.31.4",
-    "@xyo-network/payload-plugin": "^2.31.4",
-    "@xyo-network/witness": "^2.31.4",
+    "@xyo-network/payload": "^2.32.0-rc.2",
+    "@xyo-network/payload-plugin": "^2.32.0-rc.2",
+    "@xyo-network/witness": "^2.32.0-rc.2",
     "tslib": "^2.4.0"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -49,5 +50,6 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.31.4"
+  "version": "2.32.0-rc.2",
+  "stableVersion": "2.31.5"
 }

package/src/Payload.ts

@@ -1,8 +1,8 @@
 import { XyoPayload } from '@xyo-network/payload'
 
-import { XyoIdPayloadSchema } from './Schema'
+import { XyoIdSchema } from './Schema'
 
 export type XyoIdPayload = XyoPayload<{
-  schema: XyoIdPayloadSchema
+  schema: XyoIdSchema
   salt: string
 }>

package/src/Plugin.spec.ts

@@ -1,12 +1,12 @@
 import { XyoPayloadPluginResolver } from '@xyo-network/payload-plugin'
 
 import { XyoIdPayloadPlugin } from './Plugin'
-import { XyoIdPayloadSchema } from './Schema'
+import { XyoIdSchema } from './Schema'
 
 describe('XyoIdPayloadPlugin', () => {
   test('Add to Resolver', () => {
     const resolver = new XyoPayloadPluginResolver().register(XyoIdPayloadPlugin())
-    expect(resolver.resolve({ schema: XyoIdPayloadSchema })).toBeObject()
-    expect(resolver.witness(XyoIdPayloadSchema)).toBeObject()
+    expect(resolver.resolve({ schema: XyoIdSchema })).toBeObject()
+    expect(resolver.witness(XyoIdSchema)).toBeObject()
   })
 })

package/src/Plugin.ts

@@ -1,20 +1,20 @@
 import { createXyoPayloadPlugin } from '@xyo-network/payload-plugin'
 
 import { XyoIdPayload } from './Payload'
-import { XyoIdPayloadSchema } from './Schema'
+import { XyoIdSchema } from './Schema'
 import { XyoIdPayloadTemplate } from './Template'
 import { XyoIdWitness, XyoIdWitnessConfig, XyoIdWitnessConfigSchema } from './Witness'
 
 export const XyoIdPayloadPlugin = () =>
   createXyoPayloadPlugin<XyoIdPayload, XyoIdWitnessConfig>({
     auto: true,
-    schema: XyoIdPayloadSchema,
+    schema: XyoIdSchema,
     template: XyoIdPayloadTemplate,
     witness: (config): XyoIdWitness => {
       return new XyoIdWitness({
         ...config,
         schema: XyoIdWitnessConfigSchema,
-        targetSchema: XyoIdPayloadSchema,
+        targetSchema: XyoIdSchema,
       })
     },
   })

package/src/Schema.ts

@@ -1,2 +1,2 @@
-export type XyoIdPayloadSchema = 'network.xyo.id'
-export const XyoIdPayloadSchema: XyoIdPayloadSchema = 'network.xyo.id'
+export type XyoIdSchema = 'network.xyo.id'
+export const XyoIdSchema: XyoIdSchema = 'network.xyo.id'

package/src/Template.ts

@@ -1,7 +1,7 @@
 import { XyoIdPayload } from './Payload'
-import { XyoIdPayloadSchema } from './Schema'
+import { XyoIdSchema } from './Schema'
 
 export const XyoIdPayloadTemplate = (): XyoIdPayload => ({
   salt: '',
-  schema: XyoIdPayloadSchema,
+  schema: XyoIdSchema,
 })

package/src/Witness.browser.spec.ts

@@ -2,20 +2,15 @@
  * @jest-environment jsdom
  */
 
-import { XyoAccount } from '@xyo-network/account'
-
-import { XyoIdPayloadSchema } from './Schema'
-import { XyoIdWitness, XyoIdWitnessConfigSchema } from './Witness'
+import { XyoIdSchema } from './Schema'
+import { XyoIdWitness } from './Witness'
 
 describe('XyoIdWitness [Browser]', () => {
   test('observe', async () => {
     const witness = new XyoIdWitness({
-      account: new XyoAccount(),
       salt: 'test',
-      schema: XyoIdWitnessConfigSchema,
-      targetSchema: XyoIdPayloadSchema,
     })
     const observation = await witness.observe()
-    expect(observation.schema).toBe(XyoIdPayloadSchema)
+    expect(observation.schema).toBe(XyoIdSchema)
   })
 })

package/src/Witness.spec.ts

@@ -1,15 +1,9 @@
-import { XyoAccount } from '@xyo-network/account'
-
-import { XyoIdPayloadSchema } from './Schema'
-import { XyoIdWitness, XyoIdWitnessConfigSchema } from './Witness'
+import { XyoIdWitness } from './Witness'
 
 describe('XyoIdWitness', () => {
   test('observe', async () => {
     const witness = new XyoIdWitness({
-      account: new XyoAccount(),
       salt: 'test',
-      schema: XyoIdWitnessConfigSchema,
-      targetSchema: XyoIdPayloadSchema,
     })
     const observation = await witness.observe()
     expect(observation.schema).toBe('network.xyo.id')

package/src/Witness.ts

@@ -1,8 +1,9 @@
+import { assertEx } from '@xylabs/assert'
 import { delay } from '@xylabs/delay'
-import { XyoWitness, XyoWitnessConfig } from '@xyo-network/witness'
+import { PartialWitnessConfig, XyoWitness, XyoWitnessConfig } from '@xyo-network/witness'
 
 import { XyoIdPayload } from './Payload'
-import { XyoIdPayloadSchema } from './Schema'
+import { XyoIdSchema } from './Schema'
 
 export type XyoIdWitnessConfigSchema = 'network.xyo.id.witness.config'
 export const XyoIdWitnessConfigSchema: XyoIdWitnessConfigSchema = 'network.xyo.id.witness.config'
@@ -16,17 +17,22 @@ export type XyoIdWitnessConfig = XyoWitnessConfig<
 >
 
 export class XyoIdWitness extends XyoWitness<XyoIdPayload, XyoIdWitnessConfig> {
+  constructor(config: PartialWitnessConfig<XyoIdWitnessConfig>) {
+    super({ schema: XyoIdWitnessConfigSchema, targetSchema: XyoIdSchema, ...config })
+  }
+
   public get salt() {
-    return this.config.salt
+    return this.config?.salt
   }
 
-  override async observe(_fields?: Partial<XyoIdPayload>): Promise<XyoIdPayload> {
+  override async observe(fields?: Partial<XyoIdPayload>): Promise<XyoIdPayload> {
     await delay(0)
     return {
-      salt: this.salt,
+      ...fields,
+      salt: assertEx(this.salt ?? fields?.salt, 'Missing salt'),
       schema: 'network.xyo.id',
     }
   }
 
-  static schema: XyoIdPayloadSchema = XyoIdPayloadSchema
+  static schema: XyoIdSchema = XyoIdSchema
 }