@xyo-network/react-archivist 2.30.3 → 2.31.0-rc.1

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 (9) hide show
  1. package/dist/cjs/contexts/Provider.d.ts.map +1 -1
  2. package/dist/cjs/contexts/Provider.js +20 -17
  3. package/dist/cjs/contexts/Provider.js.map +1 -1
  4. package/dist/docs.json +37 -37
  5. package/dist/esm/contexts/Provider.d.ts.map +1 -1
  6. package/dist/esm/contexts/Provider.js +20 -15
  7. package/dist/esm/contexts/Provider.js.map +1 -1
  8. package/package.json +11 -8
  9. package/src/contexts/Provider.tsx +44 -15
package/dist/cjs/contexts/Provider.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Provider.d.ts","sourceRoot":"","sources":["../../../src/contexts/Provider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAsB,wBAAwB,EAAE,MAAM,kBAAkB,CAAA;AAC/E,OAAO,EAAE,YAAY,EAAsB,wBAAwB,EAAE,MAAM,wBAAwB,CAAA;AACnG,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAMlE,oBAAY,sBAAsB,GAAG,sBAAsB,CAAC;IAC1D,SAAS,CAAC,EAAE,YAAY,CAAA;CACzB,CAAC,CAAA;AAEF,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,sBAAsB,CAkB9D,CAAA;AAED,oBAAY,4BAA4B,GAAG,sBAAsB,CAAC;IAChE,MAAM,EAAE,wBAAwB,CAAA;CACjC,CAAC,CAAA;AAEF,eAAO,MAAM,uBAAuB,EAAE,KAAK,CAAC,EAAE,CAAC,4BAA4B,CAS1E,CAAA;AAED,oBAAY,yBAAyB,GAAG,sBAAsB,CAAC;IAC7D,MAAM,EAAE,wBAAwB,CAAA;CACjC,CAAC,CAAA;AAEF,eAAO,MAAM,uBAAuB,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,CASvE,CAAA"}
1
+ {"version":3,"file":"Provider.d.ts","sourceRoot":"","sources":["../../../src/contexts/Provider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAsB,wBAAwB,EAAE,MAAM,kBAAkB,CAAA;AAC/E,OAAO,EAAE,YAAY,EAAsB,wBAAwB,EAAE,MAAM,wBAAwB,CAAA;AACnG,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAOlE,oBAAY,sBAAsB,GAAG,sBAAsB,CAAC;IAC1D,SAAS,CAAC,EAAE,YAAY,CAAA;CACzB,CAAC,CAAA;AAEF,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,sBAAsB,CAkB9D,CAAA;AAED,oBAAY,4BAA4B,GAAG,sBAAsB,CAAC;IAChE,MAAM,EAAE,wBAAwB,CAAA;CACjC,CAAC,CAAA;AAEF,eAAO,MAAM,uBAAuB,EAAE,KAAK,CAAC,EAAE,CAAC,4BAA4B,CAuB1E,CAAA;AAED,oBAAY,yBAAyB,GAAG,sBAAsB,CAAC;IAC7D,MAAM,EAAE,wBAAwB,CAAA;CACjC,CAAC,CAAA;AAEF,eAAO,MAAM,uBAAuB,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,CAuBvE,CAAA"}
package/dist/cjs/contexts/Provider.js CHANGED
@@ -5,11 +5,12 @@ const tslib_1 = require("tslib");
5
5
  const jsx_runtime_1 = require("react/jsx-runtime");
6
6
  const api_1 = require("@xyo-network/api");
7
7
  const archivist_1 = require("@xyo-network/archivist");
8
+ const merge_1 = tslib_1.__importDefault(require("lodash/merge"));
8
9
  const react_1 = require("react");
9
10
  const Context_1 = require("./Context");
10
11
  const use_1 = require("./use");
11
12
  const ArchivistProvider = ({ archivist: archivistProp, required = false, children }) => {
12
- const [archivist, setArchivist] = (0, react_1.useState)(archivistProp);
13
+ const [archivist, setArchivist] = (0, react_1.useState)();
13
14
  (0, react_1.useEffect)(() => {
14
15
  setArchivist(archivistProp);
15
16
  }, [archivistProp]);
@@ -21,29 +22,31 @@ const ArchivistProvider = ({ archivist: archivistProp, required = false, childre
21
22
  };
22
23
  exports.ArchivistProvider = ArchivistProvider;
23
24
  const MemoryArchivistProvider = (_a) => {
24
- var _b, _c;
25
25
  var { config } = _a, props = tslib_1.__rest(_a, ["config"]);
26
26
  const { archivist } = (0, use_1.useArchivist)();
27
- const memoryArchivistConfig = Object.assign({}, config);
28
- memoryArchivistConfig.parents = (_b = memoryArchivistConfig.parents) !== null && _b !== void 0 ? _b : {};
29
- memoryArchivistConfig.parents.read = (_c = memoryArchivistConfig.parents.read) !== null && _c !== void 0 ? _c : {};
30
- if (archivist) {
31
- memoryArchivistConfig.parents.read[archivist.address] = archivist;
32
- }
33
- return (0, jsx_runtime_1.jsx)(exports.ArchivistProvider, Object.assign({ archivist: new archivist_1.XyoMemoryArchivist(config) }, props));
27
+ return ((0, jsx_runtime_1.jsx)(exports.ArchivistProvider, Object.assign({ archivist: new archivist_1.XyoMemoryArchivist((0, merge_1.default)(config, archivist
28
+ ? {
29
+ parents: {
30
+ read: {
31
+ [archivist.address]: archivist,
32
+ },
33
+ },
34
+ }
35
+ : undefined)) }, props)));
34
36
  };
35
37
  exports.MemoryArchivistProvider = MemoryArchivistProvider;
36
38
  const RemoteArchivistProvider = (_a) => {
37
- var _b, _c;
38
39
  var { config } = _a, props = tslib_1.__rest(_a, ["config"]);
39
40
  const { archivist } = (0, use_1.useArchivist)();
40
- const remoteArchivistConfig = Object.assign({}, config);
41
- remoteArchivistConfig.parents = (_b = remoteArchivistConfig.parents) !== null && _b !== void 0 ? _b : {};
42
- remoteArchivistConfig.parents.read = (_c = remoteArchivistConfig.parents.read) !== null && _c !== void 0 ? _c : {};
43
- if (archivist) {
44
- remoteArchivistConfig.parents.read[archivist.address] = archivist;
45
- }
46
- return (0, jsx_runtime_1.jsx)(exports.ArchivistProvider, Object.assign({ archivist: new api_1.XyoRemoteArchivist(config) }, props));
41
+ return ((0, jsx_runtime_1.jsx)(exports.ArchivistProvider, Object.assign({ archivist: new api_1.XyoRemoteArchivist((0, merge_1.default)(config, archivist
42
+ ? {
43
+ parents: {
44
+ read: {
45
+ [archivist.address]: archivist,
46
+ },
47
+ },
48
+ }
49
+ : undefined)) }, props)));
47
50
  };
48
51
  exports.RemoteArchivistProvider = RemoteArchivistProvider;
49
52
  //# sourceMappingURL=Provider.js.map
package/dist/cjs/contexts/Provider.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Provider.js","sourceRoot":"","sources":["../../../src/contexts/Provider.tsx"],"names":[],"mappings":";;;;;AAAA,0CAA+E;AAC/E,sDAAmG;AAEnG,iCAA2C;AAE3C,uCAA4C;AAC5C,+BAAoC;AAM7B,MAAM,iBAAiB,GAAqC,CAAC,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,GAAG,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC9H,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,IAAA,gBAAQ,EAA2B,aAAa,CAAC,CAAA;IAEnF,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,YAAY,CAAC,aAAa,CAAC,CAAA;IAC7B,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAA;IAEnB,OAAO,CACL,uBAAC,0BAAgB,CAAC,QAAQ,kBACxB,KAAK,EAAE;YACL,SAAS,EAAE,SAAS,KAAK,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;YAC9D,QAAQ,EAAE,IAAI;YACd,YAAY;SACb,gBAEA,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,IACxB,CAC7B,CAAA;AACH,CAAC,CAAA;AAlBY,QAAA,iBAAiB,qBAkB7B;AAMM,MAAM,uBAAuB,GAA2C,CAAC,EAAoB,EAAE,EAAE;;QAAxB,EAAE,MAAM,OAAY,EAAP,KAAK,sBAAlB,UAAoB,CAAF;IAChG,MAAM,EAAE,SAAS,EAAE,GAAG,IAAA,kBAAY,GAAE,CAAA;IACpC,MAAM,qBAAqB,qBAAkC,MAAM,CAAE,CAAA;IACrE,qBAAqB,CAAC,OAAO,GAAG,MAAA,qBAAqB,CAAC,OAAO,mCAAI,EAAE,CAAA;IACnE,qBAAqB,CAAC,OAAO,CAAC,IAAI,GAAG,MAAA,qBAAqB,CAAC,OAAO,CAAC,IAAI,mCAAI,EAAE,CAAA;IAC7E,IAAI,SAAS,EAAE;QACb,qBAAqB,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,SAAS,CAAA;KAClE;IACD,OAAO,uBAAC,yBAAiB,kBAAC,SAAS,EAAE,IAAI,8BAAkB,CAAC,MAAM,CAAC,IAAM,KAAK,EAAI,CAAA;AACpF,CAAC,CAAA;AATY,QAAA,uBAAuB,2BASnC;AAMM,MAAM,uBAAuB,GAAwC,CAAC,EAAoB,EAAE,EAAE;;QAAxB,EAAE,MAAM,OAAY,EAAP,KAAK,sBAAlB,UAAoB,CAAF;IAC7F,MAAM,EAAE,SAAS,EAAE,GAAG,IAAA,kBAAY,GAAE,CAAA;IACpC,MAAM,qBAAqB,qBAAkC,MAAM,CAAE,CAAA;IACrE,qBAAqB,CAAC,OAAO,GAAG,MAAA,qBAAqB,CAAC,OAAO,mCAAI,EAAE,CAAA;IACnE,qBAAqB,CAAC,OAAO,CAAC,IAAI,GAAG,MAAA,qBAAqB,CAAC,OAAO,CAAC,IAAI,mCAAI,EAAE,CAAA;IAC7E,IAAI,SAAS,EAAE;QACb,qBAAqB,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,SAAS,CAAA;KAClE;IACD,OAAO,uBAAC,yBAAiB,kBAAC,SAAS,EAAE,IAAI,wBAAkB,CAAC,MAAM,CAAC,IAAM,KAAK,EAAI,CAAA;AACpF,CAAC,CAAA;AATY,QAAA,uBAAuB,2BASnC"}
1
+ {"version":3,"file":"Provider.js","sourceRoot":"","sources":["../../../src/contexts/Provider.tsx"],"names":[],"mappings":";;;;;AAAA,0CAA+E;AAC/E,sDAAmG;AAEnG,iEAAgC;AAChC,iCAA2C;AAE3C,uCAA4C;AAC5C,+BAAoC;AAM7B,MAAM,iBAAiB,GAAqC,CAAC,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,GAAG,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC9H,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,IAAA,gBAAQ,GAAgB,CAAA;IAE1D,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,YAAY,CAAC,aAAa,CAAC,CAAA;IAC7B,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAA;IAEnB,OAAO,CACL,uBAAC,0BAAgB,CAAC,QAAQ,kBACxB,KAAK,EAAE;YACL,SAAS,EAAE,SAAS,KAAK,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;YAC9D,QAAQ,EAAE,IAAI;YACd,YAAY;SACb,gBAEA,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,IACxB,CAC7B,CAAA;AACH,CAAC,CAAA;AAlBY,QAAA,iBAAiB,qBAkB7B;AAMM,MAAM,uBAAuB,GAA2C,CAAC,EAAoB,EAAE,EAAE;QAAxB,EAAE,MAAM,OAAY,EAAP,KAAK,sBAAlB,UAAoB,CAAF;IAChG,MAAM,EAAE,SAAS,EAAE,GAAG,IAAA,kBAAY,GAAE,CAAA;IACpC,OAAO,CACL,uBAAC,yBAAiB,kBAChB,SAAS,EACP,IAAI,8BAAkB,CACpB,IAAA,eAAK,EACH,MAAM,EACN,SAAS;YACP,CAAC,CAAC;gBACE,OAAO,EAAE;oBACP,IAAI,EAAE;wBACJ,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,SAAS;qBAC/B;iBACF;aACF;YACH,CAAC,CAAC,SAAS,CACd,CACF,IAEC,KAAK,EACT,CACH,CAAA;AACH,CAAC,CAAA;AAvBY,QAAA,uBAAuB,2BAuBnC;AAMM,MAAM,uBAAuB,GAAwC,CAAC,EAAoB,EAAE,EAAE;QAAxB,EAAE,MAAM,OAAY,EAAP,KAAK,sBAAlB,UAAoB,CAAF;IAC7F,MAAM,EAAE,SAAS,EAAE,GAAG,IAAA,kBAAY,GAAE,CAAA;IACpC,OAAO,CACL,uBAAC,yBAAiB,kBAChB,SAAS,EACP,IAAI,wBAAkB,CACpB,IAAA,eAAK,EACH,MAAM,EACN,SAAS;YACP,CAAC,CAAC;gBACE,OAAO,EAAE;oBACP,IAAI,EAAE;wBACJ,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,SAAS;qBAC/B;iBACF;aACF;YACH,CAAC,CAAC,SAAS,CACd,CACF,IAEC,KAAK,EACT,CACH,CAAA;AACH,CAAC,CAAA;AAvBY,QAAA,uBAAuB,2BAuBnC"}
package/dist/docs.json CHANGED
@@ -377,7 +377,7 @@
377
377
  "fileName": "packages/sdk/archivist/src/components/Details.tsx",
378
378
  "line": 12,
379
379
  "character": 2,
380
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3ffac7be/packages/sdk/archivist/src/components/Details.tsx#L12"
380
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/91461479/packages/sdk/archivist/src/components/Details.tsx#L12"
381
381
  }
382
382
  ],
383
383
  "type": {
@@ -18412,13 +18412,13 @@
18412
18412
  "fileName": "packages/sdk/archivist/src/components/Details.tsx",
18413
18413
  "line": 11,
18414
18414
  "character": 17,
18415
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3ffac7be/packages/sdk/archivist/src/components/Details.tsx#L11"
18415
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/91461479/packages/sdk/archivist/src/components/Details.tsx#L11"
18416
18416
  },
18417
18417
  {
18418
18418
  "fileName": "packages/sdk/archivist/src/components/Details.tsx",
18419
18419
  "line": 15,
18420
18420
  "character": 13,
18421
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3ffac7be/packages/sdk/archivist/src/components/Details.tsx#L15"
18421
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/91461479/packages/sdk/archivist/src/components/Details.tsx#L15"
18422
18422
  }
18423
18423
  ],
