@xyo-network/react-node 2.60.8 → 2.60.10

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.
@@ -4,6 +4,7 @@ exports.useModuleFromNode = exports.useModuleFromNodeConfigLogger = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const react_promise_1 = require("@xylabs/react-promise");
6
6
  const module_1 = require("@xyo-network/module");
7
+ const module_model_1 = require("@xyo-network/module-model");
7
8
  const react_1 = require("react");
8
9
  const useModuleFilterOptions_1 = require("./useModuleFilterOptions");
9
10
  const useNode_1 = require("./useNode");
@@ -11,37 +12,42 @@ const useModuleFromNodeConfigLogger = (config) => {
11
12
  return config === null || config === void 0 ? void 0 : config.logger;
12
13
  };
13
14
  exports.useModuleFromNodeConfigLogger = useModuleFromNodeConfigLogger;
14
- const useModuleFromNode = (nameOrAddress, config) => {
15
+ const useModuleFromNode = (nameOrAddressOrInstance, config) => {
15
16
  const [node, nodeError] = (0, useNode_1.useNode)(config);
16
17
  const logger = (0, exports.useModuleFromNodeConfigLogger)(config);
17
18
  const filterOptions = (0, useModuleFilterOptions_1.useModuleFilterOptions)(config);
18
19
  const [result, setResult] = (0, react_1.useState)();
19
20
  const [, error] = (0, react_promise_1.usePromise)(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
20
21
  logger === null || logger === void 0 ? void 0 : logger.debug('useModuleFromNode: resolving');
21
- if (node && nameOrAddress) {
22
+ if (node && nameOrAddressOrInstance) {
22
23
  node.on('moduleAttached', ({ module }) => {
23
24
  var _a, _b;
24
25
  logger === null || logger === void 0 ? void 0 : logger.debug(`useModuleFromNode: moduleAttached [${(_a = module.config.name) !== null && _a !== void 0 ? _a : module.address}]`);
25
- if (module.address === nameOrAddress || ((_b = module.config) === null || _b === void 0 ? void 0 : _b.name) === nameOrAddress) {
26
+ if (module.address === nameOrAddressOrInstance || ((_b = module.config) === null || _b === void 0 ? void 0 : _b.name) === nameOrAddressOrInstance) {
26
27
  setResult((0, module_1.asModuleInstance)(module));
27
28
  }
28
29
  });
29
30
  node.on('moduleDetached', ({ module }) => {
30
31
  var _a, _b;
31
32
  logger === null || logger === void 0 ? void 0 : logger.debug(`useModuleFromNode: moduleDetached [${(_a = module.config.name) !== null && _a !== void 0 ? _a : module.address}]`);
32
- if (module.address === nameOrAddress || ((_b = module.config) === null || _b === void 0 ? void 0 : _b.name) === nameOrAddress) {
33
+ if (module.address === nameOrAddressOrInstance || ((_b = module.config) === null || _b === void 0 ? void 0 : _b.name) === nameOrAddressOrInstance) {
33
34
  setResult(undefined);
34
35
  }
35
36
  });
36
- const result = yield node.resolve(nameOrAddress, filterOptions);
37
- logger === null || logger === void 0 ? void 0 : logger.debug(`Result: ${result === null || result === void 0 ? void 0 : result.address}`);
38
- setResult(result);
37
+ if ((0, module_model_1.isModuleInstance)(nameOrAddressOrInstance)) {
38
+ setResult(nameOrAddressOrInstance);
39
+ }
40
+ else {
41
+ const result = yield node.resolve(nameOrAddressOrInstance, filterOptions);
42
+ logger === null || logger === void 0 ? void 0 : logger.debug(`Result: ${result === null || result === void 0 ? void 0 : result.address}`);
43
+ setResult(result);
44
+ }
39
45
  return result;
40
46
  }
41
47
  logger === null || logger === void 0 ? void 0 : logger.debug('Result: No Node');
42
48
  return undefined;
43
49
  // eslint-disable-next-line react-hooks/exhaustive-deps
44
- }), [node, nameOrAddress]);
50
+ }), [node, nameOrAddressOrInstance]);
45
51
  return [result, nodeError !== null && nodeError !== void 0 ? nodeError : error];
46
52
  };
47
53
  exports.useModuleFromNode = useModuleFromNode;
