@xyo-network/diviner-model 2.64.9 → 2.65.0

package/dist/types/Diviner.d.ts

@@ -1,10 +1,10 @@
 import { AnyObject } from '@xyo-network/core';
 import { EventData } from '@xyo-network/module';
-import { AnyConfigSchema, ModuleEventArgs, ModuleEventData, ModuleInstance, ModuleParams } from '@xyo-network/module-model';
+import { AnyConfigSchema, DirectModule, IndirectModule, ModuleEventArgs, ModuleEventData, ModuleParams } from '@xyo-network/module-model';
 import { Payload } from '@xyo-network/payload-model';
 import { Promisable } from '@xyo-network/promise';
 import { DivinerConfig } from './Config';
-export interface DivinerInstance {
+export interface DivinerQueryFunctions {
     divine: (payloads?: Payload[]) => Promisable<Payload[]>;
 }
 /** @deprecated use DivinerInstance instead */
@@ -26,5 +26,8 @@ export interface DivinerReportStartEventData extends EventData {
 export interface DivinerModuleEventData extends DivinerReportEndEventData, DivinerReportStartEventData, ModuleEventData {
 }
 export type DivinerParams<TConfig extends AnyConfigSchema<DivinerConfig> = AnyConfigSchema<DivinerConfig>, TAdditional extends AnyObject | undefined = undefined> = ModuleParams<TConfig, TAdditional>;
-export type DivinerModule<TParams extends DivinerParams = DivinerParams, TEventData extends DivinerModuleEventData = DivinerModuleEventData> = DivinerInstance & ModuleInstance<TParams, TEventData>;
+export type IndirectDivinerModule<TParams extends DivinerParams<AnyConfigSchema<DivinerConfig>> = DivinerParams<AnyConfigSchema<DivinerConfig>>, TEventData extends ModuleEventData = ModuleEventData> = IndirectModule<TParams, TEventData>;
+export type DirectDivinerModule<TParams extends DivinerParams<AnyConfigSchema<DivinerConfig>> = DivinerParams<AnyConfigSchema<DivinerConfig>>, TEventData extends ModuleEventData = ModuleEventData> = IndirectDivinerModule<TParams, TEventData> & DivinerQueryFunctions & DirectModule;
+export type DivinerModule<TParams extends DivinerParams<AnyConfigSchema<DivinerConfig>> = DivinerParams<AnyConfigSchema<DivinerConfig>>, TEventData extends DivinerModuleEventData = DivinerModuleEventData> = IndirectDivinerModule<TParams, TEventData> | DirectDivinerModule<TParams, TEventData>;
+export type DivinerInstance<TParams extends DivinerParams<AnyConfigSchema<DivinerConfig>> = DivinerParams<AnyConfigSchema<DivinerConfig>>, TEventData extends DivinerModuleEventData = DivinerModuleEventData> = DirectDivinerModule<TParams, TEventData>;
 //# sourceMappingURL=Diviner.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,eAAe,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAC3H,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAExC,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,KAAK,UAAU,CAAC,OAAO,EAAE,CAAC,CAAA;CACxD;AAED,8CAA8C;AAC9C,MAAM,MAAM,OAAO,GAAG,eAAe,CAAA;AAErC,MAAM,MAAM,yBAAyB,GAAG,eAAe,CACrD,aAAa,EACb;IACE,MAAM,CAAC,EAAE,KAAK,EAAE,CAAA;IAChB,UAAU,CAAC,EAAE,OAAO,EAAE,CAAA;IACtB,WAAW,EAAE,OAAO,EAAE,CAAA;CACvB,CACF,CAAA;AAED,MAAM,WAAW,yBAA0B,SAAQ,SAAS;IAC1D,SAAS,EAAE,yBAAyB,CAAA;CACrC;AAED,MAAM,MAAM,2BAA2B,GAAG,eAAe,CACvD,aAAa,EACb;IACE,UAAU,CAAC,EAAE,OAAO,EAAE,CAAA;CACvB,CACF,CAAA;AAED,MAAM,WAAW,2BAA4B,SAAQ,SAAS;IAC5D,WAAW,EAAE,2BAA2B,CAAA;CACzC;AAED,MAAM,WAAW,sBAAuB,SAAQ,yBAAyB,EAAE,2BAA2B,EAAE,eAAe;CAAG;AAE1H,MAAM,MAAM,aAAa,CACvB,OAAO,SAAS,eAAe,CAAC,aAAa,CAAC,GAAG,eAAe,CAAC,aAAa,CAAC,EAC/E,WAAW,SAAS,SAAS,GAAG,SAAS,GAAG,SAAS,IACnD,YAAY,CAAC,OAAO,EAAE,WAAW,CAAC,CAAA;AAEtC,MAAM,MAAM,aAAa,CACvB,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,UAAU,SAAS,sBAAsB,GAAG,sBAAsB,IAChE,eAAe,GAAG,cAAc,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA"}
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,cAAc,EAAE,eAAe,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AACzI,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAExC,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,KAAK,UAAU,CAAC,OAAO,EAAE,CAAC,CAAA;CACxD;AAED,8CAA8C;AAC9C,MAAM,MAAM,OAAO,GAAG,eAAe,CAAA;AAErC,MAAM,MAAM,yBAAyB,GAAG,eAAe,CACrD,aAAa,EACb;IACE,MAAM,CAAC,EAAE,KAAK,EAAE,CAAA;IAChB,UAAU,CAAC,EAAE,OAAO,EAAE,CAAA;IACtB,WAAW,EAAE,OAAO,EAAE,CAAA;CACvB,CACF,CAAA;AAED,MAAM,WAAW,yBAA0B,SAAQ,SAAS;IAC1D,SAAS,EAAE,yBAAyB,CAAA;CACrC;AAED,MAAM,MAAM,2BAA2B,GAAG,eAAe,CACvD,aAAa,EACb;IACE,UAAU,CAAC,EAAE,OAAO,EAAE,CAAA;CACvB,CACF,CAAA;AAED,MAAM,WAAW,2BAA4B,SAAQ,SAAS;IAC5D,WAAW,EAAE,2BAA2B,CAAA;CACzC;AAED,MAAM,WAAW,sBAAuB,SAAQ,yBAAyB,EAAE,2BAA2B,EAAE,eAAe;CAAG;AAE1H,MAAM,MAAM,aAAa,CACvB,OAAO,SAAS,eAAe,CAAC,aAAa,CAAC,GAAG,eAAe,CAAC,aAAa,CAAC,EAC/E,WAAW,SAAS,SAAS,GAAG,SAAS,GAAG,SAAS,IACnD,YAAY,CAAC,OAAO,EAAE,WAAW,CAAC,CAAA;AAEtC,MAAM,MAAM,qBAAqB,CAC/B,OAAO,SAAS,aAAa,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,GAAG,aAAa,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,EAC7G,UAAU,SAAS,eAAe,GAAG,eAAe,IAClD,cAAc,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA;AAEvC,MAAM,MAAM,mBAAmB,CAC7B,OAAO,SAAS,aAAa,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,GAAG,aAAa,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,EAC7G,UAAU,SAAS,eAAe,GAAG,eAAe,IAClD,qBAAqB,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,qBAAqB,GAAG,YAAY,CAAA;AAErF,MAAM,MAAM,aAAa,CACvB,OAAO,SAAS,aAAa,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,GAAG,aAAa,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,EAC7G,UAAU,SAAS,sBAAsB,GAAG,sBAAsB,IAChE,qBAAqB,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,mBAAmB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA;AAEzF,MAAM,MAAM,eAAe,CACzB,OAAO,SAAS,aAAa,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,GAAG,aAAa,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,EAC7G,UAAU,SAAS,sBAAsB,GAAG,sBAAsB,IAChE,mBAAmB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA"}

package/dist/types/Queries/Divine.d.ts

@@ -1,4 +1,4 @@
-import { Query } from '@xyo-network/module-model';
+import { Query } from '@xyo-network/payload-model';
 export type DivinerDivineQuerySchema = 'network.xyo.query.diviner.divine';
 export declare const DivinerDivineQuerySchema: DivinerDivineQuerySchema;
 export type DivinerDivineQuery = Query<{

package/dist/types/Queries/Divine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Divine.d.ts","sourceRoot":"","sources":["../../../src/Queries/Divine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAA;AAEjD,MAAM,MAAM,wBAAwB,GAAG,kCAAkC,CAAA;AACzE,eAAO,MAAM,wBAAwB,EAAE,wBAA6D,CAAA;AAEpG,MAAM,MAAM,kBAAkB,GAAG,KAAK,CAAC;IACrC,MAAM,EAAE,wBAAwB,CAAA;CACjC,CAAC,CAAA"}
+{"version":3,"file":"Divine.d.ts","sourceRoot":"","sources":["../../../src/Queries/Divine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAElD,MAAM,MAAM,wBAAwB,GAAG,kCAAkC,CAAA;AACzE,eAAO,MAAM,wBAAwB,EAAE,wBAA6D,CAAA;AAEpG,MAAM,MAAM,kBAAkB,GAAG,KAAK,CAAC;IACrC,MAAM,EAAE,wBAAwB,CAAA;CACjC,CAAC,CAAA"}

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

@@ -1,5 +1,6 @@
 export * from './Divine';
-import { ModuleQuery, ModuleQueryBase, Query } from '@xyo-network/module-model';
+import { ModuleQuery, ModuleQueryBase } from '@xyo-network/module-model';
+import { Query } from '@xyo-network/payload-model';
 import { DivinerDivineQuery } from './Divine';
 export type DivinerQueryBase = DivinerDivineQuery;
 export type DivinerModuleQueries = ModuleQueryBase | DivinerQueryBase;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Queries/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AAExB,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAA;AAE/E,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAE7C,MAAM,MAAM,gBAAgB,GAAG,kBAAkB,CAAA;AACjD,MAAM,MAAM,oBAAoB,GAAG,eAAe,GAAG,gBAAgB,CAAA;AACrE,MAAM,MAAM,YAAY,CAAC,MAAM,SAAS,KAAK,GAAG,IAAI,GAAG,IAAI,IAAI,WAAW,CAAC,MAAM,SAAS,KAAK,GAAG,gBAAgB,GAAG,MAAM,GAAG,gBAAgB,CAAC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Queries/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AAExB,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AACxE,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAElD,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAE7C,MAAM,MAAM,gBAAgB,GAAG,kBAAkB,CAAA;AACjD,MAAM,MAAM,oBAAoB,GAAG,eAAe,GAAG,gBAAgB,CAAA;AACrE,MAAM,MAAM,YAAY,CAAC,MAAM,SAAS,KAAK,GAAG,IAAI,GAAG,IAAI,IAAI,WAAW,CAAC,MAAM,SAAS,KAAK,GAAG,gBAAgB,GAAG,MAAM,GAAG,gBAAgB,CAAC,CAAA"}

package/package.json

@@ -10,15 +10,15 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xyo-network/core": "^2.64.9",
-    "@xyo-network/module": "^2.64.9",
-    "@xyo-network/module-model": "^2.64.9",
-    "@xyo-network/payload-model": "^2.64.9",
-    "@xyo-network/promise": "^2.64.9"
+    "@xyo-network/core": "^2.65.0",
+    "@xyo-network/module": "^2.65.0",
+    "@xyo-network/module-model": "^2.65.0",
+    "@xyo-network/payload-model": "^2.65.0",
+    "@xyo-network/promise": "^2.65.0"
   },
   "devDependencies": {
-    "@xylabs/ts-scripts-yarn3": "^2.18.7",
-    "@xylabs/tsconfig": "^2.18.7",
+    "@xylabs/ts-scripts-yarn3": "^2.18.10",
+    "@xylabs/tsconfig": "^2.18.10",
     "typescript": "^5.1.6"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -54,5 +54,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.64.9"
+  "version": "2.65.0"
 }

package/src/Diviner.ts

@@ -1,12 +1,12 @@
 import { AnyObject } from '@xyo-network/core'
 import { EventData } from '@xyo-network/module'
-import { AnyConfigSchema, ModuleEventArgs, ModuleEventData, ModuleInstance, ModuleParams } from '@xyo-network/module-model'
+import { AnyConfigSchema, DirectModule, IndirectModule, ModuleEventArgs, ModuleEventData, ModuleParams } from '@xyo-network/module-model'
 import { Payload } from '@xyo-network/payload-model'
 import { Promisable } from '@xyo-network/promise'
 
 import { DivinerConfig } from './Config'
 
-export interface DivinerInstance {
+export interface DivinerQueryFunctions {
   divine: (payloads?: Payload[]) => Promisable<Payload[]>
 }
 
@@ -44,7 +44,22 @@ export type DivinerParams<
   TAdditional extends AnyObject | undefined = undefined,
 > = ModuleParams<TConfig, TAdditional>
 
+export type IndirectDivinerModule<
+  TParams extends DivinerParams<AnyConfigSchema<DivinerConfig>> = DivinerParams<AnyConfigSchema<DivinerConfig>>,
+  TEventData extends ModuleEventData = ModuleEventData,
+> = IndirectModule<TParams, TEventData>
+
+export type DirectDivinerModule<
+  TParams extends DivinerParams<AnyConfigSchema<DivinerConfig>> = DivinerParams<AnyConfigSchema<DivinerConfig>>,
+  TEventData extends ModuleEventData = ModuleEventData,
+> = IndirectDivinerModule<TParams, TEventData> & DivinerQueryFunctions & DirectModule
+
 export type DivinerModule<
-  TParams extends DivinerParams = DivinerParams,
+  TParams extends DivinerParams<AnyConfigSchema<DivinerConfig>> = DivinerParams<AnyConfigSchema<DivinerConfig>>,
+  TEventData extends DivinerModuleEventData = DivinerModuleEventData,
+> = IndirectDivinerModule<TParams, TEventData> | DirectDivinerModule<TParams, TEventData>
+
+export type DivinerInstance<
+  TParams extends DivinerParams<AnyConfigSchema<DivinerConfig>> = DivinerParams<AnyConfigSchema<DivinerConfig>>,
   TEventData extends DivinerModuleEventData = DivinerModuleEventData,
-> = DivinerInstance & ModuleInstance<TParams, TEventData>
+> = DirectDivinerModule<TParams, TEventData>

package/src/Queries/Divine.ts

@@ -1,4 +1,4 @@
-import { Query } from '@xyo-network/module-model'
+import { Query } from '@xyo-network/payload-model'
 
 export type DivinerDivineQuerySchema = 'network.xyo.query.diviner.divine'
 export const DivinerDivineQuerySchema: DivinerDivineQuerySchema = 'network.xyo.query.diviner.divine'

package/src/Queries/index.ts

@@ -1,6 +1,7 @@
 export * from './Divine'
 
-import { ModuleQuery, ModuleQueryBase, Query } from '@xyo-network/module-model'
+import { ModuleQuery, ModuleQueryBase } from '@xyo-network/module-model'
+import { Query } from '@xyo-network/payload-model'
 
 import { DivinerDivineQuery } from './Divine'