@openforis/arena-server 2.5.2 → 2.6.0
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/api/auth/login.js +11 -8
- package/dist/api/auth/login.js.map +1 -1
- package/dist/db/dbMigrator/dbMigrate.js +2 -2
- package/dist/db/dbMigrator/dbMigrate.js.map +1 -1
- package/dist/db/dbMigrator/dbMigrator.js +2 -2
- package/dist/db/dbMigrator/dbMigrator.js.map +1 -1
- package/dist/db/dbMigrator/migration/create.js +2 -2
- package/dist/db/dbMigrator/migration/create.js.map +1 -1
- package/dist/db/dbMigrator/migration/survey/migrations/20261004100000-alter-table-node-value-indexes-partial.d.ts +6 -0
- package/dist/db/dbMigrator/migration/survey/migrations/20261004100000-alter-table-node-value-indexes-partial.js +43 -0
- package/dist/db/dbMigrator/migration/survey/migrations/20261004100000-alter-table-node-value-indexes-partial.js.map +1 -0
- package/dist/db/dbMigrator/migration/survey/migrations/20261004100100-update-node-meta-remove-empty-dictionaries.d.ts +6 -0
- package/dist/db/dbMigrator/migration/survey/migrations/20261004100100-update-node-meta-remove-empty-dictionaries.js +43 -0
- package/dist/db/dbMigrator/migration/survey/migrations/20261004100100-update-node-meta-remove-empty-dictionaries.js.map +1 -0
- package/dist/db/dbMigrator/migration/survey/migrations/sqls/20261004100000-alter-table-node-value-indexes-partial-down.sql +15 -0
- package/dist/db/dbMigrator/migration/survey/migrations/sqls/20261004100000-alter-table-node-value-indexes-partial-up.sql +24 -0
- package/dist/db/dbMigrator/migration/survey/migrations/sqls/20261004100100-update-node-meta-remove-empty-dictionaries-down.sql +1 -0
- package/dist/db/dbMigrator/migration/survey/migrations/sqls/20261004100100-update-node-meta-remove-empty-dictionaries-up.sql +17 -0
- package/dist/db/dbs/transformCallback.js +1 -1
- package/dist/db/dbs/transformCallback.js.map +1 -1
- package/dist/db/sql/sqlDeleteBuilder.d.ts +1 -1
- package/dist/db/sql/sqlDeleteBuilder.js +1 -1
- package/dist/db/sql/sqlDeleteBuilder.js.map +1 -1
- package/dist/db/sql/sqlInsertBuilder.d.ts +1 -1
- package/dist/db/sql/sqlInsertBuilder.js +1 -1
- package/dist/db/sql/sqlInsertBuilder.js.map +1 -1
- package/dist/db/sql/sqlJoinBuilder.d.ts +2 -2
- package/dist/db/sql/sqlJoinBuilder.js +1 -1
- package/dist/db/sql/sqlJoinBuilder.js.map +1 -1
- package/dist/db/sql/sqlSelectBuilder.d.ts +6 -6
- package/dist/db/sql/sqlSelectBuilder.js.map +1 -1
- package/dist/db/sql/sqlUpdateBuilder.d.ts +3 -3
- package/dist/db/sql/sqlUpdateBuilder.js +4 -2
- package/dist/db/sql/sqlUpdateBuilder.js.map +1 -1
- package/dist/job/jobManager.d.ts +1 -1
- package/dist/job/jobManager.js +2 -2
- package/dist/job/jobManager.js.map +1 -1
- package/dist/job/jobThread.d.ts +1 -1
- package/dist/job/jobThread.js +12 -7
- package/dist/job/jobThread.js.map +1 -1
- package/dist/job/tests/testJobs.js +0 -1
- package/dist/job/tests/testJobs.js.map +1 -1
- package/dist/repository/authGroup/getMany.js +1 -1
- package/dist/repository/authGroup/getMany.js.map +1 -1
- package/dist/repository/dataQuery/delete.js +1 -1
- package/dist/repository/dataQuery/delete.js.map +1 -1
- package/dist/repository/dataQuery/insert.js +1 -1
- package/dist/repository/dataQuery/insert.js.map +1 -1
- package/dist/repository/dataQuery/read.js +1 -1
- package/dist/repository/dataQuery/read.js.map +1 -1
- package/dist/repository/user/get.js +1 -1
- package/dist/repository/user/get.js.map +1 -1
- package/dist/repository/userResetPassword/hasValidResetPassword.js +1 -1
- package/dist/repository/userResetPassword/hasValidResetPassword.js.map +1 -1
- package/dist/server/arenaServer/start.d.ts +1 -1
- package/dist/server/arenaServer/start.js +2 -2
- package/dist/server/arenaServer/start.js.map +1 -1
- package/dist/server/arenaServer/stop.d.ts +1 -1
- package/dist/service/info/index.js +1 -1
- package/dist/service/info/index.js.map +1 -1
- package/dist/service/survey/docExport/SurveyDocWalker.d.ts +1 -1
- package/dist/service/survey/docExport/SurveyDocWalker.js +28 -19
- package/dist/service/survey/docExport/SurveyDocWalker.js.map +1 -1
- package/dist/thread/thread.js +6 -6
- package/dist/thread/thread.js.map +1 -1
- package/dist/thread/worker.d.ts +1 -1
- package/dist/thread/worker.js +2 -2
- package/dist/thread/worker.js.map +1 -1
- package/dist/webSocket/server.d.ts +4 -4
- package/dist/webSocket/server.js.map +1 -1
- package/package.json +1 -1
package/dist/api/auth/login.js
CHANGED
|
@@ -65,17 +65,20 @@ const authenticationSuccessful = ({ req, res, next, user, callback, }) => req.lo
|
|
|
65
65
|
const serviceRegistry = arena_core_1.ServiceRegistry.getInstance();
|
|
66
66
|
const userAuthTokenService = serviceRegistry.getService(arena_core_1.ServiceType.userAuthToken);
|
|
67
67
|
const refreshTokenProps = (0, authApiCommon_1.extractRefreshTokenProps)({ req });
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
68
|
+
try {
|
|
69
|
+
const { authToken, refreshToken } = await userAuthTokenService.createUserAuthTokens({
|
|
70
|
+
userUuid,
|
|
71
|
+
props: refreshTokenProps,
|
|
72
|
+
});
|
|
71
73
|
(0, authApiCommon_1.setRefreshTokenCookie)({ res, refreshToken });
|
|
72
|
-
sendUser({ res, req, user, authToken: authToken.token });
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
.catch((error) => {
|
|
74
|
+
await sendUser({ res, req, user, authToken: authToken.token });
|
|
75
|
+
}
|
|
76
|
+
catch (error) {
|
|
76
77
|
next(error);
|
|
78
|
+
}
|
|
79
|
+
finally {
|
|
77
80
|
callback?.();
|
|
78
|
-
}
|
|
81
|
+
}
|
|
79
82
|
}
|
|
80
83
|
});
|
|
81
84
|
const getUser2FAService = () => arena_core_1.ServiceRegistry.getInstance().getService(server_1.ServerServiceType.user2FA);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/api/auth/login.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/api/auth/login.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.DBMigrate = void 0;
|
|
7
|
-
const
|
|
7
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
8
8
|
const db_migrate_1 = __importDefault(require("db-migrate"));
|
|
9
9
|
const processEnv_1 = require("../../processEnv");
|
|
10
10
|
const schemata_1 = require("../schemata");
|
|
@@ -38,7 +38,7 @@ const getInstance = (schema, cwd = __dirname) => {
|
|
|
38
38
|
const folder = schema === schemata_1.Schemata.PUBLIC ? MigrationFolder.public : MigrationFolder.survey;
|
|
39
39
|
const options = {
|
|
40
40
|
config: getConfig(schema),
|
|
41
|
-
cwd: `${
|
|
41
|
+
cwd: `${node_path_1.default.join(cwd, 'migration', folder)}`,
|
|
42
42
|
env: processEnv_1.ProcessEnv.nodeEnv,
|
|
43
43
|
throwUncatched: true,
|
|
44
44
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dbMigrate.js","sourceRoot":"","sources":["../../../src/db/dbMigrator/dbMigrate.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"dbMigrate.js","sourceRoot":"","sources":["../../../src/db/dbMigrator/dbMigrate.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA4B;AAE5B,4DAAkC;AAElC,iDAA6C;AAC7C,0CAAsC;AAEtC,IAAK,eAGJ;AAHD,WAAK,eAAe;IAClB,oCAAiB,CAAA;IACjB,oCAAiB,CAAA;AACnB,CAAC,EAHI,eAAe,KAAf,eAAe,QAGnB;AAED,MAAM,UAAU,GAAG;IACjB,MAAM,EAAE,IAAI;IACZ,IAAI,EAAE,uBAAU,CAAC,MAAM;IACvB,QAAQ,EAAE,uBAAU,CAAC,UAAU;IAC/B,IAAI,EAAE,uBAAU,CAAC,MAAM;IACvB,QAAQ,EAAE,uBAAU,CAAC,UAAU;IAC/B,GAAG,EAAE,uBAAU,CAAC,KAAK;QACnB,CAAC,CAAC;YACE,kBAAkB,EAAE,CAAC,uBAAU,CAAC,sBAAsB;SACvD;QACH,CAAC,CAAC,KAAK;IACT,MAAM,EAAE,EAAE;CACX,CAAA;AAED,MAAM,SAAS,GAAG,CAAC,MAAc,EAAO,EAAE;IACxC,MAAM,MAAM,GAAG,EAAE,GAAG,UAAU,EAAE,MAAM,EAAE,CAAA;IACxC,OAAO;QACL,WAAW,EAAE,MAAM;QACnB,UAAU,EAAE,MAAM;QAClB,IAAI,EAAE,MAAM;KACb,CAAA;AACH,CAAC,CAAA;AAED,MAAM,WAAW,GAAG,CAAC,MAAc,EAAE,MAAc,SAAS,EAAa,EAAE;IACzE,MAAM,MAAM,GAAG,MAAM,KAAK,mBAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,CAAA;IAE3F,MAAM,OAAO,GAAG;QACd,MAAM,EAAE,SAAS,CAAC,MAAM,CAAC;QACzB,GAAG,EAAE,GAAG,mBAAI,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE;QAC7C,GAAG,EAAE,uBAAU,CAAC,OAAO;QAGvB,cAAc,EAAE,IAAI;KACrB,CAAA;IACD,OAAO,oBAAS,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;AAC7C,CAAC,CAAA;AAEY,QAAA,SAAS,GAAG;IACvB,WAAW;CACZ,CAAA"}
|
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.DBMigrator = void 0;
|
|
7
|
-
const
|
|
7
|
+
const node_fs_1 = __importDefault(require("node:fs"));
|
|
8
8
|
const arena_core_1 = require("@openforis/arena-core");
|
|
9
9
|
const log_1 = require("../../log");
|
|
10
10
|
const repository_1 = require("../../repository");
|
|
@@ -17,7 +17,7 @@ const surveySchemaMigrationRequired = (appVersion) => appVersion === null ||
|
|
|
17
17
|
[...APP_VERSIONS_REQUIRING_SURVEY_SCHEMA_MIGRATION].some((version) => arena_core_1.Versions.isGreaterThan(version, appVersion));
|
|
18
18
|
const migrateSchema = async (params = {}) => {
|
|
19
19
|
const { schema = schemata_1.Schemata.PUBLIC, migrationsFolder = __dirname } = params;
|
|
20
|
-
if (!
|
|
20
|
+
if (!node_fs_1.default.existsSync(migrationsFolder))
|
|
21
21
|
return;
|
|
22
22
|
if (schema !== schemata_1.Schemata.PUBLIC) {
|
|
23
23
|
await db_1.DB.none(`CREATE SCHEMA IF NOT EXISTS ${schema}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dbMigrator.js","sourceRoot":"","sources":["../../../src/db/dbMigrator/dbMigrator.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"dbMigrator.js","sourceRoot":"","sources":["../../../src/db/dbMigrator/dbMigrator.ts"],"names":[],"mappings":";;;;;;AAAA,sDAAwB;AACxB,sDAAgD;AAEhD,mCAAkC;AAClC,iDAAmD;AACnD,8BAA0B;AAC1B,0CAAsC;AACtC,2CAAuC;AAEvC,MAAM,MAAM,GAAG,IAAI,YAAM,CAAC,YAAY,CAAC,CAAA;AAYvC,MAAM,8CAA8C,GAAG,IAAI,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;AAEzE,MAAM,6BAA6B,GAAG,CAAC,UAAyB,EAAW,EAAE,CAC3E,UAAU,KAAK,IAAI;IACnB,CAAC,GAAG,8CAA8C,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,qBAAQ,CAAC,aAAa,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAA;AAEpH,MAAM,aAAa,GAAG,KAAK,EAAE,SAAyD,EAAE,EAAiB,EAAE;IACzG,MAAM,EAAE,MAAM,GAAG,mBAAQ,CAAC,MAAM,EAAE,gBAAgB,GAAG,SAAS,EAAE,GAAG,MAAM,CAAA;IAEzE,IAAI,CAAC,iBAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC;QAAE,OAAM;IAE5C,IAAI,MAAM,KAAK,mBAAQ,CAAC,MAAM,EAAE,CAAC;QAC/B,MAAM,OAAE,CAAC,IAAI,CAAC,+BAA+B,MAAM,EAAE,CAAC,CAAA;IACxD,CAAC;IAED,MAAM,GAAG,GAAG,qBAAS,CAAC,WAAW,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAA;IAC3D,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IACjB,MAAM,GAAG,CAAC,EAAE,EAAE,CAAA;AAChB,CAAC,CAAA;AAED,MAAM,mBAAmB,GAAG,KAAK,EAAE,QAAgB,EAAiB,EAAE;IACpE,MAAM,CAAC,IAAI,CAAC,yBAAyB,QAAQ,UAAU,CAAC,CAAA;IACxD,MAAM,aAAa,CAAC,EAAE,MAAM,EAAE,mBAAQ,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;IACnE,MAAM,CAAC,IAAI,CAAC,yBAAyB,QAAQ,QAAQ,CAAC,CAAA;AACxD,CAAC,CAAA;AAED,MAAM,oBAAoB,GAAG,KAAK,EAAE,SAAuD,EAAE,EAAiB,EAAE;IAC9G,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAA;IAE3B,MAAM,OAAO,GAAG,MAAM,6BAAgB,CAAC,uBAAuB,EAAE,CAAA;IAChE,MAAM,kBAAkB,GAAG,OAAO;SAC/B,MAAM,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,6BAA6B,CAAC,UAAU,CAAC,CAAC;SACrE,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAA;IAEtB,MAAM,CAAC,IAAI,CAAC,kCAAkC,kBAAkB,CAAC,MAAM,WAAW,OAAO,CAAC,MAAM,UAAU,CAAC,CAAA;IAE3G,MAAM,KAAK,GAAG,kBAAkB,CAAC,MAAM,CAAA;IACvC,KAAK,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,kBAAkB,CAAC,OAAO,EAAE,EAAE,CAAC;QAC7D,MAAM,mBAAmB,CAAC,QAAQ,CAAC,CAAA;QACnC,MAAM,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAA;IAC9C,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAA;AAC5C,CAAC,CAAA;AAED,MAAM,UAAU,GAAG,KAAK,EAAE,SAAuD,EAAE,EAAiB,EAAE;IACpG,IAAI,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAA;QAE1C,MAAM,aAAa,EAAE,CAAA;QAErB,MAAM,oBAAoB,CAAC,MAAM,CAAC,CAAA;QAElC,MAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAA;IAC9C,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,MAAM,CAAC,KAAK,CAAC,sCAAsC,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;QACtE,MAAM,KAAK,CAAA;IACb,CAAC;AACH,CAAC,CAAA;AAEY,QAAA,UAAU,GAAG;IACxB,aAAa;IACb,mBAAmB;IACnB,oBAAoB;IACpB,UAAU;CACX,CAAA"}
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const
|
|
6
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
7
7
|
const schemata_1 = require("../../schemata");
|
|
8
8
|
const dbMigrate_1 = require("../dbMigrate");
|
|
9
9
|
var ArgName;
|
|
@@ -27,7 +27,7 @@ const getArgv = (name, defaultValue) => {
|
|
|
27
27
|
};
|
|
28
28
|
const name = getArgv(ArgName.name);
|
|
29
29
|
const schema = getArgv(ArgName.schema, schemata_1.Schemata.PUBLIC);
|
|
30
|
-
const cwd = getArgv(ArgName.cwd,
|
|
30
|
+
const cwd = getArgv(ArgName.cwd, node_path_1.default.resolve(__dirname, '..'));
|
|
31
31
|
const dbMigrate = dbMigrate_1.DBMigrate.getInstance(schema, cwd);
|
|
32
32
|
dbMigrate.create(name);
|
|
33
33
|
//# sourceMappingURL=create.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/db/dbMigrator/migration/create.ts"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/db/dbMigrator/migration/create.ts"],"names":[],"mappings":";;;;;AAAA,0DAA4B;AAE5B,6CAAyC;AACzC,4CAAwC;AAExC,IAAK,OAIJ;AAJD,WAAK,OAAO;IACV,wBAAa,CAAA;IACb,sBAAW,CAAA;IACX,4BAAiB,CAAA;AACnB,CAAC,EAJI,OAAO,KAAP,OAAO,QAIX;AAED,MAAM,KAAK,GAAG,2BAA2B,OAAO,CAAC,IAAI,aAAa,OAAO,CAAC,MAAM,eAAe,OAAO,CAAC,GAAG,QAAQ,CAAA;AAElH,MAAM,OAAO,GAAG,CAAC,IAAa,EAAE,YAAqB,EAAU,EAAE;IAC/D,MAAM,WAAW,GAAG,KAAK,IAAI,GAAG,CAAA;IAChC,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAA;IACnE,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,IAAI,YAAY;YAAE,OAAO,YAAY,CAAA;QAErC,OAAO,CAAC,KAAK,CAAC,YAAY,IAAI,cAAc,CAAC,CAAA;QAC7C,OAAO,CAAC,KAAK,CAAC,UAAU,KAAK,EAAE,CAAC,CAAA;QAChC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACjB,CAAC;IACD,OAAO,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;AAClC,CAAC,CAAA;AAED,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAClC,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,mBAAQ,CAAC,MAAM,CAAC,CAAA;AACvD,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,mBAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAA;AAE/D,MAAM,SAAS,GAAG,qBAAS,CAAC,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;AACpD,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA"}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
var dbm;
|
|
3
|
+
var type;
|
|
4
|
+
var seed;
|
|
5
|
+
var fs = require('fs');
|
|
6
|
+
var path = require('path');
|
|
7
|
+
var Promise;
|
|
8
|
+
exports.setup = function (options, seedLink) {
|
|
9
|
+
dbm = options.dbmigrate;
|
|
10
|
+
type = dbm.dataType;
|
|
11
|
+
seed = seedLink;
|
|
12
|
+
Promise = options.Promise;
|
|
13
|
+
};
|
|
14
|
+
exports.up = function (db) {
|
|
15
|
+
var filePath = path.join(__dirname, 'sqls', '20261004100000-alter-table-node-value-indexes-partial-up.sql');
|
|
16
|
+
return new Promise(function (resolve, reject) {
|
|
17
|
+
fs.readFile(filePath, { encoding: 'utf-8' }, function (err, data) {
|
|
18
|
+
if (err)
|
|
19
|
+
return reject(err);
|
|
20
|
+
console.log('received data: ' + data);
|
|
21
|
+
resolve(data);
|
|
22
|
+
});
|
|
23
|
+
}).then(function (data) {
|
|
24
|
+
return db.runSql(data);
|
|
25
|
+
});
|
|
26
|
+
};
|
|
27
|
+
exports.down = function (db) {
|
|
28
|
+
var filePath = path.join(__dirname, 'sqls', '20261004100000-alter-table-node-value-indexes-partial-down.sql');
|
|
29
|
+
return new Promise(function (resolve, reject) {
|
|
30
|
+
fs.readFile(filePath, { encoding: 'utf-8' }, function (err, data) {
|
|
31
|
+
if (err)
|
|
32
|
+
return reject(err);
|
|
33
|
+
console.log('received data: ' + data);
|
|
34
|
+
resolve(data);
|
|
35
|
+
});
|
|
36
|
+
}).then(function (data) {
|
|
37
|
+
return db.runSql(data);
|
|
38
|
+
});
|
|
39
|
+
};
|
|
40
|
+
exports._meta = {
|
|
41
|
+
version: 1,
|
|
42
|
+
};
|
|
43
|
+
//# sourceMappingURL=20261004100000-alter-table-node-value-indexes-partial.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"20261004100000-alter-table-node-value-indexes-partial.js","sourceRoot":"","sources":["../../../../../../src/db/dbMigrator/migration/survey/migrations/20261004100000-alter-table-node-value-indexes-partial.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,IAAI,GAAG,CAAA;AACP,IAAI,IAAI,CAAA;AACR,IAAI,IAAI,CAAA;AACR,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;AACtB,IAAI,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAC1B,IAAI,OAAO,CAAA;AAMX,OAAO,CAAC,KAAK,GAAG,UAAU,OAAO,EAAE,QAAQ;IACzC,GAAG,GAAG,OAAO,CAAC,SAAS,CAAA;IACvB,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAA;IACnB,IAAI,GAAG,QAAQ,CAAA;IACf,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;AAC3B,CAAC,CAAA;AAED,OAAO,CAAC,EAAE,GAAG,UAAU,EAAE;IACvB,IAAI,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,8DAA8D,CAAC,CAAA;IAC3G,OAAO,IAAI,OAAO,CAAC,UAAU,OAAO,EAAE,MAAM;QAC1C,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,UAAU,GAAG,EAAE,IAAI;YAC9D,IAAI,GAAG;gBAAE,OAAO,MAAM,CAAC,GAAG,CAAC,CAAA;YAC3B,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAA;YAErC,OAAO,CAAC,IAAI,CAAC,CAAA;QACf,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,IAAI;QACpB,OAAO,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACxB,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,OAAO,CAAC,IAAI,GAAG,UAAU,EAAE;IACzB,IAAI,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,gEAAgE,CAAC,CAAA;IAC7G,OAAO,IAAI,OAAO,CAAC,UAAU,OAAO,EAAE,MAAM;QAC1C,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,UAAU,GAAG,EAAE,IAAI;YAC9D,IAAI,GAAG;gBAAE,OAAO,MAAM,CAAC,GAAG,CAAC,CAAA;YAC3B,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAA;YAErC,OAAO,CAAC,IAAI,CAAC,CAAA;QACf,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,IAAI;QACpB,OAAO,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACxB,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,OAAO,CAAC,KAAK,GAAG;IACd,OAAO,EAAE,CAAC;CACX,CAAA"}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
var dbm;
|
|
3
|
+
var type;
|
|
4
|
+
var seed;
|
|
5
|
+
var fs = require('fs');
|
|
6
|
+
var path = require('path');
|
|
7
|
+
var Promise;
|
|
8
|
+
exports.setup = function (options, seedLink) {
|
|
9
|
+
dbm = options.dbmigrate;
|
|
10
|
+
type = dbm.dataType;
|
|
11
|
+
seed = seedLink;
|
|
12
|
+
Promise = options.Promise;
|
|
13
|
+
};
|
|
14
|
+
exports.up = function (db) {
|
|
15
|
+
var filePath = path.join(__dirname, 'sqls', '20261004100100-update-node-meta-remove-empty-dictionaries-up.sql');
|
|
16
|
+
return new Promise(function (resolve, reject) {
|
|
17
|
+
fs.readFile(filePath, { encoding: 'utf-8' }, function (err, data) {
|
|
18
|
+
if (err)
|
|
19
|
+
return reject(err);
|
|
20
|
+
console.log('received data: ' + data);
|
|
21
|
+
resolve(data);
|
|
22
|
+
});
|
|
23
|
+
}).then(function (data) {
|
|
24
|
+
return db.runSql(data);
|
|
25
|
+
});
|
|
26
|
+
};
|
|
27
|
+
exports.down = function (db) {
|
|
28
|
+
var filePath = path.join(__dirname, 'sqls', '20261004100100-update-node-meta-remove-empty-dictionaries-down.sql');
|
|
29
|
+
return new Promise(function (resolve, reject) {
|
|
30
|
+
fs.readFile(filePath, { encoding: 'utf-8' }, function (err, data) {
|
|
31
|
+
if (err)
|
|
32
|
+
return reject(err);
|
|
33
|
+
console.log('received data: ' + data);
|
|
34
|
+
resolve(data);
|
|
35
|
+
});
|
|
36
|
+
}).then(function (data) {
|
|
37
|
+
return db.runSql(data);
|
|
38
|
+
});
|
|
39
|
+
};
|
|
40
|
+
exports._meta = {
|
|
41
|
+
version: 1,
|
|
42
|
+
};
|
|
43
|
+
//# sourceMappingURL=20261004100100-update-node-meta-remove-empty-dictionaries.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"20261004100100-update-node-meta-remove-empty-dictionaries.js","sourceRoot":"","sources":["../../../../../../src/db/dbMigrator/migration/survey/migrations/20261004100100-update-node-meta-remove-empty-dictionaries.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,IAAI,GAAG,CAAA;AACP,IAAI,IAAI,CAAA;AACR,IAAI,IAAI,CAAA;AACR,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;AACtB,IAAI,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAC1B,IAAI,OAAO,CAAA;AAMX,OAAO,CAAC,KAAK,GAAG,UAAU,OAAO,EAAE,QAAQ;IACzC,GAAG,GAAG,OAAO,CAAC,SAAS,CAAA;IACvB,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAA;IACnB,IAAI,GAAG,QAAQ,CAAA;IACf,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;AAC3B,CAAC,CAAA;AAED,OAAO,CAAC,EAAE,GAAG,UAAU,EAAE;IACvB,IAAI,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,kEAAkE,CAAC,CAAA;IAC/G,OAAO,IAAI,OAAO,CAAC,UAAU,OAAO,EAAE,MAAM;QAC1C,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,UAAU,GAAG,EAAE,IAAI;YAC9D,IAAI,GAAG;gBAAE,OAAO,MAAM,CAAC,GAAG,CAAC,CAAA;YAC3B,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAA;YAErC,OAAO,CAAC,IAAI,CAAC,CAAA;QACf,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,IAAI;QACpB,OAAO,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACxB,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,OAAO,CAAC,IAAI,GAAG,UAAU,EAAE;IACzB,IAAI,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,oEAAoE,CAAC,CAAA;IACjH,OAAO,IAAI,OAAO,CAAC,UAAU,OAAO,EAAE,MAAM;QAC1C,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,UAAU,GAAG,EAAE,IAAI;YAC9D,IAAI,GAAG;gBAAE,OAAO,MAAM,CAAC,GAAG,CAAC,CAAA;YAC3B,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAA;YAErC,OAAO,CAAC,IAAI,CAAC,CAAA;QACf,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,IAAI;QACpB,OAAO,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACxB,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,OAAO,CAAC,KAAK,GAAG;IACd,OAAO,EAAE,CAAC;CACX,CAAA"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
DROP INDEX IF EXISTS node_item_uuid_idx;
|
|
2
|
+
CREATE INDEX node_item_uuid_idx
|
|
3
|
+
ON node USING btree (((value ->> 'itemUuid')::uuid));
|
|
4
|
+
|
|
5
|
+
DROP INDEX IF EXISTS node_taxon_uuid_idx;
|
|
6
|
+
CREATE INDEX node_taxon_uuid_idx
|
|
7
|
+
ON node USING btree (((value ->> 'taxonUuid')::uuid));
|
|
8
|
+
|
|
9
|
+
DROP INDEX IF EXISTS node_vernacular_name_uuid_idx;
|
|
10
|
+
CREATE INDEX node_vernacular_name_uuid_idx
|
|
11
|
+
ON node USING btree (((value ->> 'vernacularNameUuid')::uuid));
|
|
12
|
+
|
|
13
|
+
DROP INDEX IF EXISTS node_file_uuid_idx;
|
|
14
|
+
CREATE INDEX node_file_uuid_idx
|
|
15
|
+
ON node USING btree (((value ->> 'fileUuid')::uuid));
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
-- Recreate the node value indexes as partial indexes: a full expression index stores an entry
|
|
2
|
+
-- (NULL) also for every node without that value prop (most of the nodes).
|
|
3
|
+
-- Queries comparing the indexed expression with a strict operator (=, IN, ANY, join conditions)
|
|
4
|
+
-- imply the index predicate, so they can still use these indexes.
|
|
5
|
+
|
|
6
|
+
DROP INDEX IF EXISTS node_item_uuid_idx;
|
|
7
|
+
CREATE INDEX node_item_uuid_idx
|
|
8
|
+
ON node USING btree (((value ->> 'itemUuid')::uuid))
|
|
9
|
+
WHERE (value ->> 'itemUuid') IS NOT NULL;
|
|
10
|
+
|
|
11
|
+
DROP INDEX IF EXISTS node_taxon_uuid_idx;
|
|
12
|
+
CREATE INDEX node_taxon_uuid_idx
|
|
13
|
+
ON node USING btree (((value ->> 'taxonUuid')::uuid))
|
|
14
|
+
WHERE (value ->> 'taxonUuid') IS NOT NULL;
|
|
15
|
+
|
|
16
|
+
DROP INDEX IF EXISTS node_vernacular_name_uuid_idx;
|
|
17
|
+
CREATE INDEX node_vernacular_name_uuid_idx
|
|
18
|
+
ON node USING btree (((value ->> 'vernacularNameUuid')::uuid))
|
|
19
|
+
WHERE (value ->> 'vernacularNameUuid') IS NOT NULL;
|
|
20
|
+
|
|
21
|
+
DROP INDEX IF EXISTS node_file_uuid_idx;
|
|
22
|
+
CREATE INDEX node_file_uuid_idx
|
|
23
|
+
ON node USING btree (((value ->> 'fileUuid')::uuid))
|
|
24
|
+
WHERE (value ->> 'fileUuid') IS NOT NULL;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
-- Nothing to restore: a missing dictionary in node meta is equivalent to an empty one.
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
-- Remove the empty dictionaries from node meta (e.g. "childApplicability": {}) to save space:
|
|
2
|
+
-- a missing dictionary is equivalent to an empty one (child applicable, editable, visible; no children count).
|
|
3
|
+
-- Note: the updated rows leave dead tuples behind; VACUUM makes their space reusable,
|
|
4
|
+
-- VACUUM FULL (or pg_repack) is needed to give it back to the operating system.
|
|
5
|
+
|
|
6
|
+
UPDATE node
|
|
7
|
+
SET meta = meta - ARRAY(
|
|
8
|
+
SELECT e.key
|
|
9
|
+
FROM jsonb_each(meta) AS e
|
|
10
|
+
WHERE e.key IN ('childApplicability', 'cEdit', 'cVis', 'childrenMaxCount', 'childrenMinCount')
|
|
11
|
+
AND e.value = '{}'::jsonb
|
|
12
|
+
)
|
|
13
|
+
WHERE meta -> 'childApplicability' = '{}'::jsonb
|
|
14
|
+
OR meta -> 'cEdit' = '{}'::jsonb
|
|
15
|
+
OR meta -> 'cVis' = '{}'::jsonb
|
|
16
|
+
OR meta -> 'childrenMaxCount' = '{}'::jsonb
|
|
17
|
+
OR meta -> 'childrenMinCount' = '{}'::jsonb;
|
|
@@ -8,7 +8,7 @@ const mergeProps = (options) => {
|
|
|
8
8
|
return null;
|
|
9
9
|
}
|
|
10
10
|
const { props = {}, props_draft: propsDraft = {}, ...rest } = row;
|
|
11
|
-
const propsUpdate = draft ? { ...
|
|
11
|
+
const propsUpdate = draft ? { ...props, ...propsDraft } : props;
|
|
12
12
|
return { ...rest, props: propsUpdate };
|
|
13
13
|
};
|
|
14
14
|
const _assocPublishedDraft = (row) => ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformCallback.js","sourceRoot":"","sources":["../../../src/db/dbs/transformCallback.ts"],"names":[],"mappings":";;;AAAA,sDAA+C;AAE/C,MAAM,UAAU,GAAG,CAAC,OAAqC,EAAE,EAAE;IAC3D,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,OAAO,CAAA;IAC9B,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,IAAI,CAAA;IACb,CAAC;IACD,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,WAAW,EAAE,UAAU,GAAG,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,GAAG,CAAA;IACjE,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"transformCallback.js","sourceRoot":"","sources":["../../../src/db/dbs/transformCallback.ts"],"names":[],"mappings":";;;AAAA,sDAA+C;AAE/C,MAAM,UAAU,GAAG,CAAC,OAAqC,EAAE,EAAE;IAC3D,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,OAAO,CAAA;IAC9B,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,IAAI,CAAA;IACb,CAAC;IACD,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,WAAW,EAAE,UAAU,GAAG,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,GAAG,CAAA;IACjE,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC,CAAC,KAAK,CAAA;IAC/D,OAAO,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,CAAA;AACxC,CAAC,CAAA;AAED,MAAM,oBAAoB,GAAG,CAAC,GAAQ,EAAE,EAAE,CAAC,CAAC;IAC1C,GAAG,GAAG;IACN,SAAS,EAAE,CAAC,oBAAO,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC;IACtC,KAAK,EAAE,CAAC,oBAAO,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;CACzC,CAAC,CAAA;AAEK,MAAM,iBAAiB,GAAG,CAAC,OAMjC,EAAO,EAAE;IACR,MAAM,EAAE,GAAG,EAAE,KAAK,GAAG,KAAK,EAAE,mBAAmB,GAAG,KAAK,EAAE,MAAM,GAAG,KAAK,EAAE,IAAI,GAAG,EAAE,EAAE,GAAG,OAAO,CAAA;IAC9F,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QACjB,OAAO,IAAI,CAAA;IACb,CAAC;IAGD,MAAM,UAAU,GAAG,MAAM,IAAI,mBAAmB,CAAC,CAAC,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;IAClF,MAAM,UAAU,GAAG,oBAAO,CAAC,QAAQ,CAAC,UAAU,EAAE;QAC9C,IAAI,EAAE,CAAC,YAAY,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC;QACrD,UAAU,EAAE,IAAI;KACjB,CAAC,CAAA;IAEF,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,EAAE,CAAC;QAC9C,OAAO,UAAU,CAAA;IACnB,CAAC;IAED,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,UAAU,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAA;IAC/C,CAAC;IAGD,UAAU,CAAC,UAAU,GAAG,GAAG,CAAC,WAAW,CAAA;IACvC,OAAO,UAAU,CAAC,WAAW,CAAA;IAC7B,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA;AA/BY,QAAA,iBAAiB,qBA+B7B;AAEM,MAAM,sBAAsB,GAAG,CAAC,GAAQ,EAAU,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;AAAjE,QAAA,sBAAsB,0BAA2C"}
|
|
@@ -8,7 +8,7 @@ export declare class SqlDeleteBuilder extends SqlBuilder {
|
|
|
8
8
|
private _table;
|
|
9
9
|
private _whereRaw;
|
|
10
10
|
private _whereValues;
|
|
11
|
-
private _returning;
|
|
11
|
+
private readonly _returning;
|
|
12
12
|
deleteFrom(table: Table): this;
|
|
13
13
|
whereRaw(condition: string): this;
|
|
14
14
|
where(values: ValuesByColumn): this;
|
|
@@ -32,7 +32,7 @@ class SqlDeleteBuilder extends sqlBuilder_1.SqlBuilder {
|
|
|
32
32
|
}
|
|
33
33
|
build() {
|
|
34
34
|
if (arena_core_1.Objects.isEmpty(this._table) || (arena_core_1.Objects.isEmpty(this._whereValues) && arena_core_1.Objects.isEmpty(this._whereRaw)))
|
|
35
|
-
throw new Error(`missingParams, ${this._table}, ${this._whereValues}`);
|
|
35
|
+
throw new Error(`missingParams, ${this._table}, ${JSON.stringify(this._whereValues)}`);
|
|
36
36
|
const whereCondition = this._whereRaw ??
|
|
37
37
|
Object.keys(this._whereValues)
|
|
38
38
|
.map((columnName) => `${columnName} = $/${columnName}/`)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlDeleteBuilder.js","sourceRoot":"","sources":["../../../src/db/sql/sqlDeleteBuilder.ts"],"names":[],"mappings":";;;AAAA,sDAA+C;AAC/C,6CAAyC;AAQzC,MAAa,gBAAiB,SAAQ,uBAAU;IACtC,MAAM,GAAiB,IAAI,CAAA;IAC3B,SAAS,GAAkB,IAAI,CAAA;IAC/B,YAAY,GAAmB,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"sqlDeleteBuilder.js","sourceRoot":"","sources":["../../../src/db/sql/sqlDeleteBuilder.ts"],"names":[],"mappings":";;;AAAA,sDAA+C;AAC/C,6CAAyC;AAQzC,MAAa,gBAAiB,SAAQ,uBAAU;IACtC,MAAM,GAAiB,IAAI,CAAA;IAC3B,SAAS,GAAkB,IAAI,CAAA;IAC/B,YAAY,GAAmB,EAAE,CAAA;IACxB,UAAU,GAAa,EAAE,CAAA;IAE1C,UAAU,CAAC,KAAY;QACrB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAA;QACnB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,QAAQ,CAAC,SAAiB;QACxB,IAAI,oBAAO,CAAC,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;YAC1C,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAA;QAClE,CAAC;QACD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,MAAsB;QAC1B,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAA;QACzE,CAAC;QACD,IAAI,CAAC,YAAY,GAAG,MAAM,CAAA;QAC1B,OAAO,IAAI,CAAA;IACb,CAAC;IAED,SAAS,CAAC,GAAG,MAAqB;QAChC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAA;QAC/B,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK;QACH,IAAI,oBAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAO,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,oBAAO,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACzG,MAAM,IAAI,KAAK,CAAC,kBAAkB,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA;QAExF,MAAM,cAAc,GAClB,IAAI,CAAC,SAAS;YACd,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC;iBAC3B,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,GAAG,UAAU,QAAQ,UAAU,GAAG,CAAC;iBACvD,IAAI,CAAC,OAAO,CAAC,CAAA;QAElB,IAAI,GAAG,GAAG,eAAe,IAAI,CAAC,MAAM,UAAU,cAAc,EAAE,CAAA;QAC9D,IAAI,oBAAO,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YACxC,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAC/E,GAAG,IAAI,cAAc,eAAe,EAAE,CAAA;QACxC,CAAC;QACD,OAAO,GAAG,CAAA;IACZ,CAAC;CACF;AAjDD,4CAiDC"}
|
|
@@ -7,7 +7,7 @@ interface ValuesByColumn {
|
|
|
7
7
|
export declare class SqlInsertBuilder extends SqlBuilder {
|
|
8
8
|
private _table;
|
|
9
9
|
private _valuesByColumn;
|
|
10
|
-
private _returning;
|
|
10
|
+
private readonly _returning;
|
|
11
11
|
insertInto(table: Table): this;
|
|
12
12
|
valuesByColumn(valuesByColumn: ValuesByColumn): this;
|
|
13
13
|
returning(...fields: Array<Column>): this;
|
|
@@ -21,7 +21,7 @@ class SqlInsertBuilder extends sqlBuilder_1.SqlBuilder {
|
|
|
21
21
|
}
|
|
22
22
|
build() {
|
|
23
23
|
if (arena_core_1.Objects.isEmpty(this._table) || arena_core_1.Objects.isEmpty(this._valuesByColumn))
|
|
24
|
-
throw new Error(`missingParams, ${this._table}, ${this._valuesByColumn}`);
|
|
24
|
+
throw new Error(`missingParams, ${this._table}, ${JSON.stringify(this._valuesByColumn)}`);
|
|
25
25
|
const columnNames = [];
|
|
26
26
|
const valuesParams = [];
|
|
27
27
|
for (const columnName of Object.keys(this._valuesByColumn)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlInsertBuilder.js","sourceRoot":"","sources":["../../../src/db/sql/sqlInsertBuilder.ts"],"names":[],"mappings":";;;AAAA,sDAA+C;AAC/C,6CAAyC;AAQzC,MAAa,gBAAiB,SAAQ,uBAAU;IACtC,MAAM,GAAiB,IAAI,CAAA;IAC3B,eAAe,GAAmB,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"sqlInsertBuilder.js","sourceRoot":"","sources":["../../../src/db/sql/sqlInsertBuilder.ts"],"names":[],"mappings":";;;AAAA,sDAA+C;AAC/C,6CAAyC;AAQzC,MAAa,gBAAiB,SAAQ,uBAAU;IACtC,MAAM,GAAiB,IAAI,CAAA;IAC3B,eAAe,GAAmB,EAAE,CAAA;IAC3B,UAAU,GAAa,EAAE,CAAA;IAE1C,UAAU,CAAC,KAAY;QACrB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAA;QACnB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,cAAc,CAAC,cAA8B;QAC3C,IAAI,CAAC,eAAe,GAAG,cAAc,CAAA;QACrC,OAAO,IAAI,CAAA;IACb,CAAC;IAED,SAAS,CAAC,GAAG,MAAqB;QAChC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAA;QAC/B,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK;QACH,IAAI,oBAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,oBAAO,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC;YACvE,MAAM,IAAI,KAAK,CAAC,kBAAkB,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAA;QAE3F,MAAM,WAAW,GAAa,EAAE,CAAA;QAChC,MAAM,YAAY,GAAa,EAAE,CAAA;QAEjC,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC;YAC3D,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;YAC5B,YAAY,CAAC,IAAI,CAAC,KAAK,UAAU,GAAG,CAAC,CAAA;QACvC,CAAC;QAED,MAAM,KAAK,GAAG,CAAC,eAAe,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAElH,IAAI,CAAC,oBAAO,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YACtC,KAAK,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QACvD,CAAC;QACD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACxB,CAAC;CACF;AAvCD,4CAuCC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { Table } from '../table';
|
|
2
2
|
import { SqlBuilder } from './sqlBuilder';
|
|
3
3
|
export declare class SqlJoinBuilder extends SqlBuilder {
|
|
4
|
-
private _tables;
|
|
5
|
-
private _on;
|
|
4
|
+
private readonly _tables;
|
|
5
|
+
private readonly _on;
|
|
6
6
|
join(table: Table): this;
|
|
7
7
|
on(condition: string): this;
|
|
8
8
|
build(): string;
|
|
@@ -16,7 +16,7 @@ class SqlJoinBuilder extends sqlBuilder_1.SqlBuilder {
|
|
|
16
16
|
}
|
|
17
17
|
build() {
|
|
18
18
|
if (arena_core_1.Objects.isEmpty(this._tables) || arena_core_1.Objects.isEmpty(this._on))
|
|
19
|
-
throw new Error(`missingParams:
|
|
19
|
+
throw new Error(`missingParams: tables: [${this._tables.join(', ')}], on: [${this._on.join(', ')}]`);
|
|
20
20
|
return `JOIN ${this._tables.join(' ')} ON ${this._on.join(' ')}`;
|
|
21
21
|
}
|
|
22
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlJoinBuilder.js","sourceRoot":"","sources":["../../../src/db/sql/sqlJoinBuilder.ts"],"names":[],"mappings":";;;AAAA,sDAA+C;AAE/C,6CAAyC;AAEzC,MAAa,cAAe,SAAQ,uBAAU;
|
|
1
|
+
{"version":3,"file":"sqlJoinBuilder.js","sourceRoot":"","sources":["../../../src/db/sql/sqlJoinBuilder.ts"],"names":[],"mappings":";;;AAAA,sDAA+C;AAE/C,6CAAyC;AAEzC,MAAa,cAAe,SAAQ,uBAAU;IAC3B,OAAO,GAAiB,EAAE,CAAA;IAC1B,GAAG,GAAkB,EAAE,CAAA;IAExC,IAAI,CAAC,KAAY;QACf,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACxB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,EAAE,CAAC,SAAiB;QAClB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QACxB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK;QACH,IAAI,oBAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,oBAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC;YAC5D,MAAM,IAAI,KAAK,CAAC,2BAA2B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACtG,OAAO,QAAQ,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAA;IAClE,CAAC;CACF;AAnBD,wCAmBC"}
|
|
@@ -3,14 +3,14 @@ import { Table } from '../table';
|
|
|
3
3
|
import { SqlBuilder } from './sqlBuilder';
|
|
4
4
|
import { SqlJoinBuilder } from './sqlJoinBuilder';
|
|
5
5
|
export declare class SqlSelectBuilder extends SqlBuilder {
|
|
6
|
-
private _select;
|
|
7
|
-
private _from;
|
|
8
|
-
private _join;
|
|
9
|
-
private _where;
|
|
10
|
-
private _groupBy;
|
|
6
|
+
private readonly _select;
|
|
7
|
+
private readonly _from;
|
|
8
|
+
private readonly _join;
|
|
9
|
+
private readonly _where;
|
|
10
|
+
private readonly _groupBy;
|
|
11
11
|
private _offset;
|
|
12
12
|
private _limit;
|
|
13
|
-
private _orderBy;
|
|
13
|
+
private readonly _orderBy;
|
|
14
14
|
select(...fields: Array<Column | string>): this;
|
|
15
15
|
from(...tables: Array<Table>): this;
|
|
16
16
|
join(...joins: Array<SqlJoinBuilder>): this;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlSelectBuilder.js","sourceRoot":"","sources":["../../../src/db/sql/sqlSelectBuilder.ts"],"names":[],"mappings":";;;AAAA,sDAA+C;AAI/C,6CAAyC;AAGzC,MAAa,gBAAiB,SAAQ,uBAAU;
|
|
1
|
+
{"version":3,"file":"sqlSelectBuilder.js","sourceRoot":"","sources":["../../../src/db/sql/sqlSelectBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,9 @@ import { Table } from '../table';
|
|
|
3
3
|
import { Column } from '../column';
|
|
4
4
|
export declare class SqlUpdateBuilder extends SqlBuilder {
|
|
5
5
|
private _update;
|
|
6
|
-
private _set;
|
|
7
|
-
private _where;
|
|
8
|
-
private _returning;
|
|
6
|
+
private readonly _set;
|
|
7
|
+
private readonly _where;
|
|
8
|
+
private readonly _returning;
|
|
9
9
|
update(table: Table): this;
|
|
10
10
|
set(column: Column | string, value: string): this;
|
|
11
11
|
setColumnNames(columnNames: string[]): this;
|
|
@@ -31,8 +31,10 @@ class SqlUpdateBuilder extends sqlBuilder_1.SqlBuilder {
|
|
|
31
31
|
return this;
|
|
32
32
|
}
|
|
33
33
|
build() {
|
|
34
|
-
if (arena_core_1.Objects.isEmpty(this._update) || arena_core_1.Objects.isEmpty(this._set))
|
|
35
|
-
|
|
34
|
+
if (arena_core_1.Objects.isEmpty(this._update) || arena_core_1.Objects.isEmpty(this._set)) {
|
|
35
|
+
const setSummary = this._set.map(({ column, value }) => [String(column), value].join(' = ')).join(', ');
|
|
36
|
+
throw new Error(`missingParams, ${this._update}, ${setSummary}`);
|
|
37
|
+
}
|
|
36
38
|
const _getColumnName = (column) => (typeof column === 'string' ? column : column.columnName);
|
|
37
39
|
const _buildSetValue = (params) => {
|
|
38
40
|
const { column, value } = params;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlUpdateBuilder.js","sourceRoot":"","sources":["../../../src/db/sql/sqlUpdateBuilder.ts"],"names":[],"mappings":";;;AAAA,sDAA+C;AAC/C,6CAAyC;AAMzC,MAAa,gBAAiB,SAAQ,uBAAU;IACtC,OAAO,GAAiB,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"sqlUpdateBuilder.js","sourceRoot":"","sources":["../../../src/db/sql/sqlUpdateBuilder.ts"],"names":[],"mappings":"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"}
|
package/dist/job/jobManager.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Worker } from '../thread';
|
|
2
2
|
import { JobContext } from './jobContext';
|
|
3
3
|
export declare class JobManager {
|
|
4
|
-
private static workers;
|
|
4
|
+
private static readonly workers;
|
|
5
5
|
static cancelUserJob(userUuid: string): void;
|
|
6
6
|
private static onMessage;
|
|
7
7
|
static executeJob<C extends JobContext = JobContext>(data: C): Worker<C>;
|
package/dist/job/jobManager.js
CHANGED
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.JobManager = void 0;
|
|
7
|
-
const
|
|
7
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
8
8
|
const webSocket_1 = require("../webSocket");
|
|
9
9
|
const thread_1 = require("../thread");
|
|
10
10
|
const jobMessage_1 = require("./jobMessage");
|
|
@@ -32,7 +32,7 @@ class JobManager {
|
|
|
32
32
|
}, 1000);
|
|
33
33
|
}
|
|
34
34
|
static executeJob(data) {
|
|
35
|
-
const worker = new thread_1.Worker(
|
|
35
|
+
const worker = new thread_1.Worker(node_path_1.default.resolve(__dirname, 'jobThread.js'), data);
|
|
36
36
|
worker.on('message', JobManager.onMessage);
|
|
37
37
|
JobManager.workers.set(data.user.uuid, worker);
|
|
38
38
|
return worker;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jobManager.js","sourceRoot":"","sources":["../../src/job/jobManager.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"jobManager.js","sourceRoot":"","sources":["../../src/job/jobManager.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA4B;AAE5B,4CAA8D;AAC9D,sCAAkC;AAClC,6CAAiF;AAGjF,MAAa,UAAU;IACb,MAAM,CAAU,OAAO,GAAG,IAAI,GAAG,EAAuB,CAAA;IAEhE,MAAM,CAAC,aAAa,CAAC,QAAgB;QACnC,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QAC/C,IAAI,CAAC,MAAM;YAAE,OAAM;QACnB,MAAM,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,6BAAgB,CAAC,MAAM,EAAE,CAAC,CAAA;IACvD,CAAC;IAEO,MAAM,CAAC,SAAS,CAAC,GAAkB;QACzC,IAAI,GAAG,CAAC,IAAI,KAAK,8BAAiB,CAAC,SAAS;YAAE,OAAM;QAEpD,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,CAAA;QACnB,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,GAAG,CAAA;QAC/B,IAAI,CAAC,QAAQ;YAAE,OAAM;QAErB,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QAE/C,2BAAe,CAAC,UAAU,CAAC,QAAQ,EAAE,0BAAc,CAAC,SAAS,EAAE,GAAG,CAAC,CAAA;QAEnE,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM;YAAE,OAAM;QAG7B,UAAU,CAAC,GAAG,EAAE;YACd,MAAM,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAA;QACpE,CAAC,EAAE,IAAI,CAAC,CAAA;IACV,CAAC;IAED,MAAM,CAAC,UAAU,CAAoC,IAAO;QAC1D,MAAM,MAAM,GAAG,IAAI,eAAM,CAAI,mBAAI,CAAC,OAAO,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE,IAAI,CAAC,CAAA;QAC3E,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,UAAU,CAAC,SAAS,CAAC,CAAA;QAC1C,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QAC9C,OAAO,MAAM,CAAA;IACf,CAAC;;AAjCH,gCAkCC"}
|
package/dist/job/jobThread.d.ts
CHANGED
|
@@ -3,7 +3,7 @@ import { JobContext } from './jobContext';
|
|
|
3
3
|
import { JobMessageIn, JobMessageOut } from './jobMessage';
|
|
4
4
|
export declare class JobThread<C extends JobContext> extends Thread<JobMessageIn, JobMessageOut, C> {
|
|
5
5
|
private job;
|
|
6
|
-
startJob(): void
|
|
6
|
+
startJob(): Promise<void>;
|
|
7
7
|
onMessage(msg: JobMessageIn): Promise<void>;
|
|
8
8
|
private postJob;
|
|
9
9
|
}
|