@xyo-network/witness 2.56.1 → 2.57.4

package/dist/esm/AbstractWitness.js

@@ -4,7 +4,7 @@ import { AbstractModule, ModuleErrorBuilder, QueryBoundWitnessWrapper } from '@x
 import { PayloadWrapper } from '@xyo-network/payload-wrapper';
 import { WitnessConfigSchema } from './Config';
 import { WitnessObserveQuerySchema } from './Queries';
-class AbstractWitness extends AbstractModule {
+export class AbstractWitness extends AbstractModule {
     static configSchema = WitnessConfigSchema;
     get queries() {
         return [WitnessObserveQuerySchema, ...super.queries];
@@ -12,12 +12,16 @@ class AbstractWitness extends AbstractModule {
     get targetSet() {
         return this.config?.targetSet;
     }
+    get _queryAccountPaths() {
+        return {
+            'network.xyo.query.witness.observe': '1/1',
+        };
+    }
     observe(payloads) {
         this.started('throw');
         const payloadList = assertEx(payloads, 'Trying to witness nothing');
         assertEx(payloadList.length > 0, 'Trying to witness empty list');
         payloadList?.forEach((payload) => assertEx(payload.schema, 'observe: Missing Schema'));
-        //this.logger?.debug(`result: ${JSON.stringify(payloadList, null, 2)}`)
         return payloadList;
     }
     async queryHandler(query, payloads, queryConfig) {
@@ -33,7 +37,7 @@ class AbstractWitness extends AbstractModule {
                     await this.emit('reportStart', { inPayloads: payloads, module: this });
                     const resultPayloads = await this.observe(filteredObservation);
                     await this.emit('reportEnd', { inPayloads: payloads, module: this, outPayloads: resultPayloads });
-                    return this.bindResult(resultPayloads, queryAccount);
+                    return this.bindQueryResult(typedQuery, resultPayloads, [queryAccount]);
                 }
                 default: {
                     return super.queryHandler(query, payloads);
@@ -42,9 +46,8 @@ class AbstractWitness extends AbstractModule {
         }
         catch (ex) {
             const error = ex;
-            return this.bindResult([new ModuleErrorBuilder().sources([wrapper.hash]).message(error.message).build()], queryAccount);
+            return this.bindQueryResult(typedQuery, [new ModuleErrorBuilder().sources([wrapper.hash]).message(error.message).build()], [queryAccount]);
         }
     }
 }
-export { AbstractWitness };
 //# sourceMappingURL=AbstractWitness.js.map

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/esm/WitnessWrapper.js

@@ -2,14 +2,13 @@ import { constructableModuleWrapper, ModuleWrapper } from '@xyo-network/module';
 import { PayloadWrapper } from '@xyo-network/payload-wrapper';
 import { WitnessObserveQuerySchema } from './Queries';
 constructableModuleWrapper();
-class WitnessWrapper extends ModuleWrapper {
+export class WitnessWrapper extends ModuleWrapper {
     static requiredQueries = [WitnessObserveQuerySchema, ...super.requiredQueries];
     observe(payloads) {
         const queryPayload = PayloadWrapper.parse({ schema: WitnessObserveQuerySchema });
         return this.sendQuery(queryPayload, [queryPayload.payload, ...(payloads ?? [])]);
     }
 }
-export { WitnessWrapper };
 /** @deprecated use WitnessWrapper instead */
 export class XyoWitnessWrapper extends WitnessWrapper {
 }

package/dist/esm/WitnessWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"WitnessWrapper.js","sourceRoot":"","sources":["../../src/WitnessWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAE/E,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D,OAAO,EAAuB,yBAAyB,EAAE,MAAM,WAAW,CAAA;AAG1E,0BAA0B,EAAE,CAAA;AAC5B,MAAa,cAAe,SAAQ,aAAa;IAC/C,MAAM,CAAU,eAAe,GAAG,CAAC,yBAAyB,EAAE,GAAG,KAAK,CAAC,eAAe,CAAC,CAAA;IAEvF,OAAO,CAAC,QAAoB;QAC1B,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAAsB,EAAE,MAAM,EAAE,yBAAyB,EAAE,CAAC,CAAA;QACrG,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;IAClF,CAAC;;SANU,cAAc;AAS3B,6CAA6C;AAC7C,MAAM,OAAO,iBAAkB,SAAQ,cAAc;CAAG"}
+{"version":3,"file":"WitnessWrapper.js","sourceRoot":"","sources":["../../src/WitnessWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAE/E,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D,OAAO,EAAuB,yBAAyB,EAAE,MAAM,WAAW,CAAA;AAG1E,0BAA0B,EAAE,CAAA;AAC5B,MAAM,OAAO,cAAe,SAAQ,aAAa;IAC/C,MAAM,CAAU,eAAe,GAAG,CAAC,yBAAyB,EAAE,GAAG,KAAK,CAAC,eAAe,CAAC,CAAA;IAEvF,OAAO,CAAC,QAAoB;QAC1B,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAAsB,EAAE,MAAM,EAAE,yBAAyB,EAAE,CAAC,CAAA;QACrG,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;IAClF,CAAC;;AAGH,6CAA6C;AAC7C,MAAM,OAAO,iBAAkB,SAAQ,cAAc;CAAG"}

package/dist/types/AbstractWitness.d.ts

@@ -1,6 +1,7 @@
 import { AbstractModule, ModuleConfig, ModuleQueryResult, QueryBoundWitness } from '@xyo-network/module';
 import { Payload } from '@xyo-network/payload-model';
 import { Promisable } from '@xyo-network/promise';
+import { WitnessQueryBase } from './Queries';
 import { WitnessModule, WitnessModuleEventData, WitnessParams } from './Witness';
 export declare class AbstractWitness<TParams extends WitnessParams = WitnessParams, TEventData extends WitnessModuleEventData = WitnessModuleEventData> extends AbstractModule<TParams, TEventData> implements WitnessModule<TParams, TEventData> {
     static configSchema: string;
@@ -8,6 +9,7 @@ export declare class AbstractWitness<TParams extends WitnessParams = WitnessPara
     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;
+    protected get _queryAccountPaths(): Record<WitnessQueryBase['schema'], string>;
     observe(payloads?: Payload[]): Promisable<Payload[]>;
     protected queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): Promise<ModuleQueryResult>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"AbstractWitness.d.ts","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAsB,iBAAiB,EAAE,iBAAiB,EAA4B,MAAM,qBAAqB,CAAA;AACtJ,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAIjD,OAAO,EAAE,aAAa,EAAE,sBAAsB,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAEhF,qBAAa,eAAe,CAAC,OAAO,SAAS,aAAa,GAAG,aAAa,EAAE,UAAU,SAAS,sBAAsB,GAAG,sBAAsB,CAC5I,SAAQ,cAAc,CAAC,OAAO,EAAE,UAAU,CAC1C,YAAW,aAAa,CAAC,OAAO,EAAE,UAAU,CAAC;IAE7C,OAAgB,YAAY,EAAE,MAAM,CAAsB;IAE1D,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,IAAI,SAAS;;mBAEZ;IAED,OAAO,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;cAS3B,YAAY,CAAC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB,EAAE,OAAO,SAAS,YAAY,GAAG,YAAY,EAChI,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,OAAO,EAAE,EACpB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,iBAAiB,CAAC;CAwB9B"}
+{"version":3,"file":"AbstractWitness.d.ts","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAsB,iBAAiB,EAAE,iBAAiB,EAA4B,MAAM,qBAAqB,CAAA;AACtJ,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAGjD,OAAO,EAA2C,gBAAgB,EAAE,MAAM,WAAW,CAAA;AACrF,OAAO,EAAE,aAAa,EAAE,sBAAsB,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAEhF,qBAAa,eAAe,CAAC,OAAO,SAAS,aAAa,GAAG,aAAa,EAAE,UAAU,SAAS,sBAAsB,GAAG,sBAAsB,CAC5I,SAAQ,cAAc,CAAC,OAAO,EAAE,UAAU,CAC1C,YAAW,aAAa,CAAC,OAAO,EAAE,UAAU,CAAC;IAE7C,OAAgB,YAAY,EAAE,MAAM,CAAsB;IAE1D,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,IAAI,SAAS;;mBAEZ;IAED,cAAuB,kBAAkB,IAAI,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAItF;IAED,OAAO,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;cAQ3B,YAAY,CAAC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB,EAAE,OAAO,SAAS,YAAY,GAAG,YAAY,EAChI,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,OAAO,EAAE,EACpB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,iBAAiB,CAAC;CAwB9B"}

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

@@ -1,6 +1,7 @@
-import { ModuleQuery, Query } from '@xyo-network/module-model';
+import { ModuleQuery, ModuleQueryBase, Query } from '@xyo-network/module-model';
 import { WitnessObserveQuery } from './Observe';
 export * from './Observe';
 export type WitnessQueryBase = WitnessObserveQuery;
+export type WitnessModuleQueries = ModuleQueryBase | WitnessQueryBase;
 export type WitnessQuery<TQuery extends Query | void = void> = ModuleQuery<TQuery extends Query ? WitnessQueryBase | TQuery : WitnessQueryBase>;
 //# 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,WAAW,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAA;AAE9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAA;AAE/C,cAAc,WAAW,CAAA;AAEzB,MAAM,MAAM,gBAAgB,GAAG,mBAAmB,CAAA;AAElD,MAAM,MAAM,YAAY,CAAC,MAAM,SAAS,KAAK,GAAG,IAAI,GAAG,IAAI,IAAI,WAAW,CAAC,MAAM,SAAS,KAAK,GAAG,gBAAgB,GAAG,MAAM,GAAG,gBAAgB,CAAC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Queries/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAA;AAE/E,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAA;AAE/C,cAAc,WAAW,CAAA;AAEzB,MAAM,MAAM,gBAAgB,GAAG,mBAAmB,CAAA;AAClD,MAAM,MAAM,oBAAoB,GAAG,eAAe,GAAG,gBAAgB,CAAA;AACrE,MAAM,MAAM,YAAY,CAAC,MAAM,SAAS,KAAK,GAAG,IAAI,GAAG,IAAI,IAAI,WAAW,CAAC,MAAM,SAAS,KAAK,GAAG,gBAAgB,GAAG,MAAM,GAAG,gBAAgB,CAAC,CAAA"}

package/package.json

@@ -11,17 +11,17 @@
   },
   "dependencies": {
     "@xylabs/assert": "^2.7.6",
-    "@xyo-network/account": "^2.56.1",
-    "@xyo-network/core": "^2.56.1",
-    "@xyo-network/module": "^2.56.1",
-    "@xyo-network/module-model": "^2.56.1",
-    "@xyo-network/payload-model": "^2.56.1",
-    "@xyo-network/payload-wrapper": "^2.56.1",
-    "@xyo-network/promise": "^2.56.1"
+    "@xyo-network/account": "^2.57.4",
+    "@xyo-network/core": "^2.57.4",
+    "@xyo-network/module": "^2.57.4",
+    "@xyo-network/module-model": "^2.57.4",
+    "@xyo-network/payload-model": "^2.57.4",
+    "@xyo-network/payload-wrapper": "^2.57.4",
+    "@xyo-network/promise": "^2.57.4"
   },
   "devDependencies": {
-    "@xylabs/ts-scripts-yarn3": "^2.17.6",
-    "@xylabs/tsconfig": "^2.17.6",
+    "@xylabs/ts-scripts-yarn3": "^2.17.12",
+    "@xylabs/tsconfig": "^2.17.12",
     "typescript": "^5.0.4"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -57,5 +57,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.56.1"
+  "version": "2.57.4"
 }

package/src/AbstractWitness.ts

@@ -6,7 +6,7 @@ import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 import { Promisable } from '@xyo-network/promise'
 
 import { WitnessConfigSchema } from './Config'
-import { WitnessObserveQuerySchema, WitnessQuery } from './Queries'
+import { WitnessObserveQuerySchema, WitnessQuery, WitnessQueryBase } from './Queries'
 import { WitnessModule, WitnessModuleEventData, WitnessParams } from './Witness'
 
 export class AbstractWitness<TParams extends WitnessParams = WitnessParams, TEventData extends WitnessModuleEventData = WitnessModuleEventData>
@@ -23,12 +23,17 @@ export class AbstractWitness<TParams extends WitnessParams = WitnessParams, TEve
     return this.config?.targetSet
   }
 
+  protected override get _queryAccountPaths(): Record<WitnessQueryBase['schema'], string> {
+    return {
+      'network.xyo.query.witness.observe': '1/1',
+    }
+  }
+
   observe(payloads?: Payload[]): Promisable<Payload[]> {
     this.started('throw')
     const payloadList = assertEx(payloads, 'Trying to witness nothing')
     assertEx(payloadList.length > 0, 'Trying to witness empty list')
     payloadList?.forEach((payload) => assertEx(payload.schema, 'observe: Missing Schema'))
-    //this.logger?.debug(`result: ${JSON.stringify(payloadList, null, 2)}`)
     return payloadList
   }
 
@@ -49,7 +54,7 @@ export class AbstractWitness<TParams extends WitnessParams = WitnessParams, TEve
           await this.emit('reportStart', { inPayloads: payloads, module: this })
           const resultPayloads = await this.observe(filteredObservation)
           await this.emit('reportEnd', { inPayloads: payloads, module: this, outPayloads: resultPayloads })
-          return this.bindResult(resultPayloads, queryAccount)
+          return this.bindQueryResult(typedQuery, resultPayloads, [queryAccount])
         }
         default: {
           return super.queryHandler(query, payloads)
@@ -57,7 +62,7 @@ export class AbstractWitness<TParams extends WitnessParams = WitnessParams, TEve
       }
     } catch (ex) {
       const error = ex as Error
-      return this.bindResult([new ModuleErrorBuilder().sources([wrapper.hash]).message(error.message).build()], queryAccount)
+      return this.bindQueryResult(typedQuery, [new ModuleErrorBuilder().sources([wrapper.hash]).message(error.message).build()], [queryAccount])
     }
   }
 }

package/src/Queries/index.ts

@@ -1,9 +1,9 @@
-import { ModuleQuery, Query } from '@xyo-network/module-model'
+import { ModuleQuery, ModuleQueryBase, Query } from '@xyo-network/module-model'
 
 import { WitnessObserveQuery } from './Observe'
 
 export * from './Observe'
 
 export type WitnessQueryBase = WitnessObserveQuery
-
+export type WitnessModuleQueries = ModuleQueryBase | WitnessQueryBase
 export type WitnessQuery<TQuery extends Query | void = void> = ModuleQuery<TQuery extends Query ? WitnessQueryBase | TQuery : WitnessQueryBase>

package/typedoc.json

@@ -0,0 +1,5 @@
+{
+  "$schema": "https://typedoc.org/schema.json",
+  "entryPoints": ["src/index.ts"],
+  "tsconfig": "./tsconfig.typedoc.json"
+}