@xyo-network/react-node 2.56.17 → 2.57.1

package/dist/esm/components/render/RenderModule.js

@@ -9,7 +9,7 @@ export const RenderModule = ({ module, idRef }) => {
     useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
-        const children = (await module.downResolver.resolve()).filter((childModule) => childModule.address !== address);
+        const children = (await module.resolve()).filter((childModule) => childModule.address !== address);
         if (mounted()) {
             setChildModules(children);
         }

package/dist/esm/components/render/RenderModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"RenderModule.js","sourceRoot":"","sources":["../../../../src/components/render/RenderModule.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAE3D,OAAO,EAAoB,QAAQ,EAAE,MAAM,OAAO,CAAA;AAUlD,MAAM,CAAC,MAAM,YAAY,GAAgC,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE;IAC7E,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,EAAE,CAAA;IACzC,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,EAAY,CAAA;IAE5D,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,QAAQ,GAAG,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,OAAO,KAAK,OAAO,CAAC,CAAA;QAC/G,IAAI,OAAO,EAAE,EAAE;YACb,eAAe,CAAC,QAAQ,CAAC,CAAA;SAC1B;IACH,CAAC,EACD,CAAC,MAAM,EAAE,OAAO,CAAC,CAClB,CAAA;IAED,MAAM,SAAS,GAAG,GAAG,EAAE;QACrB,MAAM,KAAK,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAA;QACxD,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAC7B,OAAO,KAAK,CAAA;IACd,CAAC,CAAA;IAED,OAAO,CACL,MAAC,qBAAqB,IAAC,MAAM,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,YAAY,OAAO,EAAE,aACrE,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;gBAC5B,OAAO,KAAC,QAAQ,IAAa,MAAM,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,WAAW,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,KAAK,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,IAA3G,KAAK,CAA0G,CAAA;YACvI,CAAC,CAAC,EACD,YAAY,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CACzC,KAAC,QAAQ,IAAC,MAAM,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,YAC9D,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CACjC,KAAC,YAAY,IAA2B,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,IAAtD,WAAW,CAAC,OAAO,CAAuC,CAC9E,CAAC,GACO,CACZ,CAAC,CAAC,CAAC,IAAI,IACc,CACzB,CAAA;AACH,CAAC,CAAA;AAED,MAAM,qBAAqB,GAAG,MAAM,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,uBAAuB,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;IAChG,wBAAwB,EAAE;QACxB,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;KAClC;CACF,CAAC,CAAC,CAAA"}
+{"version":3,"file":"RenderModule.js","sourceRoot":"","sources":["../../../../src/components/render/RenderModule.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAE3D,OAAO,EAAoB,QAAQ,EAAE,MAAM,OAAO,CAAA;AAUlD,MAAM,CAAC,MAAM,YAAY,GAAgC,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE;IAC7E,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,EAAE,CAAA;IACzC,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,EAAY,CAAA;IAE5D,cAAc;IACZ,uDAAuD;IACvD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,QAAQ,GAAG,CAAC,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,OAAO,KAAK,OAAO,CAAC,CAAA;QAClG,IAAI,OAAO,EAAE,EAAE;YACb,eAAe,CAAC,QAAQ,CAAC,CAAA;SAC1B;IACH,CAAC,EACD,CAAC,MAAM,EAAE,OAAO,CAAC,CAClB,CAAA;IAED,MAAM,SAAS,GAAG,GAAG,EAAE;QACrB,MAAM,KAAK,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAA;QACxD,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAC7B,OAAO,KAAK,CAAA;IACd,CAAC,CAAA;IAED,OAAO,CACL,MAAC,qBAAqB,IAAC,MAAM,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,YAAY,OAAO,EAAE,aACrE,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;gBAC5B,OAAO,KAAC,QAAQ,IAAa,MAAM,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,WAAW,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,KAAK,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,IAA3G,KAAK,CAA0G,CAAA;YACvI,CAAC,CAAC,EACD,YAAY,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CACzC,KAAC,QAAQ,IAAC,MAAM,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,YAC9D,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CACjC,KAAC,YAAY,IAA2B,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,IAAtD,WAAW,CAAC,OAAO,CAAuC,CAC9E,CAAC,GACO,CACZ,CAAC,CAAC,CAAC,IAAI,IACc,CACzB,CAAA;AACH,CAAC,CAAA;AAED,MAAM,qBAAqB,GAAG,MAAM,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,uBAAuB,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;IAChG,wBAAwB,EAAE;QACxB,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;KAClC;CACF,CAAC,CAAC,CAAA"}

package/dist/esm/hooks/index.js

@@ -2,5 +2,4 @@ export * from './provided';
 export * from './useModuleFromNode';
 export * from './useModulesFromNode';
 export * from './useNodeFromNode';
-export * from './wrapped';
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA;AAC1B,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA;AACpC,cAAc,mBAAmB,CAAA;AACjC,cAAc,WAAW,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA;AAC1B,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA;AACpC,cAAc,mBAAmB,CAAA"}

package/dist/esm/hooks/provided/index.js

@@ -1,4 +1,2 @@
 export * from './useProvidedNode';
-export * from './useProvidedNodeAttachedAddresses';
-export * from './useProvidedNodeRegisteredAddresses';
 //# sourceMappingURL=index.js.map

package/dist/esm/hooks/provided/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/hooks/provided/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAA;AACjC,cAAc,oCAAoC,CAAA;AAClD,cAAc,sCAAsC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/hooks/provided/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAA"}

package/dist/esm/hooks/provided/useProvidedNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"useProvidedNode.js","sourceRoot":"","sources":["../../../../src/hooks/provided/useProvidedNode.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAA;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AAElC,MAAM,CAAC,MAAM,eAAe,GAAG,GAAoC,EAAE;IACnE,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC,WAAW,CAAC,CAAA;IACxC,OAAO,CAAC,IAAI,CAAC,CAAA;AACf,CAAC,CAAA"}
+{"version":3,"file":"useProvidedNode.js","sourceRoot":"","sources":["../../../../src/hooks/provided/useProvidedNode.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAA;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AAElC,MAAM,CAAC,MAAM,eAAe,GAAG,GAAsC,EAAE;IACrE,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC,WAAW,CAAC,CAAA;IACxC,OAAO,CAAC,IAAI,CAAC,CAAA;AACf,CAAC,CAAA"}

package/dist/esm/hooks/useModuleFromNode.js

@@ -1,7 +1,8 @@
 import { useAsyncEffect } from '@xylabs/react-async-effect';
+import { isModuleInstance } from '@xyo-network/module-model';
 import { useMemo, useState } from 'react';
 import { useProvidedNode } from './provided';
-export const useModuleFromNode = (nameOrAddress, up, logger) => {
+export const useModuleFromNode = (nameOrAddress, config) => {
     const [node] = useProvidedNode();
     const [module, setModule] = useState();
     const [error, setError] = useState();
@@ -9,33 +10,47 @@ export const useModuleFromNode = (nameOrAddress, up, logger) => {
     useAsyncEffect(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     async (mounted) => {
+        const { logger, ...resolverConfig } = config ?? {};
         const eventUnsubscribe = [];
         try {
             if (node) {
                 const attachHandler = (args) => {
                     const eventModule = args.module;
-                    if (nameOrAddress && (eventModule.address === nameOrAddress || eventModule?.config.name === nameOrAddress)) {
+                    if (nameOrAddress && (eventModule?.address === nameOrAddress || eventModule?.config.name === nameOrAddress)) {
                         logger?.debug(`attachHandler-setting [${nameOrAddress}]`);
-                        setModule(eventModule);
-                        setError(undefined);
+                        if (isModuleInstance(eventModule)) {
+                            setModule(eventModule);
+                            setError(undefined);
+                        }
+                        else {
+                            setModule(null);
+                            setError(Error('Attached module failed identity check'));
+                        }
                     }
                 };
                 const detachHandler = (args) => {
                     const eventModule = args.module;
                     if (eventModule.address === address) {
                         logger?.debug(`detachHandler-clearing [${address}]`);
-                        setModule(undefined);
+                        setModule(null);
                         setError(undefined);
                     }
                 };
-                const moduleDown = nameOrAddress ? await node.downResolver.resolveOne(nameOrAddress) : undefined;
-                const module = moduleDown ?? (up && nameOrAddress ? await node.upResolver.resolveOne(nameOrAddress) : undefined);
+                const module = nameOrAddress ? await node.resolve(nameOrAddress, resolverConfig) : undefined;
                 if (mounted()) {
-                    eventUnsubscribe.push(node.on('moduleAttached', attachHandler));
-                    eventUnsubscribe.push(node.on('moduleDetached', detachHandler));
-                    logger?.debug(`resolved [${nameOrAddress}]`);
-                    setModule(module);
-                    setError(undefined);
+                    if (module) {
+                        if (!isModuleInstance(module)) {
+                            setModule(null);
+                            setError(Error('Resolved module failed identity check'));
+                        }
+                    }
+                    else {
+                        eventUnsubscribe.push(node.on('moduleAttached', attachHandler));
+                        eventUnsubscribe.push(node.on('moduleDetached', detachHandler));
+                        logger?.debug(`resolved [${nameOrAddress}]`);
+                        setModule(module ?? null);
+                        setError(undefined);
+                    }
                 }
             }
             else {
@@ -57,7 +72,7 @@ export const useModuleFromNode = (nameOrAddress, up, logger) => {
                 setModule(undefined);
             }
         }
-    }, [nameOrAddress, node, address, logger, up]);
+    }, [nameOrAddress, node, address, config]);
     return [module, error];
 };
 //# sourceMappingURL=useModuleFromNode.js.map

package/dist/esm/hooks/useModuleFromNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"useModuleFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useModuleFromNode.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"useModuleFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useModuleFromNode.tsx"],"names":[],"mappings":"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"}

package/dist/esm/hooks/useModulesFromNode.js

@@ -1,28 +1,32 @@
 import { usePromise } from '@xylabs/react-promise';
+import { isModuleInstance } from '@xyo-network/module-model';
 import { useRefresh } from '@xyo-network/react-module';
+import compact from 'lodash/compact';
 import { useEffect, useRef } from 'react';
 import { useProvidedNode } from './provided';
-export const useModulesFromNode = (filter, up, logger) => {
+export const useModulesFromNode = (filter, config) => {
     const [node] = useProvidedNode();
     const [refreshed, refresh] = useRefresh();
+    //we store this to prevent the need of a deep compare to prevent  re-render
     const modulesLength = useRef();
     const eventUnsubscribe = [];
     const [resolvedModules, resolvedModulesError] = usePromise(async () => {
         const getModulesFromResolution = async () => {
+            const { logger, ...resolverConfig } = config ?? {};
             if (node) {
-                const resolvedDownModules = await node.downResolver.resolve(filter);
-                const resolvedUpModules = up ? await node.upResolver.resolve(filter) : [];
-                const allResolvedModules = [...resolvedDownModules, ...resolvedUpModules];
+                const allResolvedModules = compact((await node.resolve(filter, resolverConfig)).map((module) => (isModuleInstance(module) ? module : undefined)));
                 if (allResolvedModules?.length !== modulesLength.current) {
-                    logger?.debug(`getModulesFromResolution-setting: [${resolvedModules?.length}]`);
+                    logger?.debug(`getModulesFromResolution-setting: [${allResolvedModules?.length}]`);
                     modulesLength.current = allResolvedModules?.length;
                     return allResolvedModules;
                 }
             }
+            return undefined;
         };
         return await getModulesFromResolution();
-    }, [node, filter, logger, up, refreshed]);
+    }, [node, filter, config, refreshed]);
     useEffect(() => {
+        const { logger } = config ?? {};
         if (node) {
             while (eventUnsubscribe.length) {
                 eventUnsubscribe.pop()?.();
@@ -43,7 +47,7 @@ export const useModulesFromNode = (filter, up, logger) => {
                 eventUnsubscribe.pop();
             }
         };
-    }, [node]);
+    }, [node, config]);
     return [resolvedModules, resolvedModulesError];
 };
 //# sourceMappingURL=useModulesFromNode.js.map

package/dist/esm/hooks/useModulesFromNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"useModulesFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useModulesFromNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAIlD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AAEzC,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAE5C,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,MAAqB,EACrB,EAAY,EACZ,MAAe,EACoC,EAAE;IACrD,MAAM,CAAC,IAAI,CAAC,GAAG,eAAe,EAAE,CAAA;IAChC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,UAAU,EAAE,CAAA;IAEzC,MAAM,aAAa,GAAG,MAAM,EAAU,CAAA;IAEtC,MAAM,gBAAgB,GAA+B,EAAE,CAAA;IAEvD,MAAM,CAAC,eAAe,EAAE,oBAAoB,CAAC,GAAG,UAAU,CAAwB,KAAK,IAAI,EAAE;QAC3F,MAAM,wBAAwB,GAAG,KAAK,IAAI,EAAE;YAC1C,IAAI,IAAI,EAAE;gBACR,MAAM,mBAAmB,GAA0B,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAU,MAAM,CAAC,CAAA;gBACnG,MAAM,iBAAiB,GAA0B,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAU,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;gBACzG,MAAM,kBAAkB,GAAG,CAAC,GAAG,mBAAmB,EAAE,GAAG,iBAAiB,CAAC,CAAA;gBACzE,IAAI,kBAAkB,EAAE,MAAM,KAAK,aAAa,CAAC,OAAO,EAAE;oBACxD,MAAM,EAAE,KAAK,CAAC,sCAAsC,eAAe,EAAE,MAAM,GAAG,CAAC,CAAA;oBAC/E,aAAa,CAAC,OAAO,GAAG,kBAAkB,EAAE,MAAM,CAAA;oBAClD,OAAO,kBAAkB,CAAA;iBAC1B;aACF;QACH,CAAC,CAAA;QAED,OAAO,MAAM,wBAAwB,EAAE,CAAA;IACzC,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC,CAAA;IAEzC,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,IAAI,EAAE;YACR,OAAO,gBAAgB,CAAC,MAAM,EAAE;gBAC9B,gBAAgB,CAAC,GAAG,EAAE,EAAE,EAAE,CAAA;aAC3B;YACD,gBAAgB,CAAC,IAAI,CACnB,IAAI,CAAC,EAAE,CAAC,gBAAgB,EAAE,GAAG,EAAE;gBAC7B,MAAM,EAAE,KAAK,CAAC,0CAA0C,CAAC,CAAA;gBACzD,OAAO,EAAE,CAAA;YACX,CAAC,CAAC,CACH,CAAA;YACD,gBAAgB,CAAC,IAAI,CACnB,IAAI,CAAC,EAAE,CAAC,gBAAgB,EAAE,GAAG,EAAE;gBAC7B,MAAM,EAAE,KAAK,CAAC,0CAA0C,CAAC,CAAA;gBACzD,OAAO,EAAE,CAAA;YACX,CAAC,CAAC,CACH,CAAA;SACF;QAED,OAAO,GAAG,EAAE;YACV,oBAAoB;YACpB,gBAAgB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,CAAA;YAC1C,OAAO,gBAAgB,CAAC,MAAM,EAAE;gBAC9B,gBAAgB,CAAC,GAAG,EAAE,CAAA;aACvB;QACH,CAAC,CAAA;IACH,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAA;IAEV,OAAO,CAAC,eAAe,EAAE,oBAAoB,CAAC,CAAA;AAChD,CAAC,CAAA"}
+{"version":3,"file":"useModulesFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useModulesFromNode.ts"],"names":[],"mappings":"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"}

package/dist/esm/hooks/useNodeFromNode.js

@@ -1,3 +1,11 @@
+import { asNodeInstance } from '@xyo-network/node-model';
 import { useModuleFromNode } from './useModuleFromNode';
-export const useNodeFromNode = (nameOrAddress, up, logger) => useModuleFromNode(nameOrAddress, up, logger);
+export const useNodeFromNode = (nameOrAddress, config = {}) => {
+    const [module, error] = useModuleFromNode(nameOrAddress, config);
+    const instance = asNodeInstance(module);
+    if (module && !instance) {
+        return [null, Error('Resolved mode is not a NodeInstance')];
+    }
+    return [instance, error];
+};
 //# sourceMappingURL=useNodeFromNode.js.map

package/dist/esm/hooks/useNodeFromNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"useNodeFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useNodeFromNode.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,aAAsB,EAAE,EAAY,EAAE,MAAe,EAAE,EAAE,CAAC,iBAAiB,CAAa,aAAa,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA"}
+{"version":3,"file":"useNodeFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useNodeFromNode.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAgB,MAAM,yBAAyB,CAAA;AAEtE,OAAO,EAAwB,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAE7E,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,aAAsB,EAAE,SAA+B,EAAE,EAAwD,EAAE;IACjJ,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,iBAAiB,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;IAChE,MAAM,QAAQ,GAAG,cAAc,CAAC,MAAM,CAAC,CAAA;IACvC,IAAI,MAAM,IAAI,CAAC,QAAQ,EAAE;QACvB,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,qCAAqC,CAAC,CAAC,CAAA;KAC5D;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;AAC1B,CAAC,CAAA"}

