http-request-manager 18.16.13 → 18.16.16

package/fesm2022/http-request-manager.mjs

@@ -7013,14 +7013,18 @@ class HTTPManagerStateService extends ComponentStore {
                 return this.httpManagerService.getRequest(requestOptions, effectiveParams).pipe(tap((data) => {
                     // Extract array from paginated response if needed
                     const arrayData = (data?.results && Array.isArray(data.results)) ? data.results : data;
-                    data = (!arrayData) ? (this.dataType === DataType.ARRAY) ? [] : {} : arrayData;
-                    this.setData$(data);
+                    // Apply adapter to response data
+                    let adaptedData = this.applyAdapter(arrayData);
+                    adaptedData = (!adaptedData) ? (this.dataType === DataType.ARRAY) ? [] : {} : adaptedData;
+                    this.setData$(adaptedData);
                 }), concatMap((data) => {
                     // Extract array from paginated response for database storage
                     const dbData = (data?.results && Array.isArray(data.results)) ? data.results : data;
-                    if (this.hasDatabase && this.databaseOptions?.table && Array.isArray(dbData) && dbData.length > 0) {
+                    // Apply adapter before database storage
+                    const adaptedDbData = this.applyAdapter(dbData);
+                    if (this.hasDatabase && this.databaseOptions?.table && Array.isArray(adaptedDbData) && adaptedDbData.length > 0) {
                         const tableName = this.databaseOptions.table;
-                        const schema = this.buildSchemaFromSample(dbData[0]);
+                        const schema = this.buildSchemaFromSample(adaptedDbData[0]);
                         const tableDef = TableSchemaDef.adapt({ table: tableName, schema });
                         const schemaSignature = this.buildSchemaSignature(schema);
                         // Always ensure table exists immediately before writing to avoid stale schema/store races.
@@ -7035,7 +7039,7 @@ class HTTPManagerStateService extends ComponentStore {
                                     console.warn('[DB STORAGE] Table create/open not ready, skipping DB write for this payload:', { table: tableName });
                                     return of(data);
                                 }
-                                return this.dbManagerService.createTableRecords(tableName, dbData).pipe(tap(() => this.saveRequestCacheMetadata(tableName, 'GET', requestSignature, schemaSignature, options)));
+                                return this.dbManagerService.createTableRecords(tableName, adaptedDbData).pipe(tap(() => this.saveRequestCacheMetadata(tableName, 'GET', requestSignature, schemaSignature, options)));
                             }));
                         }), catchError((error) => {
                             console.error('[DB STORAGE] Failed to ensure table and write records:', { table: tableName, schema, error });
@@ -7158,39 +7162,43 @@ class HTTPManagerStateService extends ComponentStore {
                 // Restore original path after request completes
                 this.apiOptions.path = originalPath;
                 console.log('🔧 Restored apiOptions.path to:', originalPath);
-                data = (!data) ? (this.dataType === DataType.ARRAY) ? [] : {} : data;
+                // Apply adapter if provided
+                let adaptedData = this.applyAdapter(data);
+                adaptedData = (!adaptedData) ? (this.dataType === DataType.ARRAY) ? [] : {} : adaptedData;
                 const id = options.path?.length ? options.path[options.path.length - 1] : null;
                 if (method === 'DELETE') {
                     console.log('🗑️ Deleting record with id:', id);
                     this.deleteData$({ id });
                 }
                 if (method === 'UPDATE') {
-                    console.log('✏️ Updating record:', data);
-                    this.updateData$(data);
+                    console.log('✏️ Updating record:', adaptedData);
+                    this.updateData$(adaptedData);
                 }
                 if (method === 'CREATE') {
-                    console.log('➕ Adding record:', data);
-                    this.addData$(data);
+                    console.log('➕ Adding record:', adaptedData);
+                    this.addData$(adaptedData);
                 }
             }), concatMap((data) => {
+                // Apply adapter to data before database operations
+                const adaptedData = this.applyAdapter(data);
                 if (this.hasDatabase && this.databaseOptions?.table) {
                     const id = options.path?.length ? options.path[options.path.length - 1] : null;
                     if (method === 'DELETE' && id)
                         return this.dbManagerService.deleteTableRecord(this.databaseOptions.table, id);
-                    if (method === 'UPDATE' && data)
-                        return this.dbManagerService.updateTableRecord(this.databaseOptions.table, data);
-                    if (method === 'CREATE' && data) {
+                    if (method === 'UPDATE' && adaptedData)
+                        return this.dbManagerService.updateTableRecord(this.databaseOptions.table, adaptedData);
+                    if (method === 'CREATE' && adaptedData) {
                         // Validate that data has a valid id before saving to IndexedDB
-                        if (data && (data.id !== undefined && data.id !== null && data.id !== '')) {
-                            console.log('💾 Saving to IndexedDB:', { table: this.databaseOptions.table, id: data.id, data });
-                            return this.dbManagerService.createTableRecord(this.databaseOptions.table, data);
+                        if (adaptedData && (adaptedData.id !== undefined && adaptedData.id !== null && adaptedData.id !== '')) {
+                            console.log('💾 Saving to IndexedDB:', { table: this.databaseOptions.table, id: adaptedData.id, data: adaptedData });
+                            return this.dbManagerService.createTableRecord(this.databaseOptions.table, adaptedData);
                         }
                         else {
-                            console.warn('⚠️ Skipping IndexedDB save: data.id is invalid', data);
+                            console.warn('⚠️ Skipping IndexedDB save: data.id is invalid', adaptedData);
                         }
                     }
                 }
-                return of(data);
+                return of(adaptedData);
             }));
         })));
         // CREATE RECORD
