@xyo-network/diviner 2.31.5 → 2.32.0-rc.3

package/src/Payload/XyoHuriPayload.ts

@@ -1,7 +1,7 @@
 import { XyoPayload } from '@xyo-network/payload'
 
-export type XyoHuriPayloadSchema = 'network.xyo.huri'
-export const XyoHuriPayloadSchema: XyoHuriPayloadSchema = 'network.xyo.huri'
+export type XyoHuriSchema = 'network.xyo.huri'
+export const XyoHuriSchema: XyoHuriSchema = 'network.xyo.huri'
 
 export type XyoHuriPayload = XyoPayload<{
   schema: 'network.xyo.huri'

package/src/Payload/XyoPayloadDiviner.ts

@@ -1,11 +1,11 @@
 import { XyoPayload } from '@xyo-network/payload'
 
 import { XyoDivinerConfig } from '../Config'
-import { XyoDivinerQueryPayload } from '../Query'
+import { XyoDivinerQuery } from '../Queries'
 import { XyoDiviner } from '../XyoDiviner'
 
 export abstract class XyoPayloadDiviner<
   T extends XyoPayload = XyoPayload,
   C extends XyoDivinerConfig<T> = XyoDivinerConfig<T>,
-  Q extends XyoDivinerQueryPayload<T> = XyoDivinerQueryPayload<T>,
+  Q extends XyoDivinerQuery<T> = XyoDivinerQuery<T>,
 > extends XyoDiviner<T, C, Q> {}

package/src/{Query → Queries}/Divine.ts

@@ -1,10 +1,10 @@
-import { XyoQueryPayload } from '@xyo-network/module'
+import { XyoQuery } from '@xyo-network/module'
 import { XyoPayload, XyoPayloads } from '@xyo-network/payload'
 
 export type XyoDivinerDivineQuerySchema = 'network.xyo.query.diviner.divine'
 export const XyoDivinerDivineQuerySchema: XyoDivinerDivineQuerySchema = 'network.xyo.query.diviner.divine'
 
-export type XyoDivinerDivineQueryPayload<T extends XyoPayload = XyoPayload> = XyoQueryPayload<{
+export type XyoDivinerDivineQuery<T extends XyoPayload = XyoPayload> = XyoQuery<{
   schema: XyoDivinerDivineQuerySchema
   payloads?: XyoPayloads<T>
 }>

package/src/Queries/Payload.ts

@@ -0,0 +1,6 @@
+import { XyoModuleQuery } from '@xyo-network/module'
+import { XyoPayload } from '@xyo-network/payload'
+
+import { XyoDivinerDivineQuery } from './Divine'
+
+export type XyoDivinerQuery<T extends XyoPayload = XyoPayload> = XyoDivinerDivineQuery<T> | XyoModuleQuery

package/src/{Query → Queries}/Schema.ts

@@ -1,5 +1,5 @@
-import { XyoModuleQueryPayloadSchema } from '@xyo-network/module'
+import { XyoModuleQuerySchema } from '@xyo-network/module'
 
 import { XyoDivinerDivineQuerySchema } from './Divine'
 
-export type XyoDivinerQuerySchema = XyoDivinerDivineQuerySchema | XyoModuleQueryPayloadSchema
+export type XyoDivinerQuerySchema = XyoDivinerDivineQuerySchema | XyoModuleQuerySchema

package/src/XyoDiviner.ts

@@ -1,31 +1,31 @@
-import { XyoModule, XyoModuleQueryResult } from '@xyo-network/module'
+import { XyoModule, XyoModuleInitializeQuerySchema, XyoModuleQueryResult, XyoModuleShutdownQuerySchema } from '@xyo-network/module'
 import { XyoPayload, XyoPayloads } from '@xyo-network/payload'
 import { Promisable } from '@xyo-network/promisable'
 
 import { XyoDivinerConfig } from './Config'
-import { Diviner } from './Diviner'
-import { XyoDivinerDivineQuerySchema, XyoDivinerQueryPayload, XyoDivinerQuerySchema } from './Query'
+import { DivinerModule } from './Diviner'
+import { XyoDivinerDivineQuerySchema, XyoDivinerQuery, XyoDivinerQuerySchema } from './Queries'
 
 export abstract class XyoDiviner<
-    TPayload extends XyoPayload = XyoPayload,
-    TConfig extends XyoDivinerConfig<TPayload> = XyoDivinerConfig<TPayload>,
-    TQuery extends XyoDivinerQueryPayload<TPayload> = XyoDivinerQueryPayload<TPayload>,
+    TDivineResult extends XyoPayload = XyoPayload,
+    TConfig extends XyoDivinerConfig = XyoDivinerConfig,
+    TQuery extends XyoDivinerQuery<TDivineResult> = XyoDivinerQuery<TDivineResult>,
   >
-  extends XyoModule<TConfig>
-  implements Diviner<TPayload | null>
+  extends XyoModule<TConfig, TQuery, TDivineResult>
+  implements DivinerModule<TDivineResult, TQuery, TDivineResult>
 {
-  abstract divine(payloads?: XyoPayloads<TPayload>): Promisable<TPayload | null>
+  abstract divine(payloads?: XyoPayloads<TDivineResult>): Promisable<TDivineResult | null>
 
-  public override get queries(): (TQuery['schema'] | XyoDivinerQuerySchema)[] {
-    return [XyoDivinerDivineQuerySchema]
+  public override queries(): (TQuery['schema'] | XyoDivinerQuerySchema)[] {
+    return [XyoModuleInitializeQuerySchema, XyoModuleShutdownQuerySchema, XyoDivinerDivineQuerySchema]
   }
 
-  async query(query: TQuery): Promise<XyoModuleQueryResult> {
-    if (!this.queries.find((schema) => schema === query.schema)) {
+  async query(query: TQuery): Promise<XyoModuleQueryResult<TDivineResult>> {
+    if (!this.queries().find((schema) => schema === query.schema)) {
       console.error(`Undeclared Module Query: ${query.schema}`)
     }
 
-    const payloads: (TPayload | null)[] = []
+    const payloads: (TDivineResult | null)[] = []
     switch (query.schema) {
       case XyoDivinerDivineQuerySchema:
         payloads.push(await this.divine(query.payloads))
@@ -38,17 +38,17 @@ export abstract class XyoDiviner<
 export abstract class XyoTimestampDiviner<
   TPayload extends XyoPayload = XyoPayload,
   TConfig extends XyoDivinerConfig<TPayload> = XyoDivinerConfig<TPayload>,
-  TQuery extends XyoDivinerQueryPayload<TPayload> = XyoDivinerQueryPayload<TPayload>,
+  TQuery extends XyoDivinerQuery<TPayload> = XyoDivinerQuery<TPayload>,
 > extends XyoDiviner<TPayload, TConfig, TQuery> {}
 
 /** @deprecated use XyoDiviner instead*/
 export abstract class XyoAbstractDiviner<
   TConfig extends XyoDivinerConfig = XyoDivinerConfig,
-  TQuery extends XyoDivinerQueryPayload = XyoDivinerQueryPayload,
+  TQuery extends XyoDivinerQuery = XyoDivinerQuery,
 > extends XyoDiviner<XyoPayload, TConfig, TQuery> {}
 
 /** @deprecated use XyoDiviner instead*/
 export abstract class XyoAbstractTimestampDiviner<
   TConfig extends XyoDivinerConfig = XyoDivinerConfig,
-  TQuery extends XyoDivinerQueryPayload = XyoDivinerQueryPayload,
+  TQuery extends XyoDivinerQuery = XyoDivinerQuery,
 > extends XyoTimestampDiviner<XyoPayload, TConfig, TQuery> {}

package/src/XyoDivinerWrapper.ts

@@ -1,22 +1,12 @@
-import { XyoModule } from '@xyo-network/module'
+import { XyoModuleWrapper } from '@xyo-network/module'
 import { XyoPayload, XyoPayloads } from '@xyo-network/payload'
 
 import { Diviner } from './Diviner'
-import { XyoDivinerDivineQueryPayload, XyoDivinerDivineQuerySchema } from './Query'
-
-export class XyoDivinerWrapper implements Diviner<XyoPayload | null> {
-  protected module: XyoModule
-
-  constructor(module: XyoModule) {
-    this.module = module
-  }
-
-  public get queries() {
-    return this.module.queries
-  }
+import { XyoDivinerDivineQuery, XyoDivinerDivineQuerySchema } from './Queries'
 
+export class XyoDivinerWrapper extends XyoModuleWrapper implements Diviner {
   async divine(payloads?: XyoPayloads): Promise<XyoPayload | null> {
-    const query: XyoDivinerDivineQueryPayload = { payloads, schema: XyoDivinerDivineQuerySchema }
+    const query: XyoDivinerDivineQuery = { payloads, schema: XyoDivinerDivineQuerySchema }
     return (await this.module.query(query))[1][0]
   }
 }

package/src/index.ts

@@ -1,7 +1,6 @@
 export * from './Config'
 export * from './Diviner'
-export * from './PartialDivinerConfig'
 export * from './Payload'
-export * from './Query'
+export * from './Queries'
 export * from './XyoDiviner'
 export * from './XyoDivinerWrapper'

package/dist/cjs/PartialDivinerConfig.d.ts

@@ -1,5 +0,0 @@
-import { XyoDivinerConfig } from './Config';
-export declare type PartialDivinerConfig<T extends XyoDivinerConfig> = Omit<T, 'schema'> & {
-    schema?: T['schema'];
-};
-//# sourceMappingURL=PartialDivinerConfig.d.ts.map

package/dist/cjs/PartialDivinerConfig.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"PartialDivinerConfig.d.ts","sourceRoot":"","sources":["../../src/PartialDivinerConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAE3C,oBAAY,oBAAoB,CAAC,CAAC,SAAS,gBAAgB,IAAI,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG;IACjF,MAAM,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAA;CACrB,CAAA"}

package/dist/cjs/PartialDivinerConfig.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=PartialDivinerConfig.js.map

package/dist/cjs/PartialDivinerConfig.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"PartialDivinerConfig.js","sourceRoot":"","sources":["../../src/PartialDivinerConfig.ts"],"names":[],"mappings":""}

package/dist/cjs/Query/Divine.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Divine.d.ts","sourceRoot":"","sources":["../../../src/Query/Divine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAE9D,oBAAY,2BAA2B,GAAG,kCAAkC,CAAA;AAC5E,eAAO,MAAM,2BAA2B,EAAE,2BAAgE,CAAA;AAE1G,oBAAY,4BAA4B,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IAAI,eAAe,CAAC;IAC5F,MAAM,EAAE,2BAA2B,CAAA;IACnC,QAAQ,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAA;CAC1B,CAAC,CAAA"}

package/dist/cjs/Query/Divine.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Divine.js","sourceRoot":"","sources":["../../../src/Query/Divine.ts"],"names":[],"mappings":";;;AAIa,QAAA,2BAA2B,GAAgC,kCAAkC,CAAA"}

package/dist/cjs/Query/Payload.d.ts

@@ -1,5 +0,0 @@
-import { XyoModuleQueryPayload } from '@xyo-network/module';
-import { XyoPayload } from '@xyo-network/payload';
-import { XyoDivinerDivineQueryPayload } from './Divine';
-export declare type XyoDivinerQueryPayload<T extends XyoPayload = XyoPayload> = XyoDivinerDivineQueryPayload<T> | XyoModuleQueryPayload;
-//# sourceMappingURL=Payload.d.ts.map

package/dist/cjs/Query/Payload.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Payload.d.ts","sourceRoot":"","sources":["../../../src/Query/Payload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAA;AAEvD,oBAAY,sBAAsB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IAAI,4BAA4B,CAAC,CAAC,CAAC,GAAG,qBAAqB,CAAA"}

package/dist/cjs/Query/Schema.d.ts

@@ -1,4 +0,0 @@
-import { XyoModuleQueryPayloadSchema } from '@xyo-network/module';
-import { XyoDivinerDivineQuerySchema } from './Divine';
-export declare type XyoDivinerQuerySchema = XyoDivinerDivineQuerySchema | XyoModuleQueryPayloadSchema;
-//# sourceMappingURL=Schema.d.ts.map

package/dist/cjs/Query/Schema.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Schema.d.ts","sourceRoot":"","sources":["../../../src/Query/Schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAA;AAEjE,OAAO,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAA;AAEtD,oBAAY,qBAAqB,GAAG,2BAA2B,GAAG,2BAA2B,CAAA"}

package/dist/cjs/Query/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Query/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA"}

package/dist/cjs/Query/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Query/index.ts"],"names":[],"mappings":";;;AAAA,mDAAwB;AACxB,oDAAyB;AACzB,mDAAwB"}

package/dist/esm/PartialDivinerConfig.d.ts

@@ -1,5 +0,0 @@
-import { XyoDivinerConfig } from './Config';
-export declare type PartialDivinerConfig<T extends XyoDivinerConfig> = Omit<T, 'schema'> & {
-    schema?: T['schema'];
-};
-//# sourceMappingURL=PartialDivinerConfig.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"PartialDivinerConfig.d.ts","sourceRoot":"","sources":["../../src/PartialDivinerConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAE3C,oBAAY,oBAAoB,CAAC,CAAC,SAAS,gBAAgB,IAAI,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG;IACjF,MAAM,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAA;CACrB,CAAA"}

package/dist/esm/PartialDivinerConfig.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=PartialDivinerConfig.js.map

package/dist/esm/PartialDivinerConfig.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"PartialDivinerConfig.js","sourceRoot":"","sources":["../../src/PartialDivinerConfig.ts"],"names":[],"mappings":""}

package/dist/esm/Query/Divine.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Divine.d.ts","sourceRoot":"","sources":["../../../src/Query/Divine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAE9D,oBAAY,2BAA2B,GAAG,kCAAkC,CAAA;AAC5E,eAAO,MAAM,2BAA2B,EAAE,2BAAgE,CAAA;AAE1G,oBAAY,4BAA4B,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IAAI,eAAe,CAAC;IAC5F,MAAM,EAAE,2BAA2B,CAAA;IACnC,QAAQ,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAA;CAC1B,CAAC,CAAA"}

package/dist/esm/Query/Divine.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Divine.js","sourceRoot":"","sources":["../../../src/Query/Divine.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,2BAA2B,GAAgC,kCAAkC,CAAA"}

package/dist/esm/Query/Payload.d.ts

@@ -1,5 +0,0 @@
-import { XyoModuleQueryPayload } from '@xyo-network/module';
-import { XyoPayload } from '@xyo-network/payload';
-import { XyoDivinerDivineQueryPayload } from './Divine';
-export declare type XyoDivinerQueryPayload<T extends XyoPayload = XyoPayload> = XyoDivinerDivineQueryPayload<T> | XyoModuleQueryPayload;
-//# sourceMappingURL=Payload.d.ts.map

package/dist/esm/Query/Payload.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Payload.d.ts","sourceRoot":"","sources":["../../../src/Query/Payload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAA;AAEvD,oBAAY,sBAAsB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IAAI,4BAA4B,CAAC,CAAC,CAAC,GAAG,qBAAqB,CAAA"}

package/dist/esm/Query/Schema.d.ts

@@ -1,4 +0,0 @@
-import { XyoModuleQueryPayloadSchema } from '@xyo-network/module';
-import { XyoDivinerDivineQuerySchema } from './Divine';
-export declare type XyoDivinerQuerySchema = XyoDivinerDivineQuerySchema | XyoModuleQueryPayloadSchema;
-//# sourceMappingURL=Schema.d.ts.map

package/dist/esm/Query/Schema.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Schema.d.ts","sourceRoot":"","sources":["../../../src/Query/Schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAA;AAEjE,OAAO,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAA;AAEtD,oBAAY,qBAAqB,GAAG,2BAA2B,GAAG,2BAA2B,CAAA"}

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Query/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA"}

package/dist/esm/Query/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Query/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA"}

package/src/PartialDivinerConfig.ts

@@ -1,5 +0,0 @@
-import { XyoDivinerConfig } from './Config'
-
-export type PartialDivinerConfig<T extends XyoDivinerConfig> = Omit<T, 'schema'> & {
-  schema?: T['schema']
-}

package/src/Query/Payload.ts

@@ -1,6 +0,0 @@
-import { XyoModuleQueryPayload } from '@xyo-network/module'
-import { XyoPayload } from '@xyo-network/payload'
-
-import { XyoDivinerDivineQueryPayload } from './Divine'
-
-export type XyoDivinerQueryPayload<T extends XyoPayload = XyoPayload> = XyoDivinerDivineQueryPayload<T> | XyoModuleQueryPayload