@xyo-network/witness 2.45.1 → 2.46.1

package/dist/esm/AbstractWitness.js

@@ -5,6 +5,9 @@ import { PayloadWrapper } from '@xyo-network/payload-wrapper';
 import { XyoWitnessObserveQuerySchema } from './Queries';
 export class AbstractWitness extends AbstractModule {
     static configSchema;
+    get queries() {
+        return [XyoWitnessObserveQuerySchema, ...super.queries];
+    }
     get targetSet() {
         return this.config?.targetSet;
     }
@@ -21,9 +24,6 @@ export class AbstractWitness extends AbstractModule {
         this.logger?.debug(`result: ${JSON.stringify(payloadList, null, 2)}`);
         return payloadList;
     }
-    queries() {
-        return [XyoWitnessObserveQuerySchema, ...super.queries()];
-    }
     async query(query, payloads, queryConfig) {
         const wrapper = QueryBoundWitnessWrapper.parseQuery(query, payloads);
         const typedQuery = wrapper.query.payload;

package/dist/esm/AbstractWitness.js.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractWitness.js","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AbstractWitness.js","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"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"}

package/dist/types/AbstractWitness.d.ts

@@ -1,17 +1,17 @@
-import { AbstractModule, AbstractModuleConfig, ModuleParams, ModuleQueryResult, XyoQueryBoundWitness } from '@xyo-network/module';
+import { AbstractModule, ModuleConfig, ModuleParams, ModuleQueryResult, XyoQueryBoundWitness } from '@xyo-network/module';
 import { XyoPayload } from '@xyo-network/payload-model';
 import { Promisable } from '@xyo-network/promise';
 import { XyoWitnessConfig } from './Config';
 import { Witness } from './Witness';
 export declare abstract class AbstractWitness<TConfig extends XyoWitnessConfig = XyoWitnessConfig> extends AbstractModule<TConfig> implements Witness {
     static configSchema: string;
+    get queries(): string[];
     get 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;
     static create(params?: Partial<ModuleParams<XyoWitnessConfig>>): Promise<AbstractWitness>;
     observe(payloads?: XyoPayload[]): Promisable<XyoPayload[]>;
-    queries(): string[];
-    query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness, TConfig extends AbstractModuleConfig = AbstractModuleConfig>(query: T, payloads?: XyoPayload[], queryConfig?: TConfig): Promise<ModuleQueryResult>;
+    query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: XyoPayload[], queryConfig?: TConfig): Promise<ModuleQueryResult>;
 }
 /** @deprecated use AbstractWitness instead */
 export declare abstract class XyoWitness<TTarget extends XyoPayload = XyoPayload, TConfig extends XyoWitnessConfig<TTarget> = XyoWitnessConfig<TTarget>> extends AbstractWitness<TConfig> {

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

@@ -1 +1 @@
-{"version":3,"file":"AbstractWitness.d.ts","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,cAAc,EACd,oBAAoB,EACpB,YAAY,EACZ,iBAAiB,EAGjB,oBAAoB,EACrB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,8BAAsB,eAAe,CAAC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,CAAE,SAAQ,cAAc,CAAC,OAAO,CAAE,YAAW,OAAO;IAC3I,OAAgB,YAAY,EAAE,MAAM,CAAA;IAEpC,IAAW,SAAS;;mBAEnB;WAEqB,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC;IAMjG,OAAO,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC;IASxD,OAAO;IAID,KAAK,CAAC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EAAE,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,EACrI,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,UAAU,EAAE,EACvB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,iBAAiB,CAAC;CAsB9B;AAED,8CAA8C;AAC9C,8BAAsB,UAAU,CAC9B,OAAO,SAAS,UAAU,GAAG,UAAU,EACvC,OAAO,SAAS,gBAAgB,CAAC,OAAO,CAAC,GAAG,gBAAgB,CAAC,OAAO,CAAC,CACrE,SAAQ,eAAe,CAAC,OAAO,CAAC;CAAG"}
+{"version":3,"file":"AbstractWitness.d.ts","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,iBAAiB,EAGjB,oBAAoB,EACrB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,8BAAsB,eAAe,CAAC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,CAAE,SAAQ,cAAc,CAAC,OAAO,CAAE,YAAW,OAAO;IAC3I,OAAgB,YAAY,EAAE,MAAM,CAAA;IAEpC,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,IAAW,SAAS;;mBAEnB;WAEqB,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC;IAMjG,OAAO,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC;IASlD,KAAK,CAAC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EAAE,OAAO,SAAS,YAAY,GAAG,YAAY,EACrH,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,UAAU,EAAE,EACvB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,iBAAiB,CAAC;CAsB9B;AAED,8CAA8C;AAC9C,8BAAsB,UAAU,CAC9B,OAAO,SAAS,UAAU,GAAG,UAAU,EACvC,OAAO,SAAS,gBAAgB,CAAC,OAAO,CAAC,GAAG,gBAAgB,CAAC,OAAO,CAAC,CACrE,SAAQ,eAAe,CAAC,OAAO,CAAC;CAAG"}

package/dist/types/Config.d.ts

@@ -1,8 +1,8 @@
-import { AbstractModuleConfig } from '@xyo-network/module';
+import { ModuleConfig } from '@xyo-network/module';
 import { PayloadSetPayload, XyoPayload } from '@xyo-network/payload-model';
 export type XyoWitnessConfigSchema = 'network.xyo.witness.config';
 export declare const XyoWitnessConfigSchema: XyoWitnessConfigSchema;
-export type XyoWitnessConfig<TConfig extends XyoPayload = XyoPayload> = AbstractModuleConfig<TConfig & {
+export type XyoWitnessConfig<TConfig extends XyoPayload = XyoPayload> = ModuleConfig<TConfig & {
     targetSet?: PayloadSetPayload;
 }>;
 //# sourceMappingURL=Config.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../src/Config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAE1E,MAAM,MAAM,sBAAsB,GAAG,4BAA4B,CAAA;AACjE,eAAO,MAAM,sBAAsB,EAAE,sBAAqD,CAAA;AAE1F,MAAM,MAAM,gBAAgB,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,IAAI,oBAAoB,CAC1F,OAAO,GAAG;IACR,SAAS,CAAC,EAAE,iBAAiB,CAAA;CAC9B,CACF,CAAA"}
+{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../src/Config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAE1E,MAAM,MAAM,sBAAsB,GAAG,4BAA4B,CAAA;AACjE,eAAO,MAAM,sBAAsB,EAAE,sBAAqD,CAAA;AAE1F,MAAM,MAAM,gBAAgB,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,IAAI,YAAY,CAClF,OAAO,GAAG;IACR,SAAS,CAAC,EAAE,iBAAiB,CAAA;CAC9B,CACF,CAAA"}

package/dist/types/Queries/index.d.ts

@@ -1,6 +1,6 @@
-import { AbstractModuleQuery, XyoQuery } from '@xyo-network/module-model';
+import { ModuleQuery, XyoQuery } from '@xyo-network/module-model';
 import { XyoWitnessObserveQuery } from './Observe';
 export * from './Observe';
 export type XyoWitnessQueryBase = XyoWitnessObserveQuery;
-export type XyoWitnessQuery<TQuery extends XyoQuery | void = void> = AbstractModuleQuery<TQuery extends XyoQuery ? XyoWitnessQueryBase | TQuery : XyoWitnessQueryBase>;
+export type XyoWitnessQuery<TQuery extends XyoQuery | void = void> = ModuleQuery<TQuery extends XyoQuery ? XyoWitnessQueryBase | TQuery : XyoWitnessQueryBase>;
 //# sourceMappingURL=index.d.ts.map

package/dist/types/Queries/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Queries/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAA;AAEzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAA;AAElD,cAAc,WAAW,CAAA;AAEzB,MAAM,MAAM,mBAAmB,GAAG,sBAAsB,CAAA;AAExD,MAAM,MAAM,eAAe,CAAC,MAAM,SAAS,QAAQ,GAAG,IAAI,GAAG,IAAI,IAAI,mBAAmB,CACtF,MAAM,SAAS,QAAQ,GAAG,mBAAmB,GAAG,MAAM,GAAG,mBAAmB,CAC7E,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Queries/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAA;AAEjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAA;AAElD,cAAc,WAAW,CAAA;AAEzB,MAAM,MAAM,mBAAmB,GAAG,sBAAsB,CAAA;AAExD,MAAM,MAAM,eAAe,CAAC,MAAM,SAAS,QAAQ,GAAG,IAAI,GAAG,IAAI,IAAI,WAAW,CAC9E,MAAM,SAAS,QAAQ,GAAG,mBAAmB,GAAG,MAAM,GAAG,mBAAmB,CAC7E,CAAA"}

package/dist/types/Witness.d.ts

@@ -1,7 +1,8 @@
 import { Module } from '@xyo-network/module-model';
 import { XyoPayload } from '@xyo-network/payload-model';
 import { Promisable } from '@xyo-network/promise';
-export interface Witness extends Module {
+export interface Witness {
     observe: (payloads?: XyoPayload[]) => Promisable<XyoPayload[]>;
 }
+export type WitnessModule = Witness & Module;
 //# 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,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,MAAM,WAAW,OAAQ,SAAQ,MAAM;IACrC,OAAO,EAAE,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,KAAK,UAAU,CAAC,UAAU,EAAE,CAAC,CAAA;CAC/D"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,MAAM,WAAW,OAAO;IACtB,OAAO,EAAE,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,KAAK,UAAU,CAAC,UAAU,EAAE,CAAC,CAAA;CAC/D;AAED,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG,MAAM,CAAA"}

package/package.json

@@ -11,12 +11,12 @@
   },
   "dependencies": {
     "@xylabs/assert": "^2.7.1",
-    "@xyo-network/account": "^2.45.1",
-    "@xyo-network/module": "^2.45.1",
-    "@xyo-network/module-model": "^2.45.1",
-    "@xyo-network/payload-model": "^2.45.1",
-    "@xyo-network/payload-wrapper": "^2.45.1",
-    "@xyo-network/promise": "^2.45.1"
+    "@xyo-network/account": "^2.46.1",
+    "@xyo-network/module": "^2.46.1",
+    "@xyo-network/module-model": "^2.46.1",
+    "@xyo-network/payload-model": "^2.46.1",
+    "@xyo-network/payload-wrapper": "^2.46.1",
+    "@xyo-network/promise": "^2.46.1"
   },
   "devDependencies": {
     "@xylabs/ts-scripts-yarn3": "^2.14.15",
@@ -56,5 +56,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.45.1"
+  "version": "2.46.1"
 }

package/src/AbstractWitness.ts

@@ -2,7 +2,7 @@ import { assertEx } from '@xylabs/assert'
 import { Account } from '@xyo-network/account'
 import {
   AbstractModule,
-  AbstractModuleConfig,
+  ModuleConfig,
   ModuleParams,
   ModuleQueryResult,
   QueryBoundWitnessWrapper,
@@ -20,6 +20,10 @@ import { Witness } from './Witness'
 export abstract class AbstractWitness<TConfig extends XyoWitnessConfig = XyoWitnessConfig> extends AbstractModule<TConfig> implements Witness {
   static override configSchema: string
 
+  override get queries(): string[] {
+    return [XyoWitnessObserveQuerySchema, ...super.queries]
+  }
+
   public get targetSet() {
     return this.config?.targetSet
   }
@@ -39,11 +43,7 @@ export abstract class AbstractWitness<TConfig extends XyoWitnessConfig = XyoWitn
     return payloadList
   }
 
-  override queries() {
-    return [XyoWitnessObserveQuerySchema, ...super.queries()]
-  }
-
-  override async query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness, TConfig extends AbstractModuleConfig = AbstractModuleConfig>(
+  override async query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(
     query: T,
     payloads?: XyoPayload[],
     queryConfig?: TConfig,

package/src/Config.ts

@@ -1,10 +1,10 @@
-import { AbstractModuleConfig } from '@xyo-network/module'
+import { ModuleConfig } from '@xyo-network/module'
 import { PayloadSetPayload, XyoPayload } from '@xyo-network/payload-model'
 
 export type XyoWitnessConfigSchema = 'network.xyo.witness.config'
 export const XyoWitnessConfigSchema: XyoWitnessConfigSchema = 'network.xyo.witness.config'
 
-export type XyoWitnessConfig<TConfig extends XyoPayload = XyoPayload> = AbstractModuleConfig<
+export type XyoWitnessConfig<TConfig extends XyoPayload = XyoPayload> = ModuleConfig<
   TConfig & {
     targetSet?: PayloadSetPayload
   }

package/src/Queries/index.ts

@@ -1,4 +1,4 @@
-import { AbstractModuleQuery, XyoQuery } from '@xyo-network/module-model'
+import { ModuleQuery, XyoQuery } from '@xyo-network/module-model'
 
 import { XyoWitnessObserveQuery } from './Observe'
 
@@ -6,6 +6,6 @@ export * from './Observe'
 
 export type XyoWitnessQueryBase = XyoWitnessObserveQuery
 
-export type XyoWitnessQuery<TQuery extends XyoQuery | void = void> = AbstractModuleQuery<
+export type XyoWitnessQuery<TQuery extends XyoQuery | void = void> = ModuleQuery<
   TQuery extends XyoQuery ? XyoWitnessQueryBase | TQuery : XyoWitnessQueryBase
 >

package/src/Witness.ts

@@ -2,6 +2,8 @@ import { Module } from '@xyo-network/module-model'
 import { XyoPayload } from '@xyo-network/payload-model'
 import { Promisable } from '@xyo-network/promise'
 
-export interface Witness extends Module {
+export interface Witness {
   observe: (payloads?: XyoPayload[]) => Promisable<XyoPayload[]>
 }
+
+export type WitnessModule = Witness & Module

package/src/spec/AbstractWitness.spec.ts

@@ -3,7 +3,7 @@ import { XyoPayloadBuilder } from '@xyo-network/payload-builder'
 
 import { AbstractWitness } from '../AbstractWitness'
 import { XyoWitnessConfig, XyoWitnessConfigSchema } from '../Config'
-import { Witness } from '../Witness'
+import { WitnessModule } from '../Witness'
 import { WitnessWrapper } from '../WitnessWrapper'
 
 describe('XyoWitness', () => {
@@ -24,8 +24,8 @@ describe('XyoWitness', () => {
       const wrapper = new WitnessWrapper(witness)
       expect(wrapper).toBeObject()
     })
-    it('Witness', async () => {
-      const witness: Witness = await AbstractWitness.create(params)
+    it('WitnessModule', async () => {
+      const witness: WitnessModule = await AbstractWitness.create(params)
       expect(witness).toBeObject()
       const wrapper = new WitnessWrapper(witness)
       expect(wrapper).toBeObject()