@xyo-network/module-instance-payload-plugin 2.41.10 → 2.41.12

package/dist/esm/Plugin.d.ts

@@ -1,9 +1,6 @@
 import { XyoModuleParams } from '@xyo-network/module';
-export declare const XyoModuleInstancePayloadPlugin: () => import("@xyo-network/payload-plugin").XyoPayloadPlugin<import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
-    address: string;
-    queries?: Record<string, import("./Payload").XyoModuleInstanceQueryConfig> | undefined;
-    schema: "network.xyo.module.instance";
-}, XyoModuleParams<import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
+import { PayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin';
+export declare const XyoModuleInstancePlugin: () => PayloadSetWitnessPlugin<XyoModuleParams<import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
     security?: {
         allowed?: Record<string, string[][]> | undefined;
         disallowed?: Record<string, string[]> | undefined;
@@ -19,15 +16,8 @@ export declare const XyoModuleInstancePayloadPlugin: () => import("@xyo-network/
     }> | undefined;
     schema: "network.xyo.module.instance.config";
 } & {
-    targetSchema: "network.xyo.module.instance";
-}>, 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,8BAA8B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAOvC,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,uBAAuB;;;;;;;;;;;;;;;;;;;GASjC,CAAA"}

package/dist/esm/Plugin.js

@@ -1,12 +1,11 @@
-import { createXyoPayloadPlugin } from '@xyo-network/payload-plugin';
+import { PayloadSetSchema } from '@xyo-network/payload';
+import { createPayloadSetPlugin } from '@xyo-network/payloadset-plugin';
 import { XyoModuleInstanceSchema } from './Schema';
-import { XyoModuleInstancePayloadTemplate } from './Template';
 import { XyoModuleInstanceWitness } from './Witness';
-export const XyoModuleInstancePayloadPlugin = () => createXyoPayloadPlugin({
-    schema: XyoModuleInstanceSchema,
-    template: XyoModuleInstancePayloadTemplate,
+export const XyoModuleInstancePlugin = () => createPayloadSetPlugin({ required: { [XyoModuleInstanceSchema]: 1 }, schema: PayloadSetSchema }, {
     witness: async (params) => {
-        return await XyoModuleInstanceWitness.create(params);
+        const result = await XyoModuleInstanceWitness.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,uBAAuB,EAAE,MAAM,UAAU,CAAA;AAClD,OAAO,EAAE,gCAAgC,EAAE,MAAM,YAAY,CAAA;AAC7D,OAAO,EAAE,wBAAwB,EAAkC,MAAM,WAAW,CAAA;AAEpF,MAAM,CAAC,MAAM,8BAA8B,GAAG,GAAG,EAAE,CACjD,sBAAsB,CAA4E;IAChG,MAAM,EAAE,uBAAuB;IAC/B,QAAQ,EAAE,gCAAgC;IAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QACxB,OAAO,MAAM,wBAAwB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IACtD,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,uBAAuB,EAAE,MAAM,UAAU,CAAA;AAClD,OAAO,EAAE,wBAAwB,EAAkC,MAAM,WAAW,CAAA;AAEpF,MAAM,CAAC,MAAM,uBAAuB,GAAG,GAAG,EAAE,CAC1C,sBAAsB,CACpB,EAAE,QAAQ,EAAE,EAAE,CAAC,uBAAuB,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,EACxE;IACE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QACxB,MAAM,MAAM,GAAG,MAAM,wBAAwB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAC5D,OAAO,MAAM,CAAA;IACf,CAAC;CACF,CACF,CAAA"}

package/dist/esm/Witness.d.ts

@@ -1,15 +1,14 @@
 import { XyoModule, XyoModuleParams } from '@xyo-network/module';
+import { XyoPayload } from '@xyo-network/payload';
 import { AbstractWitness, XyoWitnessConfig } from '@xyo-network/witness';
-import { XyoModuleInstancePayload } from './Payload';
 export type XyoModuleInstanceWitnessConfigSchema = 'network.xyo.module.instance.config';
 export declare const XyoModuleInstanceWitnessConfigSchema: XyoModuleInstanceWitnessConfigSchema;
-export type XyoModuleInstanceWitnessConfig = XyoWitnessConfig<XyoModuleInstancePayload, {
+export type XyoModuleInstanceWitnessConfig = XyoWitnessConfig<{
     module?: XyoModule;
     schema: XyoModuleInstanceWitnessConfigSchema;
 }>;
-export declare class XyoModuleInstanceWitness extends AbstractWitness<XyoModuleInstancePayload, XyoModuleInstanceWitnessConfig> {
+export declare class XyoModuleInstanceWitness extends AbstractWitness<XyoModuleInstanceWitnessConfig> {
     static configSchema: "network.xyo.module.instance.config";
-    static targetSchema: "network.xyo.module.instance";
     protected get module(): XyoModule<import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
         security?: {
             allowed?: Record<string, string[][]> | undefined;
@@ -19,6 +18,6 @@ export declare class XyoModuleInstanceWitness extends AbstractWitness<XyoModuleI
         schema: string;
     }> | undefined;
     static create(params?: XyoModuleParams<XyoModuleInstanceWitnessConfig>): Promise<XyoModuleInstanceWitness>;
-    observe(fields?: Partial<XyoModuleInstancePayload>[]): Promise<XyoModuleInstancePayload[]>;
+    observe(payloads?: Partial<XyoPayload>[]): 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":"AAAA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAChE,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAGxE,OAAO,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAA;AAGpD,MAAM,MAAM,oCAAoC,GAAG,oCAAoC,CAAA;AACvF,eAAO,MAAM,oCAAoC,EAAE,oCAA2E,CAAA;AAE9H,MAAM,MAAM,8BAA8B,GAAG,gBAAgB,CAC3D,wBAAwB,EACxB;IACE,MAAM,CAAC,EAAE,SAAS,CAAA;IAClB,MAAM,EAAE,oCAAoC,CAAA;CAC7C,CACF,CAAA;AAED,qBAAa,wBAAyB,SAAQ,eAAe,CAAC,wBAAwB,EAAE,8BAA8B,CAAC;IACrH,OAAgB,YAAY,uCAAuC;IACnE,OAAgB,YAAY,gCAA0B;IAEtD,SAAS,KAAK,MAAM;;;;;;;mBAEnB;WAEqB,MAAM,CAAC,MAAM,CAAC,EAAE,eAAe,CAAC,8BAA8B,CAAC,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAI1G,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,wBAAwB,CAAC,EAAE,GAAG,OAAO,CAAC,wBAAwB,EAAE,CAAC;CAG1G"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAKxE,MAAM,MAAM,oCAAoC,GAAG,oCAAoC,CAAA;AACvF,eAAO,MAAM,oCAAoC,EAAE,oCAA2E,CAAA;AAE9H,MAAM,MAAM,8BAA8B,GAAG,gBAAgB,CAAC;IAC5D,MAAM,CAAC,EAAE,SAAS,CAAA;IAClB,MAAM,EAAE,oCAAoC,CAAA;CAC7C,CAAC,CAAA;AAEF,qBAAa,wBAAyB,SAAQ,eAAe,CAAC,8BAA8B,CAAC;IAC3F,OAAgB,YAAY,uCAAuC;IAEnE,SAAS,KAAK,MAAM;;;;;;;mBAEnB;WAEqB,MAAM,CAAC,MAAM,CAAC,EAAE,eAAe,CAAC,8BAA8B,CAAC,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAI1G,OAAO,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;CAGhF"}

package/dist/esm/Witness.js

@@ -4,15 +4,14 @@ import { XyoModuleInstanceSchema } from './Schema';
 export const XyoModuleInstanceWitnessConfigSchema = 'network.xyo.module.instance.config';
 export class XyoModuleInstanceWitness extends AbstractWitness {
     static configSchema = XyoModuleInstanceWitnessConfigSchema;
-    static targetSchema = XyoModuleInstanceSchema;
     get module() {
         return this.config?.module;
     }
     static async create(params) {
         return (await super.create(params));
     }
-    async observe(fields) {
-        return await super.observe([merge({ queries: this.module?.queries }, fields?.[0])]);
+    async observe(payloads) {
+        return await super.observe([merge({ queries: this.module?.queries }, payloads?.[0], { schema: XyoModuleInstanceSchema })]);
     }
 }
 //# 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,EAAoB,MAAM,sBAAsB,CAAA;AACxE,OAAO,KAAK,MAAM,cAAc,CAAA;AAGhC,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAA;AAGlD,MAAM,CAAC,MAAM,oCAAoC,GAAyC,oCAAoC,CAAA;AAU9H,MAAM,OAAO,wBAAyB,SAAQ,eAAyE;IACrH,MAAM,CAAU,YAAY,GAAG,oCAAoC,CAAA;IACnE,MAAM,CAAU,YAAY,GAAG,uBAAuB,CAAA;IAEtD,IAAc,MAAM;QAClB,OAAO,IAAI,CAAC,MAAM,EAAE,MAAM,CAAA;IAC5B,CAAC;IAED,MAAM,CAAU,KAAK,CAAC,MAAM,CAAC,MAAwD;QACnF,OAAO,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAA6B,CAAA;IACjE,CAAC;IAEQ,KAAK,CAAC,OAAO,CAAC,MAA4C;QACjE,OAAO,MAAM,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACrF,CAAC"}
+{"version":3,"file":"Witness.js","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAoB,MAAM,sBAAsB,CAAA;AACxE,OAAO,KAAK,MAAM,cAAc,CAAA;AAEhC,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAA;AAGlD,MAAM,CAAC,MAAM,oCAAoC,GAAyC,oCAAoC,CAAA;AAO9H,MAAM,OAAO,wBAAyB,SAAQ,eAA+C;IAC3F,MAAM,CAAU,YAAY,GAAG,oCAAoC,CAAA;IAEnE,IAAc,MAAM;QAClB,OAAO,IAAI,CAAC,MAAM,EAAE,MAAM,CAAA;IAC5B,CAAC;IAED,MAAM,CAAU,KAAK,CAAC,MAAM,CAAC,MAAwD;QACnF,OAAO,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAA6B,CAAA;IACjE,CAAC;IAEQ,KAAK,CAAC,OAAO,CAAC,QAAgC;QACrD,OAAO,MAAM,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,uBAAuB,EAAE,CAAC,CAAC,CAAC,CAAA;IAC5H,CAAC"}

package/dist/esm/index.d.ts

@@ -1,8 +1,8 @@
-import { XyoModuleInstancePayloadPlugin } from './Plugin';
+import { XyoModuleInstancePlugin } from './Plugin';
 export * from './Payload';
 export * from './Schema';
 export * from './Template';
 export * from './Witness';
-export { XyoModuleInstancePayloadPlugin };
-export default XyoModuleInstancePayloadPlugin;
+export { XyoModuleInstancePlugin };
+export default XyoModuleInstancePlugin;
 //# 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,8BAA8B,EAAE,MAAM,UAAU,CAAA;AAEzD,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,WAAW,CAAA;AAEzB,OAAO,EAAE,8BAA8B,EAAE,CAAA;AAGzC,eAAe,8BAA8B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAA;AAElD,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,WAAW,CAAA;AAEzB,OAAO,EAAE,uBAAuB,EAAE,CAAA;AAGlC,eAAe,uBAAuB,CAAA"}

package/dist/esm/index.js

@@ -1,9 +1,9 @@
-import { XyoModuleInstancePayloadPlugin } from './Plugin';
+import { XyoModuleInstancePlugin } from './Plugin';
 export * from './Payload';
 export * from './Schema';
 export * from './Template';
 export * from './Witness';
-export { XyoModuleInstancePayloadPlugin };
+export { XyoModuleInstancePlugin };
 // eslint-disable-next-line import/no-default-export
-export default XyoModuleInstancePayloadPlugin;
+export default XyoModuleInstancePlugin;
 //# 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,8BAA8B,EAAE,MAAM,UAAU,CAAA;AAEzD,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,WAAW,CAAA;AAEzB,OAAO,EAAE,8BAA8B,EAAE,CAAA;AAEzC,oDAAoD;AACpD,eAAe,8BAA8B,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAA;AAElD,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,WAAW,CAAA;AAEzB,OAAO,EAAE,uBAAuB,EAAE,CAAA;AAElC,oDAAoD;AACpD,eAAe,uBAAuB,CAAA"}

package/package.json

@@ -10,19 +10,19 @@
     "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",
     "lodash": "^4.17.21",
     "tslib": "^2.4.1"
   },
   "devDependencies": {
-    "axios": "~1.1.3",
+    "axios": "~1.2.1",
     "pako": "^2.1.0"
   },
   "peerDependencies": {
-    "axios": "~1.1.3",
+    "axios": "~1.2.1",
     "pako": "^2.1.0"
   },
   "description": "Contains the information about a module instance",
@@ -58,5 +58,5 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.41.10"
+  "version": "2.41.12"
 }

package/src/Plugin.spec.ts

@@ -2,20 +2,21 @@
  * @jest-environment jsdom
  */
 
-import { XyoPayloadPluginResolver } from '@xyo-network/payload-plugin'
+import { PayloadSetPluginResolver } from '@xyo-network/payloadset-plugin'
 
-import { XyoModuleInstancePayloadPlugin } from './Plugin'
+import { XyoModuleInstancePlugin } from './Plugin'
 import { XyoModuleInstanceSchema } from './Schema'
 import { XyoModuleInstanceWitnessConfigSchema } from './Witness'
 
-describe('XyoModuleInstancePayloadPlugin', () => {
+describe('XyoModuleInstancePlugin', () => {
   test('Add to Resolver', () => {
-    const resolver = new XyoPayloadPluginResolver().register(XyoModuleInstancePayloadPlugin(), {
+    const plugin = XyoModuleInstancePlugin()
+    const resolver = new PayloadSetPluginResolver().register(plugin, {
       witness: {
         config: { schema: XyoModuleInstanceWitnessConfigSchema, targetSchema: XyoModuleInstanceSchema },
       },
     })
-    expect(resolver.resolve({ schema: XyoModuleInstanceSchema })).toBeObject()
+    expect(resolver.resolve(plugin.set)).toBeObject()
     expect(resolver.witness(XyoModuleInstanceSchema)).toBeObject()
   })
 })

package/src/Plugin.ts

@@ -1,16 +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 { XyoModuleInstancePayload } from './Payload'
 import { XyoModuleInstanceSchema } from './Schema'
-import { XyoModuleInstancePayloadTemplate } from './Template'
 import { XyoModuleInstanceWitness, XyoModuleInstanceWitnessConfig } from './Witness'
 
-export const XyoModuleInstancePayloadPlugin = () =>
-  createXyoPayloadPlugin<XyoModuleInstancePayload, XyoModuleParams<XyoModuleInstanceWitnessConfig>>({
-    schema: XyoModuleInstanceSchema,
-    template: XyoModuleInstancePayloadTemplate,
-    witness: async (params) => {
-      return await XyoModuleInstanceWitness.create(params)
+export const XyoModuleInstancePlugin = () =>
+  createPayloadSetPlugin<PayloadSetWitnessPlugin<XyoModuleParams<XyoModuleInstanceWitnessConfig>>>(
+    { required: { [XyoModuleInstanceSchema]: 1 }, schema: PayloadSetSchema },
+    {
+      witness: async (params) => {
+        const result = await XyoModuleInstanceWitness.create(params)
+        return result
+      },
     },
-  })
+  )

package/src/Witness.spec.ts

@@ -1,30 +1,21 @@
 import { MemoryArchivist } from '@xyo-network/archivist'
 import { PayloadWrapper } from '@xyo-network/payload'
 
-import { XyoModuleInstanceSchema } from './Schema'
 import { XyoModuleInstanceWitness, XyoModuleInstanceWitnessConfigSchema } from './Witness'
 
 describe('XyoModuleInstanceWitness', () => {
   test('Witnessing', async () => {
     const module = await MemoryArchivist.create()
     const witness = await XyoModuleInstanceWitness.create({
-      config: { module, schema: XyoModuleInstanceWitnessConfigSchema, targetSchema: XyoModuleInstanceSchema },
+      config: { module, schema: XyoModuleInstanceWitnessConfigSchema },
     })
-
     const [result] = await witness.observe()
-
-    console.log(`Module: ${JSON.stringify(result, null, 2)}`)
-
     expect(new PayloadWrapper(result).valid).toBe(true)
   })
 
   test('Witnessing [no config]', async () => {
     const witness = await XyoModuleInstanceWitness.create()
-
     const [result] = await witness.observe()
-
-    console.log(`Module: ${JSON.stringify(result, null, 2)}`)
-
     expect(new PayloadWrapper(result).valid).toBe(true)
   })
 })

package/src/Witness.ts

@@ -1,24 +1,20 @@
 import { XyoModule, XyoModuleParams } from '@xyo-network/module'
+import { XyoPayload } from '@xyo-network/payload'
 import { AbstractWitness, XyoWitnessConfig } from '@xyo-network/witness'
 import merge from 'lodash/merge'
 
-import { XyoModuleInstancePayload } from './Payload'
 import { XyoModuleInstanceSchema } from './Schema'
 
 export type XyoModuleInstanceWitnessConfigSchema = 'network.xyo.module.instance.config'
 export const XyoModuleInstanceWitnessConfigSchema: XyoModuleInstanceWitnessConfigSchema = 'network.xyo.module.instance.config'
 
-export type XyoModuleInstanceWitnessConfig = XyoWitnessConfig<
-  XyoModuleInstancePayload,
-  {
-    module?: XyoModule
-    schema: XyoModuleInstanceWitnessConfigSchema
-  }
->
+export type XyoModuleInstanceWitnessConfig = XyoWitnessConfig<{
+  module?: XyoModule
+  schema: XyoModuleInstanceWitnessConfigSchema
+}>
 
-export class XyoModuleInstanceWitness extends AbstractWitness<XyoModuleInstancePayload, XyoModuleInstanceWitnessConfig> {
+export class XyoModuleInstanceWitness extends AbstractWitness<XyoModuleInstanceWitnessConfig> {
   static override configSchema = XyoModuleInstanceWitnessConfigSchema
-  static override targetSchema = XyoModuleInstanceSchema
 
   protected get module() {
     return this.config?.module
@@ -28,7 +24,7 @@ export class XyoModuleInstanceWitness extends AbstractWitness<XyoModuleInstanceP
     return (await super.create(params)) as XyoModuleInstanceWitness
   }
 
-  override async observe(fields?: Partial<XyoModuleInstancePayload>[]): Promise<XyoModuleInstancePayload[]> {
-    return await super.observe([merge({ queries: this.module?.queries }, fields?.[0])])
+  override async observe(payloads?: Partial<XyoPayload>[]): Promise<XyoPayload[]> {
+    return await super.observe([merge({ queries: this.module?.queries }, payloads?.[0], { schema: XyoModuleInstanceSchema })])
   }
 }

package/src/index.ts

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