@balena/pinejs 18.1.4-build-renovate-node-18-x-06b86c59ff188041f1946be17821228ff411ee2f-1 → 18.2.0-build-support-unaliased-to-version-d0d3e6804c9e655c6409f939f1fc47ba201648a0-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.
Files changed (9) hide show
  1. package/.pinejs-cache.json +1 -1
  2. package/.versionbot/CHANGELOG.yml +11 -20
  3. package/CHANGELOG.md +3 -11
  4. package/Dockerfile +1 -1
  5. package/VERSION +1 -1
  6. package/out/sbvr-api/translations.js +15 -9
  7. package/out/sbvr-api/translations.js.map +1 -1
  8. package/package.json +2 -2
  9. package/src/sbvr-api/translations.ts +23 -11
package/.versionbot/CHANGELOG.yml CHANGED
@@ -1,29 +1,20 @@
1
1
  - commits:
2
- - subject: Update Node.js to v18
3
- hash: 06b86c59ff188041f1946be17821228ff411ee2f
4
- body: |
5
- Update node from 16.20.2 to 18.20.4
2
+ - subject: Add support for and prefer providing the unaliased `$toResource`
3
+ hash: d0d3e6804c9e655c6409f939f1fc47ba201648a0
4
+ body: ""
6
5
  footer:
7
- Change-type: patch
8
- change-type: patch
9
- author: Self-hosted Renovate Bot
6
+ Change-type: minor
7
+ change-type: minor
8
+ author: Pagan Gazzard
10
9
  nested: []
11
- version: 18.1.4
12
- title: ""
13
- date: 2024-08-28T14:57:09.152Z
14
- - commits:
15
- - subject: "Tests: stop using deprecated `faker` functions"
16
- hash: e79630e8bcbf7e5ccdbb60fd4f5684f394ae341b
10
+ - subject: Add tests for getIdField using idField of intermediate translation
11
+ hash: 05195b933c5ab77b69e82ef427a044eb3db54b2c
17
12
  body: ""
18
13
  footer:
19
14
  Change-type: patch
20
15
  change-type: patch
21
- author: Pagan Gazzard
16
+ author: Otavio Jacobi
22
17
  nested: []
23
- version: 18.1.3
24
- title: ""
25
- date: 2024-08-28T14:14:57.885Z
26
- - commits:
27
18
  - subject: "Translations: strip the version alias from renames when possible"
28
19
  hash: c7b83174907e3227bab0c605662d206552ca6fc7
29
20
  body: ""
@@ -44,9 +35,9 @@
44
35
  change-type: patch
45
36
  author: Pagan Gazzard
46
37
  nested: []
47
- version: 18.1.2
38
+ version: 18.2.0
48
39
  title: ""
49
- date: 2024-08-27T16:47:00.735Z
40
+ date: 2024-08-27T16:32:27.163Z
50
41
  - commits:
51
42
  - subject: Throw an UnauthorizedError on /canAccess requests for unknown resources
52
43
  hash: 17df5f4fa060c279b0490f7b9c8fb2b774e51078
package/CHANGELOG.md CHANGED
@@ -4,19 +4,11 @@ All notable changes to this project will be documented in this file
4
4
  automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
