@xyo-network/react-node 2.56.6 → 2.56.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (22) hide show
  1. package/dist/cjs/hooks/useModuleFromNode.js +4 -7
  2. package/dist/cjs/hooks/useModuleFromNode.js.map +1 -1
  3. package/dist/cjs/hooks/useNodeFromNode.js +1 -1
  4. package/dist/cjs/hooks/useNodeFromNode.js.map +1 -1
  5. package/dist/cjs/hooks/wrapped/WrappedModuleFromNodeHookFactory.js +8 -5
  6. package/dist/cjs/hooks/wrapped/WrappedModuleFromNodeHookFactory.js.map +1 -1
  7. package/dist/docs.json +56 -84
  8. package/dist/esm/hooks/useModuleFromNode.js +4 -7
  9. package/dist/esm/hooks/useModuleFromNode.js.map +1 -1
  10. package/dist/esm/hooks/useNodeFromNode.js +1 -1
  11. package/dist/esm/hooks/useNodeFromNode.js.map +1 -1
  12. package/dist/esm/hooks/wrapped/WrappedModuleFromNodeHookFactory.js +9 -6
  13. package/dist/esm/hooks/wrapped/WrappedModuleFromNodeHookFactory.js.map +1 -1
  14. package/dist/types/hooks/useModuleFromNode.d.ts +2 -2
  15. package/dist/types/hooks/useModuleFromNode.d.ts.map +1 -1
  16. package/dist/types/hooks/useNodeFromNode.d.ts +5 -6
  17. package/dist/types/hooks/useNodeFromNode.d.ts.map +1 -1
  18. package/dist/types/hooks/wrapped/WrappedModuleFromNodeHookFactory.d.ts.map +1 -1
  19. package/package.json +6 -6
  20. package/src/hooks/useModuleFromNode.tsx +6 -8
  21. package/src/hooks/useNodeFromNode.tsx +1 -3
  22. package/src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx +12 -7
package/dist/cjs/hooks/useModuleFromNode.js CHANGED
@@ -5,9 +5,7 @@ const tslib_1 = require("tslib");
5
5
  const react_async_effect_1 = require("@xylabs/react-async-effect");
6
6
  const react_1 = require("react");
7
7
  const provided_1 = require("./provided");
8
- const useModuleFromNode = (nameOrAddressOrFilter, up = false, logger) => {
9
- const nameOrAddress = (0, react_1.useMemo)(() => (typeof nameOrAddressOrFilter === 'string' ? nameOrAddressOrFilter : undefined), [nameOrAddressOrFilter]);
10
- const filter = (0, react_1.useMemo)(() => (typeof nameOrAddressOrFilter === 'object' ? nameOrAddressOrFilter : undefined), [nameOrAddressOrFilter]);
8
+ const useModuleFromNode = (nameOrAddress, up = false, logger) => {
11
9
  const [node] = (0, provided_1.useProvidedNode)();
12
10
  const [module, setModule] = (0, react_1.useState)();
13
11
  const [error, setError] = (0, react_1.useState)();
@@ -34,9 +32,8 @@ const useModuleFromNode = (nameOrAddressOrFilter, up = false, logger) => {
34
32
  setError(undefined);
35
33
  }
36
34
  };
37
- const activeFilter = filter !== null && filter !== void 0 ? filter : (nameOrAddress ? { address: [nameOrAddress], name: [nameOrAddress] } : {});
38
- const moduleDown = (yield node.downResolver.resolve(activeFilter)).pop();
39
- const module = (moduleDown !== null && moduleDown !== void 0 ? moduleDown : up) ? (yield node.upResolver.resolve(activeFilter)).pop() : undefined;
35
+ const moduleDown = nameOrAddress ? yield node.downResolver.resolveOne(nameOrAddress) : undefined;
36
+ const module = moduleDown !== null && moduleDown !== void 0 ? moduleDown : (up && nameOrAddress ? yield node.upResolver.resolveOne(nameOrAddress) : undefined);
40
37
  if (mounted()) {
41
38
  eventUnsubscribe.push(node.on('moduleAttached', attachHandler));
42
39
  eventUnsubscribe.push(node.on('moduleDetached', detachHandler));
@@ -64,7 +61,7 @@ const useModuleFromNode = (nameOrAddressOrFilter, up = false, logger) => {
64
61
  setModule(undefined);
65
62
  }
66
63
  }
67
- }), [nameOrAddress, node, address, filter, logger, up]);
64
+ }), [nameOrAddress, node, address, logger, up]);
68
65
  return [module, error];
69
66
  };
70
67
  exports.useModuleFromNode = useModuleFromNode;
package/dist/cjs/hooks/useModuleFromNode.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"useModuleFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useModuleFromNode.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useModuleFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useModuleFromNode.tsx"],"names":[],"mappings":"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"}
package/dist/cjs/hooks/useNodeFromNode.js CHANGED
@@ -2,6 +2,6 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.useNodeFromNode = void 0;
4
4
  const useModuleFromNode_1 = require("./useModuleFromNode");
5
- const useNodeFromNode = (nameOrAddressOrFilter, up = false, logger) => (0, useModuleFromNode_1.useModuleFromNode)(nameOrAddressOrFilter, up, logger);
5
+ const useNodeFromNode = (nameOrAddress, up = false, logger) => (0, useModuleFromNode_1.useModuleFromNode)(nameOrAddress, up, logger);
6
6
  exports.useNodeFromNode = useNodeFromNode;
7
7
  //# sourceMappingURL=useNodeFromNode.js.map
package/dist/cjs/hooks/useNodeFromNode.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"useNodeFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useNodeFromNode.tsx"],"names":[],"mappings":";;;AAIA,2DAAuD;AAEhD,MAAM,eAAe,GAAG,CAAC,qBAA6C,EAAE,EAAE,GAAG,KAAK,EAAE,MAAe,EAAE,EAAE,CAC5G,IAAA,qCAAiB,EAAa,qBAAqB,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;AADrD,QAAA,eAAe,mBACsC"}
1
+ {"version":3,"file":"useNodeFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useNodeFromNode.tsx"],"names":[],"mappings":";;;AAGA,2DAAuD;AAEhD,MAAM,eAAe,GAAG,CAAC,aAAsB,EAAE,EAAE,GAAG,KAAK,EAAE,MAAe,EAAE,EAAE,CAAC,IAAA,qCAAiB,EAAa,aAAa,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;AAAnI,QAAA,eAAe,mBAAoH"}
package/dist/cjs/hooks/wrapped/WrappedModuleFromNodeHookFactory.js CHANGED
@@ -4,16 +4,19 @@ exports.WrappedModuleFromNodeHookFactory = void 0;
4
4
  const react_wallet_1 = require("@xyo-network/react-wallet");
5
5
  const react_1 = require("react");
6
6
  const useModuleFromNode_1 = require("../useModuleFromNode");
