@klerick/json-api-nestjs-sdk 10.0.0-beta.1 → 10.0.0-beta.11

package/mjs/src/lib/service/json-api-sdk.service.js

@@ -1,6 +1,7 @@
 import { EMPTY, expand, reduce, throwError } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { EntityArray, getTypeForReq } from '../utils';
+const AS_PLAIN_RESULT = Symbol('asPlainResult');
 export class JsonApiSdkService {
     http;
     jsonApiUtilsService;
@@ -10,16 +11,35 @@ export class JsonApiSdkService {
         this.jsonApiUtilsService = jsonApiUtilsService;
         this.jsonApiSdkConfig = jsonApiSdkConfig;
     }
-    getList(entity, params) {
+    entity(typeName, data, raw) {
+        const instance = this.jsonApiUtilsService.createEntityInstance(typeName);
+        const entityObj = Object.assign(instance, data);
+        if (raw)
+            return entityObj;
+        // Mark for plain result when used via chain
+        Reflect.set(entityObj, AS_PLAIN_RESULT, true);
+        return new Proxy(this, {
+            get: (target, method) => {
+                const fn = target[method];
+                if (typeof fn === 'function') {
+                    return (...args) => fn.call(target, entityObj, ...args);
+                }
+                return fn;
+            },
+        });
+    }
+    getList(entityOrTypeName, params) {
+        const asPlain = typeof entityOrTypeName === 'string';
+        const name = asPlain ? entityOrTypeName : entityOrTypeName.name;
         const query = this.jsonApiUtilsService.getQueryStringParams(params);
         return this.http
-            .get(this.jsonApiUtilsService.getUrlForResource(entity.name), {
+            .get(this.jsonApiUtilsService.getUrlForResource(name), {
             params: query.toObject(),
         })
             .pipe(map((result) => {
             const resource = params
-                ? this.jsonApiUtilsService.convertResponseData(result, params.include)
-                : this.jsonApiUtilsService.convertResponseData(result);
+                ? this.jsonApiUtilsService.convertResponseData(result, params.include, asPlain)
+                : this.jsonApiUtilsService.convertResponseData(result, undefined, asPlain);
             const { totalItems, pageSize, pageNumber } = Object.assign({
                 totalItems: 0,
                 pageNumber: 0,
@@ -32,8 +52,8 @@ export class JsonApiSdkService {
             });
         }));
     }
-    getAll(entity, params, push = true) {
-        const request = this.getList(entity, params).pipe(expand((r) => {
+    getAll(entityOrTypeName, params, push = true) {
+        const request = this.getList(entityOrTypeName, params).pipe(expand((r) => {
             if (r.pageNumber * r.pageSize >= r.totalItems) {
                 return EMPTY;
             }
@@ -46,7 +66,7 @@ export class JsonApiSdkService {
                     },
                 },
             };
-            return this.getList(entity, newParams);
+            return this.getList(entityOrTypeName, newParams);
         }));
         if (!push) {
             return request.pipe(reduce((acum, item) => {
@@ -63,18 +83,21 @@ export class JsonApiSdkService {
         }
         return request;
     }
-    getOne(entity, id, params) {
+    getOne(entityOrTypeName, id, params) {
         if (!id) {
             return throwError(() => new Error('Id for resource is required'));
         }
+        const asPlain = typeof entityOrTypeName === 'string';
+        const name = asPlain ? entityOrTypeName : entityOrTypeName.name;
         const query = this.jsonApiUtilsService.getQueryStringParams(params);
         return this.http
-            .get(`${this.jsonApiUtilsService.getUrlForResource(entity.name)}/${id}`, {
+            .get(`${this.jsonApiUtilsService.getUrlForResource(name)}/${id}`, {
             params: query.toObject(),
         })
-            .pipe(map((result) => this.jsonApiUtilsService.convertResponseData(result, params?.include)));
+            .pipe(map((result) => this.jsonApiUtilsService.convertResponseData(result, params?.include, asPlain)));
     }
     postOne(entity) {
+        const asPlain = Reflect.has(entity, AS_PLAIN_RESULT);
         const { attributes, relationships } = this.jsonApiUtilsService.generateBody(entity);
         const body = {
             data: {
@@ -85,13 +108,14 @@ export class JsonApiSdkService {
         };
         return this.http
             .post(this.jsonApiUtilsService.getUrlForResource(entity.constructor.name), body)
-            .pipe(map((r) => this.jsonApiUtilsService.convertResponseData(r)));
+            .pipe(map((r) => this.jsonApiUtilsService.convertResponseData(r, (Object.keys(relationships).length > 0 ? Object.keys(relationships) : undefined), asPlain)));
     }
     patchOne(entity) {
         const id = Reflect.get(entity, this.jsonApiSdkConfig.idKey);
         if (!id) {
             return throwError(() => new Error('Resource params should be instance of resource with id params'));
         }
+        const asPlain = Reflect.has(entity, AS_PLAIN_RESULT);
         const { attributes, relationships } = this.jsonApiUtilsService.generateBody(entity);
         const body = {
             data: {
@@ -107,7 +131,7 @@ export class JsonApiSdkService {
         }
         return this.http
             .patch(`${this.jsonApiUtilsService.getUrlForResource(entity.constructor.name)}/${id}`, body)
-            .pipe(map((r) => this.jsonApiUtilsService.convertResponseData(r)));
+            .pipe(map((r) => this.jsonApiUtilsService.convertResponseData(r, (Object.keys(relationships).length > 0 ? Object.keys(relationships) : undefined), asPlain)));
     }
     deleteOne(entity) {
         const id = Reflect.get(entity, this.jsonApiSdkConfig.idKey);

package/mjs/src/lib/service/json-api-sdk.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"json-api-sdk.service.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-sdk/src/lib/service/json-api-sdk.service.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAc,MAAM,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AACrE,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAWrC,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAGtD,MAAM,OAAO,iBAAiB;IAElB;IACA;IACA;IAHV,YACU,IAAqB,EACrB,mBAAwC,EACxC,gBAAkC;QAFlC,SAAI,GAAJ,IAAI,CAAiB;QACrB,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,qBAAgB,GAAhB,gBAAgB,CAAkB;IACzC,CAAC;IAEG,OAAO,CACZ,MAA2B,EAC3B,MAA4B;QAE5B,MAAM,KAAK,GAAG,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;QAEpE,OAAO,IAAI,CAAC,IAAI;aACb,GAAG,CACF,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,EACvD;YACE,MAAM,EAAE,KAAK,CAAC,QAAQ,EAAE;SACzB,CACF;aACA,IAAI,CACH,GAAG,CACD,CAAC,MAAM,EAAE,EAAE;YACT,MAAM,QAAQ,GAAG,MAAM;gBACrB,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAC1C,MAAM,EACN,MAAM,CAAC,OAAO,CACf;gBACH,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;YACzD,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC,MAAM,CACxD;gBACE,UAAU,EAAE,CAAC;gBACb,UAAU,EAAE,CAAC;gBACb,QAAQ,EAAE,CAAC;aACZ,EACD,MAAM,CAAC,IAAI,CACZ,CAAC;YAEF,OAAO,IAAI,WAAW,CAAS,QAAQ,EAAE;gBACvC,UAAU;gBACV,UAAU;gBACV,QAAQ;aACT,CAAC,CAAC;QACL,CAAC,CACF,CACF,CAAC;IACN,CAAC;IAED,MAAM,CACJ,MAA2B,EAC3B,MAA4B,EAC5B,IAAI,GAAG,IAAI;QAEX,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,IAAI,CAC/C,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;YACX,IAAI,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC;gBAC9C,OAAO,KAAK,CAAC;YACf,CAAC;YACD,MAAM,SAAS,GAAG;gBAChB,GAAG,MAAM;gBACT,GAAG;oBACD,IAAI,EAAE;wBACJ,MAAM,EAAE,CAAC,CAAC,UAAU,GAAG,CAAC;wBACxB,IAAI,EAAE,CAAC,CAAC,QAAQ;qBACjB;iBACF;aACF,CAAC;YACF,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACzC,CAAC,CAAC,CACH,CAAC;QAEF,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,OAAO,CAAC,IAAI,CACjB,MAAM,CAAW,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;gBAC9B,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;oBAClC,IAAI,GAAG,EAAE,CAAC;gBACZ,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;gBACnB,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,EACF,GAAG,CACD,CAAC,CAAC,EAAE,EAAE,CACJ,IAAI,WAAW,CAAS,CAAC,EAAE;gBACzB,QAAQ,EAAE,CAAC,CAAC,MAAM;gBAClB,UAAU,EAAE,CAAC;gBACb,UAAU,EAAE,CAAC,CAAC,MAAM;aACrB,CAAC,CACL,CACF,CAAC;QACJ,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,MAAM,CACJ,MAA2B,EAC3B,EAAmB,EACnB,MAAsC;QAEtC,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,OAAO,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC,CAAC;QACpE,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;QAEpE,OAAO,IAAI,CAAC,IAAI;aACb,GAAG,CACF,GAAG,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,EAClE;YACE,MAAM,EAAE,KAAK,CAAC,QAAQ,EAAE;SACzB,CACF;aACA,IAAI,CACH,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CACb,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CACtE,CACF,CAAC;IACN,CAAC;IAEM,OAAO,CAAwB,MAAc;QAClD,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,GACjC,IAAI,CAAC,mBAAmB,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAChD,MAAM,IAAI,GAAG;YACX,IAAI,EAAE;gBACJ,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC;gBAC5C,UAAU;gBACV,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACpE;SACF,CAAC;QAEF,OAAO,IAAI,CAAC,IAAI;aACb,IAAI,CACH,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,EACnE,IAAI,CACL;aACA,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACvE,CAAC;IAEM,QAAQ,CAAwB,MAAc;QACnD,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAC5D,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,OAAO,UAAU,CACf,GAAG,EAAE,CACH,IAAI,KAAK,CACP,+DAA+D,CAChE,CACJ,CAAC;QACJ,CAAC;QAED,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,GACjC,IAAI,CAAC,mBAAmB,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAEhD,MAAM,IAAI,GAAG;YACX,IAAI,EAAE;gBACJ,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC;gBACd,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC;aAC7C;SAC0B,CAAC;QAE9B,IAAI,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,eAAe,EAAE,aAAa,CAAC,CAAC;QACzD,CAAC;QAED,IAAI,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;QACnD,CAAC;QAED,OAAO,IAAI,CAAC,IAAI;aACb,KAAK,CACJ,GAAG,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAC3C,MAAM,CAAC,WAAW,CAAC,IAAI,CACxB,IAAI,EAAE,EAAE,EACT,IAAI,CACL;aACA,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACvE,CAAC;IAEM,SAAS,CAAwB,MAAc;QACpD,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAC5D,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,OAAO,UAAU,CACf,GAAG,EAAE,CACH,IAAI,KAAK,CACP,+DAA+D,CAChE,CACJ,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CACrB,GAAG,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAC3C,MAAM,CAAC,WAAW,CAAC,IAAI,CACxB,IAAI,EAAE,EAAE,CACV,CAAC;IACJ,CAAC;IAEM,gBAAgB,CAKrB,MAAc,EACd,YAAiB;QAEjB,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAC5D,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,OAAO,UAAU,CACf,GAAG,EAAE,CACH,IAAI,KAAK,CACP,+DAA+D,CAChE,CACJ,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,CAAC,IAAI;aACb,GAAG,CACF,GAAG,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAC3C,MAAM,CAAC,WAAW,CAAC,IAAI,CACxB,IAAI,EAAE,kBAAkB,MAAM,CAAC,YAAY,CAAC,EAAE,CAChD;aACA,IAAI,CACH,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CACvE,CAAC;IACN,CAAC;IAEM,kBAAkB,CAKvB,MAAc,EACd,YAAiB;QAEjB,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAC5D,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,OAAO,UAAU,CACf,GAAG,EAAE,CACH,IAAI,KAAK,CACP,+DAA+D,CAChE,CACJ,CAAC;QACJ,CAAC;QAED,IAAI,MAAM,CAAC,YAAY,CAAC,KAAK,SAAS,EAAE,CAAC;YACvC,OAAO,UAAU,CACf,GAAG,EAAE,CACH,IAAI,KAAK,CACP,GAAG,YAAY,CAAC,QAAQ,EAAE,oCAAoC,CAC/D,CACJ,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,GAAqB;YAC7B,IAAI,EAAE,IAAI,CAAC,mBAAmB,CAAC,yBAAyB,CACtD,MAAM,CAAC,YAAY,CAAW,CAC/B;SACF,CAAC;QAEF,OAAO,IAAI,CAAC,IAAI;aACb,KAAK,CACJ,GAAG,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAC3C,MAAM,CAAC,WAAW,CAAC,IAAI,CACxB,IAAI,EAAE,kBAAkB,MAAM,CAAC,YAAY,CAAC,EAAE,EAC/C,IAAI,CACL;aACA,IAAI,CACH,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CACvE,CAAC;IACN,CAAC;IAEM,iBAAiB,CAKtB,MAAc,EACd,YAAiB;QAEjB,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAC5D,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,OAAO,UAAU,CACf,GAAG,EAAE,CACH,IAAI,KAAK,CACP,+DAA+D,CAChE,CACJ,CAAC;QACJ,CAAC;QAED,IAAI,MAAM,CAAC,YAAY,CAAC,KAAK,SAAS,EAAE,CAAC;YACvC,OAAO,UAAU,CACf,GAAG,EAAE,CACH,IAAI,KAAK,CACP,GAAG,YAAY,CAAC,QAAQ,EAAE,oCAAoC,CAC/D,CACJ,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,GAAG;YACX,IAAI,EAAE,IAAI,CAAC,mBAAmB,CAAC,yBAAyB,CACtD,MAAM,CAAC,YAAY,CAAW,CAC/B;SACF,CAAC;QAEF,OAAO,IAAI,CAAC,IAAI;aACb,IAAI,CACH,GAAG,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAC3C,MAAM,CAAC,WAAW,CAAC,IAAI,CACxB,IAAI,EAAE,kBAAkB,MAAM,CAAC,YAAY,CAAC,EAAE,EAC/C,IAAI,CACL;aACA,IAAI,CACH,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CACvE,CAAC;IACN,CAAC;IAEM,mBAAmB,CAIxB,MAAc,EAAE,YAAiB;QACjC,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAC5D,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,OAAO,UAAU,CACf,GAAG,EAAE,CACH,IAAI,KAAK,CACP,+DAA+D,CAChE,CACJ,CAAC;QACJ,CAAC;QAED,IAAI,MAAM,CAAC,YAAY,CAAC,KAAK,SAAS,EAAE,CAAC;YACvC,OAAO,UAAU,CACf,GAAG,EAAE,CACH,IAAI,KAAK,CACP,GAAG,YAAY,CAAC,QAAQ,EAAE,oCAAoC,CAC/D,CACJ,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,GAAG;YACX,IAAI,EAAE,IAAI,CAAC,mBAAmB,CAAC,yBAAyB,CACtD,MAAM,CAAC,YAAY,CAAW,CAC/B;SACF,CAAC;QAEF,OAAO,IAAI,CAAC,IAAI;aACb,MAAM,CACL,GAAG,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAC3C,MAAM,CAAC,WAAW,CAAC,IAAI,CACxB,IAAI,EAAE,kBAAkB,MAAM,CAAC,YAAY,CAAC,EAAE,EAC/C,IAAI,CACL;aACA,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC;CACF"}
+{"version":3,"file":"json-api-sdk.service.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-sdk/src/lib/service/json-api-sdk.service.ts"],"names":[],"mappings":"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"}

package/mjs/src/lib/service/json-api-utils.service.d.ts

@@ -13,10 +13,11 @@ export declare class JsonApiUtilsService {
     private getFieldParam;
     private getFilterParam;
     convertResponseData<E extends object>(body: ResourceObject<E>, includeEntity?: QueryParams<E>['include']): E;
-    convertResponseData<E extends object, IdKey extends string>(body: ResourceObject<E, 'array', null, IdKey>, includeEntity?: QueryParams<E>['include']): E[];
-    convertResponseData<E extends object, IdKey extends string>(body: ResourceObject<E, 'object', null, IdKey>, includeEntity?: QueryParams<E>['include']): E;
-    convertResponseData<E extends object, IdKey extends string>(body: ResourceObject<E, 'array', null, IdKey>, includeEntity?: QueryParams<E>['include']): E[];
+    convertResponseData<E extends object, IdKey extends string>(body: ResourceObject<E, 'array', null, IdKey>, includeEntity?: QueryParams<E>['include'], asPlain?: boolean): E[];
+    convertResponseData<E extends object, IdKey extends string>(body: ResourceObject<E, 'object', null, IdKey>, includeEntity?: QueryParams<E>['include'], asPlain?: boolean): E;
+    convertResponseData<E extends object, IdKey extends string>(body: ResourceObject<E, 'array', null, IdKey>, includeEntity?: QueryParams<E>['include'], asPlain?: boolean): E[];
     createEntityInstance<E>(name: string): E;
+    private createMinimalEntityFromRelationship;
     private findIncludeEntity;
     generateBody<E extends object>(entity: E): {
         attributes: {} | undefined;

package/mjs/src/lib/service/json-api-utils.service.js

@@ -1,6 +1,6 @@
 import { createEntityInstance, isObject, ObjectTyped, } from '@klerick/json-api-nestjs-shared';
 import { kebabCase } from 'change-case-commonjs';
-import { getTypeForReq, HttpParams, isRelation } from '../utils';
+import { getTypeForReq, HttpParams, isRelation, isNullRef, isEmptyArrayRef } from '../utils';
 import { ID_KEY } from '../constants';
 export class JsonApiUtilsService {
     jsonApiSdkConfig;
@@ -113,16 +113,19 @@ export class JsonApiUtilsService {
         }
         return httpParams;
     }
-    convertResponseData(body, includeEntity) {
+    convertResponseData(body, includeEntity, asPlain = false) {
         const { data, included = [] } = body;
         const isArray = Array.isArray(data);
         const arrayData = isArray ? data : [data];
         const result = [];
         for (const dataItem of arrayData) {
+            let id = dataItem[this.jsonApiSdkConfig.idKey];
+            if (this.jsonApiSdkConfig.idIsNumber) {
+                const idNumber = parseInt(id, 10);
+                id = isNaN(idNumber) ? id : idNumber;
+            }
             const entityObject = {
-                [this.jsonApiSdkConfig.idKey]: this.jsonApiSdkConfig.idIsNumber
-                    ? parseInt(dataItem[this.jsonApiSdkConfig.idKey], 10)
-                    : dataItem[this.jsonApiSdkConfig.idKey],
+                [this.jsonApiSdkConfig.idKey]: id,
                 ...Object.entries(dataItem.attributes || []).reduce((acum, [key, val]) => {
                     acum[key] = this.jsonApiSdkConfig.dateFields.includes(key)
                         ? new Date(String(val))
@@ -130,32 +133,55 @@ export class JsonApiUtilsService {
                     return acum;
                 }, {}),
             };
-            const itemEntity = Object.assign(this.createEntityInstance(dataItem.type), entityObject);
-            if (!includeEntity || includeEntity.length === 0) {
-                result.push(itemEntity);
-                continue;
-            }
-            for (const itemInclude of includeEntity) {
-                if (!(dataItem.relationships && dataItem.relationships[itemInclude])) {
-                    continue;
-                }
-                const relationship = dataItem.relationships[itemInclude];
-                if (!relationship || !('data' in relationship) || !relationship.data) {
-                    continue;
-                }
-                const relationshipData = relationship.data;
-                if (Array.isArray(relationshipData)) {
-                    itemEntity[itemInclude] = relationshipData.reduce((acum, item) => {
-                        const result = this.findIncludeEntity(item, included);
-                        if (result)
-                            acum.push(result);
-                        return acum;
-                    }, []);
-                }
-                else {
-                    const relation = this.findIncludeEntity(relationshipData, included);
-                    if (relation)
-                        itemEntity[itemInclude] = relation;
+            const itemEntity = (asPlain
+                ? entityObject
+                : Object.assign(this.createEntityInstance(dataItem.type), entityObject));
+            // Process all relationships from response
+            if (dataItem.relationships) {
+                for (const [relKey, relationship] of Object.entries(dataItem.relationships)) {
+                    if (!relationship || typeof relationship !== 'object' || !('data' in relationship)) {
+                        continue;
+                    }
+                    const relationshipData = relationship.data;
+                    // Skip if no data (null relationship)
+                    if (relationshipData === null || relationshipData === undefined) {
+                        continue;
+                    }
+                    const isIncluded = includeEntity?.includes(relKey);
+                    if (Array.isArray(relationshipData)) {
+                        itemEntity[relKey] = relationshipData.reduce((acum, item) => {
+                            // Try to find in included first
+                            const result = isIncluded
+                                ? this.findIncludeEntity(item, included, asPlain)
+                                : null;
+                            if (result) {
+                                acum.push(result);
+                            }
+                            else {
+                                // Create minimal entity with just id
+                                const minimalEntity = this.createMinimalEntityFromRelationship(item, asPlain);
+                                if (minimalEntity)
+                                    acum.push(minimalEntity);
+                            }
+                            return acum;
+                        }, []);
+                    }
+                    else {
+                        // Try to find in included first
+                        const relation = isIncluded
+                            ? this.findIncludeEntity(relationshipData, included, asPlain)
+                            : null;
+                        if (relation) {
+                            itemEntity[relKey] = relation;
+                        }
+                        else {
+                            // Create minimal entity with just id
+                            const minimalEntity = this.createMinimalEntityFromRelationship(relationshipData, asPlain);
+                            if (minimalEntity) {
+                                itemEntity[relKey] = minimalEntity;
+                            }
+                        }
+                    }
                 }
             }
             result.push(itemEntity);
@@ -170,7 +196,23 @@ export class JsonApiUtilsService {
     createEntityInstance(name) {
         return createEntityInstance(name);
     }
-    findIncludeEntity(item, included) {
+    createMinimalEntityFromRelationship(item, asPlain = false) {
+        if (!item || !item['id'])
+            return;
+        let id = item['id'];
+        if (this.jsonApiSdkConfig.idIsNumber) {
+            const idNumber = parseInt(id, 10);
+            id = isNaN(idNumber) ? id : idNumber;
+        }
+        const entityObject = {
+            [this.jsonApiSdkConfig.idKey]: id,
+        };
+        if (asPlain) {
+            return entityObject;
+        }
+        return Object.assign(this.createEntityInstance(item.type.toString()), entityObject);
+    }
+    findIncludeEntity(item, included, asPlain = false) {
         const relatedIncluded = included.find((includedItem) => includedItem.type === item.type && includedItem.id === item.id);
         if (!relatedIncluded)
             return;
@@ -185,6 +227,9 @@ export class JsonApiUtilsService {
                 return acum;
             }, {}),
         };
+        if (asPlain) {
+            return entityObject;
+        }
         return Object.assign(this.createEntityInstance(item.type.toString()), entityObject);
     }
     generateBody(entity) {
@@ -208,7 +253,13 @@ export class JsonApiUtilsService {
         })
             .reduce((acum, [key, val]) => {
             let data;
-            if (Array.isArray(val)) {
+            if (isNullRef(val)) {
+                data = null;
+            }
+            else if (isEmptyArrayRef(val)) {
+                data = [];
+            }
+            else if (Array.isArray(val)) {
                 data = val.map((i) => ({
                     type: getTypeForReq(i.constructor.name),
                     id: i[ID_KEY].toString(),

package/mjs/src/lib/service/json-api-utils.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"json-api-utils.service.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-sdk/src/lib/service/json-api-utils.service.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EACpB,QAAQ,EACR,WAAW,GAOZ,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAQjD,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAKtC,MAAM,OAAO,mBAAmB;IACV;IAApB,YAAoB,gBAAkC;QAAlC,qBAAgB,GAAhB,gBAAgB,CAAkB;IAAG,CAAC;IAEnD,iBAAiB,CAAC,QAAgB;QACvC,MAAM,GAAG,GAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,iBAAiB,EAAE,CAAC,CAAC;QAChE,IAAI,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC;YACpC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAC/C,CAAC;QACD,OAAO,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC1E,CAAC;IAEM,oBAAoB,CACzB,SAA8B,EAAE;QAEhC,IAAI,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,UAAU,EAAE,CAAC,CAAC;QACxE,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACxD,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACxD,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAC3D,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAE5D,OAAO,UAAU,CAAC;IACpB,CAAC;IAEO,eAAe,CACrB,OAAkC,EAClC,UAAsB;QAEtB,IAAI,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5D,OAAO,UAAU,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACtD,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAEO,YAAY,CAClB,IAA4B,EAC5B,UAAsB;QAEtB,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC;YAC5D,OAAO,UAAU,CAAC;QACpB,MAAM,eAAe,GAAa,EAAE,CAAC;QACrC,MAAM,EAAE,MAAM,EAAE,GAAG,QAAQ,EAAE,GAAG,IAAI,CAAC;QACrC,IAAI,MAAM,EAAE,CAAC;YACX,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gBAChD,eAAe,CAAC,IAAI,CAAC,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC;YACxD,CAAC;QACH,CAAC;QAED,KAAK,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC3D,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBAAE,SAAS;YAClC,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAClD,eAAe,CAAC,IAAI,CAClB,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,GAAG,OAAO,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,OAAO,IAAI,GAAG,EAAE,CAC3D,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/B,OAAO,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAC3D,CAAC;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;IAEO,YAAY,CAClB,IAA4B,EAC5B,UAAsB;QAEtB,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC;YAC5D,OAAO,UAAU,CAAC;QAEpB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;QAC9B,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,cAAc,EAAE,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC;QAC9D,IAAI,IAAI,EAAE,CAAC;YACT,OAAO,UAAU,CAAC,GAAG,CAAC,YAAY,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;QACjD,CAAC;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;IAEO,aAAa,CACnB,KAA+B,EAC/B,UAAsB;QAEtB,IAAI,CAAC,KAAK,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC;YAC/D,OAAO,UAAU,CAAC;QACpB,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,EAAE,EAAE,GAAG,QAAQ,EAAE,GAAG,KAAK,CAAC;QACxD,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,UAAU,GAAG,UAAU,CAAC,GAAG,CACzB,gBAAgB,EAChB,CAAC,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CACpC,CAAC;QACJ,CAAC;QAED,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;YAC3B,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;YAC1C,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAChC,UAAU,GAAG,UAAU,CAAC,GAAG,CACzB,UAAU,GAAG,GAAG,EAChB,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAC/B,CAAC;YACJ,CAAC;QACH,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAEO,cAAc,CACpB,MAAgC,EAChC,UAAsB;QAEtB,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC;YAClE,OAAO,UAAU,CAAC;QAEpB,MAAM,EAAE,MAAM,EAAE,GAAG,QAAQ,EAAE,GAAG,MAAM,CAAC;QACvC,IAAI,MAAM,EAAE,CAAC;YACX,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gBAChD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;oBAAE,SAAS;gBAC7B,KAAK,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;oBACpD,UAAU,GAAG,UAAU,CAAC,GAAG,CACzB,UAAU,GAAG,KAAK,OAAO,GAAG,EAC5B,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;wBACnB,CAAC,CAAC,MAAM;6BACH,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACT,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC;4BAC9C,CAAC,YAAY,IAAI;4BACf,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE;4BACZ,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CACjB;6BACA,IAAI,CAAC,GAAG,CAAC;wBACd,CAAC,CAAC,MAAM,KAAK,IAAI;4BACjB,CAAC,CAAC,MAAM;4BACR,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC;gCAC9C,MAAM,YAAY,IAAI;gCACxB,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE;gCACjB,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CACtB,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QAED,KAAK,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC3D,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBAAE,SAAS;YAClC,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAClD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;oBAAE,SAAS;gBAC7B,KAAK,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;oBACpD,UAAU,GAAG,UAAU,CAAC,GAAG,CACzB,UAAU,OAAO,IAAI,GAAG,KAAK,OAAO,GAAG,EACvC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAC7D,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAkBD,mBAAmB,CACjB,IAAoD,EACpD,aAAyC;QAEzC,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC;QAErC,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,SAAS,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAQ,EAAE,CAAC;QACvB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YACjC,MAAM,YAAY,GAAG;gBACnB,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,gBAAgB,CAAC,UAAU;oBAC7D,CAAC,CAAC,QAAQ,CAAE,QAAgB,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;oBAC9D,CAAC,CAAE,QAAgB,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC;gBAClD,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,MAAM,CACjD,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE;oBACnB,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC;wBACxD,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;wBACvB,CAAC,CAAC,GAAG,CAAC;oBAER,OAAO,IAAI,CAAC;gBACd,CAAC,EACD,EAA6B,CAC9B;aACF,CAAC;YACF,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAC9B,IAAI,CAAC,oBAAoB,CAAI,QAAQ,CAAC,IAAI,CAAW,EACrD,YAAY,CACR,CAAC;YAEP,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACjD,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBACxB,SAAS;YACX,CAAC;YACD,KAAK,MAAM,WAAW,IAAI,aAAa,EAAE,CAAC;gBACxC,IAAI,CAAC,CAAC,QAAQ,CAAC,aAAa,IAAI,QAAQ,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC;oBACrE,SAAS;gBACX,CAAC;gBACD,MAAM,YAAY,GAAG,QAAQ,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;gBACzD,IAAI,CAAC,YAAY,IAAI,CAAC,CAAC,MAAM,IAAI,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;oBACrE,SAAS;gBACX,CAAC;gBAED,MAAM,gBAAgB,GAAG,YAAY,CAAC,IAAI,CAAC;gBAE3C,IAAI,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC;oBACpC,UAAU,CAAC,WAAW,CAAC,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;wBAC/D,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;wBACtD,IAAI,MAAM;4BAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;wBAC9B,OAAO,IAAI,CAAC;oBACd,CAAC,EAAE,EAA0B,CAAuB,CAAC;gBACvD,CAAC;qBAAM,CAAC;oBACN,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;oBACpE,IAAI,QAAQ;wBAAE,UAAU,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC;gBACnD,CAAC;YACH,CAAC;YACD,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC1B,CAAC;QACD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YAC5B,IAAI,SAAS;gBAAE,OAAO,SAAS,CAAC;QAClC,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,oBAAoB,CAAI,IAAY;QAClC,OAAO,oBAAoB,CAAI,IAAI,CAAC,CAAC;IACvC,CAAC;IAEO,iBAAiB,CACvB,IAAO,EACP,QAAsB;QAEtB,MAAM,eAAe,GAAG,QAAQ,CAAC,IAAI,CACnC,CAAC,YAAY,EAAE,EAAE,CACf,YAAY,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,IAAI,YAAY,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CACjE,CAAC;QAEF,IAAI,CAAC,eAAe;YAAE,OAAO;QAE7B,MAAM,YAAY,GAAG;YACnB,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,gBAAgB,CAAC,UAAU;gBAC7D,CAAC,CAAC,QAAQ,CAAE,eAAuB,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;gBACrE,CAAC,CAAE,eAAuB,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC;YACzD,GAAG,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,MAAM,CACxD,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE;gBACnB,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC;oBACxD,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;oBACvB,CAAC,CAAC,GAAG,CAAC;gBAER,OAAO,IAAI,CAAC;YACd,CAAC,EACD,EAA6B,CAC9B;SACF,CAAC;QAEF,OAAO,MAAM,CAAC,MAAM,CAClB,IAAI,CAAC,oBAAoB,CACvB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CACX,EACX,YAAY,CACS,CAAC;IAC1B,CAAC;IAED,YAAY,CAAmB,MAAS;QACtC,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;aACtC,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE;YACrB,IAAI,GAAG,KAAK,MAAM;gBAAE,OAAO,KAAK,CAAC;YACjC,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;YAE/C,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC3B,CAAC,CAAC;aACD,MAAM,CACL,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;YACrB,GAAG,IAAI;YACP,CAAC,GAAG,CAAC,EAAE,GAAG;SACX,CAAC,EACF,EAAmB,CACpB,CAAC;QAEJ,MAAM,aAAa,GAAG,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC;aAC9C,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE;YACrB,IAAI,GAAG,KAAK,MAAM;gBAAE,OAAO,KAAK,CAAC;YACjC,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;YAC/C,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE;YAC3B,IAAI,IAAI,CAAC;YACT,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;gBACvB,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC;oBAC1B,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC;oBACvC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE;iBACzB,CAAC,CAAC,CAAC;YACN,CAAC;iBAAM,CAAC;gBACN,IAAK,GAAW,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC;oBAClC,IAAI,GAAG;wBACL,IAAI,EAAE,aAAa,CAAE,GAAW,CAAC,WAAW,CAAC,IAAI,CAAC;wBAClD,EAAE,EAAG,GAAW,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE;qBACpC,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,IAAI,GAAG,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;YACD,OAAO;gBACL,GAAG,IAAI;gBACP,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE;aAChB,CAAC;QACJ,CAAC,EAAE,EAAsB,CAAC,CAAC;QAE7B,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC;IACvC,CAAC;IAED,oBAAoB,CAKlB,IAAqD;QAErD,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAClB,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CACL,CAAC;QAC1C,CAAC;aAAM,CAAC;YACN,OAAQ,IAAI,CAAC,IAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACzD,CAAC;IACH,CAAC;IAEM,yBAAyB,CAC9B,kBAA6D;QAE7D,MAAM,mBAAmB,GAAG,CAC1B,QAA4B,EACd,EAAE,CAAC,CAAC;YAClB,EAAE,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;YAC9D,IAAI,EAAE,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC;SAC/C,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC;YACtC,CAAC,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;YAC7D,CAAC,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,CAAC;IAC9C,CAAC;CACF"}
+{"version":3,"file":"json-api-utils.service.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-sdk/src/lib/service/json-api-utils.service.ts"],"names":[],"mappings":"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"}

package/mjs/src/lib/types/atomic-operation.d.ts

@@ -8,8 +8,8 @@ export interface AtomicRunPromise<T extends unknown[]> {
     run(): Promise<T>;
 }
 export interface AtomicMainOperations<T extends unknown[]> {
-    postOne<Entity extends object>(entity: Entity): AtomicOperations<[...T, Entity]>;
-    patchOne<Entity extends object>(entity: Entity): AtomicOperations<[...T, Entity]>;
+    postOne<Entity extends object, OutputEntity extends Entity = Entity>(entity: Entity): AtomicOperations<[...T, OutputEntity]>;
+    patchOne<Entity extends object, OutputEntity extends Entity = Entity>(entity: Entity): AtomicOperations<[...T, OutputEntity]>;
     deleteOne<Entity extends object>(entity: Entity): AtomicOperations<[...T]>;
     deleteOne<Entity extends object>(entity: Entity, skipEmpty: true): AtomicOperations<[...T]>;
     deleteOne<Entity extends object>(entity: Entity, skipEmpty: false): AtomicOperations<[...T, 'EMPTY']>;
@@ -18,8 +18,8 @@ export interface AtomicMainOperations<T extends unknown[]> {
     deleteRelationships<Entity extends object, Rel extends RelationKeys<Entity>>(entity: Entity, relationType: Rel): AtomicOperations<[...T]>;
 }
 export interface AtomicMainOperationsPromise<T extends unknown[]> {
-    postOne<Entity extends object>(entity: Entity): AtomicOperationsPromise<[...T, Entity]>;
-    patchOne<Entity extends object>(entity: Entity): AtomicOperationsPromise<[...T, Entity]>;
+    postOne<Entity extends object, OutputEntity extends Entity = Entity>(entity: Entity): AtomicOperationsPromise<[...T, OutputEntity]>;
+    patchOne<Entity extends object, OutputEntity extends Entity = Entity>(entity: Entity): AtomicOperationsPromise<[...T, OutputEntity]>;
     deleteOne<Entity extends object>(entity: Entity): AtomicOperationsPromise<[...T]>;
     patchRelationships<Entity extends object, Rel extends RelationKeys<Entity>>(entity: Entity, relationType: Rel): AtomicOperationsPromise<[...T, ReturnIfArray<Entity[Rel], string>]>;
     postRelationships<Entity extends object, Rel extends RelationKeys<Entity>>(entity: Entity, relationType: Rel): AtomicOperationsPromise<[...T, ReturnIfArray<Entity[Rel], string>]>;

package/mjs/src/lib/types/atomic-operation.js

@@ -1,2 +1 @@
-export {};
 //# sourceMappingURL=atomic-operation.js.map

package/mjs/src/lib/types/config.js

@@ -1,2 +1 @@
-export {};
 //# sourceMappingURL=config.js.map

package/mjs/src/lib/types/entity-chain.d.ts

@@ -0,0 +1,32 @@
+import { Observable } from 'rxjs';
+import { RelationKeys } from '@klerick/json-api-nestjs-shared';
+import { ReturnIfArray } from './utils';
+/**
+ * Chainable entity methods returning Observable
+ * @param E - Input entity type (for request body)
+ * @param OutputE - Output entity type (for response), defaults to E
+ * @param IdKey - ID field key, defaults to 'id'
+ */
+export interface EntityChain<E extends object, OutputE extends E = E, IdKey extends string = 'id'> {
+    postOne(): Observable<OutputE>;
+    patchOne(): Observable<OutputE>;
+    deleteOne(): Observable<void>;
+    getRelationships<Rel extends RelationKeys<E, IdKey>>(relationType: Rel): Observable<ReturnIfArray<E[Rel], string>>;
+    patchRelationships<Rel extends RelationKeys<E, IdKey>>(relationType: Rel): Observable<ReturnIfArray<E[Rel], string>>;
+    postRelationships<Rel extends RelationKeys<E, IdKey>>(relationType: Rel): Observable<ReturnIfArray<E[Rel], string>>;
+    deleteRelationships<Rel extends RelationKeys<E, IdKey>>(relationType: Rel): Observable<void>;
+}
+/**
+ * Converts Observable<T> to Promise<T>
+ */
+type ToPromise<T> = T extends Observable<infer U> ? Promise<U> : T;
+/**
+ * EntityChain with Promise return types (derived automatically)
+ * @param E - Input entity type (for request body)
+ * @param OutputE - Output entity type (for response), defaults to E
+ * @param IdKey - ID field key, defaults to 'id'
+ */
+export type PromiseEntityChain<E extends object, OutputE extends E = E, IdKey extends string = 'id'> = {
+    [K in keyof EntityChain<E, OutputE, IdKey>]: EntityChain<E, OutputE, IdKey>[K] extends (...args: infer A) => infer R ? (...args: A) => ToPromise<R> : never;
+};
+export {};

package/mjs/src/lib/types/entity-chain.js

@@ -0,0 +1 @@
+//# sourceMappingURL=entity-chain.js.map

package/mjs/src/lib/types/entity-chain.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"entity-chain.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-sdk/src/lib/types/entity-chain.ts"],"names":[],"mappings":""}

package/mjs/src/lib/types/http-inner-client.js

@@ -1,2 +1 @@
-export {};
 //# sourceMappingURL=http-inner-client.js.map

package/mjs/src/lib/types/http-request-params.js

@@ -1,2 +1 @@
-export {};
 //# sourceMappingURL=http-request-params.js.map

package/mjs/src/lib/types/index.d.ts

@@ -7,3 +7,4 @@ export * from './config';
 export * from './query-params';
 export * from './promise-json-api-sdk';
 export * from './filter-operand';
+export * from './entity-chain';

package/mjs/src/lib/types/index.js

@@ -7,4 +7,5 @@ export * from './config';
 export * from './query-params';
 export * from './promise-json-api-sdk';
 export * from './filter-operand';
+export * from './entity-chain';
 //# sourceMappingURL=index.js.map

package/mjs/src/lib/types/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-sdk/src/lib/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC;AACnC,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,wBAAwB,CAAC;AACvC,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-sdk/src/lib/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC;AACnC,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,wBAAwB,CAAC;AACvC,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC"}

package/mjs/src/lib/types/promise-json-api-sdk.d.ts

@@ -2,15 +2,26 @@ import { EntityClass, RelationKeys } from '@klerick/json-api-nestjs-shared';
 import { QueryParams, QueryParamsForOneItem } from './query-params';
 import { EntityArray } from '../utils';
 import { ReturnIfArray } from './utils';
+import { PromiseEntityChain } from './entity-chain';
+/**
+ * JsonApiSdkService with Promise return types
+ * POST/PATCH methods support separate Input and Output types via generics.
+ * If OutputEntity is not specified, it defaults to the same as Entity.
+ */
 export interface PromiseJsonApiSdkService {
     getList<Entity extends object>(entity: EntityClass<Entity>, params?: QueryParams<Entity>): Promise<EntityArray<Entity>>;
-    getAll<Entity extends object>(entity: EntityClass<Entity>, params?: QueryParams<Entity>): Promise<EntityArray<Entity>>;
+    getList<Entity extends object>(typeName: string, params?: QueryParams<Entity>): Promise<EntityArray<Entity>>;
+    getAll<Entity extends object>(entity: EntityClass<Entity>, params?: QueryParams<Entity>, push?: boolean): Promise<EntityArray<Entity>>;
+    getAll<Entity extends object>(typeName: string, params?: QueryParams<Entity>, push?: boolean): Promise<EntityArray<Entity>>;
     getOne<Entity extends object>(entity: EntityClass<Entity>, id: string | number, params?: QueryParamsForOneItem<Entity>): Promise<Entity>;
-    postOne<Entity extends object>(entity: Entity): Promise<Entity>;
-    patchOne<Entity extends object>(entity: Entity): Promise<Entity>;
+    getOne<Entity extends object>(typeName: string, id: string | number, params?: QueryParamsForOneItem<Entity>): Promise<Entity>;
+    postOne<Entity extends object, OutputEntity extends Entity = Entity>(entity: Entity): Promise<OutputEntity>;
+    patchOne<Entity extends object, OutputEntity extends Entity = Entity>(entity: Entity): Promise<OutputEntity>;
     deleteOne<Entity extends object>(entity: Entity): Promise<void>;
     getRelationships<Entity extends object, IdKey extends string = 'id', Rel extends RelationKeys<Entity, IdKey> = RelationKeys<Entity, IdKey>>(entity: Entity, relationType: Rel): Promise<ReturnIfArray<Entity[Rel], string>>;
     patchRelationships<Entity extends object, IdKey extends string = 'id', Rel extends RelationKeys<Entity, IdKey> = RelationKeys<Entity, IdKey>>(entity: Entity, relationType: Rel): Promise<ReturnIfArray<Entity[Rel], string>>;
     postRelationships<Entity extends object, IdKey extends string = 'id', Rel extends RelationKeys<Entity, IdKey> = RelationKeys<Entity, IdKey>>(entity: Entity, relationType: Rel): Promise<ReturnIfArray<Entity[Rel], string>>;
     deleteRelationships<Entity extends object, IdKey extends string = 'id', Rel extends RelationKeys<Entity, IdKey> = RelationKeys<Entity, IdKey>>(entity: Entity, relationType: Rel): Promise<void>;
+    entity<E extends object, OutputE extends E = E>(typeName: string, data: E): PromiseEntityChain<E, OutputE>;
+    entity<E extends object>(typeName: string, data: E, raw: true): E;
 }

package/mjs/src/lib/types/promise-json-api-sdk.js

@@ -1,2 +1 @@
-export {};
 //# sourceMappingURL=promise-json-api-sdk.js.map

package/mjs/src/lib/types/query-params.d.ts

@@ -17,8 +17,8 @@ type TargetSort<E> = {
 type RelationSort<E> = {
     [K in RelationKeys<E>]?: SortForEntity<TypeOfArray<E[K]>>;
 };
-type Sort<E> = TargetSort<E> & RelationSort<E>;
-type Fields<E> = TargetField<E> & RelationField<E>;
+export type Sort<E> = TargetSort<E> & RelationSort<E>;
+export type Fields<E> = TargetField<E> & RelationField<E>;
 export type Pagination = {
     number: number;
     size: number;
@@ -30,7 +30,7 @@ type EntityFilter<E> = {
     [K in PropertyKeys<E>]?: Operands;
 };
 type TargetFilter<E> = {
-    target: EntityFilter<E> & TargetRelationFilter<E>;
+    target?: EntityFilter<E> & TargetRelationFilter<E>;
 };
 type RelationFilter<E> = {
     [K in RelationKeys<E>]?: EntityFilter<TypeOfArray<E[K]>>;

package/mjs/src/lib/types/utils.js

@@ -1,2 +1 @@
-export {};
 //# sourceMappingURL=utils.js.map

package/mjs/src/lib/utils/adapter-for-axios.d.ts

@@ -1,3 +1,3 @@
-import { Axios } from 'axios';
+import { AxiosStatic, AxiosInstance } from 'axios';
 import { HttpInnerClient } from '../types';
-export declare function adapterForAxios(axios: Axios): HttpInnerClient;
+export declare function adapterForAxios(axios: AxiosStatic | AxiosInstance): HttpInnerClient;

package/mjs/src/lib/utils/adapter-for-axios.js.map

@@ -1 +1 @@
-{"version":3,"file":"adapter-for-axios.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-sdk/src/lib/utils/adapter-for-axios.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAYrC,MAAM,eAAe;IACC;IAApB,YAAoB,KAAY;QAAZ,UAAK,GAAL,KAAK,CAAO;IAAG,CAAC;IAE5B,SAAS,CACf,WAA6B,EAC7B,UAA2B;QAE3B,OAAO,IAAI,UAAU,CAAC,CAAC,UAAU,EAAE,EAAE;YACnC,WAAW,EAAE;iBACV,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;iBAC7C,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;iBAClD,OAAO,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;YAExC,OAAO,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,CAAC;QACnD,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,eAAe;QAIrB,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;QACzC,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;QAEjC,OAAO;YACL,UAAU;YACV,MAAM;SACP,CAAC;IACJ,CAAC;IAED,MAAM,CACJ,GAAW,EACX,IAA4C;QAE5C,IAAI,IAAI,EAAE,CAAC;YACT,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC3C,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACrC,CAAC;IAcD,GAAG,CAQD,GAAW,EAAE,MAAgC;QAC7C,OAAO,IAAI,CAAC,OAAO,CACjB,GAAG,EACH,KAAK,EACL,SAAS,EACT,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CACnC,CAAC;IACJ,CAAC;IAcD,KAAK,CAKH,GAAW,EACX,IAA0D;QAI1D,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAC1C,CAAC;IAkBD,IAAI,CACF,GAAW,EACX,IAAsE;QAMtE,OAAO,IAAI,CAAC,OAAO,CAKjB,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IACvB,CAAC;IAEO,OAAO,CACb,GAAW,EACX,MAAc,EACd,IAAQ,EACR,MAAoB;QAEpB,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QACtD,OAAO,IAAI,CAAC,SAAS,CACnB,GAAG,EAAE,CACH,IAAI,CAAC,KAAK,CAAC,OAAO,CAA4B;YAC5C,GAAG;YACH,MAAM;YACN,IAAI;YACJ,MAAM;YACN,MAAM;SACP,CAAC,EACJ,UAAU,CACX,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7B,CAAC;CACF;AAED,MAAM,UAAU,eAAe,CAAC,KAAY;IAC1C,OAAO,IAAI,eAAe,CAAC,KAAK,CAAC,CAAC;AACpC,CAAC"}
+{"version":3,"file":"adapter-for-axios.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-sdk/src/lib/utils/adapter-for-axios.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAYrC,MAAM,eAAe;IACC;IAApB,YAAoB,KAAkC;QAAlC,UAAK,GAAL,KAAK,CAA6B;IAAG,CAAC;IAElD,SAAS,CACf,WAA6B,EAC7B,UAA2B;QAE3B,OAAO,IAAI,UAAU,CAAC,CAAC,UAAU,EAAE,EAAE;YACnC,WAAW,EAAE;iBACV,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;iBAC7C,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;iBAClD,OAAO,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;YAExC,OAAO,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,CAAC;QACnD,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,eAAe;QAIrB,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;QACzC,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;QAEjC,OAAO;YACL,UAAU;YACV,MAAM;SACP,CAAC;IACJ,CAAC;IAED,MAAM,CACJ,GAAW,EACX,IAA4C;QAE5C,IAAI,IAAI,EAAE,CAAC;YACT,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC3C,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACrC,CAAC;IAcD,GAAG,CAQD,GAAW,EAAE,MAAgC;QAC7C,OAAO,IAAI,CAAC,OAAO,CACjB,GAAG,EACH,KAAK,EACL,SAAS,EACT,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CACnC,CAAC;IACJ,CAAC;IAcD,KAAK,CAKH,GAAW,EACX,IAA0D;QAI1D,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAC1C,CAAC;IAkBD,IAAI,CACF,GAAW,EACX,IAAsE;QAMtE,OAAO,IAAI,CAAC,OAAO,CAKjB,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IACvB,CAAC;IAEO,OAAO,CACb,GAAW,EACX,MAAc,EACd,IAAQ,EACR,MAAoB;QAEpB,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QACtD,OAAO,IAAI,CAAC,SAAS,CACnB,GAAG,EAAE,CACH,IAAI,CAAC,KAAK,CAAC,OAAO,CAA4B;YAC5C,GAAG;YACH,MAAM;YACN,IAAI;YACJ,MAAM;YACN,MAAM;SACP,CAAC,EACJ,UAAU,CACX,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7B,CAAC;CACF;AAED,MAAM,UAAU,eAAe,CAAC,KAAkC;IAChE,OAAO,IAAI,eAAe,CAAC,KAAK,CAAC,CAAC;AACpC,CAAC"}

package/mjs/src/lib/utils/generate-atomic-body.js

@@ -27,6 +27,9 @@ export class GenerateAtomicBody {
             };
         const rel = relationType ? { relationship: String(relationType) } : {};
         const tmpId = op === 'add' && id && !relationType ? { tmpId: String(id) } : {};
+        if (op === 'add' && id && !relationType) {
+            idObj['id'] = String(id);
+        }
         this.bodyData = {
             op,
             ref: { type, ...idObj, ...rel, ...tmpId },

package/mjs/src/lib/utils/generate-atomic-body.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate-atomic-body.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-sdk/src/lib/utils/generate-atomic-body.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generate-atomic-body.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-sdk/src/lib/utils/generate-atomic-body.ts"],"names":[],"mappings":"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"}