@xyo-network/id-payload-plugin 2.25.4 → 2.26.1

package/dist/esm/Plugin.d.ts

@@ -1,4 +1,5 @@
-import { XyoPayloadPluginFunc } from '@xyo-network/payload-plugin';
+import { XyoPayloadPluginConfig, XyoPayloadPluginFunc } from '@xyo-network/payload-plugin';
 import { XyoIdPayload } from './Payload';
-export declare const XyoIdPayloadPlugin: XyoPayloadPluginFunc<'network.xyo.id', XyoIdPayload>;
+import { XyoIdWitnessConfig } from './Witness';
+export declare const XyoIdPayloadPlugin: XyoPayloadPluginFunc<'network.xyo.id', XyoIdPayload, XyoPayloadPluginConfig<XyoIdWitnessConfig>>;
 //# sourceMappingURL=Plugin.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Plugin.d.ts","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAE1F,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAIxC,eAAO,MAAM,kBAAkB,EAAE,oBAAoB,CAAC,gBAAgB,EAAE,YAAY,CAQhF,CAAA"}
+{"version":3,"file":"Plugin.d.ts","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AACA,OAAO,EAA0B,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAElH,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAExC,OAAO,EAAgB,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAE5D,eAAO,MAAM,kBAAkB,EAAE,oBAAoB,CAAC,gBAAgB,EAAE,YAAY,EAAE,sBAAsB,CAAC,kBAAkB,CAAC,CAQ5H,CAAA"}

package/dist/esm/Plugin.js

@@ -1,12 +1,13 @@
+import { assertEx } from '@xylabs/assert';
 import { createXyoPayloadPlugin } from '@xyo-network/payload-plugin';
 import { XyoIdPayloadTemplate } from './Template';
 import { XyoIdWitness } from './Witness';