7
+ const useModulesFromNode_1 = require("../useModulesFromNode");
7
8
  exports.WrappedModuleFromNodeHookFactory = {
8
9
  create: (wrapperObject, name) => {
9
10
  const useHook = (nameOrAddress, wallet, up = false, logger) => {
10
11
  logger === null || logger === void 0 ? void 0 : logger.debug(`Render: ${name}`);
11
12
  const [walletToUse] = (0, react_wallet_1.useWallet)({ wallet });
12
- const [module, moduleError] = (0, useModuleFromNode_1.useModuleFromNode)(nameOrAddress !== null && nameOrAddress !== void 0 ? nameOrAddress : {
13
+ const [module, moduleError] = (0, useModuleFromNode_1.useModuleFromNode)(nameOrAddress, up, logger);
14
+ const [modules, modulesError] = (0, useModulesFromNode_1.useModulesFromNode)({
13
15
  query: [wrapperObject.requiredQueries],
14
16
  }, up, logger);
15
17
  const [wrapper, setWrapper] = (0, react_1.useState)();
16
18
  const [error, setError] = (0, react_1.useState)();
19
+ const activeModule = (0, react_1.useMemo)(() => module !== null && module !== void 0 ? module : modules === null || modules === void 0 ? void 0 : modules[0], [module, modules]);
17
20
  /*
18
21
  useEffect(() => {
19
22
  if (!walletToUse) {
@@ -24,9 +27,9 @@ exports.WrappedModuleFromNodeHookFactory = {
24
27
  }, [walletToUse])
25
28
  */
26
29
  (0, react_1.useEffect)(() => {
27
- if (module && walletToUse) {
30
+ if (activeModule && walletToUse) {
28
31
  try {
29
- const wrapper = wrapperObject.wrap(module, walletToUse);
32
+ const wrapper = wrapperObject.wrap(activeModule, walletToUse);
30
33
  setWrapper(wrapper);
31
34
  setError(undefined);
32
35
  }
@@ -37,9 +40,9 @@ exports.WrappedModuleFromNodeHookFactory = {
37
40
  }
38
41
  else {
39
42
  setWrapper(undefined);
40
- setError(moduleError);
43
+ setError(moduleError !== null && moduleError !== void 0 ? moduleError : modulesError);
41
44
  }
42
- }, [module, wallet, moduleError, walletToUse]);
45
+ }, [activeModule, wallet, moduleError, walletToUse, modulesError]);
43
46
  return [wrapper, error];
44
47
  };
45
48
  return useHook;
package/dist/cjs/hooks/wrapped/WrappedModuleFromNodeHookFactory.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"WrappedModuleFromNodeHookFactory.js","sourceRoot":"","sources":["../../../../src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx"],"names":[],"mappings":";;;AAEA,4DAAqD;AAErD,iCAA2C;AAE3C,4DAAwD;AAE3C,QAAA,gCAAgC,GAAG;IAC9C,MAAM,EAAE,CAAuC,aAAyD,EAAE,IAAa,EAAE,EAAE;QACzH,MAAM,OAAO,GAAG,CACd,aAAsB,EACtB,MAAuB,EACvB,EAAE,GAAG,KAAK,EACV,MAAe,EACkC,EAAE;YACnD,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,WAAW,IAAI,EAAE,CAAC,CAAA;YAChC,MAAM,CAAC,WAAW,CAAC,GAAG,IAAA,wBAAS,EAAC,EAAE,MAAM,EAAE,CAAC,CAAA;YAC3C,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,IAAA,qCAAiB,EAC7C,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI;gBACf,KAAK,EAAE,CAAC,aAAa,CAAC,eAAe,CAAC;aACvC,EACD,EAAE,EACF,MAAM,CACP,CAAA;YAED,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,IAAA,gBAAQ,GAAkB,CAAA;YACxD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,GAAS,CAAA;YAE3C;;;;;;;;YAQA;YAEA,IAAA,iBAAS,EAAC,GAAG,EAAE;gBACb,IAAI,MAAM,IAAI,WAAW,EAAE;oBACzB,IAAI;wBACF,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;wBACvD,UAAU,CAAC,OAAO,CAAC,CAAA;wBACnB,QAAQ,CAAC,SAAS,CAAC,CAAA;qBACpB;oBAAC,OAAO,EAAE,EAAE;wBACX,UAAU,CAAC,SAAS,CAAC,CAAA;wBACrB,QAAQ,CAAC,EAAW,CAAC,CAAA;qBACtB;iBACF;qBAAM;oBACL,UAAU,CAAC,SAAS,CAAC,CAAA;oBACrB,QAAQ,CAAC,WAAW,CAAC,CAAA;iBACtB;YACH,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAA;YAE9C,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;QACzB,CAAC,CAAA;QACD,OAAO,OAAO,CAAA;IAChB,CAAC;CACF,CAAA"}
1
+ {"version":3,"file":"WrappedModuleFromNodeHookFactory.js","sourceRoot":"","sources":["../../../../src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx"],"names":[],"mappings":";;;AAEA,4DAAqD;AAErD,iCAAoD;AAEpD,4DAAwD;AACxD,8DAA0D;AAE7C,QAAA,gCAAgC,GAAG;IAC9C,MAAM,EAAE,CAAuC,aAAyD,EAAE,IAAa,EAAE,EAAE;QACzH,MAAM,OAAO,GAAG,CACd,aAAsB,EACtB,MAAuB,EACvB,EAAE,GAAG,KAAK,EACV,MAAe,EACkC,EAAE;YACnD,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,WAAW,IAAI,EAAE,CAAC,CAAA;YAChC,MAAM,CAAC,WAAW,CAAC,GAAG,IAAA,wBAAS,EAAC,EAAE,MAAM,EAAE,CAAC,CAAA;YAC3C,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,IAAA,qCAAiB,EAA2B,aAAa,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;YAEpG,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,GAAG,IAAA,uCAAkB,EAChD;gBACE,KAAK,EAAE,CAAC,aAAa,CAAC,eAAe,CAAC;aACvC,EACD,EAAE,EACF,MAAM,CACP,CAAA;YAED,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,IAAA,gBAAQ,GAAkB,CAAA;YACxD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,GAAS,CAAA;YAE3C,MAAM,YAAY,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,CAAC,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;YAE7E;;;;;;;;YAQA;YAEA,IAAA,iBAAS,EAAC,GAAG,EAAE;gBACb,IAAI,YAAY,IAAI,WAAW,EAAE;oBAC/B,IAAI;wBACF,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;wBAC7D,UAAU,CAAC,OAAO,CAAC,CAAA;wBACnB,QAAQ,CAAC,SAAS,CAAC,CAAA;qBACpB;oBAAC,OAAO,EAAE,EAAE;wBACX,UAAU,CAAC,SAAS,CAAC,CAAA;wBACrB,QAAQ,CAAC,EAAW,CAAC,CAAA;qBACtB;iBACF;qBAAM;oBACL,UAAU,CAAC,SAAS,CAAC,CAAA;oBACrB,QAAQ,CAAC,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,YAAY,CAAC,CAAA;iBACtC;YACH,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC,CAAA;YAElE,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;QACzB,CAAC,CAAA;QACD,OAAO,OAAO,CAAA;IAChB,CAAC;CACF,CAAA"}
package/dist/docs.json CHANGED
@@ -567,7 +567,7 @@
567
567
  "fileName": "packages/modules/packages/node/src/components/NodeDrawer.tsx",
568
568
  "line": 10,
569
569
  "character": 17,
570
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/components/NodeDrawer.tsx#L10"
570
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/components/NodeDrawer.tsx#L10"
571
571
  }
572
572
  ],
573
573
  "extendedTypes": [
@@ -1356,9 +1356,9 @@
1356
1356
  "sources": [
1357
1357
  {
1358
1358
  "fileName": "packages/modules/packages/node/src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx",
1359
- "line": 9,
1359
+ "line": 10,
1360
1360
  "character": 13,
1361
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx#L9"
1361
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx#L10"
1362
1362
  }
1363
1363
  ],
1364
1364
  "type": {
@@ -1379,9 +1379,9 @@
1379
1379
  "sources": [
1380
1380
  {
1381
1381
  "fileName": "packages/modules/packages/node/src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx",
1382
- "line": 10,
1382
+ "line": 11,
1383
1383
  "character": 2,
1384
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx#L10"
1384
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx#L11"
1385
1385
  }
1386
1386
  ],
1387
1387
  "type": {
@@ -1395,9 +1395,9 @@
1395
1395
  "sources": [
1396
1396
  {
1397
1397
  "fileName": "packages/modules/packages/node/src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx",
1398
- "line": 10,
1398
+ "line": 11,
1399
1399
  "character": 10,
1400
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx#L10"
1400
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx#L11"
1401
1401
  }
1402
1402
  ],
1403
1403
  "signatures": [
@@ -1410,9 +1410,9 @@
1410
1410
  "sources": [
1411
1411
  {
1412
1412
  "fileName": "packages/modules/packages/node/src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx",
1413
- "line": 10,
1413
+ "line": 11,
1414
1414
  "character": 10,
1415
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx#L10"
1415
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx#L11"
1416
1416
  }
1417
1417
  ],
1418
1418
  "typeParameter": [
@@ -1677,9 +1677,9 @@
1677
1677
  "sources": [
1678
1678
  {
1679
1679
  "fileName": "packages/modules/packages/node/src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx",
1680
- "line": 11,
1680
+ "line": 12,
1681
1681
  "character": 20,
1682
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx#L11"
1682
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx#L12"
1683
1683
  }
1684
1684
  ],
1685
1685
  "signatures": [
@@ -1692,9 +1692,9 @@
1692
1692
  "sources": [
1693
1693
  {
1694
1694
  "fileName": "packages/modules/packages/node/src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx",
1695
- "line": 11,
1695
+ "line": 12,
1696
1696
  "character": 20,
1697
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx#L11"
1697
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx#L12"
1698
1698
  }
1699
1699
  ],
1700
1700
  "parameters": [
@@ -1820,9 +1820,9 @@
1820
1820
  "sources": [
1821
1821
  {
1822
1822
  "fileName": "packages/modules/packages/node/src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx",
1823
- "line": 9,
1823
+ "line": 10,
1824
1824
  "character": 48,
1825
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx#L9"
1825
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx#L10"
1826
1826
  }
1827
1827
  ]
1828
1828
  }
@@ -1842,7 +1842,7 @@
1842
1842
  "fileName": "packages/modules/packages/node/src/hooks/wrapped/WrappedModulesFromNodeHookFactory.tsx",
1843
1843
  "line": 10,
1844
1844
  "character": 13,
1845
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/wrapped/WrappedModulesFromNodeHookFactory.tsx#L10"
1845
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/wrapped/WrappedModulesFromNodeHookFactory.tsx#L10"
1846
1846
  }
1847
1847
  ],
1848
1848
  "type": {
@@ -1865,7 +1865,7 @@
1865
1865
  "fileName": "packages/modules/packages/node/src/hooks/wrapped/WrappedModulesFromNodeHookFactory.tsx",
1866
1866
  "line": 11,
1867
1867
  "character": 2,
1868
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/wrapped/WrappedModulesFromNodeHookFactory.tsx#L11"
1868
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/wrapped/WrappedModulesFromNodeHookFactory.tsx#L11"
1869
1869
  }
1870
1870
  ],
1871
1871
  "type": {
@@ -1881,7 +1881,7 @@
1881
1881
  "fileName": "packages/modules/packages/node/src/hooks/wrapped/WrappedModulesFromNodeHookFactory.tsx",
1882
1882
  "line": 11,
1883
1883
  "character": 10,
1884
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/wrapped/WrappedModulesFromNodeHookFactory.tsx#L11"
1884
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/wrapped/WrappedModulesFromNodeHookFactory.tsx#L11"
1885
1885
  }
1886
1886
  ],
1887
1887
  "signatures": [
@@ -1896,7 +1896,7 @@
1896
1896
  "fileName": "packages/modules/packages/node/src/hooks/wrapped/WrappedModulesFromNodeHookFactory.tsx",
1897
1897
  "line": 11,
1898
1898
  "character": 10,
1899
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/wrapped/WrappedModulesFromNodeHookFactory.tsx#L11"
1899
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/wrapped/WrappedModulesFromNodeHookFactory.tsx#L11"
1900
1900
  }
1901
1901
  ],
1902
1902
  "typeParameter": [
@@ -2161,7 +2161,7 @@
2161
2161
  "fileName": "packages/modules/packages/node/src/hooks/wrapped/WrappedModulesFromNodeHookFactory.tsx",
2162
2162
  "line": 15,
2163
2163
  "character": 20,
2164
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/wrapped/WrappedModulesFromNodeHookFactory.tsx#L15"
2164
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/wrapped/WrappedModulesFromNodeHookFactory.tsx#L15"
2165
2165
  }
2166
2166
  ],
2167
2167
  "signatures": [
@@ -2176,7 +2176,7 @@
2176
2176
  "fileName": "packages/modules/packages/node/src/hooks/wrapped/WrappedModulesFromNodeHookFactory.tsx",
2177
2177
  "line": 15,
2178
2178
  "character": 20,
2179
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/wrapped/WrappedModulesFromNodeHookFactory.tsx#L15"
2179
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/wrapped/WrappedModulesFromNodeHookFactory.tsx#L15"
2180
2180
  }
2181
2181
  ],
