@xyo-network/diviner-wrapper 2.52.1 → 2.53.0

package/dist/esm/DivinerWrapper.js

@@ -4,10 +4,6 @@ import { ModuleWrapper } from '@xyo-network/module';
 import { PayloadWrapper } from '@xyo-network/payload-wrapper';
 export class DivinerWrapper extends ModuleWrapper {
     static requiredQueries = [XyoDivinerDivineQuerySchema, ...super.requiredQueries];
-    constructor(params) {
-        super(params);
-        assertEx(params.module.queries.includes(XyoDivinerDivineQuerySchema));
-    }
     static tryWrap(module, account) {
         if (module) {
             const missingRequiredQueries = this.missingRequiredQueries(module);
@@ -15,7 +11,7 @@ export class DivinerWrapper extends ModuleWrapper {
                 //console.warn(`Missing queries: ${JSON.stringify(missingRequiredQueries, null, 2)}`)
             }
             else {
-                return new DivinerWrapper({ account, module });
+                return new DivinerWrapper({ account, module: module });
             }
         }
     }

package/dist/esm/DivinerWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"DivinerWrapper.js","sourceRoot":"","sources":["../../src/DivinerWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,OAAO,EAAwC,2BAA2B,EAAE,MAAM,4BAA4B,CAAA;AAC9G,OAAO,EAAE,aAAa,EAAuB,MAAM,qBAAqB,CAAA;AAGxE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D,MAAM,OAAO,cAAe,SAAQ,aAAa;IAC/C,MAAM,CAAU,eAAe,GAAG,CAAC,2BAA2B,EAAE,GAAG,KAAK,CAAC,eAAe,CAAC,CAAA;IAEzF,YAAY,MAA2B;QACrC,KAAK,CAAC,MAAM,CAAC,CAAA;QACb,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,2BAA2B,CAAC,CAAC,CAAA;IACvE,CAAC;IAED,MAAM,CAAU,OAAO,CAAC,MAAe,EAAE,OAAyB;QAChE,IAAI,MAAM,EAAE;YACV,MAAM,sBAAsB,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAA;YAClE,IAAI,sBAAsB,CAAC,MAAM,GAAG,CAAC,EAAE;gBACrC,qFAAqF;aACtF;iBAAM;gBACL,OAAO,IAAI,cAAc,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAA;aAC/C;SACF;IACH,CAAC;IAED,MAAM,CAAU,IAAI,CAAC,MAAe,EAAE,OAAyB;QAC7D,OAAO,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,yCAAyC,CAAC,CAAA;IAC3F,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,QAAuB;QAClC,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAAwB,EAAE,MAAM,EAAE,2BAA2B,EAAE,CAAC,CAAA;QACzG,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;QAC3D,OAAO,MAAM,CAAA;IACf,CAAC"}
+{"version":3,"file":"DivinerWrapper.js","sourceRoot":"","sources":["../../src/DivinerWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,OAAO,EAAwC,2BAA2B,EAAE,MAAM,4BAA4B,CAAA;AAC9G,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAGnD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D,MAAM,OAAO,cAAqE,SAAQ,aAA6B;IACrH,MAAM,CAAU,eAAe,GAAG,CAAC,2BAA2B,EAAE,GAAG,KAAK,CAAC,eAAe,CAAC,CAAA;IAEzF,MAAM,CAAU,OAAO,CAAC,MAAe,EAAE,OAAyB;QAChE,IAAI,MAAM,EAAE;YACV,MAAM,sBAAsB,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAA;YAClE,IAAI,sBAAsB,CAAC,MAAM,GAAG,CAAC,EAAE;gBACrC,qFAAqF;aACtF;iBAAM;gBACL,OAAO,IAAI,cAAc,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,MAAuB,EAAE,CAAC,CAAA;aACxE;SACF;IACH,CAAC;IAED,MAAM,CAAU,IAAI,CAAC,MAAe,EAAE,OAAyB;QAC7D,OAAO,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,yCAAyC,CAAC,CAAA;IAC3F,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,QAAuB;QAClC,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAAwB,EAAE,MAAM,EAAE,2BAA2B,EAAE,CAAC,CAAA;QACzG,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;QAC3D,OAAO,MAAM,CAAA;IACf,CAAC"}

package/dist/types/DivinerWrapper.d.ts

@@ -1,11 +1,10 @@
 import { AccountInstance } from '@xyo-network/account-model';
 import { DivinerModule } from '@xyo-network/diviner-model';
-import { ModuleWrapper, ModuleWrapperParams } from '@xyo-network/module';
+import { ModuleWrapper } from '@xyo-network/module';
 import { Module } from '@xyo-network/module-model';
 import { XyoPayload } from '@xyo-network/payload-model';
-export declare class DivinerWrapper extends ModuleWrapper implements DivinerModule {
+export declare class DivinerWrapper<TWrappedModule extends DivinerModule = DivinerModule> extends ModuleWrapper<TWrappedModule> implements DivinerModule {
     static requiredQueries: string[];
-    constructor(params: ModuleWrapperParams);
     static tryWrap(module?: Module, account?: AccountInstance): DivinerWrapper | undefined;
     static wrap(module?: Module, account?: AccountInstance): DivinerWrapper;
     divine(payloads?: XyoPayload[]): Promise<XyoPayload[]>;

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

@@ -1 +1 @@
-{"version":3,"file":"DivinerWrapper.d.ts","sourceRoot":"","sources":["../../src/DivinerWrapper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,aAAa,EAAsD,MAAM,4BAA4B,CAAA;AAC9G,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AACxE,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAGvD,qBAAa,cAAe,SAAQ,aAAc,YAAW,aAAa;IACxE,OAAgB,eAAe,WAA0D;gBAE7E,MAAM,EAAE,mBAAmB;WAKvB,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,cAAc,GAAG,SAAS;WAW/E,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,cAAc;IAI1E,MAAM,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;CAK7D"}
+{"version":3,"file":"DivinerWrapper.d.ts","sourceRoot":"","sources":["../../src/DivinerWrapper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,aAAa,EAAsD,MAAM,4BAA4B,CAAA;AAC9G,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAGvD,qBAAa,cAAc,CAAC,cAAc,SAAS,aAAa,GAAG,aAAa,CAAE,SAAQ,aAAa,CAAC,cAAc,CAAE,YAAW,aAAa;IAC9I,OAAgB,eAAe,WAA0D;WAEzE,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,cAAc,GAAG,SAAS;WAW/E,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,cAAc;IAI1E,MAAM,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;CAK7D"}

package/package.json

@@ -11,12 +11,12 @@
   },
   "dependencies": {
     "@xylabs/assert": "^2.7.4",
-    "@xyo-network/account-model": "^2.52.1",
-    "@xyo-network/diviner-model": "^2.52.1",
-    "@xyo-network/module": "^2.52.1",
-    "@xyo-network/module-model": "^2.52.1",
-    "@xyo-network/payload-model": "^2.52.1",
-    "@xyo-network/payload-wrapper": "^2.52.1"
+    "@xyo-network/account-model": "^2.53.0",
+    "@xyo-network/diviner-model": "^2.53.0",
+    "@xyo-network/module": "^2.53.0",
+    "@xyo-network/module-model": "^2.53.0",
+    "@xyo-network/payload-model": "^2.53.0",
+    "@xyo-network/payload-wrapper": "^2.53.0"
   },
   "devDependencies": {
     "@xylabs/ts-scripts-yarn3": "^2.16.1",
@@ -56,5 +56,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.52.1"
+  "version": "2.53.0"
 }

package/src/DivinerWrapper.ts

@@ -1,26 +1,21 @@
 import { assertEx } from '@xylabs/assert'
 import { AccountInstance } from '@xyo-network/account-model'
 import { DivinerModule, XyoDivinerDivineQuery, XyoDivinerDivineQuerySchema } from '@xyo-network/diviner-model'
-import { ModuleWrapper, ModuleWrapperParams } from '@xyo-network/module'
+import { ModuleWrapper } from '@xyo-network/module'
 import { Module } from '@xyo-network/module-model'
 import { XyoPayload } from '@xyo-network/payload-model'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 
-export class DivinerWrapper extends ModuleWrapper implements DivinerModule {
+export class DivinerWrapper<TWrappedModule extends DivinerModule = DivinerModule> extends ModuleWrapper<TWrappedModule> implements DivinerModule {
   static override requiredQueries = [XyoDivinerDivineQuerySchema, ...super.requiredQueries]
 
-  constructor(params: ModuleWrapperParams) {
-    super(params)
-    assertEx(params.module.queries.includes(XyoDivinerDivineQuerySchema))
-  }
-
   static override tryWrap(module?: Module, account?: AccountInstance): DivinerWrapper | undefined {
     if (module) {
       const missingRequiredQueries = this.missingRequiredQueries(module)
       if (missingRequiredQueries.length > 0) {
         //console.warn(`Missing queries: ${JSON.stringify(missingRequiredQueries, null, 2)}`)
       } else {
-        return new DivinerWrapper({ account, module })
+        return new DivinerWrapper({ account, module: module as DivinerModule })
       }
     }
   }