@xyo-network/react-node 2.75.1 → 2.75.2

package/src/hooks/useModuleFromNode.ts

@@ -1,7 +1,8 @@
 /* eslint-disable import/no-deprecated */
 /* eslint-disable deprecation/deprecation */
+import { TypeCheck } from '@xylabs/object'
 import { usePromise } from '@xylabs/react-promise'
-import { asModuleInstance, isModuleInstance, ModuleInstance } from '@xyo-network/module-model'
+import { isModuleInstance, ModuleInstance } from '@xyo-network/module-model'
 import { useState } from 'react'
 
 import { ModuleFromNodeConfig, useModuleFromNodeConfigLogger } from './ModuleFromNodeConfig'
@@ -9,21 +10,24 @@ import { useModuleFilterOptions } from './useModuleFilterOptions'
 import { useNode } from './useNode'
 
 /** @deprecated use useWeakModuleFromNode */
-export const useModuleFromNode = (
-  nameOrAddressOrInstance?: string | ModuleInstance,
-  config?: ModuleFromNodeConfig,
-): [ModuleInstance | undefined, Error | undefined] => {
+export const useModuleFromNode = <T extends ModuleInstance | void = void>(
+  nameOrAddressOrInstance: string | (T extends ModuleInstance ? T : ModuleInstance) | undefined = undefined,
+  config?: T extends ModuleInstance ? ModuleFromNodeConfig<T> : ModuleFromNodeConfig | undefined,
+): [(T extends ModuleInstance ? T : ModuleInstance) | undefined, Error | undefined] => {
   const [node, nodeError] = useNode(config)
   const logger = useModuleFromNodeConfigLogger(config)
   const filterOptions = useModuleFilterOptions(config)
-  const [result, setResult] = useState<ModuleInstance | undefined>()
+  const [result, setResult] = useState<(T extends ModuleInstance ? T : ModuleInstance) | undefined>()
   const [, error] = usePromise(async () => {
     logger?.debug('useModuleFromNode: resolving')
+    const identity: TypeCheck<T extends ModuleInstance ? T : ModuleInstance> = (config?.identity ?? isModuleInstance) as TypeCheck<
+      T extends ModuleInstance ? T : ModuleInstance
+    >
     if (node && nameOrAddressOrInstance) {
       node.on('moduleAttached', ({ module }) => {
         logger?.debug(`useModuleFromNode: moduleAttached [${module.config.name ?? module.address}]`)
         if (module.address === nameOrAddressOrInstance || module.config?.name === nameOrAddressOrInstance) {
-          setResult(asModuleInstance(module))
+          setResult(identity(module) ? (module as T extends ModuleInstance ? T : ModuleInstance) : undefined)
         }
       })
       node.on('moduleDetached', ({ module }) => {
@@ -32,12 +36,12 @@ export const useModuleFromNode = (
           setResult(undefined)
         }
       })
-      if (isModuleInstance(nameOrAddressOrInstance)) {
+      if (identity(nameOrAddressOrInstance)) {
         setResult(nameOrAddressOrInstance)
       } else {
         const result = await node.resolve(nameOrAddressOrInstance, filterOptions)
         logger?.debug(`Result: ${result?.address}`)
-        setResult(result)
+        setResult(identity(module) ? (module as T extends ModuleInstance ? T : ModuleInstance) : undefined)
       }
       return result
     }

package/src/hooks/useWeakModuleFromNode.ts

@@ -1,28 +1,31 @@
+import { TypeCheck } from '@xylabs/object'
 import { usePromise } from '@xylabs/react-promise'
-import { asModuleInstance, isModuleInstance, ModuleInstance } from '@xyo-network/module-model'
+import { isModuleInstance, ModuleInstance } from '@xyo-network/module-model'
 import { useState } from 'react'
 
 import { ModuleFromNodeConfig, useModuleFromNodeConfigLogger } from './ModuleFromNodeConfig'
 import { useModuleFilterOptions } from './useModuleFilterOptions'
 import { useNode } from './useNode'
 
-export const useWeakModuleFromNode = (
-  nameOrAddressOrInstance?: string | ModuleInstance,
+export const useWeakModuleFromNode = <T extends ModuleInstance | void = void>(
+  nameOrAddressOrInstance: string | (T extends ModuleInstance ? T : ModuleInstance) | undefined = undefined,
   config?: ModuleFromNodeConfig,
-): [WeakRef<ModuleInstance> | undefined, Error | undefined] => {
+): [WeakRef<T extends ModuleInstance ? T : ModuleInstance> | undefined, Error | undefined] => {
   const [node, nodeError] = useNode(config)
   const logger = useModuleFromNodeConfigLogger(config)
   const filterOptions = useModuleFilterOptions(config)
-  const [result, setResult] = useState<WeakRef<ModuleInstance> | undefined>()
+  const [result, setResult] = useState<WeakRef<T extends ModuleInstance ? T : ModuleInstance> | undefined>()
   const [, error] = usePromise(async () => {
     logger?.debug('useModuleFromNode: resolving')
+    const identity: TypeCheck<T extends ModuleInstance ? T : ModuleInstance> = (config?.identity ?? isModuleInstance) as TypeCheck<
+      T extends ModuleInstance ? T : ModuleInstance
+    >
     const nodeInstance = node
     if (nodeInstance && nameOrAddressOrInstance) {
       nodeInstance.on('moduleAttached', ({ module }) => {
         logger?.debug(`useModuleFromNode: moduleAttached [${module.config.name ?? module.address}]`)
         if (module.address === nameOrAddressOrInstance || module.config?.name === nameOrAddressOrInstance) {
-          const instance = asModuleInstance(module)
-          setResult(instance ? new WeakRef(instance) : undefined)
+          setResult(identity(module) ? new WeakRef(module as T extends ModuleInstance ? T : ModuleInstance) : undefined)
         }
       })
       nodeInstance.on('moduleDetached', ({ module }) => {
@@ -31,12 +34,12 @@ export const useWeakModuleFromNode = (
           setResult(undefined)
         }
       })
-      if (isModuleInstance(nameOrAddressOrInstance)) {
-        setResult(new WeakRef(nameOrAddressOrInstance))
+      if (identity(nameOrAddressOrInstance)) {
+        setResult(new WeakRef(nameOrAddressOrInstance as T extends ModuleInstance ? T : ModuleInstance))
       } else {
         const result = await nodeInstance.resolve(nameOrAddressOrInstance, filterOptions)
         logger?.debug(`Result: ${result?.address}`)
-        setResult(result ? new WeakRef(result) : undefined)
+        setResult(identity(result) ? new WeakRef(result as T extends ModuleInstance ? T : ModuleInstance) : undefined)
       }
       return result
     }