@xyo-network/abstract-witness 2.94.3 → 2.94.5

package/dist/browser/AbstractWitness.d.cts

@@ -1,8 +1,9 @@
 import { Promisable } from '@xylabs/promise';
+import { AccountInstance } from '@xyo-network/account-model';
 import { ArchivistInstance } from '@xyo-network/archivist-model';
 import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
 import { AbstractModuleInstance } from '@xyo-network/module-abstract';
-import { ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module-model';
+import { ModuleConfig, ModuleQueryHandlerResult, ModuleQueryResult } from '@xyo-network/module-model';
 import { Payload } from '@xyo-network/payload-model';
 import { CustomWitnessInstance, WitnessInstance, WitnessModuleEventData, WitnessParams, WitnessQueries } from '@xyo-network/witness-model';
 export declare abstract class AbstractWitness<TParams extends WitnessParams = WitnessParams, TIn extends Payload = Payload, TOut extends Payload = Payload, TEventData extends WitnessModuleEventData<WitnessInstance<TParams, TIn, TOut>, TIn, TOut> = WitnessModuleEventData<WitnessInstance<TParams, TIn, TOut>, TIn, TOut>> extends AbstractModuleInstance<TParams, TEventData> implements CustomWitnessInstance<TParams, TIn, TOut, TEventData> {
@@ -13,7 +14,7 @@ export declare abstract class AbstractWitness<TParams extends WitnessParams = Wi
     get queries(): string[];
     protected get _queryAccountPaths(): Record<WitnessQueries['schema'], string>;
     getArchivistInstance(): Promise<ArchivistInstance<import("@xylabs/object").BaseParamsFields & {
-        account?: import("@xyo-network/account").AccountInstance | "random" | undefined;
+        account?: AccountInstance | "random" | undefined;
         addToResolvers?: boolean | undefined;
         config: import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & Omit<import("@xyo-network/module-model").ArchivingModuleConfig & import("@xyo-network/module-model").ModuleConfigFields & import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & Omit<import("@xyo-network/module-model").ArchivingModuleConfig & import("@xyo-network/module-model").ModuleConfigFields & {
             parents?: import("@xyo-network/archivist-model").ArchivistParents | undefined;
@@ -32,6 +33,7 @@ export declare abstract class AbstractWitness<TParams extends WitnessParams = Wi
     } & import("@xyo-network/payload-model").PayloadFields> | undefined>;
     /** @function observe The main entry point for a witness.  Do not override this function.  Implement/override observeHandler for custom functionality */
     observe(inPayloads?: TIn[]): Promise<TOut[]>;
+    observeQuery(account: AccountInstance, payloads?: TIn[]): Promise<ModuleQueryResult<TOut>>;
     /** @function queryHandler Calls observe for an observe query.  Override to support additional queries. */
     protected queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): Promise<ModuleQueryHandlerResult>;
     /** @function observeHandler Implement or override to add custom functionality to a witness */

package/dist/browser/AbstractWitness.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractWitness.d.ts","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AAEnE,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAmB,YAAY,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAA;AAEnG,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EACL,qBAAqB,EAErB,eAAe,EACf,sBAAsB,EAEtB,aAAa,EACb,cAAc,EACf,MAAM,4BAA4B,CAAA;AAGnC,8BAAsB,eAAe,CACjC,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,GAAG,SAAS,OAAO,GAAG,OAAO,EAC7B,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAChH,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EACnC,GAAG,EACH,IAAI,CACL,CAEH,SAAQ,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAClD,YAAW,qBAAqB,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IAEhE,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAwB;IACxE,gBAAyB,UAAU,SAA4D;IAE/F,OAAO,CAAC,kBAAkB,CAA+B;IAEzD,IAAI,SAAS,uBAEZ;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,cAAuB,kBAAkB,IAAI,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAIpF;IAEK,oBAAoB;;;;;;;;;;;;;;;;;;IAM1B,wJAAwJ;IAClJ,OAAO,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAkBlD,0GAA0G;cACjF,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,wBAAwB,CAAC;IAoBpC,8FAA8F;IAC9F,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;CACxE"}
+{"version":3,"file":"AbstractWitness.d.ts","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AAEnE,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAmB,YAAY,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAEtH,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EACL,qBAAqB,EAErB,eAAe,EACf,sBAAsB,EAGtB,aAAa,EACb,cAAc,EACf,MAAM,4BAA4B,CAAA;AAGnC,8BAAsB,eAAe,CACjC,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,GAAG,SAAS,OAAO,GAAG,OAAO,EAC7B,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAChH,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EACnC,GAAG,EACH,IAAI,CACL,CAEH,SAAQ,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAClD,YAAW,qBAAqB,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IAEhE,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAwB;IACxE,gBAAyB,UAAU,SAA4D;IAE/F,OAAO,CAAC,kBAAkB,CAA+B;IAEzD,IAAI,SAAS,uBAEZ;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,cAAuB,kBAAkB,IAAI,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAIpF;IAEK,oBAAoB;;;;;;;;;;;;;;;;;;IAM1B,wJAAwJ;IAClJ,OAAO,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAkB5C,YAAY,CAAC,OAAO,EAAE,eAAe,EAAE,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAKhG,0GAA0G;cACjF,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,wBAAwB,CAAC;IAoBpC,8FAA8F;IAC9F,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;CACxE"}

package/dist/browser/AbstractWitness.d.mts

@@ -1,8 +1,9 @@
 import { Promisable } from '@xylabs/promise';
+import { AccountInstance } from '@xyo-network/account-model';
 import { ArchivistInstance } from '@xyo-network/archivist-model';
 import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
 import { AbstractModuleInstance } from '@xyo-network/module-abstract';
-import { ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module-model';
+import { ModuleConfig, ModuleQueryHandlerResult, ModuleQueryResult } from '@xyo-network/module-model';
 import { Payload } from '@xyo-network/payload-model';
 import { CustomWitnessInstance, WitnessInstance, WitnessModuleEventData, WitnessParams, WitnessQueries } from '@xyo-network/witness-model';
 export declare abstract class AbstractWitness<TParams extends WitnessParams = WitnessParams, TIn extends Payload = Payload, TOut extends Payload = Payload, TEventData extends WitnessModuleEventData<WitnessInstance<TParams, TIn, TOut>, TIn, TOut> = WitnessModuleEventData<WitnessInstance<TParams, TIn, TOut>, TIn, TOut>> extends AbstractModuleInstance<TParams, TEventData> implements CustomWitnessInstance<TParams, TIn, TOut, TEventData> {
@@ -13,7 +14,7 @@ export declare abstract class AbstractWitness<TParams extends WitnessParams = Wi
     get queries(): string[];
     protected get _queryAccountPaths(): Record<WitnessQueries['schema'], string>;
     getArchivistInstance(): Promise<ArchivistInstance<import("@xylabs/object").BaseParamsFields & {
-        account?: import("@xyo-network/account").AccountInstance | "random" | undefined;
+        account?: AccountInstance | "random" | undefined;
         addToResolvers?: boolean | undefined;
         config: import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & Omit<import("@xyo-network/module-model").ArchivingModuleConfig & import("@xyo-network/module-model").ModuleConfigFields & import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & Omit<import("@xyo-network/module-model").ArchivingModuleConfig & import("@xyo-network/module-model").ModuleConfigFields & {
             parents?: import("@xyo-network/archivist-model").ArchivistParents | undefined;
@@ -32,6 +33,7 @@ export declare abstract class AbstractWitness<TParams extends WitnessParams = Wi
     } & import("@xyo-network/payload-model").PayloadFields> | undefined>;
     /** @function observe The main entry point for a witness.  Do not override this function.  Implement/override observeHandler for custom functionality */
     observe(inPayloads?: TIn[]): Promise<TOut[]>;
+    observeQuery(account: AccountInstance, payloads?: TIn[]): Promise<ModuleQueryResult<TOut>>;
     /** @function queryHandler Calls observe for an observe query.  Override to support additional queries. */
     protected queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): Promise<ModuleQueryHandlerResult>;
     /** @function observeHandler Implement or override to add custom functionality to a witness */

package/dist/browser/AbstractWitness.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractWitness.d.ts","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AAEnE,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAmB,YAAY,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAA;AAEnG,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EACL,qBAAqB,EAErB,eAAe,EACf,sBAAsB,EAEtB,aAAa,EACb,cAAc,EACf,MAAM,4BAA4B,CAAA;AAGnC,8BAAsB,eAAe,CACjC,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,GAAG,SAAS,OAAO,GAAG,OAAO,EAC7B,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAChH,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EACnC,GAAG,EACH,IAAI,CACL,CAEH,SAAQ,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAClD,YAAW,qBAAqB,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IAEhE,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAwB;IACxE,gBAAyB,UAAU,SAA4D;IAE/F,OAAO,CAAC,kBAAkB,CAA+B;IAEzD,IAAI,SAAS,uBAEZ;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,cAAuB,kBAAkB,IAAI,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAIpF;IAEK,oBAAoB;;;;;;;;;;;;;;;;;;IAM1B,wJAAwJ;IAClJ,OAAO,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAkBlD,0GAA0G;cACjF,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,wBAAwB,CAAC;IAoBpC,8FAA8F;IAC9F,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;CACxE"}
+{"version":3,"file":"AbstractWitness.d.ts","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AAEnE,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAmB,YAAY,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAEtH,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EACL,qBAAqB,EAErB,eAAe,EACf,sBAAsB,EAGtB,aAAa,EACb,cAAc,EACf,MAAM,4BAA4B,CAAA;AAGnC,8BAAsB,eAAe,CACjC,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,GAAG,SAAS,OAAO,GAAG,OAAO,EAC7B,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAChH,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EACnC,GAAG,EACH,IAAI,CACL,CAEH,SAAQ,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAClD,YAAW,qBAAqB,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IAEhE,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAwB;IACxE,gBAAyB,UAAU,SAA4D;IAE/F,OAAO,CAAC,kBAAkB,CAA+B;IAEzD,IAAI,SAAS,uBAEZ;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,cAAuB,kBAAkB,IAAI,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAIpF;IAEK,oBAAoB;;;;;;;;;;;;;;;;;;IAM1B,wJAAwJ;IAClJ,OAAO,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAkB5C,YAAY,CAAC,OAAO,EAAE,eAAe,EAAE,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAKhG,0GAA0G;cACjF,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,wBAAwB,CAAC;IAoBpC,8FAA8F;IAC9F,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;CACxE"}

package/dist/browser/AbstractWitness.d.ts

@@ -1,8 +1,9 @@
 import { Promisable } from '@xylabs/promise';
+import { AccountInstance } from '@xyo-network/account-model';
 import { ArchivistInstance } from '@xyo-network/archivist-model';
 import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
 import { AbstractModuleInstance } from '@xyo-network/module-abstract';
-import { ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module-model';
+import { ModuleConfig, ModuleQueryHandlerResult, ModuleQueryResult } from '@xyo-network/module-model';
 import { Payload } from '@xyo-network/payload-model';
 import { CustomWitnessInstance, WitnessInstance, WitnessModuleEventData, WitnessParams, WitnessQueries } from '@xyo-network/witness-model';
 export declare abstract class AbstractWitness<TParams extends WitnessParams = WitnessParams, TIn extends Payload = Payload, TOut extends Payload = Payload, TEventData extends WitnessModuleEventData<WitnessInstance<TParams, TIn, TOut>, TIn, TOut> = WitnessModuleEventData<WitnessInstance<TParams, TIn, TOut>, TIn, TOut>> extends AbstractModuleInstance<TParams, TEventData> implements CustomWitnessInstance<TParams, TIn, TOut, TEventData> {
@@ -13,7 +14,7 @@ export declare abstract class AbstractWitness<TParams extends WitnessParams = Wi
     get queries(): string[];
     protected get _queryAccountPaths(): Record<WitnessQueries['schema'], string>;
     getArchivistInstance(): Promise<ArchivistInstance<import("@xylabs/object").BaseParamsFields & {
-        account?: import("@xyo-network/account").AccountInstance | "random" | undefined;
+        account?: AccountInstance | "random" | undefined;
         addToResolvers?: boolean | undefined;
         config: import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & Omit<import("@xyo-network/module-model").ArchivingModuleConfig & import("@xyo-network/module-model").ModuleConfigFields & import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & Omit<import("@xyo-network/module-model").ArchivingModuleConfig & import("@xyo-network/module-model").ModuleConfigFields & {
             parents?: import("@xyo-network/archivist-model").ArchivistParents | undefined;
@@ -32,6 +33,7 @@ export declare abstract class AbstractWitness<TParams extends WitnessParams = Wi
     } & import("@xyo-network/payload-model").PayloadFields> | undefined>;
     /** @function observe The main entry point for a witness.  Do not override this function.  Implement/override observeHandler for custom functionality */
     observe(inPayloads?: TIn[]): Promise<TOut[]>;
+    observeQuery(account: AccountInstance, payloads?: TIn[]): Promise<ModuleQueryResult<TOut>>;
     /** @function queryHandler Calls observe for an observe query.  Override to support additional queries. */
     protected queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): Promise<ModuleQueryHandlerResult>;
     /** @function observeHandler Implement or override to add custom functionality to a witness */

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

@@ -1 +1 @@
-{"version":3,"file":"AbstractWitness.d.ts","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AAEnE,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAmB,YAAY,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAA;AAEnG,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EACL,qBAAqB,EAErB,eAAe,EACf,sBAAsB,EAEtB,aAAa,EACb,cAAc,EACf,MAAM,4BAA4B,CAAA;AAGnC,8BAAsB,eAAe,CACjC,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,GAAG,SAAS,OAAO,GAAG,OAAO,EAC7B,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAChH,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EACnC,GAAG,EACH,IAAI,CACL,CAEH,SAAQ,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAClD,YAAW,qBAAqB,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IAEhE,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAwB;IACxE,gBAAyB,UAAU,SAA4D;IAE/F,OAAO,CAAC,kBAAkB,CAA+B;IAEzD,IAAI,SAAS,uBAEZ;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,cAAuB,kBAAkB,IAAI,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAIpF;IAEK,oBAAoB;;;;;;;;;;;;;;;;;;IAM1B,wJAAwJ;IAClJ,OAAO,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAkBlD,0GAA0G;cACjF,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,wBAAwB,CAAC;IAoBpC,8FAA8F;IAC9F,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;CACxE"}
+{"version":3,"file":"AbstractWitness.d.ts","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AAEnE,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAmB,YAAY,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAEtH,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EACL,qBAAqB,EAErB,eAAe,EACf,sBAAsB,EAGtB,aAAa,EACb,cAAc,EACf,MAAM,4BAA4B,CAAA;AAGnC,8BAAsB,eAAe,CACjC,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,GAAG,SAAS,OAAO,GAAG,OAAO,EAC7B,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAChH,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EACnC,GAAG,EACH,IAAI,CACL,CAEH,SAAQ,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAClD,YAAW,qBAAqB,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IAEhE,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAwB;IACxE,gBAAyB,UAAU,SAA4D;IAE/F,OAAO,CAAC,kBAAkB,CAA+B;IAEzD,IAAI,SAAS,uBAEZ;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,cAAuB,kBAAkB,IAAI,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAIpF;IAEK,oBAAoB;;;;;;;;;;;;;;;;;;IAM1B,wJAAwJ;IAClJ,OAAO,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAkB5C,YAAY,CAAC,OAAO,EAAE,eAAe,EAAE,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAKhG,0GAA0G;cACjF,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,wBAAwB,CAAC;IAoBpC,8FAA8F;IAC9F,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;CACxE"}

package/dist/browser/index.cjs

@@ -27,7 +27,7 @@ module.exports = __toCommonJS(src_exports);
 
 // src/AbstractWitness.ts
 var import_assert = require("@xylabs/assert");
-var import_account = require("@xyo-network/account");
+var import_object = require("@xylabs/object");
 var import_boundwitness_wrapper = require("@xyo-network/boundwitness-wrapper");
 var import_module_abstract = require("@xyo-network/module-abstract");
 var import_module_model = require("@xyo-network/module-model");
@@ -41,7 +41,7 @@ var AbstractWitness = class _AbstractWitness extends import_module_abstract.Abst
   static configSchemas = [
     import_witness_model.WitnessConfigSchema
   ];
-  static uniqueName = (0, import_account.globallyUnique)("AbstractWitness", _AbstractWitness, "xyo");
+  static uniqueName = (0, import_object.globallyUnique)("AbstractWitness", _AbstractWitness, "xyo");
   _archivistInstance;
   get archivist() {
     return this.config.archivist;
@@ -84,6 +84,12 @@ var AbstractWitness = class _AbstractWitness extends import_module_abstract.Abst
     });
     return outPayloads;
   }
+  async observeQuery(account, payloads) {
+    const queryPayload = {
+      schema: import_witness_model.WitnessObserveQuerySchema
+    };
+    return await this.sendQuery(queryPayload, payloads, account);
+  }
   /** @function queryHandler Calls observe for an observe query.  Override to support additional queries. */
   async queryHandler(query, payloads, queryConfig) {
     const wrapper = await import_boundwitness_wrapper.QueryBoundWitnessWrapper.parseQuery(query, payloads);

package/dist/browser/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts","../../src/AbstractWitness.ts"],"sourcesContent":["export * from './AbstractWitness'\n","import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { globallyUnique } from '@xyo-network/account'\nimport { ArchivistInstance } from '@xyo-network/archivist-model'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport { creatableModule, ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload } from '@xyo-network/payload-model'\nimport {\n  CustomWitnessInstance,\n  WitnessConfigSchema,\n  WitnessInstance,\n  WitnessModuleEventData,\n  WitnessObserveQuerySchema,\n  WitnessParams,\n  WitnessQueries,\n} from '@xyo-network/witness-model'\n\ncreatableModule()\nexport abstract class AbstractWitness<\n    TParams extends WitnessParams = WitnessParams,\n    TIn extends Payload = Payload,\n    TOut extends Payload = Payload,\n    TEventData extends WitnessModuleEventData<WitnessInstance<TParams, TIn, TOut>, TIn, TOut> = WitnessModuleEventData<\n      WitnessInstance<TParams, TIn, TOut>,\n      TIn,\n      TOut\n    >,\n  >\n  extends AbstractModuleInstance<TParams, TEventData>\n  implements CustomWitnessInstance<TParams, TIn, TOut, TEventData>\n{\n  static override readonly configSchemas: string[] = [WitnessConfigSchema]\n  static override readonly uniqueName = globallyUnique('AbstractWitness', AbstractWitness, 'xyo')\n\n  private _archivistInstance: ArchivistInstance | undefined\n\n  get archivist() {\n    return this.config.archivist\n  }\n\n  override get queries(): string[] {\n    return [WitnessObserveQuerySchema, ...super.queries]\n  }\n\n  protected override get _queryAccountPaths(): Record<WitnessQueries['schema'], string> {\n    return {\n      'network.xyo.query.witness.observe': '1/1',\n    }\n  }\n\n  async getArchivistInstance() {\n    const archivistAddress = this.archivist\n    this._archivistInstance = this._archivistInstance ?? (archivistAddress ? await this.resolve(archivistAddress) : undefined)\n    return this._archivistInstance\n  }\n\n  /** @function observe The main entry point for a witness.  Do not override this function.  Implement/override observeHandler for custom functionality */\n  async observe(inPayloads?: TIn[]): Promise<TOut[]> {\n    this._noOverride('observe')\n    await this.started('throw')\n    await this.emit('observeStart', { inPayloads, module: this } as TEventData['observeStart'])\n    const outPayloads = assertEx(await this.observeHandler(inPayloads), () => 'Trying to witness nothing')\n    //assertEx(outPayloads.length > 0, 'Trying to witness empty list')\n    for (const payload of outPayloads ?? []) assertEx(payload.schema, () => 'observe: Missing Schema')\n\n    const archivist = await this.getArchivistInstance()\n    if (archivist) {\n      await archivist.insert(outPayloads)\n    }\n\n    await this.emit('observeEnd', { inPayloads, module: this, outPayloads } as TEventData['observeEnd'])\n\n    return outPayloads\n  }\n\n  /** @function queryHandler Calls observe for an observe query.  Override to support additional queries. */\n  protected override async queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(\n    query: T,\n    payloads?: Payload[],\n    queryConfig?: TConfig,\n  ): Promise<ModuleQueryHandlerResult> {\n    const wrapper = await QueryBoundWitnessWrapper.parseQuery<WitnessQueries>(query, payloads)\n    const queryPayload = await wrapper.getQuery()\n    assertEx(await this.queryable(query, payloads, queryConfig))\n    const resultPayloads: Payload[] = []\n    // Remove the query payload from the arguments passed to us so we don't observe it\n    const filteredObservation = (await PayloadBuilder.filterExclude(payloads, query.query)) as TIn[]\n    switch (queryPayload.schema) {\n      case WitnessObserveQuerySchema: {\n        const observePayloads = await this.observe(filteredObservation)\n        resultPayloads.push(...observePayloads)\n        break\n      }\n      default: {\n        return super.queryHandler(query, payloads)\n      }\n    }\n    return resultPayloads\n  }\n\n  /** @function observeHandler Implement or override to add custom functionality to a witness */\n  protected abstract observeHandler(payloads?: TIn[]): Promisable<TOut[]>\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;ACAA,oBAAyB;AAEzB,qBAA+B;AAG/B,kCAAyC;AACzC,6BAAuC;AACvC,0BAAwE;AACxE,6BAA+B;AAE/B,2BAQO;IAEPA,qCAAAA;AACO,IAAeC,kBAAf,MAAeA,yBAUZC,8CAAAA;EA/BV,OA+BUA;;;EAGR,OAAyBC,gBAA0B;IAACC;;EACpD,OAAyBC,iBAAaC,+BAAe,mBAAmBL,kBAAiB,KAAA;EAEjFM;EAER,IAAIC,YAAY;AACd,WAAO,KAAKC,OAAOD;EACrB;EAEA,IAAaE,UAAoB;AAC/B,WAAO;MAACC;SAA8B,MAAMD;;EAC9C;EAEA,IAAuBE,qBAA+D;AACpF,WAAO;MACL,qCAAqC;IACvC;EACF;EAEA,MAAMC,uBAAuB;AAC3B,UAAMC,mBAAmB,KAAKN;AAC9B,SAAKD,qBAAqB,KAAKA,uBAAuBO,mBAAmB,MAAM,KAAKC,QAAQD,gBAAAA,IAAoBE;AAChH,WAAO,KAAKT;EACd;;EAGA,MAAMU,QAAQC,YAAqC;AACjD,SAAKC,YAAY,SAAA;AACjB,UAAM,KAAKC,QAAQ,OAAA;AACnB,UAAM,KAAKC,KAAK,gBAAgB;MAAEH;MAAYI,QAAQ;IAAK,CAAA;AAC3D,UAAMC,kBAAcC,wBAAS,MAAM,KAAKC,eAAeP,UAAAA,GAAa,MAAM,2BAAA;AAE1E,eAAWQ,WAAWH,eAAe,CAAA;AAAIC,kCAASE,QAAQC,QAAQ,MAAM,yBAAA;AAExE,UAAMnB,YAAY,MAAM,KAAKK,qBAAoB;AACjD,QAAIL,WAAW;AACb,YAAMA,UAAUoB,OAAOL,WAAAA;IACzB;AAEA,UAAM,KAAKF,KAAK,cAAc;MAAEH;MAAYI,QAAQ;MAAMC;IAAY,CAAA;AAEtE,WAAOA;EACT;;EAGA,MAAyBM,aACvBC,OACAC,UACAC,aACmC;AACnC,UAAMC,UAAU,MAAMC,qDAAyBC,WAA2BL,OAAOC,QAAAA;AACjF,UAAMK,eAAe,MAAMH,QAAQI,SAAQ;AAC3Cb,gCAAS,MAAM,KAAKc,UAAUR,OAAOC,UAAUC,WAAAA,CAAAA;AAC/C,UAAMO,iBAA4B,CAAA;AAElC,UAAMC,sBAAuB,MAAMC,sCAAeC,cAAcX,UAAUD,MAAMA,KAAK;AACrF,YAAQM,aAAaT,QAAM;MACzB,KAAKhB,gDAA2B;AAC9B,cAAMgC,kBAAkB,MAAM,KAAK1B,QAAQuB,mBAAAA;AAC3CD,uBAAeK,KAAI,GAAID,eAAAA;AACvB;MACF;MACA,SAAS;AACP,eAAO,MAAMd,aAAaC,OAAOC,QAAAA;MACnC;IACF;AACA,WAAOQ;EACT;AAIF;","names":["creatableModule","AbstractWitness","AbstractModuleInstance","configSchemas","WitnessConfigSchema","uniqueName","globallyUnique","_archivistInstance","archivist","config","queries","WitnessObserveQuerySchema","_queryAccountPaths","getArchivistInstance","archivistAddress","resolve","undefined","observe","inPayloads","_noOverride","started","emit","module","outPayloads","assertEx","observeHandler","payload","schema","insert","queryHandler","query","payloads","queryConfig","wrapper","QueryBoundWitnessWrapper","parseQuery","queryPayload","getQuery","queryable","resultPayloads","filteredObservation","PayloadBuilder","filterExclude","observePayloads","push"]}
+{"version":3,"sources":["../../src/index.ts","../../src/AbstractWitness.ts"],"sourcesContent":["export * from './AbstractWitness'\n","import { assertEx } from '@xylabs/assert'\nimport { globallyUnique } from '@xylabs/object'\nimport { Promisable } from '@xylabs/promise'\nimport { AccountInstance } from '@xyo-network/account-model'\nimport { ArchivistInstance } from '@xyo-network/archivist-model'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport { creatableModule, ModuleConfig, ModuleQueryHandlerResult, ModuleQueryResult } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload } from '@xyo-network/payload-model'\nimport {\n  CustomWitnessInstance,\n  WitnessConfigSchema,\n  WitnessInstance,\n  WitnessModuleEventData,\n  WitnessObserveQuery,\n  WitnessObserveQuerySchema,\n  WitnessParams,\n  WitnessQueries,\n} from '@xyo-network/witness-model'\n\ncreatableModule()\nexport abstract class AbstractWitness<\n    TParams extends WitnessParams = WitnessParams,\n    TIn extends Payload = Payload,\n    TOut extends Payload = Payload,\n    TEventData extends WitnessModuleEventData<WitnessInstance<TParams, TIn, TOut>, TIn, TOut> = WitnessModuleEventData<\n      WitnessInstance<TParams, TIn, TOut>,\n      TIn,\n      TOut\n    >,\n  >\n  extends AbstractModuleInstance<TParams, TEventData>\n  implements CustomWitnessInstance<TParams, TIn, TOut, TEventData>\n{\n  static override readonly configSchemas: string[] = [WitnessConfigSchema]\n  static override readonly uniqueName = globallyUnique('AbstractWitness', AbstractWitness, 'xyo')\n\n  private _archivistInstance: ArchivistInstance | undefined\n\n  get archivist() {\n    return this.config.archivist\n  }\n\n  override get queries(): string[] {\n    return [WitnessObserveQuerySchema, ...super.queries]\n  }\n\n  protected override get _queryAccountPaths(): Record<WitnessQueries['schema'], string> {\n    return {\n      'network.xyo.query.witness.observe': '1/1',\n    }\n  }\n\n  async getArchivistInstance() {\n    const archivistAddress = this.archivist\n    this._archivistInstance = this._archivistInstance ?? (archivistAddress ? await this.resolve(archivistAddress) : undefined)\n    return this._archivistInstance\n  }\n\n  /** @function observe The main entry point for a witness.  Do not override this function.  Implement/override observeHandler for custom functionality */\n  async observe(inPayloads?: TIn[]): Promise<TOut[]> {\n    this._noOverride('observe')\n    await this.started('throw')\n    await this.emit('observeStart', { inPayloads, module: this } as TEventData['observeStart'])\n    const outPayloads = assertEx(await this.observeHandler(inPayloads), () => 'Trying to witness nothing')\n    //assertEx(outPayloads.length > 0, 'Trying to witness empty list')\n    for (const payload of outPayloads ?? []) assertEx(payload.schema, () => 'observe: Missing Schema')\n\n    const archivist = await this.getArchivistInstance()\n    if (archivist) {\n      await archivist.insert(outPayloads)\n    }\n\n    await this.emit('observeEnd', { inPayloads, module: this, outPayloads } as TEventData['observeEnd'])\n\n    return outPayloads\n  }\n\n  async observeQuery(account: AccountInstance, payloads?: TIn[]): Promise<ModuleQueryResult<TOut>> {\n    const queryPayload: WitnessObserveQuery = { schema: WitnessObserveQuerySchema }\n    return (await this.sendQuery(queryPayload, payloads, account)) as ModuleQueryResult<TOut>\n  }\n\n  /** @function queryHandler Calls observe for an observe query.  Override to support additional queries. */\n  protected override async queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(\n    query: T,\n    payloads?: Payload[],\n    queryConfig?: TConfig,\n  ): Promise<ModuleQueryHandlerResult> {\n    const wrapper = await QueryBoundWitnessWrapper.parseQuery<WitnessQueries>(query, payloads)\n    const queryPayload = await wrapper.getQuery()\n    assertEx(await this.queryable(query, payloads, queryConfig))\n    const resultPayloads: Payload[] = []\n    // Remove the query payload from the arguments passed to us so we don't observe it\n    const filteredObservation = (await PayloadBuilder.filterExclude(payloads, query.query)) as TIn[]\n    switch (queryPayload.schema) {\n      case WitnessObserveQuerySchema: {\n        const observePayloads = await this.observe(filteredObservation)\n        resultPayloads.push(...observePayloads)\n        break\n      }\n      default: {\n        return super.queryHandler(query, payloads)\n      }\n    }\n    return resultPayloads\n  }\n\n  /** @function observeHandler Implement or override to add custom functionality to a witness */\n  protected abstract observeHandler(payloads?: TIn[]): Promisable<TOut[]>\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;ACAA,oBAAyB;AACzB,oBAA+B;AAK/B,kCAAyC;AACzC,6BAAuC;AACvC,0BAA2F;AAC3F,6BAA+B;AAE/B,2BASO;IAEPA,qCAAAA;AACO,IAAeC,kBAAf,MAAeA,yBAUZC,8CAAAA;EAjCV,OAiCUA;;;EAGR,OAAyBC,gBAA0B;IAACC;;EACpD,OAAyBC,iBAAaC,8BAAe,mBAAmBL,kBAAiB,KAAA;EAEjFM;EAER,IAAIC,YAAY;AACd,WAAO,KAAKC,OAAOD;EACrB;EAEA,IAAaE,UAAoB;AAC/B,WAAO;MAACC;SAA8B,MAAMD;;EAC9C;EAEA,IAAuBE,qBAA+D;AACpF,WAAO;MACL,qCAAqC;IACvC;EACF;EAEA,MAAMC,uBAAuB;AAC3B,UAAMC,mBAAmB,KAAKN;AAC9B,SAAKD,qBAAqB,KAAKA,uBAAuBO,mBAAmB,MAAM,KAAKC,QAAQD,gBAAAA,IAAoBE;AAChH,WAAO,KAAKT;EACd;;EAGA,MAAMU,QAAQC,YAAqC;AACjD,SAAKC,YAAY,SAAA;AACjB,UAAM,KAAKC,QAAQ,OAAA;AACnB,UAAM,KAAKC,KAAK,gBAAgB;MAAEH;MAAYI,QAAQ;IAAK,CAAA;AAC3D,UAAMC,kBAAcC,wBAAS,MAAM,KAAKC,eAAeP,UAAAA,GAAa,MAAM,2BAAA;AAE1E,eAAWQ,WAAWH,eAAe,CAAA;AAAIC,kCAASE,QAAQC,QAAQ,MAAM,yBAAA;AAExE,UAAMnB,YAAY,MAAM,KAAKK,qBAAoB;AACjD,QAAIL,WAAW;AACb,YAAMA,UAAUoB,OAAOL,WAAAA;IACzB;AAEA,UAAM,KAAKF,KAAK,cAAc;MAAEH;MAAYI,QAAQ;MAAMC;IAAY,CAAA;AAEtE,WAAOA;EACT;EAEA,MAAMM,aAAaC,SAA0BC,UAAoD;AAC/F,UAAMC,eAAoC;MAAEL,QAAQhB;IAA0B;AAC9E,WAAQ,MAAM,KAAKsB,UAAUD,cAAcD,UAAUD,OAAAA;EACvD;;EAGA,MAAyBI,aACvBC,OACAJ,UACAK,aACmC;AACnC,UAAMC,UAAU,MAAMC,qDAAyBC,WAA2BJ,OAAOJ,QAAAA;AACjF,UAAMC,eAAe,MAAMK,QAAQG,SAAQ;AAC3ChB,gCAAS,MAAM,KAAKiB,UAAUN,OAAOJ,UAAUK,WAAAA,CAAAA;AAC/C,UAAMM,iBAA4B,CAAA;AAElC,UAAMC,sBAAuB,MAAMC,sCAAeC,cAAcd,UAAUI,MAAMA,KAAK;AACrF,YAAQH,aAAaL,QAAM;MACzB,KAAKhB,gDAA2B;AAC9B,cAAMmC,kBAAkB,MAAM,KAAK7B,QAAQ0B,mBAAAA;AAC3CD,uBAAeK,KAAI,GAAID,eAAAA;AACvB;MACF;MACA,SAAS;AACP,eAAO,MAAMZ,aAAaC,OAAOJ,QAAAA;MACnC;IACF;AACA,WAAOW;EACT;AAIF;","names":["creatableModule","AbstractWitness","AbstractModuleInstance","configSchemas","WitnessConfigSchema","uniqueName","globallyUnique","_archivistInstance","archivist","config","queries","WitnessObserveQuerySchema","_queryAccountPaths","getArchivistInstance","archivistAddress","resolve","undefined","observe","inPayloads","_noOverride","started","emit","module","outPayloads","assertEx","observeHandler","payload","schema","insert","observeQuery","account","payloads","queryPayload","sendQuery","queryHandler","query","queryConfig","wrapper","QueryBoundWitnessWrapper","parseQuery","getQuery","queryable","resultPayloads","filteredObservation","PayloadBuilder","filterExclude","observePayloads","push"]}

package/dist/browser/index.js

@@ -3,7 +3,7 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
 
 // src/AbstractWitness.ts
 import { assertEx } from "@xylabs/assert";
-import { globallyUnique } from "@xyo-network/account";
+import { globallyUnique } from "@xylabs/object";
 import { QueryBoundWitnessWrapper } from "@xyo-network/boundwitness-wrapper";
 import { AbstractModuleInstance } from "@xyo-network/module-abstract";
 import { creatableModule } from "@xyo-network/module-model";
@@ -60,6 +60,12 @@ var AbstractWitness = class _AbstractWitness extends AbstractModuleInstance {
     });
     return outPayloads;
   }
+  async observeQuery(account, payloads) {
+    const queryPayload = {
+      schema: WitnessObserveQuerySchema
+    };
+    return await this.sendQuery(queryPayload, payloads, account);
+  }
   /** @function queryHandler Calls observe for an observe query.  Override to support additional queries. */
   async queryHandler(query, payloads, queryConfig) {
     const wrapper = await QueryBoundWitnessWrapper.parseQuery(query, payloads);

package/dist/browser/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/AbstractWitness.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { globallyUnique } from '@xyo-network/account'\nimport { ArchivistInstance } from '@xyo-network/archivist-model'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport { creatableModule, ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload } from '@xyo-network/payload-model'\nimport {\n  CustomWitnessInstance,\n  WitnessConfigSchema,\n  WitnessInstance,\n  WitnessModuleEventData,\n  WitnessObserveQuerySchema,\n  WitnessParams,\n  WitnessQueries,\n} from '@xyo-network/witness-model'\n\ncreatableModule()\nexport abstract class AbstractWitness<\n    TParams extends WitnessParams = WitnessParams,\n    TIn extends Payload = Payload,\n    TOut extends Payload = Payload,\n    TEventData extends WitnessModuleEventData<WitnessInstance<TParams, TIn, TOut>, TIn, TOut> = WitnessModuleEventData<\n      WitnessInstance<TParams, TIn, TOut>,\n      TIn,\n      TOut\n    >,\n  >\n  extends AbstractModuleInstance<TParams, TEventData>\n  implements CustomWitnessInstance<TParams, TIn, TOut, TEventData>\n{\n  static override readonly configSchemas: string[] = [WitnessConfigSchema]\n  static override readonly uniqueName = globallyUnique('AbstractWitness', AbstractWitness, 'xyo')\n\n  private _archivistInstance: ArchivistInstance | undefined\n\n  get archivist() {\n    return this.config.archivist\n  }\n\n  override get queries(): string[] {\n    return [WitnessObserveQuerySchema, ...super.queries]\n  }\n\n  protected override get _queryAccountPaths(): Record<WitnessQueries['schema'], string> {\n    return {\n      'network.xyo.query.witness.observe': '1/1',\n    }\n  }\n\n  async getArchivistInstance() {\n    const archivistAddress = this.archivist\n    this._archivistInstance = this._archivistInstance ?? (archivistAddress ? await this.resolve(archivistAddress) : undefined)\n    return this._archivistInstance\n  }\n\n  /** @function observe The main entry point for a witness.  Do not override this function.  Implement/override observeHandler for custom functionality */\n  async observe(inPayloads?: TIn[]): Promise<TOut[]> {\n    this._noOverride('observe')\n    await this.started('throw')\n    await this.emit('observeStart', { inPayloads, module: this } as TEventData['observeStart'])\n    const outPayloads = assertEx(await this.observeHandler(inPayloads), () => 'Trying to witness nothing')\n    //assertEx(outPayloads.length > 0, 'Trying to witness empty list')\n    for (const payload of outPayloads ?? []) assertEx(payload.schema, () => 'observe: Missing Schema')\n\n    const archivist = await this.getArchivistInstance()\n    if (archivist) {\n      await archivist.insert(outPayloads)\n    }\n\n    await this.emit('observeEnd', { inPayloads, module: this, outPayloads } as TEventData['observeEnd'])\n\n    return outPayloads\n  }\n\n  /** @function queryHandler Calls observe for an observe query.  Override to support additional queries. */\n  protected override async queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(\n    query: T,\n    payloads?: Payload[],\n    queryConfig?: TConfig,\n  ): Promise<ModuleQueryHandlerResult> {\n    const wrapper = await QueryBoundWitnessWrapper.parseQuery<WitnessQueries>(query, payloads)\n    const queryPayload = await wrapper.getQuery()\n    assertEx(await this.queryable(query, payloads, queryConfig))\n    const resultPayloads: Payload[] = []\n    // Remove the query payload from the arguments passed to us so we don't observe it\n    const filteredObservation = (await PayloadBuilder.filterExclude(payloads, query.query)) as TIn[]\n    switch (queryPayload.schema) {\n      case WitnessObserveQuerySchema: {\n        const observePayloads = await this.observe(filteredObservation)\n        resultPayloads.push(...observePayloads)\n        break\n      }\n      default: {\n        return super.queryHandler(query, payloads)\n      }\n    }\n    return resultPayloads\n  }\n\n  /** @function observeHandler Implement or override to add custom functionality to a witness */\n  protected abstract observeHandler(payloads?: TIn[]): Promisable<TOut[]>\n}\n"],"mappings":";;;;AAAA,SAASA,gBAAgB;AAEzB,SAASC,sBAAsB;AAG/B,SAASC,gCAAgC;AACzC,SAASC,8BAA8B;AACvC,SAASC,uBAA+D;AACxE,SAASC,sBAAsB;AAE/B,SAEEC,qBAGAC,iCAGK;AAEPC,gBAAAA;AACO,IAAeC,kBAAf,MAAeA,yBAUZC,uBAAAA;EA/BV,OA+BUA;;;EAGR,OAAyBC,gBAA0B;IAACC;;EACpD,OAAyBC,aAAaC,eAAe,mBAAmBL,kBAAiB,KAAA;EAEjFM;EAER,IAAIC,YAAY;AACd,WAAO,KAAKC,OAAOD;EACrB;EAEA,IAAaE,UAAoB;AAC/B,WAAO;MAACC;SAA8B,MAAMD;;EAC9C;EAEA,IAAuBE,qBAA+D;AACpF,WAAO;MACL,qCAAqC;IACvC;EACF;EAEA,MAAMC,uBAAuB;AAC3B,UAAMC,mBAAmB,KAAKN;AAC9B,SAAKD,qBAAqB,KAAKA,uBAAuBO,mBAAmB,MAAM,KAAKC,QAAQD,gBAAAA,IAAoBE;AAChH,WAAO,KAAKT;EACd;;EAGA,MAAMU,QAAQC,YAAqC;AACjD,SAAKC,YAAY,SAAA;AACjB,UAAM,KAAKC,QAAQ,OAAA;AACnB,UAAM,KAAKC,KAAK,gBAAgB;MAAEH;MAAYI,QAAQ;IAAK,CAAA;AAC3D,UAAMC,cAAcC,SAAS,MAAM,KAAKC,eAAeP,UAAAA,GAAa,MAAM,2BAAA;AAE1E,eAAWQ,WAAWH,eAAe,CAAA;AAAIC,eAASE,QAAQC,QAAQ,MAAM,yBAAA;AAExE,UAAMnB,YAAY,MAAM,KAAKK,qBAAoB;AACjD,QAAIL,WAAW;AACb,YAAMA,UAAUoB,OAAOL,WAAAA;IACzB;AAEA,UAAM,KAAKF,KAAK,cAAc;MAAEH;MAAYI,QAAQ;MAAMC;IAAY,CAAA;AAEtE,WAAOA;EACT;;EAGA,MAAyBM,aACvBC,OACAC,UACAC,aACmC;AACnC,UAAMC,UAAU,MAAMC,yBAAyBC,WAA2BL,OAAOC,QAAAA;AACjF,UAAMK,eAAe,MAAMH,QAAQI,SAAQ;AAC3Cb,aAAS,MAAM,KAAKc,UAAUR,OAAOC,UAAUC,WAAAA,CAAAA;AAC/C,UAAMO,iBAA4B,CAAA;AAElC,UAAMC,sBAAuB,MAAMC,eAAeC,cAAcX,UAAUD,MAAMA,KAAK;AACrF,YAAQM,aAAaT,QAAM;MACzB,KAAKhB,2BAA2B;AAC9B,cAAMgC,kBAAkB,MAAM,KAAK1B,QAAQuB,mBAAAA;AAC3CD,uBAAeK,KAAI,GAAID,eAAAA;AACvB;MACF;MACA,SAAS;AACP,eAAO,MAAMd,aAAaC,OAAOC,QAAAA;MACnC;IACF;AACA,WAAOQ;EACT;AAIF;","names":["assertEx","globallyUnique","QueryBoundWitnessWrapper","AbstractModuleInstance","creatableModule","PayloadBuilder","WitnessConfigSchema","WitnessObserveQuerySchema","creatableModule","AbstractWitness","AbstractModuleInstance","configSchemas","WitnessConfigSchema","uniqueName","globallyUnique","_archivistInstance","archivist","config","queries","WitnessObserveQuerySchema","_queryAccountPaths","getArchivistInstance","archivistAddress","resolve","undefined","observe","inPayloads","_noOverride","started","emit","module","outPayloads","assertEx","observeHandler","payload","schema","insert","queryHandler","query","payloads","queryConfig","wrapper","QueryBoundWitnessWrapper","parseQuery","queryPayload","getQuery","queryable","resultPayloads","filteredObservation","PayloadBuilder","filterExclude","observePayloads","push"]}
+{"version":3,"sources":["../../src/AbstractWitness.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { globallyUnique } from '@xylabs/object'\nimport { Promisable } from '@xylabs/promise'\nimport { AccountInstance } from '@xyo-network/account-model'\nimport { ArchivistInstance } from '@xyo-network/archivist-model'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport { creatableModule, ModuleConfig, ModuleQueryHandlerResult, ModuleQueryResult } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload } from '@xyo-network/payload-model'\nimport {\n  CustomWitnessInstance,\n  WitnessConfigSchema,\n  WitnessInstance,\n  WitnessModuleEventData,\n  WitnessObserveQuery,\n  WitnessObserveQuerySchema,\n  WitnessParams,\n  WitnessQueries,\n} from '@xyo-network/witness-model'\n\ncreatableModule()\nexport abstract class AbstractWitness<\n    TParams extends WitnessParams = WitnessParams,\n    TIn extends Payload = Payload,\n    TOut extends Payload = Payload,\n    TEventData extends WitnessModuleEventData<WitnessInstance<TParams, TIn, TOut>, TIn, TOut> = WitnessModuleEventData<\n      WitnessInstance<TParams, TIn, TOut>,\n      TIn,\n      TOut\n    >,\n  >\n  extends AbstractModuleInstance<TParams, TEventData>\n  implements CustomWitnessInstance<TParams, TIn, TOut, TEventData>\n{\n  static override readonly configSchemas: string[] = [WitnessConfigSchema]\n  static override readonly uniqueName = globallyUnique('AbstractWitness', AbstractWitness, 'xyo')\n\n  private _archivistInstance: ArchivistInstance | undefined\n\n  get archivist() {\n    return this.config.archivist\n  }\n\n  override get queries(): string[] {\n    return [WitnessObserveQuerySchema, ...super.queries]\n  }\n\n  protected override get _queryAccountPaths(): Record<WitnessQueries['schema'], string> {\n    return {\n      'network.xyo.query.witness.observe': '1/1',\n    }\n  }\n\n  async getArchivistInstance() {\n    const archivistAddress = this.archivist\n    this._archivistInstance = this._archivistInstance ?? (archivistAddress ? await this.resolve(archivistAddress) : undefined)\n    return this._archivistInstance\n  }\n\n  /** @function observe The main entry point for a witness.  Do not override this function.  Implement/override observeHandler for custom functionality */\n  async observe(inPayloads?: TIn[]): Promise<TOut[]> {\n    this._noOverride('observe')\n    await this.started('throw')\n    await this.emit('observeStart', { inPayloads, module: this } as TEventData['observeStart'])\n    const outPayloads = assertEx(await this.observeHandler(inPayloads), () => 'Trying to witness nothing')\n    //assertEx(outPayloads.length > 0, 'Trying to witness empty list')\n    for (const payload of outPayloads ?? []) assertEx(payload.schema, () => 'observe: Missing Schema')\n\n    const archivist = await this.getArchivistInstance()\n    if (archivist) {\n      await archivist.insert(outPayloads)\n    }\n\n    await this.emit('observeEnd', { inPayloads, module: this, outPayloads } as TEventData['observeEnd'])\n\n    return outPayloads\n  }\n\n  async observeQuery(account: AccountInstance, payloads?: TIn[]): Promise<ModuleQueryResult<TOut>> {\n    const queryPayload: WitnessObserveQuery = { schema: WitnessObserveQuerySchema }\n    return (await this.sendQuery(queryPayload, payloads, account)) as ModuleQueryResult<TOut>\n  }\n\n  /** @function queryHandler Calls observe for an observe query.  Override to support additional queries. */\n  protected override async queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(\n    query: T,\n    payloads?: Payload[],\n    queryConfig?: TConfig,\n  ): Promise<ModuleQueryHandlerResult> {\n    const wrapper = await QueryBoundWitnessWrapper.parseQuery<WitnessQueries>(query, payloads)\n    const queryPayload = await wrapper.getQuery()\n    assertEx(await this.queryable(query, payloads, queryConfig))\n    const resultPayloads: Payload[] = []\n    // Remove the query payload from the arguments passed to us so we don't observe it\n    const filteredObservation = (await PayloadBuilder.filterExclude(payloads, query.query)) as TIn[]\n    switch (queryPayload.schema) {\n      case WitnessObserveQuerySchema: {\n        const observePayloads = await this.observe(filteredObservation)\n        resultPayloads.push(...observePayloads)\n        break\n      }\n      default: {\n        return super.queryHandler(query, payloads)\n      }\n    }\n    return resultPayloads\n  }\n\n  /** @function observeHandler Implement or override to add custom functionality to a witness */\n  protected abstract observeHandler(payloads?: TIn[]): Promisable<TOut[]>\n}\n"],"mappings":";;;;AAAA,SAASA,gBAAgB;AACzB,SAASC,sBAAsB;AAK/B,SAASC,gCAAgC;AACzC,SAASC,8BAA8B;AACvC,SAASC,uBAAkF;AAC3F,SAASC,sBAAsB;AAE/B,SAEEC,qBAIAC,iCAGK;AAEPC,gBAAAA;AACO,IAAeC,kBAAf,MAAeA,yBAUZC,uBAAAA;EAjCV,OAiCUA;;;EAGR,OAAyBC,gBAA0B;IAACC;;EACpD,OAAyBC,aAAaC,eAAe,mBAAmBL,kBAAiB,KAAA;EAEjFM;EAER,IAAIC,YAAY;AACd,WAAO,KAAKC,OAAOD;EACrB;EAEA,IAAaE,UAAoB;AAC/B,WAAO;MAACC;SAA8B,MAAMD;;EAC9C;EAEA,IAAuBE,qBAA+D;AACpF,WAAO;MACL,qCAAqC;IACvC;EACF;EAEA,MAAMC,uBAAuB;AAC3B,UAAMC,mBAAmB,KAAKN;AAC9B,SAAKD,qBAAqB,KAAKA,uBAAuBO,mBAAmB,MAAM,KAAKC,QAAQD,gBAAAA,IAAoBE;AAChH,WAAO,KAAKT;EACd;;EAGA,MAAMU,QAAQC,YAAqC;AACjD,SAAKC,YAAY,SAAA;AACjB,UAAM,KAAKC,QAAQ,OAAA;AACnB,UAAM,KAAKC,KAAK,gBAAgB;MAAEH;MAAYI,QAAQ;IAAK,CAAA;AAC3D,UAAMC,cAAcC,SAAS,MAAM,KAAKC,eAAeP,UAAAA,GAAa,MAAM,2BAAA;AAE1E,eAAWQ,WAAWH,eAAe,CAAA;AAAIC,eAASE,QAAQC,QAAQ,MAAM,yBAAA;AAExE,UAAMnB,YAAY,MAAM,KAAKK,qBAAoB;AACjD,QAAIL,WAAW;AACb,YAAMA,UAAUoB,OAAOL,WAAAA;IACzB;AAEA,UAAM,KAAKF,KAAK,cAAc;MAAEH;MAAYI,QAAQ;MAAMC;IAAY,CAAA;AAEtE,WAAOA;EACT;EAEA,MAAMM,aAAaC,SAA0BC,UAAoD;AAC/F,UAAMC,eAAoC;MAAEL,QAAQhB;IAA0B;AAC9E,WAAQ,MAAM,KAAKsB,UAAUD,cAAcD,UAAUD,OAAAA;EACvD;;EAGA,MAAyBI,aACvBC,OACAJ,UACAK,aACmC;AACnC,UAAMC,UAAU,MAAMC,yBAAyBC,WAA2BJ,OAAOJ,QAAAA;AACjF,UAAMC,eAAe,MAAMK,QAAQG,SAAQ;AAC3ChB,aAAS,MAAM,KAAKiB,UAAUN,OAAOJ,UAAUK,WAAAA,CAAAA;AAC/C,UAAMM,iBAA4B,CAAA;AAElC,UAAMC,sBAAuB,MAAMC,eAAeC,cAAcd,UAAUI,MAAMA,KAAK;AACrF,YAAQH,aAAaL,QAAM;MACzB,KAAKhB,2BAA2B;AAC9B,cAAMmC,kBAAkB,MAAM,KAAK7B,QAAQ0B,mBAAAA;AAC3CD,uBAAeK,KAAI,GAAID,eAAAA;AACvB;MACF;MACA,SAAS;AACP,eAAO,MAAMZ,aAAaC,OAAOJ,QAAAA;MACnC;IACF;AACA,WAAOW;EACT;AAIF;","names":["assertEx","globallyUnique","QueryBoundWitnessWrapper","AbstractModuleInstance","creatableModule","PayloadBuilder","WitnessConfigSchema","WitnessObserveQuerySchema","creatableModule","AbstractWitness","AbstractModuleInstance","configSchemas","WitnessConfigSchema","uniqueName","globallyUnique","_archivistInstance","archivist","config","queries","WitnessObserveQuerySchema","_queryAccountPaths","getArchivistInstance","archivistAddress","resolve","undefined","observe","inPayloads","_noOverride","started","emit","module","outPayloads","assertEx","observeHandler","payload","schema","insert","observeQuery","account","payloads","queryPayload","sendQuery","queryHandler","query","queryConfig","wrapper","QueryBoundWitnessWrapper","parseQuery","getQuery","queryable","resultPayloads","filteredObservation","PayloadBuilder","filterExclude","observePayloads","push"]}

package/dist/node/AbstractWitness.d.cts

@@ -1,8 +1,9 @@
 import { Promisable } from '@xylabs/promise';
+import { AccountInstance } from '@xyo-network/account-model';
 import { ArchivistInstance } from '@xyo-network/archivist-model';
 import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
 import { AbstractModuleInstance } from '@xyo-network/module-abstract';
-import { ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module-model';
+import { ModuleConfig, ModuleQueryHandlerResult, ModuleQueryResult } from '@xyo-network/module-model';
 import { Payload } from '@xyo-network/payload-model';
 import { CustomWitnessInstance, WitnessInstance, WitnessModuleEventData, WitnessParams, WitnessQueries } from '@xyo-network/witness-model';
 export declare abstract class AbstractWitness<TParams extends WitnessParams = WitnessParams, TIn extends Payload = Payload, TOut extends Payload = Payload, TEventData extends WitnessModuleEventData<WitnessInstance<TParams, TIn, TOut>, TIn, TOut> = WitnessModuleEventData<WitnessInstance<TParams, TIn, TOut>, TIn, TOut>> extends AbstractModuleInstance<TParams, TEventData> implements CustomWitnessInstance<TParams, TIn, TOut, TEventData> {
@@ -13,7 +14,7 @@ export declare abstract class AbstractWitness<TParams extends WitnessParams = Wi
     get queries(): string[];
     protected get _queryAccountPaths(): Record<WitnessQueries['schema'], string>;
     getArchivistInstance(): Promise<ArchivistInstance<import("@xylabs/object").BaseParamsFields & {
-        account?: import("@xyo-network/account").AccountInstance | "random" | undefined;
+        account?: AccountInstance | "random" | undefined;
         addToResolvers?: boolean | undefined;
         config: import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & Omit<import("@xyo-network/module-model").ArchivingModuleConfig & import("@xyo-network/module-model").ModuleConfigFields & import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & Omit<import("@xyo-network/module-model").ArchivingModuleConfig & import("@xyo-network/module-model").ModuleConfigFields & {
             parents?: import("@xyo-network/archivist-model").ArchivistParents | undefined;
@@ -32,6 +33,7 @@ export declare abstract class AbstractWitness<TParams extends WitnessParams = Wi
     } & import("@xyo-network/payload-model").PayloadFields> | undefined>;
     /** @function observe The main entry point for a witness.  Do not override this function.  Implement/override observeHandler for custom functionality */
     observe(inPayloads?: TIn[]): Promise<TOut[]>;
+    observeQuery(account: AccountInstance, payloads?: TIn[]): Promise<ModuleQueryResult<TOut>>;
     /** @function queryHandler Calls observe for an observe query.  Override to support additional queries. */
     protected queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): Promise<ModuleQueryHandlerResult>;
     /** @function observeHandler Implement or override to add custom functionality to a witness */

package/dist/node/AbstractWitness.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractWitness.d.ts","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AAEnE,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAmB,YAAY,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAA;AAEnG,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EACL,qBAAqB,EAErB,eAAe,EACf,sBAAsB,EAEtB,aAAa,EACb,cAAc,EACf,MAAM,4BAA4B,CAAA;AAGnC,8BAAsB,eAAe,CACjC,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,GAAG,SAAS,OAAO,GAAG,OAAO,EAC7B,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAChH,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EACnC,GAAG,EACH,IAAI,CACL,CAEH,SAAQ,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAClD,YAAW,qBAAqB,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IAEhE,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAwB;IACxE,gBAAyB,UAAU,SAA4D;IAE/F,OAAO,CAAC,kBAAkB,CAA+B;IAEzD,IAAI,SAAS,uBAEZ;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,cAAuB,kBAAkB,IAAI,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAIpF;IAEK,oBAAoB;;;;;;;;;;;;;;;;;;IAM1B,wJAAwJ;IAClJ,OAAO,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAkBlD,0GAA0G;cACjF,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,wBAAwB,CAAC;IAoBpC,8FAA8F;IAC9F,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;CACxE"}
+{"version":3,"file":"AbstractWitness.d.ts","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AAEnE,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAmB,YAAY,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAEtH,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EACL,qBAAqB,EAErB,eAAe,EACf,sBAAsB,EAGtB,aAAa,EACb,cAAc,EACf,MAAM,4BAA4B,CAAA;AAGnC,8BAAsB,eAAe,CACjC,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,GAAG,SAAS,OAAO,GAAG,OAAO,EAC7B,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAChH,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EACnC,GAAG,EACH,IAAI,CACL,CAEH,SAAQ,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAClD,YAAW,qBAAqB,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IAEhE,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAwB;IACxE,gBAAyB,UAAU,SAA4D;IAE/F,OAAO,CAAC,kBAAkB,CAA+B;IAEzD,IAAI,SAAS,uBAEZ;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,cAAuB,kBAAkB,IAAI,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAIpF;IAEK,oBAAoB;;;;;;;;;;;;;;;;;;IAM1B,wJAAwJ;IAClJ,OAAO,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAkB5C,YAAY,CAAC,OAAO,EAAE,eAAe,EAAE,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAKhG,0GAA0G;cACjF,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,wBAAwB,CAAC;IAoBpC,8FAA8F;IAC9F,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;CACxE"}

package/dist/node/AbstractWitness.d.mts

@@ -1,8 +1,9 @@
 import { Promisable } from '@xylabs/promise';
+import { AccountInstance } from '@xyo-network/account-model';
 import { ArchivistInstance } from '@xyo-network/archivist-model';
 import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
 import { AbstractModuleInstance } from '@xyo-network/module-abstract';
-import { ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module-model';
+import { ModuleConfig, ModuleQueryHandlerResult, ModuleQueryResult } from '@xyo-network/module-model';
 import { Payload } from '@xyo-network/payload-model';
 import { CustomWitnessInstance, WitnessInstance, WitnessModuleEventData, WitnessParams, WitnessQueries } from '@xyo-network/witness-model';
 export declare abstract class AbstractWitness<TParams extends WitnessParams = WitnessParams, TIn extends Payload = Payload, TOut extends Payload = Payload, TEventData extends WitnessModuleEventData<WitnessInstance<TParams, TIn, TOut>, TIn, TOut> = WitnessModuleEventData<WitnessInstance<TParams, TIn, TOut>, TIn, TOut>> extends AbstractModuleInstance<TParams, TEventData> implements CustomWitnessInstance<TParams, TIn, TOut, TEventData> {
@@ -13,7 +14,7 @@ export declare abstract class AbstractWitness<TParams extends WitnessParams = Wi
     get queries(): string[];
     protected get _queryAccountPaths(): Record<WitnessQueries['schema'], string>;
     getArchivistInstance(): Promise<ArchivistInstance<import("@xylabs/object").BaseParamsFields & {
-        account?: import("@xyo-network/account").AccountInstance | "random" | undefined;
+        account?: AccountInstance | "random" | undefined;
         addToResolvers?: boolean | undefined;
         config: import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & Omit<import("@xyo-network/module-model").ArchivingModuleConfig & import("@xyo-network/module-model").ModuleConfigFields & import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & Omit<import("@xyo-network/module-model").ArchivingModuleConfig & import("@xyo-network/module-model").ModuleConfigFields & {
             parents?: import("@xyo-network/archivist-model").ArchivistParents | undefined;
@@ -32,6 +33,7 @@ export declare abstract class AbstractWitness<TParams extends WitnessParams = Wi
     } & import("@xyo-network/payload-model").PayloadFields> | undefined>;
     /** @function observe The main entry point for a witness.  Do not override this function.  Implement/override observeHandler for custom functionality */
     observe(inPayloads?: TIn[]): Promise<TOut[]>;
+    observeQuery(account: AccountInstance, payloads?: TIn[]): Promise<ModuleQueryResult<TOut>>;
     /** @function queryHandler Calls observe for an observe query.  Override to support additional queries. */
     protected queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): Promise<ModuleQueryHandlerResult>;
     /** @function observeHandler Implement or override to add custom functionality to a witness */

package/dist/node/AbstractWitness.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractWitness.d.ts","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AAEnE,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAmB,YAAY,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAA;AAEnG,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EACL,qBAAqB,EAErB,eAAe,EACf,sBAAsB,EAEtB,aAAa,EACb,cAAc,EACf,MAAM,4BAA4B,CAAA;AAGnC,8BAAsB,eAAe,CACjC,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,GAAG,SAAS,OAAO,GAAG,OAAO,EAC7B,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAChH,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EACnC,GAAG,EACH,IAAI,CACL,CAEH,SAAQ,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAClD,YAAW,qBAAqB,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IAEhE,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAwB;IACxE,gBAAyB,UAAU,SAA4D;IAE/F,OAAO,CAAC,kBAAkB,CAA+B;IAEzD,IAAI,SAAS,uBAEZ;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,cAAuB,kBAAkB,IAAI,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAIpF;IAEK,oBAAoB;;;;;;;;;;;;;;;;;;IAM1B,wJAAwJ;IAClJ,OAAO,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAkBlD,0GAA0G;cACjF,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,wBAAwB,CAAC;IAoBpC,8FAA8F;IAC9F,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;CACxE"}
+{"version":3,"file":"AbstractWitness.d.ts","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AAEnE,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAmB,YAAY,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAEtH,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EACL,qBAAqB,EAErB,eAAe,EACf,sBAAsB,EAGtB,aAAa,EACb,cAAc,EACf,MAAM,4BAA4B,CAAA;AAGnC,8BAAsB,eAAe,CACjC,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,GAAG,SAAS,OAAO,GAAG,OAAO,EAC7B,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAChH,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EACnC,GAAG,EACH,IAAI,CACL,CAEH,SAAQ,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAClD,YAAW,qBAAqB,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IAEhE,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAwB;IACxE,gBAAyB,UAAU,SAA4D;IAE/F,OAAO,CAAC,kBAAkB,CAA+B;IAEzD,IAAI,SAAS,uBAEZ;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,cAAuB,kBAAkB,IAAI,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAIpF;IAEK,oBAAoB;;;;;;;;;;;;;;;;;;IAM1B,wJAAwJ;IAClJ,OAAO,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAkB5C,YAAY,CAAC,OAAO,EAAE,eAAe,EAAE,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAKhG,0GAA0G;cACjF,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,wBAAwB,CAAC;IAoBpC,8FAA8F;IAC9F,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;CACxE"}

package/dist/node/AbstractWitness.d.ts

@@ -1,8 +1,9 @@
 import { Promisable } from '@xylabs/promise';
+import { AccountInstance } from '@xyo-network/account-model';
 import { ArchivistInstance } from '@xyo-network/archivist-model';
 import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
 import { AbstractModuleInstance } from '@xyo-network/module-abstract';
-import { ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module-model';
+import { ModuleConfig, ModuleQueryHandlerResult, ModuleQueryResult } from '@xyo-network/module-model';
 import { Payload } from '@xyo-network/payload-model';
 import { CustomWitnessInstance, WitnessInstance, WitnessModuleEventData, WitnessParams, WitnessQueries } from '@xyo-network/witness-model';
 export declare abstract class AbstractWitness<TParams extends WitnessParams = WitnessParams, TIn extends Payload = Payload, TOut extends Payload = Payload, TEventData extends WitnessModuleEventData<WitnessInstance<TParams, TIn, TOut>, TIn, TOut> = WitnessModuleEventData<WitnessInstance<TParams, TIn, TOut>, TIn, TOut>> extends AbstractModuleInstance<TParams, TEventData> implements CustomWitnessInstance<TParams, TIn, TOut, TEventData> {
@@ -13,7 +14,7 @@ export declare abstract class AbstractWitness<TParams extends WitnessParams = Wi
     get queries(): string[];
     protected get _queryAccountPaths(): Record<WitnessQueries['schema'], string>;
     getArchivistInstance(): Promise<ArchivistInstance<import("@xylabs/object").BaseParamsFields & {
-        account?: import("@xyo-network/account").AccountInstance | "random" | undefined;
+        account?: AccountInstance | "random" | undefined;
         addToResolvers?: boolean | undefined;
         config: import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & Omit<import("@xyo-network/module-model").ArchivingModuleConfig & import("@xyo-network/module-model").ModuleConfigFields & import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & Omit<import("@xyo-network/module-model").ArchivingModuleConfig & import("@xyo-network/module-model").ModuleConfigFields & {
             parents?: import("@xyo-network/archivist-model").ArchivistParents | undefined;
@@ -32,6 +33,7 @@ export declare abstract class AbstractWitness<TParams extends WitnessParams = Wi
     } & import("@xyo-network/payload-model").PayloadFields> | undefined>;
     /** @function observe The main entry point for a witness.  Do not override this function.  Implement/override observeHandler for custom functionality */
     observe(inPayloads?: TIn[]): Promise<TOut[]>;
+    observeQuery(account: AccountInstance, payloads?: TIn[]): Promise<ModuleQueryResult<TOut>>;
     /** @function queryHandler Calls observe for an observe query.  Override to support additional queries. */
     protected queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): Promise<ModuleQueryHandlerResult>;
     /** @function observeHandler Implement or override to add custom functionality to a witness */

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

@@ -1 +1 @@
-{"version":3,"file":"AbstractWitness.d.ts","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AAEnE,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAmB,YAAY,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAA;AAEnG,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EACL,qBAAqB,EAErB,eAAe,EACf,sBAAsB,EAEtB,aAAa,EACb,cAAc,EACf,MAAM,4BAA4B,CAAA;AAGnC,8BAAsB,eAAe,CACjC,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,GAAG,SAAS,OAAO,GAAG,OAAO,EAC7B,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAChH,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EACnC,GAAG,EACH,IAAI,CACL,CAEH,SAAQ,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAClD,YAAW,qBAAqB,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IAEhE,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAwB;IACxE,gBAAyB,UAAU,SAA4D;IAE/F,OAAO,CAAC,kBAAkB,CAA+B;IAEzD,IAAI,SAAS,uBAEZ;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,cAAuB,kBAAkB,IAAI,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAIpF;IAEK,oBAAoB;;;;;;;;;;;;;;;;;;IAM1B,wJAAwJ;IAClJ,OAAO,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAkBlD,0GAA0G;cACjF,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,wBAAwB,CAAC;IAoBpC,8FAA8F;IAC9F,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;CACxE"}
+{"version":3,"file":"AbstractWitness.d.ts","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AAEnE,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAmB,YAAY,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAEtH,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EACL,qBAAqB,EAErB,eAAe,EACf,sBAAsB,EAGtB,aAAa,EACb,cAAc,EACf,MAAM,4BAA4B,CAAA;AAGnC,8BAAsB,eAAe,CACjC,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,GAAG,SAAS,OAAO,GAAG,OAAO,EAC7B,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAChH,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EACnC,GAAG,EACH,IAAI,CACL,CAEH,SAAQ,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAClD,YAAW,qBAAqB,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IAEhE,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAwB;IACxE,gBAAyB,UAAU,SAA4D;IAE/F,OAAO,CAAC,kBAAkB,CAA+B;IAEzD,IAAI,SAAS,uBAEZ;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,cAAuB,kBAAkB,IAAI,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAIpF;IAEK,oBAAoB;;;;;;;;;;;;;;;;;;IAM1B,wJAAwJ;IAClJ,OAAO,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAkB5C,YAAY,CAAC,OAAO,EAAE,eAAe,EAAE,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAKhG,0GAA0G;cACjF,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,wBAAwB,CAAC;IAoBpC,8FAA8F;IAC9F,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;CACxE"}

package/dist/node/index.cjs

@@ -32,7 +32,7 @@ module.exports = __toCommonJS(src_exports);
 
 // src/AbstractWitness.ts
 var import_assert = require("@xylabs/assert");
-var import_account = require("@xyo-network/account");
+var import_object = require("@xylabs/object");
 var import_boundwitness_wrapper = require("@xyo-network/boundwitness-wrapper");
 var import_module_abstract = require("@xyo-network/module-abstract");
 var import_module_model = require("@xyo-network/module-model");
@@ -82,6 +82,12 @@ var _AbstractWitness = class _AbstractWitness extends import_module_abstract.Abs
     });
     return outPayloads;
   }
+  async observeQuery(account, payloads) {
+    const queryPayload = {
+      schema: import_witness_model.WitnessObserveQuerySchema
+    };
+    return await this.sendQuery(queryPayload, payloads, account);
+  }
   /** @function queryHandler Calls observe for an observe query.  Override to support additional queries. */
   async queryHandler(query, payloads, queryConfig) {
     const wrapper = await import_boundwitness_wrapper.QueryBoundWitnessWrapper.parseQuery(query, payloads);
@@ -106,7 +112,7 @@ __name(_AbstractWitness, "AbstractWitness");
 __publicField(_AbstractWitness, "configSchemas", [
   import_witness_model.WitnessConfigSchema
 ]);
-__publicField(_AbstractWitness, "uniqueName", (0, import_account.globallyUnique)("AbstractWitness", _AbstractWitness, "xyo"));
+__publicField(_AbstractWitness, "uniqueName", (0, import_object.globallyUnique)("AbstractWitness", _AbstractWitness, "xyo"));
 var AbstractWitness = _AbstractWitness;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/node/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts","../../src/AbstractWitness.ts"],"sourcesContent":["export * from './AbstractWitness'\n","import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { globallyUnique } from '@xyo-network/account'\nimport { ArchivistInstance } from '@xyo-network/archivist-model'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport { creatableModule, ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload } from '@xyo-network/payload-model'\nimport {\n  CustomWitnessInstance,\n  WitnessConfigSchema,\n  WitnessInstance,\n  WitnessModuleEventData,\n  WitnessObserveQuerySchema,\n  WitnessParams,\n  WitnessQueries,\n} from '@xyo-network/witness-model'\n\ncreatableModule()\nexport abstract class AbstractWitness<\n    TParams extends WitnessParams = WitnessParams,\n    TIn extends Payload = Payload,\n    TOut extends Payload = Payload,\n    TEventData extends WitnessModuleEventData<WitnessInstance<TParams, TIn, TOut>, TIn, TOut> = WitnessModuleEventData<\n      WitnessInstance<TParams, TIn, TOut>,\n      TIn,\n      TOut\n    >,\n  >\n  extends AbstractModuleInstance<TParams, TEventData>\n  implements CustomWitnessInstance<TParams, TIn, TOut, TEventData>\n{\n  static override readonly configSchemas: string[] = [WitnessConfigSchema]\n  static override readonly uniqueName = globallyUnique('AbstractWitness', AbstractWitness, 'xyo')\n\n  private _archivistInstance: ArchivistInstance | undefined\n\n  get archivist() {\n    return this.config.archivist\n  }\n\n  override get queries(): string[] {\n    return [WitnessObserveQuerySchema, ...super.queries]\n  }\n\n  protected override get _queryAccountPaths(): Record<WitnessQueries['schema'], string> {\n    return {\n      'network.xyo.query.witness.observe': '1/1',\n    }\n  }\n\n  async getArchivistInstance() {\n    const archivistAddress = this.archivist\n    this._archivistInstance = this._archivistInstance ?? (archivistAddress ? await this.resolve(archivistAddress) : undefined)\n    return this._archivistInstance\n  }\n\n  /** @function observe The main entry point for a witness.  Do not override this function.  Implement/override observeHandler for custom functionality */\n  async observe(inPayloads?: TIn[]): Promise<TOut[]> {\n    this._noOverride('observe')\n    await this.started('throw')\n    await this.emit('observeStart', { inPayloads, module: this } as TEventData['observeStart'])\n    const outPayloads = assertEx(await this.observeHandler(inPayloads), () => 'Trying to witness nothing')\n    //assertEx(outPayloads.length > 0, 'Trying to witness empty list')\n    for (const payload of outPayloads ?? []) assertEx(payload.schema, () => 'observe: Missing Schema')\n\n    const archivist = await this.getArchivistInstance()\n    if (archivist) {\n      await archivist.insert(outPayloads)\n    }\n\n    await this.emit('observeEnd', { inPayloads, module: this, outPayloads } as TEventData['observeEnd'])\n\n    return outPayloads\n  }\n\n  /** @function queryHandler Calls observe for an observe query.  Override to support additional queries. */\n  protected override async queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(\n    query: T,\n    payloads?: Payload[],\n    queryConfig?: TConfig,\n  ): Promise<ModuleQueryHandlerResult> {\n    const wrapper = await QueryBoundWitnessWrapper.parseQuery<WitnessQueries>(query, payloads)\n    const queryPayload = await wrapper.getQuery()\n    assertEx(await this.queryable(query, payloads, queryConfig))\n    const resultPayloads: Payload[] = []\n    // Remove the query payload from the arguments passed to us so we don't observe it\n    const filteredObservation = (await PayloadBuilder.filterExclude(payloads, query.query)) as TIn[]\n    switch (queryPayload.schema) {\n      case WitnessObserveQuerySchema: {\n        const observePayloads = await this.observe(filteredObservation)\n        resultPayloads.push(...observePayloads)\n        break\n      }\n      default: {\n        return super.queryHandler(query, payloads)\n      }\n    }\n    return resultPayloads\n  }\n\n  /** @function observeHandler Implement or override to add custom functionality to a witness */\n  protected abstract observeHandler(payloads?: TIn[]): Promisable<TOut[]>\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;ACAA,oBAAyB;AAEzB,qBAA+B;AAG/B,kCAAyC;AACzC,6BAAuC;AACvC,0BAAwE;AACxE,6BAA+B;AAE/B,2BAQO;IAEPA,qCAAAA;AACO,IAAeC,mBAAf,MAAeA,yBAUZC,8CAAAA;EAMAC;EAER,IAAIC,YAAY;AACd,WAAO,KAAKC,OAAOD;EACrB;EAEA,IAAaE,UAAoB;AAC/B,WAAO;MAACC;SAA8B,MAAMD;;EAC9C;EAEA,IAAuBE,qBAA+D;AACpF,WAAO;MACL,qCAAqC;IACvC;EACF;EAEA,MAAMC,uBAAuB;AAC3B,UAAMC,mBAAmB,KAAKN;AAC9B,SAAKD,qBAAqB,KAAKA,uBAAuBO,mBAAmB,MAAM,KAAKC,QAAQD,gBAAAA,IAAoBE;AAChH,WAAO,KAAKT;EACd;;EAGA,MAAMU,QAAQC,YAAqC;AACjD,SAAKC,YAAY,SAAA;AACjB,UAAM,KAAKC,QAAQ,OAAA;AACnB,UAAM,KAAKC,KAAK,gBAAgB;MAAEH;MAAYI,QAAQ;IAAK,CAAA;AAC3D,UAAMC,kBAAcC,wBAAS,MAAM,KAAKC,eAAeP,UAAAA,GAAa,MAAM,2BAAA;AAE1E,eAAWQ,WAAWH,eAAe,CAAA;AAAIC,kCAASE,QAAQC,QAAQ,MAAM,yBAAA;AAExE,UAAMnB,YAAY,MAAM,KAAKK,qBAAoB;AACjD,QAAIL,WAAW;AACb,YAAMA,UAAUoB,OAAOL,WAAAA;IACzB;AAEA,UAAM,KAAKF,KAAK,cAAc;MAAEH;MAAYI,QAAQ;MAAMC;IAAY,CAAA;AAEtE,WAAOA;EACT;;EAGA,MAAyBM,aACvBC,OACAC,UACAC,aACmC;AACnC,UAAMC,UAAU,MAAMC,qDAAyBC,WAA2BL,OAAOC,QAAAA;AACjF,UAAMK,eAAe,MAAMH,QAAQI,SAAQ;AAC3Cb,gCAAS,MAAM,KAAKc,UAAUR,OAAOC,UAAUC,WAAAA,CAAAA;AAC/C,UAAMO,iBAA4B,CAAA;AAElC,UAAMC,sBAAuB,MAAMC,sCAAeC,cAAcX,UAAUD,MAAMA,KAAK;AACrF,YAAQM,aAAaT,QAAM;MACzB,KAAKhB,gDAA2B;AAC9B,cAAMgC,kBAAkB,MAAM,KAAK1B,QAAQuB,mBAAAA;AAC3CD,uBAAeK,KAAI,GAAID,eAAAA;AACvB;MACF;MACA,SAAS;AACP,eAAO,MAAMd,aAAaC,OAAOC,QAAAA;MACnC;IACF;AACA,WAAOQ;EACT;AAIF;AA1EUjC;AAGR,cAboBD,kBAaKwC,iBAA0B;EAACC;;AACpD,cAdoBzC,kBAcK0C,kBAAaC,+BAAe,mBAAmB3C,kBAAiB,KAAA;AAdpF,IAAeA,kBAAf;","names":["creatableModule","AbstractWitness","AbstractModuleInstance","_archivistInstance","archivist","config","queries","WitnessObserveQuerySchema","_queryAccountPaths","getArchivistInstance","archivistAddress","resolve","undefined","observe","inPayloads","_noOverride","started","emit","module","outPayloads","assertEx","observeHandler","payload","schema","insert","queryHandler","query","payloads","queryConfig","wrapper","QueryBoundWitnessWrapper","parseQuery","queryPayload","getQuery","queryable","resultPayloads","filteredObservation","PayloadBuilder","filterExclude","observePayloads","push","configSchemas","WitnessConfigSchema","uniqueName","globallyUnique"]}
+{"version":3,"sources":["../../src/index.ts","../../src/AbstractWitness.ts"],"sourcesContent":["export * from './AbstractWitness'\n","import { assertEx } from '@xylabs/assert'\nimport { globallyUnique } from '@xylabs/object'\nimport { Promisable } from '@xylabs/promise'\nimport { AccountInstance } from '@xyo-network/account-model'\nimport { ArchivistInstance } from '@xyo-network/archivist-model'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport { creatableModule, ModuleConfig, ModuleQueryHandlerResult, ModuleQueryResult } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload } from '@xyo-network/payload-model'\nimport {\n  CustomWitnessInstance,\n  WitnessConfigSchema,\n  WitnessInstance,\n  WitnessModuleEventData,\n  WitnessObserveQuery,\n  WitnessObserveQuerySchema,\n  WitnessParams,\n  WitnessQueries,\n} from '@xyo-network/witness-model'\n\ncreatableModule()\nexport abstract class AbstractWitness<\n    TParams extends WitnessParams = WitnessParams,\n    TIn extends Payload = Payload,\n    TOut extends Payload = Payload,\n    TEventData extends WitnessModuleEventData<WitnessInstance<TParams, TIn, TOut>, TIn, TOut> = WitnessModuleEventData<\n      WitnessInstance<TParams, TIn, TOut>,\n      TIn,\n      TOut\n    >,\n  >\n  extends AbstractModuleInstance<TParams, TEventData>\n  implements CustomWitnessInstance<TParams, TIn, TOut, TEventData>\n{\n  static override readonly configSchemas: string[] = [WitnessConfigSchema]\n  static override readonly uniqueName = globallyUnique('AbstractWitness', AbstractWitness, 'xyo')\n\n  private _archivistInstance: ArchivistInstance | undefined\n\n  get archivist() {\n    return this.config.archivist\n  }\n\n  override get queries(): string[] {\n    return [WitnessObserveQuerySchema, ...super.queries]\n  }\n\n  protected override get _queryAccountPaths(): Record<WitnessQueries['schema'], string> {\n    return {\n      'network.xyo.query.witness.observe': '1/1',\n    }\n  }\n\n  async getArchivistInstance() {\n    const archivistAddress = this.archivist\n    this._archivistInstance = this._archivistInstance ?? (archivistAddress ? await this.resolve(archivistAddress) : undefined)\n    return this._archivistInstance\n  }\n\n  /** @function observe The main entry point for a witness.  Do not override this function.  Implement/override observeHandler for custom functionality */\n  async observe(inPayloads?: TIn[]): Promise<TOut[]> {\n    this._noOverride('observe')\n    await this.started('throw')\n    await this.emit('observeStart', { inPayloads, module: this } as TEventData['observeStart'])\n    const outPayloads = assertEx(await this.observeHandler(inPayloads), () => 'Trying to witness nothing')\n    //assertEx(outPayloads.length > 0, 'Trying to witness empty list')\n    for (const payload of outPayloads ?? []) assertEx(payload.schema, () => 'observe: Missing Schema')\n\n    const archivist = await this.getArchivistInstance()\n    if (archivist) {\n      await archivist.insert(outPayloads)\n    }\n\n    await this.emit('observeEnd', { inPayloads, module: this, outPayloads } as TEventData['observeEnd'])\n\n    return outPayloads\n  }\n\n  async observeQuery(account: AccountInstance, payloads?: TIn[]): Promise<ModuleQueryResult<TOut>> {\n    const queryPayload: WitnessObserveQuery = { schema: WitnessObserveQuerySchema }\n    return (await this.sendQuery(queryPayload, payloads, account)) as ModuleQueryResult<TOut>\n  }\n\n  /** @function queryHandler Calls observe for an observe query.  Override to support additional queries. */\n  protected override async queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(\n    query: T,\n    payloads?: Payload[],\n    queryConfig?: TConfig,\n  ): Promise<ModuleQueryHandlerResult> {\n    const wrapper = await QueryBoundWitnessWrapper.parseQuery<WitnessQueries>(query, payloads)\n    const queryPayload = await wrapper.getQuery()\n    assertEx(await this.queryable(query, payloads, queryConfig))\n    const resultPayloads: Payload[] = []\n    // Remove the query payload from the arguments passed to us so we don't observe it\n    const filteredObservation = (await PayloadBuilder.filterExclude(payloads, query.query)) as TIn[]\n    switch (queryPayload.schema) {\n      case WitnessObserveQuerySchema: {\n        const observePayloads = await this.observe(filteredObservation)\n        resultPayloads.push(...observePayloads)\n        break\n      }\n      default: {\n        return super.queryHandler(query, payloads)\n      }\n    }\n    return resultPayloads\n  }\n\n  /** @function observeHandler Implement or override to add custom functionality to a witness */\n  protected abstract observeHandler(payloads?: TIn[]): Promisable<TOut[]>\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;ACAA,oBAAyB;AACzB,oBAA+B;AAK/B,kCAAyC;AACzC,6BAAuC;AACvC,0BAA2F;AAC3F,6BAA+B;AAE/B,2BASO;IAEPA,qCAAAA;AACO,IAAeC,mBAAf,MAAeA,yBAUZC,8CAAAA;EAMAC;EAER,IAAIC,YAAY;AACd,WAAO,KAAKC,OAAOD;EACrB;EAEA,IAAaE,UAAoB;AAC/B,WAAO;MAACC;SAA8B,MAAMD;;EAC9C;EAEA,IAAuBE,qBAA+D;AACpF,WAAO;MACL,qCAAqC;IACvC;EACF;EAEA,MAAMC,uBAAuB;AAC3B,UAAMC,mBAAmB,KAAKN;AAC9B,SAAKD,qBAAqB,KAAKA,uBAAuBO,mBAAmB,MAAM,KAAKC,QAAQD,gBAAAA,IAAoBE;AAChH,WAAO,KAAKT;EACd;;EAGA,MAAMU,QAAQC,YAAqC;AACjD,SAAKC,YAAY,SAAA;AACjB,UAAM,KAAKC,QAAQ,OAAA;AACnB,UAAM,KAAKC,KAAK,gBAAgB;MAAEH;MAAYI,QAAQ;IAAK,CAAA;AAC3D,UAAMC,kBAAcC,wBAAS,MAAM,KAAKC,eAAeP,UAAAA,GAAa,MAAM,2BAAA;AAE1E,eAAWQ,WAAWH,eAAe,CAAA;AAAIC,kCAASE,QAAQC,QAAQ,MAAM,yBAAA;AAExE,UAAMnB,YAAY,MAAM,KAAKK,qBAAoB;AACjD,QAAIL,WAAW;AACb,YAAMA,UAAUoB,OAAOL,WAAAA;IACzB;AAEA,UAAM,KAAKF,KAAK,cAAc;MAAEH;MAAYI,QAAQ;MAAMC;IAAY,CAAA;AAEtE,WAAOA;EACT;EAEA,MAAMM,aAAaC,SAA0BC,UAAoD;AAC/F,UAAMC,eAAoC;MAAEL,QAAQhB;IAA0B;AAC9E,WAAQ,MAAM,KAAKsB,UAAUD,cAAcD,UAAUD,OAAAA;EACvD;;EAGA,MAAyBI,aACvBC,OACAJ,UACAK,aACmC;AACnC,UAAMC,UAAU,MAAMC,qDAAyBC,WAA2BJ,OAAOJ,QAAAA;AACjF,UAAMC,eAAe,MAAMK,QAAQG,SAAQ;AAC3ChB,gCAAS,MAAM,KAAKiB,UAAUN,OAAOJ,UAAUK,WAAAA,CAAAA;AAC/C,UAAMM,iBAA4B,CAAA;AAElC,UAAMC,sBAAuB,MAAMC,sCAAeC,cAAcd,UAAUI,MAAMA,KAAK;AACrF,YAAQH,aAAaL,QAAM;MACzB,KAAKhB,gDAA2B;AAC9B,cAAMmC,kBAAkB,MAAM,KAAK7B,QAAQ0B,mBAAAA;AAC3CD,uBAAeK,KAAI,GAAID,eAAAA;AACvB;MACF;MACA,SAAS;AACP,eAAO,MAAMZ,aAAaC,OAAOJ,QAAAA;MACnC;IACF;AACA,WAAOW;EACT;AAIF;AA/EUpC;AAGR,cAboBD,kBAaK2C,iBAA0B;EAACC;;AACpD,cAdoB5C,kBAcK6C,kBAAaC,8BAAe,mBAAmB9C,kBAAiB,KAAA;AAdpF,IAAeA,kBAAf;","names":["creatableModule","AbstractWitness","AbstractModuleInstance","_archivistInstance","archivist","config","queries","WitnessObserveQuerySchema","_queryAccountPaths","getArchivistInstance","archivistAddress","resolve","undefined","observe","inPayloads","_noOverride","started","emit","module","outPayloads","assertEx","observeHandler","payload","schema","insert","observeQuery","account","payloads","queryPayload","sendQuery","queryHandler","query","queryConfig","wrapper","QueryBoundWitnessWrapper","parseQuery","getQuery","queryable","resultPayloads","filteredObservation","PayloadBuilder","filterExclude","observePayloads","push","configSchemas","WitnessConfigSchema","uniqueName","globallyUnique"]}

package/dist/node/index.js

@@ -8,7 +8,7 @@ var __publicField = (obj, key, value) => {
 
 // src/AbstractWitness.ts
 import { assertEx } from "@xylabs/assert";
-import { globallyUnique } from "@xyo-network/account";
+import { globallyUnique } from "@xylabs/object";
 import { QueryBoundWitnessWrapper } from "@xyo-network/boundwitness-wrapper";
 import { AbstractModuleInstance } from "@xyo-network/module-abstract";
 import { creatableModule } from "@xyo-network/module-model";
@@ -58,6 +58,12 @@ var _AbstractWitness = class _AbstractWitness extends AbstractModuleInstance {
     });
     return outPayloads;
   }
+  async observeQuery(account, payloads) {
+    const queryPayload = {
+      schema: WitnessObserveQuerySchema
+    };
+    return await this.sendQuery(queryPayload, payloads, account);
+  }
   /** @function queryHandler Calls observe for an observe query.  Override to support additional queries. */
   async queryHandler(query, payloads, queryConfig) {
     const wrapper = await QueryBoundWitnessWrapper.parseQuery(query, payloads);

package/dist/node/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/AbstractWitness.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { globallyUnique } from '@xyo-network/account'\nimport { ArchivistInstance } from '@xyo-network/archivist-model'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport { creatableModule, ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload } from '@xyo-network/payload-model'\nimport {\n  CustomWitnessInstance,\n  WitnessConfigSchema,\n  WitnessInstance,\n  WitnessModuleEventData,\n  WitnessObserveQuerySchema,\n  WitnessParams,\n  WitnessQueries,\n} from '@xyo-network/witness-model'\n\ncreatableModule()\nexport abstract class AbstractWitness<\n    TParams extends WitnessParams = WitnessParams,\n    TIn extends Payload = Payload,\n    TOut extends Payload = Payload,\n    TEventData extends WitnessModuleEventData<WitnessInstance<TParams, TIn, TOut>, TIn, TOut> = WitnessModuleEventData<\n      WitnessInstance<TParams, TIn, TOut>,\n      TIn,\n      TOut\n    >,\n  >\n  extends AbstractModuleInstance<TParams, TEventData>\n  implements CustomWitnessInstance<TParams, TIn, TOut, TEventData>\n{\n  static override readonly configSchemas: string[] = [WitnessConfigSchema]\n  static override readonly uniqueName = globallyUnique('AbstractWitness', AbstractWitness, 'xyo')\n\n  private _archivistInstance: ArchivistInstance | undefined\n\n  get archivist() {\n    return this.config.archivist\n  }\n\n  override get queries(): string[] {\n    return [WitnessObserveQuerySchema, ...super.queries]\n  }\n\n  protected override get _queryAccountPaths(): Record<WitnessQueries['schema'], string> {\n    return {\n      'network.xyo.query.witness.observe': '1/1',\n    }\n  }\n\n  async getArchivistInstance() {\n    const archivistAddress = this.archivist\n    this._archivistInstance = this._archivistInstance ?? (archivistAddress ? await this.resolve(archivistAddress) : undefined)\n    return this._archivistInstance\n  }\n\n  /** @function observe The main entry point for a witness.  Do not override this function.  Implement/override observeHandler for custom functionality */\n  async observe(inPayloads?: TIn[]): Promise<TOut[]> {\n    this._noOverride('observe')\n    await this.started('throw')\n    await this.emit('observeStart', { inPayloads, module: this } as TEventData['observeStart'])\n    const outPayloads = assertEx(await this.observeHandler(inPayloads), () => 'Trying to witness nothing')\n    //assertEx(outPayloads.length > 0, 'Trying to witness empty list')\n    for (const payload of outPayloads ?? []) assertEx(payload.schema, () => 'observe: Missing Schema')\n\n    const archivist = await this.getArchivistInstance()\n    if (archivist) {\n      await archivist.insert(outPayloads)\n    }\n\n    await this.emit('observeEnd', { inPayloads, module: this, outPayloads } as TEventData['observeEnd'])\n\n    return outPayloads\n  }\n\n  /** @function queryHandler Calls observe for an observe query.  Override to support additional queries. */\n  protected override async queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(\n    query: T,\n    payloads?: Payload[],\n    queryConfig?: TConfig,\n  ): Promise<ModuleQueryHandlerResult> {\n    const wrapper = await QueryBoundWitnessWrapper.parseQuery<WitnessQueries>(query, payloads)\n    const queryPayload = await wrapper.getQuery()\n    assertEx(await this.queryable(query, payloads, queryConfig))\n    const resultPayloads: Payload[] = []\n    // Remove the query payload from the arguments passed to us so we don't observe it\n    const filteredObservation = (await PayloadBuilder.filterExclude(payloads, query.query)) as TIn[]\n    switch (queryPayload.schema) {\n      case WitnessObserveQuerySchema: {\n        const observePayloads = await this.observe(filteredObservation)\n        resultPayloads.push(...observePayloads)\n        break\n      }\n      default: {\n        return super.queryHandler(query, payloads)\n      }\n    }\n    return resultPayloads\n  }\n\n  /** @function observeHandler Implement or override to add custom functionality to a witness */\n  protected abstract observeHandler(payloads?: TIn[]): Promisable<TOut[]>\n}\n"],"mappings":";;;;;;;;;AAAA,SAASA,gBAAgB;AAEzB,SAASC,sBAAsB;AAG/B,SAASC,gCAAgC;AACzC,SAASC,8BAA8B;AACvC,SAASC,uBAA+D;AACxE,SAASC,sBAAsB;AAE/B,SAEEC,qBAGAC,iCAGK;AAEPC,gBAAAA;AACO,IAAeC,mBAAf,MAAeA,yBAUZC,uBAAAA;EAMAC;EAER,IAAIC,YAAY;AACd,WAAO,KAAKC,OAAOD;EACrB;EAEA,IAAaE,UAAoB;AAC/B,WAAO;MAACC;SAA8B,MAAMD;;EAC9C;EAEA,IAAuBE,qBAA+D;AACpF,WAAO;MACL,qCAAqC;IACvC;EACF;EAEA,MAAMC,uBAAuB;AAC3B,UAAMC,mBAAmB,KAAKN;AAC9B,SAAKD,qBAAqB,KAAKA,uBAAuBO,mBAAmB,MAAM,KAAKC,QAAQD,gBAAAA,IAAoBE;AAChH,WAAO,KAAKT;EACd;;EAGA,MAAMU,QAAQC,YAAqC;AACjD,SAAKC,YAAY,SAAA;AACjB,UAAM,KAAKC,QAAQ,OAAA;AACnB,UAAM,KAAKC,KAAK,gBAAgB;MAAEH;MAAYI,QAAQ;IAAK,CAAA;AAC3D,UAAMC,cAAcC,SAAS,MAAM,KAAKC,eAAeP,UAAAA,GAAa,MAAM,2BAAA;AAE1E,eAAWQ,WAAWH,eAAe,CAAA;AAAIC,eAASE,QAAQC,QAAQ,MAAM,yBAAA;AAExE,UAAMnB,YAAY,MAAM,KAAKK,qBAAoB;AACjD,QAAIL,WAAW;AACb,YAAMA,UAAUoB,OAAOL,WAAAA;IACzB;AAEA,UAAM,KAAKF,KAAK,cAAc;MAAEH;MAAYI,QAAQ;MAAMC;IAAY,CAAA;AAEtE,WAAOA;EACT;;EAGA,MAAyBM,aACvBC,OACAC,UACAC,aACmC;AACnC,UAAMC,UAAU,MAAMC,yBAAyBC,WAA2BL,OAAOC,QAAAA;AACjF,UAAMK,eAAe,MAAMH,QAAQI,SAAQ;AAC3Cb,aAAS,MAAM,KAAKc,UAAUR,OAAOC,UAAUC,WAAAA,CAAAA;AAC/C,UAAMO,iBAA4B,CAAA;AAElC,UAAMC,sBAAuB,MAAMC,eAAeC,cAAcX,UAAUD,MAAMA,KAAK;AACrF,YAAQM,aAAaT,QAAM;MACzB,KAAKhB,2BAA2B;AAC9B,cAAMgC,kBAAkB,MAAM,KAAK1B,QAAQuB,mBAAAA;AAC3CD,uBAAeK,KAAI,GAAID,eAAAA;AACvB;MACF;MACA,SAAS;AACP,eAAO,MAAMd,aAAaC,OAAOC,QAAAA;MACnC;IACF;AACA,WAAOQ;EACT;AAIF;AA1EUjC;AAGR,cAboBD,kBAaKwC,iBAA0B;EAACC;;AACpD,cAdoBzC,kBAcK0C,cAAaC,eAAe,mBAAmB3C,kBAAiB,KAAA;AAdpF,IAAeA,kBAAf;","names":["assertEx","globallyUnique","QueryBoundWitnessWrapper","AbstractModuleInstance","creatableModule","PayloadBuilder","WitnessConfigSchema","WitnessObserveQuerySchema","creatableModule","AbstractWitness","AbstractModuleInstance","_archivistInstance","archivist","config","queries","WitnessObserveQuerySchema","_queryAccountPaths","getArchivistInstance","archivistAddress","resolve","undefined","observe","inPayloads","_noOverride","started","emit","module","outPayloads","assertEx","observeHandler","payload","schema","insert","queryHandler","query","payloads","queryConfig","wrapper","QueryBoundWitnessWrapper","parseQuery","queryPayload","getQuery","queryable","resultPayloads","filteredObservation","PayloadBuilder","filterExclude","observePayloads","push","configSchemas","WitnessConfigSchema","uniqueName","globallyUnique"]}
+{"version":3,"sources":["../../src/AbstractWitness.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { globallyUnique } from '@xylabs/object'\nimport { Promisable } from '@xylabs/promise'\nimport { AccountInstance } from '@xyo-network/account-model'\nimport { ArchivistInstance } from '@xyo-network/archivist-model'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport { creatableModule, ModuleConfig, ModuleQueryHandlerResult, ModuleQueryResult } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload } from '@xyo-network/payload-model'\nimport {\n  CustomWitnessInstance,\n  WitnessConfigSchema,\n  WitnessInstance,\n  WitnessModuleEventData,\n  WitnessObserveQuery,\n  WitnessObserveQuerySchema,\n  WitnessParams,\n  WitnessQueries,\n} from '@xyo-network/witness-model'\n\ncreatableModule()\nexport abstract class AbstractWitness<\n    TParams extends WitnessParams = WitnessParams,\n    TIn extends Payload = Payload,\n    TOut extends Payload = Payload,\n    TEventData extends WitnessModuleEventData<WitnessInstance<TParams, TIn, TOut>, TIn, TOut> = WitnessModuleEventData<\n      WitnessInstance<TParams, TIn, TOut>,\n      TIn,\n      TOut\n    >,\n  >\n  extends AbstractModuleInstance<TParams, TEventData>\n  implements CustomWitnessInstance<TParams, TIn, TOut, TEventData>\n{\n  static override readonly configSchemas: string[] = [WitnessConfigSchema]\n  static override readonly uniqueName = globallyUnique('AbstractWitness', AbstractWitness, 'xyo')\n\n  private _archivistInstance: ArchivistInstance | undefined\n\n  get archivist() {\n    return this.config.archivist\n  }\n\n  override get queries(): string[] {\n    return [WitnessObserveQuerySchema, ...super.queries]\n  }\n\n  protected override get _queryAccountPaths(): Record<WitnessQueries['schema'], string> {\n    return {\n      'network.xyo.query.witness.observe': '1/1',\n    }\n  }\n\n  async getArchivistInstance() {\n    const archivistAddress = this.archivist\n    this._archivistInstance = this._archivistInstance ?? (archivistAddress ? await this.resolve(archivistAddress) : undefined)\n    return this._archivistInstance\n  }\n\n  /** @function observe The main entry point for a witness.  Do not override this function.  Implement/override observeHandler for custom functionality */\n  async observe(inPayloads?: TIn[]): Promise<TOut[]> {\n    this._noOverride('observe')\n    await this.started('throw')\n    await this.emit('observeStart', { inPayloads, module: this } as TEventData['observeStart'])\n    const outPayloads = assertEx(await this.observeHandler(inPayloads), () => 'Trying to witness nothing')\n    //assertEx(outPayloads.length > 0, 'Trying to witness empty list')\n    for (const payload of outPayloads ?? []) assertEx(payload.schema, () => 'observe: Missing Schema')\n\n    const archivist = await this.getArchivistInstance()\n    if (archivist) {\n      await archivist.insert(outPayloads)\n    }\n\n    await this.emit('observeEnd', { inPayloads, module: this, outPayloads } as TEventData['observeEnd'])\n\n    return outPayloads\n  }\n\n  async observeQuery(account: AccountInstance, payloads?: TIn[]): Promise<ModuleQueryResult<TOut>> {\n    const queryPayload: WitnessObserveQuery = { schema: WitnessObserveQuerySchema }\n    return (await this.sendQuery(queryPayload, payloads, account)) as ModuleQueryResult<TOut>\n  }\n\n  /** @function queryHandler Calls observe for an observe query.  Override to support additional queries. */\n  protected override async queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(\n    query: T,\n    payloads?: Payload[],\n    queryConfig?: TConfig,\n  ): Promise<ModuleQueryHandlerResult> {\n    const wrapper = await QueryBoundWitnessWrapper.parseQuery<WitnessQueries>(query, payloads)\n    const queryPayload = await wrapper.getQuery()\n    assertEx(await this.queryable(query, payloads, queryConfig))\n    const resultPayloads: Payload[] = []\n    // Remove the query payload from the arguments passed to us so we don't observe it\n    const filteredObservation = (await PayloadBuilder.filterExclude(payloads, query.query)) as TIn[]\n    switch (queryPayload.schema) {\n      case WitnessObserveQuerySchema: {\n        const observePayloads = await this.observe(filteredObservation)\n        resultPayloads.push(...observePayloads)\n        break\n      }\n      default: {\n        return super.queryHandler(query, payloads)\n      }\n    }\n    return resultPayloads\n  }\n\n  /** @function observeHandler Implement or override to add custom functionality to a witness */\n  protected abstract observeHandler(payloads?: TIn[]): Promisable<TOut[]>\n}\n"],"mappings":";;;;;;;;;AAAA,SAASA,gBAAgB;AACzB,SAASC,sBAAsB;AAK/B,SAASC,gCAAgC;AACzC,SAASC,8BAA8B;AACvC,SAASC,uBAAkF;AAC3F,SAASC,sBAAsB;AAE/B,SAEEC,qBAIAC,iCAGK;AAEPC,gBAAAA;AACO,IAAeC,mBAAf,MAAeA,yBAUZC,uBAAAA;EAMAC;EAER,IAAIC,YAAY;AACd,WAAO,KAAKC,OAAOD;EACrB;EAEA,IAAaE,UAAoB;AAC/B,WAAO;MAACC;SAA8B,MAAMD;;EAC9C;EAEA,IAAuBE,qBAA+D;AACpF,WAAO;MACL,qCAAqC;IACvC;EACF;EAEA,MAAMC,uBAAuB;AAC3B,UAAMC,mBAAmB,KAAKN;AAC9B,SAAKD,qBAAqB,KAAKA,uBAAuBO,mBAAmB,MAAM,KAAKC,QAAQD,gBAAAA,IAAoBE;AAChH,WAAO,KAAKT;EACd;;EAGA,MAAMU,QAAQC,YAAqC;AACjD,SAAKC,YAAY,SAAA;AACjB,UAAM,KAAKC,QAAQ,OAAA;AACnB,UAAM,KAAKC,KAAK,gBAAgB;MAAEH;MAAYI,QAAQ;IAAK,CAAA;AAC3D,UAAMC,cAAcC,SAAS,MAAM,KAAKC,eAAeP,UAAAA,GAAa,MAAM,2BAAA;AAE1E,eAAWQ,WAAWH,eAAe,CAAA;AAAIC,eAASE,QAAQC,QAAQ,MAAM,yBAAA;AAExE,UAAMnB,YAAY,MAAM,KAAKK,qBAAoB;AACjD,QAAIL,WAAW;AACb,YAAMA,UAAUoB,OAAOL,WAAAA;IACzB;AAEA,UAAM,KAAKF,KAAK,cAAc;MAAEH;MAAYI,QAAQ;MAAMC;IAAY,CAAA;AAEtE,WAAOA;EACT;EAEA,MAAMM,aAAaC,SAA0BC,UAAoD;AAC/F,UAAMC,eAAoC;MAAEL,QAAQhB;IAA0B;AAC9E,WAAQ,MAAM,KAAKsB,UAAUD,cAAcD,UAAUD,OAAAA;EACvD;;EAGA,MAAyBI,aACvBC,OACAJ,UACAK,aACmC;AACnC,UAAMC,UAAU,MAAMC,yBAAyBC,WAA2BJ,OAAOJ,QAAAA;AACjF,UAAMC,eAAe,MAAMK,QAAQG,SAAQ;AAC3ChB,aAAS,MAAM,KAAKiB,UAAUN,OAAOJ,UAAUK,WAAAA,CAAAA;AAC/C,UAAMM,iBAA4B,CAAA;AAElC,UAAMC,sBAAuB,MAAMC,eAAeC,cAAcd,UAAUI,MAAMA,KAAK;AACrF,YAAQH,aAAaL,QAAM;MACzB,KAAKhB,2BAA2B;AAC9B,cAAMmC,kBAAkB,MAAM,KAAK7B,QAAQ0B,mBAAAA;AAC3CD,uBAAeK,KAAI,GAAID,eAAAA;AACvB;MACF;MACA,SAAS;AACP,eAAO,MAAMZ,aAAaC,OAAOJ,QAAAA;MACnC;IACF;AACA,WAAOW;EACT;AAIF;AA/EUpC;AAGR,cAboBD,kBAaK2C,iBAA0B;EAACC;;AACpD,cAdoB5C,kBAcK6C,cAAaC,eAAe,mBAAmB9C,kBAAiB,KAAA;AAdpF,IAAeA,kBAAf;","names":["assertEx","globallyUnique","QueryBoundWitnessWrapper","AbstractModuleInstance","creatableModule","PayloadBuilder","WitnessConfigSchema","WitnessObserveQuerySchema","creatableModule","AbstractWitness","AbstractModuleInstance","_archivistInstance","archivist","config","queries","WitnessObserveQuerySchema","_queryAccountPaths","getArchivistInstance","archivistAddress","resolve","undefined","observe","inPayloads","_noOverride","started","emit","module","outPayloads","assertEx","observeHandler","payload","schema","insert","observeQuery","account","payloads","queryPayload","sendQuery","queryHandler","query","queryConfig","wrapper","QueryBoundWitnessWrapper","parseQuery","getQuery","queryable","resultPayloads","filteredObservation","PayloadBuilder","filterExclude","observePayloads","push","configSchemas","WitnessConfigSchema","uniqueName","globallyUnique"]}

package/package.json

@@ -10,17 +10,18 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xylabs/assert": "^3.0.24",
-    "@xylabs/promise": "^3.0.24",
-    "@xyo-network/account": "~2.94.3",
-    "@xyo-network/archivist-model": "~2.94.3",
-    "@xyo-network/boundwitness-model": "~2.94.3",
-    "@xyo-network/boundwitness-wrapper": "~2.94.3",
-    "@xyo-network/module-abstract": "~2.94.3",
-    "@xyo-network/module-model": "~2.94.3",
-    "@xyo-network/payload-builder": "~2.94.3",
-    "@xyo-network/payload-model": "~2.94.3",
-    "@xyo-network/witness-model": "~2.94.3"
+    "@xylabs/assert": "^3.0.25",
+    "@xylabs/object": "^3.0.25",
+    "@xylabs/promise": "^3.0.25",
+    "@xyo-network/account-model": "~2.94.5",
+    "@xyo-network/archivist-model": "~2.94.5",
+    "@xyo-network/boundwitness-model": "~2.94.5",
+    "@xyo-network/boundwitness-wrapper": "~2.94.5",
+    "@xyo-network/module-abstract": "~2.94.5",
+    "@xyo-network/module-model": "~2.94.5",
+    "@xyo-network/payload-builder": "~2.94.5",
+    "@xyo-network/payload-model": "~2.94.5",
+    "@xyo-network/witness-model": "~2.94.5"
   },
   "devDependencies": {
     "@xylabs/ts-scripts-yarn3": "^3.5.2",
@@ -66,6 +67,6 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
   "sideEffects": false,
-  "version": "2.94.3",
+  "version": "2.94.5",
   "type": "module"
 }

package/src/AbstractWitness.ts

@@ -1,11 +1,12 @@
 import { assertEx } from '@xylabs/assert'
+import { globallyUnique } from '@xylabs/object'
 import { Promisable } from '@xylabs/promise'
-import { globallyUnique } from '@xyo-network/account'
+import { AccountInstance } from '@xyo-network/account-model'
 import { ArchivistInstance } from '@xyo-network/archivist-model'
 import { QueryBoundWitness } from '@xyo-network/boundwitness-model'
 import { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'
 import { AbstractModuleInstance } from '@xyo-network/module-abstract'
-import { creatableModule, ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module-model'
+import { creatableModule, ModuleConfig, ModuleQueryHandlerResult, ModuleQueryResult } from '@xyo-network/module-model'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import { Payload } from '@xyo-network/payload-model'
 import {
@@ -13,6 +14,7 @@ import {
   WitnessConfigSchema,
   WitnessInstance,
   WitnessModuleEventData,
+  WitnessObserveQuery,
   WitnessObserveQuerySchema,
   WitnessParams,
   WitnessQueries,
@@ -76,6 +78,11 @@ export abstract class AbstractWitness<
     return outPayloads
   }
 
+  async observeQuery(account: AccountInstance, payloads?: TIn[]): Promise<ModuleQueryResult<TOut>> {
+    const queryPayload: WitnessObserveQuery = { schema: WitnessObserveQuerySchema }
+    return (await this.sendQuery(queryPayload, payloads, account)) as ModuleQueryResult<TOut>
+  }
+
   /** @function queryHandler Calls observe for an observe query.  Override to support additional queries. */
   protected override async queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(
     query: T,