@balena/pinejs 21.6.4-build-translations-toresouce-only-2f149839a38d087faa5efd43879316513266470f-1 → 21.6.4
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,10 +1,8 @@
|
|
|
1
1
|
- commits:
|
|
2
|
-
- subject: "Translations:
|
|
3
|
-
|
|
4
|
-
hash: 2f149839a38d087faa5efd43879316513266470f
|
|
2
|
+
- subject: "Translations: avoid fully referenced fields when not necessary"
|
|
3
|
+
hash: 1eac90d96e73db3744f868603df9ea498c51cca0
|
|
5
4
|
body: |
|
|
6
|
-
This
|
|
7
|
-
and so will reduce the size of the generated SQL and hence the memory
|
|
5
|
+
This should reduce the size of the generated SQL and hence the memory
|
|
8
6
|
usage by cache and network usage to transmit the queries
|
|
9
7
|
footer:
|
|
10
8
|
Change-type: patch
|
|
@@ -13,7 +11,7 @@
|
|
|
13
11
|
nested: []
|
|
14
12
|
version: 21.6.4
|
|
15
13
|
title: ""
|
|
16
|
-
date: 2025-06-
|
|
14
|
+
date: 2025-06-10T12:47:47.151Z
|
|
17
15
|
- commits:
|
|
18
16
|
- subject: Update dependency lint-staged to v16
|
|
19
17
|
hash: 75beac7b22b63eaa059a487da902023354619f88
|
package/CHANGELOG.md
CHANGED
|
@@ -7,7 +7,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
|
|
|
7
7
|
# v21.6.4
|
|
8
8
|
## (2025-06-10)
|
|
9
9
|
|
|
10
|
-
* Translations:
|
|
10
|
+
* Translations: avoid fully referenced fields when not necessary [Pagan Gazzard]
|
|
11
11
|
|
|
12
12
|
# v21.6.3
|
|
13
13
|
## (2025-06-06)
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type { AbstractSqlModel,
|
|
1
|
+
import type { AbstractSqlModel, Definition, SelectQueryNode, NumberTypeNodes, BooleanTypeNodes, UnknownTypeNodes, NullNode } from '@balena/abstract-sql-compiler';
|
|
2
2
|
import type { Dictionary } from './common-types.js';
|
|
3
|
-
export type AliasValidNodeType =
|
|
3
|
+
export type AliasValidNodeType = SelectQueryNode | NumberTypeNodes | BooleanTypeNodes | UnknownTypeNodes | NullNode;
|
|
4
4
|
export declare const translateAbstractSqlModel: (fromAbstractSqlModel: AbstractSqlModel, toAbstractSqlModel: AbstractSqlModel, fromVersion: string, toVersion: string, translationDefinitions?: Dictionary<(Definition & {
|
|
5
5
|
$toResource?: string;
|
|
6
6
|
}) | Dictionary<string | AliasValidNodeType>>) => Dictionary<string>;
|
|
@@ -16,16 +16,12 @@ const aliasFields = (translationAbstractSqlModel, fromResourceName, toResource,
|
|
|
16
16
|
if (alias) {
|
|
17
17
|
if (typeof alias === 'string') {
|
|
18
18
|
checkToFieldExists(fieldName, alias);
|
|
19
|
-
return [
|
|
20
|
-
'Alias',
|
|
21
|
-
['ReferencedField', fromResourceName, alias],
|
|
22
|
-
fieldName,
|
|
23
|
-
];
|
|
19
|
+
return ['Alias', ['Field', alias], fieldName];
|
|
24
20
|
}
|
|
25
21
|
return ['Alias', alias, fieldName];
|
|
26
22
|
}
|
|
27
23
|
checkToFieldExists(fieldName, fieldName);
|
|
28
|
-
return ['
|
|
24
|
+
return ['Field', fieldName];
|
|
29
25
|
});
|
|
30
26
|
};
|
|
31
27
|
const aliasResource = (translationAbstractSqlModel, fromResourceName, toResource, aliases) => {
|
|
@@ -142,11 +138,6 @@ export const translateAbstractSqlModel = (fromAbstractSqlModel, toAbstractSqlMod
|
|
|
142
138
|
if (isDefinition(definition)) {
|
|
143
139
|
table.definition = definition;
|
|
144
140
|
}
|
|
145
|
-
else if (Object.keys(definition).length === 0) {
|
|
146
|
-
table.definition = {
|
|
147
|
-
abstractSql: ['Resource', aliasedToResource],
|
|
148
|
-
};
|
|
149
|
-
}
|
|
150
141
|
else {
|
|
151
142
|
table.definition = aliasResource(fromAbstractSqlModel, key, aliasedToResource, definition);
|
|
152
143
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"translations.js","sourceRoot":"","sources":["../../src/sbvr-api/translations.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,QAAQ,CAAC;
|
|
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": "21.6.4
|
|
3
|
+
"version": "21.6.4",
|
|
4
4
|
"main": "out/server-glue/module.js",
|
|
5
5
|
"type": "module",
|
|
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": "2025-06-
|
|
152
|
+
"publishedAt": "2025-06-10T12:47:48.171Z"
|
|
153
153
|
}
|
|
154
154
|
}
|
|
@@ -2,7 +2,6 @@ import _ from 'lodash';
|
|
|
2
2
|
import type {
|
|
3
3
|
AbstractSqlModel,
|
|
4
4
|
Relationship,
|
|
5
|
-
ReferencedFieldNode,
|
|
6
5
|
SelectNode,
|
|
7
6
|
AliasNode,
|
|
8
7
|
Definition,
|
|
@@ -13,11 +12,11 @@ import type {
|
|
|
13
12
|
BooleanTypeNodes,
|
|
14
13
|
UnknownTypeNodes,
|
|
15
14
|
NullNode,
|
|
15
|
+
FieldNode,
|
|
16
16
|
} from '@balena/abstract-sql-compiler';
|
|
17
17
|
import type { Dictionary } from './common-types.js';
|
|
18
18
|
|
|
19
19
|
export type AliasValidNodeType =
|
|
20
|
-
| ReferencedFieldNode
|
|
21
20
|
| SelectQueryNode
|
|
22
21
|
| NumberTypeNodes
|
|
23
22
|
| BooleanTypeNodes
|
|
@@ -49,21 +48,17 @@ const aliasFields = (
|
|
|
49
48
|
}
|
|
50
49
|
};
|
|
51
50
|
return fromFieldNames.map(
|
|
52
|
-
(fieldName): AliasNode<AliasValidNodeType> |
|
|
51
|
+
(fieldName): AliasNode<AliasValidNodeType> | FieldNode => {
|
|
53
52
|
const alias = aliases[fieldName];
|
|
54
53
|
if (alias) {
|
|
55
54
|
if (typeof alias === 'string') {
|
|
56
55
|
checkToFieldExists(fieldName, alias);
|
|
57
|
-
return [
|
|
58
|
-
'Alias',
|
|
59
|
-
['ReferencedField', fromResourceName, alias],
|
|
60
|
-
fieldName,
|
|
61
|
-
];
|
|
56
|
+
return ['Alias', ['Field', alias], fieldName];
|
|
62
57
|
}
|
|
63
58
|
return ['Alias', alias, fieldName];
|
|
64
59
|
}
|
|
65
60
|
checkToFieldExists(fieldName, fieldName);
|
|
66
|
-
return ['
|
|
61
|
+
return ['Field', fieldName];
|
|
67
62
|
},
|
|
68
63
|
);
|
|
69
64
|
};
|
|
@@ -243,11 +238,6 @@ export const translateAbstractSqlModel = (
|
|
|
243
238
|
table.modifyName = toTable.modifyName ?? toTable.name;
|
|
244
239
|
if (isDefinition(definition)) {
|
|
245
240
|
table.definition = definition;
|
|
246
|
-
} else if (Object.keys(definition).length === 0) {
|
|
247
|
-
// If there are no translation definitions, we can just target the `$toResource`
|
|
248
|
-
table.definition = {
|
|
249
|
-
abstractSql: ['Resource', aliasedToResource],
|
|
250
|
-
};
|
|
251
241
|
} else {
|
|
252
242
|
table.definition = aliasResource(
|
|
253
243
|
// fromAbstractSqlModel is the translation model as it contains
|