@xyo-network/react-node 2.45.0-rc.15 → 2.45.0-rc.17

package/dist/cjs/hooks/index.js

@@ -15,4 +15,5 @@ tslib_1.__exportStar(require("./useNodeQueryDiviner"), exports);
 tslib_1.__exportStar(require("./useProvidedNode"), exports);
 tslib_1.__exportStar(require("./useWitnessModule"), exports);
 tslib_1.__exportStar(require("./useWitnessModules"), exports);
+tslib_1.__exportStar(require("./useWrappedModule"), 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,iEAAsC;AACtC,+DAAoC;AACpC,gEAAqC;AACrC,6DAAkC;AAClC,8DAAmC;AACnC,iEAAsC;AACtC,sDAA2B;AAC3B,+DAAoC;AACpC,uDAA4B;AAC5B,oDAAyB;AACzB,gEAAqC;AACrC,4DAAiC;AACjC,6DAAkC;AAClC,8DAAmC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":";;;AAAA,iEAAsC;AACtC,+DAAoC;AACpC,gEAAqC;AACrC,6DAAkC;AAClC,8DAAmC;AACnC,iEAAsC;AACtC,sDAA2B;AAC3B,+DAAoC;AACpC,uDAA4B;AAC5B,oDAAyB;AACzB,gEAAqC;AACrC,4DAAiC;AACjC,6DAAkC;AAClC,8DAAmC;AACnC,6DAAkC"}

package/dist/cjs/hooks/useModule.js

@@ -1,7 +1,53 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useModule = void 0;
-const module_1 = require("@xyo-network/module");
-const useNode_1 = require("./useNode");
-exports.useModule = (0, useNode_1.createUseModuleHook)((module) => module_1.ModuleWrapper.tryWrap(module), useNode_1.useNode);
+const tslib_1 = require("tslib");
+const react_shared_1 = require("@xylabs/react-shared");
+const node_1 = require("@xyo-network/node");
+const react_1 = require("react");
+const useProvidedNode_1 = require("./useProvidedNode");
+const useModule = (nameOrAddress) => {
+    const [node, nodeError] = (0, useProvidedNode_1.useProvidedNode)();
+    const [module, setModule] = (0, react_1.useState)();
+    const [error, setError] = (0, react_1.useState)();
+    (0, react_shared_1.useAsyncEffect)(
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    (mounted) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+        try {
+            if (nodeError) {
+                console.log(`Setting NodeError [${nodeError.message}]`);
+                setError(nodeError);
+                setModule(undefined);
+            }
+            else {
+                const wrappedNode = node_1.NodeWrapper.tryWrap(node);
+                if (wrappedNode) {
+                    const module = nameOrAddress
+                        ? yield (wrappedNode === null || wrappedNode === void 0 ? void 0 : wrappedNode.resolve(nameOrAddress))
+                        : (yield wrappedNode.resolve()).pop();
+                    if (mounted()) {
+                        console.log(`Setting Module [${module === null || module === void 0 ? void 0 : module.address}]`);
+                        setModule(module);
+                        setError(undefined);
+                    }
+                }
+                else {
+                    console.log('Setting All to undefined');
+                    setError(undefined);
+                    setModule(undefined);
+                }
+            }
+        }
+        catch (ex) {
+            if (mounted()) {
+                const error = ex;
+                console.log(`Setting Error [${error.message}]`);
+                setError(error);
+                setModule(undefined);
+            }
+        }
+    }), [nameOrAddress, node, nodeError]);
+    return [module, error];
+};
+exports.useModule = useModule;
 //# sourceMappingURL=useModule.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useModule.js","sourceRoot":"","sources":["../../../src/hooks/useModule.tsx"],"names":[],"mappings":";;;AAAA,gDAA2D;AAE3D,uCAAwD;AAE3C,QAAA,SAAS,GAAG,IAAA,6BAAmB,EAAwB,CAAC,MAAM,EAAE,EAAE,CAAC,sBAAa,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,iBAAO,CAAC,CAAA"}
