@xyo-network/id-payload-plugin 2.41.10 → 2.41.12

package/dist/esm/Plugin.d.ts

@@ -1,8 +1,6 @@
 import { XyoModuleParams } from '@xyo-network/module';
-export declare const XyoIdPayloadPlugin: () => import("@xyo-network/payload-plugin").XyoPayloadPlugin<import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
-    salt: string;
-    schema: "network.xyo.id";
-}, XyoModuleParams<import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
+import { PayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin';
+export declare const XyoIdPlugin: () => PayloadSetWitnessPlugin<XyoModuleParams<import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
     security?: {
         allowed?: Record<string, string[][]> | undefined;
         disallowed?: Record<string, string[]> | undefined;
@@ -11,15 +9,8 @@ export declare const XyoIdPayloadPlugin: () => import("@xyo-network/payload-plug
     salt: string;
     schema: "network.xyo.id.witness.config";
 } & {
-    targetSchema: "network.xyo.id";
-}>, XyoModuleParams<import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
-    security?: {
-        allowed?: Record<string, string[][]> | undefined;
-        disallowed?: Record<string, string[]> | undefined;
-    } | undefined;
-} & {
-    targetSchema?: string | undefined;
-} & {
-    schema: string;
+    targetSet?: (import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & import("@xyo-network/payload").PayloadSet & {
+        schema: "network.xyo.payload.set";
+    }) | undefined;
 }>>;
 //# 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,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAQrD,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;GAQ3B,CAAA"}
+{"version":3,"file":"Plugin.d.ts","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAErD,OAAO,EAA0B,uBAAuB,EAAE,MAAM,gCAAgC,CAAA;AAKhG,eAAO,MAAM,WAAW;;;;;;;;;;;;GASrB,CAAA"}

package/dist/esm/Plugin.js

@@ -1,13 +1,11 @@
-import { createXyoPayloadPlugin } from '@xyo-network/payload-plugin';
+import { PayloadSetSchema } from '@xyo-network/payload';
+import { createPayloadSetPlugin } from '@xyo-network/payloadset-plugin';
 import { XyoIdSchema } from './Schema';
-import { XyoIdPayloadTemplate } from './Template';
 import { XyoIdWitness } from './Witness';
-export const XyoIdPayloadPlugin = () => createXyoPayloadPlugin({
-    auto: true,
-    schema: XyoIdSchema,
-    template: XyoIdPayloadTemplate,
+export const XyoIdPlugin = () => createPayloadSetPlugin({ required: { [XyoIdSchema]: 1 }, schema: PayloadSetSchema }, {
     witness: async (params) => {
-        return await XyoIdWitness.create(params);
+        const result = await XyoIdWitness.create(params);
+        return result;
     },
 });
 //# sourceMappingURL=Plugin.js.map

package/dist/esm/Plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"Plugin.js","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AACA,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,MAAM,WAAW,CAAA;AAE5D,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,EAAE,CACrC,sBAAsB,CAAoD;IACxE,IAAI,EAAE,IAAI;IACV,MAAM,EAAE,WAAW;IACnB,QAAQ,EAAE,oBAAoB;IAC9B,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QACxB,OAAO,MAAM,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IAC1C,CAAC;CACF,CAAC,CAAA"}
+{"version":3,"file":"Plugin.js","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,sBAAsB,EAA2B,MAAM,gCAAgC,CAAA;AAEhG,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AACtC,OAAO,EAAE,YAAY,EAAsB,MAAM,WAAW,CAAA;AAE5D,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,EAAE,CAC9B,sBAAsB,CACpB,EAAE,QAAQ,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,EAC5D;IACE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QACxB,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAChD,OAAO,MAAM,CAAA;IACf,CAAC;CACF,CACF,CAAA"}

package/dist/esm/Witness.d.ts

@@ -1,17 +1,17 @@
 import { XyoModuleParams } from '@xyo-network/module';
+import { XyoPayload } from '@xyo-network/payload';
 import { AbstractWitness, XyoWitnessConfig } from '@xyo-network/witness';
 import { XyoIdPayload } from './Payload';
 export type XyoIdWitnessConfigSchema = 'network.xyo.id.witness.config';
 export declare const XyoIdWitnessConfigSchema: XyoIdWitnessConfigSchema;
-export type XyoIdWitnessConfig = XyoWitnessConfig<XyoIdPayload, {
+export type XyoIdWitnessConfig = XyoWitnessConfig<{
     salt: string;
     schema: XyoIdWitnessConfigSchema;
 }>;
-export declare class XyoIdWitness extends AbstractWitness<XyoIdPayload, XyoIdWitnessConfig> {
+export declare class XyoIdWitness extends AbstractWitness<XyoIdWitnessConfig> {
     static configSchema: "network.xyo.id.witness.config";
-    static targetSchema: "network.xyo.id";
     get salt(): string;
     static create(params?: XyoModuleParams<XyoIdWitnessConfig>): Promise<XyoIdWitness>;
-    observe(fields?: Partial<XyoIdPayload>[]): Promise<XyoIdPayload[]>;
+    observe(payloads?: XyoIdPayload[]): Promise<XyoPayload[]>;
 }
 //# 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,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAExE,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAGxC,MAAM,MAAM,wBAAwB,GAAG,+BAA+B,CAAA;AACtE,eAAO,MAAM,wBAAwB,EAAE,wBAA0D,CAAA;AAEjG,MAAM,MAAM,kBAAkB,GAAG,gBAAgB,CAC/C,YAAY,EACZ;IACE,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,wBAAwB,CAAA;CACjC,CACF,CAAA;AAED,qBAAa,YAAa,SAAQ,eAAe,CAAC,YAAY,EAAE,kBAAkB,CAAC;IACjF,OAAgB,YAAY,kCAA2B;IACvD,OAAgB,YAAY,mBAAc;IAE1C,IAAW,IAAI,WAEd;WAEqB,MAAM,CAAC,MAAM,CAAC,EAAE,eAAe,CAAC,kBAAkB,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC;IAIlF,OAAO,CAAC,MAAM,GAAE,OAAO,CAAC,YAAY,CAAC,EAAS,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;CAUxF"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAExE,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAGxC,MAAM,MAAM,wBAAwB,GAAG,+BAA+B,CAAA;AACtE,eAAO,MAAM,wBAAwB,EAAE,wBAA0D,CAAA;AAEjG,MAAM,MAAM,kBAAkB,GAAG,gBAAgB,CAAC;IAChD,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,wBAAwB,CAAA;CACjC,CAAC,CAAA;AAEF,qBAAa,YAAa,SAAQ,eAAe,CAAC,kBAAkB,CAAC;IACnE,OAAgB,YAAY,kCAA2B;IAEvD,IAAW,IAAI,WAEd;WAEqB,MAAM,CAAC,MAAM,CAAC,EAAE,eAAe,CAAC,kBAAkB,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC;IAIlF,OAAO,CAAC,QAAQ,GAAE,YAAY,EAAO,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;CAiB7E"}

package/dist/esm/Witness.js

@@ -1,23 +1,28 @@
-import { assertEx } from '@xylabs/assert';
 import { AbstractWitness } from '@xyo-network/witness';
 import { XyoIdSchema } from './Schema';
 export const XyoIdWitnessConfigSchema = 'network.xyo.id.witness.config';
 export class XyoIdWitness extends AbstractWitness {
     static configSchema = XyoIdWitnessConfigSchema;
-    static targetSchema = XyoIdSchema;
     get salt() {
         return this.config?.salt ?? `${Math.floor(Math.random() * 9999999)}`;
     }
     static async create(params) {
         return (await super.create(params));
     }
-    async observe(fields = [{}]) {
-        return await super.observe(fields.map((fieldItems) => {
-            return {
-                salt: assertEx(fieldItems?.salt ?? this.salt, 'Missing salt'),
-                schema: XyoIdSchema,
-            };
-        }));
+    async observe(payloads = []) {
+        return await super.observe(payloads.length > 0
+            ? payloads.map((fieldItems) => {
+                return {
+                    salt: fieldItems?.salt ?? this.salt,
+                    schema: XyoIdSchema,
+                };
+            })
+            : [
+                {
+                    salt: this.salt,
+                    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,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,OAAO,EAAE,eAAe,EAAoB,MAAM,sBAAsB,CAAA;AAGxE,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAGtC,MAAM,CAAC,MAAM,wBAAwB,GAA6B,+BAA+B,CAAA;AAUjG,MAAM,OAAO,YAAa,SAAQ,eAAiD;IACjF,MAAM,CAAU,YAAY,GAAG,wBAAwB,CAAA;IACvD,MAAM,CAAU,YAAY,GAAG,WAAW,CAAA;IAE1C,IAAW,IAAI;QACb,OAAO,IAAI,CAAC,MAAM,EAAE,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,OAAO,CAAC,EAAE,CAAA;IACtE,CAAC;IAED,MAAM,CAAU,KAAK,CAAC,MAAM,CAAC,MAA4C;QACvE,OAAO,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAiB,CAAA;IACrD,CAAC;IAEQ,KAAK,CAAC,OAAO,CAAC,SAAkC,CAAC,EAAE,CAAC;QAC3D,OAAO,MAAM,KAAK,CAAC,OAAO,CACxB,MAAM,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;YACxB,OAAO;gBACL,IAAI,EAAE,QAAQ,CAAC,UAAU,EAAE,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC;gBAC7D,MAAM,EAAE,WAAW;aACpB,CAAA;QACH,CAAC,CAAC,CACH,CAAA;IACH,CAAC"}
+{"version":3,"file":"Witness.js","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAoB,MAAM,sBAAsB,CAAA;AAGxE,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAGtC,MAAM,CAAC,MAAM,wBAAwB,GAA6B,+BAA+B,CAAA;AAOjG,MAAM,OAAO,YAAa,SAAQ,eAAmC;IACnE,MAAM,CAAU,YAAY,GAAG,wBAAwB,CAAA;IAEvD,IAAW,IAAI;QACb,OAAO,IAAI,CAAC,MAAM,EAAE,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,OAAO,CAAC,EAAE,CAAA;IACtE,CAAC;IAED,MAAM,CAAU,KAAK,CAAC,MAAM,CAAC,MAA4C;QACvE,OAAO,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAiB,CAAA;IACrD,CAAC;IAEQ,KAAK,CAAC,OAAO,CAAC,WAA2B,EAAE;QAClD,OAAO,MAAM,KAAK,CAAC,OAAO,CACxB,QAAQ,CAAC,MAAM,GAAG,CAAC;YACjB,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;gBAC1B,OAAO;oBACL,IAAI,EAAE,UAAU,EAAE,IAAI,IAAI,IAAI,CAAC,IAAI;oBACnC,MAAM,EAAE,WAAW;iBACpB,CAAA;YACH,CAAC,CAAC;YACJ,CAAC,CAAC;gBACE;oBACE,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,MAAM,EAAE,WAAW;iBACpB;aACF,CACN,CAAA;IACH,CAAC"}

package/dist/esm/index.d.ts

@@ -1,8 +1,8 @@
-import { XyoIdPayloadPlugin } from './Plugin';
+import { XyoIdPlugin } from './Plugin';
 export * from './Payload';
 export * from './Schema';
 export * from './Template';
 export * from './Witness';
-export { XyoIdPayloadPlugin };
-export default XyoIdPayloadPlugin;
+export { XyoIdPlugin };
+export default XyoIdPlugin;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAE7C,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,WAAW,CAAA;AAEzB,OAAO,EAAE,kBAAkB,EAAE,CAAA;AAG7B,eAAe,kBAAkB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAEtC,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,WAAW,CAAA;AAEzB,OAAO,EAAE,WAAW,EAAE,CAAA;AAGtB,eAAe,WAAW,CAAA"}

package/dist/esm/index.js

@@ -1,9 +1,9 @@
-import { XyoIdPayloadPlugin } from './Plugin';
+import { XyoIdPlugin } from './Plugin';
 export * from './Payload';
 export * from './Schema';
 export * from './Template';
 export * from './Witness';
-export { XyoIdPayloadPlugin };
+export { XyoIdPlugin };
 // eslint-disable-next-line import/no-default-export
-export default XyoIdPayloadPlugin;
+export default XyoIdPlugin;
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAE7C,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,WAAW,CAAA;AAEzB,OAAO,EAAE,kBAAkB,EAAE,CAAA;AAE7B,oDAAoD;AACpD,eAAe,kBAAkB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAEtC,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,WAAW,CAAA;AAEzB,OAAO,EAAE,WAAW,EAAE,CAAA;AAEtB,oDAAoD;AACpD,eAAe,WAAW,CAAA"}

package/package.json

@@ -10,11 +10,10 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xylabs/assert": "^2.6.9",
-    "@xyo-network/module": "^2.41.10",
-    "@xyo-network/payload": "^2.41.10",
-    "@xyo-network/payload-plugin": "^2.41.10",
-    "@xyo-network/witness": "^2.41.10",
+    "@xyo-network/module": "^2.41.12",
+    "@xyo-network/payload": "^2.41.12",
+    "@xyo-network/payloadset-plugin": "^2.41.12",
+    "@xyo-network/witness": "^2.41.12",
     "tslib": "^2.4.1"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -50,5 +49,5 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.41.10"
+  "version": "2.41.12"
 }

package/src/Plugin.spec.ts

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

package/src/Plugin.ts

@@ -1,17 +1,17 @@
 import { XyoModuleParams } from '@xyo-network/module'
-import { createXyoPayloadPlugin } from '@xyo-network/payload-plugin'
+import { PayloadSetSchema } from '@xyo-network/payload'
+import { createPayloadSetPlugin, PayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin'
 
-import { XyoIdPayload } from './Payload'
 import { XyoIdSchema } from './Schema'
-import { XyoIdPayloadTemplate } from './Template'
 import { XyoIdWitness, XyoIdWitnessConfig } from './Witness'
 
-export const XyoIdPayloadPlugin = () =>
-  createXyoPayloadPlugin<XyoIdPayload, XyoModuleParams<XyoIdWitnessConfig>>({
-    auto: true,
-    schema: XyoIdSchema,
-    template: XyoIdPayloadTemplate,
-    witness: async (params) => {
-      return await XyoIdWitness.create(params)
+export const XyoIdPlugin = () =>
+  createPayloadSetPlugin<PayloadSetWitnessPlugin<XyoModuleParams<XyoIdWitnessConfig>>>(
+    { required: { [XyoIdSchema]: 1 }, schema: PayloadSetSchema },
+    {
+      witness: async (params) => {
+        const result = await XyoIdWitness.create(params)
+        return result
+      },
     },
-  })
+  )

package/src/Witness.browser.spec.ts

@@ -10,16 +10,16 @@ import { XyoIdWitness, XyoIdWitnessConfigSchema } from './Witness'
 describe('XyoIdWitness [Browser]', () => {
   test('observe', async () => {
     const witness = await XyoIdWitness.create({
-      config: { salt: 'test', schema: XyoIdWitnessConfigSchema, targetSchema: XyoIdSchema },
+      config: { salt: 'test', schema: XyoIdWitnessConfigSchema },
     })
-    const [observation] = await witness.observe([{ salt: 'test' }])
+    const [observation] = await witness.observe([{ salt: 'test', schema: XyoIdSchema }])
     expect(observation.schema).toBe(XyoIdSchema)
     expect(new PayloadWrapper(observation).valid).toBe(true)
   })
 
   test('observe [no config]', async () => {
     const witness = await XyoIdWitness.create()
-    const [observation] = await witness.observe([{ salt: 'test' }])
+    const [observation] = await witness.observe([{ salt: 'test', schema: XyoIdSchema }])
     expect(observation.schema).toBe(XyoIdSchema)
     expect(new PayloadWrapper(observation).valid).toBe(true)
   })

package/src/Witness.spec.ts

@@ -17,14 +17,14 @@ describe('XyoIdWitness', () => {
       describe('with payloads supplied to observe', () => {
         it('without salt uses config salt', async () => {
           const witness = await XyoIdWitness.create({ config })
-          const observations = await witness.observe([{ schema: XyoIdSchema }])
+          const observations = (await witness.observe()) as XyoIdPayload[]
           validateObservationShape(observations)
           const [observation] = observations
           expect(observation.salt).toBe(witness.config.salt)
         })
         it('with salt uses payload salt', async () => {
           const witness = await XyoIdWitness.create({ config })
-          const observations = await witness.observe([{ salt: payloadSalt }])
+          const observations = (await witness.observe([{ salt: payloadSalt, schema: XyoIdSchema }])) as XyoIdPayload[]
           validateObservationShape(observations)
           const [observation] = observations
           expect(observation.salt).toBe(payloadSalt)
@@ -33,7 +33,7 @@ describe('XyoIdWitness', () => {
       describe('with no payloads supplied to observe', () => {
         it('uses config salt', async () => {
           const witness = await XyoIdWitness.create({ config })
-          const observations = await witness.observe()
+          const observations = (await witness.observe()) as XyoIdPayload[]
           validateObservationShape(observations)
           const [observation] = observations
           expect(observation.salt).toBe(witness.config.salt)
@@ -44,14 +44,14 @@ describe('XyoIdWitness', () => {
       describe('with payloads supplied to observe', () => {
         it('without salt uses random numeric string', async () => {
           const witness = await XyoIdWitness.create()
-          const observations = await witness.observe([{ schema: XyoIdSchema }])
+          const observations = (await witness.observe()) as XyoIdPayload[]
           validateObservationShape(observations)
           const [observation] = observations
           expect(parseInt(observation.salt)).toBeInteger()
         })
         it('with salt uses payload salt', async () => {
           const witness = await XyoIdWitness.create()
-          const observations = await witness.observe([{ salt: payloadSalt }])
+          const observations = (await witness.observe([{ salt: payloadSalt, schema: XyoIdSchema }])) as XyoIdPayload[]
           validateObservationShape(observations)
           const [observation] = observations
           expect(observation.salt).toBe(payloadSalt)
@@ -60,7 +60,7 @@ describe('XyoIdWitness', () => {
       describe('with no payloads supplied to observe', () => {
         it('uses random numeric string', async () => {
           const witness = await XyoIdWitness.create()
-          const observations = await witness.observe()
+          const observations = (await witness.observe()) as XyoIdPayload[]
           validateObservationShape(observations)
           const [observation] = observations
           expect(parseInt(observation.salt)).toBeInteger()

package/src/Witness.ts

@@ -1,5 +1,5 @@
-import { assertEx } from '@xylabs/assert'
 import { XyoModuleParams } from '@xyo-network/module'
+import { XyoPayload } from '@xyo-network/payload'
 import { AbstractWitness, XyoWitnessConfig } from '@xyo-network/witness'
 
 import { XyoIdPayload } from './Payload'
@@ -8,17 +8,13 @@ import { XyoIdSchema } from './Schema'
 export type XyoIdWitnessConfigSchema = 'network.xyo.id.witness.config'
 export const XyoIdWitnessConfigSchema: XyoIdWitnessConfigSchema = 'network.xyo.id.witness.config'
 
-export type XyoIdWitnessConfig = XyoWitnessConfig<
-  XyoIdPayload,
-  {
-    salt: string
-    schema: XyoIdWitnessConfigSchema
-  }
->
+export type XyoIdWitnessConfig = XyoWitnessConfig<{
+  salt: string
+  schema: XyoIdWitnessConfigSchema
+}>
 
-export class XyoIdWitness extends AbstractWitness<XyoIdPayload, XyoIdWitnessConfig> {
+export class XyoIdWitness extends AbstractWitness<XyoIdWitnessConfig> {
   static override configSchema = XyoIdWitnessConfigSchema
-  static override targetSchema = XyoIdSchema
 
   public get salt() {
     return this.config?.salt ?? `${Math.floor(Math.random() * 9999999)}`
@@ -28,14 +24,21 @@ export class XyoIdWitness extends AbstractWitness<XyoIdPayload, XyoIdWitnessConf
     return (await super.create(params)) as XyoIdWitness
   }
 
-  override async observe(fields: Partial<XyoIdPayload>[] = [{}]): Promise<XyoIdPayload[]> {
+  override async observe(payloads: XyoIdPayload[] = []): Promise<XyoPayload[]> {
     return await super.observe(
-      fields.map((fieldItems) => {
-        return {
-          salt: assertEx(fieldItems?.salt ?? this.salt, 'Missing salt'),
-          schema: XyoIdSchema,
-        }
-      }),
+      payloads.length > 0
+        ? payloads.map((fieldItems) => {
+            return {
+              salt: fieldItems?.salt ?? this.salt,
+              schema: XyoIdSchema,
+            }
+          })
+        : [
+            {
+              salt: this.salt,
+              schema: XyoIdSchema,
+            },
+          ],
     )
   }
 }

package/src/index.ts

@@ -1,11 +1,11 @@
-import { XyoIdPayloadPlugin } from './Plugin'
+import { XyoIdPlugin } from './Plugin'
 
 export * from './Payload'
 export * from './Schema'
 export * from './Template'
 export * from './Witness'
 
-export { XyoIdPayloadPlugin }
+export { XyoIdPlugin }
 
 // eslint-disable-next-line import/no-default-export
-export default XyoIdPayloadPlugin
+export default XyoIdPlugin