@balena/pinejs 15.0.0-true-boolean-911aca4062d3132ad3c34712014739b6849fa13a → 15.0.0
Sign up to get free protection for your applications and to get access to all the features.
- package/.dockerignore +4 -0
- package/.github/workflows/flowzone.yml +21 -0
- package/.husky/pre-commit +4 -0
- package/.pinejs-cache.json +1 -0
- package/.resinci.yml +1 -0
- package/.versionbot/CHANGELOG.yml +9678 -2001
- package/CHANGELOG.md +2975 -2
- package/Dockerfile +14 -0
- package/Gruntfile.ts +3 -6
- package/README.md +10 -1
- package/VERSION +1 -0
- package/build/browser.ts +1 -1
- package/build/config.ts +0 -1
- package/docker-compose.npm-test.yml +11 -0
- package/docs/AdvancedUsage.md +77 -63
- package/docs/GettingStarted.md +90 -41
- package/docs/Migrations.md +102 -1
- package/docs/ProjectConfig.md +12 -21
- package/docs/Testing.md +7 -0
- package/out/bin/abstract-sql-compiler.js +17 -17
- package/out/bin/abstract-sql-compiler.js.map +1 -1
- package/out/bin/odata-compiler.js +23 -20
- package/out/bin/odata-compiler.js.map +1 -1
- package/out/bin/sbvr-compiler.js +22 -22
- package/out/bin/sbvr-compiler.js.map +1 -1
- package/out/bin/utils.d.ts +2 -2
- package/out/bin/utils.js +3 -3
- package/out/bin/utils.js.map +1 -1
- package/out/config-loader/config-loader.d.ts +9 -8
- package/out/config-loader/config-loader.js +135 -78
- package/out/config-loader/config-loader.js.map +1 -1
- package/out/config-loader/env.d.ts +41 -16
- package/out/config-loader/env.js +46 -2
- package/out/config-loader/env.js.map +1 -1
- package/out/data-server/sbvr-server.d.ts +2 -19
- package/out/data-server/sbvr-server.js +44 -38
- package/out/data-server/sbvr-server.js.map +1 -1
- package/out/database-layer/db.d.ts +32 -14
- package/out/database-layer/db.js +120 -41
- package/out/database-layer/db.js.map +1 -1
- package/out/express-emulator/express.js +10 -11
- package/out/express-emulator/express.js.map +1 -1
- package/out/http-transactions/transactions.d.ts +2 -18
- package/out/http-transactions/transactions.js +29 -21
- package/out/http-transactions/transactions.js.map +1 -1
- package/out/migrator/async.d.ts +7 -0
- package/out/migrator/async.js +168 -0
- package/out/migrator/async.js.map +1 -0
- package/out/migrator/migrations.sbvr +43 -0
- package/out/migrator/sync.d.ts +9 -0
- package/out/migrator/sync.js +106 -0
- package/out/migrator/sync.js.map +1 -0
- package/out/migrator/utils.d.ts +78 -0
- package/out/migrator/utils.js +283 -0
- package/out/migrator/utils.js.map +1 -0
- package/out/odata-metadata/odata-metadata-generator.js +10 -13
- package/out/odata-metadata/odata-metadata-generator.js.map +1 -1
- package/out/passport-pinejs/passport-pinejs.d.ts +1 -1
- package/out/passport-pinejs/passport-pinejs.js +8 -7
- 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 +20 -6
- package/out/pinejs-session-store/pinejs-session-store.js.map +1 -1
- package/out/sbvr-api/abstract-sql.d.ts +3 -2
- package/out/sbvr-api/abstract-sql.js +9 -9
- package/out/sbvr-api/abstract-sql.js.map +1 -1
- package/out/sbvr-api/cached-compile.js +1 -1
- package/out/sbvr-api/cached-compile.js.map +1 -1
- package/out/sbvr-api/common-types.d.ts +6 -5
- package/out/sbvr-api/control-flow.d.ts +8 -1
- package/out/sbvr-api/control-flow.js +36 -9
- package/out/sbvr-api/control-flow.js.map +1 -1
- package/out/sbvr-api/errors.d.ts +47 -40
- package/out/sbvr-api/errors.js +78 -77
- package/out/sbvr-api/errors.js.map +1 -1
- package/out/sbvr-api/express-extension.d.ts +4 -0
- package/out/sbvr-api/hooks.d.ts +16 -15
- package/out/sbvr-api/hooks.js +74 -48
- 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 +28 -30
- package/out/sbvr-api/odata-response.js.map +1 -1
- package/out/sbvr-api/permissions.d.ts +17 -16
- package/out/sbvr-api/permissions.js +369 -304
- package/out/sbvr-api/permissions.js.map +1 -1
- package/out/sbvr-api/sbvr-utils.d.ts +33 -15
- package/out/sbvr-api/sbvr-utils.js +397 -235
- package/out/sbvr-api/sbvr-utils.js.map +1 -1
- package/out/sbvr-api/translations.d.ts +6 -0
- package/out/sbvr-api/translations.js +150 -0
- package/out/sbvr-api/translations.js.map +1 -0
- package/out/sbvr-api/uri-parser.d.ts +23 -17
- package/out/sbvr-api/uri-parser.js +33 -27
- package/out/sbvr-api/uri-parser.js.map +1 -1
- package/out/sbvr-api/user.sbvr +2 -0
- package/out/server-glue/module.d.ts +6 -6
- package/out/server-glue/module.js +4 -2
- package/out/server-glue/module.js.map +1 -1
- package/out/server-glue/server.js +5 -5
- package/out/server-glue/server.js.map +1 -1
- package/package.json +89 -73
- package/pinejs.png +0 -0
- package/repo.yml +9 -9
- package/src/bin/abstract-sql-compiler.ts +5 -7
- package/src/bin/odata-compiler.ts +11 -13
- package/src/bin/sbvr-compiler.ts +11 -17
- package/src/bin/utils.ts +3 -5
- package/src/config-loader/config-loader.ts +167 -53
- package/src/config-loader/env.ts +106 -6
- package/src/data-server/sbvr-server.js +44 -38
- package/src/database-layer/db.ts +205 -64
- package/src/express-emulator/express.js +10 -11
- package/src/http-transactions/transactions.js +29 -21
- package/src/migrator/async.ts +323 -0
- package/src/migrator/migrations.sbvr +43 -0
- package/src/migrator/sync.ts +152 -0
- package/src/migrator/utils.ts +458 -0
- package/src/odata-metadata/odata-metadata-generator.ts +12 -15
- package/src/passport-pinejs/passport-pinejs.ts +9 -7
- package/src/pinejs-session-store/pinejs-session-store.ts +15 -1
- package/src/sbvr-api/abstract-sql.ts +17 -14
- package/src/sbvr-api/common-types.ts +2 -1
- package/src/sbvr-api/control-flow.ts +45 -11
- package/src/sbvr-api/errors.ts +82 -77
- package/src/sbvr-api/express-extension.ts +6 -1
- package/src/sbvr-api/hooks.ts +123 -50
- package/src/sbvr-api/odata-response.ts +23 -28
- package/src/sbvr-api/permissions.ts +548 -415
- package/src/sbvr-api/sbvr-utils.ts +581 -259
- package/src/sbvr-api/translations.ts +248 -0
- package/src/sbvr-api/uri-parser.ts +63 -49
- package/src/sbvr-api/user.sbvr +2 -0
- package/src/server-glue/module.ts +16 -10
- package/src/server-glue/server.ts +5 -5
- package/tsconfig.dev.json +1 -0
- package/tsconfig.json +1 -2
- package/typings/lf-to-abstract-sql.d.ts +6 -9
- package/typings/memoizee.d.ts +1 -1
- package/.github/CODEOWNERS +0 -1
- package/circle.yml +0 -37
- package/docs/todo.txt +0 -22
- package/out/migrator/migrator.d.ts +0 -20
- package/out/migrator/migrator.js +0 -188
- package/out/migrator/migrator.js.map +0 -1
- package/src/migrator/migrator.ts +0 -286
@@ -0,0 +1,106 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.config = exports.run = exports.postRun = void 0;
|
4
|
+
const utils_1 = require("./utils");
|
5
|
+
const _ = require("lodash");
|
6
|
+
const sbvrUtils = require("../sbvr-api/sbvr-utils");
|
7
|
+
const postRun = async (tx, model) => {
|
8
|
+
const { initSql } = model;
|
9
|
+
if (initSql == null) {
|
10
|
+
return;
|
11
|
+
}
|
12
|
+
const modelName = model.apiRoot;
|
13
|
+
const modelIsNew = await sbvrUtils.isModelNew(tx, modelName);
|
14
|
+
if (modelIsNew) {
|
15
|
+
(sbvrUtils.api.migrations?.logger.info ?? console.info)(`First time executing '${modelName}', running init script`);
|
16
|
+
await (0, utils_1.lockMigrations)({ tx, modelName, blocking: true }, async () => {
|
17
|
+
try {
|
18
|
+
await tx.executeSql(initSql);
|
19
|
+
}
|
20
|
+
catch (err) {
|
21
|
+
(sbvrUtils.api.migrations?.logger.error ?? console.error)(`initSql execution error ${err} `);
|
22
|
+
throw new utils_1.MigrationError(err);
|
23
|
+
}
|
24
|
+
});
|
25
|
+
}
|
26
|
+
};
|
27
|
+
exports.postRun = postRun;
|
28
|
+
const run = async (tx, model) => {
|
29
|
+
const { migrations } = model;
|
30
|
+
if (migrations == null || _.isEmpty(migrations)) {
|
31
|
+
return;
|
32
|
+
}
|
33
|
+
const runnableMigrations = (0, utils_1.getRunnableSyncMigrations)(migrations);
|
34
|
+
return $run(tx, model, runnableMigrations);
|
35
|
+
};
|
36
|
+
exports.run = run;
|
37
|
+
const $run = async (tx, model, migrations) => {
|
38
|
+
const modelName = model.apiRoot;
|
39
|
+
const modelIsNew = await sbvrUtils.isModelNew(tx, modelName);
|
40
|
+
if (modelIsNew) {
|
41
|
+
(sbvrUtils.api.migrations?.logger.info ?? console.info)(`First time model '${modelName}' has executed, skipping migrations`);
|
42
|
+
return await (0, utils_1.setExecutedMigrations)(tx, modelName, Object.keys(migrations));
|
43
|
+
}
|
44
|
+
await (0, utils_1.lockMigrations)({ tx, modelName, blocking: true }, async () => {
|
45
|
+
try {
|
46
|
+
const executedMigrations = await (0, utils_1.getExecutedMigrations)(tx, modelName);
|
47
|
+
const pendingMigrations = (0, utils_1.filterAndSortPendingMigrations)(migrations, executedMigrations);
|
48
|
+
if (pendingMigrations.length === 0) {
|
49
|
+
return;
|
50
|
+
}
|
51
|
+
const newlyExecutedMigrations = await executeMigrations(tx, pendingMigrations);
|
52
|
+
await (0, utils_1.setExecutedMigrations)(tx, modelName, [
|
53
|
+
...executedMigrations,
|
54
|
+
...newlyExecutedMigrations,
|
55
|
+
]);
|
56
|
+
}
|
57
|
+
catch (err) {
|
58
|
+
(sbvrUtils.api.migrations?.logger.error ?? console.error)(`Failed to executed synchronous migrations from api root model ${err}`);
|
59
|
+
throw new utils_1.MigrationError(err);
|
60
|
+
}
|
61
|
+
});
|
62
|
+
};
|
63
|
+
const executeMigrations = async (tx, migrations = []) => {
|
64
|
+
try {
|
65
|
+
for (const migration of migrations) {
|
66
|
+
await executeMigration(tx, migration);
|
67
|
+
}
|
68
|
+
}
|
69
|
+
catch (err) {
|
70
|
+
(sbvrUtils.api.migrations?.logger.error ?? console.error)('Error while executing migrations, rolled back');
|
71
|
+
throw new utils_1.MigrationError(err);
|
72
|
+
}
|
73
|
+
return migrations.map(([migrationKey]) => migrationKey);
|
74
|
+
};
|
75
|
+
const executeMigration = async (tx, [key, migration]) => {
|
76
|
+
(sbvrUtils.api.migrations?.logger.info ?? console.info)(`Running migration ${JSON.stringify(key)}`);
|
77
|
+
if (typeof migration === 'function') {
|
78
|
+
await migration(tx, sbvrUtils);
|
79
|
+
}
|
80
|
+
else if (typeof migration === 'string') {
|
81
|
+
await tx.executeSql(migration);
|
82
|
+
}
|
83
|
+
else {
|
84
|
+
throw new utils_1.MigrationError(`Invalid migration type: ${typeof migration}`);
|
85
|
+
}
|
86
|
+
};
|
87
|
+
exports.config = {
|
88
|
+
models: [
|
89
|
+
{
|
90
|
+
modelName: 'migrations',
|
91
|
+
apiRoot: 'migrations',
|
92
|
+
modelText: utils_1.modelText,
|
93
|
+
migrations: {
|
94
|
+
'11.0.0-modified-at': `
|
95
|
+
ALTER TABLE "migration"
|
96
|
+
ADD COLUMN IF NOT EXISTS "modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL;
|
97
|
+
`,
|
98
|
+
'11.0.1-modified-at': `
|
99
|
+
ALTER TABLE "migration lock"
|
100
|
+
ADD COLUMN IF NOT EXISTS "modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL;
|
101
|
+
`,
|
102
|
+
},
|
103
|
+
},
|
104
|
+
],
|
105
|
+
};
|
106
|
+
//# sourceMappingURL=sync.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/migrator/sync.ts"],"names":[],"mappings":"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"}
|
@@ -0,0 +1,78 @@
|
|
1
|
+
import type { Result, Tx } from '../database-layer/db';
|
2
|
+
import type { Resolvable } from '../sbvr-api/common-types';
|
3
|
+
import { TypedError } from 'typed-error';
|
4
|
+
export { migrator as migratorEnv } from '../config-loader/env';
|
5
|
+
export declare const modelText: any;
|
6
|
+
export declare const migrations: Migrations;
|
7
|
+
import * as sbvrUtils from '../sbvr-api/sbvr-utils';
|
8
|
+
export declare enum MigrationCategories {
|
9
|
+
'sync' = "sync",
|
10
|
+
'async' = "async"
|
11
|
+
}
|
12
|
+
export declare const defaultMigrationCategory = MigrationCategories['sync'];
|
13
|
+
export type CategorizedMigrations = {
|
14
|
+
[key in MigrationCategories]: RunnableMigrations;
|
15
|
+
};
|
16
|
+
type SbvrUtils = typeof sbvrUtils;
|
17
|
+
export type MigrationTuple = [string, Migration];
|
18
|
+
export type MigrationFn = (tx: Tx, sbvrUtils: SbvrUtils) => Resolvable<void>;
|
19
|
+
export type RunnableMigrations = {
|
20
|
+
[key: string]: Migration;
|
21
|
+
};
|
22
|
+
export type RunnableAsyncMigrations = {
|
23
|
+
[key: string]: AsyncMigration;
|
24
|
+
};
|
25
|
+
export type Migrations = CategorizedMigrations | RunnableMigrations;
|
26
|
+
export type AsyncMigrationFn = (tx: Tx, options: {
|
27
|
+
batchSize: number;
|
28
|
+
}, sbvrUtils: SbvrUtils) => Resolvable<number>;
|
29
|
+
type AddFn<T extends {}, x extends 'sync' | 'async'> = T & {
|
30
|
+
[key in `${x}Fn`]: key extends 'syncFn' ? MigrationFn : AsyncMigrationFn;
|
31
|
+
} & {
|
32
|
+
[key in `${x}Sql`]?: undefined;
|
33
|
+
};
|
34
|
+
type AddSql<T extends {}, x extends 'sync' | 'async'> = T & {
|
35
|
+
[key in `${x}Fn`]?: undefined;
|
36
|
+
} & {
|
37
|
+
[key in `${x}Sql`]: string;
|
38
|
+
};
|
39
|
+
export type BaseAsyncMigration = {
|
40
|
+
type?: MigrationCategories.async;
|
41
|
+
delayMS?: number | undefined;
|
42
|
+
backoffDelayMS?: number | undefined;
|
43
|
+
errorThreshold?: number | undefined;
|
44
|
+
asyncBatchSize?: number | undefined;
|
45
|
+
finalize?: boolean | undefined;
|
46
|
+
};
|
47
|
+
export type AsyncMigration = AddFn<BaseAsyncMigration, 'async' | 'sync'> | AddSql<BaseAsyncMigration, 'async' | 'sync'> | AddFn<AddSql<BaseAsyncMigration, 'async'>, 'sync'> | AddFn<AddSql<BaseAsyncMigration, 'sync'>, 'async'>;
|
48
|
+
export declare function isAsyncMigration(migration: string | MigrationFn | AsyncMigration | RunnableMigrations): migration is AsyncMigration;
|
49
|
+
export declare function isSyncMigration(migration: string | MigrationFn | RunnableMigrations | AsyncMigration): migration is MigrationFn;
|
50
|
+
export declare function areCategorizedMigrations($migrations: Migrations): $migrations is CategorizedMigrations;
|
51
|
+
export type Migration = string | MigrationFn | AsyncMigration;
|
52
|
+
export declare class MigrationError extends TypedError {
|
53
|
+
}
|
54
|
+
export type MigrationStatus = {
|
55
|
+
migration_key: string;
|
56
|
+
start_time: Date;
|
57
|
+
last_run_time: Date | null;
|
58
|
+
run_count: number;
|
59
|
+
migrated_row_count: number;
|
60
|
+
error_count: number;
|
61
|
+
converged_time: Date | undefined;
|
62
|
+
is_backing_off: boolean;
|
63
|
+
};
|
64
|
+
export declare const getRunnableAsyncMigrations: ($migrations: Migrations) => RunnableAsyncMigrations | undefined;
|
65
|
+
export declare const getRunnableSyncMigrations: ($migrations: Migrations) => RunnableMigrations;
|
66
|
+
export declare const filterAndSortPendingMigrations: ($migrations: NonNullable<RunnableMigrations | RunnableAsyncMigrations>, executedMigrations: string[]) => MigrationTuple[];
|
67
|
+
export declare const binds: (strings: TemplateStringsArray, ...bindNums: number[]) => string;
|
68
|
+
export declare const lockMigrations: <T>(options: {
|
69
|
+
tx: Tx;
|
70
|
+
modelName: string;
|
71
|
+
blocking: boolean;
|
72
|
+
}, fn: () => Promise<T>) => Promise<T | undefined>;
|
73
|
+
export declare const setExecutedMigrations: (tx: Tx, modelName: string, executedMigrations: string[]) => Promise<void>;
|
74
|
+
export declare const getExecutedMigrations: (tx: Tx, modelName: string) => Promise<string[]>;
|
75
|
+
export declare const migrationTablesExist: (tx: Tx) => Promise<boolean>;
|
76
|
+
export declare const initMigrationStatus: (tx: Tx, migrationStatus: MigrationStatus) => Promise<Result | undefined>;
|
77
|
+
export declare const updateMigrationStatus: (tx: Tx, migrationStatus: MigrationStatus) => Promise<Result | undefined>;
|
78
|
+
export declare const readMigrationStatus: (tx: Tx, migrationKey: string) => Promise<MigrationStatus | undefined>;
|
@@ -0,0 +1,283 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
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.areCategorizedMigrations = exports.isSyncMigration = exports.isAsyncMigration = exports.defaultMigrationCategory = exports.MigrationCategories = exports.migrations = exports.modelText = exports.migratorEnv = void 0;
|
4
|
+
const crypto_1 = require("crypto");
|
5
|
+
const _ = require("lodash");
|
6
|
+
const typed_error_1 = require("typed-error");
|
7
|
+
const env_1 = require("../config-loader/env");
|
8
|
+
var env_2 = require("../config-loader/env");
|
9
|
+
Object.defineProperty(exports, "migratorEnv", { enumerable: true, get: function () { return env_2.migrator; } });
|
10
|
+
const env_3 = require("../config-loader/env");
|
11
|
+
const control_flow_1 = require("../sbvr-api/control-flow");
|
12
|
+
exports.modelText = require('./migrations.sbvr');
|
13
|
+
exports.migrations = {
|
14
|
+
'15.0.0-data-types': async (tx, { db }) => {
|
15
|
+
switch (db.engine) {
|
16
|
+
case 'mysql':
|
17
|
+
await tx.executeSql(`\
|
18
|
+
ALTER TABLE "migration"
|
19
|
+
MODIFY "executed migrations" JSON NOT NULL;`);
|
20
|
+
await tx.executeSql(`\
|
21
|
+
ALTER TABLE "migration status"
|
22
|
+
MODIFY "is backing off" BOOLEAN NOT NULL;`);
|
23
|
+
break;
|
24
|
+
case 'postgres':
|
25
|
+
await tx.executeSql(`\
|
26
|
+
ALTER TABLE "migration"
|
27
|
+
ALTER COLUMN "executed migrations" SET DATA TYPE JSONB USING "executed migrations"::JSONB;`);
|
28
|
+
await tx.executeSql(`\
|
29
|
+
ALTER TABLE "migration status"
|
30
|
+
ALTER COLUMN "is backing off" DROP DEFAULT,
|
31
|
+
ALTER COLUMN "is backing off" SET DATA TYPE BOOLEAN USING "is backing off"::BOOLEAN,
|
32
|
+
ALTER COLUMN "is backing off" SET DEFAULT FALSE;`);
|
33
|
+
break;
|
34
|
+
}
|
35
|
+
},
|
36
|
+
};
|
37
|
+
const sbvrUtils = require("../sbvr-api/sbvr-utils");
|
38
|
+
var MigrationCategories;
|
39
|
+
(function (MigrationCategories) {
|
40
|
+
MigrationCategories["sync"] = "sync";
|
41
|
+
MigrationCategories["async"] = "async";
|
42
|
+
})(MigrationCategories = exports.MigrationCategories || (exports.MigrationCategories = {}));
|
43
|
+
exports.defaultMigrationCategory = MigrationCategories.sync;
|
44
|
+
function isAsyncMigration(migration) {
|
45
|
+
return (((typeof migration.asyncFn === 'function' ||
|
46
|
+
typeof migration.asyncSql === 'string') &&
|
47
|
+
(typeof migration.syncFn === 'function' ||
|
48
|
+
typeof migration.syncSql === 'string')) ||
|
49
|
+
migration.type === MigrationCategories.async);
|
50
|
+
}
|
51
|
+
exports.isAsyncMigration = isAsyncMigration;
|
52
|
+
function isSyncMigration(migration) {
|
53
|
+
return typeof migration === 'function' || typeof migration === 'string';
|
54
|
+
}
|
55
|
+
exports.isSyncMigration = isSyncMigration;
|
56
|
+
function areCategorizedMigrations($migrations) {
|
57
|
+
const containsCategories = Object.keys(MigrationCategories).some((key) => key in $migrations);
|
58
|
+
if (containsCategories &&
|
59
|
+
Object.keys($migrations).some((key) => !(key in MigrationCategories))) {
|
60
|
+
throw new Error('Mixing categorized and uncategorized migrations is not supported');
|
61
|
+
}
|
62
|
+
return containsCategories;
|
63
|
+
}
|
64
|
+
exports.areCategorizedMigrations = areCategorizedMigrations;
|
65
|
+
class MigrationError extends typed_error_1.TypedError {
|
66
|
+
}
|
67
|
+
exports.MigrationError = MigrationError;
|
68
|
+
const getRunnableAsyncMigrations = ($migrations) => {
|
69
|
+
if ($migrations[MigrationCategories.async]) {
|
70
|
+
if (Object.values($migrations[MigrationCategories.async]).some((migration) => !isAsyncMigration(migration)) ||
|
71
|
+
typeof $migrations[MigrationCategories.async] !== 'object') {
|
72
|
+
throw new Error(`All loaded async migrations need to be of type: ${MigrationCategories.async}`);
|
73
|
+
}
|
74
|
+
return $migrations[MigrationCategories.async];
|
75
|
+
}
|
76
|
+
};
|
77
|
+
exports.getRunnableAsyncMigrations = getRunnableAsyncMigrations;
|
78
|
+
const getRunnableSyncMigrations = ($migrations) => {
|
79
|
+
if (areCategorizedMigrations($migrations)) {
|
80
|
+
const runnableMigrations = {};
|
81
|
+
for (const [category, categoryMigrations] of Object.entries($migrations)) {
|
82
|
+
if (category in MigrationCategories) {
|
83
|
+
for (const [key, migration] of Object.entries(categoryMigrations)) {
|
84
|
+
if (isAsyncMigration(migration)) {
|
85
|
+
if (migration.finalize) {
|
86
|
+
runnableMigrations[key] = migration.syncFn ?? migration.syncSql;
|
87
|
+
}
|
88
|
+
}
|
89
|
+
else if (isSyncMigration(migration)) {
|
90
|
+
runnableMigrations[key] = migration;
|
91
|
+
}
|
92
|
+
}
|
93
|
+
}
|
94
|
+
}
|
95
|
+
return runnableMigrations;
|
96
|
+
}
|
97
|
+
return $migrations;
|
98
|
+
};
|
99
|
+
exports.getRunnableSyncMigrations = getRunnableSyncMigrations;
|
100
|
+
const filterAndSortPendingMigrations = ($migrations, executedMigrations) => _($migrations).omit(executedMigrations)
|
101
|
+
.toPairs()
|
102
|
+
.sortBy(([migrationKey]) => migrationKey)
|
103
|
+
.value();
|
104
|
+
exports.filterAndSortPendingMigrations = filterAndSortPendingMigrations;
|
105
|
+
const binds = (strings, ...bindNums) => strings
|
106
|
+
.map((str, i) => {
|
107
|
+
if (i === bindNums.length) {
|
108
|
+
return str;
|
109
|
+
}
|
110
|
+
if (i + 1 !== bindNums[i]) {
|
111
|
+
throw new SyntaxError('Migration sql binds must be sequential');
|
112
|
+
}
|
113
|
+
if (sbvrUtils.db.engine === "postgres") {
|
114
|
+
return str + `$${bindNums[i]}`;
|
115
|
+
}
|
116
|
+
return str + `?`;
|
117
|
+
})
|
118
|
+
.join('');
|
119
|
+
exports.binds = binds;
|
120
|
+
const $lockMigrations = async (tx, modelName, fn) => {
|
121
|
+
try {
|
122
|
+
await tx.executeSql((0, exports.binds) `
|
123
|
+
DELETE FROM "migration lock"
|
124
|
+
WHERE "model name" = ${1}
|
125
|
+
AND "created at" < ${2}`, [modelName, new Date(Date.now() - env_1.migrator.lockTimeout)]);
|
126
|
+
await tx.executeSql((0, exports.binds) `
|
127
|
+
INSERT INTO "migration lock" ("model name")
|
128
|
+
VALUES (${1})`, [modelName]);
|
129
|
+
}
|
130
|
+
catch (err) {
|
131
|
+
await (0, control_flow_1.delay)(env_1.migrator.lockFailDelay);
|
132
|
+
throw err;
|
133
|
+
}
|
134
|
+
try {
|
135
|
+
return await fn();
|
136
|
+
}
|
137
|
+
finally {
|
138
|
+
try {
|
139
|
+
await tx.executeSql((0, exports.binds) `
|
140
|
+
DELETE FROM "migration lock"
|
141
|
+
WHERE "model name" = ${1}`, [modelName]);
|
142
|
+
}
|
143
|
+
catch {
|
144
|
+
}
|
145
|
+
}
|
146
|
+
};
|
147
|
+
const lockMigrations = async (options, fn) => {
|
148
|
+
if (!(await (0, exports.migrationTablesExist)(options.tx))) {
|
149
|
+
return;
|
150
|
+
}
|
151
|
+
if (sbvrUtils.db.engine === "websql") {
|
152
|
+
return $lockMigrations(options.tx, options.modelName, fn);
|
153
|
+
}
|
154
|
+
else if (sbvrUtils.db.engine === "mysql") {
|
155
|
+
return $lockMigrations(options.tx, options.modelName, fn);
|
156
|
+
}
|
157
|
+
else if (sbvrUtils.db.engine === "postgres") {
|
158
|
+
const modelKey = (0, crypto_1.createHash)('shake128', { outputLength: 4 })
|
159
|
+
.update('resin')
|
160
|
+
.digest()
|
161
|
+
.readInt32BE();
|
162
|
+
const lockStatus = await options.tx.getTxLevelLock(env_3.PINEJS_ADVISORY_LOCK.namespaceKey, modelKey, options.blocking);
|
163
|
+
if (lockStatus) {
|
164
|
+
return await fn();
|
165
|
+
}
|
166
|
+
}
|
167
|
+
else {
|
168
|
+
throw new Error(`unknown database engine for getting migration locks`);
|
169
|
+
}
|
170
|
+
};
|
171
|
+
exports.lockMigrations = lockMigrations;
|
172
|
+
const setExecutedMigrations = async (tx, modelName, executedMigrations) => {
|
173
|
+
if (!(await (0, exports.migrationTablesExist)(tx))) {
|
174
|
+
return;
|
175
|
+
}
|
176
|
+
const stringifiedMigrations = await sbvrUtils.sbvrTypes.JSON.validate(executedMigrations, true);
|
177
|
+
const { rowsAffected } = await tx.executeSql((0, exports.binds) `
|
178
|
+
UPDATE "migration"
|
179
|
+
SET "model name" = ${1},
|
180
|
+
"executed migrations" = ${2}
|
181
|
+
WHERE "migration"."model name" = ${3}`, [modelName, stringifiedMigrations, modelName]);
|
182
|
+
if (rowsAffected === 0) {
|
183
|
+
await tx.executeSql((0, exports.binds) `
|
184
|
+
INSERT INTO "migration" ("model name", "executed migrations")
|
185
|
+
VALUES (${1}, ${2})`, [modelName, stringifiedMigrations]);
|
186
|
+
}
|
187
|
+
};
|
188
|
+
exports.setExecutedMigrations = setExecutedMigrations;
|
189
|
+
const getExecutedMigrations = async (tx, modelName) => {
|
190
|
+
if (!(await (0, exports.migrationTablesExist)(tx))) {
|
191
|
+
return [];
|
192
|
+
}
|
193
|
+
const { rows } = await tx.executeSql((0, exports.binds) `
|
194
|
+
SELECT "migration"."executed migrations" AS "executed_migrations"
|
195
|
+
FROM "migration"
|
196
|
+
WHERE "migration"."model name" = ${1}`, [modelName]);
|
197
|
+
const data = rows[0];
|
198
|
+
if (data == null) {
|
199
|
+
return [];
|
200
|
+
}
|
201
|
+
return sbvrUtils.sbvrTypes.JSON.fetchProcessing(data.executed_migrations);
|
202
|
+
};
|
203
|
+
exports.getExecutedMigrations = getExecutedMigrations;
|
204
|
+
const migrationTablesExist = async (tx) => {
|
205
|
+
const tables = ['migration', 'migration lock', 'migration status'];
|
206
|
+
const where = tables.map((tableName) => `name = '${tableName}'`).join(' OR ');
|
207
|
+
const result = await tx.tableList(where);
|
208
|
+
return result.rows.length === tables.length;
|
209
|
+
};
|
210
|
+
exports.migrationTablesExist = migrationTablesExist;
|
211
|
+
const initMigrationStatus = async (tx, migrationStatus) => {
|
212
|
+
try {
|
213
|
+
return await tx.executeSql((0, exports.binds) `
|
214
|
+
INSERT INTO "migration status" ("migration key", "start time", "is backing off", "run count")
|
215
|
+
SELECT ${1}, ${2}, ${3}, ${4}
|
216
|
+
WHERE NOT EXISTS (SELECT 1 FROM "migration status" WHERE "migration key" = ${5})
|
217
|
+
`, [
|
218
|
+
migrationStatus['migration_key'],
|
219
|
+
migrationStatus['start_time'],
|
220
|
+
migrationStatus['is_backing_off'],
|
221
|
+
migrationStatus['run_count'],
|
222
|
+
migrationStatus['migration_key'],
|
223
|
+
]);
|
224
|
+
}
|
225
|
+
catch (err) {
|
226
|
+
throw new Error(`unknown error in init migration status: ${err}`);
|
227
|
+
}
|
228
|
+
};
|
229
|
+
exports.initMigrationStatus = initMigrationStatus;
|
230
|
+
const updateMigrationStatus = async (tx, migrationStatus) => {
|
231
|
+
try {
|
232
|
+
return await tx.executeSql((0, exports.binds) `
|
233
|
+
UPDATE "migration status"
|
234
|
+
SET
|
235
|
+
"run count" = ${1},
|
236
|
+
"last run time" = ${2},
|
237
|
+
"migrated row count" = ${3},
|
238
|
+
"error count" = ${4},
|
239
|
+
"converged time" = ${5},
|
240
|
+
"is backing off" = ${6}
|
241
|
+
WHERE "migration status"."migration key" = ${7};`, [
|
242
|
+
migrationStatus['run_count'],
|
243
|
+
migrationStatus['last_run_time'],
|
244
|
+
migrationStatus['migrated_row_count'],
|
245
|
+
migrationStatus['error_count'],
|
246
|
+
migrationStatus['converged_time'],
|
247
|
+
migrationStatus['is_backing_off'],
|
248
|
+
migrationStatus['migration_key'],
|
249
|
+
]);
|
250
|
+
}
|
251
|
+
catch (err) {
|
252
|
+
throw new Error(`unknown error in update migration status: ${err}`);
|
253
|
+
}
|
254
|
+
};
|
255
|
+
exports.updateMigrationStatus = updateMigrationStatus;
|
256
|
+
const readMigrationStatus = async (tx, migrationKey) => {
|
257
|
+
try {
|
258
|
+
const { rows } = await tx.executeSql((0, exports.binds) `
|
259
|
+
SELECT *
|
260
|
+
FROM "migration status"
|
261
|
+
WHERE "migration status"."migration key" = ${1}
|
262
|
+
LIMIT 1;`, [migrationKey]);
|
263
|
+
const data = rows[0];
|
264
|
+
if (data == null) {
|
265
|
+
return;
|
266
|
+
}
|
267
|
+
return {
|
268
|
+
migration_key: data['migration key'],
|
269
|
+
start_time: sbvrUtils.sbvrTypes['Date Time'].fetchProcessing(data['start time']),
|
270
|
+
last_run_time: sbvrUtils.sbvrTypes['Date Time'].fetchProcessing(data['last run time']),
|
271
|
+
run_count: data['run count'],
|
272
|
+
migrated_row_count: data['migrated row count'],
|
273
|
+
error_count: data['error count'],
|
274
|
+
converged_time: sbvrUtils.sbvrTypes['Date Time'].fetchProcessing(data['converged time']),
|
275
|
+
is_backing_off: sbvrUtils.sbvrTypes.Boolean.fetchProcessing(data['is backing off']),
|
276
|
+
};
|
277
|
+
}
|
278
|
+
catch (err) {
|
279
|
+
throw new Error(`unknown error in read migration status: ${err}`);
|
280
|
+
}
|
281
|
+
};
|
282
|
+
exports.readMigrationStatus = readMigrationStatus;
|
283
|
+
//# sourceMappingURL=utils.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/migrator/utils.ts"],"names":[],"mappings":"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"}
|
@@ -1,7 +1,7 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.generateODataMetadata = void 0;
|
4
|
-
const
|
4
|
+
const sbvr_types_1 = require("@balena/sbvr-types");
|
5
5
|
const { version } = require('../../package.json');
|
6
6
|
const getResourceName = (resourceName) => resourceName
|
7
7
|
.split('-')
|
@@ -10,15 +10,12 @@ const getResourceName = (resourceName) => resourceName
|
|
10
10
|
const forEachUniqueTable = (model, callback) => {
|
11
11
|
const usedTableNames = {};
|
12
12
|
const result = [];
|
13
|
-
for (const key
|
14
|
-
if (
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
usedTableNames[table.name] = true;
|
20
|
-
result.push(callback(key, table));
|
21
|
-
}
|
13
|
+
for (const [key, table] of Object.entries(model)) {
|
14
|
+
if (typeof table !== 'string' &&
|
15
|
+
!table.primitive &&
|
16
|
+
!usedTableNames[table.name]) {
|
17
|
+
usedTableNames[table.name] = true;
|
18
|
+
result.push(callback(key, table));
|
22
19
|
}
|
23
20
|
}
|
24
21
|
return result;
|
@@ -26,15 +23,15 @@ const forEachUniqueTable = (model, callback) => {
|
|
26
23
|
const generateODataMetadata = (vocabulary, abstractSqlModel) => {
|
27
24
|
const complexTypes = {};
|
28
25
|
const resolveDataType = (fieldType) => {
|
29
|
-
if (
|
26
|
+
if (sbvr_types_1.default[fieldType] == null) {
|
30
27
|
console.error('Could not resolve type', fieldType);
|
31
28
|
throw new Error('Could not resolve type' + fieldType);
|
32
29
|
}
|
33
|
-
const { complexType } =
|
30
|
+
const { complexType } = sbvr_types_1.default[fieldType].types.odata;
|
34
31
|
if (complexType != null) {
|
35
32
|
complexTypes[fieldType] = complexType;
|
36
33
|
}
|
37
|
-
return
|
34
|
+
return sbvr_types_1.default[fieldType].types.odata.name;
|
38
35
|
};
|
39
36
|
const model = abstractSqlModel.tables;
|
40
37
|
const associations = [];
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"odata-metadata-generator.js","sourceRoot":"","sources":["../../src/odata-metadata/odata-metadata-generator.ts"],"names":[],"mappings":";;;AAKA,
|
1
|
+
{"version":3,"file":"odata-metadata-generator.js","sourceRoot":"","sources":["../../src/odata-metadata/odata-metadata-generator.ts"],"names":[],"mappings":"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"}
|
@@ -1,7 +1,7 @@
|
|
1
1
|
import type * as Express from 'express';
|
2
2
|
import type * as PassportLocal from 'passport-local';
|
3
3
|
import type * as ConfigLoader from '../config-loader/config-loader';
|
4
|
-
export declare let login: (fn: (err: any, user: {} | undefined, req: Express.Request, res: Express.Response, next: Express.NextFunction) => void) => Express.RequestHandler;
|
4
|
+
export declare let login: (fn: (err: any, user: {} | null | false | undefined, req: Express.Request, res: Express.Response, next: Express.NextFunction) => void) => Express.RequestHandler;
|
5
5
|
export declare let logout: Express.RequestHandler;
|
6
6
|
export declare const checkPassword: PassportLocal.VerifyFunction;
|
7
7
|
export declare const config: ConfigLoader.Config;
|
@@ -7,7 +7,7 @@ const checkPassword = async (username, password, done) => {
|
|
7
7
|
const result = await permissions.checkPassword(username, password);
|
8
8
|
done(undefined, result);
|
9
9
|
}
|
10
|
-
catch
|
10
|
+
catch {
|
11
11
|
done(undefined, false);
|
12
12
|
}
|
13
13
|
};
|
@@ -25,18 +25,19 @@ const setup = async (app) => {
|
|
25
25
|
done(null, user);
|
26
26
|
});
|
27
27
|
passport.use(new LocalStrategy(exports.checkPassword));
|
28
|
-
exports.login = (fn) => (req, res, next) => passport.authenticate('local', (err, user) => {
|
29
|
-
if (err || user == null) {
|
28
|
+
exports.login = (fn) => (req, res, next) => passport.authenticate('local', ((err, user) => {
|
29
|
+
if (err || user == null || user === false) {
|
30
30
|
fn(err, user, req, res, next);
|
31
31
|
return;
|
32
32
|
}
|
33
33
|
req.login(user, (error) => {
|
34
34
|
fn(error, user, req, res, next);
|
35
35
|
});
|
36
|
-
})(req, res, next);
|
36
|
+
}))(req, res, next);
|
37
37
|
exports.logout = (req, _res, next) => {
|
38
|
-
req.logout()
|
39
|
-
|
38
|
+
req.logout((error) => {
|
39
|
+
error ? next(error) : next();
|
40
|
+
});
|
40
41
|
};
|
41
42
|
}
|
42
43
|
else {
|
@@ -48,7 +49,7 @@ const setup = async (app) => {
|
|
48
49
|
}
|
49
50
|
next();
|
50
51
|
});
|
51
|
-
exports.login = (fn) => (req, res, next) => exports.checkPassword(req.body.username, req.body.password, (err, user) => {
|
52
|
+
exports.login = (fn) => (req, res, next) => (0, exports.checkPassword)(req.body.username, req.body.password, (err, user) => {
|
52
53
|
if (user) {
|
53
54
|
loggedIn = true;
|
54
55
|
loggedInUser = user;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"passport-pinejs.js","sourceRoot":"","sources":["../../src/passport-pinejs/passport-pinejs.ts"],"names":[],"mappings":";;;
|
1
|
+
{"version":3,"file":"passport-pinejs.js","sourceRoot":"","sources":["../../src/passport-pinejs/passport-pinejs.ts"],"names":[],"mappings":"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"}
|
@@ -9,6 +9,6 @@ export declare class PinejsSessionStore extends Store {
|
|
9
9
|
[sid: string]: import("express-session").SessionData;
|
10
10
|
} | null | undefined) => void) => void) | undefined;
|
11
11
|
clear: ((callback?: ((err?: any) => void) | undefined) => void) | undefined;
|
12
|
-
length: ((callback: (err: any, length
|
12
|
+
length: ((callback: (err: any, length?: number | undefined) => void) => void) | undefined;
|
13
13
|
static config: Config;
|
14
14
|
}
|