@xyo-network/witness 2.33.13 → 2.33.15

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

@@ -3,5 +3,5 @@ import { XyoPayload } from '@xyo-network/payload';
 import { XyoWitnessObserveQuery } from './Observe';
 export * from './Observe';
 export declare type XyoWitnessQueryBase<TTarget extends XyoPayload = XyoPayload> = XyoWitnessObserveQuery<TTarget>;
-export declare type XyoWitnessQuery<TTarget extends XyoPayload = XyoPayload, TQuery extends XyoQuery | void = void> = TQuery extends XyoQuery ? XyoModuleQuery<XyoWitnessQueryBase<TTarget> | TQuery> : XyoModuleQuery<XyoWitnessQueryBase<TTarget>>;
+export declare type XyoWitnessQuery<TTarget extends XyoPayload = XyoPayload, TQuery extends XyoQuery | void = void> = XyoModuleQuery<TQuery extends XyoQuery ? XyoWitnessQueryBase<TTarget> | TQuery : XyoWitnessQueryBase<TTarget>>;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Queries/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAA;AAElD,cAAc,WAAW,CAAA;AAEzB,oBAAY,mBAAmB,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,IAAI,sBAAsB,CAAC,OAAO,CAAC,CAAA;AAE1G,oBAAY,eAAe,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,EAAE,MAAM,SAAS,QAAQ,GAAG,IAAI,GAAG,IAAI,IAAI,MAAM,SAAS,QAAQ,GACjI,cAAc,CAAC,mBAAmB,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,GACrD,cAAc,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Queries/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAA;AAElD,cAAc,WAAW,CAAA;AAEzB,oBAAY,mBAAmB,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,IAAI,sBAAsB,CAAC,OAAO,CAAC,CAAA;AAE1G,oBAAY,eAAe,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,EAAE,MAAM,SAAS,QAAQ,GAAG,IAAI,GAAG,IAAI,IAAI,cAAc,CAC1H,MAAM,SAAS,QAAQ,GAAG,mBAAmB,CAAC,OAAO,CAAC,GAAG,MAAM,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAC/F,CAAA"}

package/dist/esm/Witness.d.ts

@@ -1,7 +1,7 @@
-import { Module, XyoQuery } from '@xyo-network/module';
+import { Module } from '@xyo-network/module';
 import { XyoPayload } from '@xyo-network/payload';
 import { Promisable } from '@xyo-network/promise';
