@xyo-network/react-node 2.45.0-rc.15 → 2.45.0-rc.16
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.
- package/dist/cjs/hooks/useModule.js +1 -1
- package/dist/cjs/hooks/useModule.js.map +1 -1
- package/dist/cjs/hooks/useNode.js +5 -7
- package/dist/cjs/hooks/useNode.js.map +1 -1
- package/dist/docs.json +126 -207
- package/dist/esm/hooks/useModule.js +2 -2
- package/dist/esm/hooks/useModule.js.map +1 -1
- package/dist/esm/hooks/useNode.js +5 -7
- package/dist/esm/hooks/useNode.js.map +1 -1
- package/dist/types/hooks/useModule.d.ts.map +1 -1
- package/dist/types/hooks/useNode.d.ts +1 -1
- package/dist/types/hooks/useNode.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/hooks/useModule.tsx +2 -2
- package/src/hooks/useNode.tsx +4 -8
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { ModuleWrapper } from '@xyo-network/module';
|
|
2
|
-
import { createUseModuleHook
|
|
3
|
-
export const useModule = createUseModuleHook((module) => ModuleWrapper.tryWrap(module)
|
|
2
|
+
import { createUseModuleHook } from './useNode';
|
|
3
|
+
export const useModule = createUseModuleHook((module) => ModuleWrapper.tryWrap(module));
|
|
4
4
|
//# sourceMappingURL=useModule.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useModule.js","sourceRoot":"","sources":["../../../src/hooks/useModule.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAU,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAE3D,OAAO,EAAE,mBAAmB,EAAE,
|
|
1
|
+
{"version":3,"file":"useModule.js","sourceRoot":"","sources":["../../../src/hooks/useModule.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAU,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAE3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAA;AAE/C,MAAM,CAAC,MAAM,SAAS,GAAG,mBAAmB,CAAwB,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAA"}
|
|
@@ -3,10 +3,9 @@ import { useAsyncEffect } from '@xylabs/react-shared';
|
|
|
3
3
|
import { NodeWrapper } from '@xyo-network/node';
|
|
4
4
|
import { useState } from 'react';
|
|
5
5
|
import { useProvidedNode } from './useProvidedNode';
|
|
6
|
-
export const createUseModuleHook = (wrapFunc
|
|
6
|
+
export const createUseModuleHook = (wrapFunc) => {
|
|
7
7
|
function use(nameOrAddressOrWrapOrAccount, wrap = false) {
|
|
8
|
-
const [node, nodeError] =
|
|
9
|
-
const [defaultModule] = defaultModuleFunc();
|
|
8
|
+
const [node, nodeError] = useProvidedNode();
|
|
10
9
|
const shouldWrap = typeof nameOrAddressOrWrapOrAccount === 'boolean' ? nameOrAddressOrWrapOrAccount : wrap;
|
|
11
10
|
const account = typeof nameOrAddressOrWrapOrAccount === 'object' ? nameOrAddressOrWrapOrAccount : typeof wrap === 'boolean' ? undefined : wrap;
|
|
12
11
|
const nameOrAddress = typeof nameOrAddressOrWrapOrAccount === 'string' ? nameOrAddressOrWrapOrAccount : undefined;
|
|
@@ -27,8 +26,7 @@ export const createUseModuleHook = (wrapFunc, nodeFunc, defaultModuleFunc = () =
|
|
|
27
26
|
const module = nameOrAddress
|
|
28
27
|
? await wrappedNode?.resolve(nameOrAddress)
|
|
29
28
|
: (await wrappedNode.resolve()).pop();
|
|
30
|
-
const
|
|
31
|
-
const finalModule = shouldWrap ? wrapFunc(moduleWithDefault, account) : moduleWithDefault;
|
|
29
|
+
const finalModule = shouldWrap ? wrapFunc(module, account) : module;
|
|
32
30
|
if (mounted()) {
|
|
33
31
|
console.log(`Setting Module [${finalModule?.address}]`);
|
|
34
32
|
setModule(finalModule);
|
|
@@ -50,10 +48,10 @@ export const createUseModuleHook = (wrapFunc, nodeFunc, defaultModuleFunc = () =
|
|
|
50
48
|
setModule(undefined);
|
|
51
49
|
}
|
|
52
50
|
}
|
|
53
|
-
}, [wrap, node, nameOrAddress, nodeError, shouldWrap, account
|
|
51
|
+
}, [wrap, node, nameOrAddress, nodeError, shouldWrap, account]);
|
|
54
52
|
return [module, error];
|
|
55
53
|
}
|
|
56
54
|
return use;
|
|
57
55
|
};
|
|
58
|
-
export const useNode = createUseModuleHook((module) => NodeWrapper.tryWrap(module)
|
|
56
|
+
export const useNode = createUseModuleHook((module) => NodeWrapper.tryWrap(module));
|
|
59
57
|
//# sourceMappingURL=useNode.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useNode.js","sourceRoot":"","sources":["../../../src/hooks/useNode.tsx"],"names":[],"mappings":"AAAA,+CAA+C;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAGrD,OAAO,EAAc,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AASnD,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAKjC,QAAmB,EACnB,
|
|
1
|
+
{"version":3,"file":"useNode.js","sourceRoot":"","sources":["../../../src/hooks/useNode.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useModule.d.ts","sourceRoot":"","sources":["../../../src/hooks/useModule.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAI3D,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"useModule.d.ts","sourceRoot":"","sources":["../../../src/hooks/useModule.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAI3D,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAwF,CAAA"}
|
|
@@ -43,7 +43,7 @@ export declare const createUseModuleHook: <TModule extends Module<import("@xyo-n
|
|
|
43
43
|
storeQueries?: boolean | undefined;
|
|
44
44
|
} & {
|
|
45
45
|
schema: string;
|
|
46
|
-
}>>, TWrapFunc extends WrapFunc<TModule, TWrapper> = WrapFunc<TModule, TWrapper>>(wrapFunc: TWrapFunc
|
|
46
|
+
}>>, TWrapFunc extends WrapFunc<TModule, TWrapper> = WrapFunc<TModule, TWrapper>>(wrapFunc: TWrapFunc) => {
|
|
47
47
|
(name?: string): [TModule | undefined, Error | undefined];
|
|
48
48
|
(name: string | undefined, wrap: true | Account): [TWrapper | undefined, Error | undefined];
|
|
49
49
|
(wrap: true | Account): [TWrapper | undefined, Error | undefined];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useNode.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAC3D,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAK3D,MAAM,MAAM,QAAQ,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,EAAE,QAAQ,SAAS,aAAa,GAAG,aAAa,IAAI,CACtG,MAAM,CAAC,EAAE,OAAO,EAChB,OAAO,CAAC,EAAE,OAAO,KACd,QAAQ,GAAG,SAAS,CAAA;AAEzB,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAAC,CAAA;AAExE,eAAO,MAAM,mBAAmB
|
|
1
|
+
{"version":3,"file":"useNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useNode.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAC3D,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAK3D,MAAM,MAAM,QAAQ,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM,EAAE,QAAQ,SAAS,aAAa,GAAG,aAAa,IAAI,CACtG,MAAM,CAAC,EAAE,OAAO,EAChB,OAAO,CAAC,EAAE,OAAO,KACd,QAAQ,GAAG,SAAS,CAAA;AAEzB,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAAC,CAAA;AAExE,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAOV,MAAM;WACP,MAAM,GAAG,SAAS,QAAQ,IAAI,GAAG,OAAO;WACxC,IAAI,GAAG,OAAO;cACX,MAAM;cACN,MAAM,QAAQ,IAAI,GAAG,OAAO;CAoDnD,CAAA;AAED,eAAO,MAAM,OAAO;YA1DE,MAAM;WACP,MAAM,GAAG,SAAS,QAAQ,IAAI,GAAG,OAAO;WACxC,IAAI,GAAG,OAAO;cACX,MAAM;cACN,MAAM,QAAQ,IAAI,GAAG,OAAO;CAsDwD,CAAA"}
|
package/package.json
CHANGED
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"@xyo-network/module-model": "^2.51.2",
|
|
22
22
|
"@xyo-network/node": "^2.51.2",
|
|
23
23
|
"@xyo-network/payload-model": "^2.51.2",
|
|
24
|
-
"@xyo-network/react-shared": "^2.45.0-rc.
|
|
24
|
+
"@xyo-network/react-shared": "^2.45.0-rc.16",
|
|
25
25
|
"@xyo-network/witness": "^2.51.2"
|
|
26
26
|
},
|
|
27
27
|
"devDependencies": {
|
|
@@ -83,6 +83,6 @@
|
|
|
83
83
|
},
|
|
84
84
|
"sideEffects": false,
|
|
85
85
|
"types": "dist/types/index.d.ts",
|
|
86
|
-
"version": "2.45.0-rc.
|
|
86
|
+
"version": "2.45.0-rc.16",
|
|
87
87
|
"stableVersion": "2.44.1"
|
|
88
88
|
}
|
package/src/hooks/useModule.tsx
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Module, ModuleWrapper } from '@xyo-network/module'
|
|
2
2
|
|
|
3
|
-
import { createUseModuleHook
|
|
3
|
+
import { createUseModuleHook } from './useNode'
|
|
4
4
|
|
|
5
|
-
export const useModule = createUseModuleHook<Module, ModuleWrapper>((module) => ModuleWrapper.tryWrap(module)
|
|
5
|
+
export const useModule = createUseModuleHook<Module, ModuleWrapper>((module) => ModuleWrapper.tryWrap(module))
|
package/src/hooks/useNode.tsx
CHANGED
|
@@ -20,8 +20,6 @@ export const createUseModuleHook = <
|
|
|
20
20
|
TWrapFunc extends WrapFunc<TModule, TWrapper> = WrapFunc<TModule, TWrapper>,
|
|
21
21
|
>(
|
|
22
22
|
wrapFunc: TWrapFunc,
|
|
23
|
-
nodeFunc: NodeFunc,
|
|
24
|
-
defaultModuleFunc: () => [TModule | undefined, Error | undefined] = () => [undefined, undefined],
|
|
25
23
|
) => {
|
|
26
24
|
function use(name?: string): [TModule | undefined, Error | undefined]
|
|
27
25
|
function use(name: string | undefined, wrap: true | Account): [TWrapper | undefined, Error | undefined]
|
|
@@ -32,8 +30,7 @@ export const createUseModuleHook = <
|
|
|
32
30
|
nameOrAddressOrWrapOrAccount?: string | boolean | Account,
|
|
33
31
|
wrap: boolean | Account = false,
|
|
34
32
|
): [TWrapper | TModule | undefined, Error | undefined] {
|
|
35
|
-
const [node, nodeError] =
|
|
36
|
-
const [defaultModule] = defaultModuleFunc()
|
|
33
|
+
const [node, nodeError] = useProvidedNode()
|
|
37
34
|
const shouldWrap = typeof nameOrAddressOrWrapOrAccount === 'boolean' ? nameOrAddressOrWrapOrAccount : wrap
|
|
38
35
|
const account = typeof nameOrAddressOrWrapOrAccount === 'object' ? nameOrAddressOrWrapOrAccount : typeof wrap === 'boolean' ? undefined : wrap
|
|
39
36
|
const nameOrAddress = typeof nameOrAddressOrWrapOrAccount === 'string' ? nameOrAddressOrWrapOrAccount : undefined
|
|
@@ -53,8 +50,7 @@ export const createUseModuleHook = <
|
|
|
53
50
|
const module: TModule | undefined = nameOrAddress
|
|
54
51
|
? await wrappedNode?.resolve<TModule>(nameOrAddress)
|
|
55
52
|
: (await wrappedNode.resolve<TModule>()).pop()
|
|
56
|
-
const
|
|
57
|
-
const finalModule = shouldWrap ? wrapFunc(moduleWithDefault, account) : moduleWithDefault
|
|
53
|
+
const finalModule = shouldWrap ? wrapFunc(module, account) : module
|
|
58
54
|
if (mounted()) {
|
|
59
55
|
console.log(`Setting Module [${finalModule?.address}]`)
|
|
60
56
|
setModule(finalModule)
|
|
@@ -75,7 +71,7 @@ export const createUseModuleHook = <
|
|
|
75
71
|
}
|
|
76
72
|
}
|
|
77
73
|
},
|
|
78
|
-
[wrap, node, nameOrAddress, nodeError, shouldWrap, account
|
|
74
|
+
[wrap, node, nameOrAddress, nodeError, shouldWrap, account],
|
|
79
75
|
)
|
|
80
76
|
|
|
81
77
|
return [module, error]
|
|
@@ -83,4 +79,4 @@ export const createUseModuleHook = <
|
|
|
83
79
|
return use
|
|
84
80
|
}
|
|
85
81
|
|
|
86
|
-
export const useNode = createUseModuleHook<NodeModule, NodeWrapper>((module) => NodeWrapper.tryWrap(module)
|
|
82
|
+
export const useNode = createUseModuleHook<NodeModule, NodeWrapper>((module) => NodeWrapper.tryWrap(module))
|