+{"version":3,"file":"useModule.js","sourceRoot":"","sources":["../../../src/hooks/useModule.tsx"],"names":[],"mappings":";;;;AAAA,uDAAqD;AAErD,4CAA+C;AAC/C,iCAAgC;AAEhC,uDAAmD;AAE5C,MAAM,SAAS,GAAG,CAAkC,aAAsB,EAA4C,EAAE;IAC7H,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,IAAA,iCAAe,GAAE,CAAA;IAC3C,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAA,gBAAQ,GAAW,CAAA;IAC/C,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,GAAS,CAAA;IAC3C,IAAA,6BAAc;IACZ,uDAAuD;IACvD,CAAO,OAAO,EAAE,EAAE;QAChB,IAAI;YACF,IAAI,SAAS,EAAE;gBACb,OAAO,CAAC,GAAG,CAAC,sBAAsB,SAAS,CAAC,OAAO,GAAG,CAAC,CAAA;gBACvD,QAAQ,CAAC,SAAS,CAAC,CAAA;gBACnB,SAAS,CAAC,SAAS,CAAC,CAAA;aACrB;iBAAM;gBACL,MAAM,WAAW,GAAG,kBAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;gBAC7C,IAAI,WAAW,EAAE;oBACf,MAAM,MAAM,GAAwB,aAAa;wBAC/C,CAAC,CAAC,MAAM,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,CAAU,aAAa,CAAC,CAAA;wBACpD,CAAC,CAAC,CAAC,MAAM,WAAW,CAAC,OAAO,EAAW,CAAC,CAAC,GAAG,EAAE,CAAA;oBAChD,IAAI,OAAO,EAAE,EAAE;wBACb,OAAO,CAAC,GAAG,CAAC,mBAAmB,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,GAAG,CAAC,CAAA;wBAClD,SAAS,CAAC,MAAM,CAAC,CAAA;wBACjB,QAAQ,CAAC,SAAS,CAAC,CAAA;qBACpB;iBACF;qBAAM;oBACL,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAA;oBACvC,QAAQ,CAAC,SAAS,CAAC,CAAA;oBACnB,SAAS,CAAC,SAAS,CAAC,CAAA;iBACrB;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,IAAI,OAAO,EAAE,EAAE;gBACb,MAAM,KAAK,GAAG,EAAW,CAAA;gBACzB,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,CAAC,OAAO,GAAG,CAAC,CAAA;gBAC/C,QAAQ,CAAC,KAAK,CAAC,CAAA;gBACf,SAAS,CAAC,SAAS,CAAC,CAAA;aACrB;SACF;IACH,CAAC,CAAA,EACD,CAAC,aAAa,EAAE,IAAI,EAAE,SAAS,CAAC,CACjC,CAAA;IAED,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;AACxB,CAAC,CAAA;AA1CY,QAAA,SAAS,aA0CrB"}

package/dist/cjs/hooks/useNode.js

@@ -1,64 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useNode = exports.createUseModuleHook = void 0;
-const tslib_1 = require("tslib");
-/* eslint-disable react-hooks/rules-of-hooks */
-const react_shared_1 = require("@xylabs/react-shared");
-const node_1 = require("@xyo-network/node");
-const react_1 = require("react");
+exports.useNode = void 0;
+const useModule_1 = require("./useModule");
 const useProvidedNode_1 = require("./useProvidedNode");
-const createUseModuleHook = (wrapFunc, nodeFunc, defaultModuleFunc = () => [undefined, undefined]) => {
-    function use(nameOrAddressOrWrapOrAccount, wrap = false) {
-        const [node, nodeError] = nodeFunc();
-        const [defaultModule] = defaultModuleFunc();
-        const shouldWrap = typeof nameOrAddressOrWrapOrAccount === 'boolean' ? nameOrAddressOrWrapOrAccount : wrap;
-        const account = typeof nameOrAddressOrWrapOrAccount === 'object' ? nameOrAddressOrWrapOrAccount : typeof wrap === 'boolean' ? undefined : wrap;
-        const nameOrAddress = typeof nameOrAddressOrWrapOrAccount === 'string' ? nameOrAddressOrWrapOrAccount : undefined;
-        const [module, setModule] = (0, react_1.useState)();
-        const [error, setError] = (0, react_1.useState)();
-        (0, react_shared_1.useAsyncEffect)(
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-        (mounted) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            try {
-                if (nodeError) {
-                    console.log(`Setting NodeError [${nodeError.message}]`);
-                    setError(nodeError);
-                    setModule(undefined);
-                }
-                else {
-                    const wrappedNode = node_1.NodeWrapper.tryWrap(node);
-                    if (wrappedNode) {
-                        const module = nameOrAddress
-                            ? yield (wrappedNode === null || wrappedNode === void 0 ? void 0 : wrappedNode.resolve(nameOrAddress))
-                            : (yield wrappedNode.resolve()).pop();
-                        const moduleWithDefault = nameOrAddress ? module : module !== null && module !== void 0 ? module : defaultModule;
-                        const finalModule = shouldWrap ? wrapFunc(moduleWithDefault, account) : moduleWithDefault;
-                        if (mounted()) {
-                            console.log(`Setting Module [${finalModule === null || finalModule === void 0 ? void 0 : finalModule.address}]`);
-                            setModule(finalModule);
-                            setError(undefined);
-                        }
-                    }
-                    else {
-                        console.log('Setting All to undefined');
-                        setError(undefined);
-                        setModule(undefined);
-                    }
-                }
-            }
-            catch (ex) {
-                if (mounted()) {
-                    const error = ex;
-                    console.log(`Setting Error [${error.message}]`);
-                    setError(error);
-                    setModule(undefined);
-                }
-            }
-        }), [wrap, node, nameOrAddress, nodeError, shouldWrap, account, defaultModule]);
-        return [module, error];
+const useNode = (nameOrAddress) => {
+    const providedNode = (0, useProvidedNode_1.useProvidedNode)();
+    const node = (0, useModule_1.useModule)(nameOrAddress);
+    if (nameOrAddress) {
+        if (providedNode && node) {
+            return node;
+        }
     }
-    return use;
+    else {
+        return providedNode;
+    }
+    return [undefined, undefined];
 };
