@balena/pinejs 15.1.0-build-web-resource-4-60a3313d5465335b98b5a93fdfa92d801e914f5a-4 → 15.1.0-build-update-Updatepinejs-client-core-9757808e1422074b805c57fd5b629f5b3ef6f779-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 +70 -12
- package/CHANGELOG.md +33 -3
- package/README.md +0 -10
- package/bin/abstract-sql-compiler.js +0 -0
- package/bin/odata-compiler.js +0 -0
- package/bin/sbvr-compiler.js +0 -0
- package/docker-compose.npm-test.yml +1 -22
- package/out/config-loader/config-loader.d.ts +0 -2
- package/out/config-loader/config-loader.js +2 -13
- package/out/config-loader/config-loader.js.map +1 -1
- package/out/migrator/sync.js +24 -1
- package/out/migrator/sync.js.map +1 -1
- package/out/migrator/utils.d.ts +0 -2
- package/out/migrator/utils.js +1 -26
- package/out/migrator/utils.js.map +1 -1
- package/out/sbvr-api/sbvr-utils.d.ts +2 -6
- package/out/sbvr-api/sbvr-utils.js +2 -11
- package/out/sbvr-api/sbvr-utils.js.map +1 -1
- package/out/server-glue/server.js +2 -0
- package/out/server-glue/server.js.map +1 -1
- package/package.json +17 -18
- package/src/config-loader/config-loader.ts +2 -27
- package/src/migrator/sync.ts +26 -1
- package/src/migrator/utils.ts +0 -28
- package/src/sbvr-api/sbvr-utils.ts +1 -10
- package/src/server-glue/server.ts +3 -0
- package/out/server-glue/webresource-handler.d.ts +0 -28
- package/out/server-glue/webresource-handler.js +0 -236
- package/out/server-glue/webresource-handler.js.map +0 -1
- package/out/server-glue/webresource-handlers/NoopHandler.d.ts +0 -5
- package/out/server-glue/webresource-handlers/NoopHandler.js +0 -17
- package/out/server-glue/webresource-handlers/NoopHandler.js.map +0 -1
- package/out/server-glue/webresource-handlers/S3Handler.d.ts +0 -12
- package/out/server-glue/webresource-handlers/S3Handler.js +0 -72
- package/out/server-glue/webresource-handlers/S3Handler.js.map +0 -1
- package/src/server-glue/webresource-handler.ts +0 -344
- package/src/server-glue/webresource-handlers/NoopHandler.ts +0 -20
- package/src/server-glue/webresource-handlers/S3Handler.ts +0 -101
|
@@ -1,26 +1,84 @@
|
|
|
1
1
|
- commits:
|
|
2
|
-
- subject:
|
|
3
|
-
hash:
|
|
4
|
-
body:
|
|
2
|
+
- subject: Update pinejs-client-core to 6.13.0
|
|
3
|
+
hash: 9757808e1422074b805c57fd5b629f5b3ef6f779
|
|
4
|
+
body: |
|
|
5
|
+
Update pinejs-client-core from 6.12.3 to 6.13.0
|
|
5
6
|
footer:
|
|
6
7
|
Change-type: minor
|
|
7
8
|
change-type: minor
|
|
8
|
-
author:
|
|
9
|
+
author: Thodoris Greasidis
|
|
10
|
+
nested:
|
|
11
|
+
- commits:
|
|
12
|
+
- subject: Add support for $duration
|
|
13
|
+
hash: 05edeeea86147ac49dd864ae6e0b46ffc73f6fc4
|
|
14
|
+
body: ""
|
|
15
|
+
footer:
|
|
16
|
+
Change-type: minor
|
|
17
|
+
change-type: minor
|
|
18
|
+
author: Thodoris Greasidis
|
|
19
|
+
nested: []
|
|
20
|
+
version: pinejs-client-js-6.13.0
|
|
21
|
+
title: ""
|
|
22
|
+
date: 2023-07-11T13:16:05.245Z
|
|
23
|
+
- commits:
|
|
24
|
+
- subject: Avoid an unnecessary function creation on each get() call
|
|
25
|
+
hash: 782e43ef40a22fa4c8e0f3d64917b03e07c77522
|
|
26
|
+
body: ""
|
|
27
|
+
footer:
|
|
28
|
+
Change-type: patch
|
|
29
|
+
change-type: patch
|
|
30
|
+
author: Thodoris Greasidis
|
|
31
|
+
nested: []
|
|
32
|
+
version: pinejs-client-js-6.12.4
|
|
33
|
+
title: ""
|
|
34
|
+
date: 2023-05-09T13:11:13.136Z
|
|
35
|
+
version: 15.1.0
|
|
36
|
+
title: ""
|
|
37
|
+
date: 2023-07-11T13:55:18.866Z
|
|
38
|
+
- commits:
|
|
39
|
+
- subject: Mark the bin scripts as executable
|
|
40
|
+
hash: b530c6d4f5c599e517345084f2db3c544118186e
|
|
41
|
+
body: ""
|
|
42
|
+
footer:
|
|
43
|
+
Change-type: patch
|
|
44
|
+
change-type: patch
|
|
45
|
+
author: Thodoris Greasidis
|
|
9
46
|
nested: []
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
47
|
+
version: 15.0.5
|
|
48
|
+
title: ""
|
|
49
|
+
date: 2023-07-07T15:40:24.029Z
|
|
50
|
+
- commits:
|
|
51
|
+
- subject: Add transaction cancelation tests for properly hooked custom endpoints
|
|
52
|
+
hash: dfe17f5933b2da276633ee713de5c2a0d714b656
|
|
13
53
|
body: ""
|
|
14
54
|
footer:
|
|
15
55
|
Change-type: patch
|
|
16
56
|
change-type: patch
|
|
17
|
-
|
|
18
|
-
signed-off-by: Ramiro Gonzalez <ramiro.gonzalez@balena.io>
|
|
19
|
-
author: Ramiro González Maciel
|
|
57
|
+
author: Thodoris Greasidis
|
|
20
58
|
nested: []
|
|
21
|
-
|
|
59
|
+
- subject: Add OData request transaction cancelation tests
|
|
60
|
+
hash: e6a3cb5d9b6b0be45ae77f6217d4112b6c5fa0a7
|
|
61
|
+
body: ""
|
|
62
|
+
footer:
|
|
63
|
+
Change-type: patch
|
|
64
|
+
change-type: patch
|
|
65
|
+
author: Thodoris Greasidis
|
|
66
|
+
nested: []
|
|
67
|
+
version: 15.0.4
|
|
68
|
+
title: ""
|
|
69
|
+
date: 2023-06-27T15:50:39.665Z
|
|
70
|
+
- commits:
|
|
71
|
+
- subject: Fix pinejs 15 migrations for the migrations model
|
|
72
|
+
hash: 2705ae109fdef70777a38aa1000d117c32b84d2f
|
|
73
|
+
body: ""
|
|
74
|
+
footer:
|
|
75
|
+
Change-type: patch
|
|
76
|
+
change-type: patch
|
|
77
|
+
author: Pagan Gazzard
|
|
78
|
+
nested: []
|
|
79
|
+
version: 15.0.3
|
|
22
80
|
title: ""
|
|
23
|
-
date: 2023-06-
|
|
81
|
+
date: 2023-06-15T12:32:07.075Z
|
|
24
82
|
- commits:
|
|
25
83
|
- subject: Update TypeScript to 5.1.3
|
|
26
84
|
hash: 67487ebc958401c7b20dc3b4052f2374b36548c4
|
package/CHANGELOG.md
CHANGED
|
@@ -5,10 +5,40 @@ automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
|
|
|
5
5
|
This project adheres to [Semantic Versioning](http://semver.org/).
|
|
6
6
|
|
|
7
7
|
# v15.1.0
|
|
8
|
-
## (2023-
|
|
8
|
+
## (2023-07-11)
|
|
9
9
|
|
|
10
|
-
|
|
11
|
-
|
|
10
|
+
|
|
11
|
+
<details>
|
|
12
|
+
<summary> Update pinejs-client-core to 6.13.0 [Thodoris Greasidis] </summary>
|
|
13
|
+
|
|
14
|
+
> ## pinejs-client-js-6.13.0
|
|
15
|
+
> ### (2023-07-11)
|
|
16
|
+
>
|
|
17
|
+
> * Add support for $duration [Thodoris Greasidis]
|
|
18
|
+
>
|
|
19
|
+
> ## pinejs-client-js-6.12.4
|
|
20
|
+
> ### (2023-05-09)
|
|
21
|
+
>
|
|
22
|
+
> * Avoid an unnecessary function creation on each get() call [Thodoris Greasidis]
|
|
23
|
+
>
|
|
24
|
+
|
|
25
|
+
</details>
|
|
26
|
+
|
|
27
|
+
# v15.0.5
|
|
28
|
+
## (2023-07-07)
|
|
29
|
+
|
|
30
|
+
* Mark the bin scripts as executable [Thodoris Greasidis]
|
|
31
|
+
|
|
32
|
+
# v15.0.4
|
|
33
|
+
## (2023-06-27)
|
|
34
|
+
|
|
35
|
+
* Add transaction cancelation tests for properly hooked custom endpoints [Thodoris Greasidis]
|
|
36
|
+
* Add OData request transaction cancelation tests [Thodoris Greasidis]
|
|
37
|
+
|
|
38
|
+
# v15.0.3
|
|
39
|
+
## (2023-06-15)
|
|
40
|
+
|
|
41
|
+
* Fix pinejs 15 migrations for the migrations model [Pagan Gazzard]
|
|
12
42
|
|
|
13
43
|
# v15.0.2
|
|
14
44
|
## (2023-06-02)
|
package/README.md
CHANGED
|
@@ -59,13 +59,3 @@ One can experiment with Pine.js, its main dependencies and the above tools insid
|
|
|
59
59
|
|
|
60
60
|
### Where to go from here:
|
|
61
61
|
Start by creating your very first application with Pine.js. Jump to the [Getting Started guide](https://github.com/balena-io/pinejs/blob/master/docs/GettingStarted.md).
|
|
62
|
-
|
|
63
|
-
## Storing files and other large objects
|
|
64
|
-
|
|
65
|
-
An application can choose between two types to save file content or another large object: `File` or `WebResource`. When using a `File`, PineJS saves the content in the database using a binary data type like `BYTEA` or `BLOB`. When using a `WebResource`, PineJS saves the binary content on an external storage service and then writes metadata, including the content public URL, to the database. Client apps use the `WebResource` `href` to get the content.
|
|
66
|
-
|
|
67
|
-
Please note that `WebResource` is still a work in progress and as such as a few limitations. Such as (but not exclusively):
|
|
68
|
-
|
|
69
|
-
- Files stored are currently only STANDARD public-read on buckets
|
|
70
|
-
- Deletion of a file may fail and will require to manually delete the file from S3
|
|
71
|
-
|
|
File without changes
|
package/bin/odata-compiler.js
CHANGED
|
File without changes
|
package/bin/sbvr-compiler.js
CHANGED
|
File without changes
|
|
@@ -8,25 +8,4 @@ services:
|
|
|
8
8
|
POSTGRES_PASSWORD: docker
|
|
9
9
|
POSTGRES_DB: postgres
|
|
10
10
|
ports:
|
|
11
|
-
- "5431:5432"
|
|
12
|
-
minio-server:
|
|
13
|
-
image: minio/minio
|
|
14
|
-
restart: always
|
|
15
|
-
environment:
|
|
16
|
-
MINIO_ROOT_USER: USERNAME
|
|
17
|
-
MINIO_ROOT_PASSWORD: PASSWORD
|
|
18
|
-
command: server /data --console-address ":9001"
|
|
19
|
-
ports:
|
|
20
|
-
- "43680:9000"
|
|
21
|
-
- "43697:9001"
|
|
22
|
-
minio-client:
|
|
23
|
-
image: minio/mc
|
|
24
|
-
depends_on:
|
|
25
|
-
- minio-server
|
|
26
|
-
entrypoint: >
|
|
27
|
-
/bin/sh -c "
|
|
28
|
-
/usr/bin/mc config host add minio-server http://minio-server:9000 USERNAME PASSWORD;
|
|
29
|
-
/usr/bin/mc mb --ignore-existing minio-server/balena-pine-web-resources;
|
|
30
|
-
/usr/bin/mc anonymous set download minio-server/balena-pine-web-resources;
|
|
31
|
-
exit 0;
|
|
32
|
-
"
|
|
11
|
+
- "5431:5432"
|
|
@@ -4,7 +4,6 @@ import type { Database } from '../database-layer/db';
|
|
|
4
4
|
import type { Dictionary, Resolvable } from '../sbvr-api/common-types';
|
|
5
5
|
import { Migrations } from '../migrator/utils';
|
|
6
6
|
import * as sbvrUtils from '../sbvr-api/sbvr-utils';
|
|
7
|
-
import { WebResourceHandler } from '../server-glue/webresource-handler';
|
|
8
7
|
import { AliasValidNodeType } from '../sbvr-api/translations';
|
|
9
8
|
export type SetupFunction = (app: Express.Application, sbvrUtilsInstance: typeof sbvrUtils, db: Database) => Resolvable<void>;
|
|
10
9
|
export interface Model {
|
|
@@ -25,7 +24,6 @@ export interface Model {
|
|
|
25
24
|
};
|
|
26
25
|
translateTo?: Model['apiRoot'];
|
|
27
26
|
translations?: Dictionary<Definition | Dictionary<string | AliasValidNodeType>>;
|
|
28
|
-
webResourceHandler?: WebResourceHandler;
|
|
29
27
|
}
|
|
30
28
|
export interface User {
|
|
31
29
|
username: string;
|
|
@@ -7,7 +7,6 @@ const _ = require("lodash");
|
|
|
7
7
|
const path = require("path");
|
|
8
8
|
const sbvrUtils = require("../sbvr-api/sbvr-utils");
|
|
9
9
|
const permissions = require("../sbvr-api/permissions");
|
|
10
|
-
const webresource_handler_1 = require("../server-glue/webresource-handler");
|
|
11
10
|
const getOrCreate = async (authApiTx, resource, uniqueFields, extraFields) => {
|
|
12
11
|
const result = (await authApiTx.get({
|
|
13
12
|
resource,
|
|
@@ -97,25 +96,15 @@ const setup = (app) => {
|
|
|
97
96
|
}
|
|
98
97
|
await sbvrUtils.executeModel(tx, model);
|
|
99
98
|
const apiRoute = `/${model.apiRoot}/*`;
|
|
100
|
-
const webResourceHandler = model.webResourceHandler ?? (0, webresource_handler_1.getDefaultHandler)();
|
|
101
|
-
const fileUploadMiddleware = (0, webresource_handler_1.getUploaderMiddlware)(webResourceHandler);
|
|
102
99
|
app
|
|
103
100
|
.route(apiRoute)
|
|
104
101
|
.options((_req, res) => res.status(200).end())
|
|
105
102
|
.get(sbvrUtils.handleODataRequest)
|
|
106
103
|
.put(sbvrUtils.handleODataRequest)
|
|
107
|
-
.post(
|
|
108
|
-
.patch(
|
|
104
|
+
.post(sbvrUtils.handleODataRequest)
|
|
105
|
+
.patch(sbvrUtils.handleODataRequest)
|
|
109
106
|
.merge(sbvrUtils.handleODataRequest)
|
|
110
107
|
.delete(sbvrUtils.handleODataRequest);
|
|
111
|
-
app.options(apiRoute, (_req, res) => res.status(200).end());
|
|
112
|
-
const loadedModel = sbvrUtils.getModel(model.apiRoot);
|
|
113
|
-
if (translateTo == null) {
|
|
114
|
-
const resources = Object.entries(loadedModel.abstractSql.tables).filter(([_resourceName, table]) => table.fields.some((f) => f.dataType === 'WebResource'));
|
|
115
|
-
for (const [resource, _table] of resources) {
|
|
116
|
-
(0, webresource_handler_1.setupUploadHooks)(webResourceHandler, model.apiRoot, resource);
|
|
117
|
-
}
|
|
118
|
-
}
|
|
119
108
|
console.info('Successfully executed ' + model.modelName + ' model.');
|
|
120
109
|
}
|
|
121
110
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-loader.js","sourceRoot":"","sources":["../../src/config-loader/config-loader.ts"],"names":[],"mappings":";;;AAaA,6CAO2B;AAE3B,yBAAyB;AACzB,4BAA4B;AAC5B,6BAA6B;AAE7B,oDAAoD;AAEpD,uDAAuD;
|
|
1
|
+
{"version":3,"file":"config-loader.js","sourceRoot":"","sources":["../../src/config-loader/config-loader.ts"],"names":[],"mappings":"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"}
|
package/out/migrator/sync.js
CHANGED
|
@@ -4,6 +4,7 @@ exports.config = exports.run = exports.postRun = void 0;
|
|
|
4
4
|
const utils_1 = require("./utils");
|
|
5
5
|
const _ = require("lodash");
|
|
6
6
|
const sbvrUtils = require("../sbvr-api/sbvr-utils");
|
|
7
|
+
const modelText = require('./migrations.sbvr');
|
|
7
8
|
const postRun = async (tx, model) => {
|
|
8
9
|
const { initSql } = model;
|
|
9
10
|
if (initSql == null) {
|
|
@@ -89,7 +90,7 @@ exports.config = {
|
|
|
89
90
|
{
|
|
90
91
|
modelName: 'migrations',
|
|
91
92
|
apiRoot: 'migrations',
|
|
92
|
-
modelText
|
|
93
|
+
modelText,
|
|
93
94
|
migrations: {
|
|
94
95
|
'11.0.0-modified-at': `
|
|
95
96
|
ALTER TABLE "migration"
|
|
@@ -99,6 +100,28 @@ exports.config = {
|
|
|
99
100
|
ALTER TABLE "migration lock"
|
|
100
101
|
ADD COLUMN IF NOT EXISTS "modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL;
|
|
101
102
|
`,
|
|
103
|
+
'15.0.0-data-types': async (tx, { db }) => {
|
|
104
|
+
switch (db.engine) {
|
|
105
|
+
case 'mysql':
|
|
106
|
+
await tx.executeSql(`\
|
|
107
|
+
ALTER TABLE "migration"
|
|
108
|
+
MODIFY "executed migrations" JSON NOT NULL;`);
|
|
109
|
+
await tx.executeSql(`\
|
|
110
|
+
ALTER TABLE "migration status"
|
|
111
|
+
MODIFY "is backing off" BOOLEAN NOT NULL;`);
|
|
112
|
+
break;
|
|
113
|
+
case 'postgres':
|
|
114
|
+
await tx.executeSql(`\
|
|
115
|
+
ALTER TABLE "migration"
|
|
116
|
+
ALTER COLUMN "executed migrations" SET DATA TYPE JSONB USING "executed migrations"::JSONB;`);
|
|
117
|
+
await tx.executeSql(`\
|
|
118
|
+
ALTER TABLE "migration status"
|
|
119
|
+
ALTER COLUMN "is backing off" DROP DEFAULT,
|
|
120
|
+
ALTER COLUMN "is backing off" SET DATA TYPE BOOLEAN USING "is backing off"::BOOLEAN,
|
|
121
|
+
ALTER COLUMN "is backing off" SET DEFAULT FALSE;`);
|
|
122
|
+
break;
|
|
123
|
+
}
|
|
124
|
+
},
|
|
102
125
|
},
|
|
103
126
|
},
|
|
104
127
|
],
|
package/out/migrator/sync.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/migrator/sync.ts"],"names":[],"mappings":";;;AAAA,
|
|
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
|
@@ -2,8 +2,6 @@ import type { Result, Tx } from '../database-layer/db';
|
|
|
2
2
|
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
|
-
export declare const modelText: any;
|
|
6
|
-
export declare const migrations: Migrations;
|
|
7
5
|
import * as sbvrUtils from '../sbvr-api/sbvr-utils';
|
|
8
6
|
export declare enum MigrationCategories {
|
|
9
7
|
'sync' = "sync",
|
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.
|
|
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.migratorEnv = void 0;
|
|
4
4
|
const crypto_1 = require("crypto");
|
|
5
5
|
const _ = require("lodash");
|
|
6
6
|
const typed_error_1 = require("typed-error");
|
|
@@ -9,31 +9,6 @@ var env_2 = require("../config-loader/env");
|
|
|
9
9
|
Object.defineProperty(exports, "migratorEnv", { enumerable: true, get: function () { return env_2.migrator; } });
|
|
10
10
|
const env_3 = require("../config-loader/env");
|
|
11
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
12
|
const sbvrUtils = require("../sbvr-api/sbvr-utils");
|
|
38
13
|
var MigrationCategories;
|
|
39
14
|
(function (MigrationCategories) {
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/migrator/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -69,13 +69,13 @@ export declare function generateModels(model: ExecutableModel, targetDatabaseEng
|
|
|
69
69
|
export declare const executeModel: (tx: Db.Tx, model: ExecutableModel) => Promise<void>;
|
|
70
70
|
export declare const executeModels: (tx: Db.Tx, execModels: ExecutableModel[]) => Promise<void>;
|
|
71
71
|
export declare const deleteModel: (vocabulary: string) => Promise<void>;
|
|
72
|
-
export declare const getID: (vocab: string, request: uriParser.ODataRequest) => string | number | boolean | string[] | Date | AbstractSQLCompiler.AbstractSqlQuery | AbstractSQLCompiler.DateNode | ["Bind", string | number] | AbstractSQLCompiler.BooleanNode | AbstractSQLCompiler.NumberNode | AbstractSQLCompiler.IntegerNode | AbstractSQLCompiler.RealNode | AbstractSQLCompiler.SubstringNode | AbstractSQLCompiler.
|
|
72
|
+
export declare const getID: (vocab: string, request: uriParser.ODataRequest) => string | number | boolean | string[] | Date | AbstractSQLCompiler.AbstractSqlQuery | AbstractSQLCompiler.DateNode | ["Bind", string | number] | AbstractSQLCompiler.BooleanNode | AbstractSQLCompiler.NumberNode | AbstractSQLCompiler.IntegerNode | AbstractSQLCompiler.RealNode | AbstractSQLCompiler.SubstringNode | AbstractSQLCompiler.SelectNode | AbstractSQLCompiler.InnerJoinNode | AbstractSQLCompiler.LeftJoinNode | AbstractSQLCompiler.RightJoinNode | AbstractSQLCompiler.FullJoinNode | AbstractSQLCompiler.GroupByNode | AbstractSQLCompiler.AnyTypeNodes[] | {
|
|
73
73
|
negative?: boolean | undefined;
|
|
74
74
|
day?: number | undefined;
|
|
75
75
|
hour?: number | undefined;
|
|
76
76
|
minute?: number | undefined;
|
|
77
77
|
second?: number | undefined;
|
|
78
|
-
} | AbstractSQLCompiler.ValuesNodeTypes[] |
|
|
78
|
+
} | AbstractSQLCompiler.ValuesNodeTypes[] | undefined;
|
|
79
79
|
export declare const runRule: (vocab: string, rule: string) => Promise<AnyObject>;
|
|
80
80
|
export type Passthrough = AnyObject & {
|
|
81
81
|
req?: {
|
|
@@ -105,10 +105,6 @@ export declare const getAbstractSqlModel: (request: Pick<uriParser.ODataRequest,
|
|
|
105
105
|
export declare const getAffectedIds: (args: HookArgs & {
|
|
106
106
|
tx: Db.Tx;
|
|
107
107
|
}) => Promise<number[]>;
|
|
108
|
-
export declare const getModel: (vocabulary: string) => CompiledModel & {
|
|
109
|
-
versions: string[];
|
|
110
|
-
};
|
|
111
|
-
export declare const getApiRoot: (req: Express.Request) => string | undefined;
|
|
112
108
|
export declare const handleODataRequest: Express.Handler;
|
|
113
109
|
declare const handleErrorFns: Array<(req: Express.Request, err: HttpError) => void>;
|
|
114
110
|
export declare const onHandleHttpError: (fn: (typeof handleErrorFns)[number]) => void;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.setup = exports.executeStandardModels = exports.handleHttpErrors = exports.onHandleHttpError = exports.handleODataRequest = exports.
|
|
3
|
+
exports.setup = exports.executeStandardModels = exports.handleHttpErrors = exports.onHandleHttpError = exports.handleODataRequest = exports.getAffectedIds = exports.getAbstractSqlModel = exports.runURI = exports.api = exports.PinejsClient = exports.runRule = exports.getID = exports.deleteModel = exports.executeModels = exports.executeModel = exports.generateModels = exports.generateSqlModel = exports.generateAbstractSqlModel = exports.generateLfModel = exports.validateModel = exports.isModelNew = exports.resolveNavigationResource = exports.resolveSynonym = exports.resolveOdataBind = exports.sbvrTypes = exports.db = exports.addSideEffectHook = exports.addPureHook = void 0;
|
|
4
4
|
const _ = require("lodash");
|
|
5
5
|
const cached_compile_1 = require("./cached-compile");
|
|
6
6
|
const AbstractSQLCompiler = require("@balena/abstract-sql-compiler");
|
|
@@ -669,10 +669,6 @@ const $getAffectedIds = async ({ req, request, tx, }) => {
|
|
|
669
669
|
}
|
|
670
670
|
return result.rows.map((row) => row[idField]);
|
|
671
671
|
};
|
|
672
|
-
const getModel = (vocabulary) => {
|
|
673
|
-
return models[vocabulary];
|
|
674
|
-
};
|
|
675
|
-
exports.getModel = getModel;
|
|
676
672
|
const runODataRequest = (req, vocabulary) => {
|
|
677
673
|
if (module_1.env.DEBUG) {
|
|
678
674
|
exports.api[vocabulary].logger.log('Parsing', req.method, req.url);
|
|
@@ -809,13 +805,8 @@ const runODataRequest = (req, vocabulary) => {
|
|
|
809
805
|
})(),
|
|
810
806
|
};
|
|
811
807
|
};
|
|
812
|
-
const getApiRoot = (req) => {
|
|
813
|
-
const [, apiRoot] = req.url.split('/', 2);
|
|
814
|
-
return apiRoot;
|
|
815
|
-
};
|
|
816
|
-
exports.getApiRoot = getApiRoot;
|
|
817
808
|
const handleODataRequest = async (req, res, next) => {
|
|
818
|
-
const apiRoot = (
|
|
809
|
+
const [, apiRoot] = req.url.split('/', 2);
|
|
819
810
|
if (apiRoot == null || models[apiRoot] == null) {
|
|
820
811
|
return next('route');
|
|
821
812
|
}
|