@legendapp/state 3.0.0-beta.6 → 3.0.0-beta.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 (5) hide show
  1. package/package.json +1 -1
  2. package/persist-plugins/async-storage.js +8 -3
  3. package/persist-plugins/async-storage.mjs +8 -3
  4. package/sync-plugins/crud.js +22 -24
  5. package/sync-plugins/crud.mjs +22 -24
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@legendapp/state",
3
- "version": "3.0.0-beta.6",
3
+ "version": "3.0.0-beta.8",
4
4
  "description": "legend-state",
5
5
  "sideEffects": false,
6
6
  "private": false,
package/persist-plugins/async-storage.js CHANGED
@@ -21,7 +21,10 @@ var ObservablePersistAsyncStorage = class {
21
21
  if (preload === true) {
22
22
  tables = await AsyncStorage.getAllKeys();
23
23
  } else if (state.isArray(preload)) {
24
- tables = preload;
24
+ const metadataTables = preload.map(
25
+ (table) => table.endsWith(MetadataSuffix) ? void 0 : table + MetadataSuffix
26
+ );
27
+ tables = [...preload, ...metadataTables.filter(Boolean)];
25
28
  }
26
29
  if (tables) {
27
30
  const values = await AsyncStorage.multiGet(tables);
@@ -40,8 +43,10 @@ var ObservablePersistAsyncStorage = class {
40
43
  if (this.data[table] === void 0) {
41
44
  try {
42
45
  return (async () => {
43
- const value = await AsyncStorage.getItem(table);
44
- this.data[table] = value ? safeParse(value) : void 0;
46
+ const values = await AsyncStorage.multiGet([table, table + MetadataSuffix]);
47
+ values.forEach(([table2, value]) => {
48
+ this.data[table2] = value ? safeParse(value) : void 0;
49
+ });
45
50
  })();
46
51
  } catch (e) {
47
52
  console.error("[legend-state] ObservablePersistLocalAsyncStorage failed to parse", table);
package/persist-plugins/async-storage.mjs CHANGED
@@ -19,7 +19,10 @@ var ObservablePersistAsyncStorage = class {
19
19
  if (preload === true) {
20
20
  tables = await AsyncStorage.getAllKeys();
21
21
  } else if (isArray(preload)) {
22
- tables = preload;
22
+ const metadataTables = preload.map(
23
+ (table) => table.endsWith(MetadataSuffix) ? void 0 : table + MetadataSuffix
24
+ );
25
+ tables = [...preload, ...metadataTables.filter(Boolean)];
23
26
  }
24
27
  if (tables) {
25
28
  const values = await AsyncStorage.multiGet(tables);
@@ -38,8 +41,10 @@ var ObservablePersistAsyncStorage = class {
38
41
  if (this.data[table] === void 0) {
39
42
  try {
40
43
  return (async () => {
41
- const value = await AsyncStorage.getItem(table);
42
- this.data[table] = value ? safeParse(value) : void 0;
44
+ const values = await AsyncStorage.multiGet([table, table + MetadataSuffix]);
45
+ values.forEach(([table2, value]) => {
46
+ this.data[table2] = value ? safeParse(value) : void 0;
47
+ });
43
48
  })();
44
49
  } catch (e) {
45
50
  console.error("[legend-state] ObservablePersistLocalAsyncStorage failed to parse", table);
package/sync-plugins/crud.js CHANGED
@@ -256,40 +256,38 @@ function syncedCrud(props) {
256
256
  const saveResult = async (itemKey, input, data, isCreate) => {
257
257
  var _a;
258
258
  if (data) {
259
- const saved = (transform == null ? void 0 : transform.load) ? await transform.load(data, "set") : data;
259
+ let saved = (transform == null ? void 0 : transform.load) ? await transform.load(data, "set") : data;
260
260
  const isChild = itemKey !== "undefined" && asType !== "value";
261
261
  const currentPeeked = state.getNodeValue(node);
262
262
  const currentValue = isChild ? (_a = asType === "array" && state.isArray(currentPeeked) ? currentPeeked.find((v) => v[fieldId] === itemKey) : void 0) != null ? _a : currentPeeked[itemKey] : currentPeeked;
263
- const dataOnSaved = {
264
- saved,
265
- input,
266
- currentValue,
267
- isCreate,
268
- props
269
- };
270
- let savedOut = saved;
271
- if (savedOut && !state.isNullOrUndefined(currentValue)) {
272
- savedOut = clone(savedOut);
273
- Object.keys(savedOut).forEach((key) => {
263
+ if (saved && !state.isNullOrUndefined(currentValue)) {
264
+ if (onSaved) {
265
+ const ret = onSaved({
266
+ saved,
267
+ input,
268
+ currentValue,
269
+ isCreate,
270
+ props
271
+ });
272
+ if (ret) {
273
+ saved = ret;
274
+ }
275
+ }
276
+ saved = clone(saved);
277
+ Object.keys(saved).forEach((key) => {
274
278
  const i = input[key];
275
279
  const c = currentValue[key];
276
280
  if (
277
281
  // value is already the new value, can ignore
278
- savedOut[key] === c || // user has changed local value
279
- key !== "id" && i !== c
282
+ saved[key] === c || // user has changed local value
283
+ key !== fieldId && i !== c
280
284
  ) {
281
- delete savedOut[key];
285
+ delete saved[key];
282
286
  }
283
287
  });
284
- if (onSaved) {
285
- const ret = onSaved(dataOnSaved);
286
- if (ret) {
287
- savedOut = ret;
288
- }
289
- }
290
- const createdAt = fieldCreatedAt ? savedOut[fieldCreatedAt] : void 0;
291
- const updatedAt = fieldUpdatedAt ? savedOut[fieldUpdatedAt] : void 0;
292
- const value2 = itemKey !== "undefined" && asType !== "value" ? { [itemKey]: savedOut } : savedOut;
288
+ const createdAt = fieldCreatedAt ? saved[fieldCreatedAt] : void 0;
289
+ const updatedAt = fieldUpdatedAt ? saved[fieldUpdatedAt] : void 0;
290
+ const value2 = itemKey !== "undefined" && asType !== "value" ? { [itemKey]: saved } : saved;
293
291
  update({
294
292
  value: value2,
295
293
  lastSync: updatedAt || createdAt ? +new Date(updatedAt || createdAt) : void 0,
package/sync-plugins/crud.mjs CHANGED
@@ -254,40 +254,38 @@ function syncedCrud(props) {
254
254
  const saveResult = async (itemKey, input, data, isCreate) => {
255
255
  var _a;
256
256
  if (data) {
257
- const saved = (transform == null ? void 0 : transform.load) ? await transform.load(data, "set") : data;
257
+ let saved = (transform == null ? void 0 : transform.load) ? await transform.load(data, "set") : data;
258
258
  const isChild = itemKey !== "undefined" && asType !== "value";
259
259
  const currentPeeked = getNodeValue(node);
260
260
  const currentValue = isChild ? (_a = asType === "array" && isArray(currentPeeked) ? currentPeeked.find((v) => v[fieldId] === itemKey) : void 0) != null ? _a : currentPeeked[itemKey] : currentPeeked;
261
- const dataOnSaved = {
262
- saved,
263
- input,
264
- currentValue,
265
- isCreate,
266
- props
267
- };
268
- let savedOut = saved;
269
- if (savedOut && !isNullOrUndefined(currentValue)) {
270
- savedOut = clone(savedOut);
271
- Object.keys(savedOut).forEach((key) => {
261
+ if (saved && !isNullOrUndefined(currentValue)) {
262
+ if (onSaved) {
263
+ const ret = onSaved({
264
+ saved,
265
+ input,
266
+ currentValue,
267
+ isCreate,
268
+ props
269
+ });
270
+ if (ret) {
271
+ saved = ret;
272
+ }
273
+ }
274
+ saved = clone(saved);
275
+ Object.keys(saved).forEach((key) => {
272
276
  const i = input[key];
273
277
  const c = currentValue[key];
274
278
  if (
275
279
  // value is already the new value, can ignore
276
- savedOut[key] === c || // user has changed local value
277
- key !== "id" && i !== c
280
+ saved[key] === c || // user has changed local value
281
+ key !== fieldId && i !== c
278
282
  ) {
279
- delete savedOut[key];
283
+ delete saved[key];
280
284
  }
281
285
  });
282
- if (onSaved) {
283
- const ret = onSaved(dataOnSaved);
284
- if (ret) {
285
- savedOut = ret;
286
- }
287
- }
288
- const createdAt = fieldCreatedAt ? savedOut[fieldCreatedAt] : void 0;
289
- const updatedAt = fieldUpdatedAt ? savedOut[fieldUpdatedAt] : void 0;
290
- const value2 = itemKey !== "undefined" && asType !== "value" ? { [itemKey]: savedOut } : savedOut;
286
+ const createdAt = fieldCreatedAt ? saved[fieldCreatedAt] : void 0;
287
+ const updatedAt = fieldUpdatedAt ? saved[fieldUpdatedAt] : void 0;
288
+ const value2 = itemKey !== "undefined" && asType !== "value" ? { [itemKey]: saved } : saved;
291
289
  update({
292
290
  value: value2,
293
291
  lastSync: updatedAt || createdAt ? +new Date(updatedAt || createdAt) : void 0,