@nmxjs/api 1.2.3 → 1.2.5

package/dist/ApiService/services/CreateApiService.d.ts

@@ -3,13 +3,11 @@ import * as NodeCache from 'node-cache';
 import { IConfig } from '@nmxjs/config';
 import { ICreateApiServiceOptions, IApiServiceWithInfo, ITransportStrategy } from '../interfaces';
 import { TrySetupWebApiService } from './TrySetupWebApiService';
-import { TransformJsonService } from './TransformJsonService';
 export declare class CreateApiService {
     protected readonly config: IConfig;
     protected readonly transportStrategy: ITransportStrategy;
-    protected readonly transformJsonService: TransformJsonService;
     protected readonly trySetupWebApiService: TrySetupWebApiService;
     protected cache: NodeCache;
-    constructor(config: IConfig, transportStrategy: ITransportStrategy, transformJsonService: TransformJsonService, trySetupWebApiService: TrySetupWebApiService);
+    constructor(config: IConfig, transportStrategy: ITransportStrategy, trySetupWebApiService: TrySetupWebApiService);
     call(options: ICreateApiServiceOptions): Promise<IApiServiceWithInfo>;
 }

package/dist/ApiService/services/CreateApiService.js

@@ -29,15 +29,14 @@ const objHash = require("object-hash");
 const common_1 = require("@nestjs/common");
 const config_1 = require("@nmxjs/config");
 const rxjs_1 = require("rxjs");
+const errors_1 = require("@nmxjs/errors");
 const constants_1 = require("../constants");
 const TrySetupWebApiService_1 = require("./TrySetupWebApiService");