18424
18424
  "extendedTypes": [
@@ -18450,7 +18450,7 @@
18450
18450
  "fileName": "packages/sdk/archivist/src/contexts/State.ts",
18451
18451
  "line": 5,
18452
18452
  "character": 2,
18453
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3ffac7be/packages/sdk/archivist/src/contexts/State.ts#L5"
18453
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/91461479/packages/sdk/archivist/src/contexts/State.ts#L5"
18454
18454
  }
18455
18455
  ],
18456
18456
  "type": {
@@ -18487,7 +18487,7 @@
18487
18487
  "fileName": "packages/sdk/archivist/src/contexts/State.ts",
18488
18488
  "line": 6,
18489
18489
  "character": 2,
18490
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3ffac7be/packages/sdk/archivist/src/contexts/State.ts#L6"
18490
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/91461479/packages/sdk/archivist/src/contexts/State.ts#L6"
18491
18491
  }
18492
18492
  ],
18493
18493
  "type": {
@@ -18534,7 +18534,7 @@
18534
18534
  "fileName": "packages/sdk/archivist/src/contexts/State.ts",
18535
18535
  "line": 4,
18536
18536
  "character": 17,
18537
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3ffac7be/packages/sdk/archivist/src/contexts/State.ts#L4"
18537
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/91461479/packages/sdk/archivist/src/contexts/State.ts#L4"
18538
18538
  }