-exports.createUseModuleHook = createUseModuleHook;
-exports.useNode = (0, exports.createUseModuleHook)((module) => node_1.NodeWrapper.tryWrap(module), useProvidedNode_1.useProvidedNode, useProvidedNode_1.useProvidedNode);
+exports.useNode = useNode;
 //# sourceMappingURL=useNode.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useNode.js","sourceRoot":"","sources":["../../../src/hooks/useNode.tsx"],"names":[],"mappings":";;;;AAAA,+CAA+C;AAC/C,uDAAqD;AAGrD,4CAA2D;AAC3D,iCAAgC;AAEhC,uDAAmD;AAS5C,MAAM,mBAAmB,GAAG,CAKjC,QAAmB,EACnB,QAAkB,EAClB,oBAAoE,GAAG,EAAE,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,EAChG,EAAE;IAMF,SAAS,GAAG,CACV,4BAAyD,EACzD,OAA0B,KAAK;QAE/B,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,QAAQ,EAAE,CAAA;QACpC,MAAM,CAAC,aAAa,CAAC,GAAG,iBAAiB,EAAE,CAAA;QAC3C,MAAM,UAAU,GAAG,OAAO,4BAA4B,KAAK,SAAS,CAAC,CAAC,CAAC,4BAA4B,CAAC,CAAC,CAAC,IAAI,CAAA;QAC1G,MAAM,OAAO,GAAG,OAAO,4BAA4B,KAAK,QAAQ,CAAC,CAAC,CAAC,4BAA4B,CAAC,CAAC,CAAC,OAAO,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAA;QAC9I,MAAM,aAAa,GAAG,OAAO,4BAA4B,KAAK,QAAQ,CAAC,CAAC,CAAC,4BAA4B,CAAC,CAAC,CAAC,SAAS,CAAA;QACjH,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAA,gBAAQ,GAAsB,CAAA;QAC1D,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,GAAS,CAAA;QAC3C,IAAA,6BAAc;QACZ,uDAAuD;QACvD,CAAO,OAAO,EAAE,EAAE;YAChB,IAAI;gBACF,IAAI,SAAS,EAAE;oBACb,OAAO,CAAC,GAAG,CAAC,sBAAsB,SAAS,CAAC,OAAO,GAAG,CAAC,CAAA;oBACvD,QAAQ,CAAC,SAAS,CAAC,CAAA;oBACnB,SAAS,CAAC,SAAS,CAAC,CAAA;iBACrB;qBAAM;oBACL,MAAM,WAAW,GAAG,kBAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;oBAC7C,IAAI,WAAW,EAAE;wBACf,MAAM,MAAM,GAAwB,aAAa;4BAC/C,CAAC,CAAC,MAAM,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,CAAU,aAAa,CAAC,CAAA;4BACpD,CAAC,CAAC,CAAC,MAAM,WAAW,CAAC,OAAO,EAAW,CAAC,CAAC,GAAG,EAAE,CAAA;wBAChD,MAAM,iBAAiB,GAAG,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,aAAa,CAAA;wBAC1E,MAAM,WAAW,GAAG,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAA;wBACzF,IAAI,OAAO,EAAE,EAAE;4BACb,OAAO,CAAC,GAAG,CAAC,mBAAmB,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,GAAG,CAAC,CAAA;4BACvD,SAAS,CAAC,WAAW,CAAC,CAAA;4BACtB,QAAQ,CAAC,SAAS,CAAC,CAAA;yBACpB;qBACF;yBAAM;wBACL,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAA;wBACvC,QAAQ,CAAC,SAAS,CAAC,CAAA;wBACnB,SAAS,CAAC,SAAS,CAAC,CAAA;qBACrB;iBACF;aACF;YAAC,OAAO,EAAE,EAAE;gBACX,IAAI,OAAO,EAAE,EAAE;oBACb,MAAM,KAAK,GAAG,EAAW,CAAA;oBACzB,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,CAAC,OAAO,GAAG,CAAC,CAAA;oBAC/C,QAAQ,CAAC,KAAK,CAAC,CAAA;oBACf,SAAS,CAAC,SAAS,CAAC,CAAA;iBACrB;aACF;QACH,CAAC,CAAA,EACD,CAAC,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa,CAAC,CAC3E,CAAA;QAED,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IACxB,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAnEY,QAAA,mBAAmB,uBAmE/B;AAEY,QAAA,OAAO,GAAG,IAAA,2BAAmB,EAA0B,CAAC,MAAM,EAAE,EAAE,CAAC,kBAAW,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,iCAAe,EAAE,iCAAe,CAAC,CAAA"}