-export const XyoIdPayloadPlugin = () => createXyoPayloadPlugin({
+export const XyoIdPayloadPlugin = (config) => createXyoPayloadPlugin({
     auto: true,
     schema: 'network.xyo.id',
     template: XyoIdPayloadTemplate,
     witness: () => {
-        return new XyoIdWitness();
+        return new XyoIdWitness(assertEx(config?.witness, 'Missing config'));
     },
 });
 //# sourceMappingURL=Plugin.js.map

package/dist/esm/Plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"Plugin.js","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAwB,MAAM,6BAA6B,CAAA;AAG1F,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAExC,MAAM,CAAC,MAAM,kBAAkB,GAAyD,GAAG,EAAE,CAC3F,sBAAsB,CAAC;IACrB,IAAI,EAAE,IAAI;IACV,MAAM,EAAE,gBAAgB;IACxB,QAAQ,EAAE,oBAAoB;IAC9B,OAAO,EAAE,GAAiB,EAAE;QAC1B,OAAO,IAAI,YAAY,EAAE,CAAA;IAC3B,CAAC;CACF,CAAC,CAAA"}
+{"version":3,"file":"Plugin.js","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,sBAAsB,EAAgD,MAAM,6BAA6B,CAAA;AAGlH,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AACjD,OAAO,EAAE,YAAY,EAAsB,MAAM,WAAW,CAAA;AAE5D,MAAM,CAAC,MAAM,kBAAkB,GAAqG,CAAC,MAAO,EAAE,EAAE,CAC9I,sBAAsB,CAAC;IACrB,IAAI,EAAE,IAAI;IACV,MAAM,EAAE,gBAAgB;IACxB,QAAQ,EAAE,oBAAoB;IAC9B,OAAO,EAAE,GAAiB,EAAE;QAC1B,OAAO,IAAI,YAAY,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAA;IACtE,CAAC;CACF,CAAC,CAAA"}

package/dist/esm/Witness.d.ts

@@ -1,10 +1,16 @@
-import { XyoSimpleWitness } from '@xyo-network/witness';
+import { XyoPayload } from '@xyo-network/payload';
+import { XyoWitness, XyoWitnessConfig, XyoWitnessQueryPayload } from '@xyo-network/witness';
 import { XyoIdPayload } from './Payload';
 import { XyoIdPayloadSchema } from './Schema';
-export declare class XyoIdWitness extends XyoSimpleWitness<XyoIdPayload> {
+export interface XyoIdWitnessConfig extends XyoWitnessConfig {
+    salt?: string;
+}
+export declare class XyoIdWitness extends XyoWitness<XyoIdPayload> {
     private salt;
-    constructor(salt?: string);
-    observe(): Promise<XyoIdPayload>;
+    constructor({ salt, ...config }: XyoIdWitnessConfig);
+    observe(_fields?: Partial<XyoIdPayload>, _query?: XyoWitnessQueryPayload<XyoPayload<{
+        schema: string;
+    }>> | undefined): Promise<XyoIdPayload>;
     static schema: XyoIdPayloadSchema;
 }
 //# 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":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAGvD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAG7C,qBAAa,YAAa,SAAQ,gBAAgB,CAAC,YAAY,CAAC;IAC9D,OAAO,CAAC,IAAI,CAAQ;gBAER,IAAI,SAAS;IASV,OAAO,IAAI,OAAO,CAAC,YAAY,CAAC;IAM/C,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAqB;CACvD"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAA;AAE3F,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAE7C,MAAM,WAAW,kBAAmB,SAAQ,gBAAgB;IAC1D,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,qBAAa,YAAa,SAAQ,UAAU,CAAC,YAAY,CAAC;IACxD,OAAO,CAAC,IAAI,CAAQ;gBAER,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,EAAE,kBAAkB;IAKpC,OAAO,CACpB,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,EAC/B,MAAM,CAAC,EAAE,sBAAsB,CAAC,UAAU,CAAC;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC,GAAG,SAAS,GAC1E,OAAO,CAAC,YAAY,CAAC;IAQxB,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAqB;CACvD"}

package/dist/esm/Witness.js

@@ -1,21 +1,19 @@
-import { XyoSimpleWitness } from '@xyo-network/witness';
-import { v4 as uuid } from 'uuid';
+import { delay } from '@xylabs/delay';
+import { uuid } from '@xyo-network/core';
+import { XyoWitness } from '@xyo-network/witness';
 import { XyoIdPayloadSchema } from './Schema';
-import { XyoIdPayloadTemplate } from './Template';
-export class XyoIdWitness extends XyoSimpleWitness {
+export class XyoIdWitness extends XyoWitness {
     salt;
-    constructor(salt = uuid()) {
-        const template = XyoIdPayloadTemplate();
-        super({
-            schema: template.schema,
-            template,
-        });
-        this.salt = salt;
+    constructor({ salt, ...config }) {
+        super(config);
+        this.salt = salt ?? uuid();
     }
-    async observe() {
-        return await super.observe({
+    async observe(_fields, _query) {
+        await delay(0);
+        return {
             salt: this.salt,
-        });
+            schema: 'network.xyo.id',
+        };
     }
     static schema = XyoIdPayloadSchema;
 }

package/dist/esm/Witness.js.map

@@ -1 +1 @@
-{"version":3,"file":"Witness.js","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,EAAE,IAAI,IAAI,EAAE,MAAM,MAAM,CAAA;AAGjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAEjD,MAAM,OAAO,YAAa,SAAQ,gBAA8B;IACtD,IAAI,CAAQ;IAEpB,YAAY,IAAI,GAAG,IAAI,EAAE;QACvB,MAAM,QAAQ,GAAG,oBAAoB,EAAE,CAAA;QACvC,KAAK,CAAC;YACJ,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,QAAQ;SACT,CAAC,CAAA;QACF,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IAClB,CAAC;IAEQ,KAAK,CAAC,OAAO;QACpB,OAAO,MAAM,KAAK,CAAC,OAAO,CAAC;YACzB,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,CAAC,MAAM,GAAuB,kBAAkB,CAAA"}
+{"version":3,"file":"Witness.js","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAExC,OAAO,EAAE,UAAU,EAA4C,MAAM,sBAAsB,CAAA;AAG3F,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAM7C,MAAM,OAAO,YAAa,SAAQ,UAAwB;IAChD,IAAI,CAAQ;IAEpB,YAAY,EAAE,IAAI,EAAE,GAAG,MAAM,EAAsB;QACjD,KAAK,CAAC,MAAM,CAAC,CAAA;QACb,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,IAAI,EAAE,CAAA;IAC5B,CAAC;IAEQ,KAAK,CAAC,OAAO,CACpB,OAA+B,EAC/B,MAA2E;QAE3E,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"}

package/package.json

@@ -10,14 +10,17 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xyo-network/payload": "^2.25.4",
-    "@xyo-network/payload-plugin": "^2.25.4",
-    "@xyo-network/witness": "^2.25.4",
-    "tslib": "^2.4.0",
-    "uuid": "^8.3.2"
+    "@xylabs/assert": "^2.6.6",
+    "@xylabs/delay": "^2.6.6",
+    "@xyo-network/account": "^2.26.1",
+    "@xyo-network/core": "^2.26.1",
+    "@xyo-network/payload": "^2.26.1",
+    "@xyo-network/payload-plugin": "^2.26.1",
+    "@xyo-network/witness": "^2.26.1",
+    "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@xylabs/tsconfig": "^2.5.98"
+    "@xylabs/tsconfig": "^2.5.118"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
   "browser": "dist/esm/index.js",
@@ -52,5 +55,5 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.25.4"
+  "version": "2.26.1"
 }

package/src/Plugin.spec.ts

@@ -5,6 +5,6 @@ import { XyoIdPayloadPlugin } from './Plugin'
 describe('XyoLocationPayloadPlugin', () => {
   test('Add to Resolver', () => {
     const resolver = new XyoPayloadPluginResolver().register(XyoIdPayloadPlugin())
-    expect(resolver.resolve({ schema: 'network.xyo.location' })).toBeDefined()
+    expect(resolver.resolve({ schema: 'network.xyo.id' })).toBeDefined()
   })
 })

package/src/Plugin.ts

@@ -1,15 +1,16 @@
-import { createXyoPayloadPlugin, XyoPayloadPluginFunc } from '@xyo-network/payload-plugin'
+import { assertEx } from '@xylabs/assert'
+import { createXyoPayloadPlugin, XyoPayloadPluginConfig, XyoPayloadPluginFunc } from '@xyo-network/payload-plugin'
 
 import { XyoIdPayload } from './Payload'
 import { XyoIdPayloadTemplate } from './Template'
-import { XyoIdWitness } from './Witness'
+import { XyoIdWitness, XyoIdWitnessConfig } from './Witness'
 
-export const XyoIdPayloadPlugin: XyoPayloadPluginFunc<'network.xyo.id', XyoIdPayload> = () =>
+export const XyoIdPayloadPlugin: XyoPayloadPluginFunc<'network.xyo.id', XyoIdPayload, XyoPayloadPluginConfig<XyoIdWitnessConfig>> = (config?) =>
   createXyoPayloadPlugin({
     auto: true,
     schema: 'network.xyo.id',
     template: XyoIdPayloadTemplate,
     witness: (): XyoIdWitness => {
-      return new XyoIdWitness()
+      return new XyoIdWitness(assertEx(config?.witness, 'Missing config'))
     },
   })

package/src/Witness.browser.spec.ts

@@ -0,0 +1,19 @@
+/**
+ * @jest-environment jsdom
+ */
+
+import { XyoAccount } from '@xyo-network/account'
+
+import { XyoIdWitness } from './Witness'
+
+describe('XyoSystemInfoWitness', () => {
+  test('observe', async () => {
+    const witness = new XyoIdWitness({
+      account: new XyoAccount(),
+      schema: 'network.xyo.id.config',
+      targetSchema: 'network.xyo.id',
+    })
+    const observation = await witness.observe()
+    expect(observation.schema).toBe('network.xyo.id')
+  })
+})

package/src/Witness.spec.ts

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

package/src/Witness.ts

@@ -1,26 +1,32 @@
-import { XyoSimpleWitness } from '@xyo-network/witness'
-import { v4 as uuid } from 'uuid'
+import { delay } from '@xylabs/delay'
+import { uuid } from '@xyo-network/core'
+import { XyoPayload } from '@xyo-network/payload'
+import { XyoWitness, XyoWitnessConfig, XyoWitnessQueryPayload } from '@xyo-network/witness'
 
 import { XyoIdPayload } from './Payload'
 import { XyoIdPayloadSchema } from './Schema'
-import { XyoIdPayloadTemplate } from './Template'
 
-export class XyoIdWitness extends XyoSimpleWitness<XyoIdPayload> {
+export interface XyoIdWitnessConfig extends XyoWitnessConfig {
+  salt?: string
+}
+
+export class XyoIdWitness extends XyoWitness<XyoIdPayload> {
   private salt: string
 
-  constructor(salt = uuid()) {
-    const template = XyoIdPayloadTemplate()
-    super({
-      schema: template.schema,
-      template,
-    })
-    this.salt = salt
+  constructor({ salt, ...config }: XyoIdWitnessConfig) {
+    super(config)
+    this.salt = salt ?? uuid()
   }
 
-  override async observe(): Promise<XyoIdPayload> {
-    return await super.observe({
+  override async observe(
+    _fields?: Partial<XyoIdPayload>,
+    _query?: XyoWitnessQueryPayload<XyoPayload<{ schema: string }>> | undefined,
+  ): Promise<XyoIdPayload> {
+    await delay(0)
+    return {
       salt: this.salt,
-    })
+      schema: 'network.xyo.id',
+    }
   }
 
   static schema: XyoIdPayloadSchema = XyoIdPayloadSchema