18539
18539
  ]
18540
18540
  },
@@ -18547,9 +18547,9 @@
18547
18547
  "sources": [
18548
18548
  {
18549
18549
  "fileName": "packages/sdk/archivist/src/contexts/Provider.tsx",
18550
- "line": 48,
18550
+ "line": 63,
18551
18551
  "character": 12,
18552
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3ffac7be/packages/sdk/archivist/src/contexts/Provider.tsx#L48"
18552
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/91461479/packages/sdk/archivist/src/contexts/Provider.tsx#L63"
18553
18553
  }
18554
18554
  ],
18555
18555
  "type": {
@@ -18573,9 +18573,9 @@
18573
18573
  "sources": [
18574
18574
  {
18575
18575
  "fileName": "packages/sdk/archivist/src/contexts/Provider.tsx",
18576
- "line": 49,
18576
+ "line": 64,
18577
18577
  "character": 2,
18578
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3ffac7be/packages/sdk/archivist/src/contexts/Provider.tsx#L49"
18578
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/91461479/packages/sdk/archivist/src/contexts/Provider.tsx#L64"
18579
18579
  }
18580
18580
  ],
18581
18581
  "type": {
@@ -18597,9 +18597,9 @@
18597
18597
  "sources": [
18598
18598
  {
18599
18599
  "fileName": "packages/sdk/archivist/src/contexts/Provider.tsx",
18600
- "line": 48,
18600
+ "line": 63,
18601
18601
  "character": 63,
18602
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3ffac7be/packages/sdk/archivist/src/contexts/Provider.tsx#L48"
18602
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/91461479/packages/sdk/archivist/src/contexts/Provider.tsx#L63"
18603
18603
  }
18604
18604
  ]
18605
18605
  }
@@ -18617,9 +18617,9 @@
18617
18617
  "sources": [
18618
18618
  {
18619
18619
  "fileName": "packages/sdk/archivist/src/contexts/Provider.tsx",
18620
- "line": 9,
18620
+ "line": 10,
18621
18621
  "character": 12,
18622
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3ffac7be/packages/sdk/archivist/src/contexts/Provider.tsx#L9"
18622
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/91461479/packages/sdk/archivist/src/contexts/Provider.tsx#L10"
18623
18623
  }
18624
18624
  ],
18625
18625
  "type": {
@@ -18645,9 +18645,9 @@
18645
18645
  "sources": [
18646
18646
  {
18647
18647
  "fileName": "packages/sdk/archivist/src/contexts/Provider.tsx",
18648
- "line": 10,
18648
+ "line": 11,
18649
18649
  "character": 2,
18650
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3ffac7be/packages/sdk/archivist/src/contexts/Provider.tsx#L10"
18650
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/91461479/packages/sdk/archivist/src/contexts/Provider.tsx#L11"
18651
18651
  }
18652
18652
  ],
18653
18653
  "type": {
@@ -18669,9 +18669,9 @@
18669
18669
  "sources": [
18670
18670
  {
18671
18671
  "fileName": "packages/sdk/archivist/src/contexts/Provider.tsx",
18672
- "line": 9,
18672
+ "line": 10,
18673
18673
  "character": 60,
18674
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3ffac7be/packages/sdk/archivist/src/contexts/Provider.tsx#L9"
18674
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/91461479/packages/sdk/archivist/src/contexts/Provider.tsx#L10"
18675
18675
  }
18676
18676
  ]
18677
18677
  }
@@ -18689,9 +18689,9 @@
18689
18689
  "sources": [
18690
18690
  {
18691
18691
  "fileName": "packages/sdk/archivist/src/contexts/Provider.tsx",
18692
- "line": 33,
18692
+ "line": 34,
18693
18693
  "character": 12,
18694
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3ffac7be/packages/sdk/archivist/src/contexts/Provider.tsx#L33"
18694
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/91461479/packages/sdk/archivist/src/contexts/Provider.tsx#L34"
18695
18695
  }
18696
18696
  ],
18697
18697
  "type": {
@@ -18715,9 +18715,9 @@
18715
18715
  "sources": [
18716
18716
  {
18717
18717
  "fileName": "packages/sdk/archivist/src/contexts/Provider.tsx",
18718
- "line": 34,
18718
+ "line": 35,
18719
18719
  "character": 2,
18720
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3ffac7be/packages/sdk/archivist/src/contexts/Provider.tsx#L34"
18720
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/91461479/packages/sdk/archivist/src/contexts/Provider.tsx#L35"
18721
18721
  }
18722
18722
  ],
18723
18723
  "type": {
@@ -18739,9 +18739,9 @@
18739
18739
  "sources": [
18740
18740
  {
18741
18741
  "fileName": "packages/sdk/archivist/src/contexts/Provider.tsx",
18742
- "line": 33,
18742
+ "line": 34,
18743
18743
  "character": 66,
18744
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3ffac7be/packages/sdk/archivist/src/contexts/Provider.tsx#L33"
18744
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/91461479/packages/sdk/archivist/src/contexts/Provider.tsx#L34"
18745
18745
  }
18746
18746
  ]
18747
18747
  }
@@ -18763,7 +18763,7 @@
18763
18763
  "fileName": "packages/sdk/archivist/src/contexts/Context.ts",
18764
18764
  "line": 5,
18765
18765
  "character": 6,
18766
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3ffac7be/packages/sdk/archivist/src/contexts/Context.ts#L5"
18766
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/91461479/packages/sdk/archivist/src/contexts/Context.ts#L5"
18767
18767
  }
18768
18768
  ],
18769
18769
  "type": {
@@ -18801,13 +18801,13 @@
18801
18801
  "fileName": "packages/sdk/archivist/src/components/Details.tsx",
18802
18802
  "line": 11,
18803
18803
  "character": 17,
18804
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3ffac7be/packages/sdk/archivist/src/components/Details.tsx#L11"
18804
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/91461479/packages/sdk/archivist/src/components/Details.tsx#L11"
18805
18805
  },
18806
18806
  {
18807
18807
  "fileName": "packages/sdk/archivist/src/components/Details.tsx",
18808
18808
  "line": 15,
18809
18809
  "character": 13,
18810
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3ffac7be/packages/sdk/archivist/src/components/Details.tsx#L15"
18810
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/91461479/packages/sdk/archivist/src/components/Details.tsx#L15"
18811
18811
  }
18812
18812
  ],