-export interface Witness<TTarget extends XyoPayload = XyoPayload, TQuery extends XyoQuery = XyoQuery> extends Module<TQuery> {
+export interface Witness<TTarget extends XyoPayload = XyoPayload> extends Module {
     observe: (fields?: Partial<TTarget> | undefined) => Promisable<TTarget | null>;
 }
 //# sourceMappingURL=Witness.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,MAAM,WAAW,OAAO,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,EAAE,MAAM,SAAS,QAAQ,GAAG,QAAQ,CAAE,SAAQ,MAAM,CAAC,MAAM,CAAC;IAC1H,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,SAAS,KAAK,UAAU,CAAC,OAAO,GAAG,IAAI,CAAC,CAAA;CAC/E"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,MAAM,WAAW,OAAO,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,CAAE,SAAQ,MAAM;IAC9E,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,SAAS,KAAK,UAAU,CAAC,OAAO,GAAG,IAAI,CAAC,CAAA;CAC/E"}

package/dist/esm/XyoWitness.d.ts

@@ -1,16 +1,15 @@
 import { XyoAccount } from '@xyo-network/account';
-import { XyoModule } from '@xyo-network/module';
+import { XyoModule, XyoQuery } from '@xyo-network/module';
 import { XyoPayload } from '@xyo-network/payload';
 import { Promisable } from '@xyo-network/promise';
 import { XyoWitnessConfig } from './Config';
-import { XyoWitnessQuery } from './Queries';
 import { Witness } from './Witness';
-export declare class XyoWitness<TTarget extends XyoPayload = XyoPayload, TConfig extends XyoWitnessConfig<TTarget> = XyoWitnessConfig<TTarget>, TQuery extends XyoWitnessQuery<TTarget> = XyoWitnessQuery<TTarget>> extends XyoModule<TQuery, TConfig> implements Witness<TTarget, TQuery> {
+export declare class XyoWitness<TTarget extends XyoPayload = XyoPayload, TConfig extends XyoWitnessConfig<TTarget> = XyoWitnessConfig<TTarget>> extends XyoModule<TConfig> implements Witness<TTarget> {
     constructor(config?: TConfig, account?: XyoAccount, resolver?: (address: string) => XyoModule);
     get targetSchema(): TTarget["schema"] | undefined;
-    queries(): ("network.xyo.query.witness.observe" | TQuery["schema"])[];
+    queries(): string[];
     observe(fields?: Partial<TTarget> | undefined): Promisable<TTarget>;
-    query(query: TQuery): Promise<import("@xyo-network/module").XyoModuleQueryResult<import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
+    query<T extends XyoQuery = XyoQuery>(query: T): Promise<import("@xyo-network/module").XyoModuleQueryResult<import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
         schema: string;
     }>>;
 }

package/dist/esm/XyoWitness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"XyoWitness.d.ts","sourceRoot":"","sources":["../../src/XyoWitness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAC3C,OAAO,EAAgC,eAAe,EAAE,MAAM,WAAW,CAAA;AACzE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,qBAAa,UAAU,CACnB,OAAO,SAAS,UAAU,GAAG,UAAU,EACvC,OAAO,SAAS,gBAAgB,CAAC,OAAO,CAAC,GAAG,gBAAgB,CAAC,OAAO,CAAC,EACrE,MAAM,SAAS,eAAe,CAAC,OAAO,CAAC,GAAG,eAAe,CAAC,OAAO,CAAC,CAEpE,SAAQ,SAAS,CAAC,MAAM,EAAE,OAAO,CACjC,YAAW,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC;gBAGvB,MAAM,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,SAAS;IAI7F,IAAW,YAAY,kCAEtB;IAEQ,OAAO;IAIT,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,SAAS,GAAG,UAAU,CAAC,OAAO,CAAC;IAI3D,KAAK,CAAC,KAAK,EAAE,MAAM;;;CAanC"}
+{"version":3,"file":"XyoWitness.d.ts","sourceRoot":"","sources":["../../src/XyoWitness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,qBAAa,UAAU,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,EAAE,OAAO,SAAS,gBAAgB,CAAC,OAAO,CAAC,GAAG,gBAAgB,CAAC,OAAO,CAAC,CACpI,SAAQ,SAAS,CAAC,OAAO,CACzB,YAAW,OAAO,CAAC,OAAO,CAAC;gBAGf,MAAM,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,SAAS;IAI7F,IAAW,YAAY,kCAEtB;IAEQ,OAAO;IAIT,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,SAAS,GAAG,UAAU,CAAC,OAAO,CAAC;IAI3D,KAAK,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAAE,KAAK,EAAE,CAAC;;;CAc7D"}

package/dist/esm/XyoWitness.js

@@ -17,13 +17,14 @@ export class XyoWitness extends XyoModule {
     }
     async query(query) {
         const queryAccount = new XyoAccount();
-        switch (query.schema) {
+        const typedQuery = query;
+        switch (typedQuery.schema) {
             case XyoWitnessObserveQuerySchema: {
-                const payloads = [await this.observe(query?.payload)];
+                const payloads = [await this.observe(typedQuery?.payload)];
                 return this.bindPayloads(payloads, queryAccount);
             }
             default: {
-                return super.query(query);
+                return super.query(typedQuery);
             }
         }
     }

package/dist/esm/XyoWitness.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoWitness.js","sourceRoot":"","sources":["../../src/XyoWitness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAK/C,OAAO,EAAE,4BAA4B,EAAmB,MAAM,WAAW,CAAA;AAGzE,MAAM,OAAO,UAKX,SAAQ,SAA0B;IAGlC,mCAAmC;IACnC,YAAY,MAAgB,EAAE,OAAoB,EAAE,QAAyC;QAC3F,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;IAClC,CAAC;IAED,IAAW,YAAY;QACrB,OAAO,IAAI,CAAC,MAAM,EAAE,YAAY,CAAA;IAClC,CAAC;IAEQ,OAAO;QACd,OAAO,CAAC,4BAA4B,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAC3D,CAAC;IAEM,OAAO,CAAC,MAAqC;QAClD,OAAO,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,YAAY,EAAa,CAAA;IAC5D,CAAC;IAEQ,KAAK,CAAC,KAAK,CAAC,KAAa;QAChC,MAAM,YAAY,GAAG,IAAI,UAAU,EAAE,CAAA;QACrC,QAAQ,KAAK,CAAC,MAAM,EAAE;YACpB,KAAK,4BAA4B,CAAC,CAAC;gBACjC,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAA;gBACrD,OAAO,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;aACjD;YAED,OAAO,CAAC,CAAC;gBACP,OAAO,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;aAC1B;SACF;IACH,CAAC;CACF"}
+{"version":3,"file":"XyoWitness.js","sourceRoot":"","sources":["../../src/XyoWitness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,SAAS,EAAY,MAAM,qBAAqB,CAAA;AAKzD,OAAO,EAAE,4BAA4B,EAAmB,MAAM,WAAW,CAAA;AAGzE,MAAM,OAAO,UACX,SAAQ,SAAkB;IAG1B,mCAAmC;IACnC,YAAY,MAAgB,EAAE,OAAoB,EAAE,QAAyC;QAC3F,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;IAClC,CAAC;IAED,IAAW,YAAY;QACrB,OAAO,IAAI,CAAC,MAAM,EAAE,YAAY,CAAA;IAClC,CAAC;IAEQ,OAAO;QACd,OAAO,CAAC,4BAA4B,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAC3D,CAAC;IAEM,OAAO,CAAC,MAAqC;QAClD,OAAO,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,YAAY,EAAa,CAAA;IAC5D,CAAC;IAEQ,KAAK,CAAC,KAAK,CAAgC,KAAQ;QAC1D,MAAM,YAAY,GAAG,IAAI,UAAU,EAAE,CAAA;QACrC,MAAM,UAAU,GAAG,KAAiC,CAAA;QACpD,QAAQ,UAAU,CAAC,MAAM,EAAE;YACzB,KAAK,4BAA4B,CAAC,CAAC;gBACjC,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAA;gBAC1D,OAAO,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;aACjD;YAED,OAAO,CAAC,CAAC;gBACP,OAAO,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;aAC/B;SACF;IACH,CAAC;CACF"}

package/package.json

@@ -10,10 +10,10 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xyo-network/account": "^2.33.13",
-    "@xyo-network/module": "^2.33.13",
-    "@xyo-network/payload": "^2.33.13",
-    "@xyo-network/promise": "^2.33.13",
+    "@xyo-network/account": "^2.33.15",
+    "@xyo-network/module": "^2.33.15",
+    "@xyo-network/payload": "^2.33.15",
+    "@xyo-network/promise": "^2.33.15",
     "tslib": "^2.4.0"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -49,5 +49,5 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.33.13"
+  "version": "2.33.15"
 }

package/src/Queries/index.ts

@@ -7,6 +7,6 @@ export * from './Observe'
 
 export type XyoWitnessQueryBase<TTarget extends XyoPayload = XyoPayload> = XyoWitnessObserveQuery<TTarget>
 
-export type XyoWitnessQuery<TTarget extends XyoPayload = XyoPayload, TQuery extends XyoQuery | void = void> = TQuery extends XyoQuery
-  ? XyoModuleQuery<XyoWitnessQueryBase<TTarget> | TQuery>
-  : XyoModuleQuery<XyoWitnessQueryBase<TTarget>>
+export type XyoWitnessQuery<TTarget extends XyoPayload = XyoPayload, TQuery extends XyoQuery | void = void> = XyoModuleQuery<
+  TQuery extends XyoQuery ? XyoWitnessQueryBase<TTarget> | TQuery : XyoWitnessQueryBase<TTarget>
+>

package/src/Witness.ts

@@ -1,7 +1,7 @@
-import { Module, XyoQuery } from '@xyo-network/module'
+import { Module } from '@xyo-network/module'
 import { XyoPayload } from '@xyo-network/payload'
 import { Promisable } from '@xyo-network/promise'
 
-export interface Witness<TTarget extends XyoPayload = XyoPayload, TQuery extends XyoQuery = XyoQuery> extends Module<TQuery> {
+export interface Witness<TTarget extends XyoPayload = XyoPayload> extends Module {
   observe: (fields?: Partial<TTarget> | undefined) => Promisable<TTarget | null>
 }

package/src/XyoWitness.ts

@@ -1,5 +1,5 @@
 import { XyoAccount } from '@xyo-network/account'
-import { XyoModule } from '@xyo-network/module'
+import { XyoModule, XyoQuery } from '@xyo-network/module'
 import { XyoPayload } from '@xyo-network/payload'
 import { Promisable } from '@xyo-network/promise'
 
@@ -7,13 +7,9 @@ import { XyoWitnessConfig } from './Config'
 import { XyoWitnessObserveQuerySchema, XyoWitnessQuery } from './Queries'
 import { Witness } from './Witness'
 
-export class XyoWitness<
-    TTarget extends XyoPayload = XyoPayload,
-    TConfig extends XyoWitnessConfig<TTarget> = XyoWitnessConfig<TTarget>,
-    TQuery extends XyoWitnessQuery<TTarget> = XyoWitnessQuery<TTarget>,
-  >
-  extends XyoModule<TQuery, TConfig>
-  implements Witness<TTarget, TQuery>
+export class XyoWitness<TTarget extends XyoPayload = XyoPayload, TConfig extends XyoWitnessConfig<TTarget> = XyoWitnessConfig<TTarget>>
+  extends XyoModule<TConfig>
+  implements Witness<TTarget>
 {
   //we require a config for witnesses
   constructor(config?: TConfig, account?: XyoAccount, resolver?: (address: string) => XyoModule) {
@@ -32,16 +28,17 @@ export class XyoWitness<
     return { ...fields, schema: this.targetSchema } as TTarget
   }
 
-  override async query(query: TQuery) {
+  override async query<T extends XyoQuery = XyoQuery>(query: T) {
     const queryAccount = new XyoAccount()
-    switch (query.schema) {
+    const typedQuery = query as XyoWitnessQuery<TTarget>
+    switch (typedQuery.schema) {
       case XyoWitnessObserveQuerySchema: {
-        const payloads = [await this.observe(query?.payload)]
+        const payloads = [await this.observe(typedQuery?.payload)]
         return this.bindPayloads(payloads, queryAccount)
       }
 
       default: {
-        return super.query(query)
+        return super.query(typedQuery)
       }
     }
   }