+{"version":3,"file":"useNode.js","sourceRoot":"","sources":["../../../src/hooks/useNode.tsx"],"names":[],"mappings":";;;AAEA,2CAAuC;AACvC,uDAAmD;AAE5C,MAAM,OAAO,GAAG,CAAC,aAAsB,EAA+C,EAAE;IAC7F,MAAM,YAAY,GAAG,IAAA,iCAAe,GAAE,CAAA;IACtC,MAAM,IAAI,GAAG,IAAA,qBAAS,EAAa,aAAa,CAAC,CAAA;IAEjD,IAAI,aAAa,EAAE;QACjB,IAAI,YAAY,IAAI,IAAI,EAAE;YACxB,OAAO,IAAI,CAAA;SACZ;KACF;SAAM;QACL,OAAO,YAAY,CAAA;KACpB;IACD,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;AAC/B,CAAC,CAAA;AAZY,QAAA,OAAO,WAYnB"}

package/dist/cjs/hooks/useWrappedModule.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useWrappedModule = exports.WrappedModuleHookFactory = void 0;
+const module_1 = require("@xyo-network/module");
+const react_1 = require("react");
+const useModule_1 = require("./useModule");
+const WrappedModuleHookFactory = (wrapperObject) => {
+    return (nameOrAddress, account) => {
+        const [module, moduleError] = (0, useModule_1.useModule)(nameOrAddress);
+        const [wrapper, setWrapper] = (0, react_1.useState)();
+        const [error, setError] = (0, react_1.useState)();
+        (0, react_1.useEffect)(() => {
+            if (module) {
+                try {
+                    const wrapper = wrapperObject.wrap(module, account);
+                    setWrapper(wrapper);
+                }
+                catch (ex) {
+                    setWrapper(undefined);
+                    setError(ex);
+                }
+            }
+            else {
+                setWrapper(undefined);
+                setError(moduleError);
+            }
+        }, [module, account, moduleError]);
+        return [wrapper, error];
+    };
+};
+exports.WrappedModuleHookFactory = WrappedModuleHookFactory;
+exports.useWrappedModule = (0, exports.WrappedModuleHookFactory)(module_1.ModuleWrapper);
+//# sourceMappingURL=useWrappedModule.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useWrappedModule.js","sourceRoot":"","sources":["../../../src/hooks/useWrappedModule.tsx"],"names":[],"mappings":";;;AAEA,gDAAmD;AACnD,iCAA2C;AAE3C,2CAAuC;AAMhC,MAAM,wBAAwB,GAAG,CAAuD,aAA4C,EAAE,EAAE;IAC7I,OAAO,CAAC,aAAsB,EAAE,OAAyB,EAAmD,EAAE;QAC5G,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,IAAA,qBAAS,EAA2B,aAAa,CAAC,CAAA;QAEhF,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,IAAA,gBAAQ,GAAkB,CAAA;QACxD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,GAAS,CAAA;QAC3C,IAAA,iBAAS,EAAC,GAAG,EAAE;YACb,IAAI,MAAM,EAAE;gBACV,IAAI;oBACF,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAmB,CAAA;oBACrE,UAAU,CAAC,OAAO,CAAC,CAAA;iBACpB;gBAAC,OAAO,EAAE,EAAE;oBACX,UAAU,CAAC,SAAS,CAAC,CAAA;oBACrB,QAAQ,CAAC,EAAW,CAAC,CAAA;iBACtB;aACF;iBAAM;gBACL,UAAU,CAAC,SAAS,CAAC,CAAA;gBACrB,QAAQ,CAAC,WAAW,CAAC,CAAA;aACtB;QACH,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAA;QAElC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;IACzB,CAAC,CAAA;AACH,CAAC,CAAA;AAvBY,QAAA,wBAAwB,4BAuBpC;AAEY,QAAA,gBAAgB,GAAG,IAAA,gCAAwB,EAAC,sBAAa,CAAC,CAAA"}