http-request-manager 18.15.0 → 18.15.2

package/fesm2022/http-request-manager.mjs

@@ -906,13 +906,12 @@ class NormalizedRequestOptionsModel {
 }
 
 class PathTrackerStateModel {
-    constructor(consumedValuesByKey = {}, baselineQuery, watchExpiresAt) {
+    constructor(consumedValuesByKey = {}, watchExpiresAt) {
         this.consumedValuesByKey = consumedValuesByKey;
-        this.baselineQuery = baselineQuery;
         this.watchExpiresAt = watchExpiresAt;
     }
     static adapt(item) {
-        return new PathTrackerStateModel(item?.consumedValuesByKey && typeof item.consumedValuesByKey === 'object' ? item.consumedValuesByKey : {}, item?.baselineQuery, item?.watchExpiresAt);
+        return new PathTrackerStateModel(item?.consumedValuesByKey && typeof item.consumedValuesByKey === 'object' ? item.consumedValuesByKey : {}, item?.watchExpiresAt);
     }
 }
 
@@ -6391,9 +6390,8 @@ class QueryParamsTrackerService {
         this.cleanupExpiredEntries();
         if (!normalized.hasQuery) {
             const pathState = this.ensurePathState(normalized.pathKey);
-            const pathSeenBefore = !!pathState.baselineQuery;
+            const pathSeenBefore = Object.keys(pathState.consumedValuesByKey).length > 0;
             if (!pathSeenBefore) {
-                pathState.baselineQuery = {};
                 this.persistState();
             }
             return !pathSeenBefore;
@@ -6415,19 +6413,20 @@ class QueryParamsTrackerService {
         if (Object.keys(filteredQuery).length === 0) {
             return false;
         }
-        if (!pathState.baselineQuery) {
-            pathState.baselineQuery = filteredQuery;
+        const hash = this.stringifyQuery(filteredQuery);
+        const consumed = pathState.consumedValuesByKey['__exact__'] || [];
+        if (!consumed.includes(hash)) {
+            pathState.consumedValuesByKey['__exact__'] = [...consumed, hash];
             this.persistState();
             return true;
         }
-        return this.stringifyQuery(pathState.baselineQuery) !== this.stringifyQuery(filteredQuery);
+        return false;
     }
     checkVariation(normalized, options) {
         const pathState = this.ensurePathState(normalized.pathKey);
         if (Array.isArray(options.watchParams) && options.watchParams.length === 0) {
-            const pathSeenBefore = !!pathState.baselineQuery;
+            const pathSeenBefore = Object.keys(pathState.consumedValuesByKey).length > 0;
             if (!pathSeenBefore) {
-                pathState.baselineQuery = {};
                 pathState.watchExpiresAt = this.buildExpiryEpoch(typeof options.watchExpiresAt !== 'undefined' ? options.watchExpiresAt : options.watchParamsExpire);
                 this.persistState();
             }
@@ -6449,9 +6448,6 @@ class QueryParamsTrackerService {
             }
         });
         if (accepted) {
-            if (!pathState.baselineQuery) {
-                pathState.baselineQuery = filteredQuery;
-            }
             pathState.watchExpiresAt = this.buildExpiryEpoch(typeof options.watchExpiresAt !== 'undefined' ? options.watchExpiresAt : options.watchParamsExpire);
             this.persistState();
         }
@@ -6609,9 +6605,8 @@ class QueryParamsTrackerService {
                 pathState.consumedValuesByKey = {};
                 pathState.watchExpiresAt = undefined;
             }
-            const hasBaseline = pathState.baselineQuery !== undefined;
             const hasTrackedValues = Object.keys(pathState.consumedValuesByKey).some((key) => (pathState.consumedValuesByKey[key] || []).length > 0);
-            if (!hasBaseline && !hasTrackedValues) {
+            if (!hasTrackedValues) {
                 delete this.state.paths[pathKey];
             }
         });
@@ -10142,22 +10137,22 @@ class RequestManagerStateDemoComponent {
     }
     onSetStateOptions() {
         const dbValue = this.database;
-        console.log('[onSetStateOptions] Called, checking form values:', {
-            isValid: this.isValid,
-            database: dbValue,
-            hasTable: !!dbValue?.table,
-            tableValue: dbValue?.table,
-            dataType: this.dataType
-        });
+        // console.log('[onSetStateOptions] Called, checking form values:', {
+        //   isValid: this.isValid,
+        //   database: dbValue,
+        //   hasTable: !!dbValue?.table,
+        //   tableValue: dbValue?.table,
+        //   dataType: this.dataType
+        // })
         if (!this.isValid) {
-            console.log('[onSetStateOptions] Form invalid, aborting');
+            // console.log('[onSetStateOptions] Form invalid, aborting')
             return;
         }
         const reqParams = this.compileRequest();
         const db = DatabaseStorage.adapt(dbValue);
-        console.log('[onSetStateOptions] DatabaseStorage.adapt result:', db);
+        // console.log('[onSetStateOptions] DatabaseStorage.adapt result:', db)
         const type = this.dataType === "ARRAY" ? DataType.ARRAY : DataType.OBJECT;
-        console.log('[onSetStateOptions] Calling setAPIOptions with:', { db, type, hasTable: !!db?.table });
+        // console.log('[onSetStateOptions] Calling setAPIOptions with:', { db, type, hasTable: !!db?.table })
         this.stateManagerDemoService.setAPIOptions(reqParams.apiOptions, type, db);
         this.requestForm.markAsPristine();
     }