@@ -7200,16 +7208,20 @@ class HTTPManagerStateService extends ComponentStore {
             const effectiveParams = this.getEffectiveParams(options?.path);
             return this.httpManagerService.postRequest(data, requestOptions, effectiveParams)
                 .pipe(tap((data) => {
-                data = (!data) ? (this.dataType === DataType.ARRAY) ? [] : {} : data;
-                this.addData$(data);
+                // Apply adapter to response data
+                let adaptedData = this.applyAdapter(data);
+                adaptedData = (!adaptedData) ? (this.dataType === DataType.ARRAY) ? [] : {} : adaptedData;
+                this.addData$(adaptedData);
                 this.operationSuccess.next(OperationResultModel.adapt({ success: true, operation: 'CREATE' }));
                 // Always call wsCommunication - it will queue if not connected
-                this.wsCommunication('CREATE', [...options?.path || [], data.id]);
+                this.wsCommunication('CREATE', [...options?.path || [], adaptedData.id]);
             }), concatMap((data) => {
-                if (this.hasDatabase && this.databaseOptions?.table && data?.id) {
-                    return this.dbManagerService.createTableRecord(this.databaseOptions.table, data);
+                // Apply adapter before database operations
+                const adaptedData = this.applyAdapter(data);
+                if (this.hasDatabase && this.databaseOptions?.table && adaptedData?.id) {
+                    return this.dbManagerService.createTableRecord(this.databaseOptions.table, adaptedData);
                 }
-                return of(data);
+                return of(adaptedData);
             }));
         })));
         // UPDATE RECORD
@@ -7219,16 +7231,20 @@ class HTTPManagerStateService extends ComponentStore {
             const effectiveParams = this.getEffectiveParams(options?.path);
             return this.httpManagerService.putRequest(data, requestOptions, effectiveParams)
                 .pipe(tap((data) => {
-                data = (!data) ? (this.dataType === DataType.ARRAY) ? [] : {} : data;
-                this.updateData$(data);
+                // Apply adapter to response data
+                let adaptedData = this.applyAdapter(data);
+                adaptedData = (!adaptedData) ? (this.dataType === DataType.ARRAY) ? [] : {} : adaptedData;
+                this.updateData$(adaptedData);
                 this.operationSuccess.next(OperationResultModel.adapt({ success: true, operation: 'UPDATE' }));
                 // Always call wsCommunication - it will queue if not connected
                 this.wsCommunication('UPDATE', [...options?.path || []]);
             }), concatMap((data) => {
-                if (this.hasDatabase && this.databaseOptions?.table && data?.id) {
-                    return this.dbManagerService.updateTableRecord(this.databaseOptions.table, data);
+                // Apply adapter before database operations
+                const adaptedData = this.applyAdapter(data);
+                if (this.hasDatabase && this.databaseOptions?.table && adaptedData?.id) {
+                    return this.dbManagerService.updateTableRecord(this.databaseOptions.table, adaptedData);
                 }
-                return of(data);
+                return of(adaptedData);
             }));
         })));
         // DELETE RECORD