2182
2182
  "parameters": [
@@ -2294,7 +2294,7 @@
2294
2294
  "fileName": "packages/modules/packages/node/src/hooks/wrapped/WrappedModulesFromNodeHookFactory.tsx",
2295
2295
  "line": 10,
2296
2296
  "character": 49,
2297
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/wrapped/WrappedModulesFromNodeHookFactory.tsx#L10"
2297
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/wrapped/WrappedModulesFromNodeHookFactory.tsx#L10"
2298
2298
  }
2299
2299
  ]
2300
2300
  }
@@ -2486,7 +2486,7 @@
2486
2486
  "fileName": "packages/modules/packages/node/src/components/Node.tsx",
2487
2487
  "line": 8,
2488
2488
  "character": 13,
2489
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/components/Node.tsx#L8"
2489
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/components/Node.tsx#L8"
2490
2490
  }
2491
2491
  ],
2492
2492
  "signatures": [
@@ -2577,7 +2577,7 @@
2577
2577
  "fileName": "packages/modules/packages/node/src/components/NodeDrawer.tsx",
2578
2578
  "line": 12,
2579
2579
  "character": 13,
2580
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/components/NodeDrawer.tsx#L12"
2580
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/components/NodeDrawer.tsx#L12"
2581
2581
  }
2582
2582
  ],
