@xyo-network/module-instance-plugin 2.51.9 → 2.52.0-rc.2

package/dist/esm/Plugin.js

@@ -1,8 +1,8 @@
 import { AbstractModuleInstanceSchema } from '@xyo-network/module-instance-payload-plugin';
 import { PayloadSetSchema } from '@xyo-network/payload-model';
-import { createPayloadSetPlugin } from '@xyo-network/payloadset-plugin';
+import { createPayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin';
 import { AbstractModuleInstanceWitness } from './Witness';
-export const AbstractModuleInstancePlugin = () => createPayloadSetPlugin({ required: { [AbstractModuleInstanceSchema]: 1 }, schema: PayloadSetSchema }, {
+export const AbstractModuleInstancePlugin = () => createPayloadSetWitnessPlugin({ required: { [AbstractModuleInstanceSchema]: 1 }, schema: PayloadSetSchema }, {
     witness: async (params) => {
         const result = await AbstractModuleInstanceWitness.create(params);
         return result;

package/dist/esm/Plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"Plugin.js","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAA;AAC1F,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAC7D,OAAO,EAAE,sBAAsB,EAA2B,MAAM,gCAAgC,CAAA;AAEhG,OAAO,EAAE,6BAA6B,EAAuC,MAAM,WAAW,CAAA;AAE9F,MAAM,CAAC,MAAM,4BAA4B,GAAG,GAAG,EAAE,CAC/C,sBAAsB,CACpB,EAAE,QAAQ,EAAE,EAAE,CAAC,4BAA4B,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,EAC7E;IACE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QACxB,MAAM,MAAM,GAAG,MAAM,6BAA6B,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QACjE,OAAO,MAAM,CAAA;IACf,CAAC;CACF,CACF,CAAA"}
+{"version":3,"file":"Plugin.js","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAA;AAC1F,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAC7D,OAAO,EAAE,6BAA6B,EAAE,MAAM,gCAAgC,CAAA;AAE9E,OAAO,EAAE,6BAA6B,EAAE,MAAM,WAAW,CAAA;AAEzD,MAAM,CAAC,MAAM,4BAA4B,GAAG,GAAG,EAAE,CAC/C,6BAA6B,CAC3B,EAAE,QAAQ,EAAE,EAAE,CAAC,4BAA4B,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,EAC7E;IACE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QACxB,MAAM,MAAM,GAAG,MAAM,6BAA6B,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QACjE,OAAO,MAAM,CAAA;IACf,CAAC;CACF,CACF,CAAA"}

package/dist/esm/Witness.js

@@ -5,7 +5,7 @@ export const AbstractModuleInstanceWitnessConfigSchema = 'network.xyo.module.ins
 export class AbstractModuleInstanceWitness extends AbstractWitness {
     static configSchema = AbstractModuleInstanceWitnessConfigSchema;
     get module() {
-        return this.config?.module;
+        return this.params?.module;
     }
     static async create(params) {
         return (await super.create(params));

package/dist/esm/Witness.js.map

@@ -1 +1 @@
-{"version":3,"file":"Witness.js","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAA;AAE1F,OAAO,EAAE,eAAe,EAAmC,MAAM,sBAAsB,CAAA;AACvF,OAAO,KAAK,MAAM,cAAc,CAAA;AAGhC,MAAM,CAAC,MAAM,yCAAyC,GAA8C,oCAAoC,CAAA;AAOxI,MAAM,OAAO,6BAA8B,SAAQ,eAAmE;IACpH,MAAM,CAAU,YAAY,GAAG,yCAAyC,CAAA;IAExE,IAAc,MAAM;QAClB,OAAO,IAAI,CAAC,MAAM,EAAE,MAAM,CAAA;IAC5B,CAAC;IAED,MAAM,CAAU,KAAK,CAAC,MAAM,CAAC,MAA0D;QACrF,OAAO,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAkC,CAAA;IACtE,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,4BAA4B,EAAE,CAAC,CAAC,CAAC,CAAA;IACjI,CAAC"}
+{"version":3,"file":"Witness.js","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAA;AAE1F,OAAO,EAAE,eAAe,EAAmC,MAAM,sBAAsB,CAAA;AACvF,OAAO,KAAK,MAAM,cAAc,CAAA;AAGhC,MAAM,CAAC,MAAM,yCAAyC,GAA8C,oCAAoC,CAAA;AAcxI,MAAM,OAAO,6BAEX,SAAQ,eAAwB;IAChC,MAAM,CAAU,YAAY,GAAG,yCAAyC,CAAA;IAExE,IAAc,MAAM;QAClB,OAAO,IAAI,CAAC,MAAM,EAAE,MAAM,CAAA;IAC5B,CAAC;IAED,MAAM,CAAU,KAAK,CAAC,MAAM,CAAsD,MAAgB;QAChG,OAAO,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAA2C,CAAA;IAC/E,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,4BAA4B,EAAE,CAAC,CAAC,CAAC,CAAA;IACjI,CAAC"}

package/dist/types/Plugin.d.ts

@@ -1,30 +1,3 @@
-import { ModuleParams } from '@xyo-network/module';
-import { PayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin';
 import { AbstractModuleInstanceWitness } from './Witness';
-export declare const AbstractModuleInstancePlugin: () => PayloadSetWitnessPlugin<AbstractModuleInstanceWitness, ModuleParams<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
-    name?: string | undefined;
-    security?: {
-        allowAnonymous?: boolean | undefined;
-        allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
-        disallowed?: Record<string, string[]> | undefined;
-    } | undefined;
-    storeQueries?: boolean | undefined;
-} & {
-    module?: import("@xyo-network/module").AbstractModule<ModuleParams<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
-        name?: string | undefined;
-        security?: {
-            allowAnonymous?: boolean | undefined;
-            allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
-            disallowed?: Record<string, string[]> | undefined;
-        } | undefined;
-        storeQueries?: boolean | undefined;
-    } & {
-        schema: string;
-    }, undefined>> | undefined;
-    schema: "network.xyo.module.instance.config";
-} & {
-    targetSet?: (import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & import("@xyo-network/payload-model").PayloadSet & {
-        schema: "network.xyo.payload.set";
-    }) | undefined;
-}, undefined>>;
+export declare const AbstractModuleInstancePlugin: () => import("@xyo-network/payloadset-plugin").PayloadSetWitnessPlugin<AbstractModuleInstanceWitness<import("./Witness").AbstractModuleInstanceWitnessParams>>;
 //# sourceMappingURL=Plugin.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Plugin.d.ts","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAGlD,OAAO,EAA0B,uBAAuB,EAAE,MAAM,gCAAgC,CAAA;AAEhG,OAAO,EAAE,6BAA6B,EAAuC,MAAM,WAAW,CAAA;AAE9F,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;cAStC,CAAA"}
+{"version":3,"file":"Plugin.d.ts","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,6BAA6B,EAAE,MAAM,WAAW,CAAA;AAEzD,eAAO,MAAM,4BAA4B,gKAStC,CAAA"}

package/dist/types/Witness.d.ts

@@ -1,26 +1,38 @@
-import { AbstractModule, ModuleParams } from '@xyo-network/module';
+import { AnyConfigSchema, Module } from '@xyo-network/module';
 import { XyoPayload } from '@xyo-network/payload-model';
 import { AbstractWitness, WitnessParams, XyoWitnessConfig } from '@xyo-network/witness';
 export type AbstractModuleInstanceWitnessConfigSchema = 'network.xyo.module.instance.config';
 export declare const AbstractModuleInstanceWitnessConfigSchema: AbstractModuleInstanceWitnessConfigSchema;
 export type AbstractModuleInstanceWitnessConfig = XyoWitnessConfig<{
-    module?: AbstractModule;
     schema: AbstractModuleInstanceWitnessConfigSchema;
 }>;
-export declare class AbstractModuleInstanceWitness extends AbstractWitness<WitnessParams<AbstractModuleInstanceWitnessConfig>> {
+export type AbstractModuleInstanceWitnessParams = WitnessParams<AnyConfigSchema<AbstractModuleInstanceWitnessConfig>, undefined, {
+    module?: Module;
+}>;
+export declare class AbstractModuleInstanceWitness<TParams extends AbstractModuleInstanceWitnessParams = AbstractModuleInstanceWitnessParams> extends AbstractWitness<TParams> {
     static configSchema: "network.xyo.module.instance.config";
-    protected get module(): AbstractModule<ModuleParams<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
+    protected get module(): Module<import("@xyo-network/module").ModuleParams<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
+        name?: string | undefined;
+        schema: string;
+        security?: {
+            allowAnonymous?: boolean | undefined;
+            allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
+            disallowed?: Record<string, string[]> | undefined;
+        } | undefined;
+        storeQueries?: boolean | undefined;
+    } & Omit<Omit<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
         name?: string | undefined;
+        schema: "network.xyo.module.config";
         security?: {
             allowAnonymous?: boolean | undefined;
             allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
             disallowed?: Record<string, string[]> | undefined;
         } | undefined;
         storeQueries?: boolean | undefined;
-    } & {
+    } & Omit<undefined, "schema">, "schema"> & {
         schema: string;
-    }, undefined>> | undefined;
-    static create(params?: ModuleParams<AbstractModuleInstanceWitnessConfig>): Promise<AbstractModuleInstanceWitness>;
+    }, "schema">, undefined, undefined>> | undefined;
+    static create<TParams extends AbstractModuleInstanceWitnessParams>(params?: TParams): Promise<AbstractModuleInstanceWitness<TParams>>;
     observe(payloads?: Partial<XyoPayload>[]): Promise<XyoPayload[]>;
 }
 //# sourceMappingURL=Witness.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAElE,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAGvF,MAAM,MAAM,yCAAyC,GAAG,oCAAoC,CAAA;AAC5F,eAAO,MAAM,yCAAyC,EAAE,yCAAgF,CAAA;AAExI,MAAM,MAAM,mCAAmC,GAAG,gBAAgB,CAAC;IACjE,MAAM,CAAC,EAAE,cAAc,CAAA;IACvB,MAAM,EAAE,yCAAyC,CAAA;CAClD,CAAC,CAAA;AAEF,qBAAa,6BAA8B,SAAQ,eAAe,CAAC,aAAa,CAAC,mCAAmC,CAAC,CAAC;IACpH,OAAgB,YAAY,uCAA4C;IAExE,SAAS,KAAK,MAAM;;;;;;;;;;+BAEnB;WAEqB,MAAM,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC,mCAAmC,CAAC,GAAG,OAAO,CAAC,6BAA6B,CAAC;IAIjH,OAAO,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;CAGhF"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAE7D,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAGvF,MAAM,MAAM,yCAAyC,GAAG,oCAAoC,CAAA;AAC5F,eAAO,MAAM,yCAAyC,EAAE,yCAAgF,CAAA;AAExI,MAAM,MAAM,mCAAmC,GAAG,gBAAgB,CAAC;IACjE,MAAM,EAAE,yCAAyC,CAAA;CAClD,CAAC,CAAA;AAEF,MAAM,MAAM,mCAAmC,GAAG,aAAa,CAC7D,eAAe,CAAC,mCAAmC,CAAC,EACpD,SAAS,EACT;IACE,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CACF,CAAA;AAED,qBAAa,6BAA6B,CACxC,OAAO,SAAS,mCAAmC,GAAG,mCAAmC,CACzF,SAAQ,eAAe,CAAC,OAAO,CAAC;IAChC,OAAgB,YAAY,uCAA4C;IAExE,SAAS,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;qDAEnB;WAEqB,MAAM,CAAC,OAAO,SAAS,mCAAmC,EAAE,MAAM,CAAC,EAAE,OAAO;IAInF,OAAO,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;CAGhF"}

package/package.json

@@ -10,11 +10,11 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xyo-network/module": "^2.51.9",
-    "@xyo-network/module-instance-payload-plugin": "^2.51.9",
-    "@xyo-network/payload-model": "^2.51.9",
-    "@xyo-network/payloadset-plugin": "^2.51.9",
-    "@xyo-network/witness": "^2.51.9",
+    "@xyo-network/module": "^2.52.0-rc.2",
+    "@xyo-network/module-instance-payload-plugin": "^2.52.0-rc.2",
+    "@xyo-network/payload-model": "^2.52.0-rc.2",
+    "@xyo-network/payloadset-plugin": "^2.52.0-rc.2",
+    "@xyo-network/witness": "^2.52.0-rc.2",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
@@ -56,5 +56,6 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.51.9"
+  "version": "2.52.0-rc.2",
+  "stableVersion": "2.51.9"
 }

package/src/Plugin.ts

@@ -1,12 +1,11 @@
-import { ModuleParams } from '@xyo-network/module'
 import { AbstractModuleInstanceSchema } from '@xyo-network/module-instance-payload-plugin'
 import { PayloadSetSchema } from '@xyo-network/payload-model'
-import { createPayloadSetPlugin, PayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin'
+import { createPayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin'
 
-import { AbstractModuleInstanceWitness, AbstractModuleInstanceWitnessConfig } from './Witness'
+import { AbstractModuleInstanceWitness } from './Witness'
 
 export const AbstractModuleInstancePlugin = () =>
-  createPayloadSetPlugin<PayloadSetWitnessPlugin<AbstractModuleInstanceWitness, ModuleParams<AbstractModuleInstanceWitnessConfig>>>(
+  createPayloadSetWitnessPlugin<AbstractModuleInstanceWitness>(
     { required: { [AbstractModuleInstanceSchema]: 1 }, schema: PayloadSetSchema },
     {
       witness: async (params) => {

package/src/Witness.ts

@@ -1,4 +1,4 @@
-import { AbstractModule, ModuleParams } from '@xyo-network/module'
+import { AnyConfigSchema, Module } from '@xyo-network/module'
 import { AbstractModuleInstanceSchema } from '@xyo-network/module-instance-payload-plugin'
 import { XyoPayload } from '@xyo-network/payload-model'
 import { AbstractWitness, WitnessParams, XyoWitnessConfig } from '@xyo-network/witness'
@@ -8,19 +8,28 @@ export type AbstractModuleInstanceWitnessConfigSchema = 'network.xyo.module.inst
 export const AbstractModuleInstanceWitnessConfigSchema: AbstractModuleInstanceWitnessConfigSchema = 'network.xyo.module.instance.config'
 
 export type AbstractModuleInstanceWitnessConfig = XyoWitnessConfig<{
-  module?: AbstractModule
   schema: AbstractModuleInstanceWitnessConfigSchema
 }>
 
-export class AbstractModuleInstanceWitness extends AbstractWitness<WitnessParams<AbstractModuleInstanceWitnessConfig>> {
+export type AbstractModuleInstanceWitnessParams = WitnessParams<
+  AnyConfigSchema<AbstractModuleInstanceWitnessConfig>,
+  undefined,
+  {
+    module?: Module
+  }
+>
+
+export class AbstractModuleInstanceWitness<
+  TParams extends AbstractModuleInstanceWitnessParams = AbstractModuleInstanceWitnessParams,
+> extends AbstractWitness<TParams> {
   static override configSchema = AbstractModuleInstanceWitnessConfigSchema
 
   protected get module() {
-    return this.config?.module
+    return this.params?.module
   }
 
-  static override async create(params?: ModuleParams<AbstractModuleInstanceWitnessConfig>): Promise<AbstractModuleInstanceWitness> {
-    return (await super.create(params)) as AbstractModuleInstanceWitness
+  static override async create<TParams extends AbstractModuleInstanceWitnessParams>(params?: TParams) {
+    return (await super.create(params)) as AbstractModuleInstanceWitness<TParams>
   }
 
   override async observe(payloads?: Partial<XyoPayload>[]): Promise<XyoPayload[]> {