@xyo-network/react-node 2.56.17 → 2.57.1

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

@@ -13,7 +13,7 @@ const RenderModule = ({ module, idRef }) => {
     (0, react_async_effect_1.useAsyncEffect)(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     (mounted) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        const children = (yield module.downResolver.resolve()).filter((childModule) => childModule.address !== address);
+        const children = (yield module.resolve()).filter((childModule) => childModule.address !== address);
         if (mounted()) {
             setChildModules(children);
         }

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

@@ -1 +1 @@
-{"version":3,"file":"RenderModule.js","sourceRoot":"","sources":["../../../../src/components/render/RenderModule.tsx"],"names":[],"mappings":";;;;;AAAA,kCAAmC;AACnC,4CAAsC;AACtC,mEAA2D;AAE3D,iCAAkD;AAU3C,MAAM,YAAY,GAAgC,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE;IAC7E,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAA;IACzC,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,IAAA,gBAAQ,GAAY,CAAA;IAE5D,IAAA,mCAAc;IACZ,uDAAuD;IACvD,CAAO,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,CAAA,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,wBAAC,qBAAqB,kBAAC,MAAM,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,YAAY,OAAO,EAAE,iBACrE,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;gBAC5B,OAAO,uBAAC,cAAQ,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,uBAAC,cAAQ,kBAAC,MAAM,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,gBAC9D,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CACjC,uBAAC,oBAAY,IAA2B,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,IAAtD,WAAW,CAAC,OAAO,CAAuC,CAC9E,CAAC,IACO,CACZ,CAAC,CAAC,CAAC,IAAI,KACc,CACzB,CAAA;AACH,CAAC,CAAA;AAnCY,QAAA,YAAY,gBAmCxB;AAED,MAAM,qBAAqB,GAAG,IAAA,iBAAM,EAAC,cAAQ,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,kCAAmC;AACnC,4CAAsC;AACtC,mEAA2D;AAE3D,iCAAkD;AAU3C,MAAM,YAAY,GAAgC,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE;IAC7E,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAA;IACzC,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,IAAA,gBAAQ,GAAY,CAAA;IAE5D,IAAA,mCAAc;IACZ,uDAAuD;IACvD,CAAO,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,CAAA,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,wBAAC,qBAAqB,kBAAC,MAAM,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,YAAY,OAAO,EAAE,iBACrE,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;gBAC5B,OAAO,uBAAC,cAAQ,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,uBAAC,cAAQ,kBAAC,MAAM,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,gBAC9D,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CACjC,uBAAC,oBAAY,IAA2B,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,IAAtD,WAAW,CAAC,OAAO,CAAuC,CAC9E,CAAC,IACO,CACZ,CAAC,CAAC,CAAC,IAAI,KACc,CACzB,CAAA;AACH,CAAC,CAAA;AAnCY,QAAA,YAAY,gBAmCxB;AAED,MAAM,qBAAqB,GAAG,IAAA,iBAAM,EAAC,cAAQ,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/cjs/hooks/index.js

@@ -5,5 +5,4 @@ tslib_1.__exportStar(require("./provided"), exports);
 tslib_1.__exportStar(require("./useModuleFromNode"), exports);
 tslib_1.__exportStar(require("./useModulesFromNode"), exports);
 tslib_1.__exportStar(require("./useNodeFromNode"), exports);
-tslib_1.__exportStar(require("./wrapped"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":";;;AAAA,qDAA0B;AAC1B,8DAAmC;AACnC,+DAAoC;AACpC,4DAAiC;AACjC,oDAAyB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":";;;AAAA,qDAA0B;AAC1B,8DAAmC;AACnC,+DAAoC;AACpC,4DAAiC"}

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

@@ -2,6 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./useProvidedNode"), exports);
-tslib_1.__exportStar(require("./useProvidedNodeAttachedAddresses"), exports);
-tslib_1.__exportStar(require("./useProvidedNodeRegisteredAddresses"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/hooks/provided/index.ts"],"names":[],"mappings":";;;AAAA,4DAAiC;AACjC,6EAAkD;AAClD,+EAAoD"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/hooks/provided/index.ts"],"names":[],"mappings":";;;AAAA,4DAAiC"}

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

@@ -1 +1 @@
-{"version":3,"file":"useProvidedNode.js","sourceRoot":"","sources":["../../../../src/hooks/provided/useProvidedNode.tsx"],"names":[],"mappings":";;;AACA,wEAA6D;AAC7D,iCAAkC;AAE3B,MAAM,eAAe,GAAG,GAAoC,EAAE;IACnE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,kBAAU,EAAC,gCAAW,CAAC,CAAA;IACxC,OAAO,CAAC,IAAI,CAAC,CAAA;AACf,CAAC,CAAA;AAHY,QAAA,eAAe,mBAG3B"}
+{"version":3,"file":"useProvidedNode.js","sourceRoot":"","sources":["../../../../src/hooks/provided/useProvidedNode.tsx"],"names":[],"mappings":";;;AACA,wEAA6D;AAC7D,iCAAkC;AAE3B,MAAM,eAAe,GAAG,GAAsC,EAAE;IACrE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,kBAAU,EAAC,gCAAW,CAAC,CAAA;IACxC,OAAO,CAAC,IAAI,CAAC,CAAA;AACf,CAAC,CAAA;AAHY,QAAA,eAAe,mBAG3B"}

package/dist/cjs/hooks/useModuleFromNode.js

@@ -3,9 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useModuleFromNode = void 0;
 const tslib_1 = require("tslib");
 const react_async_effect_1 = require("@xylabs/react-async-effect");
+const module_model_1 = require("@xyo-network/module-model");
 const react_1 = require("react");
 const provided_1 = require("./provided");
-const useModuleFromNode = (nameOrAddress, up, logger) => {
+const useModuleFromNode = (nameOrAddress, config) => {
     const [node] = (0, provided_1.useProvidedNode)();
     const [module, setModule] = (0, react_1.useState)();
     const [error, setError] = (0, react_1.useState)();
@@ -13,33 +14,47 @@ const useModuleFromNode = (nameOrAddress, up, logger) => {
     (0, react_async_effect_1.useAsyncEffect)(
     // eslint-disable-next-line react-hooks/exhaustive-deps
     (mounted) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+        const _a = config !== null && config !== void 0 ? config : {}, { logger } = _a, resolverConfig = tslib_1.__rest(_a, ["logger"]);
         const eventUnsubscribe = [];
         try {
             if (node) {
                 const attachHandler = (args) => {
                     const eventModule = args.module;
-                    if (nameOrAddress && (eventModule.address === nameOrAddress || (eventModule === null || eventModule === void 0 ? void 0 : eventModule.config.name) === nameOrAddress)) {
+                    if (nameOrAddress && ((eventModule === null || eventModule === void 0 ? void 0 : eventModule.address) === nameOrAddress || (eventModule === null || eventModule === void 0 ? void 0 : eventModule.config.name) === nameOrAddress)) {
                         logger === null || logger === void 0 ? void 0 : logger.debug(`attachHandler-setting [${nameOrAddress}]`);
-                        setModule(eventModule);
-                        setError(undefined);
+                        if ((0, module_model_1.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 === null || logger === void 0 ? void 0 : logger.debug(`detachHandler-clearing [${address}]`);
-                        setModule(undefined);
+                        setModule(null);
                         setError(undefined);
                     }
                 };
-                const moduleDown = nameOrAddress ? yield node.downResolver.resolveOne(nameOrAddress) : undefined;
-                const module = moduleDown !== null && moduleDown !== void 0 ? moduleDown : (up && nameOrAddress ? yield node.upResolver.resolveOne(nameOrAddress) : undefined);
+                const module = nameOrAddress ? yield node.resolve(nameOrAddress, resolverConfig) : undefined;
                 if (mounted()) {
-                    eventUnsubscribe.push(node.on('moduleAttached', attachHandler));
-                    eventUnsubscribe.push(node.on('moduleDetached', detachHandler));
-                    logger === null || logger === void 0 ? void 0 : logger.debug(`resolved [${nameOrAddress}]`);
-                    setModule(module);
-                    setError(undefined);
+                    if (module) {
+                        if (!(0, module_model_1.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 === null || logger === void 0 ? void 0 : logger.debug(`resolved [${nameOrAddress}]`);
+                        setModule(module !== null && module !== void 0 ? module : null);
+                        setError(undefined);
+                    }
                 }
             }
             else {
@@ -61,7 +76,7 @@ const useModuleFromNode = (nameOrAddress, up, logger) => {
                 setModule(undefined);
             }
         }
-    }), [nameOrAddress, node, address, logger, up]);
+    }), [nameOrAddress, node, address, config]);
     return [module, error];
 };
 exports.useModuleFromNode = useModuleFromNode;

package/dist/cjs/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/cjs/hooks/useModulesFromNode.js

@@ -3,31 +3,35 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useModulesFromNode = void 0;
 const tslib_1 = require("tslib");
 const react_promise_1 = require("@xylabs/react-promise");
+const module_model_1 = require("@xyo-network/module-model");
 const react_module_1 = require("@xyo-network/react-module");
+const compact_1 = tslib_1.__importDefault(require("lodash/compact"));
 const react_1 = require("react");
 const provided_1 = require("./provided");
-const useModulesFromNode = (filter, up, logger) => {
+const useModulesFromNode = (filter, config) => {
     const [node] = (0, provided_1.useProvidedNode)();
     const [refreshed, refresh] = (0, react_module_1.useRefresh)();
+    //we store this to prevent the need of a deep compare to prevent  re-render
     const modulesLength = (0, react_1.useRef)();
     const eventUnsubscribe = [];
     const [resolvedModules, resolvedModulesError] = (0, react_promise_1.usePromise)(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
         const getModulesFromResolution = () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+            const _a = config !== null && config !== void 0 ? config : {}, { logger } = _a, resolverConfig = tslib_1.__rest(_a, ["logger"]);
             if (node) {
-                const resolvedDownModules = yield node.downResolver.resolve(filter);
-                const resolvedUpModules = up ? yield node.upResolver.resolve(filter) : [];
-                const allResolvedModules = [...resolvedDownModules, ...resolvedUpModules];
+                const allResolvedModules = (0, compact_1.default)((yield node.resolve(filter, resolverConfig)).map((module) => ((0, module_model_1.isModuleInstance)(module) ? module : undefined)));
                 if ((allResolvedModules === null || allResolvedModules === void 0 ? void 0 : allResolvedModules.length) !== modulesLength.current) {
-                    logger === null || logger === void 0 ? void 0 : logger.debug(`getModulesFromResolution-setting: [${resolvedModules === null || resolvedModules === void 0 ? void 0 : resolvedModules.length}]`);
+                    logger === null || logger === void 0 ? void 0 : logger.debug(`getModulesFromResolution-setting: [${allResolvedModules === null || allResolvedModules === void 0 ? void 0 : allResolvedModules.length}]`);
                     modulesLength.current = allResolvedModules === null || allResolvedModules === void 0 ? void 0 : allResolvedModules.length;
                     return allResolvedModules;
                 }
             }
+            return undefined;
         });
         return yield getModulesFromResolution();
-    }), [node, filter, logger, up, refreshed]);
+    }), [node, filter, config, refreshed]);
     (0, react_1.useEffect)(() => {
         var _a;
+        const { logger } = config !== null && config !== void 0 ? config : {};
         if (node) {
             while (eventUnsubscribe.length) {
                 (_a = eventUnsubscribe.pop()) === null || _a === void 0 ? void 0 : _a();
@@ -48,7 +52,7 @@ const useModulesFromNode = (filter, up, logger) => {
                 eventUnsubscribe.pop();
             }
         };
-    }, [node]);
+    }, [node, config]);
     return [resolvedModules, resolvedModulesError];
 };
 exports.useModulesFromNode = useModulesFromNode;

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

@@ -1 +1 @@
-{"version":3,"file":"useModulesFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useModulesFromNode.ts"],"names":[],"mappings":";;;;AAAA,yDAAkD;AAIlD,4DAAsD;AACtD,iCAAyC;AAEzC,yCAA4C;AAErC,MAAM,kBAAkB,GAAG,CAChC,MAAqB,EACrB,EAAY,EACZ,MAAe,EACoC,EAAE;IACrD,MAAM,CAAC,IAAI,CAAC,GAAG,IAAA,0BAAe,GAAE,CAAA;IAChC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,IAAA,yBAAU,GAAE,CAAA;IAEzC,MAAM,aAAa,GAAG,IAAA,cAAM,GAAU,CAAA;IAEtC,MAAM,gBAAgB,GAA+B,EAAE,CAAA;IAEvD,MAAM,CAAC,eAAe,EAAE,oBAAoB,CAAC,GAAG,IAAA,0BAAU,EAAwB,GAAS,EAAE;QAC3F,MAAM,wBAAwB,GAAG,GAAS,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,CAAA,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,MAAM,MAAK,aAAa,CAAC,OAAO,EAAE;oBACxD,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,sCAAsC,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,MAAM,GAAG,CAAC,CAAA;oBAC/E,aAAa,CAAC,OAAO,GAAG,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,MAAM,CAAA;oBAClD,OAAO,kBAAkB,CAAA;iBAC1B;aACF;QACH,CAAC,CAAA,CAAA;QAED,OAAO,MAAM,wBAAwB,EAAE,CAAA;IACzC,CAAC,CAAA,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC,CAAA;IAEzC,IAAA,iBAAS,EAAC,GAAG,EAAE;;QACb,IAAI,IAAI,EAAE;YACR,OAAO,gBAAgB,CAAC,MAAM,EAAE;gBAC9B,MAAA,gBAAgB,CAAC,GAAG,EAAE,2CAAI,CAAA;aAC3B;YACD,gBAAgB,CAAC,IAAI,CACnB,IAAI,CAAC,EAAE,CAAC,gBAAgB,EAAE,GAAG,EAAE;gBAC7B,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,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,aAAN,MAAM,uBAAN,MAAM,CAAE,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;AA1DY,QAAA,kBAAkB,sBA0D9B"}
+{"version":3,"file":"useModulesFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useModulesFromNode.ts"],"names":[],"mappings":"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"}

