@xyo-network/diviner-wrapper 2.53.21 → 2.53.22

package/dist/esm/DivinerWrapper.js

@@ -1,23 +1,9 @@
-import { assertEx } from '@xylabs/assert';
 import { DivinerDivineQuerySchema } from '@xyo-network/diviner-model';
-import { ModuleWrapper } from '@xyo-network/module';
+import { constructableModuleWrapper, ModuleWrapper } from '@xyo-network/module';
 import { PayloadWrapper } from '@xyo-network/payload-wrapper';
+constructableModuleWrapper();
 export class DivinerWrapper extends ModuleWrapper {
     static requiredQueries = [DivinerDivineQuerySchema, ...super.requiredQueries];
-    static tryWrap(module, account) {
-        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: module });
-            }
-        }
-    }
-    static wrap(module, account) {
-        return assertEx(this.tryWrap(module, account), 'Unable to wrap module as DivinerWrapper');
-    }
     async divine(payloads) {
         const queryPayload = PayloadWrapper.parse({ schema: DivinerDivineQuerySchema });
         const result = await this.sendQuery(queryPayload, payloads);

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,EAAsB,wBAAwB,EAAiB,MAAM,4BAA4B,CAAA;AACxG,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,wBAAwB,EAAE,GAAG,KAAK,CAAC,eAAe,CAAC,CAAA;IAEtF,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,QAAoB;QAC/B,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAAqB,EAAE,MAAM,EAAE,wBAAwB,EAAE,CAAC,CAAA;QACnG,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,EAAsB,wBAAwB,EAAiB,MAAM,4BAA4B,CAAA;AACxG,OAAO,EAAE,0BAA0B,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAE/E,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D,0BAA0B,EAAE,CAAA;AAC5B,MAAM,OAAO,cAAqE,SAAQ,aAA6B;IACrH,MAAM,CAAU,eAAe,GAAG,CAAC,wBAAwB,EAAE,GAAG,KAAK,CAAC,eAAe,CAAC,CAAA;IAEtF,KAAK,CAAC,MAAM,CAAC,QAAoB;QAC/B,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAAqB,EAAE,MAAM,EAAE,wBAAwB,EAAE,CAAC,CAAA;QACnG,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,12 +1,8 @@
-import { AccountInstance } from '@xyo-network/account-model';
 import { DivinerModule } from '@xyo-network/diviner-model';
 import { ModuleWrapper } from '@xyo-network/module';
-import { Module } from '@xyo-network/module-model';
 import { Payload } from '@xyo-network/payload-model';
 export declare class DivinerWrapper<TWrappedModule extends DivinerModule = DivinerModule> extends ModuleWrapper<TWrappedModule> implements DivinerModule {
     static requiredQueries: string[];
-    static tryWrap(module?: Module, account?: AccountInstance): DivinerWrapper | undefined;
-    static wrap(module?: Module, account?: AccountInstance): DivinerWrapper;
     divine(payloads?: Payload[]): Promise<Payload[]>;
 }
 //# sourceMappingURL=DivinerWrapper.d.ts.map

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,EAAgD,aAAa,EAAE,MAAM,4BAA4B,CAAA;AACxG,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAGpD,qBAAa,cAAc,CAAC,cAAc,SAAS,aAAa,GAAG,aAAa,CAAE,SAAQ,aAAa,CAAC,cAAc,CAAE,YAAW,aAAa;IAC9I,OAAgB,eAAe,WAAuD;WAEtE,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,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CAKvD"}
+{"version":3,"file":"DivinerWrapper.d.ts","sourceRoot":"","sources":["../../src/DivinerWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgD,aAAa,EAAE,MAAM,4BAA4B,CAAA;AACxG,OAAO,EAA8B,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAC/E,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,qBAAa,cAAc,CAAC,cAAc,SAAS,aAAa,GAAG,aAAa,CAAE,SAAQ,aAAa,CAAC,cAAc,CAAE,YAAW,aAAa;IAC9I,OAAgB,eAAe,WAAuD;IAEhF,MAAM,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CAKvD"}

package/package.json

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

package/src/DivinerWrapper.ts

@@ -1,29 +1,12 @@
-import { assertEx } from '@xylabs/assert'
-import { AccountInstance } from '@xyo-network/account-model'
 import { DivinerDivineQuery, DivinerDivineQuerySchema, DivinerModule } from '@xyo-network/diviner-model'
-import { ModuleWrapper } from '@xyo-network/module'
-import { Module } from '@xyo-network/module-model'
+import { constructableModuleWrapper, ModuleWrapper } from '@xyo-network/module'
 import { Payload } from '@xyo-network/payload-model'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 
+constructableModuleWrapper()
 export class DivinerWrapper<TWrappedModule extends DivinerModule = DivinerModule> extends ModuleWrapper<TWrappedModule> implements DivinerModule {
   static override requiredQueries = [DivinerDivineQuerySchema, ...super.requiredQueries]
 
-  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: module as DivinerModule })
-      }
-    }
-  }
-
-  static override wrap(module?: Module, account?: AccountInstance): DivinerWrapper {
-    return assertEx(this.tryWrap(module, account), 'Unable to wrap module as DivinerWrapper')
-  }
-
   async divine(payloads?: Payload[]): Promise<Payload[]> {
     const queryPayload = PayloadWrapper.parse<DivinerDivineQuery>({ schema: DivinerDivineQuerySchema })
     const result = await this.sendQuery(queryPayload, payloads)