@xyo-network/diviner-model 2.93.5 → 2.93.7

package/dist/node/typeChecks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typeChecks.d.ts","sourceRoot":"","sources":["../../src/typeChecks.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAGxC,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;wDAA8F,CAAA;AAC5H,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;wDAA0E,CAAA;AAEtG,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAA0C,CAAA;AACtE,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAA4C,CAAA;AAC1E,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;+EAAsC,CAAA;AACpE,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;+EAAwC,CAAA"}
+{"version":3,"file":"typeChecks.d.ts","sourceRoot":"","sources":["../../src/typeChecks.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAGxC,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;sGAA8F,CAAA;AAC5H,eAAO,MAAM,eAAe;;;;;;;;;;;;iDAA0E,CAAA;AAEtG,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAA0C,CAAA;AACtE,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAA4C,CAAA;AAC1E,eAAO,MAAM,iBAAiB;;;;;;;;;;;;wEAAsC,CAAA;AACpE,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;6HAAwC,CAAA"}

package/package.json

@@ -13,9 +13,9 @@
     "@xylabs/hex": "^3.0.24",
     "@xylabs/object": "^3.0.24",
     "@xylabs/retry": "^3.0.24",
-    "@xyo-network/module-events": "~2.93.5",
-    "@xyo-network/module-model": "~2.93.5",
-    "@xyo-network/payload-model": "~2.93.5"
+    "@xyo-network/module-events": "~2.93.7",
+    "@xyo-network/module-model": "~2.93.7",
+    "@xyo-network/payload-model": "~2.93.7"
   },
   "devDependencies": {
     "@xylabs/ts-scripts-yarn3": "^3.5.2",
@@ -61,6 +61,6 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
   "sideEffects": false,
-  "version": "2.93.5",
+  "version": "2.93.7",
   "type": "module"
 }

package/src/EventData.ts

@@ -1,9 +1,10 @@
-import { Module, ModuleEventData } from '@xyo-network/module-model'
+import { ModuleEventData, ModuleInstance } from '@xyo-network/module-model'
 import { Payload } from '@xyo-network/payload-model'
 
 import { DivineEndEventData, DivineStartEventData } from './EventsModels'
 
-export interface DivinerModuleEventData<T extends Module = Module, TIn extends Payload = Payload, TOut extends Payload = Payload>
-  extends DivineEndEventData<T, TIn, TOut>,
-    DivineStartEventData<T, TIn>,
-    ModuleEventData<T> {}
+export type DivinerModuleEventData<
+  TInstance extends ModuleInstance = ModuleInstance,
+  TIn extends Payload = Payload,
+  TOut extends Payload = Payload,
+> = DivineEndEventData<TInstance, TIn, TOut> & DivineStartEventData<TInstance, TIn> & ModuleEventData<TInstance>

package/src/EventsModels/DivineEnd.ts

@@ -5,9 +5,9 @@ import { Payload } from '@xyo-network/payload-model'
 export type DivineEndEventArgs<T extends Module = Module, TIn extends Payload = Payload, TOut extends Payload = Payload> = ModuleEventArgs<
   T,
   {
-    errors?: Error[]
-    inPayloads?: TIn[]
-    outPayloads?: TOut[]
+    errors: Error[]
+    inPayloads: TIn[]
+    outPayloads: TOut[]
   }
 >
 

package/src/EventsModels/DivineStart.ts

@@ -5,7 +5,7 @@ import { Payload } from '@xyo-network/payload-model'
 export type DivineStartEventArgs<T extends Module = Module, TIn extends Payload = Payload> = ModuleEventArgs<
   T,
   {
-    inPayloads?: TIn[]
+    inPayloads: TIn[]
   }
 >
 

package/src/Instance.ts

@@ -3,26 +3,14 @@ import { Payload } from '@xyo-network/payload-model'
 
 import { DivinerQueryFunctions } from './DivinerQueryFunctions'
 import { DivinerModuleEventData } from './EventData'
-import { CustomDivinerModule, DivinerModule } from './Module'
+import { DivinerModule } from './Module'
 import { DivinerParams } from './Params'
 
-export interface DivinerInstance<TParams extends DivinerParams = DivinerParams, TIn extends Payload = Payload, TOut extends Payload = Payload>
-  extends DivinerModule<TParams, TIn, TOut>,
-    DivinerQueryFunctions<TIn, TOut>,
-    ModuleInstance<TParams, DivinerModuleEventData<DivinerModule<TParams, TIn, TOut>>> {}
-
-export interface CustomDivinerInstance<
+export interface DivinerInstance<
   TParams extends DivinerParams = DivinerParams,
   TIn extends Payload = Payload,
   TOut extends Payload = Payload,