2583
2583
  "signatures": [
@@ -2850,7 +2850,7 @@
2850
2850
  "fileName": "packages/modules/packages/node/src/hooks/useModuleFromNode.tsx",
2851
2851
  "line": 10,
2852
2852
  "character": 13,
2853
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/useModuleFromNode.tsx#L10"
2853
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/useModuleFromNode.tsx#L10"
2854
2854
  }
2855
2855
  ],
2856
2856
  "signatures": [
@@ -2865,7 +2865,7 @@
2865
2865
  "fileName": "packages/modules/packages/node/src/hooks/useModuleFromNode.tsx",
2866
2866
  "line": 10,
2867
2867
  "character": 33,
2868
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/useModuleFromNode.tsx#L10"
2868
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/useModuleFromNode.tsx#L10"
2869
2869
  }
2870
2870
  ],
2871
2871
  "typeParameter": [
@@ -3274,29 +3274,15 @@
3274
3274
  "parameters": [
3275
3275
  {
3276
3276
  "id": 39,
3277
- "name": "nameOrAddressOrFilter",
3277
+ "name": "nameOrAddress",
3278
3278
  "variant": "param",
3279
3279
  "kind": 32768,
3280
3280
  "flags": {
3281
3281
  "isOptional": true
3282
3282
  },
3283
3283
  "type": {
3284
- "type": "union",
3285
- "types": [
3286
- {
3287
- "type": "intrinsic",
3288
- "name": "string"
3289
- },
3290
- {
3291
- "type": "reference",
3292
- "target": {
3293
- "sourceFileName": "../../../../node_modules/@xyo-network/module-model/src/ModuleFilter.ts",
3294
- "qualifiedName": "ModuleFilter"
3295
- },
3296
- "name": "ModuleFilter",
3297
- "package": "@xyo-network/module-model"
3298
- }
3299
- ]
3284
+ "type": "intrinsic",
3285
+ "name": "string"
3300
3286
  }
3301
3287
  },
3302
3288
  {
@@ -3466,7 +3452,7 @@
3466
3452
  "fileName": "packages/modules/packages/node/src/hooks/useModulesFromNode.ts",
3467
3453
  "line": 9,
3468
3454
  "character": 13,
3469
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/useModulesFromNode.ts#L9"
3455
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/useModulesFromNode.ts#L9"
3470
3456
  }
3471
3457
  ],
3472
3458
  "signatures": [
@@ -3481,7 +3467,7 @@
3481
3467
  "fileName": "packages/modules/packages/node/src/hooks/useModulesFromNode.ts",
3482
3468
  "line": 9,
3483
3469
  "character": 34,
3484
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/useModulesFromNode.ts#L9"
3470
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/useModulesFromNode.ts#L9"
3485
3471
  }
3486
3472
  ],
3487
3473
  "typeParameter": [
@@ -4074,9 +4060,9 @@
4074
4060
  "sources": [
4075
4061
  {
4076
4062
  "fileName": "packages/modules/packages/node/src/hooks/useNodeFromNode.tsx",
4077
- "line": 7,
4063
+ "line": 6,
4078
4064
  "character": 13,
4079
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/useNodeFromNode.tsx#L7"
4065
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/useNodeFromNode.tsx#L6"
4080
4066
  }
4081
4067
  ],
4082
4068
  "signatures": [
@@ -4089,37 +4075,23 @@
4089
4075
  "sources": [
4090
4076
  {
4091
4077
  "fileName": "packages/modules/packages/node/src/hooks/useNodeFromNode.tsx",
4092
- "line": 7,
4078
+ "line": 6,
4093
4079
  "character": 31,
4094
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/useNodeFromNode.tsx#L7"
4080
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/useNodeFromNode.tsx#L6"
4095
4081
  }
4096
4082
  ],
4097
4083
  "parameters": [
4098
4084
  {
4099
4085
  "id": 56,
4100
- "name": "nameOrAddressOrFilter",
4086
+ "name": "nameOrAddress",
4101
4087
  "variant": "param",
4102
4088
  "kind": 32768,
4103
4089
  "flags": {
4104
4090
  "isOptional": true
4105
4091
  },
4106
4092
  "type": {
4107
- "type": "union",
4108
- "types": [
4109
- {
4110
- "type": "intrinsic",
4111
- "name": "string"
4112
- },
4113
- {
4114
- "type": "reference",
4115
- "target": {
4116
- "sourceFileName": "../../../../node_modules/@xyo-network/module-model/src/ModuleFilter.ts",
4117
- "qualifiedName": "ModuleFilter"
4118
- },
4119
- "name": "ModuleFilter",
4120
- "package": "@xyo-network/module-model"
4121
- }
4122
- ]
4093
+ "type": "intrinsic",
4094
+ "name": "string"
4123
4095
  }
4124
4096
  },
4125
4097
  {
@@ -4426,7 +4398,7 @@
4426
4398
  "fileName": "packages/modules/packages/node/src/hooks/provided/useProvidedNode.tsx",
4427
4399
  "line": 5,
4428
4400
  "character": 13,
4429
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/provided/useProvidedNode.tsx#L5"
4401
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/provided/useProvidedNode.tsx#L5"
4430
4402
  }
4431
4403
  ],
4432
4404
  "signatures": [
@@ -4441,7 +4413,7 @@
4441
4413
  "fileName": "packages/modules/packages/node/src/hooks/provided/useProvidedNode.tsx",
4442
4414
  "line": 5,
4443
4415
  "character": 31,
4444
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/provided/useProvidedNode.tsx#L5"
4416
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/provided/useProvidedNode.tsx#L5"
4445
4417
  }
4446
4418
  ],
4447
4419
  "type": {
@@ -4699,7 +4671,7 @@
4699
4671
  "fileName": "packages/modules/packages/node/src/hooks/provided/useProvidedNodeAttachedAddresses.ts",
4700
4672
  "line": 7,
4701
4673
  "character": 13,
4702
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/provided/useProvidedNodeAttachedAddresses.ts#L7"
4674
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/provided/useProvidedNodeAttachedAddresses.ts#L7"
4703
4675
  }
4704
4676
  ],
4705
4677
  "signatures": [
@@ -4714,7 +4686,7 @@
4714
4686
  "fileName": "packages/modules/packages/node/src/hooks/provided/useProvidedNodeAttachedAddresses.ts",
4715
4687
  "line": 7,
4716
4688
  "character": 48,
4717
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/provided/useProvidedNodeAttachedAddresses.ts#L7"
4689
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/provided/useProvidedNodeAttachedAddresses.ts#L7"
4718
4690
  }
4719
4691
  ],
4720
4692
  "parameters": [
@@ -4984,7 +4956,7 @@
4984
4956
  "fileName": "packages/modules/packages/node/src/hooks/provided/useProvidedNodeRegisteredAddresses.ts",
4985
4957
  "line": 7,
4986
4958
  "character": 13,
4987
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/provided/useProvidedNodeRegisteredAddresses.ts#L7"
4959
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/provided/useProvidedNodeRegisteredAddresses.ts#L7"
4988
4960
  }
4989
4961
  ],
4990
4962
  "signatures": [
@@ -4999,7 +4971,7 @@
4999
4971
  "fileName": "packages/modules/packages/node/src/hooks/provided/useProvidedNodeRegisteredAddresses.ts",
5000
4972
  "line": 7,
5001
4973
  "character": 50,
5002
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/provided/useProvidedNodeRegisteredAddresses.ts#L7"
4974
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/provided/useProvidedNodeRegisteredAddresses.ts#L7"
5003
4975
  }