@@ -7238,16 +7254,20 @@ class HTTPManagerStateService extends ComponentStore {
             const effectiveParams = this.getEffectiveParams(options?.path);
             return this.httpManagerService.deleteRequest(requestOptions, effectiveParams)
                 .pipe(tap((data) => {
-                data = (!data) ? (this.dataType === DataType.ARRAY) ? [] : {} : data;
-                this.deleteData$(data);
+                // Apply adapter to response data
+                let adaptedData = this.applyAdapter(data);
+                adaptedData = (!adaptedData) ? (this.dataType === DataType.ARRAY) ? [] : {} : adaptedData;
+                this.deleteData$(adaptedData);
                 this.operationSuccess.next(OperationResultModel.adapt({ success: true, operation: 'DELETE' }));
                 // Always call wsCommunication - it will queue if not connected
                 this.wsCommunication('DELETE', [...options?.path || []]);
             }), concatMap((data) => {
-                if (this.hasDatabase && this.databaseOptions?.table && data?.id) {
-                    return this.dbManagerService.deleteTableRecord(this.databaseOptions.table, data.id);
+                // Apply adapter before database operations
+                const adaptedData = this.applyAdapter(data);
+                if (this.hasDatabase && this.databaseOptions?.table && adaptedData?.id) {
+                    return this.dbManagerService.deleteTableRecord(this.databaseOptions.table, adaptedData.id);
                 }
-                return of(data);
+                return of(adaptedData);
             }));
         })));
         // --------------------------------------------------------------------------------------------------