package/dist/esm/hooks/useNodesFromNode.js

@@ -1,3 +1,23 @@
+import { isNodeInstance } from '@xyo-network/node-model';
 import { useModulesFromNode } from './useModulesFromNode';
-export const useNodesFromNode = (filter, up, logger) => useModulesFromNode(filter, up, logger);
+export const useNodesFromNode = (filter, config) => {
+    const [modules, error] = useModulesFromNode(filter, config);
+    if (error) {
+        return [null, error];
+    }
+    if (modules) {
+        return [
+            modules.reduce((prev, module) => {
+                if (isNodeInstance(module)) {
+                    prev.push(module);
+                }
+                return prev;
+            }, []),
+            undefined,
+        ];
+    }
+    else {
+        return [modules, error];
+    }
+};
 //# sourceMappingURL=useNodesFromNode.js.map

package/dist/esm/hooks/useNodesFromNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"useNodesFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useNodesFromNode.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAEzD,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,MAAqB,EAAE,EAAY,EAAE,MAAe,EAAE,EAAE,CAAC,kBAAkB,CAAa,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA"}
+{"version":3,"file":"useNodesFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useNodesFromNode.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAgB,MAAM,yBAAyB,CAAA;AAGtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAEzD,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,MAAqB,EAAE,MAA6B,EAA0D,EAAE;IAC/I,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC3D,IAAI,KAAK,EAAE;QACT,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;KACrB;IACD,IAAI,OAAO,EAAE;QACX,OAAO;YACL,OAAO,CAAC,MAAM,CAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;gBAC9C,IAAI,cAAc,CAAC,MAAM,CAAC,EAAE;oBAC1B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;iBAClB;gBACD,OAAO,IAAI,CAAA;YACb,CAAC,EAAE,EAAE,CAAC;YACN,SAAS;SACV,CAAA;KACF;SAAM;QACL,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;KACxB;AACH,CAAC,CAAA"}