5004
4976
  ],
5005
4977
  "parameters": [
@@ -5269,7 +5241,7 @@
5269
5241
  "fileName": "packages/modules/packages/node/src/hooks/wrapped/useWrappedModuleFromNode.tsx",
5270
5242
  "line": 5,
5271
5243
  "character": 13,
5272
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/wrapped/useWrappedModuleFromNode.tsx#L5"
5244
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/wrapped/useWrappedModuleFromNode.tsx#L5"
5273
5245
  }
5274
5246
  ],
5275
5247
  "signatures": [
@@ -5282,9 +5254,9 @@
5282
5254
  "sources": [
5283
5255
  {
5284
5256
  "fileName": "packages/modules/packages/node/src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx",
5285
- "line": 11,
5257
+ "line": 12,
5286
5258
  "character": 20,
5287
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx#L11"
5259
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx#L12"
5288
5260
  }
5289
5261
  ],
5290
5262
  "parameters": [
@@ -5593,7 +5565,7 @@
5593
5565
  "fileName": "packages/modules/packages/node/src/hooks/wrapped/useWrappedModulesFromNode.tsx",
5594
5566
  "line": 5,
5595
5567
  "character": 13,
5596
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/wrapped/useWrappedModulesFromNode.tsx#L5"
5568
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/wrapped/useWrappedModulesFromNode.tsx#L5"
5597
5569
  }
5598
5570
  ],
5599
5571
  "signatures": [
@@ -5608,7 +5580,7 @@
5608
5580
  "fileName": "packages/modules/packages/node/src/hooks/wrapped/WrappedModulesFromNodeHookFactory.tsx",
5609
5581
  "line": 15,
5610
5582
  "character": 20,
5611
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/wrapped/WrappedModulesFromNodeHookFactory.tsx#L15"
5583
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/wrapped/WrappedModulesFromNodeHookFactory.tsx#L15"
5612
5584
  }
5613
5585
  ],
5614
5586
  "parameters": [
@@ -5907,7 +5879,7 @@
5907
5879
  "fileName": "packages/modules/packages/node/src/hooks/wrapped/useWrappedNodeFromNode.tsx",
5908
5880
  "line": 5,
5909
5881
  "character": 13,
5910
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/wrapped/useWrappedNodeFromNode.tsx#L5"
5882
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/wrapped/useWrappedNodeFromNode.tsx#L5"
5911
5883
  }
5912
5884
  ],
5913
5885
  "signatures": [
@@ -5920,9 +5892,9 @@
5920
5892
  "sources": [
5921
5893
  {
5922
5894
  "fileName": "packages/modules/packages/node/src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx",
5923
- "line": 11,
5895
+ "line": 12,
5924
5896
  "character": 20,
5925
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx#L11"
5897
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx#L12"
5926
5898
  }
5927
5899
  ],
5928
5900
  "parameters": [
@@ -6268,7 +6240,7 @@
6268
6240
  "fileName": "packages/modules/packages/node/src/hooks/wrapped/provided/useWrappedProvidedNode.tsx",
6269
6241
  "line": 8,
6270
6242
  "character": 13,
6271
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/wrapped/provided/useWrappedProvidedNode.tsx#L8"
6243
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/wrapped/provided/useWrappedProvidedNode.tsx#L8"
6272
6244
  }
6273
6245
  ],
6274
6246
  "signatures": [
@@ -6283,7 +6255,7 @@
6283
6255
  "fileName": "packages/modules/packages/node/src/hooks/wrapped/provided/useWrappedProvidedNode.tsx",
6284
6256
  "line": 8,
6285
6257
  "character": 38,
6286
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a9d07f28fbbb/packages/modules/packages/node/src/hooks/wrapped/provided/useWrappedProvidedNode.tsx#L8"
6258
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/a4cffa673cd5/packages/modules/packages/node/src/hooks/wrapped/provided/useWrappedProvidedNode.tsx#L8"
6287
6259
  }
6288
6260
  ],
6289
6261
  "parameters": [
@@ -6805,7 +6777,7 @@
6805
6777
  },
6806
6778
  "39": {
6807
6779
  "sourceFileName": "src/hooks/useModuleFromNode.tsx",
6808
- "qualifiedName": "nameOrAddressOrFilter"
6780
+ "qualifiedName": "nameOrAddress"
6809
6781
  },
6810
6782
  "40": {
6811
6783
  "sourceFileName": "src/hooks/useModuleFromNode.tsx",
@@ -6873,7 +6845,7 @@
6873
6845
  },
6874
6846
  "56": {
6875
6847
  "sourceFileName": "src/hooks/useNodeFromNode.tsx",
6876
- "qualifiedName": "nameOrAddressOrFilter"
6848
+ "qualifiedName": "nameOrAddress"
6877
6849
  },
6878
6850
  "57": {
6879
6851
  "sourceFileName": "src/hooks/useNodeFromNode.tsx",
package/dist/esm/hooks/useModuleFromNode.js CHANGED
@@ -1,9 +1,7 @@
1
1
  import { useAsyncEffect } from '@xylabs/react-async-effect';
2
2
  import { useMemo, useState } from 'react';
3
3
  import { useProvidedNode } from './provided';
4
- export const useModuleFromNode = (nameOrAddressOrFilter, up = false, logger) => {
5
- const nameOrAddress = useMemo(() => (typeof nameOrAddressOrFilter === 'string' ? nameOrAddressOrFilter : undefined), [nameOrAddressOrFilter]);
6
- const filter = useMemo(() => (typeof nameOrAddressOrFilter === 'object' ? nameOrAddressOrFilter : undefined), [nameOrAddressOrFilter]);
4
+ export const useModuleFromNode = (nameOrAddress, up = false, logger) => {
7
5
  const [node] = useProvidedNode();
8
6
  const [module, setModule] = useState();
9
7
  const [error, setError] = useState();
@@ -30,9 +28,8 @@ export const useModuleFromNode = (nameOrAddressOrFilter, up = false, logger) =>
30
28
  setError(undefined);
31
29
  }
32
30
  };
33
- const activeFilter = filter ?? (nameOrAddress ? { address: [nameOrAddress], name: [nameOrAddress] } : {});
34
- const moduleDown = (await node.downResolver.resolve(activeFilter)).pop();
35
- const module = (moduleDown ?? up) ? (await node.upResolver.resolve(activeFilter)).pop() : undefined;
31
+ const moduleDown = nameOrAddress ? await node.downResolver.resolveOne(nameOrAddress) : undefined;
32
+ const module = moduleDown ?? (up && nameOrAddress ? await node.upResolver.resolveOne(nameOrAddress) : undefined);
36
33
  if (mounted()) {
37
34
  eventUnsubscribe.push(node.on('moduleAttached', attachHandler));
38
35
  eventUnsubscribe.push(node.on('moduleDetached', detachHandler));
@@ -60,7 +57,7 @@ export const useModuleFromNode = (nameOrAddressOrFilter, up = false, logger) =>
60
57
  setModule(undefined);
61
58
  }
62
59
  }
63
- }, [nameOrAddress, node, address, filter, logger, up]);
60
+ }, [nameOrAddress, node, address, logger, up]);
64
61
  return [module, error];
65
62
  };