@@ -1 +1 @@
1
- {"version":3,"file":"useModuleFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useModuleFromNode.ts"],"names":[],"mappings":";;;;AAAA,yDAAkD;AAElD,gDAAsD;AAGtD,iCAAgC;AAEhC,qEAAiE;AACjE,uCAAmC;AAO5B,MAAM,6BAA6B,GAAG,CAAC,MAA6B,EAAE,EAAE;IAC7E,OAAO,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,CAAA;AACvB,CAAC,CAAA;AAFY,QAAA,6BAA6B,iCAEzC;AAEM,MAAM,iBAAiB,GAAG,CAAC,aAAsB,EAAE,MAA6B,EAAmD,EAAE;IAC1I,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,IAAA,iBAAO,EAAC,MAAM,CAAC,CAAA;IACzC,MAAM,MAAM,GAAG,IAAA,qCAA6B,EAAC,MAAM,CAAC,CAAA;IACpD,MAAM,aAAa,GAAG,IAAA,+CAAsB,EAAC,MAAM,CAAC,CAAA;IACpD,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAA,gBAAQ,GAA8B,CAAA;IAClE,MAAM,CAAC,EAAE,KAAK,CAAC,GAAG,IAAA,0BAAU,EAAC,GAAS,EAAE;QACtC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,8BAA8B,CAAC,CAAA;QAC7C,IAAI,IAAI,IAAI,aAAa,EAAE;YACzB,IAAI,CAAC,EAAE,CAAC,gBAAgB,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;;gBACvC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,sCAAsC,MAAA,MAAM,CAAC,MAAM,CAAC,IAAI,mCAAI,MAAM,CAAC,OAAO,GAAG,CAAC,CAAA;gBAC5F,IAAI,MAAM,CAAC,OAAO,KAAK,aAAa,IAAI,CAAA,MAAA,MAAM,CAAC,MAAM,0CAAE,IAAI,MAAK,aAAa,EAAE;oBAC7E,SAAS,CAAC,IAAA,yBAAgB,EAAC,MAAM,CAAC,CAAC,CAAA;iBACpC;YACH,CAAC,CAAC,CAAA;YACF,IAAI,CAAC,EAAE,CAAC,gBAAgB,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;;gBACvC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,sCAAsC,MAAA,MAAM,CAAC,MAAM,CAAC,IAAI,mCAAI,MAAM,CAAC,OAAO,GAAG,CAAC,CAAA;gBAC5F,IAAI,MAAM,CAAC,OAAO,KAAK,aAAa,IAAI,CAAA,MAAA,MAAM,CAAC,MAAM,0CAAE,IAAI,MAAK,aAAa,EAAE;oBAC7E,SAAS,CAAC,SAAS,CAAC,CAAA;iBACrB;YACH,CAAC,CAAC,CAAA;YACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,aAAa,CAAC,CAAA;YAC/D,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,WAAW,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,EAAE,CAAC,CAAA;YAC3C,SAAS,CAAC,MAAM,CAAC,CAAA;YACjB,OAAO,MAAM,CAAA;SACd;QACD,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,iBAAiB,CAAC,CAAA;QAChC,OAAO,SAAS,CAAA;QAChB,uDAAuD;IACzD,CAAC,CAAA,EAAE,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC,CAAA;IACzB,OAAO,CAAC,MAAM,EAAE,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,KAAK,CAAC,CAAA;AACrC,CAAC,CAAA;AA9BY,QAAA,iBAAiB,qBA8B7B"}
1
+ {"version":3,"file":"useModuleFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useModuleFromNode.ts"],"names":[],"mappings":";;;;AAAA,yDAAkD;AAElD,gDAAsD;AACtD,4DAAiG;AAEjG,iCAAgC;AAEhC,qEAAiE;AACjE,uCAAmC;AAO5B,MAAM,6BAA6B,GAAG,CAAC,MAA6B,EAAE,EAAE;IAC7E,OAAO,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,CAAA;AACvB,CAAC,CAAA;AAFY,QAAA,6BAA6B,iCAEzC;AAEM,MAAM,iBAAiB,GAAG,CAC/B,uBAAiD,EACjD,MAA6B,EACoB,EAAE;IACnD,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,IAAA,iBAAO,EAAC,MAAM,CAAC,CAAA;IACzC,MAAM,MAAM,GAAG,IAAA,qCAA6B,EAAC,MAAM,CAAC,CAAA;IACpD,MAAM,aAAa,GAAG,IAAA,+CAAsB,EAAC,MAAM,CAAC,CAAA;IACpD,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAA,gBAAQ,GAA8B,CAAA;IAClE,MAAM,CAAC,EAAE,KAAK,CAAC,GAAG,IAAA,0BAAU,EAAC,GAAS,EAAE;QACtC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,8BAA8B,CAAC,CAAA;QAC7C,IAAI,IAAI,IAAI,uBAAuB,EAAE;YACnC,IAAI,CAAC,EAAE,CAAC,gBAAgB,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;;gBACvC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,sCAAsC,MAAA,MAAM,CAAC,MAAM,CAAC,IAAI,mCAAI,MAAM,CAAC,OAAO,GAAG,CAAC,CAAA;gBAC5F,IAAI,MAAM,CAAC,OAAO,KAAK,uBAAuB,IAAI,CAAA,MAAA,MAAM,CAAC,MAAM,0CAAE,IAAI,MAAK,uBAAuB,EAAE;oBACjG,SAAS,CAAC,IAAA,yBAAgB,EAAC,MAAM,CAAC,CAAC,CAAA;iBACpC;YACH,CAAC,CAAC,CAAA;YACF,IAAI,CAAC,EAAE,CAAC,gBAAgB,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;;gBACvC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,sCAAsC,MAAA,MAAM,CAAC,MAAM,CAAC,IAAI,mCAAI,MAAM,CAAC,OAAO,GAAG,CAAC,CAAA;gBAC5F,IAAI,MAAM,CAAC,OAAO,KAAK,uBAAuB,IAAI,CAAA,MAAA,MAAM,CAAC,MAAM,0CAAE,IAAI,MAAK,uBAAuB,EAAE;oBACjG,SAAS,CAAC,SAAS,CAAC,CAAA;iBACrB;YACH,CAAC,CAAC,CAAA;YACF,IAAI,IAAA,+BAAgB,EAAC,uBAAuB,CAAC,EAAE;gBAC7C,SAAS,CAAC,uBAAuB,CAAC,CAAA;aACnC;iBAAM;gBACL,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,uBAAuB,EAAE,aAAa,CAAC,CAAA;gBACzE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,WAAW,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,EAAE,CAAC,CAAA;gBAC3C,SAAS,CAAC,MAAM,CAAC,CAAA;aAClB;YACD,OAAO,MAAM,CAAA;SACd;QACD,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,iBAAiB,CAAC,CAAA;QAChC,OAAO,SAAS,CAAA;QAChB,uDAAuD;IACzD,CAAC,CAAA,EAAE,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC,CAAA;IACnC,OAAO,CAAC,MAAM,EAAE,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,KAAK,CAAC,CAAA;AACrC,CAAC,CAAA;AArCY,QAAA,iBAAiB,qBAqC7B"}
@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.useNodeFromNode = void 0;
4
4
  const node_model_1 = require("@xyo-network/node-model");