package/dist/types/components/render/ModuleDescriptionBox.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="react" />
 import { FlexBoxProps } from '@xylabs/react-flexbox';
-import { Module } from '@xyo-network/module';
+import { ModuleInstance } from '@xyo-network/module';
 export interface ModuleDescriptionProps extends FlexBoxProps {
-    module?: Module | null;
+    module?: ModuleInstance | null;
 }
 export declare const ModuleDescriptionBox: React.FC<ModuleDescriptionProps>;
 //# sourceMappingURL=ModuleDescriptionBox.d.ts.map

package/dist/types/components/render/ModuleDescriptionBox.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ModuleDescriptionBox.d.ts","sourceRoot":"","sources":["../../../../src/components/render/ModuleDescriptionBox.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAK5C,MAAM,WAAW,sBAAuB,SAAQ,YAAY;IAC1D,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CACvB;AACD,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,sBAAsB,CAwBjE,CAAA"}
+{"version":3,"file":"ModuleDescriptionBox.d.ts","sourceRoot":"","sources":["../../../../src/components/render/ModuleDescriptionBox.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAKpD,MAAM,WAAW,sBAAuB,SAAQ,YAAY;IAC1D,MAAM,CAAC,EAAE,cAAc,GAAG,IAAI,CAAA;CAC/B;AACD,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,sBAAsB,CAwBjE,CAAA"}

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

@@ -2,5 +2,4 @@ export * from './provided';
 export * from './useModuleFromNode';
 export * from './useModulesFromNode';
 export * from './useNodeFromNode';
-export * from './wrapped';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA;AAC1B,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA;AACpC,cAAc,mBAAmB,CAAA;AACjC,cAAc,WAAW,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA;AAC1B,cAAc,qBAAqB,CAAA;AACnC,cAAc,sBAAsB,CAAA;AACpC,cAAc,mBAAmB,CAAA"}

package/dist/types/hooks/provided/index.d.ts

@@ -1,4 +1,2 @@
 export * from './useProvidedNode';
-export * from './useProvidedNodeAttachedAddresses';
-export * from './useProvidedNodeRegisteredAddresses';
 //# sourceMappingURL=index.d.ts.map

package/dist/types/hooks/provided/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/hooks/provided/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAA;AACjC,cAAc,oCAAoC,CAAA;AAClD,cAAc,sCAAsC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/hooks/provided/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAA"}

package/dist/types/hooks/provided/useProvidedNode.d.ts

@@ -1,3 +1,3 @@
-import { NodeModule } from '@xyo-network/node';
-export declare const useProvidedNode: () => [NodeModule | null | undefined];
+import { NodeInstance } from '@xyo-network/node';
+export declare const useProvidedNode: () => [NodeInstance | null | undefined];
 //# sourceMappingURL=useProvidedNode.d.ts.map

package/dist/types/hooks/provided/useProvidedNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useProvidedNode.d.ts","sourceRoot":"","sources":["../../../../src/hooks/provided/useProvidedNode.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAI9C,eAAO,MAAM,eAAe,QAAO,CAAC,UAAU,GAAG,IAAI,GAAG,SAAS,CAGhE,CAAA"}
+{"version":3,"file":"useProvidedNode.d.ts","sourceRoot":"","sources":["../../../../src/hooks/provided/useProvidedNode.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAIhD,eAAO,MAAM,eAAe,QAAO,CAAC,YAAY,GAAG,IAAI,GAAG,SAAS,CAGlE,CAAA"}

package/dist/types/hooks/useModuleFromNode.d.ts

@@ -1,68 +1,7 @@
 import { Logger } from '@xyo-network/core';
-import { Module } from '@xyo-network/module-model';
-export declare const useModuleFromNode: <TModule extends Module<import("@xyo-network/module").ModuleParams<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
-    readonly archivist?: import("@xyo-network/module").ArchivistModuleConfig | undefined;
-    readonly name?: string | undefined;
-    readonly paging?: Record<string, {
-        size?: number | undefined;
-    }> | undefined;
-    readonly schema: string;
-    readonly security?: {
-        readonly allowAnonymous?: boolean | undefined;
-        readonly allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
-        readonly disallowed?: Record<string, string[]> | undefined;
-    } | undefined;
-    readonly storeQueries?: boolean | undefined;
-} & Omit<Omit<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
-    readonly archivist?: import("@xyo-network/module").ArchivistModuleConfig | undefined;
-    readonly name?: string | undefined;
-    readonly paging?: Record<string, {
-        size?: number | undefined;
-    }> | undefined;
-    readonly schema: "network.xyo.module.config";
-    readonly security?: {
-        readonly allowAnonymous?: boolean | undefined;
-        readonly allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
-        readonly disallowed?: Record<string, string[]> | undefined;
-    } | undefined;
-    readonly storeQueries?: boolean | undefined;
-} & Omit<undefined, "schema"> & {
-    schema: "network.xyo.module.config";
-}, "schema"> & {
-    schema: string;
-}, "schema"> & {
-    schema: string;
-}, undefined>, import("@xyo-network/module").ModuleEventData> = Module<import("@xyo-network/module").ModuleParams<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
-    readonly archivist?: import("@xyo-network/module").ArchivistModuleConfig | undefined;
-    readonly name?: string | undefined;
-    readonly paging?: Record<string, {
-        size?: number | undefined;
-    }> | undefined;
-    readonly schema: string;
-    readonly security?: {
-        readonly allowAnonymous?: boolean | undefined;
-        readonly allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
-        readonly disallowed?: Record<string, string[]> | undefined;
-    } | undefined;
-    readonly storeQueries?: boolean | undefined;
-} & Omit<Omit<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
-    readonly archivist?: import("@xyo-network/module").ArchivistModuleConfig | undefined;
-    readonly name?: string | undefined;
-    readonly paging?: Record<string, {
-        size?: number | undefined;
-    }> | undefined;
-    readonly schema: "network.xyo.module.config";
-    readonly security?: {
-        readonly allowAnonymous?: boolean | undefined;
-        readonly allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
-        readonly disallowed?: Record<string, string[]> | undefined;
-    } | undefined;
-    readonly storeQueries?: boolean | undefined;
-} & Omit<undefined, "schema"> & {
-    schema: "network.xyo.module.config";
-}, "schema"> & {
-    schema: string;
-}, "schema"> & {
-    schema: string;
-}, undefined>, import("@xyo-network/module").ModuleEventData>>(nameOrAddress?: string, up?: boolean, logger?: Logger) => [TModule | null | undefined, Error | undefined];
+import { ModuleFilterOptions, ModuleInstance } from '@xyo-network/module-model';
+export type ModuleFromNodeConfig = ModuleFilterOptions & {
+    logger?: Logger;
+};
+export declare const useModuleFromNode: (nameOrAddress?: string, config?: ModuleFromNodeConfig) => [ModuleInstance | null | undefined, Error | undefined];
 //# sourceMappingURL=useModuleFromNode.d.ts.map

