@futdevpro/fsm-dynamo 1.20.184 → 1.20.185

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.
@@ -95,10 +95,22 @@ export declare abstract class DyFM_DataHandler_ControlModel<T extends DyFM_Metad
95
95
  protected dependency_DH?: DyFM_DataHandler_ControlModel<unknown, unknown, unknown>;
96
96
  /** BFR-CREDIT-117 - a clear in progress (a cyclic dependency is cleared once). */
97
97
  private isClearing;
98
+ /**
99
+ * BFR-FLEET-078 - the number of the latest load; a new load and a `clear()` move it. The answer of an older load
100
+ * (superseded by a newer one, or by a clear, e.g. a logout) changes nothing: no data, no loaded state.
101
+ */
102
+ private loadGeneration;
98
103
  /** BFR-ORGANIZER-040 - the dependency's current `_id`, as this handler's key (`undefined`: none). */
99
104
  private dependencyLoadBy;
100
105
  /** BFR-ORGANIZER-040 - the `_id` of a loaded data (`undefined` when it has none). */
101
106
  protected static idOf(data: unknown): string | undefined;
107
+ /** BFR-FLEET-078 - whether the load of this generation was superseded (`undefined`: not a load, never). */
108
+ private isSupersededLoad;
109
+ /**
110
+ * BFR-FLEET-078 - what the caller of a superseded load gets: the newer load's result (it is in flight), else the
111
+ * current data (the newer load is done, or the handler was cleared).
112
+ */
113
+ private supersededResult;
102
114
  /** @deprecated Use isDebugLogEnabled; debugLog remains the serialized compatibility key. */
103
115
  debugLog?: DyFM_DeprecatedBooleanAlias;
104
116
  /** Naming-conformant alias for debugLog; it is intentionally not serialized. */
@@ -142,7 +154,13 @@ export declare abstract class DyFM_DataHandler_ControlModel<T extends DyFM_Metad
142
154
  silentMissingId?: boolean;
143
155
  }): Promise<T>;
144
156
  getData(): Promise<T>;
145
- protected doReloadDataBy(loadedBy: T_LoadBy): Promise<T>;
157
+ /**
158
+ * Loads by the key and applies the answer, unless the load was superseded meanwhile (BFR-FLEET-078).
159
+ *
160
+ * @param loadedBy the key
161
+ * @param generation the load's number (`reloadData` gives it; a direct call starts a new one)
162
+ */
163
+ protected doReloadDataBy(loadedBy: T_LoadBy, generation?: number): Promise<T>;
146
164
  /**
147
165
  * A DataHandler adatának közvetlen frissítése egy már ismert value-val, szerver-round-trip NÉLKÜL
148
166
  * (pl. login-response → user_DH.updateData). Alapból CSAK a saját data_BS-t frissíti.
@@ -160,7 +178,15 @@ export declare abstract class DyFM_DataHandler_ControlModel<T extends DyFM_Metad
160
178
  * dependents are really reached now - a cyclic dependency is cleared once (`isClearing`), not endlessly.
161
179
  */
162
180
  clear(dontClearDependents?: boolean): void;
163
- protected processLoadResult(result: any, loadedBy: T_LoadBy): Promise<T>;
181
+ /**
182
+ * Runs the post-processes on a loaded answer and applies it. BFR-FLEET-078: a superseded load stops before the
183
+ * next post-process (they reload or clear the dependents) and is not applied.
184
+ *
185
+ * @param result the answer of the `get`
186
+ * @param loadedBy the key
187
+ * @param generation the load's number (`undefined`: applied whatever happened meanwhile, as before)
188
+ */
189
+ protected processLoadResult(result: any, loadedBy: T_LoadBy, generation?: number): Promise<T>;
164
190
  private resolveWaitsOnLoad;
165
191
  /**
166
192
  * waits for the first load to finish
@@ -1 +1 @@
1
- {"version":3,"file":"data-handler.control-model.d.ts","sourceRoot":"","sources":["../../../../src/_modules/data-handler/_models/data-handler.control-model.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"data-handler.control-model.d.ts","sourceRoot":"","sources":["../../../../src/_modules/data-handler/_models/data-handler.control-model.ts"],"names":[],"mappings":"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"}
@@ -78,6 +78,11 @@ class DyFM_DataHandler_ControlModel {
78
78
  dependency_DH;
79
79
  /** BFR-CREDIT-117 - a clear in progress (a cyclic dependency is cleared once). */
80
80
  isClearing = false;
81
+ /**
82
+ * BFR-FLEET-078 - the number of the latest load; a new load and a `clear()` move it. The answer of an older load
83
+ * (superseded by a newer one, or by a clear, e.g. a logout) changes nothing: no data, no loaded state.
84
+ */
85
+ loadGeneration = 0;
81
86
  /** BFR-ORGANIZER-040 - the dependency's current `_id`, as this handler's key (`undefined`: none). */
