@balena/pinejs 19.6.3-build-renovate-postgres-17-x-f5a8c2799409a8f19cee7abb50046fec9eff9544-1 → 19.6.3-build-use-translate-model-62dabf733348b2f82549264d63380555d7d61eb7-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/.versionbot/CHANGELOG.yml +13 -6
- package/CHANGELOG.md +2 -2
- package/docker-compose.npm-test.yml +1 -1
- package/out/sbvr-api/translations.js +7 -7
- package/out/sbvr-api/translations.js.map +1 -1
- package/package.json +2 -2
- package/src/migrator/migrations.ts +1 -1
- package/src/sbvr-api/dev.ts +1 -1
- package/src/sbvr-api/translations.ts +10 -12
- package/src/sbvr-api/user.ts +1 -1
- package/src/tasks/tasks.ts +1 -1
|
@@ -1,16 +1,23 @@
|
|
|
1
1
|
- commits:
|
|
2
|
-
- subject:
|
|
3
|
-
hash:
|
|
4
|
-
body:
|
|
5
|
-
|
|
2
|
+
- subject: Use translationAbstractSqlModel for resolving translations
|
|
3
|
+
hash: 62dabf733348b2f82549264d63380555d7d61eb7
|
|
4
|
+
body: >
|
|
5
|
+
This is necessary because the `fromAbstractSqlModel` (here renamed to
|
|
6
|
+
translationAbstractSqlModel)
|
|
7
|
+
|
|
8
|
+
will actually contain both the unaliased fromResource and aliased
|
|
9
|
+
toResource where the previous
|
|
10
|
+
|
|
11
|
+
approach of passing only `toResource` might not contain the aliased
|
|
12
|
+
toResource
|
|
6
13
|
footer:
|
|
7
14
|
Change-type: patch
|
|
8
15
|
change-type: patch
|
|
9
|
-
author:
|
|
16
|
+
author: Otavio Jacobi
|
|
10
17
|
nested: []
|
|
11
18
|
version: 19.6.3
|
|
12
19
|
title: ""
|
|
13
|
-
date: 2024-12-
|
|
20
|
+
date: 2024-12-04T14:55:04.304Z
|
|
14
21
|
- commits:
|
|
15
22
|
- subject: Update dependency @balena/lf-to-abstract-sql to 5.0.3
|
|
16
23
|
hash: 90c78095c8d41245f69ae6c56de6054034f06d12
|
package/CHANGELOG.md
CHANGED
|
@@ -5,9 +5,9 @@ automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
|
|
|
5
5
|
This project adheres to [Semantic Versioning](http://semver.org/).
|
|
6
6
|
|
|
7
7
|
# v19.6.3
|
|
8
|
-
## (2024-12-
|
|
8
|
+
## (2024-12-04)
|
|
9
9
|
|
|
10
|
-
*
|
|
10
|
+
* Use translationAbstractSqlModel for resolving translations [Otavio Jacobi]
|
|
11
11
|
|
|
12
12
|
# v19.6.2
|
|
13
13
|
## (2024-12-03)
|
|
@@ -5,13 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.translateAbstractSqlModel = void 0;
|
|
7
7
|
const lodash_1 = __importDefault(require("lodash"));
|
|
8
|
-
const aliasFields = (
|
|
9
|
-
const fromFieldNames =
|
|
8
|
+
const aliasFields = (translationAbstractSqlModel, fromResourceName, toResource, aliases) => {
|
|
9
|
+
const fromFieldNames = translationAbstractSqlModel.tables[fromResourceName].fields.map(({ fieldName }) => fieldName);
|
|
10
10
|
const nonexistentFields = lodash_1.default.difference(Object.keys(aliases), fromFieldNames);
|
|
11
11
|
if (nonexistentFields.length > 0) {
|
|
12
12
|
throw new Error(`Tried to alias non-existent fields: '${nonexistentFields.join(', ')}'`);
|
|
13
13
|
}
|
|
14
|
-
const toFieldNames =
|
|
14
|
+
const toFieldNames = translationAbstractSqlModel.tables[toResource].fields.map(({ fieldName }) => fieldName);
|
|
15
15
|
const checkToFieldExists = (fromFieldName, toFieldName) => {
|
|
16
16
|
if (!toFieldNames.includes(toFieldName)) {
|
|
17
17
|
throw new Error(`Tried to alias '${fromFieldName}' to the non-existent target field: '${toFieldName}'`);
|
|
@@ -34,8 +34,8 @@ const aliasFields = (fromAbstractSqlModel, toAbstractSqlModel, fromResourceName,
|
|
|
34
34
|
return ['ReferencedField', fromResourceName, fieldName];
|
|
35
35
|
});
|
|
36
36
|
};
|
|
37
|
-
const aliasResource = (
|
|
38
|
-
if (!
|
|
37
|
+
const aliasResource = (translationAbstractSqlModel, fromResourceName, toResource, aliases) => {
|
|
38
|
+
if (!translationAbstractSqlModel.tables[toResource]) {
|
|
39
39
|
throw new Error(`Tried to alias to a non-existent resource: ${toResource}`);
|
|
40
40
|
}
|
|
41
41
|
return {
|
|
@@ -43,7 +43,7 @@ const aliasResource = (fromAbstractSqlModel, toAbstractSqlModel, fromResourceNam
|
|
|
43
43
|
'SelectQuery',
|
|
44
44
|
[
|
|
45
45
|
'Select',
|
|
46
|
-
aliasFields(
|
|
46
|
+
aliasFields(translationAbstractSqlModel, fromResourceName, toResource, aliases),
|
|
47
47
|
],
|
|
48
48
|
['From', ['Alias', ['Resource', toResource], fromResourceName]],
|
|
49
49
|
],
|
|
@@ -154,7 +154,7 @@ const translateAbstractSqlModel = (fromAbstractSqlModel, toAbstractSqlModel, fro
|
|
|
154
154
|
table.definition = definition;
|
|
155
155
|
}
|
|
156
156
|
else {
|
|
157
|
-
table.definition = aliasResource(fromAbstractSqlModel,
|
|
157
|
+
table.definition = aliasResource(fromAbstractSqlModel, key, aliasedToResource, definition);
|
|
158
158
|
}
|
|
159
159
|
}
|
|
160
160
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"translations.js","sourceRoot":"","sources":["../../src/sbvr-api/translations.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AAyBvB,MAAM,WAAW,GAAG,CACnB,
|
|
1
|
+
{"version":3,"file":"translations.js","sourceRoot":"","sources":["../../src/sbvr-api/translations.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@balena/pinejs",
|
|
3
|
-
"version": "19.6.3-build-
|
|
3
|
+
"version": "19.6.3-build-use-translate-model-62dabf733348b2f82549264d63380555d7d61eb7-1",
|
|
4
4
|
"main": "out/server-glue/module",
|
|
5
5
|
"type": "commonjs",
|
|
6
6
|
"repository": "git@github.com:balena-io/pinejs.git",
|
|
@@ -147,6 +147,6 @@
|
|
|
147
147
|
"recursive": true
|
|
148
148
|
},
|
|
149
149
|
"versionist": {
|
|
150
|
-
"publishedAt": "2024-12-
|
|
150
|
+
"publishedAt": "2024-12-04T14:55:05.206Z"
|
|
151
151
|
}
|
|
152
152
|
}
|
package/src/sbvr-api/dev.ts
CHANGED
|
@@ -24,13 +24,12 @@ export type AliasValidNodeType =
|
|
|
24
24
|
| UnknownTypeNodes
|
|
25
25
|
| NullNode;
|
|
26
26
|
const aliasFields = (
|
|
27
|
-
|
|
28
|
-
toAbstractSqlModel: AbstractSqlModel,
|
|
27
|
+
translationAbstractSqlModel: AbstractSqlModel,
|
|
29
28
|
fromResourceName: string,
|
|
30
29
|
toResource: string,
|
|
31
30
|
aliases: Dictionary<string | AliasValidNodeType>,
|
|
32
31
|
): SelectNode[1] => {
|
|
33
|
-
const fromFieldNames =
|
|
32
|
+
const fromFieldNames = translationAbstractSqlModel.tables[
|
|
34
33
|
fromResourceName
|
|
35
34
|
].fields.map(({ fieldName }) => fieldName);
|
|
36
35
|
const nonexistentFields = _.difference(Object.keys(aliases), fromFieldNames);
|
|
@@ -39,9 +38,9 @@ const aliasFields = (
|
|
|
39
38
|
`Tried to alias non-existent fields: '${nonexistentFields.join(', ')}'`,
|
|
40
39
|
);
|
|
41
40
|
}
|
|
42
|
-
const toFieldNames =
|
|
43
|
-
|
|
44
|
-
);
|
|
41
|
+
const toFieldNames = translationAbstractSqlModel.tables[
|
|
42
|
+
toResource
|
|
43
|
+
].fields.map(({ fieldName }) => fieldName);
|
|
45
44
|
const checkToFieldExists = (fromFieldName: string, toFieldName: string) => {
|
|
46
45
|
if (!toFieldNames.includes(toFieldName)) {
|
|
47
46
|
throw new Error(
|
|
@@ -70,13 +69,12 @@ const aliasFields = (
|
|
|
70
69
|
};
|
|
71
70
|
|
|
72
71
|
const aliasResource = (
|
|
73
|
-
|
|
74
|
-
toAbstractSqlModel: AbstractSqlModel,
|
|
72
|
+
translationAbstractSqlModel: AbstractSqlModel,
|
|
75
73
|
fromResourceName: string,
|
|
76
74
|
toResource: string,
|
|
77
75
|
aliases: Dictionary<string | AliasValidNodeType>,
|
|
78
76
|
): Definition => {
|
|
79
|
-
if (!
|
|
77
|
+
if (!translationAbstractSqlModel.tables[toResource]) {
|
|
80
78
|
throw new Error(`Tried to alias to a non-existent resource: ${toResource}`);
|
|
81
79
|
}
|
|
82
80
|
return {
|
|
@@ -85,8 +83,7 @@ const aliasResource = (
|
|
|
85
83
|
[
|
|
86
84
|
'Select',
|
|
87
85
|
aliasFields(
|
|
88
|
-
|
|
89
|
-
toAbstractSqlModel,
|
|
86
|
+
translationAbstractSqlModel,
|
|
90
87
|
fromResourceName,
|
|
91
88
|
toResource,
|
|
92
89
|
aliases,
|
|
@@ -247,8 +244,9 @@ export const translateAbstractSqlModel = (
|
|
|
247
244
|
table.definition = definition;
|
|
248
245
|
} else {
|
|
249
246
|
table.definition = aliasResource(
|
|
247
|
+
// fromAbstractSqlModel is the translation model as it contains
|
|
248
|
+
// both the unaliased fromResource and the aliased toResource
|
|
250
249
|
fromAbstractSqlModel,
|
|
251
|
-
toAbstractSqlModel,
|
|
252
250
|
key,
|
|
253
251
|
aliasedToResource,
|
|
254
252
|
definition,
|
package/src/sbvr-api/user.ts
CHANGED
package/src/tasks/tasks.ts
CHANGED