diff --git a/package-lock.json b/package-lock.json index ed1f62b..330b402 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,6 +23,7 @@ "angular-in-memory-web-api": "^0.18.0", "chance": "^1.1.4", "firebase": "^9.9.2", + "lodash.merge": "^4.6.2", "object-hash": "^2.0.3", "rxjs": "7.5.3", "tslib": "^2.6.3", @@ -16765,8 +16766,7 @@ "node_modules/lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" }, "node_modules/lodash.set": { "version": "4.3.2", diff --git a/package.json b/package.json index 59fad8b..b351499 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,7 @@ "angular-in-memory-web-api": "^0.18.0", "chance": "^1.1.4", "firebase": "^9.9.2", + "lodash.merge": "^4.6.2", "object-hash": "^2.0.3", "rxjs": "7.5.3", "tslib": "^2.6.3", diff --git a/projects/ngx-firestore-repository/package.json b/projects/ngx-firestore-repository/package.json index 107303b..127fb37 100644 --- a/projects/ngx-firestore-repository/package.json +++ b/projects/ngx-firestore-repository/package.json @@ -1,10 +1,10 @@ { "name": "@paddls/ngx-firestore-repository", - "version": "8.1.2-rc.2", + "version": "8.1.2-rc.3", "peerDependencies": { "@angular/common": ">= 18.0.0", "@angular/core": ">= 18.0.0", - "@paddls/ngx-repository": "^8.0.0 || 8.1.2-rc.2", + "@paddls/ngx-repository": "^8.0.0 || 8.1.2-rc.3", "firebase": ">= 9.9.2" }, "dependencies": { diff --git a/projects/ngx-http-repository/ng-package.json b/projects/ngx-http-repository/ng-package.json index 0d43c70..980ff4b 100644 --- a/projects/ngx-http-repository/ng-package.json +++ b/projects/ngx-http-repository/ng-package.json @@ -5,5 +5,6 @@ "entryFile": "src/public-api.ts" }, "allowedNonPeerDependencies": [ + "lodash.merge" ] } diff --git a/projects/ngx-http-repository/package.json b/projects/ngx-http-repository/package.json index 4b37213..2bc7edf 100644 --- a/projects/ngx-http-repository/package.json +++ b/projects/ngx-http-repository/package.json @@ -1,13 +1,14 @@ { "name": "@paddls/ngx-http-repository", - "version": "8.1.2-rc.2", + "version": "8.1.2-rc.3", "peerDependencies": { "@angular/common": ">= 18.0.0", "@angular/core": ">= 18.0.0", - "@paddls/ngx-repository": "^8.0.0 || 8.1.2-rc.2" + "@paddls/ngx-repository": "^8.0.0 || 8.1.2-rc.3" }, "dependencies": { - "tslib": "^2.0.0" + "tslib": "^2.0.0", + "lodash.merge": "^4.6.2" }, "repository": { "type": "git", diff --git a/projects/ngx-http-repository/src/lib/repository/http.repository.ts b/projects/ngx-http-repository/src/lib/repository/http.repository.ts index ce854e4..8b0f17c 100644 --- a/projects/ngx-http-repository/src/lib/repository/http.repository.ts +++ b/projects/ngx-http-repository/src/lib/repository/http.repository.ts @@ -45,7 +45,7 @@ import { OnHttpResourceChange } from '../decorator/on-http-resource-change.decor import { Inject, Type } from '@angular/core'; import { createHttpRepositoryConfiguration } from '../configuration/context/http-repository-context.configuration'; import { HTTP_REPOSITORY_CONFIGURATION } from '../configuration/http-repository.configuration'; -import { mergeDeep } from '../utils/merge-deep'; +import merge from 'lodash.merge'; @Repository(null, { requestBuilder: HttpRequestBuilder, @@ -262,7 +262,7 @@ export class HttpRepository extends AbstractRepository implements FindA } protected getResourceConfiguration(resourceType: Type, configuration: ResourceConfiguration): ResourceConfiguration { - const config = mergeDeep(configuration, Reflect.getMetadata(HTTP_RESOURCE_METADATA_KEY, resourceType)); + const config = merge(configuration, Reflect.getMetadata(HTTP_RESOURCE_METADATA_KEY, resourceType)); return createHttpRepositoryConfiguration(config); } diff --git a/projects/ngx-repository/package.json b/projects/ngx-repository/package.json index 8fd0cbe..24b3fc1 100644 --- a/projects/ngx-repository/package.json +++ b/projects/ngx-repository/package.json @@ -1,6 +1,6 @@ { "name": "@paddls/ngx-repository", - "version": "8.1.2-rc.2", + "version": "8.1.2-rc.3", "peerDependencies": { "@angular/common": ">=18.0.0", "@angular/core": ">=18.0.0"