66
63
  //# sourceMappingURL=useModuleFromNode.js.map
package/dist/esm/hooks/useModuleFromNode.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"useModuleFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useModuleFromNode.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useModuleFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useModuleFromNode.tsx"],"names":[],"mappings":"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"}
package/dist/esm/hooks/useNodeFromNode.js CHANGED
@@ -1,3 +1,3 @@
1
1
  import { useModuleFromNode } from './useModuleFromNode';
2
- export const useNodeFromNode = (nameOrAddressOrFilter, up = false, logger) => useModuleFromNode(nameOrAddressOrFilter, up, logger);
2
+ export const useNodeFromNode = (nameOrAddress, up = false, logger) => useModuleFromNode(nameOrAddress, up, logger);
3
3
  //# sourceMappingURL=useNodeFromNode.js.map
package/dist/esm/hooks/useNodeFromNode.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"useNodeFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useNodeFromNode.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,qBAA6C,EAAE,EAAE,GAAG,KAAK,EAAE,MAAe,EAAE,EAAE,CAC5G,iBAAiB,CAAa,qBAAqB,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA"}
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,EAAE,GAAG,KAAK,EAAE,MAAe,EAAE,EAAE,CAAC,iBAAiB,CAAa,aAAa,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA"}
package/dist/esm/hooks/wrapped/WrappedModuleFromNodeHookFactory.js CHANGED
@@ -1,16 +1,19 @@
1
1
  import { useWallet } from '@xyo-network/react-wallet';
2
- import { useEffect, useState } from 'react';
2
+ import { useEffect, useMemo, useState } from 'react';
3
3
  import { useModuleFromNode } from '../useModuleFromNode';