package/dist/cjs/hooks/useNodeFromNode.js

@@ -1,7 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useNodeFromNode = void 0;
+const node_model_1 = require("@xyo-network/node-model");
 const useModuleFromNode_1 = require("./useModuleFromNode");
-const useNodeFromNode = (nameOrAddress, up, logger) => (0, useModuleFromNode_1.useModuleFromNode)(nameOrAddress, up, logger);
+const useNodeFromNode = (nameOrAddress, config = {}) => {
+    const [module, error] = (0, useModuleFromNode_1.useModuleFromNode)(nameOrAddress, config);
+    const instance = (0, node_model_1.asNodeInstance)(module);
+    if (module && !instance) {
+        return [null, Error('Resolved mode is not a NodeInstance')];
+    }
+    return [instance, error];
+};
 exports.useNodeFromNode = useNodeFromNode;
 //# sourceMappingURL=useNodeFromNode.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useNodeFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useNodeFromNode.tsx"],"names":[],"mappings":";;;AAGA,2DAAuD;AAEhD,MAAM,eAAe,GAAG,CAAC,aAAsB,EAAE,EAAY,EAAE,MAAe,EAAE,EAAE,CAAC,IAAA,qCAAiB,EAAa,aAAa,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;AAArI,QAAA,eAAe,mBAAsH"}
