eservices-back-core 1.6.14 → 1.6.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/socket/connect-socket.d.ts.map +1 -1
- package/dist/socket/connect-socket.js +10 -2
- package/dist/socket/connect-socket.js.map +1 -1
- package/dist/socket/core-socket-server.d.ts +2 -0
- package/dist/socket/core-socket-server.d.ts.map +1 -1
- package/dist/socket/core-socket-server.js +22 -2
- package/dist/socket/core-socket-server.js.map +1 -1
- package/dist/socket/events/entity_update.d.ts.map +1 -1
- package/dist/socket/events/entity_update.js +2 -2
- package/dist/socket/events/entity_update.js.map +1 -1
- package/dist/utils/transform-update-values.d.ts +1 -1
- package/dist/utils/transform-update-values.d.ts.map +1 -1
- package/dist/utils/transform-update-values.js +3 -21
- package/dist/utils/transform-update-values.js.map +1 -1
- package/package.json +2 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect-socket.d.ts","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,IAAI,CAAC;AAC7B,OAAO,MAAM,MAAM,WAAW,CAAC;AA4B/B;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,SAAS,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"connect-socket.d.ts","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,IAAI,CAAC;AAC7B,OAAO,MAAM,MAAM,WAAW,CAAC;AA4B/B;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,SAAS,EAAE,MAAM,QA8HtD;AAkBD;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,GAAE,MAAU,QAMhG;AA0BD,MAAM,WAAW,cAAc;IAC9B;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,YAAY,EAAE,MAAM,CAAA;IACpB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAA;CAChB"}
|
|
@@ -59,9 +59,13 @@ function connectSocket(webServer) {
|
|
|
59
59
|
socketServer.addSocket(ws, userId);
|
|
60
60
|
sendWSResponse(ws, 'configuration:read', (0, configuration_read_socket_1.readConfiguration)());
|
|
61
61
|
debug("Socket was added to server and configuration was send.");
|
|
62
|
-
ws.on('error',
|
|
62
|
+
ws.on('error', (err) => {
|
|
63
|
+
debug('UserId %d Получена ошибка в socket соединении.');
|
|
64
|
+
onSocketError(err);
|
|
65
|
+
});
|
|
63
66
|
ws.on('message', function message(stringData) {
|
|
64
67
|
return __awaiter(this, void 0, void 0, function* () {
|
|
68
|
+
debug('UserId %d сообщение по web-socket получено, но ещё не проверено на авторизацию.', userId);
|
|
65
69
|
const info = JSON.parse(stringData.toString());
|
|
66
70
|
try {
|
|
67
71
|
yield (0, auth_middleware_1.authModule)().useWSAuthMiddleware(req);
|
|
@@ -138,10 +142,14 @@ function connectSocket(webServer) {
|
|
|
138
142
|
});
|
|
139
143
|
});
|
|
140
144
|
ws.on('close', () => {
|
|
141
|
-
debug("
|
|
145
|
+
debug("UserId %d socket был закрыт.");
|
|
142
146
|
use_logger_1.Logger.info("Socket connection closed.");
|
|
143
147
|
socketServer.deleteSocket(ws.id);
|
|
144
148
|
});
|
|
149
|
+
})
|
|
150
|
+
.on('close', () => {
|
|
151
|
+
debug("TEST_EVENT: on close");
|
|
152
|
+
use_logger_1.Logger.warn("TEST_EVENT: on close");
|
|
145
153
|
});
|
|
146
154
|
/**
|
|
147
155
|
* @description Перехватчик используется для того для проверки авторизации пользователя. Socket соединение не будет
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect-socket.js","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAGA,6DAAsD;AACtD,mFAAyD;AACzD,iEAAoD;AACpD,2EAA8D;AAC9D,+DAA2D;AAC3D,8EAAoD;AACpD,gDAAwB;AACxB,kDAAgC;AAChC,yEAA+D;AAC/D,mEAAyD;AACzD,+CAA0G;AAC1G,qDAA4C;AAC5C,oCAA0C;AAC1C,oEAA2C;AAC3C,gEAAyD;AACzD,0DAA0D;AAC1D,sDAAsD;AACtD,wEAAkE;AAClE,oEAA8D;AAC9D,wFAAiF;AACjF,oFAA6E;AAC7E,0EAAiD;AACjD,sEAA6C;AAE7C,MAAM,KAAK,GAAG,IAAA,eAAW,EAAC,IAAA,wBAAgB,EAAC,QAAQ,CAAC,CAAC,CAAC;AACtD,MAAM,kBAAkB,GAAG,eAAe,CAAC;AAC3C;;;GAGG;AACH,SAAwB,aAAa,CAAC,SAAiB;IACtD,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAE/B,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,GAAG,IAAI,4BAAgB,CAAC;QAC5D,QAAQ,EAAE,IAAI;QACd,iBAAiB,EAAE,IAAI;KACvB,CAAC;SACD,EAAE,CAAC,YAAY,EAAE,SAAS,UAAU,CAAC,EAAa,EAAE,GAAY;QAChE,MAAM,MAAM,GAAK,IAAA,mCAAwB,EAAC,GAAG,CAAC,CAAC;QAC/C,MAAM,QAAQ,GAAG,IAAA,qCAA0B,EAAC,GAAG,CAAC,CAAC;QAEjD,IAAI,CAAC,MAAM,EAAE,CAAC;YACb,mBAAM,CAAC,KAAK,CAAC,mBAAQ,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAC;YACpD,OAAO;QACR,CAAC;QAED,KAAK,CAAC,2CAA2C,EAAE,MAAM,CAAC,CAAC;QAC3D,YAAY,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QACnC,cAAc,CAAC,EAAE,EAAE,oBAAoB,EAAE,IAAA,6CAAiB,GAAE,CAAC,CAAA;QAC7D,KAAK,CAAC,wDAAwD,CAAC,CAAC;QAEhE,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"connect-socket.js","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { WebSocket, WebSocketServer } from "ws";
|
|
2
2
|
import { UserId } from "../Server";
|
|
3
3
|
export default class CoreSocketServer extends WebSocketServer {
|
|
4
|
+
static TIME_PING_PONG: number;
|
|
5
|
+
constructor(params: any);
|
|
4
6
|
/**
|
|
5
7
|
* @description Метод по переданному идентификатору пользователя возвращает массив сокетов пользователя.
|
|
6
8
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core-socket-server.d.ts","sourceRoot":"","sources":["../../src/socket/core-socket-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,eAAe,EAAC,MAAM,IAAI,CAAC;AAC9C,OAAO,EAAC,MAAM,EAAC,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"core-socket-server.d.ts","sourceRoot":"","sources":["../../src/socket/core-socket-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,eAAe,EAAC,MAAM,IAAI,CAAC;AAC9C,OAAO,EAAC,MAAM,EAAC,MAAM,WAAW,CAAC;AAMjC,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,eAAe;IACzD,MAAM,CAAC,cAAc,SAAS;gBAClB,MAAM,KAAA;IAiBlB;;OAEG;IACH,aAAa,CAAC,QAAQ,EAAE,MAAM;IAM9B;;OAEG;IACH,aAAa;IAGb;;OAEG;IACH,WAAW,EAAE,GAAG,CAAC,YAAY,EAAE,SAAS,CAAC,CAAY;IACrD;;;OAGG;IACH,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC,CAAa;IAE1D;;OAEG;IACH,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM;IASvC;;OAEG;IACH,YAAY,CAAC,QAAQ,EAAE,MAAM;CAShC;AAED,KAAK,YAAY,GAAG,MAAM,CAAA"}
|
|
@@ -1,10 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
const ws_1 = require("ws");
|
|
4
7
|
const uuid_1 = require("uuid");
|
|
8
|
+
const debug_1 = __importDefault(require("debug"));
|
|
9
|
+
const utils_1 = require("../utils");
|
|
10
|
+
const debug = (0, debug_1.default)((0, utils_1.getCoreDebugMark)('core-socket-server'));
|
|
5
11
|
class CoreSocketServer extends ws_1.WebSocketServer {
|
|
6
|
-
constructor() {
|
|
7
|
-
super(
|
|
12
|
+
constructor(params) {
|
|
13
|
+
super(params);
|
|
8
14
|
/**
|
|
9
15
|
* @description Хранит все сокет соединения
|
|
10
16
|
*/
|
|
@@ -14,6 +20,18 @@ class CoreSocketServer extends ws_1.WebSocketServer {
|
|
|
14
20
|
* используемых этим пользователем
|
|
15
21
|
*/
|
|
16
22
|
this.socketClients = new Map();
|
|
23
|
+
setInterval(() => {
|
|
24
|
+
debug('ping-pong');
|
|
25
|
+
this.getAllSockets().forEach(socket => {
|
|
26
|
+
if (!socket.isAlive) {
|
|
27
|
+
socket.terminate();
|
|
28
|
+
debug('UserId %d socket is terminated due to not being alive.', socket.id);
|
|
29
|
+
return;
|
|
30
|
+
}
|
|
31
|
+
socket.isAlive = false;
|
|
32
|
+
socket.ping();
|
|
33
|
+
});
|
|
34
|
+
}, CoreSocketServer.TIME_PING_PONG);
|
|
17
35
|
}
|
|
18
36
|
/**
|
|
19
37
|
* @description Метод по переданному идентификатору пользователя возвращает массив сокетов пользователя.
|
|
@@ -35,6 +53,7 @@ class CoreSocketServer extends ws_1.WebSocketServer {
|
|
|
35
53
|
addSocket(ws, userId) {
|
|
36
54
|
ws.id = (0, uuid_1.v4)();
|
|
37
55
|
ws.userId = userId;
|
|
56
|
+
ws.isAlive = false;
|
|
38
57
|
this.socketStore.set(ws.id, ws);
|
|
39
58
|
if (!this.socketClients.get(userId))
|
|
40
59
|
this.socketClients.set(userId, new Set());
|
|
@@ -52,5 +71,6 @@ class CoreSocketServer extends ws_1.WebSocketServer {
|
|
|
52
71
|
userSockets.delete(socketId);
|
|
53
72
|
}
|
|
54
73
|
}
|
|
74
|
+
CoreSocketServer.TIME_PING_PONG = 5000;
|
|
55
75
|
exports.default = CoreSocketServer;
|
|
56
76
|
//# sourceMappingURL=core-socket-server.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core-socket-server.js","sourceRoot":"","sources":["../../src/socket/core-socket-server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"core-socket-server.js","sourceRoot":"","sources":["../../src/socket/core-socket-server.ts"],"names":[],"mappings":";;;;;AAAA,2BAA8C;AAE9C,+BAAkC;AAClC,kDAAgC;AAChC,oCAA0C;AAC1C,MAAM,KAAK,GAAG,IAAA,eAAW,EAAC,IAAA,wBAAgB,EAAC,oBAAoB,CAAC,CAAC,CAAC;AAElE,MAAqB,gBAAiB,SAAQ,oBAAe;IAEzD,YAAY,MAAM;QACd,KAAK,CAAC,MAAM,CAAC,CAAC;QA+BlB;;WAEG;QACH,gBAAW,GAAiC,IAAI,GAAG,EAAE,CAAA;QACrD;;;WAGG;QACH,kBAAa,GAAmC,IAAI,GAAG,EAAE,CAAC;QArCtD,WAAW,CAAC,GAAG,EAAE;YACb,KAAK,CAAC,WAAW,CAAC,CAAA;YAClB,IAAI,CAAC,aAAa,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;gBAClC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;oBAElB,MAAM,CAAC,SAAS,EAAE,CAAC;oBACnB,KAAK,CAAC,wDAAwD,EAAE,MAAM,CAAC,EAAE,CAAC,CAAA;oBAC1E,OAAO;gBACX,CAAC;gBACD,MAAM,CAAC,OAAO,GAAG,KAAK,CAAC;gBACvB,MAAM,CAAC,IAAI,EAAE,CAAC;YAClB,CAAC,CAAC,CAAA;QACN,CAAC,EAAE,gBAAgB,CAAC,cAAc,CAAE,CAAA;IACxC,CAAC;IACD;;OAEG;IACH,aAAa,CAAC,QAAgB;QAC1B,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC;YAAE,OAAO,EAAE,CAAC;QAEjD,OAAO,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;IACjG,CAAC;IAED;;OAEG;IACH,aAAa;QACT,OAAO,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAA;IACzC,CAAC;IAWD;;OAEG;IACH,SAAS,CAAC,EAAa,EAAE,MAAc;QACnC,EAAE,CAAC,EAAE,GAAG,IAAA,SAAM,GAAE,CAAC;QACjB,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC;QACnB,EAAE,CAAC,OAAO,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAEhC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC;YAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;QAC/E,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAC9C,CAAC;IACD;;OAEG;IACH,YAAY,CAAC,QAAgB;QACzB,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAClD,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAElC,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;QAC7D,IAAI,CAAC,WAAW;YAAE,OAAO;QAEzB,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACjC,CAAC;;AAlEM,+BAAc,GAAG,IAAK,AAAR,CAAS;kBADb,gBAAgB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity_update.d.ts","sourceRoot":"","sources":["../../../src/socket/events/entity_update.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,cAAc,EAAC,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"entity_update.d.ts","sourceRoot":"","sources":["../../../src/socket/events/entity_update.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,cAAc,EAAC,MAAM,mBAAmB,CAAC;AAOjD,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,4DAY9E;AAQD,MAAM,WAAW,iBAAiB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,OAAO,CAAA;CACf"}
|
|
@@ -18,6 +18,7 @@ const data_service_1 = __importDefault(require("../../services/data-service"));
|
|
|
18
18
|
const criterion_1 = __importDefault(require("../../model/criterion"));
|
|
19
19
|
const get_criterion_config_1 = __importDefault(require("../../utils/get-criterion-config"));
|
|
20
20
|
const get_criterion_preset_1 = require("../../utils/get-criterion-preset");
|
|
21
|
+
const transform_update_values_1 = __importDefault(require("../../utils/transform-update-values"));
|
|
21
22
|
function updateEntitySocket(options, data) {
|
|
22
23
|
return __awaiter(this, void 0, void 0, function* () {
|
|
23
24
|
if (!isEntityReadParams(data))
|
|
@@ -28,8 +29,7 @@ function updateEntitySocket(options, data) {
|
|
|
28
29
|
accessToken: options.token
|
|
29
30
|
});
|
|
30
31
|
const criterion = yield criterionObject.generate();
|
|
31
|
-
|
|
32
|
-
return dataService.updateById(data.entity, data.id, data.values, data.version, options.usageContext, criterion);
|
|
32
|
+
return dataService.updateById(data.entity, data.id, (0, transform_update_values_1.default)(data.values), data.version, options.usageContext, criterion);
|
|
33
33
|
});
|
|
34
34
|
}
|
|
35
35
|
exports.updateEntitySocket = updateEntitySocket;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity_update.js","sourceRoot":"","sources":["../../../src/socket/events/entity_update.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uEAA8C;AAE9C,+EAAsD;AACtD,sEAA8C;AAC9C,4FAAkE;AAClE,2EAAqF;
|
|
1
|
+
{"version":3,"file":"entity_update.js","sourceRoot":"","sources":["../../../src/socket/events/entity_update.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uEAA8C;AAE9C,+EAAsD;AACtD,sEAA8C;AAC9C,4FAAkE;AAClE,2EAAqF;AACrF,kGAAwE;AAExE,SAAsB,kBAAkB,CAAC,OAAuB,EAAE,IAAa;;QAC9E,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC;YAAE,MAAM,mBAAQ,CAAC,2BAA2B,EAAE,CAAC;QAE5E,MAAM,WAAW,GAAG,IAAI,sBAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAEnD,MAAM,eAAe,GAAG,IAAI,mBAAS,CAAC,MAAM,IAAA,8BAAkB,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YAC5E,aAAa,EAAE,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,IAAA,0DAAmC,EAAC,OAAO,CAAC;YACpG,WAAW,EAAE,OAAO,CAAC,KAAK;SAC1B,CAAC,CAAA;QACF,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,QAAQ,EAAE,CAAC;QAEnD,OAAO,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,IAAA,iCAAqB,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;IACvI,CAAC;CAAA;AAZD,gDAYC;AAED,MAAM,kBAAkB,GAAG,CAAC,KAAc,EACd,EAAE,CAC7B,CAAC,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;IACpC,QAAQ,IAAI,KAAK,IAAI,OAAQ,KAA2B,CAAC,MAAM,KAAK,QAAQ;IAC5E,IAAI,IAAI,KAAK,IAAI,OAAQ,KAA2B,CAAC,EAAE,KAAK,QAAQ,CAAA"}
|
|
@@ -4,5 +4,5 @@
|
|
|
4
4
|
* @example { address: { city: "Mogilev" } } -> { "Address.City": "Mogilev" }
|
|
5
5
|
*
|
|
6
6
|
*/
|
|
7
|
-
export default function transformUpdateValues(values: unknown
|
|
7
|
+
export default function transformUpdateValues(values: unknown): any;
|
|
8
8
|
//# sourceMappingURL=transform-update-values.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform-update-values.d.ts","sourceRoot":"","sources":["../../src/utils/transform-update-values.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"transform-update-values.d.ts","sourceRoot":"","sources":["../../src/utils/transform-update-values.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,MAAM,CAAC,OAAO,UAAU,qBAAqB,CAAC,MAAM,EAAE,OAAO,OAE5D"}
|
|
@@ -1,32 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const jenesius_vue_form_1 = require("jenesius-vue-form");
|
|
3
4
|
/**
|
|
4
5
|
* @description Функция получает values, возвращает новый объект значений. Суть функции - разложить вложенные значения и
|
|
5
6
|
* возвращает линейный объект. В названиях ключей так-же меняется первая
|
|
6
7
|
* @example { address: { city: "Mogilev" } } -> { "Address.City": "Mogilev" }
|
|
7
8
|
*
|
|
8
9
|
*/
|
|
9
|
-
function transformUpdateValues(values
|
|
10
|
-
|
|
11
|
-
return output;
|
|
12
|
-
for (const key in values) {
|
|
13
|
-
if (!(key in values))
|
|
14
|
-
continue;
|
|
15
|
-
const fieldValue = values[key];
|
|
16
|
-
const names = [...name, key];
|
|
17
|
-
if (isObject(fieldValue))
|
|
18
|
-
transformUpdateValues(fieldValue, names, output);
|
|
19
|
-
else {
|
|
20
|
-
output[concatNames(names)] = fieldValue;
|
|
21
|
-
}
|
|
22
|
-
}
|
|
23
|
-
return output;
|
|
10
|
+
function transformUpdateValues(values) {
|
|
11
|
+
return jenesius_vue_form_1.utils.plainObject(values);
|
|
24
12
|
}
|
|
25
13
|
exports.default = transformUpdateValues;
|
|
26
|
-
function isObject(value) {
|
|
27
|
-
return (typeof value === 'object' && value !== null && value !== undefined);
|
|
28
|
-
}
|
|
29
|
-
function concatNames(name) {
|
|
30
|
-
return name.map(tmp => tmp.replace(/\w/, c => c.toUpperCase())).join('.');
|
|
31
|
-
}
|
|
32
14
|
//# sourceMappingURL=transform-update-values.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform-update-values.js","sourceRoot":"","sources":["../../src/utils/transform-update-values.ts"],"names":[],"mappings":";;AAAA;;;;;GAKG;AACH,SAAwB,qBAAqB,CAAC,MAAe
|
|
1
|
+
{"version":3,"file":"transform-update-values.js","sourceRoot":"","sources":["../../src/utils/transform-update-values.ts"],"names":[],"mappings":";;AAAA,yDAAwC;AAExC;;;;;GAKG;AACH,SAAwB,qBAAqB,CAAC,MAAe;IAC5D,OAAO,yBAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;AACjC,CAAC;AAFD,wCAEC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "eservices-back-core",
|
|
3
|
-
"version": "1.6.
|
|
3
|
+
"version": "1.6.16",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/Server.js",
|
|
6
6
|
"scripts": {
|
|
@@ -36,6 +36,7 @@
|
|
|
36
36
|
"express-openid-connect": "^2.7.2",
|
|
37
37
|
"express-session": "^1.17.3",
|
|
38
38
|
"http-proxy-middleware": "^2.0.2",
|
|
39
|
+
"jenesius-vue-form": "^3.0.4",
|
|
39
40
|
"jwt-decode": "^3.1.2",
|
|
40
41
|
"node-fetch": "2.6.7",
|
|
41
42
|
"nodemon": "^2.0.16",
|