@balena/pinejs 17.0.2-build-otaviojacobi-test-5f48482cbb5c4721fbddd5cf00fc101b0e891ff7-1 → 17.0.2-build-fix-duplicate-types-fd522e4ae75be1a7c7c927303d631c967d4bd9b9-3
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,15 +1,15 @@
|
|
|
1
1
|
- commits:
|
|
2
|
-
- subject:
|
|
3
|
-
hash:
|
|
2
|
+
- subject: Avoid duplicate types when using sbvr-compiler to generate model types
|
|
3
|
+
hash: fd522e4ae75be1a7c7c927303d631c967d4bd9b9
|
|
4
4
|
body: ""
|
|
5
5
|
footer:
|
|
6
6
|
Change-type: patch
|
|
7
7
|
change-type: patch
|
|
8
|
-
author:
|
|
8
|
+
author: Pagan Gazzard
|
|
9
9
|
nested: []
|
|
10
10
|
version: 17.0.2
|
|
11
11
|
title: ""
|
|
12
|
-
date: 2024-06-
|
|
12
|
+
date: 2024-06-14T14:42:06.870Z
|
|
13
13
|
- commits:
|
|
14
14
|
- subject: Switch from `Object.prototype.hasOwnProperty.call` to `Object.hasOwn`
|
|
15
15
|
hash: 1343f0d463bf4271846343ee98de4d8afb9402f3
|
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
|
# v17.0.2
|
|
8
|
-
## (2024-06-
|
|
8
|
+
## (2024-06-14)
|
|
9
9
|
|
|
10
|
-
*
|
|
10
|
+
* Avoid duplicate types when using sbvr-compiler to generate model types [Pagan Gazzard]
|
|
11
11
|
|
|
12
12
|
# v17.0.1
|
|
13
13
|
## (2024-06-13)
|
package/out/bin/sbvr-compiler.js
CHANGED
|
@@ -49,11 +49,12 @@ const runCompile = async (inputFile, outputFile) => {
|
|
|
49
49
|
(0, utils_1.writeSqlModel)(models.sql, outputFile);
|
|
50
50
|
};
|
|
51
51
|
const generateTypes = async (inputFile, outputFile) => {
|
|
52
|
-
const {
|
|
52
|
+
const { generateLfModel, generateAbstractSqlModel } = await import('../sbvr-api/sbvr-utils.js');
|
|
53
53
|
const seModel = getSE(inputFile);
|
|
54
|
-
const
|
|
54
|
+
const lfModel = generateLfModel(seModel);
|
|
55
|
+
const abstractSql = generateAbstractSqlModel(lfModel);
|
|
55
56
|
const { abstractSqlToTypescriptTypes } = await import('@balena/abstract-sql-to-typescript/generate');
|
|
56
|
-
const types = abstractSqlToTypescriptTypes(
|
|
57
|
+
const types = abstractSqlToTypescriptTypes(abstractSql);
|
|
57
58
|
(0, utils_1.writeAll)(types, outputFile);
|
|
58
59
|
};
|
|
59
60
|
commander_1.program
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sbvr-compiler.js","sourceRoot":"","sources":["../../src/bin/sbvr-compiler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAA2D;AAC3D,yCAAoC;AACpC,uCAAyB;AAEzB,MAAM,KAAK,GAAG,CAAC,SAAiB,EAAE,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;AAExE,MAAM,KAAK,GAAG,KAAK,EAAE,SAAiB,EAAE,UAAmB,EAAE,EAAE;IAC9D,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC,2BAA2B,CAAC,CAAC;IACtE,MAAM,OAAO,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;IACjC,MAAM,MAAM,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IACxC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAC7C,IAAA,gBAAQ,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;AAC5B,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,KAAK,EAAE,SAAiB,EAAE,UAAmB,EAAE,EAAE;IAClE,MAAM,EAAE,eAAe,EAAE,wBAAwB,EAAE,GAAG,MAAM,MAAM,CACjE,2BAA2B,CAC3B,CAAC;IACF,MAAM,OAAO,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;IACjC,MAAM,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IACzC,MAAM,MAAM,GAAG,wBAAwB,CAAC,OAAO,CAAC,CAAC;IACjD,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAC7C,IAAA,gBAAQ,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;AAC5B,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,KAAK,EAAE,SAAiB,EAAE,UAAmB,EAAE,EAAE;IACnE,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,MAAM,CAAC,2BAA2B,CAAC,CAAC;IACrE,MAAM,OAAO,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;IACjC,MAAM,MAAM,GAAG,cAAc,CAC5B,EAAE,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,OAAO,EAAE,EAChD,mBAAO,CAAC,IAAI,EAAE,CAAC,MAAM,CACrB,CAAC;IAEF,IAAA,qBAAa,EAAC,MAAM,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;AACvC,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,KAAK,EAAE,SAAiB,EAAE,UAAmB,EAAE,EAAE;IACtE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"sbvr-compiler.js","sourceRoot":"","sources":["../../src/bin/sbvr-compiler.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@balena/pinejs",
|
|
3
|
-
"version": "17.0.2-build-
|
|
3
|
+
"version": "17.0.2-build-fix-duplicate-types-fd522e4ae75be1a7c7c927303d631c967d4bd9b9-3",
|
|
4
4
|
"main": "out/server-glue/module",
|
|
5
5
|
"type": "commonjs",
|
|
6
6
|
"repository": "git@github.com:balena-io/pinejs.git",
|
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
"express-session": "^1.18.0",
|
|
59
59
|
"lodash": "^4.17.21",
|
|
60
60
|
"memoizee": "^0.4.17",
|
|
61
|
-
"pinejs-client-core": "6.
|
|
61
|
+
"pinejs-client-core": "^6.14.6",
|
|
62
62
|
"randomstring": "^1.3.0",
|
|
63
63
|
"typed-error": "^3.2.2"
|
|
64
64
|
},
|
|
@@ -144,6 +144,6 @@
|
|
|
144
144
|
"recursive": true
|
|
145
145
|
},
|
|
146
146
|
"versionist": {
|
|
147
|
-
"publishedAt": "2024-06-
|
|
147
|
+
"publishedAt": "2024-06-14T14:42:07.609Z"
|
|
148
148
|
}
|
|
149
149
|
}
|
package/src/bin/sbvr-compiler.ts
CHANGED
|
@@ -35,16 +35,16 @@ const runCompile = async (inputFile: string, outputFile?: string) => {
|
|
|
35
35
|
};
|
|
36
36
|
|
|
37
37
|
const generateTypes = async (inputFile: string, outputFile?: string) => {
|
|
38
|
-
const {
|
|
39
|
-
|
|
40
|
-
const models = generateModels(
|
|
41
|
-
{ apiRoot: 'sbvr-compiler', modelText: seModel },
|
|
42
|
-
program.opts().engine,
|
|
38
|
+
const { generateLfModel, generateAbstractSqlModel } = await import(
|
|
39
|
+
'../sbvr-api/sbvr-utils.js'
|
|
43
40
|
);
|
|
41
|
+
const seModel = getSE(inputFile);
|
|
42
|
+
const lfModel = generateLfModel(seModel);
|
|
43
|
+
const abstractSql = generateAbstractSqlModel(lfModel);
|
|
44
44
|
const { abstractSqlToTypescriptTypes } = await import(
|
|
45
45
|
'@balena/abstract-sql-to-typescript/generate'
|
|
46
46
|
);
|
|
47
|
-
const types = abstractSqlToTypescriptTypes(
|
|
47
|
+
const types = abstractSqlToTypescriptTypes(abstractSql);
|
|
48
48
|
|
|
49
49
|
writeAll(types, outputFile);
|
|
50
50
|
};
|