5
5
  This project adheres to [Semantic Versioning](http://semver.org/).
6
6
 
7
- # v18.1.4
8
- ## (2024-08-28)
9
-
10
- * Update Node.js to v18 [Self-hosted Renovate Bot]
11
-
12
- # v18.1.3
13
- ## (2024-08-28)
14
-
15
- * Tests: stop using deprecated `faker` functions [Pagan Gazzard]
16
-
17
- # v18.1.2
7
+ # v18.2.0
18
8
  ## (2024-08-27)
19
9
 
10
+ * Add support for and prefer providing the unaliased `$toResource` [Pagan Gazzard]
11
+ * Add tests for getIdField using idField of intermediate translation [Otavio Jacobi]
20
12
  * Translations: strip the version alias from renames when possible [Pagan Gazzard]
21
13
  * Translations: use the `toAbstractSqlModel` to fetch the `toTable` info [Pagan Gazzard]
22
14
 
package/Dockerfile CHANGED
@@ -1,4 +1,4 @@
1
- FROM node:18-alpine as runner
1
+ FROM node:16-alpine as runner
2
2
 
3
3
  WORKDIR /usr/src/pine
4
4
 
package/VERSION CHANGED
@@ -1 +1 @@
1
- 18.1.4
1
+ 18.2.0
package/out/sbvr-api/translations.js CHANGED
@@ -118,24 +118,30 @@ const translateAbstractSqlModel = (fromAbstractSqlModel, toAbstractSqlModel, fro
118
118
  if (translationDefinition) {
119
119
  const { $toResource, ...definition } = translationDefinition;
120
120
  const hasToResource = typeof $toResource === 'string';
121
+ let aliasedToResource;
121
122
  if (hasToResource) {
122
- if ($toResource.endsWith(toVersionSuffix)) {
123
- resourceRenames[key] = $toResource.slice(0, -toVersionSuffix.length);
123
+ if ($toResource.includes('$')) {
124
+ console.warn(`'$toResource' should be the unaliased name of the resource in the subsequent model and not be targeting a specific model, got '${$toResource}'`, $toResource);
125
+ if ($toResource.endsWith(toVersionSuffix)) {
126
+ resourceRenames[key] = $toResource.slice(0, -toVersionSuffix.length);
127
+ }
128
+ aliasedToResource = $toResource;
124
129
  }
125
130
  else {
126
131
  resourceRenames[key] = $toResource;
132
+ aliasedToResource = `${$toResource}${toVersionSuffix}`;
127
133
  }
128
134
  }
129
- const toResource = hasToResource
130
- ? $toResource
131
- : `${key}${toVersionSuffix}`;
132
- const toTable = toAbstractSqlModel.tables[toResource];
135
+ else {
136
+ aliasedToResource = `${key}${toVersionSuffix}`;
137
+ }
138
+ const toTable = toAbstractSqlModel.tables[aliasedToResource];
133
139
  if (!toTable) {
134
140
  if (hasToResource) {
135
- throw new Error(`Unknown $toResource: '${toResource}'`);
141
+ throw new Error(`Unknown $toResource: '${aliasedToResource}'`);
136
142
  }
137
143
  else {
138
- throw new Error(`Missing $toResource: '${toResource}'`);
144
+ throw new Error(`Missing $toResource: '${aliasedToResource}'`);
139
145
  }
140
146
  }
141
147
  table.modifyFields = lodash_1.default.cloneDeep(toTable.modifyFields ?? toTable.fields);
@@ -144,7 +150,7 @@ const translateAbstractSqlModel = (fromAbstractSqlModel, toAbstractSqlModel, fro
144
150
  table.definition = definition;
145
151
  }
146
152
  else {
147
- table.definition = aliasResource(fromAbstractSqlModel, toAbstractSqlModel, key, toResource, definition);
153
+ table.definition = aliasResource(fromAbstractSqlModel, toAbstractSqlModel, key, aliasedToResource, definition);
148
154
  }
149
155
  }
150
156
  else {
package/out/sbvr-api/translations.js.map CHANGED
@@ -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.4-build-renovate-node-18-x-06b86c59ff188041f1946be17821228ff411ee2f-1",
3
+ "version": "18.2.0-build-support-unaliased-to-version-d0d3e6804c9e655c6409f939f1fc47ba201648a0-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-28T14:57:09.860Z"
152
+ "publishedAt": "2024-08-27T16:32:27.966Z"
153
153
  }
154
154
  }
package/src/sbvr-api/translations.ts CHANGED
@@ -208,24 +208,36 @@ export const translateAbstractSqlModel = (
208
208
  if (translationDefinition) {
209
209
  const { $toResource, ...definition } = translationDefinition;
210
210
  const hasToResource = typeof $toResource === 'string';
211
+ let aliasedToResource;
211
212
  if (hasToResource) {
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);
213
+ if ($toResource.includes('$')) {
214
+ // TODO-MAJOR: Change this to an error
215
+ console.warn(
216
+ `'$toResource' should be the unaliased name of the resource in the subsequent model and not be targeting a specific model, got '${$toResource}'`,
217
+ $toResource,
218
+ );
219
+ if ($toResource.endsWith(toVersionSuffix)) {
220
+ // Ideally we want to rename to the unaliased resource of the next version
221
+ // so when the alias matches the next version we can just strip it
222
+ resourceRenames[key] = $toResource.slice(
223
+ 0,
224
+ -toVersionSuffix.length,
225
+ );
226
+ }
227
+ aliasedToResource = $toResource;
216
228
  } else {
217
229
  resourceRenames[key] = $toResource;
230
+ aliasedToResource = `${$toResource}${toVersionSuffix}`;
218
231
  }
232
+ } else {
233
+ aliasedToResource = `${key}${toVersionSuffix}`;
219
234
  }
220
- const toResource = hasToResource
221
- ? $toResource
222
- : `${key}${toVersionSuffix}`;
223
- const toTable = toAbstractSqlModel.tables[toResource];
235
+ const toTable = toAbstractSqlModel.tables[aliasedToResource];
224
236
  if (!toTable) {
225
237
  if (hasToResource) {
226
- throw new Error(`Unknown $toResource: '${toResource}'`);
238
+ throw new Error(`Unknown $toResource: '${aliasedToResource}'`);
227
239
  } else {
228
- throw new Error(`Missing $toResource: '${toResource}'`);
240
+ throw new Error(`Missing $toResource: '${aliasedToResource}'`);
229
241
  }
230
242
  }
231
243
  table.modifyFields = _.cloneDeep(toTable.modifyFields ?? toTable.fields);
@@ -237,7 +249,7 @@ export const translateAbstractSqlModel = (
237
249
  fromAbstractSqlModel,
238
250
  toAbstractSqlModel,
239
251
  key,
240
- toResource,
252
+ aliasedToResource,
241
253
  definition,
242
254
  );
243
255
  }