@xyo-network/diviner-wrapper 2.46.3 → 2.47.0

package/dist/esm/DivinerWrapper.js

@@ -3,10 +3,23 @@ import { XyoDivinerDivineQuerySchema } from '@xyo-network/diviner-model';
 import { ModuleWrapper } from '@xyo-network/module';
 import { PayloadWrapper } from '@xyo-network/payload-wrapper';
 export class DivinerWrapper extends ModuleWrapper {
+    static requiredQueries = [XyoDivinerDivineQuerySchema, ...super.requiredQueries];
     constructor(module) {
         super(module);
         assertEx(module.queries.includes(XyoDivinerDivineQuerySchema));
     }
+    static tryWrap(module) {
+        const missingRequiredQueries = this.missingRequiredQueries(module);
+        if (missingRequiredQueries.length > 0) {
+            console.warn(`Missing queries: ${JSON.stringify(missingRequiredQueries, null, 2)}`);
+        }
+        else {
+            return new DivinerWrapper(module);
+        }
+    }
+    static wrap(module) {
+        return assertEx(this.tryWrap(module), 'Unable to wrap module as DivinerWrapper');
+    }
     async divine(payloads) {
         const queryPayload = PayloadWrapper.parse({ schema: XyoDivinerDivineQuerySchema });
         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;AACzC,OAAO,EAAkC,2BAA2B,EAAE,MAAM,4BAA4B,CAAA;AACxG,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAGnD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D,MAAM,OAAO,cAAe,SAAQ,aAAa;IAC/C,YAAY,MAAc;QACxB,KAAK,CAAC,MAAM,CAAC,CAAA;QACb,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,2BAA2B,CAAC,CAAC,CAAA;IAChE,CAAC;IACD,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;CACF"}
+{"version":3,"file":"DivinerWrapper.js","sourceRoot":"","sources":["../../src/DivinerWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAiD,2BAA2B,EAAE,MAAM,4BAA4B,CAAA;AACvH,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAGnD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D,MAAM,OAAO,cAAe,SAAQ,aAAa;IAC/C,MAAM,CAAC,eAAe,GAAG,CAAC,2BAA2B,EAAE,GAAG,KAAK,CAAC,eAAe,CAAC,CAAA;IAEhF,YAAY,MAAc;QACxB,KAAK,CAAC,MAAM,CAAC,CAAA;QACb,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,2BAA2B,CAAC,CAAC,CAAA;IAChE,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,MAAc;QAC3B,MAAM,sBAAsB,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAA;QAClE,IAAI,sBAAsB,CAAC,MAAM,GAAG,CAAC,EAAE;YACrC,OAAO,CAAC,IAAI,CAAC,oBAAoB,IAAI,CAAC,SAAS,CAAC,sBAAsB,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;SACpF;aAAM;YACL,OAAO,IAAI,cAAc,CAAC,MAAuB,CAAC,CAAA;SACnD;IACH,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,MAAc;QACxB,OAAO,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,yCAAyC,CAAC,CAAA;IAClF,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

@@ -3,7 +3,10 @@ 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 Diviner {
+    static requiredQueries: string[];
     constructor(module: Module);
+    static tryWrap(module: Module): DivinerWrapper | undefined;
+    static wrap(module: Module): DivinerWrapper;
     divine(payloads?: XyoPayload[]): Promise<XyoPayload[]>;
 }
 //# 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,OAAO,EAAsD,MAAM,4BAA4B,CAAA;AACxG,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,cAAe,SAAQ,aAAc,YAAW,OAAO;gBACtD,MAAM,EAAE,MAAM;IAIpB,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,OAAO,EAAqE,MAAM,4BAA4B,CAAA;AACvH,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,cAAe,SAAQ,aAAc,YAAW,OAAO;IAClE,MAAM,CAAC,eAAe,WAA0D;gBAEpE,MAAM,EAAE,MAAM;IAK1B,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IAS1D,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,cAAc;IAIrC,MAAM,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;CAK7D"}

package/package.json

@@ -11,11 +11,11 @@
   },
   "dependencies": {
     "@xylabs/assert": "^2.7.1",
-    "@xyo-network/diviner-model": "^2.46.3",
-    "@xyo-network/module": "^2.46.3",
-    "@xyo-network/module-model": "^2.46.3",
-    "@xyo-network/payload-model": "^2.46.3",
-    "@xyo-network/payload-wrapper": "^2.46.3"
+    "@xyo-network/diviner-model": "^2.47.0",
+    "@xyo-network/module": "^2.47.0",
+    "@xyo-network/module-model": "^2.47.0",
+    "@xyo-network/payload-model": "^2.47.0",
+    "@xyo-network/payload-wrapper": "^2.47.0"
   },
   "devDependencies": {
     "@xylabs/ts-scripts-yarn3": "^2.14.15",
@@ -55,5 +55,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.46.3"
+  "version": "2.47.0"
 }

package/src/DivinerWrapper.ts

@@ -1,15 +1,31 @@
 import { assertEx } from '@xylabs/assert'
-import { Diviner, XyoDivinerDivineQuery, XyoDivinerDivineQuerySchema } from '@xyo-network/diviner-model'
+import { Diviner, DivinerModule, XyoDivinerDivineQuery, XyoDivinerDivineQuerySchema } from '@xyo-network/diviner-model'
 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 Diviner {
+  static requiredQueries = [XyoDivinerDivineQuerySchema, ...super.requiredQueries]
+
   constructor(module: Module) {
     super(module)
     assertEx(module.queries.includes(XyoDivinerDivineQuerySchema))
   }
+
+  static tryWrap(module: Module): DivinerWrapper | undefined {
+    const missingRequiredQueries = this.missingRequiredQueries(module)
+    if (missingRequiredQueries.length > 0) {
+      console.warn(`Missing queries: ${JSON.stringify(missingRequiredQueries, null, 2)}`)
+    } else {
+      return new DivinerWrapper(module as DivinerModule)
+    }
+  }
+
+  static wrap(module: Module): DivinerWrapper {
+    return assertEx(this.tryWrap(module), 'Unable to wrap module as DivinerWrapper')
+  }
+
   async divine(payloads?: XyoPayload[]): Promise<XyoPayload[]> {
     const queryPayload = PayloadWrapper.parse<XyoDivinerDivineQuery>({ schema: XyoDivinerDivineQuerySchema })
     const result = await this.sendQuery(queryPayload, payloads)