@ngrx/data 15.3.0 → 15.4.0

package/esm2020/src/dataservices/default-data.service.mjs

@@ -35,26 +35,26 @@ export class DefaultDataService {
     }
     add(entity, options) {
         const entityOrError = entity || new Error(`No "${this.entityName}" entity to add`);
-        return this.execute('POST', this.entityUrl, entityOrError, options);
+        return this.execute('POST', this.entityUrl, entityOrError, null, options);
     }
     delete(key, options) {
         let err;
         if (key == null) {
             err = new Error(`No "${this.entityName}" key to delete`);
         }
-        return this.execute('DELETE', this.entityUrl + key, err, options).pipe(
+        return this.execute('DELETE', this.entityUrl + key, err, null, options).pipe(
         // forward the id of deleted entity as the result of the HTTP DELETE
         map((result) => key));
     }
     getAll(options) {
-        return this.execute('GET', this.entitiesUrl, options);
+        return this.execute('GET', this.entitiesUrl, null, options);
     }
     getById(key, options) {
         let err;
         if (key == null) {
             err = new Error(`No "${this.entityName}" key to get`);
         }
-        return this.execute('GET', this.entityUrl + key, err, options);
+        return this.execute('GET', this.entityUrl + key, err, null, options);
     }
     getWithQuery(queryParams, options) {
         const qParams = typeof queryParams === 'string'
@@ -68,20 +68,20 @@ export class DefaultDataService {
         const updateOrError = id == null
             ? new Error(`No "${this.entityName}" update data or id`)
             : update.changes;
-        return this.execute('PUT', this.entityUrl + id, updateOrError, options);
+        return this.execute('PUT', this.entityUrl + id, updateOrError, null, options);
     }
     // Important! Only call if the backend service supports upserts as a POST to the target URL
     upsert(entity, options) {
         const entityOrError = entity || new Error(`No "${this.entityName}" entity to upsert`);
-        return this.execute('POST', this.entityUrl, entityOrError, options);
+        return this.execute('POST', this.entityUrl, entityOrError, null, options);
     }
     execute(method, url, data, // data, error, or undefined/null
     options, // options or undefined/null
     httpOptions // these override any options passed via options
     ) {
-        let ngHttpClientOptions = undefined;
+        let entityActionHttpClientOptions = undefined;
         if (httpOptions) {
-            ngHttpClientOptions = {
+            entityActionHttpClientOptions = {
                 headers: httpOptions?.httpHeaders
                     ? new HttpHeaders(httpOptions?.httpHeaders)
                     : undefined,
@@ -90,21 +90,24 @@ export class DefaultDataService {
                     : undefined,
             };
         }
+        // Now we may have:
+        // options: containing headers, params, or any other allowed http options already in angular's api
+        // entityActionHttpClientOptions: headers and params in angular's api
+        // We therefore need to merge these so that the action ones override the
+        // existing keys where applicable.
         // If any options have been specified, pass them to http client. Note
         // the new http options, if specified, will override any options passed
         // from the deprecated options parameter
         let mergedOptions = undefined;
-        if (options || ngHttpClientOptions) {
-            if (isDevMode() && options && ngHttpClientOptions) {
+        if (options || entityActionHttpClientOptions) {
+            if (isDevMode() && options && entityActionHttpClientOptions) {
                 console.warn('@ngrx/data: options.httpParams will be merged with queryParams when both are are provided to getWithQuery(). In the event of a conflict HttpOptions.httpParams will override queryParams`. The queryParams parameter of getWithQuery() will be removed in next major release.');
             }
-            mergedOptions = {};
-            if (ngHttpClientOptions?.headers) {
-                mergedOptions.headers = ngHttpClientOptions?.headers;
-            }
-            if (ngHttpClientOptions?.params || options?.params) {
-                mergedOptions.params = ngHttpClientOptions?.params ?? options?.params;
-            }
+            mergedOptions = {
+                ...options,
+                headers: entityActionHttpClientOptions?.headers ?? options?.headers,
+                params: entityActionHttpClientOptions?.params ?? options?.params,
+            };
         }
         const req = {
             method,
@@ -118,7 +121,7 @@ export class DefaultDataService {
         let result$;
         switch (method) {
             case 'DELETE': {
-                result$ = this.http.delete(url, ngHttpClientOptions);
+                result$ = this.http.delete(url, mergedOptions);
                 if (this.saveDelay) {
                     result$ = result$.pipe(delay(this.saveDelay));
                 }
@@ -132,7 +135,7 @@ export class DefaultDataService {
                 break;
             }
             case 'POST': {
-                result$ = this.http.post(url, data, ngHttpClientOptions);
+                result$ = this.http.post(url, data, mergedOptions);
                 if (this.saveDelay) {
                     result$ = result$.pipe(delay(this.saveDelay));
                 }
@@ -140,7 +143,7 @@ export class DefaultDataService {
             }
             // N.B.: It must return an Update<T>
             case 'PUT': {
-                result$ = this.http.put(url, data, ngHttpClientOptions);
+                result$ = this.http.put(url, data, mergedOptions);
                 if (this.saveDelay) {
                     result$ = result$.pipe(delay(this.saveDelay));
                 }
@@ -203,4 +206,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0", ngImpor
         }], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: i2.HttpUrlGenerator }, { type: i3.DefaultDataServiceConfig, decorators: [{
                     type: Optional
                 }] }]; } });
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"default-data.service.js","sourceRoot":"","sources":["../../../../../../modules/data/src/dataservices/default-data.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, isDevMode, Optional } from '@angular/core';\nimport {\n  HttpClient,\n  HttpErrorResponse,\n  HttpHeaders,\n  HttpParams,\n} from '@angular/common/http';\n\nimport { Observable, of, throwError } from 'rxjs';\nimport { catchError, delay, map, timeout } from 'rxjs/operators';\n\nimport { Update } from '@ngrx/entity';\n\nimport { DataServiceError } from './data-service-error';\nimport { DefaultDataServiceConfig } from './default-data-service-config';\nimport {\n  EntityCollectionDataService,\n  HttpMethods,\n  HttpOptions,\n  QueryParams,\n  RequestData,\n} from './interfaces';\nimport { HttpUrlGenerator } from './http-url-generator';\n\n/**\n * A basic, generic entity data service\n * suitable for persistence of most entities.\n * Assumes a common REST-y web API\n */\nexport class DefaultDataService<T> implements EntityCollectionDataService<T> {\n  protected _name: string;\n  protected delete404OK: boolean;\n  protected entityName: string;\n  protected entityUrl: string;\n  protected entitiesUrl: string;\n  protected getDelay = 0;\n  protected saveDelay = 0;\n  protected timeout = 0;\n  protected trailingSlashEndpoints = false;\n\n  get name() {\n    return this._name;\n  }\n\n  constructor(\n    entityName: string,\n    protected http: HttpClient,\n    protected httpUrlGenerator: HttpUrlGenerator,\n    config?: DefaultDataServiceConfig\n  ) {\n    this._name = `${entityName} DefaultDataService`;\n    this.entityName = entityName;\n    const {\n      root = 'api',\n      delete404OK = true,\n      getDelay = 0,\n      saveDelay = 0,\n      timeout: to = 0,\n      trailingSlashEndpoints = false,\n    } = config || {};\n    this.delete404OK = delete404OK;\n    this.entityUrl = httpUrlGenerator.entityResource(\n      entityName,\n      root,\n      trailingSlashEndpoints\n    );\n    this.entitiesUrl = httpUrlGenerator.collectionResource(entityName, root);\n    this.getDelay = getDelay;\n    this.saveDelay = saveDelay;\n    this.timeout = to;\n  }\n\n  add(entity: T, options?: HttpOptions): Observable<T> {\n    const entityOrError =\n      entity || new Error(`No \"${this.entityName}\" entity to add`);\n    return this.execute('POST', this.entityUrl, entityOrError, options);\n  }\n\n  delete(\n    key: number | string,\n    options?: HttpOptions\n  ): Observable<number | string> {\n    let err: Error | undefined;\n    if (key == null) {\n      err = new Error(`No \"${this.entityName}\" key to delete`);\n    }\n    return this.execute('DELETE', this.entityUrl + key, err, options).pipe(\n      // forward the id of deleted entity as the result of the HTTP DELETE\n      map((result) => key as number | string)\n    );\n  }\n\n  getAll(options?: HttpOptions): Observable<T[]> {\n    return this.execute('GET', this.entitiesUrl, options);\n  }\n\n  getById(key: number | string, options?: HttpOptions): Observable<T> {\n    let err: Error | undefined;\n    if (key == null) {\n      err = new Error(`No \"${this.entityName}\" key to get`);\n    }\n    return this.execute('GET', this.entityUrl + key, err, options);\n  }\n\n  getWithQuery(\n    queryParams: QueryParams | string | undefined,\n    options?: HttpOptions\n  ): Observable<T[]> {\n    const qParams =\n      typeof queryParams === 'string'\n        ? { fromString: queryParams }\n        : { fromObject: queryParams };\n    const params = new HttpParams(qParams);\n\n    return this.execute(\n      'GET',\n      this.entitiesUrl,\n      undefined,\n      { params },\n      options\n    );\n  }\n\n  update(update: Update<T>, options?: HttpOptions): Observable<T> {\n    const id = update && update.id;\n    const updateOrError =\n      id == null\n        ? new Error(`No \"${this.entityName}\" update data or id`)\n        : update.changes;\n    return this.execute('PUT', this.entityUrl + id, updateOrError, options);\n  }\n\n  // Important! Only call if the backend service supports upserts as a POST to the target URL\n  upsert(entity: T, options?: HttpOptions): Observable<T> {\n    const entityOrError =\n      entity || new Error(`No \"${this.entityName}\" entity to upsert`);\n    return this.execute('POST', this.entityUrl, entityOrError, options);\n  }\n\n  protected execute(\n    method: HttpMethods,\n    url: string,\n    data?: any, // data, error, or undefined/null\n    options?: any, // options or undefined/null\n    httpOptions?: HttpOptions // these override any options passed via options\n  ): Observable<any> {\n    let ngHttpClientOptions: any = undefined;\n    if (httpOptions) {\n      ngHttpClientOptions = {\n        headers: httpOptions?.httpHeaders\n          ? new HttpHeaders(httpOptions?.httpHeaders)\n          : undefined,\n        params: httpOptions?.httpParams\n          ? new HttpParams(httpOptions?.httpParams)\n          : undefined,\n      };\n    }\n\n    // If any options have been specified, pass them to http client. Note\n    // the new http options, if specified, will override any options passed\n    // from the deprecated options parameter\n    let mergedOptions: any = undefined;\n    if (options || ngHttpClientOptions) {\n      if (isDevMode() && options && ngHttpClientOptions) {\n        console.warn(\n          '@ngrx/data: options.httpParams will be merged with queryParams when both are are provided to getWithQuery(). In the event of a conflict HttpOptions.httpParams will override queryParams`. The queryParams parameter of getWithQuery() will be removed in next major release.'\n        );\n      }\n\n      mergedOptions = {};\n      if (ngHttpClientOptions?.headers) {\n        mergedOptions.headers = ngHttpClientOptions?.headers;\n      }\n      if (ngHttpClientOptions?.params || options?.params) {\n        mergedOptions.params = ngHttpClientOptions?.params ?? options?.params;\n      }\n    }\n\n    const req: RequestData = {\n      method,\n      url,\n      data,\n      options: mergedOptions,\n    };\n\n    if (data instanceof Error) {\n      return this.handleError(req)(data);\n    }\n\n    let result$: Observable<ArrayBuffer>;\n\n    switch (method) {\n      case 'DELETE': {\n        result$ = this.http.delete(url, ngHttpClientOptions);\n        if (this.saveDelay) {\n          result$ = result$.pipe(delay(this.saveDelay));\n        }\n        break;\n      }\n      case 'GET': {\n        result$ = this.http.get(url, mergedOptions);\n        if (this.getDelay) {\n          result$ = result$.pipe(delay(this.getDelay));\n        }\n        break;\n      }\n      case 'POST': {\n        result$ = this.http.post(url, data, ngHttpClientOptions);\n        if (this.saveDelay) {\n          result$ = result$.pipe(delay(this.saveDelay));\n        }\n        break;\n      }\n      // N.B.: It must return an Update<T>\n      case 'PUT': {\n        result$ = this.http.put(url, data, ngHttpClientOptions);\n        if (this.saveDelay) {\n          result$ = result$.pipe(delay(this.saveDelay));\n        }\n        break;\n      }\n      default: {\n        const error = new Error('Unimplemented HTTP method, ' + method);\n        result$ = throwError(error);\n      }\n    }\n    if (this.timeout) {\n      result$ = result$.pipe(timeout(this.timeout + this.saveDelay));\n    }\n    return result$.pipe(catchError(this.handleError(req)));\n  }\n\n  private handleError(reqData: RequestData) {\n    return (err: any) => {\n      const ok = this.handleDelete404(err, reqData);\n      if (ok) {\n        return ok;\n      }\n      const error = new DataServiceError(err, reqData);\n      return throwError(error);\n    };\n  }\n\n  private handleDelete404(error: HttpErrorResponse, reqData: RequestData) {\n    if (\n      error.status === 404 &&\n      reqData.method === 'DELETE' &&\n      this.delete404OK\n    ) {\n      return of({});\n    }\n    return undefined;\n  }\n}\n\n/**\n * Create a basic, generic entity data service\n * suitable for persistence of most entities.\n * Assumes a common REST-y web API\n */\n@Injectable()\nexport class DefaultDataServiceFactory {\n  constructor(\n    protected http: HttpClient,\n    protected httpUrlGenerator: HttpUrlGenerator,\n    @Optional() protected config?: DefaultDataServiceConfig\n  ) {\n    config = config || {};\n    httpUrlGenerator.registerHttpResourceUrls(config.entityHttpResourceUrls);\n  }\n\n  /**\n   * Create a default {EntityCollectionDataService} for the given entity type\n   * @param entityName {string} Name of the entity type for this data service\n   */\n  create<T>(entityName: string): EntityCollectionDataService<T> {\n    return new DefaultDataService<T>(\n      entityName,\n      this.http,\n      this.httpUrlGenerator,\n      this.config\n    );\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"default-data.service.js","sourceRoot":"","sources":["../../../../../../modules/data/src/dataservices/default-data.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, isDevMode, Optional } from '@angular/core';\nimport {\n  HttpClient,\n  HttpErrorResponse,\n  HttpHeaders,\n  HttpParams,\n} from '@angular/common/http';\n\nimport { Observable, of, throwError } from 'rxjs';\nimport { catchError, delay, map, timeout } from 'rxjs/operators';\n\nimport { Update } from '@ngrx/entity';\n\nimport { DataServiceError } from './data-service-error';\nimport { DefaultDataServiceConfig } from './default-data-service-config';\nimport {\n  EntityCollectionDataService,\n  HttpMethods,\n  HttpOptions,\n  QueryParams,\n  RequestData,\n} from './interfaces';\nimport { HttpUrlGenerator } from './http-url-generator';\n\n/**\n * A basic, generic entity data service\n * suitable for persistence of most entities.\n * Assumes a common REST-y web API\n */\nexport class DefaultDataService<T> implements EntityCollectionDataService<T> {\n  protected _name: string;\n  protected delete404OK: boolean;\n  protected entityName: string;\n  protected entityUrl: string;\n  protected entitiesUrl: string;\n  protected getDelay = 0;\n  protected saveDelay = 0;\n  protected timeout = 0;\n  protected trailingSlashEndpoints = false;\n\n  get name() {\n    return this._name;\n  }\n\n  constructor(\n    entityName: string,\n    protected http: HttpClient,\n    protected httpUrlGenerator: HttpUrlGenerator,\n    config?: DefaultDataServiceConfig\n  ) {\n    this._name = `${entityName} DefaultDataService`;\n    this.entityName = entityName;\n    const {\n      root = 'api',\n      delete404OK = true,\n      getDelay = 0,\n      saveDelay = 0,\n      timeout: to = 0,\n      trailingSlashEndpoints = false,\n    } = config || {};\n    this.delete404OK = delete404OK;\n    this.entityUrl = httpUrlGenerator.entityResource(\n      entityName,\n      root,\n      trailingSlashEndpoints\n    );\n    this.entitiesUrl = httpUrlGenerator.collectionResource(entityName, root);\n    this.getDelay = getDelay;\n    this.saveDelay = saveDelay;\n    this.timeout = to;\n  }\n\n  add(entity: T, options?: HttpOptions): Observable<T> {\n    const entityOrError =\n      entity || new Error(`No \"${this.entityName}\" entity to add`);\n    return this.execute('POST', this.entityUrl, entityOrError, null, options);\n  }\n\n  delete(\n    key: number | string,\n    options?: HttpOptions\n  ): Observable<number | string> {\n    let err: Error | undefined;\n    if (key == null) {\n      err = new Error(`No \"${this.entityName}\" key to delete`);\n    }\n\n    return this.execute(\n      'DELETE',\n      this.entityUrl + key,\n      err,\n      null,\n      options\n    ).pipe(\n      // forward the id of deleted entity as the result of the HTTP DELETE\n      map((result) => key as number | string)\n    );\n  }\n\n  getAll(options?: HttpOptions): Observable<T[]> {\n    return this.execute('GET', this.entitiesUrl, null, options);\n  }\n\n  getById(key: number | string, options?: HttpOptions): Observable<T> {\n    let err: Error | undefined;\n    if (key == null) {\n      err = new Error(`No \"${this.entityName}\" key to get`);\n    }\n    return this.execute('GET', this.entityUrl + key, err, null, options);\n  }\n\n  getWithQuery(\n    queryParams: QueryParams | string | undefined,\n    options?: HttpOptions\n  ): Observable<T[]> {\n    const qParams =\n      typeof queryParams === 'string'\n        ? { fromString: queryParams }\n        : { fromObject: queryParams };\n    const params = new HttpParams(qParams);\n\n    return this.execute(\n      'GET',\n      this.entitiesUrl,\n      undefined,\n      { params },\n      options\n    );\n  }\n\n  update(update: Update<T>, options?: HttpOptions): Observable<T> {\n    const id = update && update.id;\n    const updateOrError =\n      id == null\n        ? new Error(`No \"${this.entityName}\" update data or id`)\n        : update.changes;\n    return this.execute(\n      'PUT',\n      this.entityUrl + id,\n      updateOrError,\n      null,\n      options\n    );\n  }\n\n  // Important! Only call if the backend service supports upserts as a POST to the target URL\n  upsert(entity: T, options?: HttpOptions): Observable<T> {\n    const entityOrError =\n      entity || new Error(`No \"${this.entityName}\" entity to upsert`);\n    return this.execute('POST', this.entityUrl, entityOrError, null, options);\n  }\n\n  protected execute(\n    method: HttpMethods,\n    url: string,\n    data?: any, // data, error, or undefined/null\n    options?: any, // options or undefined/null\n    httpOptions?: HttpOptions // these override any options passed via options\n  ): Observable<any> {\n    let entityActionHttpClientOptions: any = undefined;\n    if (httpOptions) {\n      entityActionHttpClientOptions = {\n        headers: httpOptions?.httpHeaders\n          ? new HttpHeaders(httpOptions?.httpHeaders)\n          : undefined,\n        params: httpOptions?.httpParams\n          ? new HttpParams(httpOptions?.httpParams)\n          : undefined,\n      };\n    }\n\n    // Now we may have:\n    // options: containing headers, params, or any other allowed http options already in angular's api\n    // entityActionHttpClientOptions: headers and params in angular's api\n\n    // We therefore need to merge these so that the action ones override the\n    // existing keys where applicable.\n\n    // If any options have been specified, pass them to http client. Note\n    // the new http options, if specified, will override any options passed\n    // from the deprecated options parameter\n    let mergedOptions: any = undefined;\n    if (options || entityActionHttpClientOptions) {\n      if (isDevMode() && options && entityActionHttpClientOptions) {\n        console.warn(\n          '@ngrx/data: options.httpParams will be merged with queryParams when both are are provided to getWithQuery(). In the event of a conflict HttpOptions.httpParams will override queryParams`. The queryParams parameter of getWithQuery() will be removed in next major release.'\n        );\n      }\n\n      mergedOptions = {\n        ...options,\n        headers: entityActionHttpClientOptions?.headers ?? options?.headers,\n        params: entityActionHttpClientOptions?.params ?? options?.params,\n      };\n    }\n\n    const req: RequestData = {\n      method,\n      url,\n      data,\n      options: mergedOptions,\n    };\n\n    if (data instanceof Error) {\n      return this.handleError(req)(data);\n    }\n\n    let result$: Observable<ArrayBuffer>;\n\n    switch (method) {\n      case 'DELETE': {\n        result$ = this.http.delete(url, mergedOptions);\n        if (this.saveDelay) {\n          result$ = result$.pipe(delay(this.saveDelay));\n        }\n        break;\n      }\n      case 'GET': {\n        result$ = this.http.get(url, mergedOptions);\n        if (this.getDelay) {\n          result$ = result$.pipe(delay(this.getDelay));\n        }\n        break;\n      }\n      case 'POST': {\n        result$ = this.http.post(url, data, mergedOptions);\n        if (this.saveDelay) {\n          result$ = result$.pipe(delay(this.saveDelay));\n        }\n        break;\n      }\n      // N.B.: It must return an Update<T>\n      case 'PUT': {\n        result$ = this.http.put(url, data, mergedOptions);\n        if (this.saveDelay) {\n          result$ = result$.pipe(delay(this.saveDelay));\n        }\n        break;\n      }\n      default: {\n        const error = new Error('Unimplemented HTTP method, ' + method);\n        result$ = throwError(error);\n      }\n    }\n    if (this.timeout) {\n      result$ = result$.pipe(timeout(this.timeout + this.saveDelay));\n    }\n    return result$.pipe(catchError(this.handleError(req)));\n  }\n\n  private handleError(reqData: RequestData) {\n    return (err: any) => {\n      const ok = this.handleDelete404(err, reqData);\n      if (ok) {\n        return ok;\n      }\n      const error = new DataServiceError(err, reqData);\n      return throwError(error);\n    };\n  }\n\n  private handleDelete404(error: HttpErrorResponse, reqData: RequestData) {\n    if (\n      error.status === 404 &&\n      reqData.method === 'DELETE' &&\n      this.delete404OK\n    ) {\n      return of({});\n    }\n    return undefined;\n  }\n}\n\n/**\n * Create a basic, generic entity data service\n * suitable for persistence of most entities.\n * Assumes a common REST-y web API\n */\n@Injectable()\nexport class DefaultDataServiceFactory {\n  constructor(\n    protected http: HttpClient,\n    protected httpUrlGenerator: HttpUrlGenerator,\n    @Optional() protected config?: DefaultDataServiceConfig\n  ) {\n    config = config || {};\n    httpUrlGenerator.registerHttpResourceUrls(config.entityHttpResourceUrls);\n  }\n\n  /**\n   * Create a default {EntityCollectionDataService} for the given entity type\n   * @param entityName {string} Name of the entity type for this data service\n   */\n  create<T>(entityName: string): EntityCollectionDataService<T> {\n    return new DefaultDataService<T>(\n      entityName,\n      this.http,\n      this.httpUrlGenerator,\n      this.config\n    );\n  }\n}\n"]}

package/fesm2015/ngrx-data.mjs

@@ -694,26 +694,26 @@ class DefaultDataService {
     }
     add(entity, options) {
         const entityOrError = entity || new Error(`No "${this.entityName}" entity to add`);
-        return this.execute('POST', this.entityUrl, entityOrError, options);
+        return this.execute('POST', this.entityUrl, entityOrError, null, options);
     }
     delete(key, options) {
         let err;
         if (key == null) {
             err = new Error(`No "${this.entityName}" key to delete`);
         }
-        return this.execute('DELETE', this.entityUrl + key, err, options).pipe(
+        return this.execute('DELETE', this.entityUrl + key, err, null, options).pipe(
         // forward the id of deleted entity as the result of the HTTP DELETE
         map((result) => key));
     }
     getAll(options) {
-        return this.execute('GET', this.entitiesUrl, options);
+        return this.execute('GET', this.entitiesUrl, null, options);
     }
     getById(key, options) {
         let err;
         if (key == null) {
             err = new Error(`No "${this.entityName}" key to get`);
         }
-        return this.execute('GET', this.entityUrl + key, err, options);
+        return this.execute('GET', this.entityUrl + key, err, null, options);
     }
     getWithQuery(queryParams, options) {
         const qParams = typeof queryParams === 'string'
@@ -727,21 +727,21 @@ class DefaultDataService {
         const updateOrError = id == null
             ? new Error(`No "${this.entityName}" update data or id`)
             : update.changes;
-        return this.execute('PUT', this.entityUrl + id, updateOrError, options);
+        return this.execute('PUT', this.entityUrl + id, updateOrError, null, options);
     }
     // Important! Only call if the backend service supports upserts as a POST to the target URL
     upsert(entity, options) {
         const entityOrError = entity || new Error(`No "${this.entityName}" entity to upsert`);
-        return this.execute('POST', this.entityUrl, entityOrError, options);
+        return this.execute('POST', this.entityUrl, entityOrError, null, options);
     }
     execute(method, url, data, // data, error, or undefined/null
     options, // options or undefined/null
     httpOptions // these override any options passed via options
     ) {
-        var _a;
-        let ngHttpClientOptions = undefined;
+        var _a, _b;
+        let entityActionHttpClientOptions = undefined;
         if (httpOptions) {
-            ngHttpClientOptions = {
+            entityActionHttpClientOptions = {
                 headers: (httpOptions === null || httpOptions === void 0 ? void 0 : httpOptions.httpHeaders)
                     ? new HttpHeaders(httpOptions === null || httpOptions === void 0 ? void 0 : httpOptions.httpHeaders)
                     : undefined,
@@ -750,21 +750,20 @@ class DefaultDataService {
                     : undefined,
             };
         }
+        // Now we may have:
+        // options: containing headers, params, or any other allowed http options already in angular's api
+        // entityActionHttpClientOptions: headers and params in angular's api
+        // We therefore need to merge these so that the action ones override the
+        // existing keys where applicable.
         // If any options have been specified, pass them to http client. Note
         // the new http options, if specified, will override any options passed
         // from the deprecated options parameter
         let mergedOptions = undefined;
-        if (options || ngHttpClientOptions) {
-            if (isDevMode() && options && ngHttpClientOptions) {
+        if (options || entityActionHttpClientOptions) {
+            if (isDevMode() && options && entityActionHttpClientOptions) {
                 console.warn('@ngrx/data: options.httpParams will be merged with queryParams when both are are provided to getWithQuery(). In the event of a conflict HttpOptions.httpParams will override queryParams`. The queryParams parameter of getWithQuery() will be removed in next major release.');
             }
-            mergedOptions = {};
-            if (ngHttpClientOptions === null || ngHttpClientOptions === void 0 ? void 0 : ngHttpClientOptions.headers) {
-                mergedOptions.headers = ngHttpClientOptions === null || ngHttpClientOptions === void 0 ? void 0 : ngHttpClientOptions.headers;
-            }
-            if ((ngHttpClientOptions === null || ngHttpClientOptions === void 0 ? void 0 : ngHttpClientOptions.params) || (options === null || options === void 0 ? void 0 : options.params)) {
-                mergedOptions.params = (_a = ngHttpClientOptions === null || ngHttpClientOptions === void 0 ? void 0 : ngHttpClientOptions.params) !== null && _a !== void 0 ? _a : options === null || options === void 0 ? void 0 : options.params;
-            }
+            mergedOptions = Object.assign(Object.assign({}, options), { headers: (_a = entityActionHttpClientOptions === null || entityActionHttpClientOptions === void 0 ? void 0 : entityActionHttpClientOptions.headers) !== null && _a !== void 0 ? _a : options === null || options === void 0 ? void 0 : options.headers, params: (_b = entityActionHttpClientOptions === null || entityActionHttpClientOptions === void 0 ? void 0 : entityActionHttpClientOptions.params) !== null && _b !== void 0 ? _b : options === null || options === void 0 ? void 0 : options.params });
         }
         const req = {
             method,
@@ -778,7 +777,7 @@ class DefaultDataService {
         let result$;
         switch (method) {
             case 'DELETE': {
-                result$ = this.http.delete(url, ngHttpClientOptions);
+                result$ = this.http.delete(url, mergedOptions);
                 if (this.saveDelay) {
                     result$ = result$.pipe(delay(this.saveDelay));
                 }
@@ -792,7 +791,7 @@ class DefaultDataService {
                 break;
             }
             case 'POST': {
-                result$ = this.http.post(url, data, ngHttpClientOptions);
+                result$ = this.http.post(url, data, mergedOptions);
                 if (this.saveDelay) {
                     result$ = result$.pipe(delay(this.saveDelay));
                 }
@@ -800,7 +799,7 @@ class DefaultDataService {
             }
             // N.B.: It must return an Update<T>
             case 'PUT': {
-                result$ = this.http.put(url, data, ngHttpClientOptions);
+                result$ = this.http.put(url, data, mergedOptions);
                 if (this.saveDelay) {
                     result$ = result$.pipe(delay(this.saveDelay));
                 }