@balena/pinejs 19.7.3-build-renovate-postgres-17-x-2d03a162db08921d8a448438b1e1514c161bb75a-1 → 20.0.0-build-esm-724decc895c0df04c6238f249763a742cc5efa39-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/.pinejs-cache.json +1 -1
- package/.versionbot/CHANGELOG.yml +30 -7
- package/CHANGELOG.md +6 -3
- package/{Gruntfile.ts → Gruntfile.cts} +9 -22
- package/VERSION +1 -1
- 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.ts → browser.cts} +1 -1
- package/build/{config.ts → config.cts} +5 -1
- package/build/{module.ts → module.cts} +1 -1
- package/build/{server.ts → server.cts} +1 -1
- package/docker-compose.npm-test.yml +1 -1
- package/out/bin/abstract-sql-compiler.js +17 -19
- package/out/bin/abstract-sql-compiler.js.map +1 -1
- package/out/bin/odata-compiler.js +19 -21
- package/out/bin/odata-compiler.js.map +1 -1
- package/out/bin/sbvr-compiler.js +19 -54
- package/out/bin/sbvr-compiler.js.map +1 -1
- package/out/bin/utils.d.ts +3 -3
- package/out/bin/utils.js +21 -53
- package/out/bin/utils.js.map +1 -1
- package/out/config-loader/config-loader.d.ts +7 -7
- package/out/config-loader/config-loader.js +23 -63
- 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 +24 -66
- 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 +5 -42
- 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 +37 -83
- 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 +8 -11
- 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 +20 -60
- package/out/migrator/async.js.map +1 -1
- package/out/migrator/migrations.js +1 -2
- package/out/migrator/sync.d.ts +6 -6
- package/out/migrator/sync.js +20 -61
- package/out/migrator/sync.js.map +1 -1
- package/out/migrator/utils.d.ts +4 -4
- package/out/migrator/utils.js +42 -97
- package/out/migrator/utils.js.map +1 -1
- package/out/odata-metadata/odata-metadata-generator.js +7 -14
- 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 +4 -41
- package/out/passport-pinejs/mount-login-router.js.map +1 -1
- package/out/passport-pinejs/passport-pinejs.d.ts +3 -3
- package/out/passport-pinejs/passport-pinejs.js +11 -46
- 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 +11 -48
- package/out/pinejs-session-store/pinejs-session-store.js.map +1 -1
- package/out/sbvr-api/abstract-sql.d.ts +3 -3
- package/out/sbvr-api/abstract-sql.js +22 -65
- package/out/sbvr-api/abstract-sql.js.map +1 -1
- package/out/sbvr-api/cached-compile.js +8 -15
- package/out/sbvr-api/cached-compile.js.map +1 -1
- package/out/sbvr-api/common-types.js +1 -2
- package/out/sbvr-api/control-flow.d.ts +1 -1
- package/out/sbvr-api/control-flow.js +12 -25
- package/out/sbvr-api/control-flow.js.map +1 -1
- package/out/sbvr-api/dev.js +1 -2
- package/out/sbvr-api/errors.d.ts +1 -1
- package/out/sbvr-api/errors.js +47 -95
- 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 +1 -2
- package/out/sbvr-api/hooks.d.ts +4 -4
- package/out/sbvr-api/hooks.js +23 -35
- 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 +19 -29
- package/out/sbvr-api/odata-response.js.map +1 -1
- package/out/sbvr-api/permissions.d.ts +9 -9
- package/out/sbvr-api/permissions.js +106 -159
- package/out/sbvr-api/permissions.js.map +1 -1
- package/out/sbvr-api/sbvr-utils.d.ts +40 -18
- package/out/sbvr-api/sbvr-utils.js +222 -285
- 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 +10 -17
- package/out/sbvr-api/translations.js.map +1 -1
- package/out/sbvr-api/uri-parser.d.ts +7 -7
- package/out/sbvr-api/uri-parser.js +39 -84
- package/out/sbvr-api/uri-parser.js.map +1 -1
- package/out/sbvr-api/user.js +1 -2
- package/out/server-glue/global-ext.d.ts +0 -3
- package/out/server-glue/module.d.ts +16 -16
- package/out/server-glue/module.js +20 -59
- package/out/server-glue/module.js.map +1 -1
- package/out/server-glue/sbvr-loader.d.ts +2 -1
- package/out/server-glue/sbvr-loader.js +4 -11
- 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 +17 -59
- package/out/server-glue/server.js.map +1 -1
- package/out/tasks/common.d.ts +1 -1
- package/out/tasks/common.js +3 -9
- package/out/tasks/common.js.map +1 -1
- package/out/tasks/index.d.ts +8 -8
- package/out/tasks/index.js +25 -63
- package/out/tasks/index.js.map +1 -1
- package/out/tasks/tasks.js +1 -2
- package/out/tasks/worker.d.ts +3 -3
- package/out/tasks/worker.js +14 -51
- 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 +1 -5
- package/out/webresource-handler/handlers/NoopHandler.js.map +1 -1
- package/out/webresource-handler/handlers/index.d.ts +1 -2
- package/out/webresource-handler/handlers/index.js +1 -18
- package/out/webresource-handler/handlers/index.js.map +1 -1
- package/out/webresource-handler/index.d.ts +3 -3
- package/out/webresource-handler/index.js +37 -87
- package/out/webresource-handler/index.js.map +1 -1
- package/package.json +15 -14
- 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 +23 -15
- package/src/config-loader/config-loader.ts +12 -12
- package/src/config-loader/env.ts +3 -3
- package/src/data-server/sbvr-server.ts +4 -4
- package/src/database-layer/db.ts +18 -11
- 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 +3 -2
- package/src/passport-pinejs/mount-login-router.ts +3 -3
- package/src/passport-pinejs/passport-pinejs.ts +6 -6
- package/src/pinejs-session-store/pinejs-session-store.ts +4 -4
- package/src/sbvr-api/abstract-sql.ts +6 -6
- package/src/sbvr-api/cached-compile.ts +2 -2
- 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 +8 -4
- package/src/sbvr-api/permissions.ts +19 -19
- package/src/sbvr-api/sbvr-utils.ts +39 -33
- package/src/sbvr-api/translations.ts +1 -1
- package/src/sbvr-api/uri-parser.ts +10 -10
- package/src/server-glue/global-ext.d.ts +0 -3
- package/src/server-glue/module.ts +20 -20
- package/src/server-glue/sbvr-loader.ts +15 -27
- package/src/server-glue/server.ts +13 -24
- 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 +5 -1
- package/src/webresource-handler/handlers/index.ts +1 -2
- package/src/webresource-handler/index.ts +13 -13
- package/tsconfig.dev.json +4 -2
- package/tsconfig.json +1 -1
- package/typings/lf-to-abstract-sql.d.ts +2 -2
- package/typings/memoizee.d.ts +2 -2
- package/out/webresource-handler/handlers/S3Handler.d.ts +0 -28
- package/out/webresource-handler/handlers/S3Handler.js +0 -104
- package/out/webresource-handler/handlers/S3Handler.js.map +0 -1
- package/src/webresource-handler/handlers/S3Handler.ts +0 -143
@@ -1,15 +1,7 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
};
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
6
|
-
exports.prepareModel = exports.process = void 0;
|
7
|
-
exports.resourceURI = resourceURI;
|
8
|
-
const odata_to_abstract_sql_1 = require("@balena/odata-to-abstract-sql");
|
9
|
-
const sbvr_types_1 = __importDefault(require("@balena/sbvr-types"));
|
10
|
-
const lodash_1 = __importDefault(require("lodash"));
|
11
|
-
const sbvr_utils_1 = require("./sbvr-utils");
|
12
|
-
const webresource_handler_1 = require("../webresource-handler");
|
1
|
+
import { sqlNameToODataName } from '@balena/odata-to-abstract-sql';
|
2
|
+
import _ from 'lodash';
|
3
|
+
import { sbvrTypes, resolveNavigationResource, resolveSynonym, } from './sbvr-utils.js';
|
4
|
+
import { getWebresourceHandler } from '../webresource-handler/index.js';
|
13
5
|
const checkForExpansion = async (vocab, abstractSqlModel, parentResourceName, fieldName, row, opts) => {
|
14
6
|
let field = row[fieldName];
|
15
7
|
if (field == null) {
|
@@ -22,13 +14,13 @@ const checkForExpansion = async (vocab, abstractSqlModel, parentResourceName, fi
|
|
22
14
|
catch {
|
23
15
|
}
|
24
16
|
}
|
25
|
-
const mappingResourceName =
|
17
|
+
const mappingResourceName = resolveNavigationResource({
|
26
18
|
abstractSqlModel,
|
27
19
|
vocabulary: vocab,
|
28
20
|
resourceName: parentResourceName,
|
29
21
|
}, fieldName);
|
30
22
|
if (Array.isArray(field)) {
|
31
|
-
const expandedField = await
|
23
|
+
const expandedField = await process(vocab, abstractSqlModel, mappingResourceName, field, opts);
|
32
24
|
row[fieldName] = expandedField;
|
33
25
|
}
|
34
26
|
else {
|
@@ -42,7 +34,7 @@ const checkForExpansion = async (vocab, abstractSqlModel, parentResourceName, fi
|
|
42
34
|
}
|
43
35
|
}
|
44
36
|
};
|
45
|
-
function resourceURI(vocab, resourceName, id) {
|
37
|
+
export function resourceURI(vocab, resourceName, id) {
|
46
38
|
if (id == null) {
|
47
39
|
return;
|
48
40
|
}
|
@@ -56,7 +48,7 @@ const getLocalFields = (table) => {
|
|
56
48
|
table.localFields = {};
|
57
49
|
for (const { fieldName, dataType } of table.fields) {
|
58
50
|
if (!['ForeignKey', 'ConceptType'].includes(dataType)) {
|
59
|
-
const odataName =
|
51
|
+
const odataName = sqlNameToODataName(fieldName);
|
60
52
|
table.localFields[odataName] = true;
|
61
53
|
}
|
62
54
|
}
|
@@ -68,7 +60,7 @@ const getWebResourceFields = (table) => {
|
|
68
60
|
table.webresourceFields = {};
|
69
61
|
for (const { fieldName, dataType } of table.fields) {
|
70
62
|
if (dataType === 'WebResource') {
|
71
|
-
const odataName =
|
63
|
+
const odataName = sqlNameToODataName(fieldName);
|
72
64
|
table.webresourceFields[odataName] = true;
|
73
65
|
}
|
74
66
|
}
|
@@ -76,21 +68,21 @@ const getWebResourceFields = (table) => {
|
|
76
68
|
return table.webresourceFields;
|
77
69
|
};
|
78
70
|
const getFetchProcessingFields = (table) => {
|
79
|
-
return (table.fetchProcessingFields ??= (
|
80
|
-
.filter(({ dataType }) =>
|
71
|
+
return (table.fetchProcessingFields ??= _(table.fields)
|
72
|
+
.filter(({ dataType }) => sbvrTypes[dataType]
|
81
73
|
?.fetchProcessing != null)
|
82
74
|
.map(({ fieldName, dataType }) => {
|
83
|
-
const odataName =
|
75
|
+
const odataName = sqlNameToODataName(fieldName);
|
84
76
|
return [
|
85
77
|
odataName,
|
86
|
-
|
78
|
+
sbvrTypes[dataType]
|
87
79
|
.fetchProcessing,
|
88
80
|
];
|
89
81
|
})
|
90
82
|
.fromPairs()
|
91
83
|
.value());
|
92
84
|
};
|
93
|
-
const process = async (vocab, abstractSqlModel, resourceName, rows, { includeMetadata }) => {
|
85
|
+
export const process = async (vocab, abstractSqlModel, resourceName, rows, { includeMetadata }) => {
|
94
86
|
if (rows.length === 0) {
|
95
87
|
return [];
|
96
88
|
}
|
@@ -100,12 +92,12 @@ const process = async (vocab, abstractSqlModel, resourceName, rows, { includeMet
|
|
100
92
|
return count;
|
101
93
|
}
|
102
94
|
}
|
103
|
-
const sqlResourceName =
|
95
|
+
const sqlResourceName = resolveSynonym({
|
104
96
|
abstractSqlModel,
|
105
97
|
vocabulary: vocab,
|
106
98
|
resourceName,
|
107
99
|
});
|
108
|
-
const configuredWebResourceHandler =
|
100
|
+
const configuredWebResourceHandler = getWebresourceHandler();
|
109
101
|
const table = abstractSqlModel.tables[sqlResourceName];
|
110
102
|
const fieldNames = Object.keys(rows[0]);
|
111
103
|
const fetchProcessingFields = getFetchProcessingFields(table);
|
@@ -114,7 +106,7 @@ const process = async (vocab, abstractSqlModel, resourceName, rows, { includeMet
|
|
114
106
|
const expandableFields = fieldNames.filter((fieldName) => !Object.hasOwn(localFields, fieldName));
|
115
107
|
const webresourceFields = getWebResourceFields(table);
|
116
108
|
const requiredSigningFields = fieldNames.filter((fieldName) => Object.hasOwn(webresourceFields, fieldName));
|
117
|
-
const odataIdField =
|
109
|
+
const odataIdField = sqlNameToODataName(table.idField);
|
118
110
|
for (const row of rows) {
|
119
111
|
for (const fieldName of processedFields) {
|
120
112
|
row[fieldName] = fetchProcessingFields[fieldName](row[fieldName]);
|
@@ -144,13 +136,11 @@ const process = async (vocab, abstractSqlModel, resourceName, rows, { includeMet
|
|
144
136
|
}
|
145
137
|
return rows;
|
146
138
|
};
|
147
|
-
|
148
|
-
|
149
|
-
lodash_1.default.forEach(abstractSqlModel.tables, (table) => {
|
139
|
+
export const prepareModel = (abstractSqlModel) => {
|
140
|
+
_.forEach(abstractSqlModel.tables, (table) => {
|
150
141
|
getLocalFields(table);
|
151
142
|
getFetchProcessingFields(table);
|
152
143
|
getWebResourceFields(table);
|
153
144
|
});
|
154
145
|
};
|
155
|
-
exports.prepareModel = prepareModel;
|
156
146
|
//# sourceMappingURL=odata-response.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"odata-response.js","sourceRoot":"","sources":["../../src/sbvr-api/odata-response.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"odata-response.js","sourceRoot":"","sources":["../../src/sbvr-api/odata-response.ts"],"names":[],"mappings":"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"}
|
@@ -1,11 +1,11 @@
|
|
1
|
-
import type AuthModel from './user';
|
2
|
-
import './express-extension';
|
3
|
-
import type
|
4
|
-
import type { Tx } from '../database-layer/db';
|
5
|
-
import type { ApiKey, User } from '../sbvr-api/sbvr-utils';
|
6
|
-
import { type HookReq } from './hooks';
|
7
|
-
import { PermissionError, PermissionParsingError } from './errors';
|
8
|
-
import { type ODataRequest } from './uri-parser';
|
1
|
+
import type AuthModel from './user.js';
|
2
|
+
import './express-extension.js';
|
3
|
+
import type Express from 'express';
|
4
|
+
import type { Tx } from '../database-layer/db.js';
|
5
|
+
import type { ApiKey, User } from '../sbvr-api/sbvr-utils.js';
|
6
|
+
import { type HookReq } from './hooks.js';
|
7
|
+
import { PermissionError, PermissionParsingError } from './errors.js';
|
8
|
+
import { type ODataRequest } from './uri-parser.js';
|
9
9
|
export { PermissionError, PermissionParsingError };
|
10
10
|
export interface PermissionReq {
|
11
11
|
user?: User;
|
@@ -53,7 +53,7 @@ export declare const checkPermissionsMiddleware: (action: PermissionCheck) => Ex
|
|
53
53
|
export declare const addPermissions: (req: PermissionReq, request: ODataRequest & {
|
54
54
|
permissionType?: PermissionCheck;
|
55
55
|
}) => Promise<void>;
|
56
|
-
declare module './sbvr-utils' {
|
56
|
+
declare module './sbvr-utils.js' {
|
57
57
|
interface API {
|
58
58
|
[authModelConfig.apiRoot]: PinejsClient<AuthModel>;
|
59
59
|
}
|