package/dist/types/hooks/useModuleFromNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useModuleFromNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useModuleFromNode.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAMlD,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+EACZ,MAAM,OACjB,OAAO,WACH,MAAM,oDA+DhB,CAAA"}
+{"version":3,"file":"useModuleFromNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useModuleFromNode.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE1C,OAAO,EAAoB,mBAAmB,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAMjG,MAAM,MAAM,oBAAoB,GAAG,mBAAmB,GAAG;IACvD,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,eAAO,MAAM,iBAAiB,mBAAoB,MAAM,WAAW,oBAAoB,KAAG,CAAC,cAAc,GAAG,IAAI,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAyE9I,CAAA"}

package/dist/types/hooks/useModulesFromNode.d.ts

@@ -1,68 +1,4 @@
-import { Logger } from '@xyo-network/core';
-import { Module, ModuleFilter } from '@xyo-network/module-model';
-export declare const useModulesFromNode: <TModule extends Module<import("@xyo-network/module").ModuleParams<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
-    readonly archivist?: import("@xyo-network/module").ArchivistModuleConfig | undefined;
-    readonly name?: string | undefined;
-    readonly paging?: Record<string, {
-        size?: number | undefined;
-    }> | undefined;
-    readonly schema: string;
-    readonly security?: {
-        readonly allowAnonymous?: boolean | undefined;
-        readonly allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
-        readonly disallowed?: Record<string, string[]> | undefined;
-    } | undefined;
-    readonly storeQueries?: boolean | undefined;
-} & Omit<Omit<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
-    readonly archivist?: import("@xyo-network/module").ArchivistModuleConfig | undefined;
-    readonly name?: string | undefined;
-    readonly paging?: Record<string, {
-        size?: number | undefined;
-    }> | undefined;
-    readonly schema: "network.xyo.module.config";
-    readonly security?: {
-        readonly allowAnonymous?: boolean | undefined;
-        readonly allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
-        readonly disallowed?: Record<string, string[]> | undefined;
-    } | undefined;
-    readonly storeQueries?: boolean | undefined;
-} & Omit<undefined, "schema"> & {
-    schema: "network.xyo.module.config";
-}, "schema"> & {
-    schema: string;
-}, "schema"> & {
-    schema: string;
-}, undefined>, import("@xyo-network/module").ModuleEventData> = Module<import("@xyo-network/module").ModuleParams<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
-    readonly archivist?: import("@xyo-network/module").ArchivistModuleConfig | undefined;
-    readonly name?: string | undefined;
-    readonly paging?: Record<string, {
-        size?: number | undefined;
-    }> | undefined;
-    readonly schema: string;
-    readonly security?: {
-        readonly allowAnonymous?: boolean | undefined;
-        readonly allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
-        readonly disallowed?: Record<string, string[]> | undefined;
-    } | undefined;
-    readonly storeQueries?: boolean | undefined;
-} & Omit<Omit<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
-    readonly archivist?: import("@xyo-network/module").ArchivistModuleConfig | undefined;
-    readonly name?: string | undefined;
-    readonly paging?: Record<string, {
-        size?: number | undefined;
-    }> | undefined;
-    readonly schema: "network.xyo.module.config";
-    readonly security?: {
-        readonly allowAnonymous?: boolean | undefined;
-        readonly allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
-        readonly disallowed?: Record<string, string[]> | undefined;
-    } | undefined;
-    readonly storeQueries?: boolean | undefined;
-} & Omit<undefined, "schema"> & {
-    schema: "network.xyo.module.config";
-}, "schema"> & {
-    schema: string;
-}, "schema"> & {
-    schema: string;
-}, undefined>, import("@xyo-network/module").ModuleEventData>>(filter?: ModuleFilter, up?: boolean, logger?: Logger) => [TModule[] | null | undefined, Error | undefined];
+import { ModuleFilter, ModuleInstance } from '@xyo-network/module-model';
+import { ModuleFromNodeConfig } from './useModuleFromNode';
+export declare const useModulesFromNode: (filter?: ModuleFilter, config?: ModuleFromNodeConfig) => [ModuleInstance[] | null | undefined, Error | undefined];
 //# sourceMappingURL=useModulesFromNode.d.ts.map

