@xyo-network/bowser-system-info-payload-plugin 2.41.10 → 2.41.12

package/dist/esm/Config.d.ts

@@ -1,8 +1,7 @@
 import { XyoWitnessConfig } from '@xyo-network/witness';
-import { XyoBowserSystemInfoPayload } from './Payload';
 export type XyoBowserSystemInfoWitnessConfigSchema = 'network.xyo.system.info.witness.bowser.config';
 export declare const XyoBowserSystemInfoWitnessConfigSchema: XyoBowserSystemInfoWitnessConfigSchema;
-export type XyoBowserSystemInfoWitnessConfig = XyoWitnessConfig<XyoBowserSystemInfoPayload, {
+export type XyoBowserSystemInfoWitnessConfig = XyoWitnessConfig<{
     schema: XyoBowserSystemInfoWitnessConfigSchema;
 }>;
 //# sourceMappingURL=Config.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../src/Config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAEvD,OAAO,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAA;AAEtD,MAAM,MAAM,sCAAsC,GAAG,+CAA+C,CAAA;AACpG,eAAO,MAAM,sCAAsC,EAAE,sCAAwF,CAAA;AAE7I,MAAM,MAAM,gCAAgC,GAAG,gBAAgB,CAC7D,0BAA0B,EAC1B;IACE,MAAM,EAAE,sCAAsC,CAAA;CAC/C,CACF,CAAA"}
+{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../src/Config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAEvD,MAAM,MAAM,sCAAsC,GAAG,+CAA+C,CAAA;AACpG,eAAO,MAAM,sCAAsC,EAAE,sCAAwF,CAAA;AAE7I,MAAM,MAAM,gCAAgC,GAAG,gBAAgB,CAAC;IAC9D,MAAM,EAAE,sCAAsC,CAAA;CAC/C,CAAC,CAAA"}

package/dist/esm/Config.js.map

@@ -1 +1 @@
-{"version":3,"file":"Config.js","sourceRoot":"","sources":["../../src/Config.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,MAAM,sCAAsC,GAA2C,+CAA+C,CAAA"}
+{"version":3,"file":"Config.js","sourceRoot":"","sources":["../../src/Config.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,sCAAsC,GAA2C,+CAA+C,CAAA"}

package/dist/esm/Plugin.d.ts

@@ -1,8 +1,6 @@
 import { XyoModuleParams } from '@xyo-network/module';
-export declare const XyoBowserSystemInfoPayloadPlugin: () => import("@xyo-network/payload-plugin").XyoPayloadPlugin<import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
-    bowser?: import("bowser").Parser.ParsedResult | undefined;
-    schema: "network.xyo.system.info.bowser";
-}, XyoModuleParams<import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
+import { PayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin';
+export declare const XyoBowserSystemInfoPlugin: () => PayloadSetWitnessPlugin<XyoModuleParams<import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
     security?: {
         allowed?: Record<string, string[][]> | undefined;
         disallowed?: Record<string, string[]> | undefined;
@@ -10,15 +8,8 @@ export declare const XyoBowserSystemInfoPayloadPlugin: () => import("@xyo-networ
 } & {
     schema: "network.xyo.system.info.witness.bowser.config";
 } & {
-    targetSchema: "network.xyo.system.info.bowser";
-}>, 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;AASrD,eAAO,MAAM,gCAAgC;;;;;;;;;;;;;;;;;;;;;GAQzC,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;AAMhG,eAAO,MAAM,yBAAyB;;;;;;;;;;;GASnC,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 { XyoBowserSystemInfoSchema } from './Schema';
-import { XyoBowserSystemInfoPayloadTemplate } from './Template';
 import { XyoBowserSystemInfoWitness } from './Witness';
-export const XyoBowserSystemInfoPayloadPlugin = () => createXyoPayloadPlugin({
-    auto: true,
-    schema: XyoBowserSystemInfoSchema,
-    template: XyoBowserSystemInfoPayloadTemplate,
+export const XyoBowserSystemInfoPlugin = () => createPayloadSetPlugin({ required: { [XyoBowserSystemInfoSchema]: 1 }, schema: PayloadSetSchema }, {
     witness: async (params) => {
-        return await XyoBowserSystemInfoWitness.create(params);
+        const result = await XyoBowserSystemInfoWitness.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;AAIpE,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAA;AACpD,OAAO,EAAE,kCAAkC,EAAE,MAAM,YAAY,CAAA;AAC/D,OAAO,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAA;AAEtD,MAAM,CAAC,MAAM,gCAAgC,GAAG,GAAG,EAAE,CACnD,sBAAsB,CAAgF;IACpG,IAAI,EAAE,IAAI;IACV,MAAM,EAAE,yBAAyB;IACjC,QAAQ,EAAE,kCAAkC;IAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QACxB,OAAO,MAAM,0BAA0B,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IACxD,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;AAGhG,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAA;AACpD,OAAO,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAA;AAEtD,MAAM,CAAC,MAAM,yBAAyB,GAAG,GAAG,EAAE,CAC5C,sBAAsB,CACpB,EAAE,QAAQ,EAAE,EAAE,CAAC,yBAAyB,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,EAC1E;IACE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QACxB,MAAM,MAAM,GAAG,MAAM,0BAA0B,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAC9D,OAAO,MAAM,CAAA;IACf,CAAC;CACF,CACF,CAAA"}

package/dist/esm/Witness.d.ts

@@ -3,11 +3,12 @@ import { AbstractWitness } from '@xyo-network/witness';
 import Bowser from 'bowser';
 import { XyoBowserSystemInfoWitnessConfig } from './Config';
 import { XyoBowserSystemInfoPayload } from './Payload';
-export declare class XyoBowserSystemInfoWitness<T extends XyoBowserSystemInfoPayload = XyoBowserSystemInfoPayload> extends AbstractWitness<T, XyoBowserSystemInfoWitnessConfig> {
+export declare class XyoBowserSystemInfoWitness<T extends XyoBowserSystemInfoPayload = XyoBowserSystemInfoPayload> extends AbstractWitness<XyoBowserSystemInfoWitnessConfig> {
     static configSchema: "network.xyo.system.info.witness.bowser.config";
-    static targetSchema: "network.xyo.system.info.bowser";
     protected get bowser(): Bowser.Parser.ParsedResult;
     static create(params?: XyoModuleParams<XyoBowserSystemInfoWitnessConfig>): Promise<XyoBowserSystemInfoWitness>;
-    observe(fields?: Partial<T>[]): import("@xyo-network/promise").Promisable<T[], never>;
+    observe(payloads?: T[]): import("@xyo-network/promise").Promisable<(import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
+        schema: string;
+    })[], never>;
 }
 //# 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,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,MAAM,MAAM,QAAQ,CAAA;AAG3B,OAAO,EAAE,gCAAgC,EAA0C,MAAM,UAAU,CAAA;AACnG,OAAO,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAA;AAGtD,qBAAa,0BAA0B,CAAC,CAAC,SAAS,0BAA0B,GAAG,0BAA0B,CAAE,SAAQ,eAAe,CAChI,CAAC,EACD,gCAAgC,CACjC;IACC,OAAgB,YAAY,kDAAyC;IACrE,OAAgB,YAAY,mCAA4B;IAExD,SAAS,KAAK,MAAM,+BAInB;WAEqB,MAAM,CAAC,MAAM,CAAC,EAAE,eAAe,CAAC,gCAAgC,CAAC,GAAG,OAAO,CAAC,0BAA0B,CAAC;IAIpH,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE;CAGvC"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,MAAM,MAAM,QAAQ,CAAA;AAG3B,OAAO,EAAE,gCAAgC,EAA0C,MAAM,UAAU,CAAA;AACnG,OAAO,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAA;AAGtD,qBAAa,0BAA0B,CACrC,CAAC,SAAS,0BAA0B,GAAG,0BAA0B,CACjE,SAAQ,eAAe,CAAC,gCAAgC,CAAC;IACzD,OAAgB,YAAY,kDAAyC;IAErE,SAAS,KAAK,MAAM,+BAInB;WAEqB,MAAM,CAAC,MAAM,CAAC,EAAE,eAAe,CAAC,gCAAgC,CAAC,GAAG,OAAO,CAAC,0BAA0B,CAAC;IAIpH,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE;;;CAGhC"}

package/dist/esm/Witness.js

@@ -5,7 +5,6 @@ import { XyoBowserSystemInfoWitnessConfigSchema } from './Config';
 import { XyoBowserSystemInfoSchema } from './Schema';
 export class XyoBowserSystemInfoWitness extends AbstractWitness {
     static configSchema = XyoBowserSystemInfoWitnessConfigSchema;
-    static targetSchema = XyoBowserSystemInfoSchema;
     get bowser() {
         // we do this to fix importing in node-esm
         // eslint-disable-next-line import/no-named-as-default-member
@@ -14,8 +13,8 @@ export class XyoBowserSystemInfoWitness extends AbstractWitness {
     static async create(params) {
         return (await super.create(params));
     }
-    observe(fields) {
-        return super.observe([merge({ bowser: this.bowser }, fields?.[0])]);
+    observe(payloads) {
+        return super.observe([merge({ bowser: this.bowser }, payloads?.[0], { schema: XyoBowserSystemInfoSchema })]);
     }
 }
 //# sourceMappingURL=Witness.js.map

package/dist/esm/Witness.js.map

@@ -1 +1 @@
-{"version":3,"file":"Witness.js","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,MAAM,MAAM,QAAQ,CAAA;AAC3B,OAAO,KAAK,MAAM,cAAc,CAAA;AAEhC,OAAO,EAAoC,sCAAsC,EAAE,MAAM,UAAU,CAAA;AAEnG,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAA;AAEpD,MAAM,OAAO,0BAA8F,SAAQ,eAGlH;IACC,MAAM,CAAU,YAAY,GAAG,sCAAsC,CAAA;IACrE,MAAM,CAAU,YAAY,GAAG,yBAAyB,CAAA;IAExD,IAAc,MAAM;QAClB,0CAA0C;QAC1C,6DAA6D;QAC7D,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;IACjD,CAAC;IAED,MAAM,CAAU,KAAK,CAAC,MAAM,CAAC,MAA0D;QACrF,OAAO,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAA+B,CAAA;IACnE,CAAC;IAEQ,OAAO,CAAC,MAAqB;QACpC,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACrE,CAAC"}
+{"version":3,"file":"Witness.js","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,MAAM,MAAM,QAAQ,CAAA;AAC3B,OAAO,KAAK,MAAM,cAAc,CAAA;AAEhC,OAAO,EAAoC,sCAAsC,EAAE,MAAM,UAAU,CAAA;AAEnG,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAA;AAEpD,MAAM,OAAO,0BAEX,SAAQ,eAAiD;IACzD,MAAM,CAAU,YAAY,GAAG,sCAAsC,CAAA;IAErE,IAAc,MAAM;QAClB,0CAA0C;QAC1C,6DAA6D;QAC7D,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;IACjD,CAAC;IAED,MAAM,CAAU,KAAK,CAAC,MAAM,CAAC,MAA0D;QACrF,OAAO,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAA+B,CAAA;IACnE,CAAC;IAEQ,OAAO,CAAC,QAAc;QAC7B,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,yBAAyB,EAAE,CAAC,CAAC,CAAC,CAAA;IAC9G,CAAC"}

package/dist/esm/index.d.ts

@@ -1,9 +1,9 @@
-import { XyoBowserSystemInfoPayloadPlugin } from './Plugin';
+import { XyoBowserSystemInfoPlugin } from './Plugin';
 export * from './Config';
 export * from './Payload';
 export * from './Schema';
 export * from './Template';
 export * from './Witness';
-export { XyoBowserSystemInfoPayloadPlugin };
-export default XyoBowserSystemInfoPayloadPlugin;
+export { XyoBowserSystemInfoPlugin };
+export default XyoBowserSystemInfoPlugin;
 //# 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,gCAAgC,EAAE,MAAM,UAAU,CAAA;AAE3D,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,WAAW,CAAA;AAEzB,OAAO,EAAE,gCAAgC,EAAE,CAAA;AAG3C,eAAe,gCAAgC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAA;AAEpD,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,WAAW,CAAA;AAEzB,OAAO,EAAE,yBAAyB,EAAE,CAAA;AAGpC,eAAe,yBAAyB,CAAA"}

package/dist/esm/index.js

@@ -1,10 +1,10 @@
-import { XyoBowserSystemInfoPayloadPlugin } from './Plugin';
+import { XyoBowserSystemInfoPlugin } from './Plugin';
 export * from './Config';
 export * from './Payload';
 export * from './Schema';
 export * from './Template';
 export * from './Witness';
-export { XyoBowserSystemInfoPayloadPlugin };
+export { XyoBowserSystemInfoPlugin };
 // eslint-disable-next-line import/no-default-export
-export default XyoBowserSystemInfoPayloadPlugin;
+export default XyoBowserSystemInfoPlugin;
 //# 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,gCAAgC,EAAE,MAAM,UAAU,CAAA;AAE3D,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,WAAW,CAAA;AAEzB,OAAO,EAAE,gCAAgC,EAAE,CAAA;AAE3C,oDAAoD;AACpD,eAAe,gCAAgC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAA;AAEpD,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,WAAW,CAAA;AAEzB,OAAO,EAAE,yBAAyB,EAAE,CAAA;AAEpC,oDAAoD;AACpD,eAAe,yBAAyB,CAAA"}

package/package.json

@@ -10,16 +10,16 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@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",
     "bowser": "^2.11.0",
     "lodash": "^4.17.21",
     "tslib": "^2.4.1"
   },
   "devDependencies": {
-    "@types/lodash": "^4.14.190"
+    "@types/lodash": "^4.14.191"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
   "browser": "dist/esm/index.js",
@@ -54,5 +54,5 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.41.10"
+  "version": "2.41.12"
 }

package/src/Config.ts

@@ -1,13 +1,8 @@
 import { XyoWitnessConfig } from '@xyo-network/witness'
 
-import { XyoBowserSystemInfoPayload } from './Payload'
-
 export type XyoBowserSystemInfoWitnessConfigSchema = 'network.xyo.system.info.witness.bowser.config'
 export const XyoBowserSystemInfoWitnessConfigSchema: XyoBowserSystemInfoWitnessConfigSchema = 'network.xyo.system.info.witness.bowser.config'
 
-export type XyoBowserSystemInfoWitnessConfig = XyoWitnessConfig<
-  XyoBowserSystemInfoPayload,
-  {
-    schema: XyoBowserSystemInfoWitnessConfigSchema
-  }
->
+export type XyoBowserSystemInfoWitnessConfig = XyoWitnessConfig<{
+  schema: XyoBowserSystemInfoWitnessConfigSchema
+}>

package/src/Plugin.spec.ts

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

package/src/Plugin.ts

@@ -1,18 +1,18 @@
 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 { XyoBowserSystemInfoWitnessConfig } from './Config'
-import { XyoBowserSystemInfoPayload } from './Payload'
 import { XyoBowserSystemInfoSchema } from './Schema'
-import { XyoBowserSystemInfoPayloadTemplate } from './Template'
 import { XyoBowserSystemInfoWitness } from './Witness'
 
-export const XyoBowserSystemInfoPayloadPlugin = () =>
-  createXyoPayloadPlugin<XyoBowserSystemInfoPayload, XyoModuleParams<XyoBowserSystemInfoWitnessConfig>>({
-    auto: true,
-    schema: XyoBowserSystemInfoSchema,
-    template: XyoBowserSystemInfoPayloadTemplate,
-    witness: async (params) => {
-      return await XyoBowserSystemInfoWitness.create(params)
+export const XyoBowserSystemInfoPlugin = () =>
+  createPayloadSetPlugin<PayloadSetWitnessPlugin<XyoModuleParams<XyoBowserSystemInfoWitnessConfig>>>(
+    { required: { [XyoBowserSystemInfoSchema]: 1 }, schema: PayloadSetSchema },
+    {
+      witness: async (params) => {
+        const result = await XyoBowserSystemInfoWitness.create(params)
+        return result
+      },
     },
-  })
+  )

package/src/Witness.spec.ts

@@ -23,18 +23,15 @@ describe('XyoBowserSystemInfo', () => {
     const witness = await XyoBowserSystemInfoWitness.create({
       config: {
         schema: XyoBowserSystemInfoWitnessConfigSchema,
-        targetSchema: XyoBowserSystemInfoSchema,
       },
     })
     const [observation] = await witness.observe()
-    console.log(JSON.stringify(observation, null, 2))
     expect(observation.schema).toBe(XyoBowserSystemInfoSchema)
     expect(new PayloadWrapper(observation).valid).toBe(true)
   })
   test('observe [no config]', async () => {
     const witness = await XyoBowserSystemInfoWitness.create()
     const [observation] = await witness.observe()
-    console.log(JSON.stringify(observation, null, 2))
     expect(observation.schema).toBe(XyoBowserSystemInfoSchema)
     expect(new PayloadWrapper(observation).valid).toBe(true)
   })

package/src/Witness.ts

@@ -7,12 +7,10 @@ import { XyoBowserSystemInfoWitnessConfig, XyoBowserSystemInfoWitnessConfigSchem
 import { XyoBowserSystemInfoPayload } from './Payload'
 import { XyoBowserSystemInfoSchema } from './Schema'
 
-export class XyoBowserSystemInfoWitness<T extends XyoBowserSystemInfoPayload = XyoBowserSystemInfoPayload> extends AbstractWitness<
-  T,
-  XyoBowserSystemInfoWitnessConfig
-> {
+export class XyoBowserSystemInfoWitness<
+  T extends XyoBowserSystemInfoPayload = XyoBowserSystemInfoPayload,
+> extends AbstractWitness<XyoBowserSystemInfoWitnessConfig> {
   static override configSchema = XyoBowserSystemInfoWitnessConfigSchema
-  static override targetSchema = XyoBowserSystemInfoSchema
 
   protected get bowser() {
     // we do this to fix importing in node-esm
@@ -24,7 +22,7 @@ export class XyoBowserSystemInfoWitness<T extends XyoBowserSystemInfoPayload = X
     return (await super.create(params)) as XyoBowserSystemInfoWitness
   }
 
-  override observe(fields?: Partial<T>[]) {
-    return super.observe([merge({ bowser: this.bowser }, fields?.[0])])
+  override observe(payloads?: T[]) {
+    return super.observe([merge({ bowser: this.bowser }, payloads?.[0], { schema: XyoBowserSystemInfoSchema })])
   }
 }

package/src/index.ts

@@ -1,4 +1,4 @@
-import { XyoBowserSystemInfoPayloadPlugin } from './Plugin'
+import { XyoBowserSystemInfoPlugin } from './Plugin'
 
 export * from './Config'
 export * from './Payload'
@@ -6,7 +6,7 @@ export * from './Schema'
 export * from './Template'
 export * from './Witness'
 
-export { XyoBowserSystemInfoPayloadPlugin }
+export { XyoBowserSystemInfoPlugin }
 
 // eslint-disable-next-line import/no-default-export
-export default XyoBowserSystemInfoPayloadPlugin
+export default XyoBowserSystemInfoPlugin