Skip to content

Commit cd9cf9c

Browse files
committed
[objarr] Used encoded strings in persisters
1 parent b30787a commit cd9cf9c

4 files changed

Lines changed: 39 additions & 17 deletions

File tree

src/persisters/common/create.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,20 +75,18 @@ const getStoreFunctions = (
7575
persist != PersistsValues.StoreOnly && store.isMergeable()
7676
? [
7777
1,
78-
(store as MergeableStore).getMergeableContent,
78+
(store as any).getEncodedMergeableContent,
7979
() =>
80-
(store as MergeableStore).getTransactionMergeableChanges(
81-
!isSynchronizer,
82-
),
80+
(store as any).getEncodedTransactionMergeableChanges(!isSynchronizer),
8381
([[changedTables], [changedValues]]: MergeableChanges) =>
8482
!objIsEmpty(changedTables) || !objIsEmpty(changedValues),
8583
(store as MergeableStore).setDefaultContent,
8684
]
8785
: persist != PersistsValues.MergeableStoreOnly
8886
? [
8987
0,
90-
store.getContent,
91-
store.getTransactionChanges,
88+
(store as any).getEncodedContent,
89+
(store as any).getEncodedTransactionChanges,
9290
([changedTables, changedValues]: Changes) =>
9391
!objIsEmpty(changedTables) || !objIsEmpty(changedValues),
9492
store.setContent,

test/unit/persisters/database/json.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ describe.each(Object.entries(ALL_VARIANTS))(
195195
_id: '_',
196196
store:
197197
// eslint-disable-next-line max-len
198-
'[{"t1":{"r1":{"c1":{"k1":"v"},"c2":[1,2,3]}}},{"v1":{"x":1},"v2":[4,5]}]',
198+
'[{"t1":{"r1":{"c1":"\uFFFD{\\"k1\\":\\"v\\"}","c2":"\uFFFD[1,2,3]"}}},{"v1":"\uFFFD{\\"x\\":1}","v2":"\uFFFD[4,5]"}]',
199199
},
200200
],
201201
],

test/unit/persisters/persisters.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ describe.each([
9999
.setValues({v1: {x: 1}, v2: [4, 5]});
100100
await persister.save();
101101
expect(await persistable.get(location)).toEqual([
102-
{t1: {r1: {c1: {k1: 'v'}, c2: [1, 2, 3]}}},
103-
{v1: {x: 1}, v2: [4, 5]},
102+
{t1: {r1: {c1: '�{"k1":"v"}', c2: '�[1,2,3]'}}},
103+
{v1: '�{"x":1}', v2: '�[4,5]'},
104104
]);
105105
store.delTables().delValues();
106106
await persister.load();

test/unit/synchronizers/__snapshots__/synchronizers.test.ts.snap

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2346,12 +2346,18 @@ exports[`Syncs to/from BroadcastChannelSynchronizer > Bidirectional, data alread
23462346
"r1": [
23472347
{
23482348
"c1": [
2349-
"�{"k1":"v"}",
2349+
{
2350+
"k1": "v",
2351+
},
23502352
"Nn1JUF-----7JQY8",
23512353
4180514038,
23522354
],
23532355
"c2": [
2354-
"�[1,2,3]",
2356+
[
2357+
1,
2358+
2,
2359+
3,
2360+
],
23552361
"Nn1JUF-----4JQFF",
23562362
3823624040,
23572363
],
@@ -6757,12 +6763,18 @@ exports[`Syncs to/from Custom Synchronizer > Bidirectional, data already present
67576763
"r1": [
67586764
{
67596765
"c1": [
6760-
"�{"k1":"v"}",
6766+
{
6767+
"k1": "v",
6768+
},
67616769
"Nn1JUF-----7JQY8",
67626770
4180514038,
67636771
],
67646772
"c2": [
6765-
"�[1,2,3]",
6773+
[
6774+
1,
6775+
2,
6776+
3,
6777+
],
67666778
"Nn1JUF-----4JQFF",
67676779
3823624040,
67686780
],
@@ -10606,12 +10618,18 @@ exports[`Syncs to/from LocalSynchronizer > Bidirectional, data already present >
1060610618
"r1": [
1060710619
{
1060810620
"c1": [
10609-
"�{"k1":"v"}",
10621+
{
10622+
"k1": "v",
10623+
},
1061010624
"Nn1JUF-----7JQY8",
1061110625
4180514038,
1061210626
],
1061310627
"c2": [
10614-
"�[1,2,3]",
10628+
[
10629+
1,
10630+
2,
10631+
3,
10632+
],
1061510633
"Nn1JUF-----4JQFF",
1061610634
3823624040,
1061710635
],
@@ -14455,12 +14473,18 @@ exports[`Syncs to/from WsSynchronizer > Bidirectional, data already present > ob
1445514473
"r1": [
1445614474
{
1445714475
"c1": [
14458-
"�{"k1":"v"}",
14476+
{
14477+
"k1": "v",
14478+
},
1445914479
"Nn1JUF-----7JQY8",
1446014480
4180514038,
1446114481
],
1446214482
"c2": [
14463-
"�[1,2,3]",
14483+
[
14484+
1,
14485+
2,
14486+
3,
14487+
],
1446414488
"Nn1JUF-----4JQFF",
1446514489
3823624040,
1446614490
],

0 commit comments

Comments
 (0)