package/dist/types/hooks/useModulesFromNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useModulesFromNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useModulesFromNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE1C,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAMhE,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wEACpB,YAAY,OAChB,OAAO,WACH,MAAM,sDAuDhB,CAAA"}
+{"version":3,"file":"useModulesFromNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useModulesFromNode.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,YAAY,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAM1F,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAE1D,eAAO,MAAM,kBAAkB,YACpB,YAAY,WACZ,oBAAoB,KAC5B,CAAC,cAAc,EAAE,GAAG,IAAI,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CA0DzD,CAAA"}

package/dist/types/hooks/useNodeFromNode.d.ts

@@ -1,39 +1,4 @@
-import { Logger } from '@xyo-network/core';
-import { NodeModule } from '@xyo-network/node';
-export declare const useNodeFromNode: (nameOrAddress?: string, up?: boolean, logger?: Logger) => [NodeModule<import("@xyo-network/node").NodeModuleParams<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
-    readonly archivist?: import("@xyo-network/module-model").ArchivistModuleConfig | undefined;
-    readonly name?: string | undefined;
-    readonly paging?: Record<string, {
-        size?: number | undefined;
-    }> | undefined;
-    readonly schema: string;
-    readonly security?: {
-        readonly allowAnonymous?: boolean | undefined;
-        readonly allowed?: Record<string, (string | import("@xyo-network/module-model").CosigningAddressSet)[]> | undefined;
-        readonly disallowed?: Record<string, string[]> | undefined;
-    } | undefined;
-    readonly storeQueries?: boolean | undefined;
-} & Omit<Omit<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
-    readonly archivist?: import("@xyo-network/module-model").ArchivistModuleConfig | undefined;
-    readonly name?: string | undefined;
-    readonly paging?: Record<string, {
-        size?: number | undefined;
-    }> | undefined;
-    readonly schema: "network.xyo.node.config";
-    readonly security?: {
-        readonly allowAnonymous?: boolean | undefined;
-        readonly allowed?: Record<string, (string | import("@xyo-network/module-model").CosigningAddressSet)[]> | undefined;
-        readonly disallowed?: Record<string, string[]> | undefined;
-    } | undefined;
-    readonly storeQueries?: boolean | undefined;
-} & Omit<{
-    archivist?: string | undefined;
-    schema: "network.xyo.node.config";
-} & Omit<undefined, "schema">, "schema"> & {
-    schema: "network.xyo.node.config";
-}, "schema"> & {
-    schema: string;
-}, "schema"> & {
-    schema: string;
-}, undefined>, import("@xyo-network/node").NodeModuleEventData> | null | undefined, Error | undefined];
+import { NodeInstance } from '@xyo-network/node-model';
+import { ModuleFromNodeConfig } from './useModuleFromNode';
+export declare const useNodeFromNode: (nameOrAddress?: string, config?: ModuleFromNodeConfig) => [NodeInstance | null | undefined, Error | undefined];
 //# sourceMappingURL=useNodeFromNode.d.ts.map

