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

package/cjs/src/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.adapterForAxios = exports.JsonApiSdkService = exports.JsonApiUtilsService = exports.QueryField = exports.FilterOperand = void 0;
+exports.emptyArrayRef = exports.nullRef = exports.adapterForAxios = exports.JsonApiSdkService = exports.JsonApiUtilsService = exports.QueryField = exports.FilterOperand = void 0;
 const tslib_1 = require("tslib");
 var json_api_nestjs_shared_1 = require("@klerick/json-api-nestjs-shared");
 Object.defineProperty(exports, "FilterOperand", { enumerable: true, get: function () { return json_api_nestjs_shared_1.FilterOperand; } });
@@ -11,4 +11,6 @@ Object.defineProperty(exports, "JsonApiSdkService", { enumerable: true, get: fun
 tslib_1.__exportStar(require("./lib/json-api-js"), exports);
 var utils_1 = require("./lib/utils");
 Object.defineProperty(exports, "adapterForAxios", { enumerable: true, get: function () { return utils_1.adapterForAxios; } });
+Object.defineProperty(exports, "nullRef", { enumerable: true, get: function () { return utils_1.nullRef; } });
+Object.defineProperty(exports, "emptyArrayRef", { enumerable: true, get: function () { return utils_1.emptyArrayRef; } });
 //# sourceMappingURL=index.js.map

package/cjs/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../libs/json-api/json-api-nestjs-sdk/src/index.ts"],"names":[],"mappings":";;;;AAAA,0EAIyC;AAHvC,uHAAA,aAAa,OAAA;AAEb,oHAAA,UAAU,OAAA;AAGZ,yCAAuE;AAA9D,8GAAA,mBAAmB,OAAA;AAAE,4GAAA,iBAAiB,OAAA;AAC/C,4DAAkC;AAClC,qCAA8C;AAArC,wGAAA,eAAe,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../libs/json-api/json-api-nestjs-sdk/src/index.ts"],"names":[],"mappings":";;;;AAAA,0EAIyC;AAHvC,uHAAA,aAAa,OAAA;AAEb,oHAAA,UAAU,OAAA;AAGZ,yCAAuE;AAA9D,8GAAA,mBAAmB,OAAA;AAAE,4GAAA,iBAAiB,OAAA;AAC/C,4DAAkC;AAClC,qCAAsE;AAA7D,wGAAA,eAAe,OAAA;AAAE,gGAAA,OAAO,OAAA;AAAE,sGAAA,aAAa,OAAA"}

package/cjs/src/lib/json-api-angular.js

@@ -6,10 +6,14 @@ const http_1 = require("@angular/common/http");
 const token_1 = require("./token");
 const utils_1 = require("./utils");
 const service_1 = require("./service");
-const getProviders = (config) => [
+const isFactory = (config) => typeof config === 'function';
+const getProviders = (configOrFactory) => [
     {
         provide: token_1.JSON_API_SDK_CONFIG,
-        useValue: (0, utils_1.resultConfig)(config),
+        useFactory: () => {
+            const config = isFactory(configOrFactory) ? configOrFactory() : configOrFactory;
+            return (0, utils_1.resultConfig)(config);
+        },
     },
     {
         provide: service_1.JsonApiUtilsService,
@@ -32,7 +36,7 @@ const getProviders = (config) => [
     },
 ];
 exports.getProviders = getProviders;
-const provideJsonApi = (config) => (0, core_1.makeEnvironmentProviders)((0, exports.getProviders)(config));
+const provideJsonApi = (configOrFactory) => (0, core_1.makeEnvironmentProviders)((0, exports.getProviders)(configOrFactory));
 exports.provideJsonApi = provideJsonApi;
 var token_2 = require("./token");
 Object.defineProperty(exports, "AtomicFactory", { enumerable: true, get: function () { return token_2.AtomicFactory; } });

package/cjs/src/lib/json-api-angular.js.map

@@ -1 +1 @@
-{"version":3,"file":"json-api-angular.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs-sdk/src/lib/json-api-angular.ts"],"names":[],"mappings":";;;AAAA,wCAAiE;AACjE,+CAAkD;AAElD,mCAA6D;AAC7D,mCAAuC;AACvC,uCAImB;AAEZ,MAAM,YAAY,GAAG,CAAC,MAAqB,EAAE,EAAE,CAAC;IACrD;QACE,OAAO,EAAE,2BAAmB;QAC5B,QAAQ,EAAE,IAAA,oBAAY,EAAC,MAAM,CAAC;KAC/B;IACD;QACE,OAAO,EAAE,6BAAmB;QAC5B,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI,6BAAmB,CAAC,IAAA,aAAM,EAAC,2BAAmB,CAAC,CAAC;KACvE;IACD;QACE,OAAO,EAAE,2BAAiB;QAC1B,UAAU,EAAE,GAAG,EAAE,CACf,IAAI,2BAAiB,CACnB,IAAA,aAAM,EAAkB,iBAAiB,CAAC,EAC1C,IAAA,aAAM,EAAC,6BAAmB,CAAC,EAC3B,IAAA,aAAM,EAAC,2BAAmB,CAAC,CAC5B;KACJ;IACD;QACE,OAAO,EAAE,qBAAa;QACtB,UAAU,EAAE,GAAG,EAAE;YACf,MAAM,mBAAmB,GAAG,IAAA,aAAM,EAAC,6BAAmB,CAAC,CAAC;YACxD,MAAM,MAAM,GAAG,IAAA,aAAM,EAAC,2BAAmB,CAAC,CAAC;YAC3C,MAAM,UAAU,GAAG,IAAA,aAAM,EAAkB,iBAAiB,CAAC,CAAC;YAE9D,OAAO,GAAG,EAAE;gBACV,OAAO,IAAI,iCAAuB,CAChC,mBAAmB,EACnB,MAAM,EACN,UAAU,CACX,CAAC;YACJ,CAAC,CAAC;QACJ,CAAC;KACF;CACF,CAAC;AAlCW,QAAA,YAAY,gBAkCvB;AAEK,MAAM,cAAc,GAAG,CAAC,MAAqB,EAAE,EAAE,CACtD,IAAA,+BAAwB,EAAC,IAAA,oBAAY,EAAC,MAAM,CAAC,CAAC,CAAC;AADpC,QAAA,cAAc,kBACsB;AAEjD,iCAA6D;AAApD,sGAAA,aAAa,OAAA;AAAE,4GAAA,mBAAmB,OAAA"}
+{"version":3,"file":"json-api-angular.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs-sdk/src/lib/json-api-angular.ts"],"names":[],"mappings":";;;AAAA,wCAAiE;AACjE,+CAAkD;AAElD,mCAA6D;AAC7D,mCAAuC;AACvC,uCAImB;AAKnB,MAAM,SAAS,GAAG,CAAC,MAA8B,EAAkC,EAAE,CACnF,OAAO,MAAM,KAAK,UAAU,CAAC;AAExB,MAAM,YAAY,GAAG,CAAC,eAAuC,EAAE,EAAE,CAAC;IACvE;QACE,OAAO,EAAE,2BAAmB;QAC5B,UAAU,EAAE,GAAG,EAAE;YACf,MAAM,MAAM,GAAG,SAAS,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC;YAChF,OAAO,IAAA,oBAAY,EAAC,MAAM,CAAC,CAAC;QAC9B,CAAC;KACF;IACD;QACE,OAAO,EAAE,6BAAmB;QAC5B,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI,6BAAmB,CAAC,IAAA,aAAM,EAAC,2BAAmB,CAAC,CAAC;KACvE;IACD;QACE,OAAO,EAAE,2BAAiB;QAC1B,UAAU,EAAE,GAAG,EAAE,CACf,IAAI,2BAAiB,CACnB,IAAA,aAAM,EAAkB,iBAAiB,CAAC,EAC1C,IAAA,aAAM,EAAC,6BAAmB,CAAC,EAC3B,IAAA,aAAM,EAAC,2BAAmB,CAAC,CAC5B;KACJ;IACD;QACE,OAAO,EAAE,qBAAa;QACtB,UAAU,EAAE,GAAG,EAAE;YACf,MAAM,mBAAmB,GAAG,IAAA,aAAM,EAAC,6BAAmB,CAAC,CAAC;YACxD,MAAM,MAAM,GAAG,IAAA,aAAM,EAAC,2BAAmB,CAAC,CAAC;YAC3C,MAAM,UAAU,GAAG,IAAA,aAAM,EAAkB,iBAAiB,CAAC,CAAC;YAE9D,OAAO,GAAG,EAAE;gBACV,OAAO,IAAI,iCAAuB,CAChC,mBAAmB,EACnB,MAAM,EACN,UAAU,CACX,CAAC;YACJ,CAAC,CAAC;QACJ,CAAC;KACF;CACF,CAAC;AArCW,QAAA,YAAY,gBAqCvB;AAEK,MAAM,cAAc,GAAG,CAAC,eAAuC,EAAE,EAAE,CACxE,IAAA,+BAAwB,EAAC,IAAA,oBAAY,EAAC,eAAe,CAAC,CAAC,CAAC;AAD7C,QAAA,cAAc,kBAC+B;AAE1D,iCAA6D;AAApD,sGAAA,aAAa,OAAA;AAAE,4GAAA,mBAAmB,OAAA"}

package/cjs/src/lib/json-api-js.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsonApiJs = JsonApiJs;
-const tslib_1 = require("tslib");
 const utils_1 = require("./utils");
 const service_1 = require("./service");
 const fetch_inner_client_1 = require("./service/fetch-inner-client");
@@ -10,17 +9,37 @@ const jsonSdk = {};
 function JsonApiJs(config, returnPromise) {
     if (Object.keys(jsonSdk).length > 0)
         return jsonSdk;
-    const { adapter } = config, jsonSdkConfig = tslib_1.__rest(config, ["adapter"]);
+    const { adapter, ...jsonSdkConfig } = config;
     const resultJsonConfig = (0, utils_1.resultConfig)(jsonSdkConfig);
     const jsonApiUtilsService = new service_1.JsonApiUtilsService(resultJsonConfig);
     const httpInnerClient = adapter ? adapter : new fetch_inner_client_1.FetchInnerClient();
-    const jonApiSdkService = new service_1.JsonApiSdkService(httpInnerClient, jsonApiUtilsService, resultJsonConfig);
+    const jsonApiSdkService = new service_1.JsonApiSdkService(httpInnerClient, jsonApiUtilsService, resultJsonConfig);
     jsonSdk['jsonApiUtilsService'] = jsonApiUtilsService;
-    jsonSdk['jonApiSdkService'] = jonApiSdkService;
+    jsonSdk['jsonApiSdkService'] = jsonApiSdkService;
     jsonSdk['atomicFactory'] = () => new service_1.AtomicOperationsService(jsonApiUtilsService, resultJsonConfig, httpInnerClient);
     if (returnPromise) {
-        jsonSdk['jonApiSdkService'] = new Proxy(jonApiSdkService, {
+        jsonSdk['jsonApiSdkService'] = new Proxy(jsonApiSdkService, {
             get(target, p) {
+                // Special handling for entity() method - it returns EntityChain, not Observable
+                if (p === 'entity') {
+                    return ((...args) => {
+                        const result = target.entity(...args);
+                        // If raw mode (third arg is true), return entity as-is
+                        if (args[2] === true) {
+                            return result;
+                        }
+                        // Chain mode - wrap chain methods to return Promise instead of Observable
+                        return new Proxy(result, {
+                            get(chainTarget, chainMethod) {
+                                const fn = chainTarget[chainMethod];
+                                if (typeof fn === 'function') {
+                                    return (...chainArgs) => (0, rxjs_1.lastValueFrom)(fn.call(chainTarget, ...chainArgs));
+                                }
+                                return fn;
+                            },
+                        });
+                    });
+                }
                 return (...arg) => (0, rxjs_1.lastValueFrom)(target[p].apply(target, arg));
             },
         });

package/cjs/src/lib/json-api-js.js.map

@@ -1 +1 @@
-{"version":3,"file":"json-api-js.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs-sdk/src/lib/json-api-js.ts"],"names":[],"mappings":";;AAmCA,8BAsEC;;AAjGD,mCAAuC;AACvC,uCAImB;AACnB,qEAAgE;AAChE,+BAAqC;AAkBrC,MAAM,OAAO,GAAG,EAAS,CAAC;AAE1B,SAAgB,SAAS,CACvB,MAAkB,EAClB,aAAiB;IAEjB,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,OAAO,CAAC;IACpD,MAAM,EAAE,OAAO,KAAuB,MAAM,EAAxB,aAAa,kBAAK,MAAM,EAAtC,WAA6B,CAAS,CAAC;IAC7C,MAAM,gBAAgB,GAAG,IAAA,oBAAY,EAAC,aAAa,CAAC,CAAC;IAErD,MAAM,mBAAmB,GAAG,IAAI,6BAAmB,CAAC,gBAAgB,CAAC,CAAC;IACtE,MAAM,eAAe,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,qCAAgB,EAAE,CAAC;IACnE,MAAM,gBAAgB,GAAG,IAAI,2BAAiB,CAC5C,eAAe,EACf,mBAAmB,EACnB,gBAAgB,CACjB,CAAC;IACF,OAAO,CAAC,qBAAqB,CAAC,GAAG,mBAAmB,CAAC;IACrD,OAAO,CAAC,kBAAkB,CAAC,GAAG,gBAAgB,CAAC;IAC/C,OAAO,CAAC,eAAe,CAAC,GAAG,GAAG,EAAE,CAC9B,IAAI,iCAAuB,CACzB,mBAAmB,EACnB,gBAAgB,EAChB,eAAe,CAChB,CAAC;IAEJ,IAAI,aAAa,EAAE,CAAC;QAClB,OAAO,CAAC,kBAAkB,CAAC,GAAG,IAAI,KAAK,CAAC,gBAAgB,EAAE;YACxD,GAAG,CAID,MAAS,EAAE,CAAI;gBACf,OAAO,CAAC,GAAG,GAAQ,EAAO,EAAE,CAC1B,IAAA,oBAAa,EAAE,MAAM,CAAC,CAAC,CAAO,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;YACvD,CAAC;SACF,CAAC,CAAC;QAEH,OAAO,CAAC,eAAe,CAAC,GAAG,GAAG,EAAE;YAC9B,MAAM,KAAK,GAAG,IAAI,KAAK,CACrB,IAAI,iCAAuB,CACzB,mBAAmB,EACnB,gBAAgB,EAChB,eAAe,CAChB,EACD;gBACE,GAAG,CAID,MAAS,EAAE,CAAI;oBACf,IAAI,CAAC,KAAK,KAAK,EAAE,CAAC;wBAChB,OAAO,GAAG,EAAE,CAAC,IAAA,oBAAa,EAAC,MAAM,CAAC,GAAG,EAAE,CAAQ,CAAC;oBAClD,CAAC;oBAED,IAAI,OAAO,MAAM,CAAC,CAAC,CAAC,KAAK,UAAU,EAAE,CAAC;wBACpC,OAAO,CAAC,GAAG,GAAQ,EAAE,EAAE;4BACrB,aAAa;4BACb,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;4BAClB,OAAO,KAAK,CAAC;wBACf,CAAC,CAAC;oBACJ,CAAC;oBACD,OAAO,MAAM,CAAC,CAAC,CAAQ,CAAC;gBAC1B,CAAC;aACF,CACF,CAAC;YAEF,OAAO,KAAK,CAAC;QACf,CAAC,CAAC;IACJ,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"version":3,"file":"json-api-js.js","sourceRoot":"","sources":["../../../../../../../libs/json-api/json-api-nestjs-sdk/src/lib/json-api-js.ts"],"names":[],"mappings":"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"}

package/cjs/src/lib/service/atomic-operations.service.js.map

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

package/cjs/src/lib/service/fetch-inner-client.js

@@ -9,7 +9,10 @@ class FetchInnerClient {
             method: 'delete',
         };
         if (body) {
-            requestInit = Object.assign(Object.assign({}, requestInit), { body: JSON.stringify(body) });
+            requestInit = {
+                ...requestInit,
+                body: JSON.stringify(body),
+            };
         }
         return this.request(url, requestInit);
     }
@@ -35,7 +38,10 @@ class FetchInnerClient {
         });
     }
     request(url, initData) {
-        return (0, fetch_1.fromFetch)(url, Object.assign(Object.assign({}, initData), { selector: (r) => r.json() }));
+        return (0, fetch_1.fromFetch)(url, {
+            ...initData,
+            selector: (r) => r.json(),
+        });
     }
     getResultUrl(url, params) {
         const paramsStr = new utils_1.HttpParams({ fromObject: params }).toString();

package/cjs/src/lib/service/fetch-inner-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetch-inner-client.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-sdk/src/lib/service/fetch-inner-client.ts"],"names":[],"mappings":";;;AACA,sCAAuC;AAMvC,oCAAmD;AAWnD,MAAa,gBAAgB;IAC3B,MAAM,CACJ,GAAW,EACX,IAA4C;QAE5C,IAAI,WAAW,GAAgB;YAC7B,MAAM,EAAE,QAAQ;SACjB,CAAC;QACF,IAAI,IAAI,EAAE,CAAC;YACT,WAAW,mCACN,WAAW,KACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAC3B,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAO,GAAG,EAAE,WAAW,CAAC,CAAC;IAC9C,CAAC;IAkBD,GAAG,CAMD,GAAW,EACX,MAAgC;QAKhC,IAAI,YAAY,GAAG,EAAE,CAAC;QACtB,IAAI,MAAM,EAAE,CAAC;YACX,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC,CAAC;QACtC,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAGjB,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,YAAY,CAAC,EAAE;YACtC,MAAM,EAAE,KAAK;SACd,CAAC,CAAC;IACL,CAAC;IAcD,KAAK,CAKH,GAAW,EACX,IAA0D;QAI1D,OAAO,IAAI,CAAC,OAAO,CAEjB,GAAG,EAAE;YACL,MAAM,EAAE,OAAO;YACf,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;SAC3B,CAAC,CAAC;IACL,CAAC;IAkBD,IAAI,CAKF,GAAW,EACX,IAAsE;QAMtE,OAAO,IAAI,CAAC,OAAO,CAOjB,GAAG,EAAE;YACL,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;SAC3B,CAAC,CAAC;IACL,CAAC;IAEO,OAAO,CAAI,GAAW,EAAE,QAAqB;QACnD,OAAO,IAAA,iBAAS,EAAI,GAAG,kCAClB,QAAQ,KACX,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,IACzB,CAAC;IACL,CAAC;IAEO,YAAY,CAAC,GAAW,EAAE,MAAmB;QACnD,MAAM,SAAS,GAAG,IAAI,kBAAU,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;QACpE,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,GAAG,CAAC;QACvC,OAAO,IAAI,GAAG,CACZ,GAAG,GAAG,IAAI,kBAAU,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,EACvD,GAAG,CACJ,CAAC,QAAQ,EAAE,CAAC;IACf,CAAC;CACF;AA/ID,4CA+IC"}
+{"version":3,"file":"fetch-inner-client.js","sourceRoot":"","sources":["../../../../../../../../libs/json-api/json-api-nestjs-sdk/src/lib/service/fetch-inner-client.ts"],"names":[],"mappings":";;;AACA,sCAAuC;AAMvC,oCAAmD;AAWnD,MAAa,gBAAgB;IAC3B,MAAM,CACJ,GAAW,EACX,IAA4C;QAE5C,IAAI,WAAW,GAAgB;YAC7B,MAAM,EAAE,QAAQ;SACjB,CAAC;QACF,IAAI,IAAI,EAAE,CAAC;YACT,WAAW,GAAG;gBACZ,GAAG,WAAW;gBACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;aAC3B,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAO,GAAG,EAAE,WAAW,CAAC,CAAC;IAC9C,CAAC;IAkBD,GAAG,CAMD,GAAW,EACX,MAAgC;QAKhC,IAAI,YAAY,GAAG,EAAE,CAAC;QACtB,IAAI,MAAM,EAAE,CAAC;YACX,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC,CAAC;QACtC,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAGjB,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,YAAY,CAAC,EAAE;YACtC,MAAM,EAAE,KAAK;SACd,CAAC,CAAC;IACL,CAAC;IAcD,KAAK,CAKH,GAAW,EACX,IAA0D;QAI1D,OAAO,IAAI,CAAC,OAAO,CAEjB,GAAG,EAAE;YACL,MAAM,EAAE,OAAO;YACf,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;SAC3B,CAAC,CAAC;IACL,CAAC;IAkBD,IAAI,CAKF,GAAW,EACX,IAAsE;QAMtE,OAAO,IAAI,CAAC,OAAO,CAOjB,GAAG,EAAE;YACL,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;SAC3B,CAAC,CAAC;IACL,CAAC;IAEO,OAAO,CAAI,GAAW,EAAE,QAAqB;QACnD,OAAO,IAAA,iBAAS,EAAI,GAAG,EAAE;YACvB,GAAG,QAAQ;YACX,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE;SAC1B,CAAC,CAAC;IACL,CAAC;IAEO,YAAY,CAAC,GAAW,EAAE,MAAmB;QACnD,MAAM,SAAS,GAAG,IAAI,kBAAU,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;QACpE,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,GAAG,CAAC;QACvC,OAAO,IAAI,GAAG,CACZ,GAAG,GAAG,IAAI,kBAAU,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,EACvD,GAAG,CACJ,CAAC,QAAQ,EAAE,CAAC;IACf,CAAC;CACF;AA/ID,4CA+IC"}

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

@@ -4,22 +4,42 @@ exports.JsonApiSdkService = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const utils_1 = require("../utils");
+const AS_PLAIN_RESULT = Symbol('asPlainResult');
 class JsonApiSdkService {
     constructor(http, jsonApiUtilsService, jsonApiSdkConfig) {
         this.http = http;
         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((0, operators_1.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,18 +52,21 @@ class JsonApiSdkService {
             });
         }));
     }
-    getAll(entity, params, push = true) {
-        const request = this.getList(entity, params).pipe((0, rxjs_1.expand)((r) => {
+    getAll(entityOrTypeName, params, push = true) {
+        const request = this.getList(entityOrTypeName, params).pipe((0, rxjs_1.expand)((r) => {
             if (r.pageNumber * r.pageSize >= r.totalItems) {
                 return rxjs_1.EMPTY;
             }
-            const newParams = Object.assign(Object.assign({}, params), {
-                page: {
-                    number: r.pageNumber + 1,
-                    size: r.pageSize,
+            const newParams = {
+                ...params,
+                ...{
+                    page: {
+                        number: r.pageNumber + 1,
+                        size: r.pageSize,
+                    },
                 },
-            });
-            return this.getList(entity, newParams);
+            };
+            return this.getList(entityOrTypeName, newParams);
         }));
         if (!push) {
             return request.pipe((0, rxjs_1.reduce)((acum, item) => {
@@ -60,31 +83,39 @@ class JsonApiSdkService {
         }
         return request;
     }
-    getOne(entity, id, params) {
+    getOne(entityOrTypeName, id, params) {
         if (!id) {
             return (0, rxjs_1.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((0, operators_1.map)((result) => this.jsonApiUtilsService.convertResponseData(result, params === null || params === void 0 ? void 0 : params.include)));
+            .pipe((0, operators_1.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: Object.assign({ type: (0, utils_1.getTypeForReq)(entity.constructor.name), attributes }, (Object.keys(relationships).length > 0 ? { relationships } : {})),
+            data: {
+                type: (0, utils_1.getTypeForReq)(entity.constructor.name),
+                attributes,
+                ...(Object.keys(relationships).length > 0 ? { relationships } : {}),
+            },
         };
         return this.http
             .post(this.jsonApiUtilsService.getUrlForResource(entity.constructor.name), body)
-            .pipe((0, operators_1.map)((r) => this.jsonApiUtilsService.convertResponseData(r)));
+            .pipe((0, operators_1.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 (0, rxjs_1.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: {
@@ -100,7 +131,7 @@ class JsonApiSdkService {
         }
         return this.http
             .patch(`${this.jsonApiUtilsService.getUrlForResource(entity.constructor.name)}/${id}`, body)
-            .pipe((0, operators_1.map)((r) => this.jsonApiUtilsService.convertResponseData(r)));
+            .pipe((0, operators_1.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/cjs/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":"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"}
+{"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/cjs/src/lib/service/json-api-utils.service.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsonApiUtilsService = void 0;
-const tslib_1 = require("tslib");
 const json_api_nestjs_shared_1 = require("@klerick/json-api-nestjs-shared");
 const change_case_commonjs_1 = require("change-case-commonjs");
 const utils_1 = require("../utils");
@@ -35,7 +34,7 @@ class JsonApiUtilsService {
         if (!sort || !(0, json_api_nestjs_shared_1.isObject)(sort) || Object.keys(sort).length === 0)
             return httpParams;
         const resultSortQuery = [];
-        const { target } = sort, relation = tslib_1.__rest(sort, ["target"]);
+        const { target, ...relation } = sort;
         if (target) {
             for (const [key, val] of Object.entries(target)) {
                 resultSortQuery.push(val === 'ASC' ? key : `-${key}`);
@@ -66,7 +65,7 @@ class JsonApiUtilsService {
     getFieldParam(field, httpParams) {
         if (!field || !(0, json_api_nestjs_shared_1.isObject)(field) || Object.keys(field).length === 0)
             return httpParams;
-        const { target: targetProps = [] } = field, relation = tslib_1.__rest(field, ["target"]);
+        const { target: targetProps = [], ...relation } = field;
         if (targetProps.length > 0) {
             httpParams = httpParams.set('fields[target]', [...new Set(targetProps)].join(','));
         }
@@ -81,7 +80,7 @@ class JsonApiUtilsService {
     getFilterParam(filter, httpParams) {
         if (!filter || !(0, json_api_nestjs_shared_1.isObject)(filter) || Object.keys(filter).length === 0)
             return httpParams;
-        const { target } = filter, relation = tslib_1.__rest(filter, ["target"]);
+        const { target, ...relation } = filter;
         if (target) {
             for (const [key, val] of Object.entries(target)) {
                 if (!(0, json_api_nestjs_shared_1.isObject)(val))
@@ -116,46 +115,75 @@ 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) {
-            const entityObject = Object.assign({ [this.jsonApiSdkConfig.idKey]: this.jsonApiSdkConfig.idIsNumber
-                    ? parseInt(dataItem[this.jsonApiSdkConfig.idKey], 10)
-                    : dataItem[this.jsonApiSdkConfig.idKey] }, Object.entries(dataItem.attributes || []).reduce((acum, [key, val]) => {
-                acum[key] = this.jsonApiSdkConfig.dateFields.includes(key)
-                    ? new Date(String(val))
-                    : val;
-                return acum;
-            }, {}));
-            const itemEntity = Object.assign(this.createEntityInstance(dataItem.type), entityObject);
-            if (!includeEntity || includeEntity.length === 0) {
-                result.push(itemEntity);
-                continue;
+            let id = dataItem[this.jsonApiSdkConfig.idKey];
+            if (this.jsonApiSdkConfig.idIsNumber) {
+                const idNumber = parseInt(id, 10);
+                id = isNaN(idNumber) ? id : idNumber;
             }
-            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 entityObject = {
+                [this.jsonApiSdkConfig.idKey]: id,
+                ...Object.entries(dataItem.attributes || []).reduce((acum, [key, val]) => {
+                    acum[key] = this.jsonApiSdkConfig.dateFields.includes(key)
+                        ? new Date(String(val))
+                        : val;
+                    return acum;
+                }, {}),
+            };
+            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,18 +198,40 @@ class JsonApiUtilsService {
     createEntityInstance(name) {
         return (0, json_api_nestjs_shared_1.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;
-        const entityObject = Object.assign({ [this.jsonApiSdkConfig.idKey]: this.jsonApiSdkConfig.idIsNumber
+        const entityObject = {
+            [this.jsonApiSdkConfig.idKey]: this.jsonApiSdkConfig.idIsNumber
                 ? parseInt(relatedIncluded[this.jsonApiSdkConfig.idKey], 10)
-                : relatedIncluded[this.jsonApiSdkConfig.idKey] }, Object.entries(relatedIncluded.attributes || []).reduce((acum, [key, val]) => {
-            acum[key] = this.jsonApiSdkConfig.dateFields.includes(key)
-                ? new Date(String(val))
-                : val;
-            return acum;
-        }, {}));
+                : relatedIncluded[this.jsonApiSdkConfig.idKey],
+            ...Object.entries(relatedIncluded.attributes || []).reduce((acum, [key, val]) => {
+                acum[key] = this.jsonApiSdkConfig.dateFields.includes(key)
+                    ? new Date(String(val))
+                    : val;
+                return acum;
+            }, {}),
+        };
+        if (asPlain) {
+            return entityObject;
+        }
         return Object.assign(this.createEntityInstance(item.type.toString()), entityObject);
     }
     generateBody(entity) {
@@ -192,7 +242,10 @@ class JsonApiUtilsService {
             const item = Array.isArray(val) ? val[0] : val;
             return !(0, utils_1.isRelation)(item);
         })
-            .reduce((acum, [key, val]) => (Object.assign(Object.assign({}, acum), { [key]: val })), {});
+            .reduce((acum, [key, val]) => ({
+            ...acum,
+            [key]: val,
+        }), {});
         const relationships = json_api_nestjs_shared_1.ObjectTyped.entries(entity)
             .filter(([key, val]) => {
             if (key === constants_1.ID_KEY)
@@ -202,7 +255,13 @@ class JsonApiUtilsService {
         })
             .reduce((acum, [key, val]) => {
             let data;
-            if (Array.isArray(val)) {
+            if ((0, utils_1.isNullRef)(val)) {
+                data = null;
+            }
+            else if ((0, utils_1.isEmptyArrayRef)(val)) {
+                data = [];
+            }
+            else if (Array.isArray(val)) {
                 data = val.map((i) => ({
                     type: (0, utils_1.getTypeForReq)(i.constructor.name),
                     id: i[constants_1.ID_KEY].toString(),
@@ -219,7 +278,10 @@ class JsonApiUtilsService {
                     data = null;
                 }
             }
-            return Object.assign(Object.assign({}, acum), { [key]: { data } });
+            return {
+                ...acum,
+                [key]: { data },
+            };
         }, {});
         return { attributes, relationships };
     }