-  TEvents extends DivinerModuleEventData<DivinerInstance<TParams, TIn, TOut>, TIn, TOut> = DivinerModuleEventData<
-    DivinerInstance<TParams, TIn, TOut>,
-    TIn,
-    TOut
-  >,
-> extends CustomDivinerModule<TParams, TIn, TOut, TEvents>,
+  TEvents extends DivinerModuleEventData = DivinerModuleEventData,
+> extends DivinerModule<TParams, TEvents>,
     DivinerQueryFunctions<TIn, TOut>,
     ModuleInstance<TParams, TEvents> {}
-
-/** @deprecated use DivinerInstance instead */
-export interface Diviner extends DivinerInstance {}

package/src/Module.ts

@@ -1,15 +1,7 @@
 import { Module } from '@xyo-network/module-model'
-import { Payload } from '@xyo-network/payload-model'
 
 import { DivinerModuleEventData } from './EventData'
 import { DivinerParams } from './Params'
 
-export interface DivinerModule<TParams extends DivinerParams = DivinerParams, TIn extends Payload = Payload, TOut extends Payload = Payload>
-  extends Module<TParams, DivinerModuleEventData<DivinerModule<TParams, TIn, TOut>>> {}
-
-export interface CustomDivinerModule<
-  TParams extends DivinerParams = DivinerParams,
-  TIn extends Payload = Payload,
-  TOut extends Payload = Payload,
-  TEvents extends DivinerModuleEventData<DivinerModule<TParams, TIn, TOut>> = DivinerModuleEventData<DivinerModule<TParams, TIn, TOut>>,
-> extends Module<TParams, TEvents> {}
+export interface DivinerModule<TParams extends DivinerParams = DivinerParams, TEvents extends DivinerModuleEventData = DivinerModuleEventData>
+  extends Module<TParams, TEvents> {}

package/src/attachable/AttachableInstance.ts

@@ -0,0 +1,19 @@
+import { IsObjectFactory, TypeCheck } from '@xylabs/object'
+import { AttachableModuleInstance } from '@xyo-network/module-model'
+import { Payload } from '@xyo-network/payload-model'
+
+import { DivinerModuleEventData } from '../EventData'
+import { DivinerInstance } from '../Instance'
+import { DivinerParams } from '../Params'
+
+export interface AttachableDivinerInstance<
+  TParams extends DivinerParams = DivinerParams,
+  TIn extends Payload = Payload,
+  TOut extends Payload = Payload,
+  TEventData extends DivinerModuleEventData = DivinerModuleEventData,
+> extends DivinerInstance<TParams, TIn, TOut, TEventData>,
+    AttachableModuleInstance<TParams, TEventData> {}
+
+export type AttachableDivinerInstanceTypeCheck<T extends AttachableDivinerInstance = AttachableDivinerInstance> = TypeCheck<T>
+
+export class IsAttachableDivinerInstanceFactory<T extends AttachableDivinerInstance = AttachableDivinerInstance> extends IsObjectFactory<T> {}

package/src/attachable/asAttachableInstance.ts

@@ -0,0 +1,5 @@
+import { AsObjectFactory } from '@xylabs/object'
+
+import { isAttachableDivinerInstance } from './isAttachableInstance'
+
+export const asAttachableDivinerInstance = AsObjectFactory.create(isAttachableDivinerInstance)

package/src/attachable/index.ts

@@ -0,0 +1,3 @@
+export * from './asAttachableInstance'
+export * from './AttachableInstance'
+export * from './isAttachableInstance'

package/src/attachable/isAttachableInstance.ts

@@ -0,0 +1,15 @@
+import { IsObjectFactory, ObjectTypeShape, TypeCheck } from '@xylabs/object'
+import { isAttachableModuleInstance } from '@xyo-network/module-model'
+
+import { isDivinerInstance } from '../typeChecks'
+import { AttachableDivinerInstance } from './AttachableInstance'
+
+export const requiredAttachableDivinerInstanceFunctions: ObjectTypeShape = {}
+
+//we do not use IsInstanceFactory here to prevent a cycle
+const factory = new IsObjectFactory<AttachableDivinerInstance>()
+
+export const isAttachableDivinerInstance: TypeCheck<AttachableDivinerInstance> = factory.create(requiredAttachableDivinerInstanceFunctions, [
+  isDivinerInstance,
+  isAttachableModuleInstance,
+])

package/src/index.ts

@@ -1,3 +1,4 @@
+export * from './attachable'
 export * from './Config'
 export * from './DivinerQueryFunctions'
 export * from './EventData'