@@ -7257,9 +7277,11 @@ class HTTPManagerStateService extends ComponentStore {
             const effectiveParams = this.getEffectiveParams(options?.path);
             return this.httpManagerService.postRequest(data, requestOptions, effectiveParams)
                 .pipe(tap((res) => {
-                if (res.length > 0)
-                    this.setData$(res);
-                this.streamedResponse = res;
+                // Apply adapter to streaming response
+                const adaptedRes = this.applyAdapter(res);
+                if (adaptedRes.length > 0)
+                    this.setData$(adaptedRes);
+                this.streamedResponse = adaptedRes;
             }), concatMap((res) => this.persistStreamDataToDb(res, options)), scan((acc, res) => {
                 const previous = acc.current;
                 const current = res;
@@ -7340,11 +7362,13 @@ class HTTPManagerStateService extends ComponentStore {
                     }));
                 })).pipe(tap((packet) => {
                     const res = packet?.data;
-                    // console.log('[DEBUG] Streaming response received:', res)
-                    if (res && res.length > 0) {
-                        // console.log('[DEBUG] Updating state with streaming data:', res)
-                        this.setData$(res);
-                        this.streamedResponse = [...this.streamedResponse, ...res];
+                    // Apply adapter to streaming response
+                    const adaptedRes = this.applyAdapter(res);
+                    // console.log('[DEBUG] Streaming response received:', adaptedRes)
+                    if (adaptedRes && adaptedRes.length > 0) {
+                        // console.log('[DEBUG] Updating state with streaming data:', adaptedRes)
+                        this.setData$(adaptedRes);
+                        this.streamedResponse = [...this.streamedResponse, ...adaptedRes];
                     }
                 }), concatMap((packet) => {
                     if (packet?.fromCache) {
@@ -7362,15 +7386,17 @@ class HTTPManagerStateService extends ComponentStore {
             // If no database is configured, always call the API (do not check tracker)
             return this.httpManagerService.getRequest(requestOptions, effectiveParams)
                 .pipe(tap((res) => {
-                console.log('[DEBUG] Streaming response received:', res);
+                // Apply adapter to streaming response
+                const adaptedRes = this.applyAdapter(res);
+                console.log('[DEBUG] Streaming response received:', adaptedRes);
                 // Always update state with streaming data
-                if (res && res.length > 0) {
-                    // console.log('[DEBUG] Updating state with streaming data:', res)
-                    this.setData$(res);
-                    this.streamedResponse = [...this.streamedResponse, ...res];
+                if (adaptedRes && adaptedRes.length > 0) {
+                    // console.log('[DEBUG] Updating state with streaming data:', adaptedRes)
+                    this.setData$(adaptedRes);
+                    this.streamedResponse = [...this.streamedResponse, ...adaptedRes];
                 }
                 else {
-                    // console.log('[DEBUG] No streaming data or empty array:', res)
+                    // console.log('[DEBUG] No streaming data or empty array:', adaptedRes)
                 }
             }), concatMap((res) => this.persistStreamDataToDb(res, options)), map((res) => {
                 // console.log('[DEBUG] Returning data to subscribers:', res)
@@ -7664,15 +7690,17 @@ class HTTPManagerStateService extends ComponentStore {
         if (!this.hasDatabase || !this.databaseOptions?.table) {
             return of(payload);
         }
-        const dbData = (payload?.results && Array.isArray(payload.results))
-            ? payload.results
-            : Array.isArray(payload)
-                ? payload
-                : payload
-                    ? [payload]
+        // Apply adapter to payload before processing
+        const adaptedPayload = this.applyAdapter(payload);
+        const dbData = (adaptedPayload?.results && Array.isArray(adaptedPayload.results))
+            ? adaptedPayload.results
+            : Array.isArray(adaptedPayload)
+                ? adaptedPayload
+                : adaptedPayload
+                    ? [adaptedPayload]
                     : [];
         if (dbData.length === 0) {
-            return of(payload);
+            return of(adaptedPayload);
         }
         const tableName = this.databaseOptions.table;
         const requestOptions = this.updateRequestOptions(streamOptions?.headers);
@@ -7691,13 +7719,13 @@ class HTTPManagerStateService extends ComponentStore {
             return ensureTable$.pipe(switchMap((created) => {
                 if (!created) {
                     console.warn('[DB STORAGE] Stream table create/open not ready, skipping DB write for this chunk:', { table: tableName });
-                    return of(payload);
+                    return of(adaptedPayload);
                 }
-                return this.dbManagerService.createTableRecords(tableName, dbData).pipe(tap(() => this.saveRequestCacheMetadata(tableName, 'STREAM', requestSignature, schemaSignature, streamOptions)), map(() => payload));
+                return this.dbManagerService.createTableRecords(tableName, dbData).pipe(tap(() => this.saveRequestCacheMetadata(tableName, 'STREAM', requestSignature, schemaSignature, streamOptions)), map(() => adaptedPayload));
             }));
-        }), map(() => payload), catchError((error) => {
+        }), map(() => adaptedPayload), catchError((error) => {
             console.error('[DB STORAGE] Failed to persist streaming payload:', { table: tableName, schema, error });
-            return of(payload);
+            return of(adaptedPayload);
         }));
     }
     // WEBSOCKET COMMUNICATION (STATE MANAGER)
@@ -8017,6 +8045,20 @@ class HTTPManagerStateService extends ComponentStore {
     isEmpty(obj) {
         return Object.keys(obj).length === 0;
     }
+    /**
+     * Apply adapter to data if adapter is provided
+     * Handles both array and single object responses
+     * Only applies adapter when it exists - returns data as-is otherwise
+     */
+    applyAdapter(data) {
+        if (!data || !this.apiOptions?.adapter) {
+            return data;
+        }
+        if (Array.isArray(data)) {
+            return data.map((item) => this.apiOptions.adapter(item));
+        }
+        return this.apiOptions.adapter(data);
+    }
     updateRequestOptions(headers) {
         const options = ApiRequest.adapt({ ...this.apiOptions });
         options.headers = (headers)