-const errors_1 = require("@nmxjs/errors");
-const TransformJsonService_1 = require("./TransformJsonService");
+const utils_1 = require("../utils");
 let CreateApiService = class CreateApiService {
-    constructor(config, transportStrategy, transformJsonService, trySetupWebApiService) {
+    constructor(config, transportStrategy, trySetupWebApiService) {
         this.config = config;
         this.transportStrategy = transportStrategy;
-        this.transformJsonService = transformJsonService;
         this.trySetupWebApiService = trySetupWebApiService;
         this.cache = new NodeCache();
     }
@@ -52,8 +51,9 @@ let CreateApiService = class CreateApiService {
         const service = Object.keys(currentService).reduce((res, methodName) => {
             res[methodName] = async (requestData = {}, methodOptions = {}) => {
                 const route = `${serviceName}.${methodName}`;
+                const resultRequestData = (0, utils_1.transformStringifyJson)(`${route}.request`, requestData);
                 const getData = async () => {
-                    const payload = currentService[methodName](requestData);
+                    const payload = currentService[methodName](resultRequestData);
                     const result = await ((0, rxjs_1.isObservable)(payload) ? (0, rxjs_1.lastValueFrom)(payload) : payload).catch(e => {
                         if (requestData.skipError || methodOptions.skipError) {
                             return;
@@ -66,7 +66,7 @@ let CreateApiService = class CreateApiService {
                         }
                         throw e;
                     });
-                    return this.transformJsonService.call(route, result);
+                    return (0, utils_1.transformParseJson)(`${route}.response`, result);
                 };
                 const cacheTtlMs = requestData.cacheTtlMs || methodOptions.cacheTtlMs;
                 if (typeof cacheTtlMs !== 'number') {
@@ -96,7 +96,6 @@ exports.CreateApiService = CreateApiService = __decorate([
     (0, common_1.Injectable)(),
     __param(0, (0, common_1.Inject)(config_1.configKey)),
     __param(1, (0, common_1.Inject)(constants_1.transportStrategyKey)),
-    __metadata("design:paramtypes", [Object, Object, TransformJsonService_1.TransformJsonService,
-        TrySetupWebApiService_1.TrySetupWebApiService])
+    __metadata("design:paramtypes", [Object, Object, TrySetupWebApiService_1.TrySetupWebApiService])
 ], CreateApiService);
 //# sourceMappingURL=CreateApiService.js.map

package/dist/ApiService/services/CreateApiService.js.map

@@ -1 +1 @@
-{"version":3,"file":"CreateApiService.js","sourceRoot":"","sources":["../../../src/ApiService/services/CreateApiService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CreateApiService.js","sourceRoot":"","sources":["../../../src/ApiService/services/CreateApiService.ts"],"names":[],"mappings":"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"}

package/dist/ApiService/services/index.d.ts

@@ -1,3 +1,2 @@
 export * from './CreateApiService';
-export * from './TransformJsonService';
 export * from './TrySetupWebApiService';

package/dist/ApiService/services/index.js

@@ -15,6 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./CreateApiService"), exports);
-__exportStar(require("./TransformJsonService"), exports);
 __exportStar(require("./TrySetupWebApiService"), exports);
 //# sourceMappingURL=index.js.map

package/dist/ApiService/services/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/ApiService/services/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,qDAAmC;AACnC,yDAAuC;AACvC,0DAAwC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/ApiService/services/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,qDAAmC;AACnC,0DAAwC"}

package/dist/ApiService/utils/index.d.ts

@@ -1,2 +1,4 @@
 export * from './getJsonFieldsKeys';
 export * from './getQueryMutationByName';
+export * from './transformParseJson';
+export * from './transformStringifyJson';

package/dist/ApiService/utils/index.js

@@ -16,4 +16,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./getJsonFieldsKeys"), exports);
 __exportStar(require("./getQueryMutationByName"), exports);
+__exportStar(require("./transformParseJson"), exports);
+__exportStar(require("./transformStringifyJson"), exports);
 //# sourceMappingURL=index.js.map

package/dist/ApiService/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/ApiService/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sDAAoC;AACpC,2DAAyC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/ApiService/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sDAAoC;AACpC,2DAAyC;AACzC,uDAAqC;AACrC,2DAAyC"}

package/dist/ApiService/utils/transformParseJson.d.ts

@@ -0,0 +1 @@
+export declare function transformParseJson<T>(key: string, data: T): T;

package/dist/ApiService/utils/transformParseJson.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transformParseJson = void 0;
+const getJsonFieldsKeys_1 = require("./getJsonFieldsKeys");
+function transformParseJson(key, data) {
+    const jsonFieldsKeys = (0, getJsonFieldsKeys_1.getJsonFieldsKeys)(key);
+    if (!jsonFieldsKeys || jsonFieldsKeys.length === 0) {
+        return data;
+    }
+    for (const path of jsonFieldsKeys) {
+        const [firstKey, secondKey] = path.split('.');
+        if (firstKey && !secondKey) {
+            data[firstKey] = JSON.parse(data[firstKey]);
+        }
+        else if (Array.isArray(data[firstKey])) {
+            data[firstKey].forEach(item => {
+                item[secondKey] = JSON.parse(item[secondKey]);
+            });
+        }
+        else {
+            data[firstKey][secondKey] = JSON.parse(data[firstKey][secondKey]);
+        }
+    }
+    return data;
+}
+exports.transformParseJson = transformParseJson;
+//# sourceMappingURL=transformParseJson.js.map

package/dist/ApiService/utils/transformParseJson.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"transformParseJson.js","sourceRoot":"","sources":["../../../src/ApiService/utils/transformParseJson.ts"],"names":[],"mappings":";;;AAAA,2DAAwD;AAExD,SAAgB,kBAAkB,CAAI,GAAW,EAAE,IAAO;IACxD,MAAM,cAAc,GAAG,IAAA,qCAAiB,EAAC,GAAG,CAAC,CAAC;IAE9C,IAAI,CAAC,cAAc,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE,CAAC;QAClC,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAE9C,IAAI,QAAQ,IAAI,CAAC,SAAS,EAAE,CAAC;YAC3B,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC9C,CAAC;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;YACzC,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBAC5B,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;YAChD,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAtBD,gDAsBC"}

package/dist/ApiService/utils/transformStringifyJson.d.ts

@@ -0,0 +1 @@
+export declare function transformStringifyJson<T>(key: string, data: T): T;

package/dist/ApiService/utils/transformStringifyJson.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transformStringifyJson = void 0;
+const getJsonFieldsKeys_1 = require("./getJsonFieldsKeys");
+function transformStringifyJson(key, data) {
+    const jsonFieldsKeys = (0, getJsonFieldsKeys_1.getJsonFieldsKeys)(this.key);
+    if (!jsonFieldsKeys || jsonFieldsKeys.length === 0) {
+        return data;
+    }
+    for (const path of jsonFieldsKeys) {
+        const [firstKey, secondKey] = path.split('.');
+        if (firstKey && !secondKey) {
+            data[firstKey] = JSON.stringify(data[firstKey]);
+        }
+        else if (Array.isArray(data[firstKey])) {
+            data[firstKey].forEach(item => {
+                item[secondKey] = JSON.stringify(item[secondKey]);
+            });
+        }
+        else {
+            data[firstKey][secondKey] = JSON.stringify(data[firstKey][secondKey]);
+        }
+    }
+    return data;
+}
+exports.transformStringifyJson = transformStringifyJson;
+//# sourceMappingURL=transformStringifyJson.js.map

package/dist/ApiService/utils/transformStringifyJson.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"transformStringifyJson.js","sourceRoot":"","sources":["../../../src/ApiService/utils/transformStringifyJson.ts"],"names":[],"mappings":";;;AAAA,2DAAwD;AAExD,SAAgB,sBAAsB,CAAI,GAAW,EAAE,IAAO;IAC5D,MAAM,cAAc,GAAG,IAAA,qCAAiB,EAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEnD,IAAI,CAAC,cAAc,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE,CAAC;QAClC,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAE9C,IAAI,QAAQ,IAAI,CAAC,SAAS,EAAE,CAAC;YAC3B,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;QAClD,CAAC;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;YACzC,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBAC5B,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;YACpD,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;QACxE,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAtBD,wDAsBC"}

package/dist/GrpcTransport/interceptors/GrpcInterceptor.d.ts

@@ -1,7 +1,7 @@
 import { Observable } from 'rxjs';
-import { CallHandler, NestInterceptor } from '@nestjs/common';
+import { CallHandler, ExecutionContext, NestInterceptor } from '@nestjs/common';
 export declare class GrpcInterceptor implements NestInterceptor {
     protected readonly key: string;
     constructor(key: string);
-    intercept(_: any, next: CallHandler): Observable<any>;
+    intercept(ctx: ExecutionContext, next: CallHandler): Observable<any>;
 }

package/dist/GrpcTransport/interceptors/GrpcInterceptor.js

@@ -12,33 +12,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GrpcInterceptor = void 0;
 const rxjs_1 = require("rxjs");
 const common_1 = require("@nestjs/common");
-const getJsonFieldsKeys_1 = require("../../ApiService/utils/getJsonFieldsKeys");
+const transformParseJson_1 = require("../../ApiService/utils/transformParseJson");
+const transformStringifyJson_1 = require("../../ApiService/utils/transformStringifyJson");
 let GrpcInterceptor = class GrpcInterceptor {
     constructor(key) {
         this.key = key;
     }
-    intercept(_, next) {
-        return next.handle().pipe((0, rxjs_1.map)(res => {
-            const jsonFieldsKeys = (0, getJsonFieldsKeys_1.getJsonFieldsKeys)(this.key);
-            if (!jsonFieldsKeys || jsonFieldsKeys.length === 0) {
-                return res;
-            }
-            for (const path of jsonFieldsKeys) {
-                const [firstKey, secondKey] = path.split('.');
-                if (firstKey && !secondKey) {
-                    res[firstKey] = `json${JSON.stringify(res[firstKey])}`;
-                }
-                else if (Array.isArray(res[firstKey])) {
-                    res[firstKey].forEach(item => {
-                        item[secondKey] = `json${JSON.stringify(item[secondKey])}`;
-                    });
-                }
-                else {
-                    res[firstKey][secondKey] = `json${JSON.stringify(res[firstKey][secondKey])}`;
-                }
-            }
-            return res;
-        }));
+    intercept(ctx, next) {
+        (0, transformParseJson_1.transformParseJson)(`${this.key}.request`, ctx.switchToRpc().getData());
+        return next.handle().pipe((0, rxjs_1.map)(res => (0, transformStringifyJson_1.transformStringifyJson)(`${this.key}.response`, res)));
     }
 };
 exports.GrpcInterceptor = GrpcInterceptor;

package/dist/GrpcTransport/interceptors/GrpcInterceptor.js.map

@@ -1 +1 @@
-{"version":3,"file":"GrpcInterceptor.js","sourceRoot":"","sources":["../../../src/GrpcTransport/interceptors/GrpcInterceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAAuC;AACvC,2CAA0E;AAC1E,gFAA6E;AAGtE,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YAA+B,GAAW;QAAX,QAAG,GAAH,GAAG,CAAQ;IAAG,CAAC;IAEvC,SAAS,CAAC,CAAC,EAAE,IAAiB;QACnC,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CACvB,IAAA,UAAG,EAAC,GAAG,CAAC,EAAE;YACR,MAAM,cAAc,GAAG,IAAA,qCAAiB,EAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAEnD,IAAI,CAAC,cAAc,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACnD,OAAO,GAAG,CAAC;YACb,CAAC;YAED,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE,CAAC;gBAClC,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAE9C,IAAI,QAAQ,IAAI,CAAC,SAAS,EAAE,CAAC;oBAC3B,GAAG,CAAC,QAAQ,CAAC,GAAG,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;gBACzD,CAAC;qBAAM,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;oBACxC,GAAG,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;wBAC3B,IAAI,CAAC,SAAS,CAAC,GAAG,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;oBAC7D,CAAC,CAAC,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACN,GAAG,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,GAAG,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;gBAC/E,CAAC;YACH,CAAC;YAED,OAAO,GAAG,CAAC;QACb,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;CACF,CAAA;AA9BY,0CAAe;0BAAf,eAAe;IAD3B,IAAA,mBAAU,GAAE;;GACA,eAAe,CA8B3B"}
+{"version":3,"file":"GrpcInterceptor.js","sourceRoot":"","sources":["../../../src/GrpcTransport/interceptors/GrpcInterceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAAuC;AACvC,2CAA4F;AAC5F,kFAA+E;AAC/E,0FAAuF;AAGhF,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YAA+B,GAAW;QAAX,QAAG,GAAH,GAAG,CAAQ;IAAG,CAAC;IAEvC,SAAS,CAAC,GAAqB,EAAE,IAAiB;QACvD,IAAA,uCAAkB,EAAC,GAAG,IAAI,CAAC,GAAG,UAAU,EAAE,GAAG,CAAC,WAAW,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;QACvE,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,IAAA,UAAG,EAAC,GAAG,CAAC,EAAE,CAAC,IAAA,+CAAsB,EAAC,GAAG,IAAI,CAAC,GAAG,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IAC7F,CAAC;CACF,CAAA;AAPY,0CAAe;0BAAf,eAAe;IAD3B,IAAA,mBAAU,GAAE;;GACA,eAAe,CAO3B"}

package/dist/GrpcTransport/services/GenerateProtoService.js

@@ -41,7 +41,10 @@ let GenerateProtoService = class GenerateProtoService {
             const requestMethodName = `${upperMethodName}Request`;
             const responseMethodName = `${upperMethodName}Response`;
             protoFileData.push(`    rpc ${methodName} (${requestMethodName}) returns (${responseMethodName}) {}\n`);
-            (0, getJsonFieldsKeys_1.setJsonFieldsKey)(`${service}.${methodName}`, schema[methodName].response);
+            if (schema[methodName].request) {
+                (0, getJsonFieldsKeys_1.setJsonFieldsKey)(`${service}.${methodName}.request`, schema[methodName].request);
+            }
+            (0, getJsonFieldsKeys_1.setJsonFieldsKey)(`${service}.${methodName}.response`, schema[methodName].response);
             let res = this.generateProtoMessagesService.call({
                 messageName: requestMethodName,
                 objSchema: schema[methodName].request,

package/dist/GrpcTransport/services/GenerateProtoService.js.map

@@ -1 +1 @@
-{"version":3,"file":"GenerateProtoService.js","sourceRoot":"","sources":["../../../src/GrpcTransport/services/GenerateProtoService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"GenerateProtoService.js","sourceRoot":"","sources":["../../../src/GrpcTransport/services/GenerateProtoService.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nmxjs/api",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/dist/ApiService/services/TransformJsonService.d.ts

@@ -1,3 +0,0 @@
-export declare class TransformJsonService {
-    call<T>(key: string, data: T): T;
-}

package/dist/ApiService/services/TransformJsonService.js

@@ -1,39 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TransformJsonService = void 0;
-const common_1 = require("@nestjs/common");
-const utils_1 = require("../utils");
-let TransformJsonService = class TransformJsonService {
-    call(key, data) {
-        const jsonFieldsKeys = (0, utils_1.getJsonFieldsKeys)(key);
-        if (!jsonFieldsKeys || jsonFieldsKeys.length === 0) {
-            return data;
-        }
-        for (const path of jsonFieldsKeys) {
-            const [firstKey, secondKey] = path.split('.');
-            if (firstKey && !secondKey) {
-                data[firstKey] = JSON.parse(data[firstKey].substring(4));
-            }
-            else if (Array.isArray(data[firstKey])) {
-                data[firstKey].forEach(item => {
-                    item[secondKey] = JSON.parse(item[secondKey].substring(4));
-                });
-            }
-            else {
-                data[firstKey][secondKey] = JSON.parse(data[firstKey][secondKey].substring(4));
-            }
-        }
-        return data;
-    }
-};
-exports.TransformJsonService = TransformJsonService;
-exports.TransformJsonService = TransformJsonService = __decorate([
-    (0, common_1.Injectable)()
-], TransformJsonService);
-//# sourceMappingURL=TransformJsonService.js.map

package/dist/ApiService/services/TransformJsonService.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"TransformJsonService.js","sourceRoot":"","sources":["../../../src/ApiService/services/TransformJsonService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4C;AAC5C,oCAA6C;AAGtC,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IACxB,IAAI,CAAI,GAAW,EAAE,IAAO;QACjC,MAAM,cAAc,GAAG,IAAA,yBAAiB,EAAC,GAAG,CAAC,CAAC;QAE9C,IAAI,CAAC,cAAc,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE,CAAC;YAClC,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAE9C,IAAI,QAAQ,IAAI,CAAC,SAAS,EAAE,CAAC;gBAC3B,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;YAC3D,CAAC;iBAAM,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;gBACzC,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;oBAC5B,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC7D,CAAC,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;YACjF,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AAxBY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,mBAAU,GAAE;GACA,oBAAoB,CAwBhC"}