@balena/pinejs 18.1.2-build-clarify-to-resource-54b4f1d233fb8c8787e9c71769f8fb459624fb26-1 → 18.1.2-build-clarify-to-resource-05195b933c5ab77b69e82ef427a044eb3db54b2c-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.
|
@@ -1,7 +1,27 @@
|
|
|
1
1
|
- commits:
|
|
2
|
-
- subject:
|
|
3
|
-
hash:
|
|
2
|
+
- subject: Add tests for getIdField using idField of intermediate translation
|
|
3
|
+
hash: 05195b933c5ab77b69e82ef427a044eb3db54b2c
|
|
4
4
|
body: ""
|
|
5
|
+
footer:
|
|
6
|
+
Change-type: patch
|
|
7
|
+
change-type: patch
|
|
8
|
+
author: Otavio Jacobi
|
|
9
|
+
nested: []
|
|
10
|
+
- subject: "Translations: strip the version alias from renames when possible"
|
|
11
|
+
hash: c7b83174907e3227bab0c605662d206552ca6fc7
|
|
12
|
+
body: ""
|
|
13
|
+
footer:
|
|
14
|
+
Change-type: patch
|
|
15
|
+
change-type: patch
|
|
16
|
+
author: Pagan Gazzard
|
|
17
|
+
nested: []
|
|
18
|
+
- subject: "Translations: use the `toAbstractSqlModel` to fetch the `toTable` info"
|
|
19
|
+
hash: 459751aed7d20e53ee10efd7cc12c296f945ba7d
|
|
20
|
+
body: |
|
|
21
|
+
This should give the same result whenever the resource name has a
|
|
22
|
+
version suffix, however in the case it is unversioned then it should be
|
|
23
|
+
more correct as that will be the table it gets translated to for the
|
|
24
|
+
next version
|
|
5
25
|
footer:
|
|
6
26
|
Change-type: patch
|
|
7
27
|
change-type: patch
|
|
@@ -9,7 +29,7 @@
|
|
|
9
29
|
nested: []
|
|
10
30
|
version: 18.1.2
|
|
11
31
|
title: ""
|
|
12
|
-
date: 2024-08-
|
|
32
|
+
date: 2024-08-27T16:11:35.121Z
|
|
13
33
|
- commits:
|
|
14
34
|
- subject: Throw an UnauthorizedError on /canAccess requests for unknown resources
|
|
15
35
|
hash: 17df5f4fa060c279b0490f7b9c8fb2b774e51078
|
package/CHANGELOG.md
CHANGED
|
@@ -7,7 +7,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
|
|
|
7
7
|
# v18.1.2
|
|
8
8
|
## (2024-08-27)
|
|
9
9
|
|
|
10
|
-
*
|
|
10
|
+
* Add tests for getIdField using idField of intermediate translation [Otavio Jacobi]
|
|
11
|
+
* Translations: strip the version alias from renames when possible [Pagan Gazzard]
|
|
12
|
+
* Translations: use the `toAbstractSqlModel` to fetch the `toTable` info [Pagan Gazzard]
|
|
11
13
|
|
|
12
14
|
# v18.1.1
|
|
13
15
|
## (2024-08-20)
|
|
@@ -70,6 +70,7 @@ const namespaceRelationships = (relationships, alias) => {
|
|
|
70
70
|
};
|
|
71
71
|
const translateAbstractSqlModel = (fromAbstractSqlModel, toAbstractSqlModel, fromVersion, toVersion, translationDefinitions = {}) => {
|
|
72
72
|
const isDefinition = (d) => 'abstractSql' in d;
|
|
73
|
+
const toVersionSuffix = `$${toVersion}`;
|
|
73
74
|
const resourceRenames = {};
|
|
74
75
|
fromAbstractSqlModel.rules = toAbstractSqlModel.rules;
|
|
75
76
|
const fromResourceKeys = Object.keys(fromAbstractSqlModel.tables);
|
|
@@ -82,15 +83,15 @@ const translateAbstractSqlModel = (fromAbstractSqlModel, toAbstractSqlModel, fro
|
|
|
82
83
|
fromAbstractSqlModel.synonyms[synonym] = canonicalForm;
|
|
83
84
|
}
|
|
84
85
|
else {
|
|
85
|
-
fromAbstractSqlModel.synonyms[`${synonym}
|
|
86
|
-
`${canonicalForm}
|
|
86
|
+
fromAbstractSqlModel.synonyms[`${synonym}${toVersionSuffix}`] =
|
|
87
|
+
`${canonicalForm}${toVersionSuffix}`;
|
|
87
88
|
}
|
|
88
89
|
}
|
|
89
90
|
const relationships = lodash_1.default.cloneDeep(toAbstractSqlModel.relationships);
|
|
90
91
|
namespaceRelationships(relationships, toVersion);
|
|
91
92
|
for (let [key, relationship] of Object.entries(relationships)) {
|
|
92
93
|
if (!key.includes('$')) {
|
|
93
|
-
key = `${key}
|
|
94
|
+
key = `${key}${toVersionSuffix}`;
|
|
94
95
|
}
|
|
95
96
|
fromAbstractSqlModel.relationships[key] = relationship;
|
|
96
97
|
}
|
|
@@ -104,7 +105,7 @@ const translateAbstractSqlModel = (fromAbstractSqlModel, toAbstractSqlModel, fro
|
|
|
104
105
|
}
|
|
105
106
|
for (let [key, table] of Object.entries(toAbstractSqlModel.tables)) {
|
|
106
107
|
if (!key.includes('$')) {
|
|
107
|
-
key = `${key}
|
|
108
|
+
key = `${key}${toVersionSuffix}`;
|
|
108
109
|
}
|
|
109
110
|
fromAbstractSqlModel.tables[key] = lodash_1.default.cloneDeep(table);
|
|
110
111
|
}
|
|
@@ -117,20 +118,17 @@ const translateAbstractSqlModel = (fromAbstractSqlModel, toAbstractSqlModel, fro
|
|
|
117
118
|
if (translationDefinition) {
|
|
118
119
|
const { $toResource, ...definition } = translationDefinition;
|
|
119
120
|
const hasToResource = typeof $toResource === 'string';
|
|
120
|
-
let toResource;
|
|
121
121
|
if (hasToResource) {
|
|
122
|
-
if ($toResource.
|
|
123
|
-
|
|
124
|
-
toResource = $toResource;
|
|
122
|
+
if ($toResource.endsWith(toVersionSuffix)) {
|
|
123
|
+
resourceRenames[key] = $toResource.slice(0, -toVersionSuffix.length);
|
|
125
124
|
}
|
|
126
125
|
else {
|
|
127
|
-
|
|
126
|
+
resourceRenames[key] = $toResource;
|
|
128
127
|
}
|
|
129
|
-
resourceRenames[key] = $toResource;
|
|
130
|
-
}
|
|
131
|
-
else {
|
|
132
|
-
toResource = `${key}$${toVersion}`;
|
|
133
128
|
}
|
|
129
|
+
const toResource = hasToResource
|
|
130
|
+
? $toResource
|
|
131
|
+
: `${key}${toVersionSuffix}`;
|
|
134
132
|
const toTable = toAbstractSqlModel.tables[toResource];
|
|
135
133
|
if (!toTable) {
|
|
136
134
|
if (hasToResource) {
|
|
@@ -150,13 +148,13 @@ const translateAbstractSqlModel = (fromAbstractSqlModel, toAbstractSqlModel, fro
|
|
|
150
148
|
}
|
|
151
149
|
}
|
|
152
150
|
else {
|
|
153
|
-
const toTable =
|
|
151
|
+
const toTable = toAbstractSqlModel.tables[`${key}${toVersionSuffix}`];
|
|
154
152
|
if (!toTable) {
|
|
155
153
|
throw new Error(`Missing translation for: '${key}'`);
|
|
156
154
|
}
|
|
157
155
|
table.modifyFields = lodash_1.default.cloneDeep(toTable.modifyFields ?? toTable.fields);
|
|
158
156
|
table.definition = {
|
|
159
|
-
abstractSql: ['Resource', `${key}
|
|
157
|
+
abstractSql: ['Resource', `${key}${toVersionSuffix}`],
|
|
160
158
|
};
|
|
161
159
|
}
|
|
162
160
|
fromAbstractSqlModel.tables[`${key}$${fromVersion}`] = table;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"translations.js","sourceRoot":"","sources":["../../src/sbvr-api/translations.ts"],"names":[],"mappings":"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
|
|
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": "18.1.2-build-clarify-to-resource-
|
|
3
|
+
"version": "18.1.2-build-clarify-to-resource-05195b933c5ab77b69e82ef427a044eb3db54b2c-1",
|
|
4
4
|
"main": "out/server-glue/module",
|
|
5
5
|
"type": "commonjs",
|
|
6
6
|
"repository": "git@github.com:balena-io/pinejs.git",
|
|
@@ -149,6 +149,6 @@
|
|
|
149
149
|
"recursive": true
|
|
150
150
|
},
|
|
151
151
|
"versionist": {
|
|
152
|
-
"publishedAt": "2024-08-
|
|
152
|
+
"publishedAt": "2024-08-27T16:11:35.881Z"
|
|
153
153
|
}
|
|
154
154
|
}
|
|
@@ -136,6 +136,7 @@ export const translateAbstractSqlModel = (
|
|
|
136
136
|
const isDefinition = (
|
|
137
137
|
d: (typeof translationDefinitions)[string],
|
|
138
138
|
): d is Definition => 'abstractSql' in d;
|
|
139
|
+
const toVersionSuffix = `$${toVersion}`;
|
|
139
140
|
|
|
140
141
|
const resourceRenames: Dictionary<string> = {};
|
|
141
142
|
|
|
@@ -160,8 +161,8 @@ export const translateAbstractSqlModel = (
|
|
|
160
161
|
if (synonym.includes('$')) {
|
|
161
162
|
fromAbstractSqlModel.synonyms[synonym] = canonicalForm;
|
|
162
163
|
} else {
|
|
163
|
-
fromAbstractSqlModel.synonyms[`${synonym}
|
|
164
|
-
`${canonicalForm}
|
|
164
|
+
fromAbstractSqlModel.synonyms[`${synonym}${toVersionSuffix}`] =
|
|
165
|
+
`${canonicalForm}${toVersionSuffix}`;
|
|
165
166
|
}
|
|
166
167
|
}
|
|
167
168
|
const relationships = _.cloneDeep(toAbstractSqlModel.relationships);
|
|
@@ -169,7 +170,7 @@ export const translateAbstractSqlModel = (
|
|
|
169
170
|
for (let [key, relationship] of Object.entries(relationships)) {
|
|
170
171
|
// Don't double alias
|
|
171
172
|
if (!key.includes('$')) {
|
|
172
|
-
key = `${key}
|
|
173
|
+
key = `${key}${toVersionSuffix}`;
|
|
173
174
|
}
|
|
174
175
|
fromAbstractSqlModel.relationships[key] = relationship;
|
|
175
176
|
}
|
|
@@ -192,7 +193,7 @@ export const translateAbstractSqlModel = (
|
|
|
192
193
|
for (let [key, table] of Object.entries(toAbstractSqlModel.tables)) {
|
|
193
194
|
// Don't double alias
|
|
194
195
|
if (!key.includes('$')) {
|
|
195
|
-
key = `${key}
|
|
196
|
+
key = `${key}${toVersionSuffix}`;
|
|
196
197
|
}
|
|
197
198
|
fromAbstractSqlModel.tables[key] = _.cloneDeep(table);
|
|
198
199
|
}
|
|
@@ -207,21 +208,18 @@ export const translateAbstractSqlModel = (
|
|
|
207
208
|
if (translationDefinition) {
|
|
208
209
|
const { $toResource, ...definition } = translationDefinition;
|
|
209
210
|
const hasToResource = typeof $toResource === 'string';
|
|
210
|
-
let toResource;
|
|
211
211
|
if (hasToResource) {
|
|
212
|
-
if ($toResource.
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
);
|
|
217
|
-
toResource = $toResource;
|
|
212
|
+
if ($toResource.endsWith(toVersionSuffix)) {
|
|
213
|
+
// Ideally we want to rename to the unaliased resource of the next version
|
|
214
|
+
// so when the alias matches the next version we can just strip it
|
|
215
|
+
resourceRenames[key] = $toResource.slice(0, -toVersionSuffix.length);
|
|
218
216
|
} else {
|
|
219
|
-
|
|
217
|
+
resourceRenames[key] = $toResource;
|
|
220
218
|
}
|
|
221
|
-
resourceRenames[key] = $toResource;
|
|
222
|
-
} else {
|
|
223
|
-
toResource = `${key}$${toVersion}`;
|
|
224
219
|
}
|
|
220
|
+
const toResource = hasToResource
|
|
221
|
+
? $toResource
|
|
222
|
+
: `${key}${toVersionSuffix}`;
|
|
225
223
|
const toTable = toAbstractSqlModel.tables[toResource];
|
|
226
224
|
if (!toTable) {
|
|
227
225
|
if (hasToResource) {
|
|
@@ -244,13 +242,13 @@ export const translateAbstractSqlModel = (
|
|
|
244
242
|
);
|
|
245
243
|
}
|
|
246
244
|
} else {
|
|
247
|
-
const toTable =
|
|
245
|
+
const toTable = toAbstractSqlModel.tables[`${key}${toVersionSuffix}`];
|
|
248
246
|
if (!toTable) {
|
|
249
247
|
throw new Error(`Missing translation for: '${key}'`);
|
|
250
248
|
}
|
|
251
249
|
table.modifyFields = _.cloneDeep(toTable.modifyFields ?? toTable.fields);
|
|
252
250
|
table.definition = {
|
|
253
|
-
abstractSql: ['Resource', `${key}
|
|
251
|
+
abstractSql: ['Resource', `${key}${toVersionSuffix}`],
|
|
254
252
|
};
|
|
255
253
|
}
|
|
256
254
|
// Also alias the current version so it can be explicitly referenced
|