@balena/pinejs 19.7.2-build-esm-debc5e08e09b78ba96aec7ee219676236007e113-1 → 19.7.2-build-update-deps-a909ee054f395de407ec4e1275fd0f5b7514fe29-1
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/.versionbot/CHANGELOG.yml +3 -3
- package/CHANGELOG.md +1 -1
- package/{Gruntfile.cts → Gruntfile.ts} +22 -9
- package/bin/abstract-sql-compiler.js +1 -1
- package/bin/odata-compiler.js +1 -1
- package/bin/sbvr-compiler.js +1 -1
- package/build/{browser.cts → browser.ts} +1 -1
- package/build/{config.cts → config.ts} +1 -5
- package/build/{module.cts → module.ts} +1 -1
- package/build/{server.cts → server.ts} +1 -1
- package/out/bin/abstract-sql-compiler.js +19 -17
- package/out/bin/abstract-sql-compiler.js.map +1 -1
- package/out/bin/odata-compiler.js +21 -19
- package/out/bin/odata-compiler.js.map +1 -1
- package/out/bin/sbvr-compiler.js +54 -19
- package/out/bin/sbvr-compiler.js.map +1 -1
- package/out/bin/utils.d.ts +3 -3
- package/out/bin/utils.js +53 -21
- package/out/bin/utils.js.map +1 -1
- package/out/config-loader/config-loader.d.ts +6 -6
- package/out/config-loader/config-loader.js +63 -23
- package/out/config-loader/config-loader.js.map +1 -1
- package/out/config-loader/env.d.ts +1 -1
- package/out/config-loader/env.js +66 -24
- package/out/config-loader/env.js.map +1 -1
- package/out/data-server/sbvr-server.d.ts +3 -3
- package/out/data-server/sbvr-server.js +42 -5
- package/out/data-server/sbvr-server.js.map +1 -1
- package/out/database-layer/db.d.ts +3 -3
- package/out/database-layer/db.js +83 -37
- package/out/database-layer/db.js.map +1 -1
- package/out/express-emulator/express.js.map +1 -1
- package/out/extended-sbvr-parser/extended-sbvr-parser.js +11 -8
- package/out/extended-sbvr-parser/extended-sbvr-parser.js.map +1 -1
- package/out/http-transactions/transactions.d.ts +2 -2
- package/out/http-transactions/transactions.js +4 -4
- package/out/http-transactions/transactions.js.map +1 -1
- package/out/migrator/async.d.ts +2 -2
- package/out/migrator/async.js +60 -20
- package/out/migrator/async.js.map +1 -1
- package/out/migrator/migrations.js +2 -1
- package/out/migrator/sync.d.ts +6 -6
- package/out/migrator/sync.js +61 -20
- package/out/migrator/sync.js.map +1 -1
- package/out/migrator/utils.d.ts +4 -4
- package/out/migrator/utils.js +97 -42
- package/out/migrator/utils.js.map +1 -1
- package/out/odata-metadata/odata-metadata-generator.js +14 -7
- package/out/odata-metadata/odata-metadata-generator.js.map +1 -1
- package/out/passport-pinejs/mount-login-router.d.ts +1 -1
- package/out/passport-pinejs/mount-login-router.js +41 -4
- package/out/passport-pinejs/mount-login-router.js.map +1 -1
- package/out/passport-pinejs/passport-pinejs.d.ts +1 -1
- package/out/passport-pinejs/passport-pinejs.js +46 -11
- package/out/passport-pinejs/passport-pinejs.js.map +1 -1
- package/out/pinejs-session-store/pinejs-session-store.d.ts +1 -1
- package/out/pinejs-session-store/pinejs-session-store.js +48 -11
- package/out/pinejs-session-store/pinejs-session-store.js.map +1 -1
- package/out/sbvr-api/abstract-sql.d.ts +2 -2
- package/out/sbvr-api/abstract-sql.js +65 -22
- package/out/sbvr-api/abstract-sql.js.map +1 -1
- package/out/sbvr-api/cached-compile.js +15 -8
- package/out/sbvr-api/cached-compile.js.map +1 -1
- package/out/sbvr-api/common-types.js +2 -1
- package/out/sbvr-api/control-flow.d.ts +1 -1
- package/out/sbvr-api/control-flow.js +25 -12
- package/out/sbvr-api/control-flow.js.map +1 -1
- package/out/sbvr-api/dev.js +2 -1
- package/out/sbvr-api/errors.d.ts +1 -1
- package/out/sbvr-api/errors.js +95 -47
- package/out/sbvr-api/errors.js.map +1 -1
- package/out/sbvr-api/express-extension.d.ts +2 -2
- package/out/sbvr-api/express-extension.js +2 -1
- package/out/sbvr-api/hooks.d.ts +4 -4
- package/out/sbvr-api/hooks.js +35 -23
- package/out/sbvr-api/hooks.js.map +1 -1
- package/out/sbvr-api/odata-response.d.ts +2 -2
- package/out/sbvr-api/odata-response.js +29 -19
- package/out/sbvr-api/odata-response.js.map +1 -1
- package/out/sbvr-api/permissions.d.ts +8 -8
- package/out/sbvr-api/permissions.js +159 -106
- package/out/sbvr-api/permissions.js.map +1 -1
- package/out/sbvr-api/sbvr-utils.d.ts +16 -38
- package/out/sbvr-api/sbvr-utils.js +285 -222
- package/out/sbvr-api/sbvr-utils.js.map +1 -1
- package/out/sbvr-api/translations.d.ts +1 -1
- package/out/sbvr-api/translations.js +17 -10
- package/out/sbvr-api/translations.js.map +1 -1
- package/out/sbvr-api/uri-parser.d.ts +6 -6
- package/out/sbvr-api/uri-parser.js +84 -39
- package/out/sbvr-api/uri-parser.js.map +1 -1
- package/out/sbvr-api/user.js +2 -1
- package/out/server-glue/global-ext.d.ts +3 -0
- package/out/server-glue/module.d.ts +15 -15
- package/out/server-glue/module.js +59 -20
- package/out/server-glue/module.js.map +1 -1
- package/out/server-glue/sbvr-loader.d.ts +1 -2
- package/out/server-glue/sbvr-loader.js +11 -4
- package/out/server-glue/sbvr-loader.js.map +1 -1
- package/out/server-glue/server.d.ts +2 -2
- package/out/server-glue/server.js +59 -17
- package/out/server-glue/server.js.map +1 -1
- package/out/tasks/common.d.ts +1 -1
- package/out/tasks/common.js +9 -3
- package/out/tasks/common.js.map +1 -1
- package/out/tasks/index.d.ts +8 -8
- package/out/tasks/index.js +63 -25
- package/out/tasks/index.js.map +1 -1
- package/out/tasks/tasks.js +2 -1
- package/out/tasks/worker.d.ts +3 -3
- package/out/tasks/worker.js +51 -14
- package/out/tasks/worker.js.map +1 -1
- package/out/webresource-handler/handlers/NoopHandler.d.ts +1 -1
- package/out/webresource-handler/handlers/NoopHandler.js +5 -1
- package/out/webresource-handler/handlers/NoopHandler.js.map +1 -1
- package/out/webresource-handler/handlers/S3Handler.d.ts +1 -1
- package/out/webresource-handler/handlers/S3Handler.js +24 -17
- package/out/webresource-handler/handlers/S3Handler.js.map +1 -1
- package/out/webresource-handler/handlers/index.d.ts +2 -2
- package/out/webresource-handler/handlers/index.js +18 -2
- package/out/webresource-handler/handlers/index.js.map +1 -1
- package/out/webresource-handler/index.d.ts +1 -1
- package/out/webresource-handler/index.js +85 -35
- package/out/webresource-handler/index.js.map +1 -1
- package/package.json +33 -33
- package/src/bin/abstract-sql-compiler.ts +3 -3
- package/src/bin/odata-compiler.ts +3 -3
- package/src/bin/sbvr-compiler.ts +2 -2
- package/src/bin/utils.ts +15 -23
- package/src/config-loader/config-loader.ts +11 -11
- package/src/config-loader/env.ts +3 -3
- package/src/data-server/sbvr-server.ts +4 -4
- package/src/database-layer/db.ts +11 -18
- package/src/extended-sbvr-parser/extended-sbvr-parser.ts +5 -5
- package/src/http-transactions/transactions.js +4 -4
- package/src/migrator/async.ts +5 -5
- package/src/migrator/sync.ts +8 -8
- package/src/migrator/utils.ts +7 -7
- package/src/odata-metadata/odata-metadata-generator.ts +2 -3
- package/src/passport-pinejs/mount-login-router.ts +3 -3
- package/src/passport-pinejs/passport-pinejs.ts +3 -3
- package/src/pinejs-session-store/pinejs-session-store.ts +4 -4
- package/src/sbvr-api/abstract-sql.ts +5 -5
- package/src/sbvr-api/cached-compile.ts +1 -1
- package/src/sbvr-api/control-flow.ts +1 -1
- package/src/sbvr-api/errors.ts +1 -1
- package/src/sbvr-api/express-extension.ts +2 -2
- package/src/sbvr-api/hooks.ts +5 -5
- package/src/sbvr-api/odata-response.ts +4 -8
- package/src/sbvr-api/permissions.ts +17 -17
- package/src/sbvr-api/sbvr-utils.ts +31 -37
- package/src/sbvr-api/translations.ts +1 -1
- package/src/sbvr-api/uri-parser.ts +9 -9
- package/src/server-glue/global-ext.d.ts +3 -0
- package/src/server-glue/module.ts +19 -19
- package/src/server-glue/sbvr-loader.ts +27 -15
- package/src/server-glue/server.ts +24 -13
- package/src/tasks/common.ts +1 -1
- package/src/tasks/index.ts +14 -14
- package/src/tasks/worker.ts +8 -8
- package/src/webresource-handler/handlers/NoopHandler.ts +1 -5
- package/src/webresource-handler/handlers/S3Handler.ts +1 -1
- package/src/webresource-handler/handlers/index.ts +2 -2
- package/src/webresource-handler/index.ts +8 -8
- package/tsconfig.dev.json +2 -4
- package/tsconfig.json +1 -1
- package/typings/lf-to-abstract-sql.d.ts +2 -2
- package/typings/memoizee.d.ts +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"async.js","sourceRoot":"","sources":["../../src/migrator/async.ts"],"names":[],"mappings":"AAGA,
|
|
1
|
+
{"version":3,"file":"async.js","sourceRoot":"","sources":["../../src/migrator/async.ts"],"names":[],"mappings":"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"}
|
package/out/migrator/sync.d.ts
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
|
-
import type MigrationsModel from './migrations
|
|
2
|
-
import { type MigrationExecutionResult } from './utils
|
|
3
|
-
import type { Tx } from '../database-layer/db
|
|
4
|
-
import type { Config, Model } from '../config-loader/config-loader
|
|
5
|
-
import * as sbvrUtils from '../sbvr-api/sbvr-utils
|
|
1
|
+
import type MigrationsModel from './migrations';
|
|
2
|
+
import { type MigrationExecutionResult } from './utils';
|
|
3
|
+
import type { Tx } from '../database-layer/db';
|
|
4
|
+
import type { Config, Model } from '../config-loader/config-loader';
|
|
5
|
+
import * as sbvrUtils from '../sbvr-api/sbvr-utils';
|
|
6
6
|
type ApiRootModel = Model & {
|
|
7
7
|
apiRoot: string;
|
|
8
8
|
};
|
|
9
9
|
export declare const postRun: (tx: Tx, model: ApiRootModel) => Promise<void>;
|
|
10
10
|
export declare const run: (tx: Tx, model: ApiRootModel) => Promise<MigrationExecutionResult>;
|
|
11
|
-
declare module '../sbvr-api/sbvr-utils
|
|
11
|
+
declare module '../sbvr-api/sbvr-utils' {
|
|
12
12
|
interface API {
|
|
13
13
|
[migrationModelConfig.apiRoot]: PinejsClient<MigrationsModel>;
|
|
14
14
|
}
|
package/out/migrator/sync.js
CHANGED
|
@@ -1,9 +1,48 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
36
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
|
+
};
|
|
38
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
+
exports.config = exports.run = exports.postRun = void 0;
|
|
40
|
+
const utils_1 = require("./utils");
|
|
41
|
+
const lodash_1 = __importDefault(require("lodash"));
|
|
42
|
+
const sbvrUtils = __importStar(require("../sbvr-api/sbvr-utils"));
|
|
43
|
+
const sbvr_loader_1 = require("../server-glue/sbvr-loader");
|
|
44
|
+
const migrationsModel = (0, sbvr_loader_1.requireSBVR)('./migrations.sbvr', require);
|
|
45
|
+
const postRun = async (tx, model) => {
|
|
7
46
|
const { initSql } = model;
|
|
8
47
|
if (initSql == null) {
|
|
9
48
|
return;
|
|
@@ -12,48 +51,50 @@ export const postRun = async (tx, model) => {
|
|
|
12
51
|
const modelIsNew = await sbvrUtils.isModelNew(tx, modelName);
|
|
13
52
|
if (modelIsNew) {
|
|
14
53
|
(sbvrUtils.logger.migrations?.info ?? console.info)(`First time executing '${modelName}', running init script`);
|
|
15
|
-
await lockMigrations({ tx, modelName, blocking: true }, async () => {
|
|
54
|
+
await (0, utils_1.lockMigrations)({ tx, modelName, blocking: true }, async () => {
|
|
16
55
|
try {
|
|
17
56
|
await tx.executeSql(initSql);
|
|
18
57
|
}
|
|
19
58
|
catch (err) {
|
|
20
59
|
(sbvrUtils.logger.migrations?.error ?? console.error)(`initSql execution error ${err} `);
|
|
21
|
-
throw new MigrationError(err);
|
|
60
|
+
throw new utils_1.MigrationError(err);
|
|
22
61
|
}
|
|
23
62
|
});
|
|
24
63
|
}
|
|
25
64
|
};
|
|
26
|
-
|
|
65
|
+
exports.postRun = postRun;
|
|
66
|
+
const run = async (tx, model) => {
|
|
27
67
|
const { migrations } = model;
|
|
28
|
-
if (migrations == null ||
|
|
68
|
+
if (migrations == null || lodash_1.default.isEmpty(migrations)) {
|
|
29
69
|
return;
|
|
30
70
|
}
|
|
31
|
-
const runnableMigrations = getRunnableSyncMigrations(migrations);
|
|
71
|
+
const runnableMigrations = (0, utils_1.getRunnableSyncMigrations)(migrations);
|
|
32
72
|
return $run(tx, model, runnableMigrations);
|
|
33
73
|
};
|
|
74
|
+
exports.run = run;
|
|
34
75
|
const $run = async (tx, model, migrations) => {
|
|
35
76
|
const modelName = model.apiRoot;
|
|
36
77
|
const modelIsNew = await sbvrUtils.isModelNew(tx, modelName);
|
|
37
78
|
if (modelIsNew) {
|
|
38
79
|
(sbvrUtils.logger.migrations?.info ?? console.info)(`First time model '${modelName}' has executed, skipping migrations`);
|
|
39
|
-
return await setExecutedMigrations(tx, modelName, Object.keys(migrations));
|
|
80
|
+
return await (0, utils_1.setExecutedMigrations)(tx, modelName, Object.keys(migrations));
|
|
40
81
|
}
|
|
41
|
-
await lockMigrations({ tx, modelName, blocking: true }, async () => {
|
|
82
|
+
await (0, utils_1.lockMigrations)({ tx, modelName, blocking: true }, async () => {
|
|
42
83
|
try {
|
|
43
|
-
const executedMigrations = await getExecutedMigrations(tx, modelName);
|
|
44
|
-
const pendingMigrations = filterAndSortPendingMigrations(migrations, executedMigrations);
|
|
84
|
+
const executedMigrations = await (0, utils_1.getExecutedMigrations)(tx, modelName);
|
|
85
|
+
const pendingMigrations = (0, utils_1.filterAndSortPendingMigrations)(migrations, executedMigrations);
|
|
45
86
|
if (pendingMigrations.length === 0) {
|
|
46
87
|
return;
|
|
47
88
|
}
|
|
48
89
|
const newlyExecutedMigrations = await executeMigrations(tx, pendingMigrations);
|
|
49
|
-
await setExecutedMigrations(tx, modelName, [
|
|
90
|
+
await (0, utils_1.setExecutedMigrations)(tx, modelName, [
|
|
50
91
|
...executedMigrations,
|
|
51
92
|
...newlyExecutedMigrations,
|
|
52
93
|
]);
|
|
53
94
|
}
|
|
54
95
|
catch (err) {
|
|
55
96
|
(sbvrUtils.logger.migrations?.error ?? console.error)(`Failed to executed synchronous migrations from api root model ${err}`);
|
|
56
|
-
throw new MigrationError(err);
|
|
97
|
+
throw new utils_1.MigrationError(err);
|
|
57
98
|
}
|
|
58
99
|
});
|
|
59
100
|
};
|
|
@@ -65,7 +106,7 @@ const executeMigrations = async (tx, migrations = []) => {
|
|
|
65
106
|
}
|
|
66
107
|
catch (err) {
|
|
67
108
|
(sbvrUtils.logger.migrations?.error ?? console.error)('Error while executing migrations, rolled back');
|
|
68
|
-
throw new MigrationError(err);
|
|
109
|
+
throw new utils_1.MigrationError(err);
|
|
69
110
|
}
|
|
70
111
|
return migrations.map(([migrationKey]) => migrationKey);
|
|
71
112
|
};
|
|
@@ -78,7 +119,7 @@ const executeMigration = async (tx, [key, migration]) => {
|
|
|
78
119
|
await tx.executeSql(migration);
|
|
79
120
|
}
|
|
80
121
|
else {
|
|
81
|
-
throw new MigrationError(`Invalid migration type: ${typeof migration}`);
|
|
122
|
+
throw new utils_1.MigrationError(`Invalid migration type: ${typeof migration}`);
|
|
82
123
|
}
|
|
83
124
|
};
|
|
84
125
|
const migrationModelConfig = {
|
|
@@ -118,7 +159,7 @@ const migrationModelConfig = {
|
|
|
118
159
|
},
|
|
119
160
|
},
|
|
120
161
|
};
|
|
121
|
-
|
|
162
|
+
exports.config = {
|
|
122
163
|
models: [migrationModelConfig],
|
|
123
164
|
};
|
|
124
165
|
//# sourceMappingURL=sync.js.map
|
package/out/migrator/sync.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/migrator/sync.ts"],"names":[],"mappings":"AACA,
|
|
1
|
+
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/migrator/sync.ts"],"names":[],"mappings":"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"}
|
package/out/migrator/utils.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import type { Result, Tx } from '../database-layer/db
|
|
2
|
-
import type { Resolvable } from '../sbvr-api/common-types
|
|
1
|
+
import type { Result, Tx } from '../database-layer/db';
|
|
2
|
+
import type { Resolvable } from '../sbvr-api/common-types';
|
|
3
3
|
import { TypedError } from 'typed-error';
|
|
4
|
-
export { migrator as migratorEnv } from '../config-loader/env
|
|
5
|
-
import * as sbvrUtils from '../sbvr-api/sbvr-utils
|
|
4
|
+
export { migrator as migratorEnv } from '../config-loader/env';
|
|
5
|
+
import * as sbvrUtils from '../sbvr-api/sbvr-utils';
|
|
6
6
|
export declare enum MigrationCategories {
|
|
7
7
|
'sync' = "sync",
|
|
8
8
|
'async' = "async"
|
package/out/migrator/utils.js
CHANGED
|
@@ -1,28 +1,71 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
36
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
|
+
};
|
|
38
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
+
exports.readMigrationStatus = exports.updateMigrationStatus = exports.initMigrationStatus = exports.migrationTablesExist = exports.getExecutedMigrations = exports.setExecutedMigrations = exports.lockMigrations = exports.binds = exports.filterAndSortPendingMigrations = exports.getRunnableSyncMigrations = exports.getRunnableAsyncMigrations = exports.MigrationError = exports.defaultMigrationCategory = exports.MigrationCategories = exports.migratorEnv = void 0;
|
|
40
|
+
exports.isAsyncMigration = isAsyncMigration;
|
|
41
|
+
exports.isSyncMigration = isSyncMigration;
|
|
42
|
+
exports.areCategorizedMigrations = areCategorizedMigrations;
|
|
43
|
+
const crypto_1 = require("crypto");
|
|
44
|
+
const lodash_1 = __importDefault(require("lodash"));
|
|
45
|
+
const typed_error_1 = require("typed-error");
|
|
46
|
+
const env_1 = require("../config-loader/env");
|
|
47
|
+
var env_2 = require("../config-loader/env");
|
|
48
|
+
Object.defineProperty(exports, "migratorEnv", { enumerable: true, get: function () { return env_2.migrator; } });
|
|
49
|
+
const env_3 = require("../config-loader/env");
|
|
50
|
+
const control_flow_1 = require("../sbvr-api/control-flow");
|
|
51
|
+
const sbvrUtils = __importStar(require("../sbvr-api/sbvr-utils"));
|
|
52
|
+
var MigrationCategories;
|
|
10
53
|
(function (MigrationCategories) {
|
|
11
54
|
MigrationCategories["sync"] = "sync";
|
|
12
55
|
MigrationCategories["async"] = "async";
|
|
13
|
-
})(MigrationCategories || (MigrationCategories = {}));
|
|
14
|
-
|
|
15
|
-
|
|
56
|
+
})(MigrationCategories || (exports.MigrationCategories = MigrationCategories = {}));
|
|
57
|
+
exports.defaultMigrationCategory = MigrationCategories.sync;
|
|
58
|
+
function isAsyncMigration(migration) {
|
|
16
59
|
return (((typeof migration.asyncFn === 'function' ||
|
|
17
60
|
typeof migration.asyncSql === 'string') &&
|
|
18
61
|
(typeof migration.syncFn === 'function' ||
|
|
19
62
|
typeof migration.syncSql === 'string')) ||
|
|
20
63
|
migration.type === MigrationCategories.async);
|
|
21
64
|
}
|
|
22
|
-
|
|
65
|
+
function isSyncMigration(migration) {
|
|
23
66
|
return typeof migration === 'function' || typeof migration === 'string';
|
|
24
67
|
}
|
|
25
|
-
|
|
68
|
+
function areCategorizedMigrations($migrations) {
|
|
26
69
|
const containsCategories = Object.keys(MigrationCategories).some((key) => key in $migrations);
|
|
27
70
|
if (containsCategories &&
|
|
28
71
|
Object.keys($migrations).some((key) => !(key in MigrationCategories))) {
|
|
@@ -30,9 +73,10 @@ export function areCategorizedMigrations($migrations) {
|
|
|
30
73
|
}
|
|
31
74
|
return containsCategories;
|
|
32
75
|
}
|
|
33
|
-
|
|
76
|
+
class MigrationError extends typed_error_1.TypedError {
|
|
34
77
|
}
|
|
35
|
-
|
|
78
|
+
exports.MigrationError = MigrationError;
|
|
79
|
+
const getRunnableAsyncMigrations = ($migrations) => {
|
|
36
80
|
if ($migrations[MigrationCategories.async]) {
|
|
37
81
|
if (Object.values($migrations[MigrationCategories.async]).some((migration) => !isAsyncMigration(migration)) ||
|
|
38
82
|
typeof $migrations[MigrationCategories.async] !== 'object') {
|
|
@@ -41,7 +85,8 @@ export const getRunnableAsyncMigrations = ($migrations) => {
|
|
|
41
85
|
return $migrations[MigrationCategories.async];
|
|
42
86
|
}
|
|
43
87
|
};
|
|
44
|
-
|
|
88
|
+
exports.getRunnableAsyncMigrations = getRunnableAsyncMigrations;
|
|
89
|
+
const getRunnableSyncMigrations = ($migrations) => {
|
|
45
90
|
if (areCategorizedMigrations($migrations)) {
|
|
46
91
|
const runnableMigrations = {};
|
|
47
92
|
for (const [category, categoryMigrations] of Object.entries($migrations)) {
|
|
@@ -62,12 +107,14 @@ export const getRunnableSyncMigrations = ($migrations) => {
|
|
|
62
107
|
}
|
|
63
108
|
return $migrations;
|
|
64
109
|
};
|
|
65
|
-
|
|
110
|
+
exports.getRunnableSyncMigrations = getRunnableSyncMigrations;
|
|
111
|
+
const filterAndSortPendingMigrations = ($migrations, executedMigrations) => (0, lodash_1.default)($migrations)
|
|
66
112
|
.omit(executedMigrations)
|
|
67
113
|
.toPairs()
|
|
68
114
|
.sortBy(([migrationKey]) => migrationKey)
|
|
69
115
|
.value();
|
|
70
|
-
|
|
116
|
+
exports.filterAndSortPendingMigrations = filterAndSortPendingMigrations;
|
|
117
|
+
const binds = (strings, ...bindNums) => strings
|
|
71
118
|
.map((str, i) => {
|
|
72
119
|
if (i === bindNums.length) {
|
|
73
120
|
return str;
|
|
@@ -81,18 +128,19 @@ export const binds = (strings, ...bindNums) => strings
|
|
|
81
128
|
return str + `?`;
|
|
82
129
|
})
|
|
83
130
|
.join('');
|
|
131
|
+
exports.binds = binds;
|
|
84
132
|
const $lockMigrations = async (tx, modelName, fn) => {
|
|
85
133
|
try {
|
|
86
|
-
await tx.executeSql(binds `
|
|
134
|
+
await tx.executeSql((0, exports.binds) `
|
|
87
135
|
DELETE FROM "migration lock"
|
|
88
136
|
WHERE "model name" = ${1}
|
|
89
|
-
AND "created at" < ${2}`, [modelName, new Date(Date.now() -
|
|
90
|
-
await tx.executeSql(binds `
|
|
137
|
+
AND "created at" < ${2}`, [modelName, new Date(Date.now() - env_1.migrator.lockTimeout)]);
|
|
138
|
+
await tx.executeSql((0, exports.binds) `
|
|
91
139
|
INSERT INTO "migration lock" ("model name")
|
|
92
140
|
VALUES (${1})`, [modelName]);
|
|
93
141
|
}
|
|
94
142
|
catch (err) {
|
|
95
|
-
await delay(
|
|
143
|
+
await (0, control_flow_1.delay)(env_1.migrator.lockFailDelay);
|
|
96
144
|
throw err;
|
|
97
145
|
}
|
|
98
146
|
try {
|
|
@@ -100,7 +148,7 @@ VALUES (${1})`, [modelName]);
|
|
|
100
148
|
}
|
|
101
149
|
finally {
|
|
102
150
|
try {
|
|
103
|
-
await tx.executeSql(binds `
|
|
151
|
+
await tx.executeSql((0, exports.binds) `
|
|
104
152
|
DELETE FROM "migration lock"
|
|
105
153
|
WHERE "model name" = ${1}`, [modelName]);
|
|
106
154
|
}
|
|
@@ -108,8 +156,8 @@ WHERE "model name" = ${1}`, [modelName]);
|
|
|
108
156
|
}
|
|
109
157
|
}
|
|
110
158
|
};
|
|
111
|
-
|
|
112
|
-
if (!(await migrationTablesExist(options.tx))) {
|
|
159
|
+
const lockMigrations = async (options, fn) => {
|
|
160
|
+
if (!(await (0, exports.migrationTablesExist)(options.tx))) {
|
|
113
161
|
return;
|
|
114
162
|
}
|
|
115
163
|
if (sbvrUtils.db.engine === "websql") {
|
|
@@ -119,11 +167,11 @@ export const lockMigrations = async (options, fn) => {
|
|
|
119
167
|
return $lockMigrations(options.tx, options.modelName, fn);
|
|
120
168
|
}
|
|
121
169
|
else if (sbvrUtils.db.engine === "postgres") {
|
|
122
|
-
const modelKey = createHash('shake128', { outputLength: 4 })
|
|
170
|
+
const modelKey = (0, crypto_1.createHash)('shake128', { outputLength: 4 })
|
|
123
171
|
.update('resin')
|
|
124
172
|
.digest()
|
|
125
173
|
.readInt32BE();
|
|
126
|
-
const lockStatus = await options.tx.getTxLevelLock(PINEJS_ADVISORY_LOCK.namespaceKey, modelKey, options.blocking);
|
|
174
|
+
const lockStatus = await options.tx.getTxLevelLock(env_3.PINEJS_ADVISORY_LOCK.namespaceKey, modelKey, options.blocking);
|
|
127
175
|
if (lockStatus) {
|
|
128
176
|
return await fn();
|
|
129
177
|
}
|
|
@@ -132,27 +180,29 @@ export const lockMigrations = async (options, fn) => {
|
|
|
132
180
|
throw new Error(`unknown database engine for getting migration locks`);
|
|
133
181
|
}
|
|
134
182
|
};
|
|
135
|
-
|
|
136
|
-
|
|
183
|
+
exports.lockMigrations = lockMigrations;
|
|
184
|
+
const setExecutedMigrations = async (tx, modelName, executedMigrations) => {
|
|
185
|
+
if (!(await (0, exports.migrationTablesExist)(tx))) {
|
|
137
186
|
return { pendingUnsetMigrations: executedMigrations };
|
|
138
187
|
}
|
|
139
188
|
const stringifiedMigrations = await sbvrUtils.sbvrTypes.JSON.validate(executedMigrations, true);
|
|
140
|
-
const { rowsAffected } = await tx.executeSql(binds `
|
|
189
|
+
const { rowsAffected } = await tx.executeSql((0, exports.binds) `
|
|
141
190
|
UPDATE "migration"
|
|
142
191
|
SET "model name" = ${1},
|
|
143
192
|
"executed migrations" = ${2}
|
|
144
193
|
WHERE "migration"."model name" = ${3}`, [modelName, stringifiedMigrations, modelName]);
|
|
145
194
|
if (rowsAffected === 0) {
|
|
146
|
-
await tx.executeSql(binds `
|
|
195
|
+
await tx.executeSql((0, exports.binds) `
|
|
147
196
|
INSERT INTO "migration" ("model name", "executed migrations")
|
|
148
197
|
VALUES (${1}, ${2})`, [modelName, stringifiedMigrations]);
|
|
149
198
|
}
|
|
150
199
|
};
|
|
151
|
-
|
|
152
|
-
|
|
200
|
+
exports.setExecutedMigrations = setExecutedMigrations;
|
|
201
|
+
const getExecutedMigrations = async (tx, modelName) => {
|
|
202
|
+
if (!(await (0, exports.migrationTablesExist)(tx))) {
|
|
153
203
|
return [];
|
|
154
204
|
}
|
|
155
|
-
const { rows } = await tx.executeSql(binds `
|
|
205
|
+
const { rows } = await tx.executeSql((0, exports.binds) `
|
|
156
206
|
SELECT "migration"."executed migrations" AS "executed_migrations"
|
|
157
207
|
FROM "migration"
|
|
158
208
|
WHERE "migration"."model name" = ${1}`, [modelName]);
|
|
@@ -170,15 +220,17 @@ WHERE "migration"."model name" = ${1}`, [modelName]);
|
|
|
170
220
|
}
|
|
171
221
|
return executedMigrations;
|
|
172
222
|
};
|
|
173
|
-
|
|
223
|
+
exports.getExecutedMigrations = getExecutedMigrations;
|
|
224
|
+
const migrationTablesExist = async (tx) => {
|
|
174
225
|
const tables = ['migration', 'migration lock', 'migration status'];
|
|
175
226
|
const where = tables.map((tableName) => `name = '${tableName}'`).join(' OR ');
|
|
176
227
|
const result = await tx.tableList(where);
|
|
177
228
|
return result.rows.length === tables.length;
|
|
178
229
|
};
|
|
179
|
-
|
|
230
|
+
exports.migrationTablesExist = migrationTablesExist;
|
|
231
|
+
const initMigrationStatus = async (tx, migrationStatus) => {
|
|
180
232
|
try {
|
|
181
|
-
return await tx.executeSql(binds `
|
|
233
|
+
return await tx.executeSql((0, exports.binds) `
|
|
182
234
|
INSERT INTO "migration status" ("migration key", "start time", "is backing off", "run count")
|
|
183
235
|
SELECT ${1}, ${2}, ${3}, ${4}
|
|
184
236
|
WHERE NOT EXISTS (SELECT 1 FROM "migration status" WHERE "migration key" = ${5})
|
|
@@ -194,9 +246,10 @@ WHERE NOT EXISTS (SELECT 1 FROM "migration status" WHERE "migration key" = ${5})
|
|
|
194
246
|
throw new Error(`unknown error in init migration status: ${err}`);
|
|
195
247
|
}
|
|
196
248
|
};
|
|
197
|
-
|
|
249
|
+
exports.initMigrationStatus = initMigrationStatus;
|
|
250
|
+
const updateMigrationStatus = async (tx, migrationStatus) => {
|
|
198
251
|
try {
|
|
199
|
-
return await tx.executeSql(binds `
|
|
252
|
+
return await tx.executeSql((0, exports.binds) `
|
|
200
253
|
UPDATE "migration status"
|
|
201
254
|
SET
|
|
202
255
|
"run count" = ${1},
|
|
@@ -219,9 +272,10 @@ WHERE "migration status"."migration key" = ${7};`, [
|
|
|
219
272
|
throw new Error(`unknown error in update migration status: ${err}`);
|
|
220
273
|
}
|
|
221
274
|
};
|
|
222
|
-
|
|
275
|
+
exports.updateMigrationStatus = updateMigrationStatus;
|
|
276
|
+
const readMigrationStatus = async (tx, migrationKey) => {
|
|
223
277
|
try {
|
|
224
|
-
const { rows } = await tx.executeSql(binds `
|
|
278
|
+
const { rows } = await tx.executeSql((0, exports.binds) `
|
|
225
279
|
SELECT *
|
|
226
280
|
FROM "migration status"
|
|
227
281
|
WHERE "migration status"."migration key" = ${1}
|
|
@@ -245,4 +299,5 @@ LIMIT 1;`, [migrationKey]);
|
|
|
245
299
|
throw new Error(`unknown error in read migration status: ${err}`);
|
|
246
300
|
}
|
|
247
301
|
};
|
|
302
|
+
exports.readMigrationStatus = readMigrationStatus;
|
|
248
303
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/migrator/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/migrator/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.generateODataMetadata = void 0;
|
|
7
|
+
const sbvr_types_1 = __importDefault(require("@balena/sbvr-types"));
|
|
8
|
+
const env_1 = require("../config-loader/env");
|
|
3
9
|
const getResourceName = (resourceName) => resourceName
|
|
4
10
|
.split('-')
|
|
5
11
|
.map((namePart) => namePart.split(' ').join('_'))
|
|
@@ -17,18 +23,18 @@ const forEachUniqueTable = (model, callback) => {
|
|
|
17
23
|
}
|
|
18
24
|
return result;
|
|
19
25
|
};
|
|
20
|
-
|
|
26
|
+
const generateODataMetadata = (vocabulary, abstractSqlModel) => {
|
|
21
27
|
const complexTypes = {};
|
|
22
28
|
const resolveDataType = (fieldType) => {
|
|
23
|
-
if (
|
|
29
|
+
if (sbvr_types_1.default[fieldType] == null) {
|
|
24
30
|
console.error('Could not resolve type', fieldType);
|
|
25
31
|
throw new Error('Could not resolve type' + fieldType);
|
|
26
32
|
}
|
|
27
|
-
const { complexType } =
|
|
33
|
+
const { complexType } = sbvr_types_1.default[fieldType].types.odata;
|
|
28
34
|
if (complexType != null) {
|
|
29
35
|
complexTypes[fieldType] = complexType;
|
|
30
36
|
}
|
|
31
|
-
return
|
|
37
|
+
return sbvr_types_1.default[fieldType].types.odata.name;
|
|
32
38
|
};
|
|
33
39
|
const model = abstractSqlModel.tables;
|
|
34
40
|
const associations = [];
|
|
@@ -128,5 +134,6 @@ export const generateODataMetadata = (vocabulary, abstractSqlModel) => {
|
|
|
128
134
|
</edmx:DataServices>
|
|
129
135
|
</edmx:Edmx>`);
|
|
130
136
|
};
|
|
131
|
-
generateODataMetadata
|
|
137
|
+
exports.generateODataMetadata = generateODataMetadata;
|
|
138
|
+
exports.generateODataMetadata.version = env_1.version;
|
|
132
139
|
//# sourceMappingURL=odata-metadata-generator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"odata-metadata-generator.js","sourceRoot":"","sources":["../../src/odata-metadata/odata-metadata-generator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"odata-metadata-generator.js","sourceRoot":"","sources":["../../src/odata-metadata/odata-metadata-generator.ts"],"names":[],"mappings":"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"}
|