Fix angular base fetch

lerna.json

@@ -3,7 +3,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "2.4.2",
+  "version": "2.4.3",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "publishConfig": {

packages/datx-jsonapi-angular/package.json

@@ -1,48 +1,24 @@
 {
   "name": "@datx/jsonapi-angular",
-  "version": "2.4.2",
-  "description": "DatX mixin for Angular JSON API support",
-  "main": "dist/bundles/datx-jsonapi-angular.umd.js",
-  "module": "dist/fesm2015/datx-jsonapi-angular.js",
-  "es2015": "dist/fesm2015/datx-jsonapi-angular.js",
-  "esm2015": "dist/esm2015/datx-jsonapi-angular.js",
-  "fesm2015": "dist/fesm2015/datx-jsonapi-angular.js",
-  "typings": "dist/datx-jsonapi-angular.d.ts",
-  "sideEffects": false,
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/infinum/datx.git"
-  },
-  "bugs": {
-    "url": "https://github.com/infinum/datx/issues"
-  },
-  "homepage": "https://github.com/infinum/datx#readme",
-  "author": "Infinum JavaScript Team <hello@infinum.com>",
-  "license": "MIT",
-  "keywords": [
-    "datx",
-    "mobx",
-    "jsonapi",
-    "angular"
-  ],
+  "version": "0.0.0",
   "scripts": {
     "ng": "ng",
-    "build": "ng build datx-jsonapi-angular",
+    "build": "ng build datx-jsonapi-angular && npm run copy-license && npm run copy-readme",
+    "copy-license": "cp ./LICENSE ./dist/LICENSE",
+    "copy-readme": "cp ./README.md ./dist/README.md",
     "prepublish": "npm run build",
     "test": "jest"
   },
-  "dependencies": {
-    "@datx/core": "2.4.0",
-    "@datx/jsonapi": "2.4.0",
-    "@datx/network": "2.4.0",
-    "@datx/utils": "2.4.0"
-  },
   "peerDependencies": {
     "@angular/common": ">=12",
     "@angular/core": ">=12",
     "rxjs": "6 || 7"
   },
   "devDependencies": {
+    "@datx/core": "2.4.0",
+    "@datx/jsonapi": "2.4.0",
+    "@datx/network": "2.4.0",
+    "@datx/utils": "2.4.0",
     "@angular-devkit/build-angular": "~14.0.1",
     "@angular/animations": "~14.0.1",
     "@angular/cli": "~14.0.1",

packages/datx-jsonapi-angular/projects/datx-jsonapi-angular/package.json

@@ -1,3 +1,31 @@
 {
-  "name": "@datx/jsonapi-angular"
+  "name": "@datx/jsonapi-angular",
+  "version": "2.4.3-beta.1",
+  "description": "DatX mixin for Angular JSON API support",
+  "sideEffects": false,
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/infinum/datx.git"
+  },
+  "bugs": {
+    "url": "https://github.com/infinum/datx/issues"
+  },
+  "homepage": "https://github.com/infinum/datx#readme",
+  "author": "Infinum JavaScript Team <hello@infinum.com>",
+  "license": "MIT",
+  "keywords": [
+    "datx",
+    "mobx",
+    "jsonapi",
+    "angular"
+  ],
+  "dependencies": {
+    "tslib": "^2.3.0"
+  },
+  "peerDependencies": {
+    "@angular/common": ">=12",
+    "@angular/core": ">=12",
+    "@datx/jsonapi": "2.4.0",
+    "rxjs": "6 || 7"
+  }
 }

packages/datx-jsonapi-angular/projects/datx-jsonapi-angular/src/lib/helpers/init-datx-factory.ts

@@ -6,7 +6,7 @@ import { CustomFetchService } from '../services/custom-fetch/custom-fetch.servic
 export function initDatxFactory(staticConfig: Partial<IConfigType> = {}) {
   return (
     customFetch: CustomFetchService,
-    dynamicConfig: Partial<IConfigType>,
+    dynamicConfig?: Partial<IConfigType>,
   ): (() => Promise<void>) => {
     const mergedConfig: Partial<IConfigType> = {
       ...DEFAULT_DATX_ANGULAR_JSON_API_CONFIG,
@@ -17,7 +17,7 @@ export function initDatxFactory(staticConfig: Partial<IConfigType> = {}) {
     return () => {
       Object.assign(config, mergedConfig);
 
-      if (!config.baseFetch) {
+      if (!staticConfig.baseFetch && !dynamicConfig?.baseFetch) {
         config.baseFetch = customFetch.fetch.bind(customFetch);
       }