18813
18813
  "signatures": [
@@ -18881,9 +18881,9 @@
18881
18881
  "sources": [
18882
18882
  {
18883
18883
  "fileName": "packages/sdk/archivist/src/contexts/Provider.tsx",
18884
- "line": 13,
18884
+ "line": 14,
18885
18885
  "character": 13,
18886
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3ffac7be/packages/sdk/archivist/src/contexts/Provider.tsx#L13"
18886
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/91461479/packages/sdk/archivist/src/contexts/Provider.tsx#L14"
18887
18887
  }
18888
18888
  ],
18889
18889
  "signatures": [
@@ -18957,9 +18957,9 @@
18957
18957
  "sources": [
18958
18958
  {
18959
18959
  "fileName": "packages/sdk/archivist/src/contexts/Provider.tsx",
18960
- "line": 37,
18960
+ "line": 38,
18961
18961
  "character": 13,
18962
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3ffac7be/packages/sdk/archivist/src/contexts/Provider.tsx#L37"
18962
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/91461479/packages/sdk/archivist/src/contexts/Provider.tsx#L38"
18963
18963
  }
18964
18964
  ],
18965
18965
  "signatures": [
@@ -19033,9 +19033,9 @@
19033
19033
  "sources": [
19034
19034
  {
19035
19035
  "fileName": "packages/sdk/archivist/src/contexts/Provider.tsx",
19036
- "line": 52,
19036
+ "line": 67,
19037
19037
  "character": 13,
19038
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3ffac7be/packages/sdk/archivist/src/contexts/Provider.tsx#L52"
19038
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/91461479/packages/sdk/archivist/src/contexts/Provider.tsx#L67"
19039
19039
  }
19040
19040
  ],
19041
19041
  "signatures": [
@@ -19111,7 +19111,7 @@
19111
19111
  "fileName": "packages/sdk/archivist/src/contexts/use.ts",
19112
19112
  "line": 9,
19113
19113
  "character": 13,
19114
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3ffac7be/packages/sdk/archivist/src/contexts/use.ts#L9"
19114
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/91461479/packages/sdk/archivist/src/contexts/use.ts#L9"
19115
19115
  }
19116
19116
  ],
19117
19117
  "signatures": [
@@ -19175,7 +19175,7 @@
19175
19175
  "fileName": "packages/sdk/archivist/src/contexts/use.ts",
19176
19176
  "line": 35,
19177
19177
  "character": 13,
19178
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3ffac7be/packages/sdk/archivist/src/contexts/use.ts#L35"
19178
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/91461479/packages/sdk/archivist/src/contexts/use.ts#L35"
19179
19179
  }
19180
19180
  ],
19181
19181
  "signatures": [
@@ -19286,7 +19286,7 @@
19286
19286
  "fileName": "packages/sdk/archivist/src/contexts/use.ts",
19287
19287
  "line": 13,
19288
19288
  "character": 13,
19289
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3ffac7be/packages/sdk/archivist/src/contexts/use.ts#L13"
19289
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/91461479/packages/sdk/archivist/src/contexts/use.ts#L13"
19290
19290
  }
19291
19291
  ],