5
5
  const useModuleFromNode_1 = require("./useModuleFromNode");
6
- const useNodeFromNode = (nameOrAddress, config) => {
6
+ const useNodeFromNode = (nameOrAddressOrInstance, config) => {
7
7
  var _a, _b;
8
- const [module, error] = (0, useModuleFromNode_1.useModuleFromNode)(nameOrAddress, config);
8
+ const [module, error] = (0, useModuleFromNode_1.useModuleFromNode)(nameOrAddressOrInstance, config);
9
9
  const instance = (0, node_model_1.asNodeInstance)(module);
10
10
  if (module && !instance) {
11
11
  const error = Error(`Resolved module is not a NodeInstance [${(_a = module.config) === null || _a === void 0 ? void 0 : _a.schema}:${(_b = module.config) === null || _b === void 0 ? void 0 : _b.name}:${module.address}]`);
@@ -1 +1 @@
1
- {"version":3,"file":"useNodeFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useNodeFromNode.tsx"],"names":[],"mappings":";;;AAAA,wDAAsE;AAEtE,2DAA6E;AAEtE,MAAM,eAAe,GAAG,CAAC,aAAsB,EAAE,MAA6B,EAAiD,EAAE;;IACtI,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,MAAM,KAAK,GAAG,KAAK,CAAC,0CAA0C,MAAA,MAAM,CAAC,MAAM,0CAAE,MAAM,IAAI,MAAA,MAAM,CAAC,MAAM,0CAAE,IAAI,IAAI,MAAM,CAAC,OAAO,GAAG,CAAC,CAAA;QAChI,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QAC5B,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,CAAA;KAC1B;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;AAC1B,CAAC,CAAA;AATY,QAAA,eAAe,mBAS3B"}
1
+ {"version":3,"file":"useNodeFromNode.js","sourceRoot":"","sources":["../../../src/hooks/useNodeFromNode.tsx"],"names":[],"mappings":";;;AAAA,wDAAsE;AAEtE,2DAA6E;AAEtE,MAAM,eAAe,GAAG,CAC7B,uBAA+C,EAC/C,MAA6B,EACkB,EAAE;;IACjD,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,IAAA,qCAAiB,EAAC,uBAAuB,EAAE,MAAM,CAAC,CAAA;IAC1E,MAAM,QAAQ,GAAG,IAAA,2BAAc,EAAC,MAAM,CAAC,CAAA;IACvC,IAAI,MAAM,IAAI,CAAC,QAAQ,EAAE;QACvB,MAAM,KAAK,GAAG,KAAK,CAAC,0CAA0C,MAAA,MAAM,CAAC,MAAM,0CAAE,MAAM,IAAI,MAAA,MAAM,CAAC,MAAM,0CAAE,IAAI,IAAI,MAAM,CAAC,OAAO,GAAG,CAAC,CAAA;QAChI,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QAC5B,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,CAAA;KAC1B;IACD,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;AAC1B,CAAC,CAAA;AAZY,QAAA,eAAe,mBAY3B"}