@balena/abstract-sql-to-typescript 1.4.1 → 1.4.2
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 -1
- package/CHANGELOG.md +5 -1
- package/out/index.d.ts +3 -1
- package/out/index.js.map +1 -1
- package/package.json +12 -12
- package/src/index.ts +12 -7
|
@@ -1,3 +1,15 @@
|
|
|
1
|
+
- commits:
|
|
2
|
+
- subject: Update typings to the minimal subset of the abstract sql model we need
|
|
3
|
+
hash: 7f44648fe2bde3c85914c53cdaec448321f5ffca
|
|
4
|
+
body: ""
|
|
5
|
+
footer:
|
|
6
|
+
Change-type: patch
|
|
7
|
+
change-type: patch
|
|
8
|
+
author: Pagan Gazzard
|
|
9
|
+
nested: []
|
|
10
|
+
version: 1.4.2
|
|
11
|
+
title: ""
|
|
12
|
+
date: 2023-02-15T13:34:28.968Z
|
|
1
13
|
- commits:
|
|
2
14
|
- subject: Update `abstract-sql-compiler` and `odata-to-abstract-sql`
|
|
3
15
|
hash: 8f605b533f4c0716b55fcfe3ddfe75316d92da67
|
|
@@ -11,7 +23,7 @@
|
|
|
11
23
|
nested: []
|
|
12
24
|
version: 1.4.1
|
|
13
25
|
title: ""
|
|
14
|
-
date: 2023-02-
|
|
26
|
+
date: 2023-02-14T14:27:09.414Z
|
|
15
27
|
- commits:
|
|
16
28
|
- subject: Generate properties for reverse navigation relations using synonyms
|
|
17
29
|
hash: 105c27e6b5279bd7189df0c8758200ec84997a43
|
package/CHANGELOG.md
CHANGED
|
@@ -4,7 +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
|
-
## 1.4.
|
|
7
|
+
## 1.4.2 - 2023-02-15
|
|
8
|
+
|
|
9
|
+
* Update typings to the minimal subset of the abstract sql model we need [Pagan Gazzard]
|
|
10
|
+
|
|
11
|
+
## 1.4.1 - 2023-02-14
|
|
8
12
|
|
|
9
13
|
* Update `abstract-sql-compiler` and `odata-to-abstract-sql` [Carol Schulze]
|
|
10
14
|
|
package/out/index.d.ts
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import type { AbstractSqlModel } from '@balena/abstract-sql-compiler';
|
|
2
|
+
type RequiredModelSubset = Pick<AbstractSqlModel, 'tables' | 'relationships' | 'synonyms'>;
|
|
2
3
|
export interface Options {
|
|
3
4
|
mode?: 'read' | 'write';
|
|
4
5
|
}
|
|
5
|
-
export declare const abstractSqlToTypescriptTypes: (m:
|
|
6
|
+
export declare const abstractSqlToTypescriptTypes: (m: RequiredModelSubset, opts?: Options) => string;
|
|
7
|
+
export {};
|
package/out/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AASA,yEAGuC;AACvC,6CAAoE;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@balena/abstract-sql-to-typescript",
|
|
3
|
-
"version": "1.4.
|
|
3
|
+
"version": "1.4.2",
|
|
4
4
|
"description": "A translator for abstract sql into typescript types.",
|
|
5
5
|
"main": "out/index.js",
|
|
6
6
|
"types": "out/index.d.ts",
|
|
@@ -15,20 +15,20 @@
|
|
|
15
15
|
"dependencies": {
|
|
16
16
|
"@balena/abstract-sql-compiler": "^8.0.0",
|
|
17
17
|
"@balena/odata-to-abstract-sql": "^5.9.1",
|
|
18
|
-
"@types/node": "^12.20.
|
|
18
|
+
"@types/node": "^12.20.55",
|
|
19
19
|
"common-tags": "^1.8.2"
|
|
20
20
|
},
|
|
21
21
|
"devDependencies": {
|
|
22
|
-
"@balena/lint": "^6.2.
|
|
23
|
-
"@types/chai": "^4.3.
|
|
22
|
+
"@balena/lint": "^6.2.1",
|
|
23
|
+
"@types/chai": "^4.3.4",
|
|
24
24
|
"@types/common-tags": "^1.8.1",
|
|
25
|
-
"@types/mocha": "^10.0.
|
|
26
|
-
"chai": "^4.3.
|
|
27
|
-
"husky": "^8.0.
|
|
28
|
-
"lint-staged": "^13.
|
|
29
|
-
"mocha": "^10.
|
|
30
|
-
"ts-node": "^10.
|
|
31
|
-
"typescript": "^4.
|
|
25
|
+
"@types/mocha": "^10.0.1",
|
|
26
|
+
"chai": "^4.3.7",
|
|
27
|
+
"husky": "^8.0.3",
|
|
28
|
+
"lint-staged": "^13.1.2",
|
|
29
|
+
"mocha": "^10.2.0",
|
|
30
|
+
"ts-node": "^10.9.1",
|
|
31
|
+
"typescript": "^4.9.5"
|
|
32
32
|
},
|
|
33
33
|
"lint-staged": {
|
|
34
34
|
"*.ts": [
|
|
@@ -40,6 +40,6 @@
|
|
|
40
40
|
"_": "test/**/*.ts"
|
|
41
41
|
},
|
|
42
42
|
"versionist": {
|
|
43
|
-
"publishedAt": "2023-02-
|
|
43
|
+
"publishedAt": "2023-02-15T13:34:29.198Z"
|
|
44
44
|
}
|
|
45
45
|
}
|
package/src/index.ts
CHANGED
|
@@ -13,6 +13,11 @@ import {
|
|
|
13
13
|
} from '@balena/odata-to-abstract-sql';
|
|
14
14
|
import { replaceResultTransformer, TemplateTag } from 'common-tags';
|
|
15
15
|
|
|
16
|
+
type RequiredModelSubset = Pick<
|
|
17
|
+
AbstractSqlModel,
|
|
18
|
+
'tables' | 'relationships' | 'synonyms'
|
|
19
|
+
>;
|
|
20
|
+
|
|
16
21
|
const typeHelpers = {
|
|
17
22
|
read: `
|
|
18
23
|
export type DateString = string;
|
|
@@ -39,7 +44,7 @@ const modelNameToCamelCaseName = (s: string): string =>
|
|
|
39
44
|
.join('');
|
|
40
45
|
|
|
41
46
|
const getReferencedDataType = (
|
|
42
|
-
m:
|
|
47
|
+
m: RequiredModelSubset,
|
|
43
48
|
{ references }: AbstractSqlField,
|
|
44
49
|
opts: RequiredOptions,
|
|
45
50
|
): string => {
|
|
@@ -55,7 +60,7 @@ const getReferencedDataType = (
|
|
|
55
60
|
};
|
|
56
61
|
|
|
57
62
|
const sqlTypeToTypescriptType = (
|
|
58
|
-
m:
|
|
63
|
+
m: RequiredModelSubset,
|
|
59
64
|
f: AbstractSqlField,
|
|
60
65
|
opts: RequiredOptions,
|
|
61
66
|
): string => {
|
|
@@ -109,7 +114,7 @@ const sqlTypeToTypescriptType = (
|
|
|
109
114
|
};
|
|
110
115
|
|
|
111
116
|
const fieldsToInterfaceProps = (
|
|
112
|
-
m:
|
|
117
|
+
m: RequiredModelSubset,
|
|
113
118
|
fields: AbstractSqlField[],
|
|
114
119
|
opts: RequiredOptions,
|
|
115
120
|
): string[] =>
|
|
@@ -123,7 +128,7 @@ const fieldsToInterfaceProps = (
|
|
|
123
128
|
});
|
|
124
129
|
|
|
125
130
|
const recurseRelationships = (
|
|
126
|
-
m:
|
|
131
|
+
m: RequiredModelSubset,
|
|
127
132
|
relationships: Relationship,
|
|
128
133
|
inverseSynonyms: Record<string, string>,
|
|
129
134
|
opts: RequiredOptions,
|
|
@@ -164,7 +169,7 @@ const recurseRelationships = (
|
|
|
164
169
|
});
|
|
165
170
|
|
|
166
171
|
const relationshipsToInterfaceProps = (
|
|
167
|
-
m:
|
|
172
|
+
m: RequiredModelSubset,
|
|
168
173
|
table: AbstractSqlTable,
|
|
169
174
|
opts: RequiredOptions,
|
|
170
175
|
): string[] => {
|
|
@@ -195,7 +200,7 @@ const relationshipsToInterfaceProps = (
|
|
|
195
200
|
};
|
|
196
201
|
|
|
197
202
|
const tableToInterface = (
|
|
198
|
-
m:
|
|
203
|
+
m: RequiredModelSubset,
|
|
199
204
|
table: AbstractSqlTable,
|
|
200
205
|
opts: RequiredOptions,
|
|
201
206
|
) => {
|
|
@@ -217,7 +222,7 @@ export interface Options {
|
|
|
217
222
|
type RequiredOptions = Required<Options>;
|
|
218
223
|
|
|
219
224
|
export const abstractSqlToTypescriptTypes = (
|
|
220
|
-
m:
|
|
225
|
+
m: RequiredModelSubset,
|
|
221
226
|
opts: Options = {},
|
|
222
227
|
): string => {
|
|
223
228
|
const mode = opts.mode ?? 'read';
|