package/dist/types/hooks/useNodeFromNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useNodeFromNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useNodeFromNode.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAI9C,eAAO,MAAM,eAAe,mBAAoB,MAAM,OAAO,OAAO,WAAW,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sGAA6D,CAAA"}
+{"version":3,"file":"useNodeFromNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useNodeFromNode.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAkB,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAEtE,OAAO,EAAE,oBAAoB,EAAqB,MAAM,qBAAqB,CAAA;AAE7E,eAAO,MAAM,eAAe,mBAAoB,MAAM,WAAU,oBAAoB,KAAQ,CAAC,YAAY,GAAG,IAAI,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAO9I,CAAA"}

package/dist/types/hooks/useNodesFromNode.d.ts

@@ -1,40 +1,5 @@
-import { Logger } from '@xyo-network/core';
-import { ModuleFilter } from '@xyo-network/module';
-import { NodeModule } from '@xyo-network/node';
-export declare const useNodesFromNode: (filter?: ModuleFilter, up?: boolean, logger?: Logger) => [NodeModule<import("@xyo-network/node").NodeModuleParams<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
-    readonly archivist?: import("@xyo-network/module").ArchivistModuleConfig | undefined;
-    readonly name?: string | undefined;
-    readonly paging?: Record<string, {
-        size?: number | undefined;
-    }> | undefined;
-    readonly schema: string;
-    readonly security?: {
-        readonly allowAnonymous?: boolean | undefined;
-        readonly allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
-        readonly disallowed?: Record<string, string[]> | undefined;
-    } | undefined;
-    readonly storeQueries?: boolean | undefined;
-} & Omit<Omit<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
-    readonly archivist?: import("@xyo-network/module").ArchivistModuleConfig | undefined;
-    readonly name?: string | undefined;
-    readonly paging?: Record<string, {
-        size?: number | undefined;
-    }> | undefined;
-    readonly schema: "network.xyo.node.config";
-    readonly security?: {
-        readonly allowAnonymous?: boolean | undefined;
-        readonly allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
-        readonly disallowed?: Record<string, string[]> | undefined;
-    } | undefined;
-    readonly storeQueries?: boolean | undefined;
-} & Omit<{
-    archivist?: string | undefined;
-    schema: "network.xyo.node.config";
-} & Omit<undefined, "schema">, "schema"> & {
-    schema: "network.xyo.node.config";
-}, "schema"> & {
-    schema: string;
-}, "schema"> & {
-    schema: string;
-}, undefined>, import("@xyo-network/node").NodeModuleEventData>[] | null | undefined, Error | undefined];
+import { ModuleFilter } from '@xyo-network/module-model';
+import { NodeInstance } from '@xyo-network/node-model';
+import { ModuleFromNodeConfig } from './useModuleFromNode';
+export declare const useNodesFromNode: (filter?: ModuleFilter, config?: ModuleFromNodeConfig) => [NodeInstance[] | null | undefined, Error | undefined];
 //# sourceMappingURL=useNodesFromNode.d.ts.map

package/dist/types/hooks/useNodesFromNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useNodesFromNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useNodesFromNode.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAI9C,eAAO,MAAM,gBAAgB,YAAa,YAAY,OAAO,OAAO,WAAW,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wGAAuD,CAAA"}
+{"version":3,"file":"useNodesFromNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useNodesFromNode.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,EAAkB,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAEtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAG1D,eAAO,MAAM,gBAAgB,YAAa,YAAY,WAAW,oBAAoB,KAAG,CAAC,YAAY,EAAE,GAAG,IAAI,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAkB5I,CAAA"}