19292
19292
  "signatures": [
@@ -19416,7 +19416,7 @@
19416
19416
  "fileName": "packages/sdk/archivist/src/index.ts",
19417
19417
  "line": 1,
19418
19418
  "character": 0,
19419
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/3ffac7be/packages/sdk/archivist/src/index.ts#L1"
19419
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-react-js/blob/91461479/packages/sdk/archivist/src/index.ts#L1"
19420
19420
  }
19421
19421
  ]
19422
19422
  }
package/dist/esm/contexts/Provider.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Provider.d.ts","sourceRoot":"","sources":["../../../src/contexts/Provider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAsB,wBAAwB,EAAE,MAAM,kBAAkB,CAAA;AAC/E,OAAO,EAAE,YAAY,EAAsB,wBAAwB,EAAE,MAAM,wBAAwB,CAAA;AACnG,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAMlE,oBAAY,sBAAsB,GAAG,sBAAsB,CAAC;IAC1D,SAAS,CAAC,EAAE,YAAY,CAAA;CACzB,CAAC,CAAA;AAEF,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,sBAAsB,CAkB9D,CAAA;AAED,oBAAY,4BAA4B,GAAG,sBAAsB,CAAC;IAChE,MAAM,EAAE,wBAAwB,CAAA;CACjC,CAAC,CAAA;AAEF,eAAO,MAAM,uBAAuB,EAAE,KAAK,CAAC,EAAE,CAAC,4BAA4B,CAS1E,CAAA;AAED,oBAAY,yBAAyB,GAAG,sBAAsB,CAAC;IAC7D,MAAM,EAAE,wBAAwB,CAAA;CACjC,CAAC,CAAA;AAEF,eAAO,MAAM,uBAAuB,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,CASvE,CAAA"}
1
+ {"version":3,"file":"Provider.d.ts","sourceRoot":"","sources":["../../../src/contexts/Provider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAsB,wBAAwB,EAAE,MAAM,kBAAkB,CAAA;AAC/E,OAAO,EAAE,YAAY,EAAsB,wBAAwB,EAAE,MAAM,wBAAwB,CAAA;AACnG,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAOlE,oBAAY,sBAAsB,GAAG,sBAAsB,CAAC;IAC1D,SAAS,CAAC,EAAE,YAAY,CAAA;CACzB,CAAC,CAAA;AAEF,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,sBAAsB,CAkB9D,CAAA;AAED,oBAAY,4BAA4B,GAAG,sBAAsB,CAAC;IAChE,MAAM,EAAE,wBAAwB,CAAA;CACjC,CAAC,CAAA;AAEF,eAAO,MAAM,uBAAuB,EAAE,KAAK,CAAC,EAAE,CAAC,4BAA4B,CAuB1E,CAAA;AAED,oBAAY,yBAAyB,GAAG,sBAAsB,CAAC;IAC7D,MAAM,EAAE,wBAAwB,CAAA;CACjC,CAAC,CAAA;AAEF,eAAO,MAAM,uBAAuB,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,CAuBvE,CAAA"}
package/dist/esm/contexts/Provider.js CHANGED
@@ -1,11 +1,12 @@
1
1
  import { jsx as _jsx } from "react/jsx-runtime";
2
2
  import { XyoRemoteArchivist } from '@xyo-network/api';
3
3
  import { XyoMemoryArchivist } from '@xyo-network/archivist';
4
+ import merge from 'lodash/merge';
4
5
  import { useEffect, useState } from 'react';
5
6
  import { ArchivistContext } from './Context';
6
7
  import { useArchivist } from './use';
7
8
  export const ArchivistProvider = ({ archivist: archivistProp, required = false, children }) => {
8
- const [archivist, setArchivist] = useState(archivistProp);
9
+ const [archivist, setArchivist] = useState();
9
10
  useEffect(() => {
10
11
  setArchivist(archivistProp);
11
12
  }, [archivistProp]);
@@ -17,22 +18,26 @@ export const ArchivistProvider = ({ archivist: archivistProp, required = false,
17
18
  };
18
19
  export const MemoryArchivistProvider = ({ config, ...props }) => {
19
20
  const { archivist } = useArchivist();
20
- const memoryArchivistConfig = { ...config };
21
- memoryArchivistConfig.parents = memoryArchivistConfig.parents ?? {};
22
- memoryArchivistConfig.parents.read = memoryArchivistConfig.parents.read ?? {};
23
- if (archivist) {
24
- memoryArchivistConfig.parents.read[archivist.address] = archivist;
25
- }
26
- return _jsx(ArchivistProvider, { archivist: new XyoMemoryArchivist(config), ...props });
21
+ return (_jsx(ArchivistProvider, { archivist: new XyoMemoryArchivist(merge(config, archivist
22
+ ? {
23
+ parents: {
24
+ read: {
25
+ [archivist.address]: archivist,
26
+ },
27
+ },
28
+ }
29
+ : undefined)), ...props }));
27
30
  };
28
31
  export const RemoteArchivistProvider = ({ config, ...props }) => {
29
32
  const { archivist } = useArchivist();
30
- const remoteArchivistConfig = { ...config };
31
- remoteArchivistConfig.parents = remoteArchivistConfig.parents ?? {};
32
- remoteArchivistConfig.parents.read = remoteArchivistConfig.parents.read ?? {};
33
- if (archivist) {
34
- remoteArchivistConfig.parents.read[archivist.address] = archivist;
35
- }
36
- return _jsx(ArchivistProvider, { archivist: new XyoRemoteArchivist(config), ...props });
33
+ return (_jsx(ArchivistProvider, { archivist: new XyoRemoteArchivist(merge(config, archivist
34
+ ? {
35
+ parents: {
36
+ read: {
37
+ [archivist.address]: archivist,
38
+ },
39
+ },
40
+ }
41
+ : undefined)), ...props }));
37
42
  };
38
43
  //# sourceMappingURL=Provider.js.map
package/dist/esm/contexts/Provider.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Provider.js","sourceRoot":"","sources":["../../../src/contexts/Provider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,kBAAkB,EAA4B,MAAM,kBAAkB,CAAA;AAC/E,OAAO,EAAgB,kBAAkB,EAA4B,MAAM,wBAAwB,CAAA;AAEnG,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAA;AAMpC,MAAM,CAAC,MAAM,iBAAiB,GAAqC,CAAC,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,GAAG,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC9H,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAA2B,aAAa,CAAC,CAAA;IAEnF,SAAS,CAAC,GAAG,EAAE;QACb,YAAY,CAAC,aAAa,CAAC,CAAA;IAC7B,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAA;IAEnB,OAAO,CACL,KAAC,gBAAgB,CAAC,QAAQ,IACxB,KAAK,EAAE;YACL,SAAS,EAAE,SAAS,KAAK,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;YAC9D,QAAQ,EAAE,IAAI;YACd,YAAY;SACb,YAEA,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,GACxB,CAC7B,CAAA;AACH,CAAC,CAAA;AAMD,MAAM,CAAC,MAAM,uBAAuB,GAA2C,CAAC,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IACtG,MAAM,EAAE,SAAS,EAAE,GAAG,YAAY,EAAE,CAAA;IACpC,MAAM,qBAAqB,GAA6B,EAAE,GAAG,MAAM,EAAE,CAAA;IACrE,qBAAqB,CAAC,OAAO,GAAG,qBAAqB,CAAC,OAAO,IAAI,EAAE,CAAA;IACnE,qBAAqB,CAAC,OAAO,CAAC,IAAI,GAAG,qBAAqB,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAA;IAC7E,IAAI,SAAS,EAAE;QACb,qBAAqB,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,SAAS,CAAA;KAClE;IACD,OAAO,KAAC,iBAAiB,IAAC,SAAS,EAAE,IAAI,kBAAkB,CAAC,MAAM,CAAC,KAAM,KAAK,GAAI,CAAA;AACpF,CAAC,CAAA;AAMD,MAAM,CAAC,MAAM,uBAAuB,GAAwC,CAAC,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IACnG,MAAM,EAAE,SAAS,EAAE,GAAG,YAAY,EAAE,CAAA;IACpC,MAAM,qBAAqB,GAA6B,EAAE,GAAG,MAAM,EAAE,CAAA;IACrE,qBAAqB,CAAC,OAAO,GAAG,qBAAqB,CAAC,OAAO,IAAI,EAAE,CAAA;IACnE,qBAAqB,CAAC,OAAO,CAAC,IAAI,GAAG,qBAAqB,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAA;IAC7E,IAAI,SAAS,EAAE;QACb,qBAAqB,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,SAAS,CAAA;KAClE;IACD,OAAO,KAAC,iBAAiB,IAAC,SAAS,EAAE,IAAI,kBAAkB,CAAC,MAAM,CAAC,KAAM,KAAK,GAAI,CAAA;AACpF,CAAC,CAAA"}
1
+ {"version":3,"file":"Provider.js","sourceRoot":"","sources":["../../../src/contexts/Provider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,kBAAkB,EAA4B,MAAM,kBAAkB,CAAA;AAC/E,OAAO,EAAgB,kBAAkB,EAA4B,MAAM,wBAAwB,CAAA;AAEnG,OAAO,KAAK,MAAM,cAAc,CAAA;AAChC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAA;AAMpC,MAAM,CAAC,MAAM,iBAAiB,GAAqC,CAAC,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,GAAG,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC9H,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,EAAgB,CAAA;IAE1D,SAAS,CAAC,GAAG,EAAE;QACb,YAAY,CAAC,aAAa,CAAC,CAAA;IAC7B,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAA;IAEnB,OAAO,CACL,KAAC,gBAAgB,CAAC,QAAQ,IACxB,KAAK,EAAE;YACL,SAAS,EAAE,SAAS,KAAK,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;YAC9D,QAAQ,EAAE,IAAI;YACd,YAAY;SACb,YAEA,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,GACxB,CAC7B,CAAA;AACH,CAAC,CAAA;AAMD,MAAM,CAAC,MAAM,uBAAuB,GAA2C,CAAC,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IACtG,MAAM,EAAE,SAAS,EAAE,GAAG,YAAY,EAAE,CAAA;IACpC,OAAO,CACL,KAAC,iBAAiB,IAChB,SAAS,EACP,IAAI,kBAAkB,CACpB,KAAK,CACH,MAAM,EACN,SAAS;YACP,CAAC,CAAC;gBACE,OAAO,EAAE;oBACP,IAAI,EAAE;wBACJ,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,SAAS;qBAC/B;iBACF;aACF;YACH,CAAC,CAAC,SAAS,CACd,CACF,KAEC,KAAK,GACT,CACH,CAAA;AACH,CAAC,CAAA;AAMD,MAAM,CAAC,MAAM,uBAAuB,GAAwC,CAAC,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IACnG,MAAM,EAAE,SAAS,EAAE,GAAG,YAAY,EAAE,CAAA;IACpC,OAAO,CACL,KAAC,iBAAiB,IAChB,SAAS,EACP,IAAI,kBAAkB,CACpB,KAAK,CACH,MAAM,EACN,SAAS;YACP,CAAC,CAAC;gBACE,OAAO,EAAE;oBACP,IAAI,EAAE;wBACJ,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,SAAS;qBAC/B;iBACF;aACF;YACH,CAAC,CAAC,SAAS,CACd,CACF,KAEC,KAAK,GACT,CACH,CAAA;AACH,CAAC,CAAA"}
package/package.json CHANGED
@@ -17,10 +17,11 @@
17
17
  "@xylabs/react-flexbox": "^2.14.14",
18
18
  "@xylabs/react-shared": "^2.14.14",
19
19
  "@xylabs/sdk-js": "2.6.7",
20
- "@xyo-network/api": "^2.28.0",
21
- "@xyo-network/archivist": "^2.28.0",
22
- "@xyo-network/payload": "^2.28.0",
23
- "@xyo-network/react-shared": "^2.30.3",
20
+ "@xyo-network/api": "^2.29.0-rc.1",
21
+ "@xyo-network/archivist": "^2.29.0-rc.1",
22
+ "@xyo-network/payload": "^2.29.0-rc.1",
23
+ "@xyo-network/react-shared": "^2.31.0-rc.1",
24
+ "lodash": "^4.17.21",
24
25
  "react": "^18.2.0",
25
26
  "react-dom": "^18.2.0",
26
27
  "tslib": "^2.4.0"
@@ -28,9 +29,10 @@
28
29
  "description": "Common React library for all XYO projects that use React",
29
30
  "devDependencies": {
30
31
  "@storybook/react": "^6.5.10",
31
- "@xylabs/tsconfig-dom": "^2.5.128",
32
- "@xyo-network/account": "^2.28.0",
33
- "@xyo-network/react-storybook": "^2.30.3"
32
+ "@types/lodash": "^4.14.184",
33
+ "@xylabs/tsconfig-dom": "^2.5.138",
34
+ "@xyo-network/account": "^2.29.0-rc.1",
35
+ "@xyo-network/react-storybook": "^2.31.0-rc.1"
34
36
  },
35
37
  "browser": "dist/esm/index.js",
36
38
  "docs": "dist/docs.json",
@@ -74,5 +76,6 @@
74
76
  },
75
77
  "sideEffects": false,
76
78
  "types": "dist/esm/index.d.ts",
77
- "version": "2.30.3"
79
+ "version": "2.31.0-rc.1",
80
+ "stableVersion": "2.30.5"
78
81
  }
package/src/contexts/Provider.tsx CHANGED
@@ -1,6 +1,7 @@
1
1
  import { XyoRemoteArchivist, XyoRemoteArchivistConfig } from '@xyo-network/api'
2
2
  import { XyoArchivist, XyoMemoryArchivist, XyoMemoryArchivistConfig } from '@xyo-network/archivist'
3
3
  import { ContextExProviderProps } from '@xyo-network/react-shared'
4
+ import merge from 'lodash/merge'
4
5
  import { useEffect, useState } from 'react'
5
6
 
6
7
  import { ArchivistContext } from './Context'
@@ -11,7 +12,7 @@ export type ArchivistProviderProps = ContextExProviderProps<{
11
12
  }>
12
13
 
13
14
  export const ArchivistProvider: React.FC<ArchivistProviderProps> = ({ archivist: archivistProp, required = false, children }) => {
14
- const [archivist, setArchivist] = useState<XyoArchivist | undefined>(archivistProp)
15
+ const [archivist, setArchivist] = useState<XyoArchivist>()
15
16
 
16
17
  useEffect(() => {
17
18
  setArchivist(archivistProp)
@@ -36,13 +37,27 @@ export type MemoryArchivistProviderProps = ContextExProviderProps<{
36
37
 
37
38
  export const MemoryArchivistProvider: React.FC<MemoryArchivistProviderProps> = ({ config, ...props }) => {
38
39
  const { archivist } = useArchivist()
39
- const memoryArchivistConfig: XyoMemoryArchivistConfig = { ...config }
40
- memoryArchivistConfig.parents = memoryArchivistConfig.parents ?? {}
41
- memoryArchivistConfig.parents.read = memoryArchivistConfig.parents.read ?? {}
42
- if (archivist) {
43
- memoryArchivistConfig.parents.read[archivist.address] = archivist
44
- }
45
- return <ArchivistProvider archivist={new XyoMemoryArchivist(config)} {...props} />
40
+ return (
41
+ <ArchivistProvider
42
+ archivist={
43
+ new XyoMemoryArchivist(
44
+ merge(
45
+ config,
46
+ archivist
47
+ ? {
48
+ parents: {
49
+ read: {
50
+ [archivist.address]: archivist,
51
+ },
52
+ },
53
+ }
54
+ : undefined,
55
+ ),
56
+ )
57
+ }
58
+ {...props}
59
+ />
60
+ )
46
61
  }
47
62
 
48
63
  export type ApiArchivistProviderProps = ContextExProviderProps<{
@@ -51,11 +66,25 @@ export type ApiArchivistProviderProps = ContextExProviderProps<{
51
66
 
52
67
  export const RemoteArchivistProvider: React.FC<ApiArchivistProviderProps> = ({ config, ...props }) => {
53
68
  const { archivist } = useArchivist()
54
- const remoteArchivistConfig: XyoRemoteArchivistConfig = { ...config }
55
- remoteArchivistConfig.parents = remoteArchivistConfig.parents ?? {}
56
- remoteArchivistConfig.parents.read = remoteArchivistConfig.parents.read ?? {}
57
- if (archivist) {
58
- remoteArchivistConfig.parents.read[archivist.address] = archivist
59
- }
60
- return <ArchivistProvider archivist={new XyoRemoteArchivist(config)} {...props} />
69
+ return (
70
+ <ArchivistProvider
71
+ archivist={
72
+ new XyoRemoteArchivist(
73
+ merge(
74
+ config,
75
+ archivist
76
+ ? {
77
+ parents: {
78
+ read: {
79
+ [archivist.address]: archivist,
80
+ },
81
+ },
82
+ }
83
+ : undefined,
84
+ ),
85
+ )
86
+ }
87
+ {...props}
88
+ />
89
+ )
61
90
  }