tsdf 11.1.2 → 11.1.4

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/main.cjs CHANGED
@@ -115,6 +115,10 @@ function createFetchOrquestrator({
115
115
  lastFetchWasAborted = abort;
116
116
  return abort;
117
117
  }
118
+ if (fetchs.b) {
119
+ clearTimeout(fetchs.b.timeoutId);
120
+ fetchs.b = null;
121
+ }
118
122
  const success = await fetchFn(
119
123
  {
120
124
  shouldAbort,
@@ -130,8 +134,9 @@ function createFetchOrquestrator({
130
134
  if (success) {
131
135
  lastFetchDuration = Date.now() - startTime;
132
136
  }
133
- if (currentFetchs.b) {
134
- clearTimeout(currentFetchs.b.timeoutId);
137
+ const rtScheduled = fetchs.b;
138
+ if (rtScheduled) {
139
+ clearTimeout(rtScheduled.timeoutId);
135
140
  fetchs.b = null;
136
141
  }
137
142
  const onEnd = currentFetchs.a.onEnd;
@@ -471,10 +476,13 @@ function newTSDFDocumentStore({
471
476
  if (wasAborted) {
472
477
  return { data: null, error: errorNormalizer(new Error("Aborted")) };
473
478
  }
479
+ if (store.state.error) {
480
+ return { data: null, error: store.state.error };
481
+ }
474
482
  if (!store.state.data) {
475
- return { data: null, error: errorNormalizer(new Error("No data")) };
483
+ return { data: null, error: errorNormalizer(new Error("Not found")) };
476
484
  }
477
- return store.state.error ? { data: null, error: store.state.error } : { data: store.state.data, error: null };
485
+ return { data: store.state.data, error: null };
478
486
  }
479
487
  const storeEvents = (0, import_mitt2.default)();
480
488
  let invalidationWasTriggered = false;
@@ -555,6 +563,8 @@ function newTSDFDocumentStore({
555
563
  return useModifyResult(storeState);
556
564
  }
557
565
  function updateState(produceNewData) {
566
+ if (!store.state.data)
567
+ return false;
558
568
  store.setKey(
559
569
  "data",
560
570
  (current) => {
@@ -564,6 +574,7 @@ function newTSDFDocumentStore({
564
574
  },
565
575
  { action: "update-state" }
566
576
  );
577
+ return true;
567
578
  }
568
579
  return {
569
580
  store,
@@ -753,10 +764,13 @@ function newTSDFCollectionStore({
753
764
  return { data: null, error: errorNormalizer(new Error("Aborted")) };
754
765
  }
755
766
  const item = store.state[itemId];
767
+ if (item?.error) {
768
+ return { data: null, error: item.error };
769
+ }
756
770
  if (!item?.data) {
757
771
  return { data: null, error: errorNormalizer(new Error("Not found")) };
758
772
  }
759
- return item.error ? { data: null, error: item.error } : { data: item.data, error: null };
773
+ return { data: item.data, error: null };
760
774
  }
761
775
  function getItemsKeyArray(params) {
762
776
  const items = store.state;
@@ -1274,6 +1288,13 @@ function newTSDFListQueryStore({
1274
1288
  };
1275
1289
  }
1276
1290
  const query = store.state.queries[queryKey];
1291
+ if (query?.error) {
1292
+ return {
1293
+ items: [],
1294
+ error: query.error,
1295
+ hasMore: query.hasMore
1296
+ };
1297
+ }
1277
1298
  if (!query) {
1278
1299
  return {
1279
1300
  items: [],
@@ -1281,7 +1302,7 @@ function newTSDFListQueryStore({
1281
1302
  hasMore: false
1282
1303
  };
1283
1304
  }
1284
- return query.error ? { items: [], error: query.error, hasMore: query.hasMore } : {
1305
+ return {
1285
1306
  items: getQueryItems(query, (data, itemPayload) => ({
1286
1307
  data,
1287
1308
  itemPayload
@@ -1300,10 +1321,13 @@ function newTSDFListQueryStore({
1300
1321
  }
1301
1322
  const item = store.state.items[itemKey];
1302
1323
  const itemQuery = store.state.itemQueries[itemKey];
1324
+ if (itemQuery?.error) {
1325
+ return { data: null, error: itemQuery.error };
1326
+ }
1303
1327
  if (!itemQuery || !item) {
1304
1328
  return { data: null, error: errorNormalizer(new Error("Not found")) };
1305
1329
  }
1306
- return itemQuery.error ? { data: null, error: itemQuery.error } : { data: item, error: null };
1330
+ return { data: item, error: null };
1307
1331
  }
1308
1332
  function getQueriesKeyArray(payloads) {
1309
1333
  if (Array.isArray(payloads)) {
package/dist/main.d.ts CHANGED
@@ -49,7 +49,7 @@ declare function newTSDFDocumentStore<State extends ValidStoreState, NError>({ d
49
49
  ensureIsLoaded?: boolean | undefined;
50
50
  returnRefetchingStatus?: boolean | undefined;
51
51
  }) => Readonly<TSDFUseDocumentReturn<Selected, NError>>;
52
- updateState: (produceNewData: (draftData: State) => State | void | undefined) => void;
52
+ updateState: (produceNewData: (draftData: State) => State | void | undefined) => boolean;
53
53
  startMutation: () => () => boolean;
54
54
  };
55
55
  type TSDFDocumentStore<State extends ValidStoreState, NError> = ReturnType<typeof newTSDFDocumentStore<State, NError>>;
package/dist/main.js CHANGED
@@ -77,6 +77,10 @@ function createFetchOrquestrator({
77
77
  lastFetchWasAborted = abort;
78
78
  return abort;
79
79
  }
80
+ if (fetchs.b) {
81
+ clearTimeout(fetchs.b.timeoutId);
82
+ fetchs.b = null;
83
+ }
80
84
  const success = await fetchFn(
81
85
  {
82
86
  shouldAbort,
@@ -92,8 +96,9 @@ function createFetchOrquestrator({
92
96
  if (success) {
93
97
  lastFetchDuration = Date.now() - startTime;
94
98
  }
95
- if (currentFetchs.b) {
96
- clearTimeout(currentFetchs.b.timeoutId);
99
+ const rtScheduled = fetchs.b;
100
+ if (rtScheduled) {
101
+ clearTimeout(rtScheduled.timeoutId);
97
102
  fetchs.b = null;
98
103
  }
99
104
  const onEnd = currentFetchs.a.onEnd;
@@ -433,10 +438,13 @@ function newTSDFDocumentStore({
433
438
  if (wasAborted) {
434
439
  return { data: null, error: errorNormalizer(new Error("Aborted")) };
435
440
  }
441
+ if (store.state.error) {
442
+ return { data: null, error: store.state.error };
443
+ }
436
444
  if (!store.state.data) {
437
- return { data: null, error: errorNormalizer(new Error("No data")) };
445
+ return { data: null, error: errorNormalizer(new Error("Not found")) };
438
446
  }
439
- return store.state.error ? { data: null, error: store.state.error } : { data: store.state.data, error: null };
447
+ return { data: store.state.data, error: null };
440
448
  }
441
449
  const storeEvents = mitt2();
442
450
  let invalidationWasTriggered = false;
@@ -517,6 +525,8 @@ function newTSDFDocumentStore({
517
525
  return useModifyResult(storeState);
518
526
  }
519
527
  function updateState(produceNewData) {
528
+ if (!store.state.data)
529
+ return false;
520
530
  store.setKey(
521
531
  "data",
522
532
  (current) => {
@@ -526,6 +536,7 @@ function newTSDFDocumentStore({
526
536
  },
527
537
  { action: "update-state" }
528
538
  );
539
+ return true;
529
540
  }
530
541
  return {
531
542
  store,
@@ -715,10 +726,13 @@ function newTSDFCollectionStore({
715
726
  return { data: null, error: errorNormalizer(new Error("Aborted")) };
716
727
  }
717
728
  const item = store.state[itemId];
729
+ if (item?.error) {
730
+ return { data: null, error: item.error };
731
+ }
718
732
  if (!item?.data) {
719
733
  return { data: null, error: errorNormalizer(new Error("Not found")) };
720
734
  }
721
- return item.error ? { data: null, error: item.error } : { data: item.data, error: null };
735
+ return { data: item.data, error: null };
722
736
  }
723
737
  function getItemsKeyArray(params) {
724
738
  const items = store.state;
@@ -1236,6 +1250,13 @@ function newTSDFListQueryStore({
1236
1250
  };
1237
1251
  }
1238
1252
  const query = store.state.queries[queryKey];
1253
+ if (query?.error) {
1254
+ return {
1255
+ items: [],
1256
+ error: query.error,
1257
+ hasMore: query.hasMore
1258
+ };
1259
+ }
1239
1260
  if (!query) {
1240
1261
  return {
1241
1262
  items: [],
@@ -1243,7 +1264,7 @@ function newTSDFListQueryStore({
1243
1264
  hasMore: false
1244
1265
  };
1245
1266
  }
1246
- return query.error ? { items: [], error: query.error, hasMore: query.hasMore } : {
1267
+ return {
1247
1268
  items: getQueryItems(query, (data, itemPayload) => ({
1248
1269
  data,
1249
1270
  itemPayload
@@ -1262,10 +1283,13 @@ function newTSDFListQueryStore({
1262
1283
  }
1263
1284
  const item = store.state.items[itemKey];
1264
1285
  const itemQuery = store.state.itemQueries[itemKey];
1286
+ if (itemQuery?.error) {
1287
+ return { data: null, error: itemQuery.error };
1288
+ }
1265
1289
  if (!itemQuery || !item) {
1266
1290
  return { data: null, error: errorNormalizer(new Error("Not found")) };
1267
1291
  }
1268
- return itemQuery.error ? { data: null, error: itemQuery.error } : { data: item, error: null };
1292
+ return { data: item, error: null };
1269
1293
  }
1270
1294
  function getQueriesKeyArray(payloads) {
1271
1295
  if (Array.isArray(payloads)) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "tsdf",
3
- "version": "11.1.2",
3
+ "version": "11.1.4",
4
4
  "description": "A data fetching solution based on t-state",
5
5
  "license": "MIT",
6
6
  "author": "Lucas Santos",