@balena/pinejs 16.0.0-build-renovate-node-20-x-75618baf99d03609741d31966f68baf212158bf5-1 → 16.0.0-build-renovate-node-20-x-c49001b18d762a7bdcb63a334500a94b797847ca-1
Sign up to get free protection for your applications and to get access to all the features.
- package/.versionbot/CHANGELOG.yml +34 -2
- package/CHANGELOG.md +12 -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/package.json +6 -2
- package/src/migrator/sync.ts +26 -1
- package/src/migrator/utils.ts +0 -28
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
- commits:
|
|
2
2
|
- subject: Update Node.js to v20
|
|
3
|
-
hash:
|
|
3
|
+
hash: c49001b18d762a7bdcb63a334500a94b797847ca
|
|
4
4
|
body: |
|
|
5
5
|
Update node from 16 to 20
|
|
6
6
|
footer:
|
|
@@ -10,7 +10,39 @@
|
|
|
10
10
|
nested: []
|
|
11
11
|
version: 16.0.0
|
|
12
12
|
title: ""
|
|
13
|
-
date: 2023-06-
|
|
13
|
+
date: 2023-06-27T16:04:18.035Z
|
|
14
|
+
- commits:
|
|
15
|
+
- subject: Add transaction cancelation tests for properly hooked custom endpoints
|
|
16
|
+
hash: dfe17f5933b2da276633ee713de5c2a0d714b656
|
|
17
|
+
body: ""
|
|
18
|
+
footer:
|
|
19
|
+
Change-type: patch
|
|
20
|
+
change-type: patch
|
|
21
|
+
author: Thodoris Greasidis
|
|
22
|
+
nested: []
|
|
23
|
+
- subject: Add OData request transaction cancelation tests
|
|
24
|
+
hash: e6a3cb5d9b6b0be45ae77f6217d4112b6c5fa0a7
|
|
25
|
+
body: ""
|
|
26
|
+
footer:
|
|
27
|
+
Change-type: patch
|
|
28
|
+
change-type: patch
|
|
29
|
+
author: Thodoris Greasidis
|
|
30
|
+
nested: []
|
|
31
|
+
version: 15.0.4
|
|
32
|
+
title: ""
|
|
33
|
+
date: 2023-06-27T15:50:39.665Z
|
|
34
|
+
- commits:
|
|
35
|
+
- subject: Fix pinejs 15 migrations for the migrations model
|
|
36
|
+
hash: 2705ae109fdef70777a38aa1000d117c32b84d2f
|
|
37
|
+
body: ""
|
|
38
|
+
footer:
|
|
39
|
+
Change-type: patch
|
|
40
|
+
change-type: patch
|
|
41
|
+
author: Pagan Gazzard
|
|
42
|
+
nested: []
|
|
43
|
+
version: 15.0.3
|
|
44
|
+
title: ""
|
|
45
|
+
date: 2023-06-15T12:32:07.075Z
|
|
14
46
|
- commits:
|
|
15
47
|
- subject: Update TypeScript to 5.1.3
|
|
16
48
|
hash: 67487ebc958401c7b20dc3b4052f2374b36548c4
|
package/CHANGELOG.md
CHANGED
|
@@ -5,10 +5,21 @@ automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
|
|
|
5
5
|
This project adheres to [Semantic Versioning](http://semver.org/).
|
|
6
6
|
|
|
7
7
|
# v16.0.0
|
|
8
|
-
## (2023-06-
|
|
8
|
+
## (2023-06-27)
|
|
9
9
|
|
|
10
10
|
* Update Node.js to v20 [Self-hosted Renovate Bot]
|
|
11
11
|
|
|
12
|
+
# v15.0.4
|
|
13
|
+
## (2023-06-27)
|
|
14
|
+
|
|
15
|
+
* Add transaction cancelation tests for properly hooked custom endpoints [Thodoris Greasidis]
|
|
16
|
+
* Add OData request transaction cancelation tests [Thodoris Greasidis]
|
|
17
|
+
|
|
18
|
+
# v15.0.3
|
|
19
|
+
## (2023-06-15)
|
|
20
|
+
|
|
21
|
+
* Fix pinejs 15 migrations for the migrations model [Pagan Gazzard]
|
|
22
|
+
|
|
12
23
|
# v15.0.2
|
|
13
24
|
## (2023-06-02)
|
|
14
25
|
|
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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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@balena/pinejs",
|
|
3
|
-
"version": "16.0.0-build-renovate-node-20-x-
|
|
3
|
+
"version": "16.0.0-build-renovate-node-20-x-c49001b18d762a7bdcb63a334500a94b797847ca-1",
|
|
4
4
|
"main": "out/server-glue/module",
|
|
5
5
|
"repository": "git@github.com:balena-io/pinejs.git",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -67,6 +67,8 @@
|
|
|
67
67
|
"@types/chai-as-promised": "^7.1.5",
|
|
68
68
|
"@types/grunt": "^0.4.27",
|
|
69
69
|
"@types/mocha": "^10.0.1",
|
|
70
|
+
"@types/on-finished": "^2.3.1",
|
|
71
|
+
"@types/request": "^2.48.8",
|
|
70
72
|
"@types/supertest": "^2.0.12",
|
|
71
73
|
"@types/terser-webpack-plugin": "^5.2.0",
|
|
72
74
|
"@types/webpack": "^5.28.1",
|
|
@@ -86,8 +88,10 @@
|
|
|
86
88
|
"lint-staged": "^13.2.2",
|
|
87
89
|
"load-grunt-tasks": "^5.1.0",
|
|
88
90
|
"mocha": "^10.2.0",
|
|
91
|
+
"on-finished": "^2.4.1",
|
|
89
92
|
"pinejs-client-supertest": "^1.4.0",
|
|
90
93
|
"raw-loader": "^4.0.2",
|
|
94
|
+
"request": "^2.88.2",
|
|
91
95
|
"require-npm4-to-publish": "^1.0.0",
|
|
92
96
|
"supertest": "^6.3.3",
|
|
93
97
|
"terser-webpack-plugin": "^5.3.7",
|
|
@@ -134,6 +138,6 @@
|
|
|
134
138
|
"recursive": true
|
|
135
139
|
},
|
|
136
140
|
"versionist": {
|
|
137
|
-
"publishedAt": "2023-06-
|
|
141
|
+
"publishedAt": "2023-06-27T16:04:19.037Z"
|
|
138
142
|
}
|
|
139
143
|
}
|
package/src/migrator/sync.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import {
|
|
2
|
-
modelText,
|
|
3
2
|
MigrationTuple,
|
|
4
3
|
MigrationError,
|
|
5
4
|
setExecutedMigrations,
|
|
@@ -15,6 +14,9 @@ import type { Config, Model } from '../config-loader/config-loader';
|
|
|
15
14
|
import * as _ from 'lodash';
|
|
16
15
|
import * as sbvrUtils from '../sbvr-api/sbvr-utils';
|
|
17
16
|
|
|
17
|
+
// tslint:disable-next-line:no-var-requires
|
|
18
|
+
const modelText = require('./migrations.sbvr');
|
|
19
|
+
|
|
18
20
|
type ApiRootModel = Model & { apiRoot: string };
|
|
19
21
|
|
|
20
22
|
export const postRun = async (tx: Tx, model: ApiRootModel): Promise<void> => {
|
|
@@ -146,6 +148,29 @@ export const config: Config = {
|
|
|
146
148
|
ALTER TABLE "migration lock"
|
|
147
149
|
ADD COLUMN IF NOT EXISTS "modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL;
|
|
148
150
|
`,
|
|
151
|
+
'15.0.0-data-types': async (tx, { db }) => {
|
|
152
|
+
switch (db.engine) {
|
|
153
|
+
case 'mysql':
|
|
154
|
+
await tx.executeSql(`\
|
|
155
|
+
ALTER TABLE "migration"
|
|
156
|
+
MODIFY "executed migrations" JSON NOT NULL;`);
|
|
157
|
+
await tx.executeSql(`\
|
|
158
|
+
ALTER TABLE "migration status"
|
|
159
|
+
MODIFY "is backing off" BOOLEAN NOT NULL;`);
|
|
160
|
+
break;
|
|
161
|
+
case 'postgres':
|
|
162
|
+
await tx.executeSql(`\
|
|
163
|
+
ALTER TABLE "migration"
|
|
164
|
+
ALTER COLUMN "executed migrations" SET DATA TYPE JSONB USING "executed migrations"::JSONB;`);
|
|
165
|
+
await tx.executeSql(`\
|
|
166
|
+
ALTER TABLE "migration status"
|
|
167
|
+
ALTER COLUMN "is backing off" DROP DEFAULT,
|
|
168
|
+
ALTER COLUMN "is backing off" SET DATA TYPE BOOLEAN USING "is backing off"::BOOLEAN,
|
|
169
|
+
ALTER COLUMN "is backing off" SET DEFAULT FALSE;`);
|
|
170
|
+
break;
|
|
171
|
+
// No need to migrate for websql
|
|
172
|
+
}
|
|
173
|
+
},
|
|
149
174
|
},
|
|
150
175
|
},
|
|
151
176
|
],
|
package/src/migrator/utils.ts
CHANGED
|
@@ -10,34 +10,6 @@ export { migrator as migratorEnv } from '../config-loader/env';
|
|
|
10
10
|
import { PINEJS_ADVISORY_LOCK } from '../config-loader/env';
|
|
11
11
|
import { delay } from '../sbvr-api/control-flow';
|
|
12
12
|
|
|
13
|
-
// tslint:disable-next-line:no-var-requires
|
|
14
|
-
export const modelText = require('./migrations.sbvr');
|
|
15
|
-
export const migrations: Migrations = {
|
|
16
|
-
'15.0.0-data-types': async (tx, { db }) => {
|
|
17
|
-
switch (db.engine) {
|
|
18
|
-
case 'mysql':
|
|
19
|
-
await tx.executeSql(`\
|
|
20
|
-
ALTER TABLE "migration"
|
|
21
|
-
MODIFY "executed migrations" JSON NOT NULL;`);
|
|
22
|
-
await tx.executeSql(`\
|
|
23
|
-
ALTER TABLE "migration status"
|
|
24
|
-
MODIFY "is backing off" BOOLEAN NOT NULL;`);
|
|
25
|
-
break;
|
|
26
|
-
case 'postgres':
|
|
27
|
-
await tx.executeSql(`\
|
|
28
|
-
ALTER TABLE "migration"
|
|
29
|
-
ALTER COLUMN "executed migrations" SET DATA TYPE JSONB USING "executed migrations"::JSONB;`);
|
|
30
|
-
await tx.executeSql(`\
|
|
31
|
-
ALTER TABLE "migration status"
|
|
32
|
-
ALTER COLUMN "is backing off" DROP DEFAULT,
|
|
33
|
-
ALTER COLUMN "is backing off" SET DATA TYPE BOOLEAN USING "is backing off"::BOOLEAN,
|
|
34
|
-
ALTER COLUMN "is backing off" SET DEFAULT FALSE;`);
|
|
35
|
-
break;
|
|
36
|
-
// No need to migrate for websql
|
|
37
|
-
}
|
|
38
|
-
},
|
|
39
|
-
};
|
|
40
|
-
|
|
41
13
|
import * as sbvrUtils from '../sbvr-api/sbvr-utils';
|
|
42
14
|
export enum MigrationCategories {
|
|
43
15
|
'sync' = 'sync',
|