82
87
  dependencyLoadBy() {
83
88
  const data = this.dependency_DH?.data;
@@ -89,6 +94,18 @@ class DyFM_DataHandler_ControlModel {
89
94
  ? data._id
90
95
  : undefined;
91
96
  }
97
+ /** BFR-FLEET-078 - whether the load of this generation was superseded (`undefined`: not a load, never). */
98
+ isSupersededLoad(generation) {
99
+ return generation !== undefined && generation !== this.loadGeneration;
100
+ }
101
+ /**
102
+ * BFR-FLEET-078 - what the caller of a superseded load gets: the newer load's result (it is in flight), else the
103
+ * current data (the newer load is done, or the handler was cleared).
104
+ */
105
+ async supersededResult() {
106
+ const inFlight = this.loadInProgress_BS.value;
107
+ return inFlight ? await inFlight.progress : this.data;
108
+ }
92
109
  /** @deprecated Use isDebugLogEnabled; debugLog remains the serialized compatibility key. */
93
110
  debugLog;
94
111
  /**
@@ -244,6 +261,8 @@ class DyFM_DataHandler_ControlModel {
244
261
  async reloadData(loadBy, opts) {
245
262
  /** BFR-MASTERPROMPTER-128 — the missing-ID error of THIS call (silenced by `silentMissingId` in the catch too). */
246
263
  let missingIdError;
264
+ /** BFR-FLEET-078 — the generation of the load this call started or joined (`undefined`: none). */
265
+ let generation;
247
266
  try {
248
267
  const loadInProgress = this.loadInProgress_BS.value;
249
268
  const useLoadBy = loadBy ??
@@ -270,28 +289,38 @@ class DyFM_DataHandler_ControlModel {
270
289
  // BFR-MASTERPROMPTER-074: a second call for the SAME key awaits the load in flight. Returning `this.data`
271
290
  // here handed the caller the not-yet-loaded (undefined / stale) value - measured: MP "Create Flow" during the
272
291
  // first `loadMyFlows()` got `undefined` and crashed on `myFlows.find`. Same contract as `getData()`.
292
+ // BFR-FLEET-078: the joined load is the latest one
293
+ generation = this.loadGeneration;
273
294
  return await loadInProgress.progress;
274
295
  }
275
296
  if (this.debugLog) {
276
297
  console.log(`DYNAMO DH.reloadData (${this.name}) DEBUG:` +
277
298
  `\n DataHandler reloadData... (using id: ${useLoadBy})`);
278
299
  }
279
- const loadProgress = this.doReloadDataBy(useLoadBy);
300
+ generation = ++this.loadGeneration;
301
+ const loadGeneration = generation;
302
+ const loadProgress = this.doReloadDataBy(useLoadBy, loadGeneration);
280
303
  this.loadInProgress_BS.next({
281
304
  loadBy: useLoadBy,
282
305
  progress: loadProgress
283
306
  });
284
307
  // clears the in-flight marker on BOTH outcomes; `.finally()` returned a derived promise that rejected unhandled on
285
- // every failed load (an "Uncaught (in promise)" beside the real error) — the caller already receives the error
308
+ // every failed load (an "Uncaught (in promise)" beside the real error) — the caller already receives the error.
309
+ // BFR-FLEET-078: only its own marker (a superseded load must not clear the newer load's)
286
310
  const clearInProgress = () => {
287
- this.loadInProgress_BS.next(false);
311
+ if (!this.isSupersededLoad(loadGeneration)) {
312
+ this.loadInProgress_BS.next(false);
313
+ }
288
314
  };
289
315
  loadProgress.then(clearInProgress, clearInProgress);
290
316
  return await loadProgress;
291
317
  }
292
318
  catch (error) {
293
- this.loadInProgress_BS.next(false);
294
- this.loaded_BS.next(false);
319
+ // BFR-FLEET-078: a superseded load (a newer one started, or the handler was cleared) fails only for its caller
320
+ if (!this.isSupersededLoad(generation)) {
321
+ this.loadInProgress_BS.next(false);
322
+ this.loaded_BS.next(false);
323
+ }
295
324
  // BFR-MASTERPROMPTER-128 — the silenced missing-ID error (the `getData` not-loaded-yet path) is not logged here
296
325
  // either: it still THROWS, only the "reloadData was UNSUCCESSFUL" line is left out
297
326
  const silenced = !!opts?.silentMissingId && !!missingIdError && error === missingIdError;
@@ -320,10 +349,16 @@ class DyFM_DataHandler_ControlModel {
320
349
  return this.data;
321
350
  }
322
351
  }
323
- async doReloadDataBy(loadedBy) {
352
+ /**
353
+ * Loads by the key and applies the answer, unless the load was superseded meanwhile (BFR-FLEET-078).
354
+ *
355
+ * @param loadedBy the key
356
+ * @param generation the load's number (`reloadData` gives it; a direct call starts a new one)
357
+ */
358
+ async doReloadDataBy(loadedBy, generation = ++this.loadGeneration) {
324
359
  try {
325
360
  this.lastLoadedBy = loadedBy;
326
- return await this.processLoadResult(await this.get(loadedBy), loadedBy);
361
+ return await this.processLoadResult(await this.get(loadedBy), loadedBy, generation);
327
362
  }
328
363
  catch (error) {
329
364
  this.resolveWaitsOnLoad();
@@ -370,6 +405,9 @@ class DyFM_DataHandler_ControlModel {
370
405
  }
371
406
  this.isClearing = true;
372
407
  try {
408
+ // BFR-FLEET-078: the answer of a load in flight is not applied any more, and a new load does not wait for it
409
+ this.loadGeneration++;
410
+ this.loadInProgress_BS.next(false);
373
411
  this.data_BS.next(undefined);
374
412
  this.lastLoadedBy = undefined;
375
413
  if (!dontClearDependents) {
@@ -382,13 +420,24 @@ class DyFM_DataHandler_ControlModel {
382
420
  this.isClearing = false;
383
421
  }
384
422
  }
385
- async processLoadResult(result, loadedBy) {
423
+ /**
424
+ * Runs the post-processes on a loaded answer and applies it. BFR-FLEET-078: a superseded load stops before the
425
+ * next post-process (they reload or clear the dependents) and is not applied.
426
+ *
427
+ * @param result the answer of the `get`
428
+ * @param loadedBy the key
429
+ * @param generation the load's number (`undefined`: applied whatever happened meanwhile, as before)
430
+ */
431
+ async processLoadResult(result, loadedBy, generation) {
386
432
  if (this.debugLog) {
387
433
  console.log(`DYNAMO DH.processLoadResult (${this.name}) DEBUG:` +
388
434
  `\n DataHandler processLoadResult... (using id: ${loadedBy})` +
389
435
  `\n Result:`, result);
390
436
  }
391
437
  for (const postProcess of this.getPostProcesses) {
438
+ if (this.isSupersededLoad(generation)) {
439
+ return await this.supersededResult();
440
+ }
392
441
  if (this.debugLog) {
393
442
  console.log(`DYNAMO DH.processLoadResult (${this.name}) DEBUG:` +
394
443
  `\n Post process:`, postProcess);
@@ -399,6 +448,9 @@ class DyFM_DataHandler_ControlModel {
399
448
  `\nPost process returned null or undefined!`, '\n\n', new Error());
400
449
  }
401
450
  }
451
+ if (this.isSupersededLoad(generation)) {
452
+ return await this.supersededResult();
453
+ }
402
454
  this.data_BS.next(result);
403
455
  this.loaded_BS.next(true);
404
456
  this.resolveWaitsOnLoad();
@@ -1 +1 @@
1
- {"version":3,"file":"data-handler.control-model.js","sourceRoot":"","sources":["../../../../src/_modules/data-handler/_models/data-handler.control-model.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"data-handler.control-model.js","sourceRoot":"","sources":["../../../../src/_modules/data-handler/_models/data-handler.control-model.ts"],"names":[],"mappings":";;;AAAA,+BAAmD;AAEnD,gCAAwF;AAkBxF;;;;;;;;;;;;;;;GAeG;AACH,MAAsB,6BAA6B;IAKjD,IAAI,CAAS;IAEb;;;OAGG;IACgB,OAAO,CAAqB;IAE/C;;;OAGG;IACM,KAAK,CAAgB;IAE9B;;;OAGG;IACgB,SAAS,CAA2B;IAEvD;;OAEG;IACM,OAAO,CAAsB;IAEtC;;;OAGG;IACgB,iBAAiB,CAAwE;IAE5G;;OAEG;IACM,eAAe,CAAmE;IAQ3F;;OAEG;IACH,YAAY,CAAW,CAAC,YAAY;IACpC,aAAa,CAAW,CAAC,YAAY;IAErC,qDAAqD;IAClC,GAAG,CAAsC;IAC5D,4DAA4D;IACzC,GAAG,CAA0B;IAChD,6DAA6D;IAC7D,qCAAqC;IAErC,OAAO;IACP,0BAA0B;IAE1B;;;OAGG;IACgB,gBAAgB,GAAoD,EAAE,CAAC;IAE1F,kFAAkF;IAClF,IAAI,CAA+B;IAInC,WAAW,GAGL,EAAE,CAAC;IAEU,qBAAqB,GAA0C,EAAE,CAAC;IAErF;;;OAGG;IACO,aAAa,CAA4D;IAEnF,kFAAkF;IAC1E,UAAU,GAAY,KAAK,CAAC;IAEpC;;;OAGG;IACK,cAAc,GAAW,CAAC,CAAC;IAEnC,qGAAqG;IAC7F,gBAAgB;QACtB,MAAM,IAAI,GAAY,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC;QAE/C,OAAO,6BAA6B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACjG,CAAC;IAED,qFAAqF;IAC3E,MAAM,CAAC,IAAI,CAAC,IAAa;QACjC,OAAO,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,OAAO,IAAI,CAAC,GAAG,KAAK,QAAQ;YAC/F,CAAC,CAAC,IAAI,CAAC,GAAG;YACV,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;IAED,2GAA2G;IACnG,gBAAgB,CAAC,UAA8B;QACrD,OAAO,UAAU,KAAK,SAAS,IAAI,UAAU,KAAK,IAAI,CAAC,cAAc,CAAC;IACxE,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,gBAAgB;QAC5B,MAAM,QAAQ,GAAyD,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC;QAEpG,OAAO,QAAQ,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;IACxD,CAAC;IAED,4FAA4F;IAC5F,QAAQ,CAA+B;IAIvC;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,YACE,GAAyD;IACzD;sFACkF;IAClF,yBAAmC;QAEnC,mCAAmC;QACnC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;YACd,GAAG,CAAC,IAAI,GAAG,sBAAsB,GAAG,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;YAElD,YAAQ,CAAC,IAAI,CACX,0BAA0B,IAAI,CAAC,IAAI,UAAU;gBAC7C,sBAAsB,EACtB,MAAM,EAAE,IAAI,KAAK,EAAE,CACpB,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,GAAG,EAAE,QAAQ,CAAC;QAE9B,8BAA8B;QAC9B,IAAI,CAAC,OAAO,GAAG,IAAI,sBAAe,CAAI,GAAG,CAAC,YAAY,CAAC,CAAC;QACxD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;QAEzC,IAAI,CAAC,SAAS,GAAG,IAAI,sBAAe,CAAU,KAAK,CAAC,CAAC;QACrD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC;QAE7C,IAAI,CAAC,iBAAiB,GAAG,IAAI,sBAAe,CAAuD,KAAK,CAAC,CAAC;QAC1G,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,CAAC;QAE7D,IAAI,GAAG,CAAC,GAAG,EAAE,CAAC;YACZ,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC;QACrB,CAAC;QAED,IAAI,GAAG,CAAC,GAAG,EAAE,CAAC;YACZ,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC;QACrB,CAAC;QAED,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;QAEvB,IAAI,GAAG,CAAC,aAAa,EAAE,CAAC;YACtB,IAAI,CAAC,aAAa,GAAG,GAAG,CAAC,aAAa,CAAC;QACzC,CAAC;QAED,IAAI,CAAC,yBAAyB,EAAE,CAAC;YAC/B,IAAI,GAAG,CAAC,qBAAqB,EAAE,CAAC;gBAC9B,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;YAC3D,CAAC;YAED,IAAI,GAAG,CAAC,qBAAqB,EAAE,CAAC;gBAC9B,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,qBAAqB,EAAE,IAAI,CAAC,CAAC;YACjE,CAAC;QACH,CAAC;QAED,IAAI,GAAG,CAAC,cAAc,EAAE,CAAC;YACvB,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACjD,CAAC;IACH,CAAC;IAED,wBAAwB,CAAC,qBAAyD;QAChF,IAAI,CAAC;YACH,IAAI,CAAC,qBAAqB,EAAE,CAAC;gBAC3B,MAAM,IAAI,KAAK,CACb,uCAAuC,IAAI,CAAC,IAAI,WAAW;oBAC3D,oDAAoD,IAAI,CAAC,IAAI,GAAG,CACjE,CAAC;YACJ,CAAC;YAED,IAAI,CAAC,CAAC,qBAAqB,YAAY,6BAA6B,CAAC,EAAE,CAAC;gBACtE,MAAM,IAAI,KAAK,CACb,uCAAuC,IAAI,CAAC,IAAI,WAAW;oBAC3D,gFAAgF,IAAI,CAAC,IAAI,GAAG,CAC7F,CAAC;YACJ,CAAC;YAED,qBAAqB,CAAC,wBAAwB,CAAC,CAAE,IAAI,CAAE,CAAC,CAAC;QAC3D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CACX,uCAAuC,IAAI,CAAC,IAAI,WAAW;gBAC3D,gDAAgD,IAAI,CAAC,IAAI,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,EACzF,MAAM,EAAE,KAAK,EACb,MAAM,EAAE,IAAI,KAAK,EAAE,CACpB,CAAC;QACJ,CAAC;IACH,CAAC;IAED,wBAAwB,CACtB,qBAAqE,EACrE,aAAuB;QAEvB,qBAAqB,CAAC,OAAO,CAAC,CAAC,YAAgD,EAAQ,EAAE;YACvF,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,MAAM,IAAI,KAAK,CACb,uCAAuC,IAAI,CAAC,IAAI,WAAW;oBAC3D,oDAAoD,IAAI,CAAC,IAAI,GAAG,CACjE,CAAC;YACJ,CAAC;YAED,IAAI,CAAC,CAAC,YAAY,YAAY,6BAA6B,CAAC,EAAE,CAAC;gBAC7D,MAAM,IAAI,KAAK,CACb,uCAAuC,IAAI,CAAC,IAAI,WAAW;oBAC3D,gFAAgF,IAAI,CAAC,IAAI,GAAG,CAC7F,CAAC;YACJ,CAAC;YAED,IAAI,YAAY,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;gBACpC,MAAM,IAAI,KAAK,CACb,uCAAuC,IAAI,CAAC,IAAI,WAAW;oBAC3D,4EAA4E,IAAI,CAAC,IAAI,GAAG,CACzF,CAAC;YACJ,CAAC;YAED,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;gBAC1B,MAAM,IAAI,KAAK,CACb,uCAAuC,IAAI,CAAC,IAAI,WAAW;oBAC3D,qDAAqD;oBACrD,WAAW,IAAI,CAAC,IAAI,kBAAkB,YAAY,CAAC,IAAI,IAAI;oBAC3D,qDAAqD,CACtD,CAAC;YACJ,CAAC;YAED,qGAAqG;YACrG,6EAA6E;YAC7E,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;gBACvD,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAChD,CAAC;YACD,YAAY,CAAC,aAAa,GAAG,IAAI,CAAC;YAElC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAClB,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,EAAE,OAAU,EAAc,EAAE;oBAC1D,OAAO,CAAC,GAAG,CACT,uCAAuC,IAAI,CAAC,IAAI,UAAU;wBAC1D,mDAAmD,YAAY,CAAC,IAAI,iBAAiB;wBACrF,gBAAgB,OAAO,IAAK,OAAyB,CAAC,GAAG,CAAC,CAAC,CAAE,OAAyB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,CACnG,CAAC;oBAEF,OAAO,OAAO,CAAC;gBACjB,CAAC,CAAC,CAAC;YACL,CAAC;YAED,IAAI,CAAC,gBAAgB,CAAC,IAAI,CACxB,KAAK,EAAE,OAAU,EAAc,EAAE;gBAC/B,IAAI,OAAO,IAAK,OAAyB,CAAC,GAAG,IAAK,OAAyB,CAAC,GAAG,KAAK,YAAY,CAAC,YAAY,EAAE,CAAC;oBAC9G,YAAY,CAAC,UAAU,CAAE,OAAyB,CAAC,GAAG,CAAC,CAAC;gBAC1D,CAAC;qBAAM,IAAI,CAAC,OAAO,EAAE,CAAC;oBACpB,YAAY,CAAC,KAAK,EAAE,CAAC;gBACvB,CAAC;gBAED,OAAO,OAAO,CAAC;YACjB,CAAC,CACF,CAAC;YAEF,gHAAgH;YAChH,gHAAgH;YAChH,yGAAyG;YACzG,8DAA8D;YAC9D,MAAM,YAAY,GAAuB,6BAA6B,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEvF,IAAI,aAAa,IAAI,YAAY,EAAE,CAAC;gBAClC,UAAU,CAAC,GAAS,EAAE;oBACpB,6FAA6F;oBAC7F,IAAI,6BAA6B,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,YAAY;2BAC7D,YAAY,CAAC,YAAY,KAAK,SAAS,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAC;wBACtF,+CAA+C;wBAC/C,YAAY,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,GAAS,EAAE,CAAC,SAAS,CAAC,CAAC;oBACrE,CAAC;gBACH,CAAC,EAAE,CAAC,CAAC,CAAC;YACR,CAAC;YAED,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;gBAChC,YAAY,CAAC,UAAU,CAAE,IAAI,CAAC,IAAsB,CAAC,GAAG,CAAC,CAAC;YAC5D,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,UAAU,CAAC,MAAiB,EAAE,IAAoC;QACtE,mHAAmH;QACnH,IAAI,cAAiC,CAAC;QACtC,kGAAkG;QAClG,IAAI,UAA8B,CAAC;QAEnC,IAAI,CAAC;YACH,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC;YACpD,MAAM,SAAS,GAAa,MAAM;gBAC9B,IAAI,CAAC,IAAsB,EAAE,GAAgB;gBAC/C,IAAI,CAAC,YAAY;gBACjB,IAAI,CAAC,aAAa;gBAClB,uGAAuG;gBACvG,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAE1B,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;gBAC7B,2FAA2F;gBAC3F,8EAA8E;gBAC9E,IAAI,CAAC,IAAI,EAAE,eAAe,EAAE,CAAC;oBAC3B,OAAO,CAAC,KAAK,CACX,6CAA6C,IAAI,CAAC,IAAI,GAAG,EACzD,IAAI,CAAC,IAAI,EACT,MAAM,EAAE,IAAI,KAAK,EAAE,CACpB,CAAC;gBACJ,CAAC;gBAED,cAAc,GAAG,IAAI,KAAK,CAAC,6CAA6C,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;gBACtF,MAAM,cAAc,CAAC;YACvB,CAAC;YAED,IAAI,cAAc,IAAI,cAAc,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;gBAC1D,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;oBAClB,OAAO,CAAC,GAAG,CACT,yBAAyB,IAAI,CAAC,IAAI,UAAU;wBAC5C,4CAA4C,SAAS,GAAG;wBACxD,0DAA0D,CAC3D,CAAC;gBACJ,CAAC;gBAED,0GAA0G;gBAC1G,8GAA8G;gBAC9G,qGAAqG;gBACrG,mDAAmD;gBACnD,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC;gBAEjC,OAAO,MAAM,cAAc,CAAC,QAAQ,CAAC;YACvC,CAAC;YAED,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAClB,OAAO,CAAC,GAAG,CACT,yBAAyB,IAAI,CAAC,IAAI,UAAU;oBAC5C,4CAA4C,SAAS,GAAG,CACzD,CAAC;YACJ,CAAC;YAED,UAAU,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC;YACnC,MAAM,cAAc,GAAW,UAAU,CAAC;YAC1C,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;YACpE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC;gBAC1B,MAAM,EAAE,SAAS;gBACjB,QAAQ,EAAE,YAAY;aACvB,CAAC,CAAC;YACH,mHAAmH;YACnH,gHAAgH;YAChH,yFAAyF;YACzF,MAAM,eAAe,GAAe,GAAS,EAAE;gBAC7C,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,EAAE,CAAC;oBAC3C,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACrC,CAAC;YACH,CAAC,CAAC;YAEF,YAAY,CAAC,IAAI,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;YAEpD,OAAO,MAAM,YAAY,CAAC;QAC5B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,+GAA+G;YAC/G,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,EAAE,CAAC;gBACvC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACnC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC7B,CAAC;YAED,gHAAgH;YAChH,mFAAmF;YACnF,MAAM,QAAQ,GAAY,CAAC,CAAC,IAAI,EAAE,eAAe,IAAI,CAAC,CAAC,cAAc,IAAI,KAAK,KAAK,cAAc,CAAC;YAElG,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACxC,OAAO,CAAC,KAAK,CACX,yBAAyB,IAAI,CAAC,IAAI,WAAW;oBAC7C,iCAAiC,EACjC,MAAM,EAAE,KAAK,EACb,MAAM,EAAE,IAAI,KAAK,EAAE,CACpB,CAAC;gBAEF,IAAI,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAC3C,KAAK,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;gBAC7B,CAAC;YACH,CAAC;YAED,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACf,MAAM,YAAY,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC;YAClD,IAAI,YAAY,EAAE,CAAC;gBACjB,OAAO,MAAM,YAAY,CAAC,QAAQ,CAAC;YACrC,CAAC;iBAAM,CAAC;gBACN,iFAAiF;gBACjF,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC;YACrE,CAAC;QACH,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,CAAC,IAAI,CAAC;QACnB,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACO,KAAK,CAAC,cAAc,CAAC,QAAkB,EAAE,aAAqB,EAAE,IAAI,CAAC,cAAc;QAC3F,IAAI,CAAC;YACH,IAAI,CAAC,YAAY,GAAG,QAAQ,CAAC;YAE7B,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QACtF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC1B,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED;;;;;;;;;;OAUG;IACH,KAAK,CAAC,UAAU,CAAC,IAAO,EAAE,cAAwB,EAAE,gBAA0B;QAC5E,IAAI,IAAI,CAAC,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;YAChC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1C,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;QAED,IAAI,gBAAgB,EAAE,CAAC;YACrB,wFAAwF;YACxF,IAAI,CAAC,qBAAqB,EAAE,OAAO,CAAC,CAAC,YAAgD,EAAQ,EAAE;gBAC7F,IAAI,IAAI,IAAK,IAAsB,CAAC,GAAG,IAAK,IAAsB,CAAC,GAAG,KAAK,YAAY,CAAC,YAAY,EAAE,CAAC;oBACrG,YAAY,CAAC,UAAU,CAAE,IAAsB,CAAC,GAAG,CAAC,CAAC;gBACvD,CAAC;qBAAM,IAAI,CAAC,IAAI,EAAE,CAAC;oBACjB,YAAY,CAAC,KAAK,EAAE,CAAC;gBACvB,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,mBAA6B;QACjC,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;QAED,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QAEvB,IAAI,CAAC;YACH,6GAA6G;YAC7G,IAAI,CAAC,cAAc,EAAE,CAAC;YACtB,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACnC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC7B,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;YAE9B,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBACzB,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,GAAuC,EAAQ,EAAE;oBACnF,GAAG,CAAC,KAAK,EAAE,CAAC;gBACd,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QAC1B,CAAC;IACH,CAAC;IAED;;;;;;;OAOG;IACO,KAAK,CAAC,iBAAiB,CAAC,MAAW,EAAE,QAAkB,EAAE,UAAmB;QACpF,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,OAAO,CAAC,GAAG,CACT,gCAAgC,IAAI,CAAC,IAAI,UAAU;gBACnD,mDAAmD,QAAQ,GAAG;gBAC9D,aAAa,EAAE,MAAM,CACtB,CAAC;QACJ,CAAC;QAED,KAAK,MAAM,WAAW,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAChD,IAAI,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,EAAE,CAAC;gBACtC,OAAO,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACvC,CAAC;YAED,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAClB,OAAO,CAAC,GAAG,CACT,gCAAgC,IAAI,CAAC,IAAI,UAAU;oBACnD,mBAAmB,EAAE,WAAW,CACjC,CAAC;YACJ,CAAC;YAED,MAAM,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YAE7C,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,YAAQ,CAAC,IAAI,CACX,gCAAgC,IAAI,CAAC,IAAI,UAAU;oBACnD,4CAA4C,EAC5C,MAAM,EAAE,IAAI,KAAK,EAAE,CACpB,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,EAAE,CAAC;YACtC,OAAO,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACvC,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC1B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1B,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,kBAAkB;QACxB,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE;YAChD,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;IACxB,CAAC;IAED;;;OAGG;IACH,WAAW;QACT,IAAI,OAA8B,CAAC;QACnC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAO,CAAC,CAAC,EAAE,EAAE,GAAG,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3D,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QAC5C,OAAO,OAAO,CAAC;IACjB,CAAC;CACF;AA/kBD,sEA+kBC;AAIyC,yDAAgB;AAF1D,MAAM,CAAC,cAAc,CAAC,6BAA6B,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,kBAAkB,EAAE,CAAC,CAAC;AAK5F,MAAM,CAAC,cAAc,CAAC,6BAA6B,CAAC,SAAS,EAAE,aAAa,EAAE;IAC5E,YAAY,EAAE,IAAI;IAClB,UAAU,EAAE,KAAK;IACjB,GAAG,EAAE;QACH,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IACD,GAAG,EAAE,UAAU,OAA4B;QACzC,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC;IACtB,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,cAAc,CAAC,6BAA6B,CAAC,SAAS,EAAE,mBAAmB,EAAE;IAClF,YAAY,EAAE,IAAI;IAClB,UAAU,EAAE,KAAK;IACjB,GAAG,EAAE;QACH,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IACD,GAAG,EAAE,UAAU,OAA4B;QACzC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;CACF,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"data-list-handler.control-model.d.ts","sourceRoot":"","sources":["../../../../src/_modules/data-handler/_models/data-list-handler.control-model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAEnD,OAAO,EAAE,6BAA6B,EAAE,MAAM,4CAA4C,CAAC;AAE3F,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,kDAAkD,CAAC;AAIjF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,qBAAa,iCAAiC,CAC5C,UAAU,SAAS,aAAa,EAChC,gBAAgB,SAAS,aAAa,GAAG,GAAG,EAC5C,YAAY,GAAG,MAAM,EACrB,cAAc,GAAG,MAAM,CACvB,SAAQ,gBAAgB,CAAC,UAAU,EAAE,EAAE,gBAAgB,EAAE,YAAY,CAAC;IAEtE,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,cAAc,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IACjG,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAExF;;;OAGG;IACH,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,eAAe,CAAC,UAAU,EAAE,CAAC,CAAC;IAE9D;;;OAGG;IACH,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC;IAE7C;;OAEG;IACH,QAAQ,CAAC,aAAa,EAAE,eAAe,CAAC,UAAU,CAAC,CAAC;IAEpD;;OAEG;IACH,QAAQ,CAAC,WAAW,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;IAE7C;;;OAGG;IACH,IAAa,IAAI,IAAI,UAAU,EAAE,CAEhC;IAED;;;;OAIG;IACH,IAAI,QAAQ,IAAI,UAAU,EAAE,CAE3B;IAED;;;;;OAKG;gBAED,GAAG,EAAE,6BAA6B,CAAC,UAAU,EAAE,gBAAgB,EAAE,YAAY,EAAE,cAAc,CAAC;IAC9F;sFACkF;IAClF,yBAAyB,CAAC,EAAE,OAAO;IAmDtB,UAAU,CAAC,MAAM,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAe9D,KAAK,CAAC,mBAAmB,CAAC,EAAE,OAAO,GAAG,IAAI;IAKnD;;;;;;OAMG;IACG,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAanG;;;;;;;OAOG;IACG,UAAU,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBhG;;;;;;;;OAQG;IACG,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBtG,aAAa,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;CAGtC;AAGD,2FAA2F;AAC3F,OAAO,EAAE,iCAAiC,IAAI,oBAAoB,EAAE,CAAC"}
1
+ {"version":3,"file":"data-list-handler.control-model.d.ts","sourceRoot":"","sources":["../../../../src/_modules/data-handler/_models/data-list-handler.control-model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAEnD,OAAO,EAAE,6BAA6B,EAAE,MAAM,4CAA4C,CAAC;AAE3F,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,kDAAkD,CAAC;AAIjF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,qBAAa,iCAAiC,CAC5C,UAAU,SAAS,aAAa,EAChC,gBAAgB,SAAS,aAAa,GAAG,GAAG,EAC5C,YAAY,GAAG,MAAM,EACrB,cAAc,GAAG,MAAM,CACvB,SAAQ,gBAAgB,CAAC,UAAU,EAAE,EAAE,gBAAgB,EAAE,YAAY,CAAC;IAEtE,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,cAAc,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IACjG,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAExF;;;OAGG;IACH,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,eAAe,CAAC,UAAU,EAAE,CAAC,CAAC;IAE9D;;;OAGG;IACH,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC;IAE7C;;OAEG;IACH,QAAQ,CAAC,aAAa,EAAE,eAAe,CAAC,UAAU,CAAC,CAAC;IAEpD;;OAEG;IACH,QAAQ,CAAC,WAAW,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;IAE7C;;;OAGG;IACH,IAAa,IAAI,IAAI,UAAU,EAAE,CAEhC;IAED;;;;OAIG;IACH,IAAI,QAAQ,IAAI,UAAU,EAAE,CAE3B;IAED;;;;;OAKG;gBAED,GAAG,EAAE,6BAA6B,CAAC,UAAU,EAAE,gBAAgB,EAAE,YAAY,EAAE,cAAc,CAAC;IAC9F;sFACkF;IAClF,yBAAyB,CAAC,EAAE,OAAO;IAmDtB,UAAU,CAAC,MAAM,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAgB9D,KAAK,CAAC,mBAAmB,CAAC,EAAE,OAAO,GAAG,IAAI;IAKnD;;;;;;OAMG;IACG,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAanG;;;;;;;OAOG;IACG,UAAU,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBhG;;;;;;;;OAQG;IACG,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBtG,aAAa,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;CAGtC;AAGD,2FAA2F;AAC3F,OAAO,EAAE,iCAAiC,IAAI,oBAAoB,EAAE,CAAC"}
@@ -125,7 +125,8 @@ class DyFM_DataListHandler_ControlModel extends data_handler_control_model_1.DyF
125
125
  try {
126
126
  const setActiveItem = !this.activeItem_BS.value || this.activeItem_BS.value?._id !== loadBy;
127
127
  const dataList = await super.reloadData(loadBy);
128
- if (setActiveItem && dataList.length > 0) {
128
+ // BFR-FLEET-078: a load superseded by a clear returns the cleared (empty) data
129
+ if (setActiveItem && dataList?.length > 0) {
129
130
  this.setActiveItem(dataList[0]);
130
131
  }
131
132
  return dataList;
@@ -1 +1 @@
1
- {"version":3,"file":"data-list-handler.control-model.js","sourceRoot":"","sources":["../../../../src/_modules/data-handler/_models/data-list-handler.control-model.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"data-list-handler.control-model.js","sourceRoot":"","sources":["../../../../src/_modules/data-handler/_models/data-list-handler.control-model.ts"],"names":[],"mappings":"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"}
@@ -89,10 +89,22 @@ export declare abstract class DyFM_DataHandler_ControlModel<T extends DyFM_Metad
89
89
  protected dependency_DH?: DyFM_DataHandler_ControlModel<unknown, unknown, unknown>;
90
90
  /** BFR-CREDIT-117 - a clear in progress (a cyclic dependency is cleared once). */
91
91
  private isClearing;
92
+ /**
93
+ * BFR-FLEET-078 - the number of the latest load; a new load and a `clear()` move it. The answer of an older load
94
+ * (superseded by a newer one, or by a clear, e.g. a logout) changes nothing: no data, no loaded / failed state.
95
+ */
96
+ private loadGeneration;
92
97
  /** BFR-ORGANIZER-040 - the dependency's current `_id`, as this handler's key (`undefined`: none). */
93
98
  private dependencyLoadBy;
94
99
  /** BFR-ORGANIZER-040 - the `_id` of a loaded data (`undefined` when it has none). */
95
100
  protected static idOf(data: unknown): string | undefined;
101
+ /** BFR-FLEET-078 - whether the load of this generation was superseded (`undefined`: not a load, never). */
102
+ private isSupersededLoad;
103
+ /**
104
+ * BFR-FLEET-078 - what the caller of a superseded load gets: the newer load's result (it is in flight), else the
105
+ * current data (the newer load is done, or the handler was cleared).
106
+ */
107
+ private supersededResult;
96
108
  loopSafetyCollection: {
97
109
  at: Date;
98
110
  stack: string;
@@ -149,7 +161,13 @@ export declare abstract class DyFM_DataHandler_ControlModel<T extends DyFM_Metad
149
161
  silentMissingId?: boolean;
150
162
  }): Promise<T>;
151
163
  getData(): Promise<T>;
152
- protected doReloadDataBy(loadedBy: T_LoadBy): Promise<T>;
164
+ /**
165
+ * Loads by the key and applies the answer, unless the load was superseded meanwhile (BFR-FLEET-078).
166
+ *
167
+ * @param loadedBy the key
168
+ * @param generation the load's number (`reloadData` gives it; a direct call starts a new one)
169
+ */
170
+ protected doReloadDataBy(loadedBy: T_LoadBy, generation?: number): Promise<T>;
153
171
  /**
154
172
  * Az adat közvetlen frissítése (round-trip nélkül; pl. SPA-login → user_DH.updateData). Alapból CSAK
155
173
  * a saját `data_$`-t frissíti.
@@ -166,7 +184,15 @@ export declare abstract class DyFM_DataHandler_ControlModel<T extends DyFM_Metad
166
184
  * dependents are really reached now - a cyclic dependency is cleared once (`isClearing`), not endlessly.
167
185
  */
168
186
  clear(dontClearDependents?: boolean): void;
169
- protected processLoadResult(result: any, loadedBy: T_LoadBy): Promise<T>;
187
+ /**
188
+ * Runs the post-processes on a loaded answer and applies it. BFR-FLEET-078: a superseded load stops before the
189
+ * next post-process (they reload or clear the dependents) and is not applied.
190
+ *
191
+ * @param result the answer of the `get`
192
+ * @param loadedBy the key
193
+ * @param generation the load's number (`undefined`: applied whatever happened meanwhile, as before)
194
+ */
195
+ protected processLoadResult(result: any, loadedBy: T_LoadBy, generation?: number): Promise<T>;
170
196
  private resolveWaitsOnLoad;
171
197
  /**
172
198
  * waits for the first load to finish
@@ -1 +1 @@
1
- {"version":3,"file":"data-handler.control-model.d.ts","sourceRoot":"","sources":["../../../../../src/_modules/ngx-models/_models/control-models/data-handler.control-model.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"data-handler.control-model.d.ts","sourceRoot":"","sources":["../../../../../src/_modules/ngx-models/_models/control-models/data-handler.control-model.ts"],"names":[],"mappings":"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"}
@@ -54,6 +54,11 @@ class DyFM_DataHandler_ControlModel {
54
54
  dependency_DH;
55
55
  /** BFR-CREDIT-117 - a clear in progress (a cyclic dependency is cleared once). */
56
56
  isClearing = false;
57
+ /**
58
+ * BFR-FLEET-078 - the number of the latest load; a new load and a `clear()` move it. The answer of an older load
59
+ * (superseded by a newer one, or by a clear, e.g. a logout) changes nothing: no data, no loaded / failed state.
60
+ */
61
+ loadGeneration = 0;
57
62
  /** BFR-ORGANIZER-040 - the dependency's current `_id`, as this handler's key (`undefined`: none). */
58
63
  dependencyLoadBy() {
59
64
  const data = this.dependency_DH?.data;
@@ -65,6 +70,18 @@ class DyFM_DataHandler_ControlModel {
65
70
  ? data._id
66
71
  : undefined;
67
72
  }
73
+ /** BFR-FLEET-078 - whether the load of this generation was superseded (`undefined`: not a load, never). */
74
+ isSupersededLoad(generation) {
75
+ return generation !== undefined && generation !== this.loadGeneration;
76
+ }
77
+ /**
78
+ * BFR-FLEET-078 - what the caller of a superseded load gets: the newer load's result (it is in flight), else the
79
+ * current data (the newer load is done, or the handler was cleared).
80
+ */
81
+ async supersededResult() {
82
+ const inFlight = this.loadInProgress_$();
83
+ return inFlight ? await inFlight.progress : this.data;
84
+ }
68
85
  loopSafetyCollection = [];
69
86
  loopSafetyTimeout = __1.second;
70
87
  /** if set to 0, loop safety will be disabled */
@@ -251,6 +268,8 @@ class DyFM_DataHandler_ControlModel {
251
268
  async reloadData(loadBy, opts) {
252
269
  /** BFR-MASTERPROMPTER-128 — the missing-ID error of THIS call (silenced by `silentMissingId` in the catch too). */
253
270
  let missingIdError;
271
+ /** BFR-FLEET-078 — the generation of the load this call started or joined (`undefined`: none). */
272
+ let generation;
254
273
  try {
255
274
  const loadInProgress = this.loadInProgress_$();
256
275
  const useLoadBy = loadBy ??
@@ -273,6 +292,8 @@ class DyFM_DataHandler_ControlModel {
273
292
  // BFR-MASTERPROMPTER-074: a second call for the SAME key awaits the load in flight. Returning `this.data`
274
293
  // here handed the caller the not-yet-loaded (undefined / stale) value - measured: MP "Create Flow" during the
275
294
  // first `loadMyFlows()` got `undefined` and crashed on `myFlows.find`. Same contract as `getData()`.
295
+ // BFR-FLEET-078: the joined load is the latest one
296
+ generation = this.loadGeneration;
276
297
  return await loadInProgress.progress;
277
298
  }
278
299
  if (this.debugLog) {
@@ -281,28 +302,36 @@ class DyFM_DataHandler_ControlModel {
281
302
  }
282
303
  // BFR-ORGANIZER-041: a new load is not failed (yet)
283
304
  this.loadError_$?.set(undefined);
284
- const loadProgress = this.doReloadDataBy(useLoadBy);
305
+ generation = ++this.loadGeneration;
306
+ const loadGeneration = generation;
307
+ const loadProgress = this.doReloadDataBy(useLoadBy, loadGeneration);
285
308
  this.loadInProgress_$.set({
286
309
  loadBy: useLoadBy,
287
310
  progress: loadProgress
288
311
  });
289
312
  // clears the in-flight marker on BOTH outcomes; `.finally()` returned a derived promise that rejected unhandled on
290
- // every failed load (an "Uncaught (in promise)" beside the real error) — the caller already receives the error
313
+ // every failed load (an "Uncaught (in promise)" beside the real error) — the caller already receives the error.
314
+ // BFR-FLEET-078: only its own marker (a superseded load must not clear the newer load's)
291
315
  const clearInProgress = () => {
292
- this.loadInProgress_$.set(false);
316
+ if (!this.isSupersededLoad(loadGeneration)) {
317
+ this.loadInProgress_$.set(false);
318
+ }
293
319
  };
294
320
  loadProgress.then(clearInProgress, clearInProgress);
295
321
  return await loadProgress;
296
322
  }
297
323
  catch (error) {
298
- this.loadInProgress_$.set(false);
299
- this.loaded_$.set(false);
300
324
  // BFR-MASTERPROMPTER-128 — the silenced missing-ID error (the `getData` not-loaded-yet path) is not logged here
301
325
  // either: it still THROWS, only the "reloadData was UNSUCCESSFUL" line is left out
302
326
  const silenced = !!opts?.silentMissingId && !!missingIdError && error === missingIdError;
303
- // BFR-ORGANIZER-041: a failed load is visible as such (the silenced missing ID is "not loaded yet")
304
- if (!silenced) {
305
- this.loadError_$?.set(error ?? new Error(`DynamoERROR (DH.reloadData): the load failed (${this.name})`));
327
+ // BFR-FLEET-078: a superseded load (a newer one started, or the handler was cleared) fails only for its caller
328
+ if (!this.isSupersededLoad(generation)) {
329
+ this.loadInProgress_$.set(false);
330
+ this.loaded_$.set(false);
331
+ // BFR-ORGANIZER-041: a failed load is visible as such (the silenced missing ID is "not loaded yet")
332
+ if (!silenced) {
333
+ this.loadError_$?.set(error ?? new Error(`DynamoERROR (DH.reloadData): the load failed (${this.name})`));
334
+ }
306
335
  }
307
336
  if (!error?.error?.handled && !silenced) {
308
337
  console.error(`DYNAMO DH.reloadData (${this.name}) ERROR: ` +
@@ -330,10 +359,16 @@ class DyFM_DataHandler_ControlModel {
330
359
  return this.data;
331
360
  }
332
361
  }
333
- async doReloadDataBy(loadedBy) {
362
+ /**
363
+ * Loads by the key and applies the answer, unless the load was superseded meanwhile (BFR-FLEET-078).
364
+ *
365
+ * @param loadedBy the key
366
+ * @param generation the load's number (`reloadData` gives it; a direct call starts a new one)
367
+ */
368
+ async doReloadDataBy(loadedBy, generation = ++this.loadGeneration) {
334
369
  try {
335
370
  this.lastLoadedBy = loadedBy;
336
- return await this.processLoadResult(await this.get(loadedBy), loadedBy);
371
+ return await this.processLoadResult(await this.get(loadedBy), loadedBy, generation);
337
372
  }
338
373
  catch (error) {
339
374
  this.resolveWaitsOnLoad();
@@ -379,6 +414,9 @@ class DyFM_DataHandler_ControlModel {
379
414
  }
380
415
  this.isClearing = true;
381
416
  try {
417
+ // BFR-FLEET-078: the answer of a load in flight is not applied any more, and a new load does not wait for it
418
+ this.loadGeneration++;
419
+ this.loadInProgress_$.set(false);
382
420
  this.data_$.set(undefined);
383
421
  this.lastLoadedBy = undefined;
384
422
  this.loadError_$?.set(undefined);
@@ -392,7 +430,15 @@ class DyFM_DataHandler_ControlModel {
392
430
  this.isClearing = false;
393
431
  }
394
432
  }
395
- async processLoadResult(result, loadedBy) {
433
+ /**
434
+ * Runs the post-processes on a loaded answer and applies it. BFR-FLEET-078: a superseded load stops before the
435
+ * next post-process (they reload or clear the dependents) and is not applied.
436
+ *
437
+ * @param result the answer of the `get`
438
+ * @param loadedBy the key
439
+ * @param generation the load's number (`undefined`: applied whatever happened meanwhile, as before)
440
+ */
441
+ async processLoadResult(result, loadedBy, generation) {
396
442
  try {
397
443
  if (this.debugLog) {
398
444
  console.log(`DYNAMO DH.processLoadResult (${this.name}) DEBUG:` +
@@ -400,6 +446,9 @@ class DyFM_DataHandler_ControlModel {
400
446
  `\n Result:`, result);
401
447
  }
402
448
  for (const postProcess of this.getPostProcesses) {
449
+ if (this.isSupersededLoad(generation)) {
450
+ return await this.supersededResult();
451
+ }
403
452
  if (this.debugLog) {
404
453
  console.log(`DYNAMO DH.processLoadResult (${this.name}) DEBUG:` +
405
454
  `\n Post process:`, postProcess);
@@ -410,6 +459,9 @@ class DyFM_DataHandler_ControlModel {
410
459
  `\nPost process returned null or undefined!`, '\n\n', new Error());
411
460
  }
412
461
  }
462
+ if (this.isSupersededLoad(generation)) {
463
+ return await this.supersededResult();
464
+ }
413
465
  this.data_$.set(result);
414
466
  this.loaded_$.set(true);
415
467
  this.loadError_$?.set(undefined);
@@ -1 +1 @@
1
- {"version":3,"file":"data-handler.control-model.js","sourceRoot":"","sources":["../../../../../src/_modules/ngx-models/_models/control-models/data-handler.control-model.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"data-handler.control-model.js","sourceRoot":"","sources":["../../../../../src/_modules/ngx-models/_models/control-models/data-handler.control-model.ts"],"names":[],"mappings":"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"}
@@ -75,6 +75,11 @@ export class DyFM_DataHandler_ControlModel {
75
75
  dependency_DH;
76
76
  /** BFR-CREDIT-117 - a clear in progress (a cyclic dependency is cleared once). */
77
77
  isClearing = false;
78
+ /**
79
+ * BFR-FLEET-078 - the number of the latest load; a new load and a `clear()` move it. The answer of an older load
80
+ * (superseded by a newer one, or by a clear, e.g. a logout) changes nothing: no data, no loaded state.
81
+ */
82
+ loadGeneration = 0;
78
83
  /** BFR-ORGANIZER-040 - the dependency's current `_id`, as this handler's key (`undefined`: none). */
79
84
  dependencyLoadBy() {
80
85
  const data = this.dependency_DH?.data;
@@ -86,6 +91,18 @@ export class DyFM_DataHandler_ControlModel {
86
91
  ? data._id
87
92
  : undefined;
88
93
  }
94
+ /** BFR-FLEET-078 - whether the load of this generation was superseded (`undefined`: not a load, never). */
95
+ isSupersededLoad(generation) {
96
+ return generation !== undefined && generation !== this.loadGeneration;
97
+ }
98
+ /**
99
+ * BFR-FLEET-078 - what the caller of a superseded load gets: the newer load's result (it is in flight), else the
100
+ * current data (the newer load is done, or the handler was cleared).
101
+ */
102
+ async supersededResult() {
103
+ const inFlight = this.loadInProgress_BS.value;
104
+ return inFlight ? await inFlight.progress : this.data;
105
+ }
89
106
  /** @deprecated Use isDebugLogEnabled; debugLog remains the serialized compatibility key. */
90
107
  debugLog;
91
108
  /**
@@ -241,6 +258,8 @@ export class DyFM_DataHandler_ControlModel {
241
258
  async reloadData(loadBy, opts) {
242
259
  /** BFR-MASTERPROMPTER-128 — the missing-ID error of THIS call (silenced by `silentMissingId` in the catch too). */
243
260
  let missingIdError;
261
+ /** BFR-FLEET-078 — the generation of the load this call started or joined (`undefined`: none). */
262
+ let generation;
244
263
  try {
245
264
  const loadInProgress = this.loadInProgress_BS.value;
246
265
  const useLoadBy = loadBy ??
@@ -267,28 +286,38 @@ export class DyFM_DataHandler_ControlModel {
267
286
  // BFR-MASTERPROMPTER-074: a second call for the SAME key awaits the load in flight. Returning `this.data`
268
287
  // here handed the caller the not-yet-loaded (undefined / stale) value - measured: MP "Create Flow" during the
269
288
  // first `loadMyFlows()` got `undefined` and crashed on `myFlows.find`. Same contract as `getData()`.
289
+ // BFR-FLEET-078: the joined load is the latest one
290
+ generation = this.loadGeneration;
270
291
  return await loadInProgress.progress;
271
292
  }
272
293
  if (this.debugLog) {
273
294
  console.log(`DYNAMO DH.reloadData (${this.name}) DEBUG:` +
274
295
  `\n DataHandler reloadData... (using id: ${useLoadBy})`);
275
296
  }
276
- const loadProgress = this.doReloadDataBy(useLoadBy);
297
+ generation = ++this.loadGeneration;
298
+ const loadGeneration = generation;
299
+ const loadProgress = this.doReloadDataBy(useLoadBy, loadGeneration);
277
300
  this.loadInProgress_BS.next({
278
301
  loadBy: useLoadBy,
279
302
  progress: loadProgress
280
303
  });
281
304
  // clears the in-flight marker on BOTH outcomes; `.finally()` returned a derived promise that rejected unhandled on
282
- // every failed load (an "Uncaught (in promise)" beside the real error) — the caller already receives the error
305
+ // every failed load (an "Uncaught (in promise)" beside the real error) — the caller already receives the error.
306
+ // BFR-FLEET-078: only its own marker (a superseded load must not clear the newer load's)
283
307
  const clearInProgress = () => {
284
- this.loadInProgress_BS.next(false);
308
+ if (!this.isSupersededLoad(loadGeneration)) {
309
+ this.loadInProgress_BS.next(false);
310
+ }
285
311
  };
286
312
  loadProgress.then(clearInProgress, clearInProgress);
287
313
  return await loadProgress;
288
314
  }
289
315
  catch (error) {
290
- this.loadInProgress_BS.next(false);
291
- this.loaded_BS.next(false);
316
+ // BFR-FLEET-078: a superseded load (a newer one started, or the handler was cleared) fails only for its caller
317
+ if (!this.isSupersededLoad(generation)) {
318
+ this.loadInProgress_BS.next(false);
319
+ this.loaded_BS.next(false);
320
+ }
292
321
  // BFR-MASTERPROMPTER-128 — the silenced missing-ID error (the `getData` not-loaded-yet path) is not logged here
293
322
  // either: it still THROWS, only the "reloadData was UNSUCCESSFUL" line is left out
294
323
  const silenced = !!opts?.silentMissingId && !!missingIdError && error === missingIdError;
@@ -317,10 +346,16 @@ export class DyFM_DataHandler_ControlModel {
317
346
  return this.data;
318
347
  }
319
348
  }
320
- async doReloadDataBy(loadedBy) {
349
+ /**
350
+ * Loads by the key and applies the answer, unless the load was superseded meanwhile (BFR-FLEET-078).
351
+ *
352
+ * @param loadedBy the key
353
+ * @param generation the load's number (`reloadData` gives it; a direct call starts a new one)
354
+ */
355
+ async doReloadDataBy(loadedBy, generation = ++this.loadGeneration) {
321
356
  try {
322
357
  this.lastLoadedBy = loadedBy;
323
- return await this.processLoadResult(await this.get(loadedBy), loadedBy);
358
+ return await this.processLoadResult(await this.get(loadedBy), loadedBy, generation);
324
359
  }
325
360
  catch (error) {
326
361
  this.resolveWaitsOnLoad();
@@ -367,6 +402,9 @@ export class DyFM_DataHandler_ControlModel {
367
402
  }
368
403
  this.isClearing = true;
369
404
  try {
405
+ // BFR-FLEET-078: the answer of a load in flight is not applied any more, and a new load does not wait for it
406
+ this.loadGeneration++;
407
+ this.loadInProgress_BS.next(false);
370
408
  this.data_BS.next(undefined);
371
409
  this.lastLoadedBy = undefined;
372
410
  if (!dontClearDependents) {
@@ -379,13 +417,24 @@ export class DyFM_DataHandler_ControlModel {
379
417
  this.isClearing = false;
380
418
  }
381
419
  }
382
- async processLoadResult(result, loadedBy) {
420
+ /**
421
+ * Runs the post-processes on a loaded answer and applies it. BFR-FLEET-078: a superseded load stops before the
422
+ * next post-process (they reload or clear the dependents) and is not applied.
423
+ *
424
+ * @param result the answer of the `get`
425
+ * @param loadedBy the key
426
+ * @param generation the load's number (`undefined`: applied whatever happened meanwhile, as before)
427
+ */
428
+ async processLoadResult(result, loadedBy, generation) {
383
429
  if (this.debugLog) {
384
430
  console.log(`DYNAMO DH.processLoadResult (${this.name}) DEBUG:` +
385
431
  `\n DataHandler processLoadResult... (using id: ${loadedBy})` +
386
432
  `\n Result:`, result);
387
433
  }
388
434
  for (const postProcess of this.getPostProcesses) {
435
+ if (this.isSupersededLoad(generation)) {
436
+ return await this.supersededResult();
437
+ }
389
438
  if (this.debugLog) {
390
439
  console.log(`DYNAMO DH.processLoadResult (${this.name}) DEBUG:` +
391
440
  `\n Post process:`, postProcess);
@@ -396,6 +445,9 @@ export class DyFM_DataHandler_ControlModel {
396
445
  `\nPost process returned null or undefined!`, '\n\n', new Error());
397
446
  }
398
447
  }
448
+ if (this.isSupersededLoad(generation)) {
449
+ return await this.supersededResult();
450
+ }
399
451
  this.data_BS.next(result);
400
452
  this.loaded_BS.next(true);
401
453
  this.resolveWaitsOnLoad();
@@ -122,7 +122,8 @@ export class DyFM_DataListHandler_ControlModel extends DyFM_DataHandler {
122
122
  try {
123
123
  const setActiveItem = !this.activeItem_BS.value || this.activeItem_BS.value?._id !== loadBy;
124
124
  const dataList = await super.reloadData(loadBy);
125
- if (setActiveItem && dataList.length > 0) {
125
+ // BFR-FLEET-078: a load superseded by a clear returns the cleared (empty) data
126
+ if (setActiveItem && dataList?.length > 0) {
126
127
  this.setActiveItem(dataList[0]);
127
128
  }
128
129
  return dataList;
@@ -51,6 +51,11 @@ export class DyFM_DataHandler_ControlModel {
51
51
  dependency_DH;
52
52
  /** BFR-CREDIT-117 - a clear in progress (a cyclic dependency is cleared once). */
53
53
  isClearing = false;
54
+ /**
55
+ * BFR-FLEET-078 - the number of the latest load; a new load and a `clear()` move it. The answer of an older load
56
+ * (superseded by a newer one, or by a clear, e.g. a logout) changes nothing: no data, no loaded / failed state.
57
+ */
58
+ loadGeneration = 0;
54
59
  /** BFR-ORGANIZER-040 - the dependency's current `_id`, as this handler's key (`undefined`: none). */
55
60
  dependencyLoadBy() {
56
61
  const data = this.dependency_DH?.data;
@@ -62,6 +67,18 @@ export class DyFM_DataHandler_ControlModel {
62
67
  ? data._id
63
68
  : undefined;
64
69
  }
70
+ /** BFR-FLEET-078 - whether the load of this generation was superseded (`undefined`: not a load, never). */
71
+ isSupersededLoad(generation) {
72
+ return generation !== undefined && generation !== this.loadGeneration;
73
+ }
74
+ /**
75
+ * BFR-FLEET-078 - what the caller of a superseded load gets: the newer load's result (it is in flight), else the
76
+ * current data (the newer load is done, or the handler was cleared).
77
+ */
78
+ async supersededResult() {
79
+ const inFlight = this.loadInProgress_$();
80
+ return inFlight ? await inFlight.progress : this.data;
81
+ }
65
82
  loopSafetyCollection = [];
66
83
  loopSafetyTimeout = second;
67
84
  /** if set to 0, loop safety will be disabled */
@@ -248,6 +265,8 @@ export class DyFM_DataHandler_ControlModel {
248
265
  async reloadData(loadBy, opts) {
249
266
  /** BFR-MASTERPROMPTER-128 — the missing-ID error of THIS call (silenced by `silentMissingId` in the catch too). */
250
267
  let missingIdError;
268
+ /** BFR-FLEET-078 — the generation of the load this call started or joined (`undefined`: none). */
269
+ let generation;
251
270
  try {
252
271
  const loadInProgress = this.loadInProgress_$();
253
272
  const useLoadBy = loadBy ??
@@ -270,6 +289,8 @@ export class DyFM_DataHandler_ControlModel {
270
289
  // BFR-MASTERPROMPTER-074: a second call for the SAME key awaits the load in flight. Returning `this.data`
271
290
  // here handed the caller the not-yet-loaded (undefined / stale) value - measured: MP "Create Flow" during the
272
291
  // first `loadMyFlows()` got `undefined` and crashed on `myFlows.find`. Same contract as `getData()`.
292
+ // BFR-FLEET-078: the joined load is the latest one
293
+ generation = this.loadGeneration;
273
294
  return await loadInProgress.progress;
274
295
  }
275
296
  if (this.debugLog) {
@@ -278,28 +299,36 @@ export class DyFM_DataHandler_ControlModel {
278
299
  }
279
300
  // BFR-ORGANIZER-041: a new load is not failed (yet)
280
301
  this.loadError_$?.set(undefined);
281
- const loadProgress = this.doReloadDataBy(useLoadBy);
302
+ generation = ++this.loadGeneration;
303
+ const loadGeneration = generation;
304
+ const loadProgress = this.doReloadDataBy(useLoadBy, loadGeneration);
282
305
  this.loadInProgress_$.set({
283
306
  loadBy: useLoadBy,
284
307
  progress: loadProgress
285
308
  });
286
309
  // clears the in-flight marker on BOTH outcomes; `.finally()` returned a derived promise that rejected unhandled on
287
- // every failed load (an "Uncaught (in promise)" beside the real error) — the caller already receives the error
310
+ // every failed load (an "Uncaught (in promise)" beside the real error) — the caller already receives the error.
311
+ // BFR-FLEET-078: only its own marker (a superseded load must not clear the newer load's)
288
312
  const clearInProgress = () => {
289
- this.loadInProgress_$.set(false);
313
+ if (!this.isSupersededLoad(loadGeneration)) {
314
+ this.loadInProgress_$.set(false);
315
+ }
290
316
  };
291
317
  loadProgress.then(clearInProgress, clearInProgress);
292
318
  return await loadProgress;
293
319
  }
294
320
  catch (error) {
295
- this.loadInProgress_$.set(false);
296
- this.loaded_$.set(false);
297
321
  // BFR-MASTERPROMPTER-128 — the silenced missing-ID error (the `getData` not-loaded-yet path) is not logged here
298
322
  // either: it still THROWS, only the "reloadData was UNSUCCESSFUL" line is left out
299
323
  const silenced = !!opts?.silentMissingId && !!missingIdError && error === missingIdError;
300
- // BFR-ORGANIZER-041: a failed load is visible as such (the silenced missing ID is "not loaded yet")
301
- if (!silenced) {
302
- this.loadError_$?.set(error ?? new Error(`DynamoERROR (DH.reloadData): the load failed (${this.name})`));
324
+ // BFR-FLEET-078: a superseded load (a newer one started, or the handler was cleared) fails only for its caller
325
+ if (!this.isSupersededLoad(generation)) {
326
+ this.loadInProgress_$.set(false);
327
+ this.loaded_$.set(false);
328
+ // BFR-ORGANIZER-041: a failed load is visible as such (the silenced missing ID is "not loaded yet")
329
+ if (!silenced) {
330
+ this.loadError_$?.set(error ?? new Error(`DynamoERROR (DH.reloadData): the load failed (${this.name})`));
331
+ }
303
332
  }
304
333
  if (!error?.error?.handled && !silenced) {
305
334
  console.error(`DYNAMO DH.reloadData (${this.name}) ERROR: ` +
@@ -327,10 +356,16 @@ export class DyFM_DataHandler_ControlModel {
327
356
  return this.data;
328
357
  }
329
358
  }
330
- async doReloadDataBy(loadedBy) {
359
+ /**
360
+ * Loads by the key and applies the answer, unless the load was superseded meanwhile (BFR-FLEET-078).
361
+ *
362
+ * @param loadedBy the key
363
+ * @param generation the load's number (`reloadData` gives it; a direct call starts a new one)
364
+ */
365
+ async doReloadDataBy(loadedBy, generation = ++this.loadGeneration) {
331
366
  try {
332
367
  this.lastLoadedBy = loadedBy;
333
- return await this.processLoadResult(await this.get(loadedBy), loadedBy);
368
+ return await this.processLoadResult(await this.get(loadedBy), loadedBy, generation);
334
369
  }
335
370
  catch (error) {
336
371
  this.resolveWaitsOnLoad();
@@ -376,6 +411,9 @@ export class DyFM_DataHandler_ControlModel {
376
411
  }
377
412
  this.isClearing = true;
378
413
  try {
414
+ // BFR-FLEET-078: the answer of a load in flight is not applied any more, and a new load does not wait for it
415
+ this.loadGeneration++;
416
+ this.loadInProgress_$.set(false);
379
417
  this.data_$.set(undefined);
380
418
  this.lastLoadedBy = undefined;
381
419
  this.loadError_$?.set(undefined);
@@ -389,7 +427,15 @@ export class DyFM_DataHandler_ControlModel {
389
427
  this.isClearing = false;
390
428
  }
391
429
  }
392
- async processLoadResult(result, loadedBy) {
430
+ /**
431
+ * Runs the post-processes on a loaded answer and applies it. BFR-FLEET-078: a superseded load stops before the
432
+ * next post-process (they reload or clear the dependents) and is not applied.
433
+ *
434
+ * @param result the answer of the `get`
435
+ * @param loadedBy the key
436
+ * @param generation the load's number (`undefined`: applied whatever happened meanwhile, as before)
437
+ */
438
+ async processLoadResult(result, loadedBy, generation) {
393
439
  try {
394
440
  if (this.debugLog) {
395
441
  console.log(`DYNAMO DH.processLoadResult (${this.name}) DEBUG:` +
@@ -397,6 +443,9 @@ export class DyFM_DataHandler_ControlModel {
397
443
  `\n Result:`, result);
398
444
  }
399
445
  for (const postProcess of this.getPostProcesses) {
446
+ if (this.isSupersededLoad(generation)) {
447
+ return await this.supersededResult();
448
+ }
400
449
  if (this.debugLog) {
401
450
  console.log(`DYNAMO DH.processLoadResult (${this.name}) DEBUG:` +
402
451
  `\n Post process:`, postProcess);
@@ -407,6 +456,9 @@ export class DyFM_DataHandler_ControlModel {
407
456
  `\nPost process returned null or undefined!`, '\n\n', new Error());
408
457
  }
409
458
  }
459
+ if (this.isSupersededLoad(generation)) {
460
+ return await this.supersededResult();
461
+ }
410
462
  this.data_$.set(result);
411
463
  this.loaded_$.set(true);
412
464
  this.loadError_$?.set(undefined);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@futdevpro/fsm-dynamo",
3
- "version": "1.20.184",
3
+ "version": "1.20.185",
4
4
  "description": "Full Stack Model Collection for Dynamic (NodeJS-Typescript) Framework called Dynamo, by Future Development Ltd.",
5
5
  "DyBu_settings": {
6
6
  "packageType": "full-stack-package",