4
+ import { useModulesFromNode } from '../useModulesFromNode';
4
5
  export const WrappedModuleFromNodeHookFactory = {
5
6
  create: (wrapperObject, name) => {
6
7
  const useHook = (nameOrAddress, wallet, up = false, logger) => {
7
8
  logger?.debug(`Render: ${name}`);
8
9
  const [walletToUse] = useWallet({ wallet });
9
- const [module, moduleError] = useModuleFromNode(nameOrAddress ?? {
10
+ const [module, moduleError] = useModuleFromNode(nameOrAddress, up, logger);
11
+ const [modules, modulesError] = useModulesFromNode({
10
12
  query: [wrapperObject.requiredQueries],
11
13
  }, up, logger);
12
14
  const [wrapper, setWrapper] = useState();
13
15
  const [error, setError] = useState();
16
+ const activeModule = useMemo(() => module ?? modules?.[0], [module, modules]);
14
17
  /*
15
18
  useEffect(() => {
16
19
  if (!walletToUse) {
@@ -21,9 +24,9 @@ export const WrappedModuleFromNodeHookFactory = {
21
24
  }, [walletToUse])
22
25
  */
23
26
  useEffect(() => {
24
- if (module && walletToUse) {
27
+ if (activeModule && walletToUse) {
25
28
  try {
26
- const wrapper = wrapperObject.wrap(module, walletToUse);
29
+ const wrapper = wrapperObject.wrap(activeModule, walletToUse);
27
30
  setWrapper(wrapper);
28
31
  setError(undefined);
29
32
  }
@@ -34,9 +37,9 @@ export const WrappedModuleFromNodeHookFactory = {
34
37
  }
35
38
  else {
36
39
  setWrapper(undefined);
37
- setError(moduleError);
40
+ setError(moduleError ?? modulesError);
38
41
  }
39
- }, [module, wallet, moduleError, walletToUse]);
42
+ }, [activeModule, wallet, moduleError, walletToUse, modulesError]);
40
43
  return [wrapper, error];
41
44
  };
42
45
  return useHook;
package/dist/esm/hooks/wrapped/WrappedModuleFromNodeHookFactory.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"WrappedModuleFromNodeHookFactory.js","sourceRoot":"","sources":["../../../../src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AAErD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAExD,MAAM,CAAC,MAAM,gCAAgC,GAAG;IAC9C,MAAM,EAAE,CAAuC,aAAyD,EAAE,IAAa,EAAE,EAAE;QACzH,MAAM,OAAO,GAAG,CACd,aAAsB,EACtB,MAAuB,EACvB,EAAE,GAAG,KAAK,EACV,MAAe,EACkC,EAAE;YACnD,MAAM,EAAE,KAAK,CAAC,WAAW,IAAI,EAAE,CAAC,CAAA;YAChC,MAAM,CAAC,WAAW,CAAC,GAAG,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;YAC3C,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,iBAAiB,CAC7C,aAAa,IAAI;gBACf,KAAK,EAAE,CAAC,aAAa,CAAC,eAAe,CAAC;aACvC,EACD,EAAE,EACF,MAAM,CACP,CAAA;YAED,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAkB,CAAA;YACxD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;YAE3C;;;;;;;;YAQA;YAEA,SAAS,CAAC,GAAG,EAAE;gBACb,IAAI,MAAM,IAAI,WAAW,EAAE;oBACzB,IAAI;wBACF,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;wBACvD,UAAU,CAAC,OAAO,CAAC,CAAA;wBACnB,QAAQ,CAAC,SAAS,CAAC,CAAA;qBACpB;oBAAC,OAAO,EAAE,EAAE;wBACX,UAAU,CAAC,SAAS,CAAC,CAAA;wBACrB,QAAQ,CAAC,EAAW,CAAC,CAAA;qBACtB;iBACF;qBAAM;oBACL,UAAU,CAAC,SAAS,CAAC,CAAA;oBACrB,QAAQ,CAAC,WAAW,CAAC,CAAA;iBACtB;YACH,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAA;YAE9C,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;QACzB,CAAC,CAAA;QACD,OAAO,OAAO,CAAA;IAChB,CAAC;CACF,CAAA"}
1
+ {"version":3,"file":"WrappedModuleFromNodeHookFactory.js","sourceRoot":"","sources":["../../../../src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AAErD,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAE1D,MAAM,CAAC,MAAM,gCAAgC,GAAG;IAC9C,MAAM,EAAE,CAAuC,aAAyD,EAAE,IAAa,EAAE,EAAE;QACzH,MAAM,OAAO,GAAG,CACd,aAAsB,EACtB,MAAuB,EACvB,EAAE,GAAG,KAAK,EACV,MAAe,EACkC,EAAE;YACnD,MAAM,EAAE,KAAK,CAAC,WAAW,IAAI,EAAE,CAAC,CAAA;YAChC,MAAM,CAAC,WAAW,CAAC,GAAG,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;YAC3C,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,iBAAiB,CAA2B,aAAa,EAAE,EAAE,EAAE,MAAM,CAAC,CAAA;YAEpG,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,GAAG,kBAAkB,CAChD;gBACE,KAAK,EAAE,CAAC,aAAa,CAAC,eAAe,CAAC;aACvC,EACD,EAAE,EACF,MAAM,CACP,CAAA;YAED,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAkB,CAAA;YACxD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;YAE3C,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,IAAI,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;YAE7E;;;;;;;;YAQA;YAEA,SAAS,CAAC,GAAG,EAAE;gBACb,IAAI,YAAY,IAAI,WAAW,EAAE;oBAC/B,IAAI;wBACF,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;wBAC7D,UAAU,CAAC,OAAO,CAAC,CAAA;wBACnB,QAAQ,CAAC,SAAS,CAAC,CAAA;qBACpB;oBAAC,OAAO,EAAE,EAAE;wBACX,UAAU,CAAC,SAAS,CAAC,CAAA;wBACrB,QAAQ,CAAC,EAAW,CAAC,CAAA;qBACtB;iBACF;qBAAM;oBACL,UAAU,CAAC,SAAS,CAAC,CAAA;oBACrB,QAAQ,CAAC,WAAW,IAAI,YAAY,CAAC,CAAA;iBACtC;YACH,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC,CAAA;YAElE,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;QACzB,CAAC,CAAA;QACD,OAAO,OAAO,CAAA;IAChB,CAAC;CACF,CAAA"}
package/dist/types/hooks/useModuleFromNode.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { Logger } from '@xyo-network/core';
2
- import { Module, ModuleFilter } from '@xyo-network/module-model';
2
+ import { Module } from '@xyo-network/module-model';
3
3
  export declare const useModuleFromNode: <TModule extends Module<import("@xyo-network/module").ModuleParams<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
4
4
  readonly archivist?: import("@xyo-network/module").ArchivistModuleConfig | undefined;
5
5
  readonly name?: string | undefined;
@@ -56,5 +56,5 @@ export declare const useModuleFromNode: <TModule extends Module<import("@xyo-net
56
56
  readonly storeQueries?: boolean | undefined;
57
57
  } & Omit<undefined, "schema">, "schema"> & {
58
58
  schema: string;
59
- }, "schema">, undefined>, import("@xyo-network/module").ModuleEventData>>(nameOrAddressOrFilter?: string | ModuleFilter, up?: boolean, logger?: Logger) => [TModule | null | undefined, Error | undefined];
59
+ }, "schema">, undefined>, import("@xyo-network/module").ModuleEventData>>(nameOrAddress?: string, up?: boolean, logger?: Logger) => [TModule | null | undefined, Error | undefined];
60
60
  //# sourceMappingURL=useModuleFromNode.d.ts.map
package/dist/types/hooks/useModuleFromNode.d.ts.map CHANGED
@@ -1 +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,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAMhE,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kGACJ,MAAM,GAAG,YAAY,yBAEpC,MAAM,oDAiEhB,CAAA"}
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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0FACZ,MAAM,yBAEb,MAAM,oDA+DhB,CAAA"}
package/dist/types/hooks/useNodeFromNode.d.ts CHANGED
@@ -1,8 +1,7 @@
1
1
  import { Logger } from '@xyo-network/core';
2
- import { ModuleFilter } from '@xyo-network/module';
3
2
  import { NodeModule } from '@xyo-network/node';
4
- export declare const useNodeFromNode: (nameOrAddressOrFilter?: string | ModuleFilter, up?: boolean, logger?: Logger) => [NodeModule<import("@xyo-network/node").NodeModuleParams<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
5
- readonly archivist?: import("@xyo-network/module").ArchivistModuleConfig | undefined;
3
+ 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 & {
4
+ readonly archivist?: import("@xyo-network/module-model").ArchivistModuleConfig | undefined;
6
5
  readonly name?: string | undefined;
7
6
  readonly paging?: Record<string, {
8
7
  size?: number | undefined;
@@ -10,12 +9,12 @@ export declare const useNodeFromNode: (nameOrAddressOrFilter?: string | ModuleFi
10
9
  readonly schema: string;
11
10
  readonly security?: {
12
11
  readonly allowAnonymous?: boolean | undefined;
13
- readonly allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
12
+ readonly allowed?: Record<string, (string | import("@xyo-network/module-model").CosigningAddressSet)[]> | undefined;
14
13
  readonly disallowed?: Record<string, string[]> | undefined;
15
14
  } | undefined;
16
15
  readonly storeQueries?: boolean | undefined;
17
16
  } & Omit<Omit<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
18
- readonly archivist?: import("@xyo-network/module").ArchivistModuleConfig | undefined;
17
+ readonly archivist?: import("@xyo-network/module-model").ArchivistModuleConfig | undefined;
19
18
  readonly name?: string | undefined;
20
19
  readonly paging?: Record<string, {
21
20
  size?: number | undefined;
@@ -23,7 +22,7 @@ export declare const useNodeFromNode: (nameOrAddressOrFilter?: string | ModuleFi
23
22
  readonly schema: "network.xyo.node.config";
24
23
  readonly security?: {
25
24
  readonly allowAnonymous?: boolean | undefined;
26
- readonly allowed?: Record<string, (string | import("@xyo-network/module").CosigningAddressSet)[]> | undefined;
25
+ readonly allowed?: Record<string, (string | import("@xyo-network/module-model").CosigningAddressSet)[]> | undefined;
27
26
  readonly disallowed?: Record<string, string[]> | undefined;
28
27
  } | undefined;
29
28
  readonly storeQueries?: boolean | undefined;
package/dist/types/hooks/useNodeFromNode.d.ts.map CHANGED
@@ -1 +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,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAI9C,eAAO,MAAM,eAAe,2BAA4B,MAAM,GAAG,YAAY,yBAAuB,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iHACxC,CAAA"}
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,yBAAuB,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iHAA6D,CAAA"}
package/dist/types/hooks/wrapped/WrappedModuleFromNodeHookFactory.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"WrappedModuleFromNodeHookFactory.d.ts","sourceRoot":"","sources":["../../../../src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,0BAA0B,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAE/E,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAK1D,eAAO,MAAM,gCAAgC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iJACsE,MAAM,sBAEnG,MAAM,WACb,cAAc,yBAEd,MAAM;CA6CpB,CAAA"}
1
+ {"version":3,"file":"WrappedModuleFromNodeHookFactory.d.ts","sourceRoot":"","sources":["../../../../src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,0BAA0B,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAE/E,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAM1D,eAAO,MAAM,gCAAgC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iJACsE,MAAM,sBAEnG,MAAM,WACb,cAAc,yBAEd,MAAM;CAiDpB,CAAA"}
package/package.json CHANGED
@@ -19,9 +19,9 @@
19
19
  "@xyo-network/module": "^2.64.3",
20
20
  "@xyo-network/module-model": "^2.64.3",
21
21
  "@xyo-network/node": "^2.64.3",
22
- "@xyo-network/react-node-context": "^2.56.6",
23
- "@xyo-network/react-node-provider": "^2.56.6",
24
- "@xyo-network/react-wallet": "^2.56.6",
22
+ "@xyo-network/react-node-context": "^2.56.8",
23
+ "@xyo-network/react-node-provider": "^2.56.8",
24
+ "@xyo-network/react-wallet": "^2.56.8",
25
25
  "@xyo-network/wallet-model": "^2.64.3",
26
26
  "lodash": "^4.17.21"
27
27
  },
@@ -30,8 +30,8 @@
30
30
  "@types/lodash": "^4.14.195",
31
31
  "@xylabs/ts-scripts-yarn3": "^2.18.7",
32
32
  "@xylabs/tsconfig-react": "^2.18.7",
33
- "@xyo-network/react-storybook": "^2.56.6",
34
- "@xyo-network/react-wallet": "^2.56.6",
33
+ "@xyo-network/react-storybook": "^2.56.8",
34
+ "@xyo-network/react-wallet": "^2.56.8",
35
35
  "typescript": "^5.1.6"
36
36
  },
37
37
  "peerDependencies": {
@@ -86,5 +86,5 @@
86
86
  },
87
87
  "sideEffects": false,
88
88
  "types": "dist/types/index.d.ts",
89
- "version": "2.56.6"
89
+ "version": "2.56.8"
90
90
  }
package/src/hooks/useModuleFromNode.tsx CHANGED
@@ -1,19 +1,17 @@
1
1
  import { useAsyncEffect } from '@xylabs/react-async-effect'
2
2
  import { Logger } from '@xyo-network/core'
3
3
  import { EventUnsubscribeFunction } from '@xyo-network/module'
4
- import { Module, ModuleFilter } from '@xyo-network/module-model'
4
+ import { Module } from '@xyo-network/module-model'
5
5
  import { ModuleAttachedEventArgs, ModuleDetachedEventArgs } from '@xyo-network/node'
6
6
  import { useMemo, useState } from 'react'
7
7
 
8
8
  import { useProvidedNode } from './provided'
9
9
 
10
10
  export const useModuleFromNode = <TModule extends Module = Module>(
11
- nameOrAddressOrFilter?: string | ModuleFilter,
11
+ nameOrAddress?: string,
12
12
  up = false,
13
13
  logger?: Logger,
14
14
  ): [TModule | null | undefined, Error | undefined] => {
15
- const nameOrAddress = useMemo(() => (typeof nameOrAddressOrFilter === 'string' ? nameOrAddressOrFilter : undefined), [nameOrAddressOrFilter])
16
- const filter = useMemo(() => (typeof nameOrAddressOrFilter === 'object' ? nameOrAddressOrFilter : undefined), [nameOrAddressOrFilter])
17
15
  const [node] = useProvidedNode()
18
16
  const [module, setModule] = useState<TModule | null>()
19
17
  const [error, setError] = useState<Error>()
@@ -42,9 +40,9 @@ export const useModuleFromNode = <TModule extends Module = Module>(
42
40
  setError(undefined)
43
41
  }
44
42
  }
45
- const activeFilter: ModuleFilter = filter ?? (nameOrAddress ? { address: [nameOrAddress], name: [nameOrAddress] } : {})
46
- const moduleDown: TModule | undefined = (await node.downResolver.resolve<TModule>(activeFilter)).pop()
47
- const module: TModule | undefined = moduleDown ?? up ? (await node.upResolver.resolve<TModule>(activeFilter)).pop() : undefined
43
+ const moduleDown: TModule | undefined = nameOrAddress ? await node.downResolver.resolveOne<TModule>(nameOrAddress) : undefined
44
+ const module: TModule | undefined =
45
+ moduleDown ?? (up && nameOrAddress ? await node.upResolver.resolveOne<TModule>(nameOrAddress) : undefined)
48
46
  if (mounted()) {
49
47
  eventUnsubscribe.push(node.on('moduleAttached', attachHandler))
50
48
  eventUnsubscribe.push(node.on('moduleDetached', detachHandler))
@@ -71,7 +69,7 @@ export const useModuleFromNode = <TModule extends Module = Module>(
71
69
  }
72
70
  }
73
71
  },
74
- [nameOrAddress, node, address, filter, logger, up],
72
+ [nameOrAddress, node, address, logger, up],
75
73
  )
76
74
 
77
75
  return [module, error]
package/src/hooks/useNodeFromNode.tsx CHANGED
@@ -1,8 +1,6 @@
1
1
  import { Logger } from '@xyo-network/core'
2
- import { ModuleFilter } from '@xyo-network/module'
3
2
  import { NodeModule } from '@xyo-network/node'
4
3
 
5
4
  import { useModuleFromNode } from './useModuleFromNode'
6
5
 
7
- export const useNodeFromNode = (nameOrAddressOrFilter?: string | ModuleFilter, up = false, logger?: Logger) =>
8
- useModuleFromNode<NodeModule>(nameOrAddressOrFilter, up, logger)
6
+ export const useNodeFromNode = (nameOrAddress?: string, up = false, logger?: Logger) => useModuleFromNode<NodeModule>(nameOrAddress, up, logger)
package/src/hooks/wrapped/WrappedModuleFromNodeHookFactory.tsx CHANGED
@@ -2,9 +2,10 @@ import { Logger } from '@xyo-network/core'
2
2
  import { ConstructableModuleWrapper, ModuleWrapper } from '@xyo-network/module'
3
3
  import { useWallet } from '@xyo-network/react-wallet'
4
4
  import { WalletInstance } from '@xyo-network/wallet-model'
5
- import { useEffect, useState } from 'react'
5
+ import { useEffect, useMemo, useState } from 'react'
6
6
 
7
7
  import { useModuleFromNode } from '../useModuleFromNode'
8
+ import { useModulesFromNode } from '../useModulesFromNode'
8
9
 
9
10
  export const WrappedModuleFromNodeHookFactory = {
10
11
  create: <TModuleWrapper extends ModuleWrapper>(wrapperObject: ConstructableModuleWrapper<TModuleWrapper>, name?: string) => {
@@ -16,8 +17,10 @@ export const WrappedModuleFromNodeHookFactory = {
16
17
  ): [TModuleWrapper | undefined, Error | undefined] => {
17
18
  logger?.debug(`Render: ${name}`)
18
19
  const [walletToUse] = useWallet({ wallet })
19
- const [module, moduleError] = useModuleFromNode<TModuleWrapper['module']>(
20
- nameOrAddress ?? {
20
+ const [module, moduleError] = useModuleFromNode<TModuleWrapper['module']>(nameOrAddress, up, logger)
21
+
22
+ const [modules, modulesError] = useModulesFromNode<TModuleWrapper['module']>(
23
+ {
21
24
  query: [wrapperObject.requiredQueries],
22
25
  },
23
26
  up,
@@ -27,6 +30,8 @@ export const WrappedModuleFromNodeHookFactory = {
27
30
  const [wrapper, setWrapper] = useState<TModuleWrapper>()
28
31
  const [error, setError] = useState<Error>()
29
32
 
33
+ const activeModule = useMemo(() => module ?? modules?.[0], [module, modules])
34
+
30
35
  /*
31
36
  useEffect(() => {
32
37
  if (!walletToUse) {
@@ -38,9 +43,9 @@ export const WrappedModuleFromNodeHookFactory = {
38
43
  */
39
44
 
40
45
  useEffect(() => {
41
- if (module && walletToUse) {
46
+ if (activeModule && walletToUse) {
42
47
  try {
43
- const wrapper = wrapperObject.wrap(module, walletToUse)
48
+ const wrapper = wrapperObject.wrap(activeModule, walletToUse)
44
49
  setWrapper(wrapper)
45
50
  setError(undefined)
46
51
  } catch (ex) {
@@ -49,9 +54,9 @@ export const WrappedModuleFromNodeHookFactory = {
49
54
  }
50
55
  } else {
51
56
  setWrapper(undefined)
52
- setError(moduleError)
57
+ setError(moduleError ?? modulesError)
53
58
  }
54
- }, [module, wallet, moduleError, walletToUse])
59
+ }, [activeModule, wallet, moduleError, walletToUse, modulesError])
55
60
 
56
61
  return [wrapper, error]
57
62
  }