+{"version":3,"file":"useNodeFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useNodeFromNode.tsx"],"names":[],"mappings":";;;AAAA,wDAAsE;AAEtE,2DAA6E;AAEtE,MAAM,eAAe,GAAG,CAAC,aAAsB,EAAE,SAA+B,EAAE,EAAwD,EAAE;IACjJ,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,IAAA,qCAAiB,EAAC,aAAa,EAAE,MAAM,CAAC,CAAA;IAChE,MAAM,QAAQ,GAAG,IAAA,2BAAc,EAAC,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;AAPY,QAAA,eAAe,mBAO3B"}

package/dist/cjs/hooks/useNodesFromNode.js

@@ -1,7 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useNodesFromNode = void 0;
+const node_model_1 = require("@xyo-network/node-model");
 const useModulesFromNode_1 = require("./useModulesFromNode");
-const useNodesFromNode = (filter, up, logger) => (0, useModulesFromNode_1.useModulesFromNode)(filter, up, logger);
+const useNodesFromNode = (filter, config) => {
+    const [modules, error] = (0, useModulesFromNode_1.useModulesFromNode)(filter, config);
+    if (error) {
+        return [null, error];
+    }
+    if (modules) {
+        return [
+            modules.reduce((prev, module) => {
+                if ((0, node_model_1.isNodeInstance)(module)) {
+                    prev.push(module);
+                }
+                return prev;
+            }, []),
+            undefined,
+        ];
+    }
+    else {
+        return [modules, error];
+    }
+};
 exports.useNodesFromNode = useNodesFromNode;
 //# sourceMappingURL=useNodesFromNode.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useNodesFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useNodesFromNode.tsx"],"names":[],"mappings":";;;AAIA,6DAAyD;AAElD,MAAM,gBAAgB,GAAG,CAAC,MAAqB,EAAE,EAAY,EAAE,MAAe,EAAE,EAAE,CAAC,IAAA,uCAAkB,EAAa,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;AAA/H,QAAA,gBAAgB,oBAA+G"}
+{"version":3,"file":"useNodesFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useNodesFromNode.tsx"],"names":[],"mappings":";;;AACA,wDAAsE;AAGtE,6DAAyD;AAElD,MAAM,gBAAgB,GAAG,CAAC,MAAqB,EAAE,MAA6B,EAA0D,EAAE;IAC/I,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,IAAA,uCAAkB,EAAC,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,IAAA,2BAAc,EAAC,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;AAlBY,QAAA,gBAAgB,oBAkB5B"}