@balena/pinejs 15.0.0-build-renovate-node-20-x-74a72cbe8a4965e32762ac3eb5a13a9720d8740c-1 → 15.0.0-build-15-x-cefa3a481a667c40b8e5dcacdc5699b37977b8d4-1
Sign up to get free protection for your applications and to get access to all the features.
- package/.pinejs-cache.json +1 -1
- package/.versionbot/CHANGELOG.yml +362 -5
- package/CHANGELOG.md +78 -2
- package/Dockerfile +1 -1
- package/build/browser.ts +0 -1
- package/out/config-loader/config-loader.js +3 -6
- package/out/config-loader/config-loader.js.map +1 -1
- package/out/config-loader/env.js +4 -4
- package/out/config-loader/env.js.map +1 -1
- package/out/data-server/sbvr-server.d.ts +1 -13
- package/out/data-server/sbvr-server.js +17 -1
- package/out/data-server/sbvr-server.js.map +1 -1
- package/out/database-layer/db.js +12 -15
- package/out/database-layer/db.js.map +1 -1
- package/out/express-emulator/express.js +4 -4
- package/out/express-emulator/express.js.map +1 -1
- package/out/http-transactions/transactions.d.ts +1 -12
- package/out/http-transactions/transactions.js +18 -0
- package/out/http-transactions/transactions.js.map +1 -1
- package/out/migrator/async.js +14 -22
- package/out/migrator/async.js.map +1 -1
- package/out/migrator/sync.js +6 -12
- package/out/migrator/sync.js.map +1 -1
- package/out/migrator/utils.d.ts +7 -9
- package/out/migrator/utils.js +44 -20
- package/out/migrator/utils.js.map +1 -1
- package/out/pinejs-session-store/pinejs-session-store.js +18 -3
- package/out/pinejs-session-store/pinejs-session-store.js.map +1 -1
- package/out/sbvr-api/abstract-sql.d.ts +2 -1
- package/out/sbvr-api/abstract-sql.js +2 -3
- 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/hooks.d.ts +0 -3
- package/out/sbvr-api/hooks.js +4 -5
- package/out/sbvr-api/hooks.js.map +1 -1
- package/out/sbvr-api/odata-response.js +4 -5
- package/out/sbvr-api/odata-response.js.map +1 -1
- package/out/sbvr-api/permissions.js +23 -64
- package/out/sbvr-api/permissions.js.map +1 -1
- package/out/sbvr-api/sbvr-utils.d.ts +4 -4
- package/out/sbvr-api/sbvr-utils.js +47 -32
- package/out/sbvr-api/sbvr-utils.js.map +1 -1
- package/out/sbvr-api/translations.js +3 -4
- package/out/sbvr-api/translations.js.map +1 -1
- package/out/sbvr-api/uri-parser.d.ts +2 -1
- package/out/sbvr-api/uri-parser.js +4 -9
- package/out/sbvr-api/uri-parser.js.map +1 -1
- package/package.json +10 -10
- package/src/config-loader/env.ts +3 -7
- package/src/data-server/sbvr-server.js +17 -1
- package/src/database-layer/db.ts +1 -1
- package/src/express-emulator/express.js +4 -4
- package/src/http-transactions/transactions.js +18 -0
- package/src/migrator/async.ts +1 -5
- package/src/migrator/utils.ts +48 -33
- package/src/pinejs-session-store/pinejs-session-store.ts +15 -0
- package/src/sbvr-api/hooks.ts +0 -2
- package/src/sbvr-api/odata-response.ts +1 -2
- package/src/sbvr-api/permissions.ts +17 -59
- package/src/sbvr-api/sbvr-utils.ts +41 -19
- package/tsconfig.json +1 -1
package/out/migrator/utils.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ import type { Resolvable } from '../sbvr-api/common-types';
|
|
|
3
3
|
import { TypedError } from 'typed-error';
|
|
4
4
|
export { migrator as migratorEnv } from '../config-loader/env';
|
|
5
5
|
export declare const modelText: any;
|
|
6
|
+
export declare const migrations: Migrations;
|
|
6
7
|
import * as sbvrUtils from '../sbvr-api/sbvr-utils';
|
|
7
8
|
export declare enum MigrationCategories {
|
|
8
9
|
'sync' = "sync",
|
|
@@ -22,12 +23,9 @@ export type RunnableAsyncMigrations = {
|
|
|
22
23
|
[key: string]: AsyncMigration;
|
|
23
24
|
};
|
|
24
25
|
export type Migrations = CategorizedMigrations | RunnableMigrations;
|
|
25
|
-
export type AsyncMigrationFn = (
|
|
26
|
+
export type AsyncMigrationFn = (tx: Tx, options: {
|
|
26
27
|
batchSize: number;
|
|
27
|
-
}, sbvrUtils: SbvrUtils) => Resolvable<number
|
|
28
|
-
type DeprecatedAsyncMigrationFn = (tx: Tx, options: {
|
|
29
|
-
batchSize: number;
|
|
30
|
-
}, sbvrUtils: SbvrUtils) => Resolvable<Result>;
|
|
28
|
+
}, sbvrUtils: SbvrUtils) => Resolvable<number>;
|
|
31
29
|
type AddFn<T extends {}, x extends 'sync' | 'async'> = T & {
|
|
32
30
|
[key in `${x}Fn`]: key extends 'syncFn' ? MigrationFn : AsyncMigrationFn;
|
|
33
31
|
} & {
|
|
@@ -49,7 +47,7 @@ export type BaseAsyncMigration = {
|
|
|
49
47
|
export type AsyncMigration = AddFn<BaseAsyncMigration, 'async' | 'sync'> | AddSql<BaseAsyncMigration, 'async' | 'sync'> | AddFn<AddSql<BaseAsyncMigration, 'async'>, 'sync'> | AddFn<AddSql<BaseAsyncMigration, 'sync'>, 'async'>;
|
|
50
48
|
export declare function isAsyncMigration(migration: string | MigrationFn | AsyncMigration | RunnableMigrations): migration is AsyncMigration;
|
|
51
49
|
export declare function isSyncMigration(migration: string | MigrationFn | RunnableMigrations | AsyncMigration): migration is MigrationFn;
|
|
52
|
-
export declare function areCategorizedMigrations(migrations: Migrations): migrations is CategorizedMigrations;
|
|
50
|
+
export declare function areCategorizedMigrations($migrations: Migrations): $migrations is CategorizedMigrations;
|
|
53
51
|
export type Migration = string | MigrationFn | AsyncMigration;
|
|
54
52
|
export declare class MigrationError extends TypedError {
|
|
55
53
|
}
|
|
@@ -63,9 +61,9 @@ export type MigrationStatus = {
|
|
|
63
61
|
converged_time: Date | undefined;
|
|
64
62
|
is_backing_off: boolean;
|
|
65
63
|
};
|
|
66
|
-
export declare const getRunnableAsyncMigrations: (migrations: Migrations) => RunnableAsyncMigrations | undefined;
|
|
67
|
-
export declare const getRunnableSyncMigrations: (migrations: Migrations) => RunnableMigrations;
|
|
68
|
-
export declare const filterAndSortPendingMigrations: (migrations: NonNullable<RunnableMigrations | RunnableAsyncMigrations>, executedMigrations: string[]) => MigrationTuple[];
|
|
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[];
|
|
69
67
|
export declare const binds: (strings: TemplateStringsArray, ...bindNums: number[]) => string;
|
|
70
68
|
export declare const lockMigrations: <T>(options: {
|
|
71
69
|
tx: Tx;
|
package/out/migrator/utils.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
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.modelText = exports.migratorEnv = void 0;
|
|
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
4
|
const crypto_1 = require("crypto");
|
|
5
5
|
const _ = require("lodash");
|
|
6
6
|
const typed_error_1 = require("typed-error");
|
|
@@ -10,6 +10,28 @@ Object.defineProperty(exports, "migratorEnv", { enumerable: true, get: function
|
|
|
10
10
|
const env_3 = require("../config-loader/env");
|
|
11
11
|
const control_flow_1 = require("../sbvr-api/control-flow");
|
|
12
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" JSON 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 b::JSONB;`);
|
|
28
|
+
await tx.executeSql(`\
|
|
29
|
+
ALTER TABLE "migration status"
|
|
30
|
+
ALTER COLUMN "is backing off" SET DATA TYPE JSONB USING b::JSONB;`);
|
|
31
|
+
break;
|
|
32
|
+
}
|
|
33
|
+
},
|
|
34
|
+
};
|
|
13
35
|
const sbvrUtils = require("../sbvr-api/sbvr-utils");
|
|
14
36
|
var MigrationCategories;
|
|
15
37
|
(function (MigrationCategories) {
|
|
@@ -29,10 +51,10 @@ function isSyncMigration(migration) {
|
|
|
29
51
|
return typeof migration === 'function' || typeof migration === 'string';
|
|
30
52
|
}
|
|
31
53
|
exports.isSyncMigration = isSyncMigration;
|
|
32
|
-
function areCategorizedMigrations(migrations) {
|
|
33
|
-
const containsCategories = Object.keys(MigrationCategories).some((key) => key in migrations);
|
|
54
|
+
function areCategorizedMigrations($migrations) {
|
|
55
|
+
const containsCategories = Object.keys(MigrationCategories).some((key) => key in $migrations);
|
|
34
56
|
if (containsCategories &&
|
|
35
|
-
Object.keys(migrations).some((key) => !(key in MigrationCategories))) {
|
|
57
|
+
Object.keys($migrations).some((key) => !(key in MigrationCategories))) {
|
|
36
58
|
throw new Error('Mixing categorized and uncategorized migrations is not supported');
|
|
37
59
|
}
|
|
38
60
|
return containsCategories;
|
|
@@ -41,26 +63,25 @@ exports.areCategorizedMigrations = areCategorizedMigrations;
|
|
|
41
63
|
class MigrationError extends typed_error_1.TypedError {
|
|
42
64
|
}
|
|
43
65
|
exports.MigrationError = MigrationError;
|
|
44
|
-
const getRunnableAsyncMigrations = (migrations) => {
|
|
45
|
-
if (migrations[MigrationCategories.async]) {
|
|
46
|
-
if (Object.values(migrations[MigrationCategories.async]).some((migration) => !isAsyncMigration(migration)) ||
|
|
47
|
-
typeof migrations[MigrationCategories.async] !== 'object') {
|
|
66
|
+
const getRunnableAsyncMigrations = ($migrations) => {
|
|
67
|
+
if ($migrations[MigrationCategories.async]) {
|
|
68
|
+
if (Object.values($migrations[MigrationCategories.async]).some((migration) => !isAsyncMigration(migration)) ||
|
|
69
|
+
typeof $migrations[MigrationCategories.async] !== 'object') {
|
|
48
70
|
throw new Error(`All loaded async migrations need to be of type: ${MigrationCategories.async}`);
|
|
49
71
|
}
|
|
50
|
-
return migrations[MigrationCategories.async];
|
|
72
|
+
return $migrations[MigrationCategories.async];
|
|
51
73
|
}
|
|
52
74
|
};
|
|
53
75
|
exports.getRunnableAsyncMigrations = getRunnableAsyncMigrations;
|
|
54
|
-
const getRunnableSyncMigrations = (migrations) => {
|
|
55
|
-
|
|
56
|
-
if (areCategorizedMigrations(migrations)) {
|
|
76
|
+
const getRunnableSyncMigrations = ($migrations) => {
|
|
77
|
+
if (areCategorizedMigrations($migrations)) {
|
|
57
78
|
const runnableMigrations = {};
|
|
58
|
-
for (const [category, categoryMigrations] of Object.entries(migrations)) {
|
|
79
|
+
for (const [category, categoryMigrations] of Object.entries($migrations)) {
|
|
59
80
|
if (category in MigrationCategories) {
|
|
60
81
|
for (const [key, migration] of Object.entries(categoryMigrations)) {
|
|
61
82
|
if (isAsyncMigration(migration)) {
|
|
62
83
|
if (migration.finalize) {
|
|
63
|
-
runnableMigrations[key] =
|
|
84
|
+
runnableMigrations[key] = migration.syncFn ?? migration.syncSql;
|
|
64
85
|
}
|
|
65
86
|
}
|
|
66
87
|
else if (isSyncMigration(migration)) {
|
|
@@ -71,10 +92,10 @@ const getRunnableSyncMigrations = (migrations) => {
|
|
|
71
92
|
}
|
|
72
93
|
return runnableMigrations;
|
|
73
94
|
}
|
|
74
|
-
return migrations;
|
|
95
|
+
return $migrations;
|
|
75
96
|
};
|
|
76
97
|
exports.getRunnableSyncMigrations = getRunnableSyncMigrations;
|
|
77
|
-
const filterAndSortPendingMigrations = (migrations, executedMigrations) => _(migrations).omit(executedMigrations)
|
|
98
|
+
const filterAndSortPendingMigrations = ($migrations, executedMigrations) => _($migrations).omit(executedMigrations)
|
|
78
99
|
.toPairs()
|
|
79
100
|
.sortBy(([migrationKey]) => migrationKey)
|
|
80
101
|
.value();
|
|
@@ -175,7 +196,10 @@ WHERE "migration"."model name" = ${1}`, [modelName]);
|
|
|
175
196
|
if (data == null) {
|
|
176
197
|
return [];
|
|
177
198
|
}
|
|
178
|
-
|
|
199
|
+
if (typeof data.executed_migrations === 'string') {
|
|
200
|
+
return JSON.parse(data.executed_migrations);
|
|
201
|
+
}
|
|
202
|
+
return data.executed_migrations;
|
|
179
203
|
};
|
|
180
204
|
exports.getExecutedMigrations = getExecutedMigrations;
|
|
181
205
|
const migrationTablesExist = async (tx) => {
|
|
@@ -194,7 +218,7 @@ WHERE NOT EXISTS (SELECT 1 FROM "migration status" WHERE "migration key" = ${5})
|
|
|
194
218
|
`, [
|
|
195
219
|
migrationStatus['migration_key'],
|
|
196
220
|
migrationStatus['start_time'],
|
|
197
|
-
migrationStatus['is_backing_off']
|
|
221
|
+
migrationStatus['is_backing_off'],
|
|
198
222
|
migrationStatus['run_count'],
|
|
199
223
|
migrationStatus['migration_key'],
|
|
200
224
|
]);
|
|
@@ -221,7 +245,7 @@ WHERE "migration status"."migration key" = ${7};`, [
|
|
|
221
245
|
migrationStatus['migrated_row_count'],
|
|
222
246
|
migrationStatus['error_count'],
|
|
223
247
|
migrationStatus['converged_time'],
|
|
224
|
-
migrationStatus['is_backing_off']
|
|
248
|
+
migrationStatus['is_backing_off'],
|
|
225
249
|
migrationStatus['migration_key'],
|
|
226
250
|
]);
|
|
227
251
|
}
|
|
@@ -249,7 +273,7 @@ LIMIT 1;`, [migrationKey]);
|
|
|
249
273
|
migrated_row_count: data['migrated row count'],
|
|
250
274
|
error_count: data['error count'],
|
|
251
275
|
converged_time: data['converged time'],
|
|
252
|
-
is_backing_off: data['is backing off'] === 1,
|
|
276
|
+
is_backing_off: data['is backing off'] === true || data['is backing off'] === 1,
|
|
253
277
|
};
|
|
254
278
|
}
|
|
255
279
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/migrator/utils.ts"],"names":[],"mappings":";;;AAGA,mCAAoC;AAEpC,4BAA4B;AAC5B,6CAAyC;AACzC,8CAA+D;AAC/D,4CAA+D;AAAtD,kGAAA,QAAQ,OAAe;AAChC,8CAA4D;AAC5D,2DAAiD;AAGpC,QAAA,SAAS,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/migrator/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var _a;
|
|
2
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
4
|
exports.PinejsSessionStore = exports.Store = void 0;
|
|
4
5
|
const express_session_1 = require("express-session");
|
|
@@ -37,7 +38,7 @@ const asCallback = async (callback, promise) => {
|
|
|
37
38
|
err = $err;
|
|
38
39
|
}
|
|
39
40
|
try {
|
|
40
|
-
callback
|
|
41
|
+
callback?.(err, result);
|
|
41
42
|
}
|
|
42
43
|
catch {
|
|
43
44
|
}
|
|
@@ -64,11 +65,10 @@ class PinejsSessionStore extends express_session_1.Store {
|
|
|
64
65
|
}));
|
|
65
66
|
});
|
|
66
67
|
this.set = ((sid, data, callback) => {
|
|
67
|
-
var _a, _b;
|
|
68
68
|
const body = {
|
|
69
69
|
session_id: sid,
|
|
70
70
|
data,
|
|
71
|
-
expiry_time:
|
|
71
|
+
expiry_time: data?.cookie?.expires ?? null,
|
|
72
72
|
};
|
|
73
73
|
asCallback(callback, sbvr_utils_1.api.session.put({
|
|
74
74
|
resource: 'session',
|
|
@@ -131,6 +131,7 @@ class PinejsSessionStore extends express_session_1.Store {
|
|
|
131
131
|
});
|
|
132
132
|
}
|
|
133
133
|
}
|
|
134
|
+
_a = PinejsSessionStore;
|
|
134
135
|
PinejsSessionStore.config = {
|
|
135
136
|
models: [
|
|
136
137
|
{
|
|
@@ -146,6 +147,20 @@ PinejsSessionStore.config = {
|
|
|
146
147
|
ALTER TABLE "session"
|
|
147
148
|
ADD COLUMN IF NOT EXISTS "modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL;
|
|
148
149
|
`,
|
|
150
|
+
'15.0.0-data-types': async (tx, sbvrUtils) => {
|
|
151
|
+
switch (sbvrUtils.db.engine) {
|
|
152
|
+
case 'mysql':
|
|
153
|
+
await tx.executeSql(`\
|
|
154
|
+
ALTER TABLE "session"
|
|
155
|
+
MODIFY "data" JSON NOT NULL;`);
|
|
156
|
+
break;
|
|
157
|
+
case 'postgres':
|
|
158
|
+
await tx.executeSql(`\
|
|
159
|
+
ALTER TABLE "session"
|
|
160
|
+
ALTER COLUMN "data" SET DATA TYPE JSONB USING b::JSONB;`);
|
|
161
|
+
break;
|
|
162
|
+
}
|
|
163
|
+
},
|
|
149
164
|
},
|
|
150
165
|
},
|
|
151
166
|
],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pinejs-session-store.js","sourceRoot":"","sources":["../../src/pinejs-session-store/pinejs-session-store.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pinejs-session-store.js","sourceRoot":"","sources":["../../src/pinejs-session-store/pinejs-session-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import * as AbstractSQLCompiler from '@balena/abstract-sql-compiler';
|
|
2
2
|
import { ODataBinds } from '@balena/odata-to-abstract-sql';
|
|
3
|
+
import * as sbvrUtils from './sbvr-utils';
|
|
3
4
|
import { ODataRequest } from './uri-parser';
|
|
4
|
-
export declare const compileRequest: (request: ODataRequest) => ODataRequest;
|
|
5
|
+
export declare const compileRequest: (request: ODataRequest) => sbvrUtils.ODataRequest;
|
|
5
6
|
export declare const resolveOdataBind: (odataBinds: ODataBinds, value: any) => any;
|
|
6
7
|
export declare const getAndCheckBindValues: (request: Required<Pick<ODataRequest, 'vocabulary' | 'odataBinds' | 'values' | 'engine'>>, bindings: AbstractSQLCompiler.Binding[]) => Promise<any[]>;
|
|
7
8
|
export declare const isRuleAffected: (rule: AbstractSQLCompiler.SqlRule, request?: Pick<ODataRequest, 'abstractSqlQuery' | 'modifiedFields' | 'method' | 'vocabulary'>) => boolean;
|
|
@@ -50,7 +50,6 @@ const getAndCheckBindValues = async (request, bindings) => {
|
|
|
50
50
|
const { odataBinds, values, engine } = request;
|
|
51
51
|
const sqlModelTables = sbvrUtils.getAbstractSqlModel(request).tables;
|
|
52
52
|
return await Promise.all(bindings.map(async (binding) => {
|
|
53
|
-
var _a;
|
|
54
53
|
let fieldName = '';
|
|
55
54
|
let field;
|
|
56
55
|
let value;
|
|
@@ -68,7 +67,7 @@ const getAndCheckBindValues = async (request, bindings) => {
|
|
|
68
67
|
const sqlTableName = (0, odata_to_abstract_sql_1.odataNameToSqlName)(tableName);
|
|
69
68
|
const sqlFieldName = (0, odata_to_abstract_sql_1.odataNameToSqlName)(fieldName);
|
|
70
69
|
const table = sqlModelTables[sqlTableName];
|
|
71
|
-
const maybeField = (
|
|
70
|
+
const maybeField = (table.modifyFields ?? table.fields).find((f) => f.fieldName === sqlFieldName);
|
|
72
71
|
if (maybeField == null) {
|
|
73
72
|
throw new Error(`Could not find field '${fieldName}'`);
|
|
74
73
|
}
|
|
@@ -128,7 +127,7 @@ const checkModifiedFields = (ruleReferencedFields, modifiedFields) => {
|
|
|
128
127
|
0);
|
|
129
128
|
};
|
|
130
129
|
const isRuleAffected = (rule, request) => {
|
|
131
|
-
if (
|
|
130
|
+
if (request?.abstractSqlQuery == null) {
|
|
132
131
|
return false;
|
|
133
132
|
}
|
|
134
133
|
if (rule.ruleReferencedFields == null) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract-sql.js","sourceRoot":"","sources":["../../src/sbvr-api/abstract-sql.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAE5B,qEAAqE;AAErE,yEAIuC;AACvC,0CAA2C;AAC3C,oCAAoC;AACpC,4CAA4C;AAC5C,qCAAgE;AAChE,0CAA0C;AAG1C,MAAM,sBAAsB,GAAG,OAAO,CACrC,CAAC,MAAmC,EAAE,EAAE,CACvC,GAAG,CAAC,WAAW,CACd,qBAAqB,EACrB,CAAC,gBAAsD,EAAE,EAAE;IAC1D,MAAM,QAAQ,GACb,mBAAmB,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;IAC3D,MAAM,cAAc,GACnB,mBAAmB,CAAC,MAAM,CAAC,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;IACjE,IAAI,cAAc,IAAI,IAAI,EAAE;QAC3B,UAAU,CAAC,cAAc,CAAC,CAAC;KAC3B;IACD,OAAO;QACN,QAAQ;QACR,cAAc;KACd,CAAC;AACH,CAAC,EACD,EAAE,IAAI,EAAE,IAAI,EAAE,CACd,EACF,EAAE,SAAS,EAAE,IAAI,EAAE,CACnB,CAAC;AAEK,MAAM,cAAc,GAAG,CAAC,OAAqB,EAAE,EAAE;IACvD,IAAI,OAAO,CAAC,gBAAgB,IAAI,IAAI,EAAE;QACrC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAC3B,IAAI,MAAM,IAAI,IAAI,EAAE;YACnB,MAAM,IAAI,4BAAmB,CAAC,8BAA8B,CAAC,CAAC;SAC9D;QACD,IAAI;YACH,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAClE,OAAO,CAAC,gBAAgB,CACxB,CAAC;YACF,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;YAC5B,OAAO,CAAC,cAAc,GAAG,cAAc,CAAC;SACxC;QAAC,OAAO,GAAQ,EAAE;YAClB,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,KAAK,CAC7C,kCAAkC,EAClC,OAAO,CAAC,gBAAgB,EACxB,GAAG,CACH,CAAC;YACF,MAAM,IAAI,4BAAmB,CAAC,GAAG,CAAC,CAAC;SACnC;KACD;IACD,OAAO,OAAO,CAAC;AAChB,CAAC,CAAC;AAtBW,QAAA,cAAc,kBAsBzB;AAEK,MAAM,gBAAgB,GAAG,CAAC,UAAsB,EAAE,KAAU,EAAE,EAAE;IACtE,IAAI,KAAK,IAAI,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,IAAA,uCAAe,EAAC,KAAK,CAAC,EAAE;QACzE,CAAC,EAAE,KAAK,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;KACnC;IACD,OAAO,KAAK,CAAC;AACd,CAAC,CAAC;AALW,QAAA,gBAAgB,oBAK3B;AAEK,MAAM,qBAAqB,GAAG,KAAK,EACzC,OAEC,EACD,QAAuC,EACtC,EAAE;IACH,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC/C,MAAM,cAAc,GAAG,SAAS,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC;IACrE,OAAO,MAAM,OAAO,CAAC,GAAG,CACvB,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"abstract-sql.js","sourceRoot":"","sources":["../../src/sbvr-api/abstract-sql.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cached-compile.js","sourceRoot":"","sources":["../../src/sbvr-api/cached-compile.ts"],"names":[],"mappings":";;;AAEA,4BAA4B;AAE5B,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,oBAAoB,CAAC;AACxE,IAAI,KAAK,GAML,IAAI,CAAC;AACT,IAAI,EAAyB,CAAC;AAC9B,IAAI;IAEH,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACnB;AAAC,OAAO,CAAC,EAAE;CAEX;AAED,MAAM,kBAAkB,GAAG,IAAI,CAAC;AAEhC,MAAM,SAAS,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE;IACjC,IAAI,EAAE,IAAI,IAAI,EAAE;QACf,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE;YAC9D,IAAI,GAAG,EAAE;gBACR,OAAO,CAAC,IAAI,CAAC,4BAA4B,EAAE,GAAG,CAAC,CAAC;aAChD;QACF,CAAC,CAAC,CAAC;KACH;AACF,CAAC,EAAE,kBAAkB,CAAC,CAAC;AAEvB,MAAM,UAAU,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE;IAClC,KAAK,GAAG,IAAI,CAAC;AACd,CAAC,EAAE,kBAAkB,GAAG,CAAC,CAAC,CAAC;AAEpB,MAAM,aAAa,GAAG,CAC5B,IAAY,EACZ,OAAe,EACf,GAAQ,EACR,EAAW,EACP,EAAE;IACN,IAAI,KAAK,IAAI,IAAI,EAAE;QAClB,IAAI,EAAE,IAAI,IAAI,EAAE;YACf,IAAI;gBACH,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;aACvD;YAAC,OAAO,CAAC,EAAE;aAEX;SACD;QACD,KAAK,
|
|
1
|
+
{"version":3,"file":"cached-compile.js","sourceRoot":"","sources":["../../src/sbvr-api/cached-compile.ts"],"names":[],"mappings":";;;AAEA,4BAA4B;AAE5B,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,oBAAoB,CAAC;AACxE,IAAI,KAAK,GAML,IAAI,CAAC;AACT,IAAI,EAAyB,CAAC;AAC9B,IAAI;IAEH,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACnB;AAAC,OAAO,CAAC,EAAE;CAEX;AAED,MAAM,kBAAkB,GAAG,IAAI,CAAC;AAEhC,MAAM,SAAS,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE;IACjC,IAAI,EAAE,IAAI,IAAI,EAAE;QACf,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE;YAC9D,IAAI,GAAG,EAAE;gBACR,OAAO,CAAC,IAAI,CAAC,4BAA4B,EAAE,GAAG,CAAC,CAAC;aAChD;QACF,CAAC,CAAC,CAAC;KACH;AACF,CAAC,EAAE,kBAAkB,CAAC,CAAC;AAEvB,MAAM,UAAU,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE;IAClC,KAAK,GAAG,IAAI,CAAC;AACd,CAAC,EAAE,kBAAkB,GAAG,CAAC,CAAC,CAAC;AAEpB,MAAM,aAAa,GAAG,CAC5B,IAAY,EACZ,OAAe,EACf,GAAQ,EACR,EAAW,EACP,EAAE;IACN,IAAI,KAAK,IAAI,IAAI,EAAE;QAClB,IAAI,EAAE,IAAI,IAAI,EAAE;YACf,IAAI;gBACH,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;aACvD;YAAC,OAAO,CAAC,EAAE;aAEX;SACD;QACD,KAAK,KAAK,EAAE,CAAC;KACb;IACD,MAAM,GAAG,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;IACjD,IAAI,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAC/B,IAAI,MAAM,IAAI,IAAI,EAAE;QACnB,MAAM,GAAG,EAAE,EAAE,CAAC;QACd,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;QAC1B,SAAS,EAAE,CAAC;KACZ;IAKD,UAAU,EAAE,CAAC;IACb,OAAO,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;AAC5B,CAAC,CAAC;AA7BW,QAAA,aAAa,iBA6BxB"}
|
package/out/sbvr-api/hooks.d.ts
CHANGED
|
@@ -37,7 +37,6 @@ export interface Hooks {
|
|
|
37
37
|
tx: Tx;
|
|
38
38
|
result: any;
|
|
39
39
|
response: Response;
|
|
40
|
-
data?: any;
|
|
41
40
|
}) => HookResponse;
|
|
42
41
|
'POSTRUN-ERROR'?: (options: HookArgs & {
|
|
43
42
|
error: TypedError | any;
|
|
@@ -98,7 +97,6 @@ export declare const addHook: (method: keyof typeof apiHooks, vocabulary: string
|
|
|
98
97
|
tx: Tx;
|
|
99
98
|
result: any;
|
|
100
99
|
response: Response;
|
|
101
|
-
data?: any;
|
|
102
100
|
}) => HookResponse> | undefined;
|
|
103
101
|
'POSTRUN-ERROR'?: HookBlueprint<(options: HookArgs & {
|
|
104
102
|
error: TypedError | any;
|
|
@@ -117,7 +115,6 @@ export declare const addHook: (method: keyof typeof apiHooks, vocabulary: string
|
|
|
117
115
|
tx: Tx;
|
|
118
116
|
result: any;
|
|
119
117
|
response: Response;
|
|
120
|
-
data?: any;
|
|
121
118
|
}) => HookResponse) | undefined;
|
|
122
119
|
'POSTRUN-ERROR'?: ((options: HookArgs & {
|
|
123
120
|
error: TypedError | any;
|
package/out/sbvr-api/hooks.js
CHANGED
|
@@ -125,7 +125,6 @@ const apiHooks = {
|
|
|
125
125
|
};
|
|
126
126
|
apiHooks.MERGE = apiHooks.PATCH;
|
|
127
127
|
const addHook = (method, vocabulary, resourceName, hooks) => {
|
|
128
|
-
var _a, _b, _c;
|
|
129
128
|
const methodHooks = apiHooks[method];
|
|
130
129
|
if (methodHooks == null) {
|
|
131
130
|
throw new Error('Unsupported method: ' + method);
|
|
@@ -154,9 +153,9 @@ const addHook = (method, vocabulary, resourceName, hooks) => {
|
|
|
154
153
|
}
|
|
155
154
|
}
|
|
156
155
|
}
|
|
157
|
-
|
|
156
|
+
methodHooks[vocabulary] ??= {};
|
|
158
157
|
const apiRootHooks = methodHooks[vocabulary];
|
|
159
|
-
|
|
158
|
+
apiRootHooks[resourceName] ??= {};
|
|
160
159
|
const resourceHooks = apiRootHooks[resourceName];
|
|
161
160
|
if ('sideEffects' in hooks && 'readOnlyTx' in hooks) {
|
|
162
161
|
const { sideEffects, readOnlyTx } = hooks;
|
|
@@ -178,7 +177,7 @@ const addHook = (method, vocabulary, resourceName, hooks) => {
|
|
|
178
177
|
throw new Error('Unknown callback type: ' + hookType);
|
|
179
178
|
}
|
|
180
179
|
const hook = hooks[hookType];
|
|
181
|
-
|
|
180
|
+
resourceHooks[hookType] ??= [];
|
|
182
181
|
if (hook != null) {
|
|
183
182
|
resourceHooks[hookType].push(hook);
|
|
184
183
|
}
|
|
@@ -245,7 +244,7 @@ const runHooks = async (hookName, hooksList, args) => {
|
|
|
245
244
|
}
|
|
246
245
|
await Promise.all(modelHooks.map(async (hook) => {
|
|
247
246
|
if (hook.readOnlyTx) {
|
|
248
|
-
modelReadOnlyArgs
|
|
247
|
+
modelReadOnlyArgs ??= getReadOnlyArgs(modelName, modelArgs);
|
|
249
248
|
await hook.run(modelReadOnlyArgs);
|
|
250
249
|
}
|
|
251
250
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../../src/sbvr-api/hooks.ts"],"names":[],"mappings":";;;AAOA,4BAA4B;AAC5B,iDAAiD;AACjD,oCAAoC;AACpC,6CAQsB;
|
|
1
|
+
{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../../src/sbvr-api/hooks.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,7 +51,7 @@ const getLocalFields = (table) => {
|
|
|
51
51
|
if (table.localFields == null) {
|
|
52
52
|
table.localFields = {};
|
|
53
53
|
for (const { fieldName, dataType } of table.fields) {
|
|
54
|
-
if (
|
|
54
|
+
if (!['ForeignKey', 'ConceptType'].includes(dataType)) {
|
|
55
55
|
const odataName = (0, odata_to_abstract_sql_1.sqlNameToODataName)(fieldName);
|
|
56
56
|
table.localFields[odataName] = true;
|
|
57
57
|
}
|
|
@@ -60,15 +60,14 @@ const getLocalFields = (table) => {
|
|
|
60
60
|
return table.localFields;
|
|
61
61
|
};
|
|
62
62
|
const getFetchProcessingFields = (table) => {
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
.filter(({ dataType }) => { var _a; return ((_a = sbvrTypes[dataType]) === null || _a === void 0 ? void 0 : _a.fetchProcessing) != null; })
|
|
63
|
+
return (table.fetchProcessingFields ??= _(table.fields)
|
|
64
|
+
.filter(({ dataType }) => sbvrTypes[dataType]?.fetchProcessing != null)
|
|
66
65
|
.map(({ fieldName, dataType }) => {
|
|
67
66
|
const odataName = (0, odata_to_abstract_sql_1.sqlNameToODataName)(fieldName);
|
|
68
67
|
return [odataName, sbvrTypes[dataType].fetchProcessing];
|
|
69
68
|
})
|
|
70
69
|
.fromPairs()
|
|
71
|
-
.value())
|
|
70
|
+
.value());
|
|
72
71
|
};
|
|
73
72
|
const process = async (vocab, abstractSqlModel, resourceName, rows, { includeMetadata }) => {
|
|
74
73
|
if (rows.length === 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"odata-response.js","sourceRoot":"","sources":["../../src/sbvr-api/odata-response.ts"],"names":[],"mappings":";;;AAmBA,yEAAmE;AACnE,gDAAgD;AAChD,4BAA4B;AAC5B,6CAAyE;AAEzE,MAAM,iBAAiB,GAAG,KAAK,EAC9B,KAAa,EACb,gBAAkC,EAClC,kBAA0B,EAC1B,SAAiB,EACjB,GAAQ,EACR,IAAkC,EACjC,EAAE;IACH,IAAI,KAAK,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,IAAI,KAAK,IAAI,IAAI,EAAE;QAClB,OAAO;KACP;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC9B,IAAI;YACH,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC1B;QAAC,MAAM;SAEP;KACD;IAED,MAAM,mBAAmB,GAAG,IAAA,sCAAyB,EACpD;QACC,gBAAgB;QAChB,UAAU,EAAE,KAAK;QACjB,YAAY,EAAE,kBAAkB;KAChC,EACD,SAAS,CACT,CAAC;IACF,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACzB,MAAM,aAAa,GAAG,MAAM,IAAA,eAAO,EAClC,KAAK,EACL,gBAAgB,EAChB,mBAAmB,EACnB,KAAK,EACL,IAAI,CACJ,CAAC;QACF,GAAG,CAAC,SAAS,CAAC,GAAG,aAAa,CAAC;KAC/B;SAAM;QACN,GAAG,CAAC,SAAS,CAAC,GAAG;YAChB,IAAI,EAAE,KAAK;SACX,CAAC;QACF,IAAI,IAAI,CAAC,eAAe,EAAE;YACzB,GAAG,CAAC,SAAS,CAAC,CAAC,UAAU,GAAG;gBAC3B,GAAG,EAAE,IAAA,mBAAW,EAAC,KAAK,EAAE,mBAAmB,EAAE,KAAK,CAAC;aACnD,CAAC;SACF;KACD;AACF,CAAC,CAAC;AAEK,MAAM,WAAW,GAAG,CAC1B,KAAa,EACb,YAAoB,EACpB,EAAmB,EACE,EAAE;IACvB,IAAI,EAAE,IAAI,IAAI,EAAE;QACf,OAAO;KACP;IACD,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE;QAC3B,EAAE,GAAG,GAAG,GAAG,kBAAkB,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC;KACxC;IACD,OAAO,IAAI,KAAK,IAAI,YAAY,aAAa,EAAE,EAAE,CAAC;AACnD,CAAC,CAAC;AAZW,QAAA,WAAW,eAYtB;AAEF,MAAM,cAAc,GAAG,CAAC,KAAuB,EAAE,EAAE;IAClD,IAAI,KAAK,CAAC,WAAW,IAAI,IAAI,EAAE;QAC9B,KAAK,CAAC,WAAW,GAAG,EAAE,CAAC;QACvB,KAAK,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,KAAK,CAAC,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"odata-response.js","sourceRoot":"","sources":["../../src/sbvr-api/odata-response.ts"],"names":[],"mappings":"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"}
|