skir 1.1.16 → 1.1.19
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/README.md +13 -13
- package/dist/compatibility_checker.d.ts.map +1 -1
- package/dist/compatibility_checker.js +3 -0
- package/dist/compatibility_checker.js.map +1 -1
- package/dist/config_parser.d.ts.map +1 -1
- package/dist/config_parser.js +2 -0
- package/dist/config_parser.js.map +1 -1
- package/dist/project_initializer.js +10 -1
- package/dist/project_initializer.js.map +1 -1
- package/package.json +3 -2
- package/src/compatibility_checker.ts +3 -0
- package/src/config_parser.ts +2 -0
- package/src/project_initializer.ts +10 -1
package/README.md
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
<div align="center">
|
|
2
2
|
<h1>Skir</h1>
|
|
3
|
-
<p><strong>
|
|
3
|
+
<p><strong>A modern alternative to Protocol Buffer</strong></p>
|
|
4
4
|
|
|
5
5
|
<p>
|
|
6
|
-
<a href="https://skir.
|
|
6
|
+
<a href="https://skir.build/"><b>skir.build</b></a>
|
|
7
7
|
</p>
|
|
8
8
|
|
|
9
9
|
[](https://www.npmjs.com/package/skir)
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
## ✨ Features
|
|
20
20
|
|
|
21
21
|
- 💎 **Single source of truth** - Define your data types and APIs once and share them between your backend, frontend, and microservices.
|
|
22
|
-
- 🌍 **Multi-language** - First-class support for TypeScript, Python, C++, Java, Kotlin, and Dart.
|
|
22
|
+
- 🌍 **Multi-language** - First-class support for TypeScript, Python, C++, Java, Kotlin, Go and Dart.
|
|
23
23
|
- ✍️ **Idiomatic code gen** - Generates code that feels native to each language.
|
|
24
24
|
- 🍃 **Effortless serialization** - Skir generates functions to serialize your data to JSON or binary, so you never have to write parsing code manually.
|
|
25
25
|
- 🦋 **Schema evolution** - Simple guidelines and built-in checks to evolve your schema without breaking backward compatibility.
|
|
@@ -46,9 +46,9 @@ struct Shape {
|
|
|
46
46
|
}
|
|
47
47
|
|
|
48
48
|
const TOP_RIGHT_CORNER: Point = {
|
|
49
|
-
x
|
|
50
|
-
y
|
|
51
|
-
label
|
|
49
|
+
x: 600,
|
|
50
|
+
y: 400,
|
|
51
|
+
label: "top-right corner",
|
|
52
52
|
};
|
|
53
53
|
|
|
54
54
|
/// Returns true if no part of the shape's boundary curves inward.
|
|
@@ -73,13 +73,13 @@ assert(restored == point)
|
|
|
73
73
|
|
|
74
74
|
## 📚 Documentation
|
|
75
75
|
|
|
76
|
-
- [Getting started: setup & workflow](https://skir.
|
|
77
|
-
- [Language reference](https://skir.
|
|
78
|
-
- [Serialization](https://skir.
|
|
79
|
-
- [Schema evolution](https://skir.
|
|
80
|
-
- [RPC services](https://skir.
|
|
81
|
-
- [External dependencies](https://skir.
|
|
82
|
-
- [Coming from Protocol Buffer](https://skir.
|
|
76
|
+
- [Getting started: setup & workflow](https://skir.build/docs/setup)
|
|
77
|
+
- [Language reference](https://skir.build/docs/language-reference)
|
|
78
|
+
- [Serialization](https://skir.build/docs/serialization)
|
|
79
|
+
- [Schema evolution](https://skir.build/docs/schema-evolution)
|
|
80
|
+
- [RPC services](https://skir.build/docs/services)
|
|
81
|
+
- [External dependencies](https://skir.build/docs/dependencies)
|
|
82
|
+
- [Coming from Protocol Buffer](https://skir.build/docs/protobuf)
|
|
83
83
|
|
|
84
84
|
## 🌍 Supported languages
|
|
85
85
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compatibility_checker.d.ts","sourceRoot":"","sources":["../src/compatibility_checker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,MAAM,EAGN,cAAc,EACd,YAAY,EACZ,KAAK,EACN,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,MAAM,WAAW,WAAW,CAAC,CAAC;IAC5B,MAAM,EAAE,CAAC,CAAC;IACV,KAAK,EAAE,CAAC,CAAC;CACV;AAED,MAAM,MAAM,cAAc,GACtB;IACE,IAAI,EAAE,qBAAqB,CAAC;IAC5B,UAAU,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IACpC,IAAI,EAAE,WAAW,CAAC,YAAY,CAAC,CAAC;CACjC,GACD;IACE,IAAI,EAAE,eAAe,CAAC;IACtB,MAAM,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC;IACpC,gBAAgB,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IAC1C,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;CACzB,GACD;IACE,IAAI,EAAE,gBAAgB,CAAC;IACvB,MAAM,EAAE,cAAc,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACtB,GACD;IACE,IAAI,EAAE,gBAAgB,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;CAChB,GACD;IACE,IAAI,EAAE,oBAAoB,CAAC;IAC3B,MAAM,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC;IACpC,gBAAgB,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IAC1C,UAAU,EAAE,WAAW,CAAC,QAAQ,GAAG,MAAM,CAAC,CAAC;CAC5C,GACD;IACE,IAAI,EAAE,6BAA6B,CAAC;IACpC,MAAM,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC;IACpC,gBAAgB,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IAC1C,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,KAAK,CAAC;CACvB,GACD;IACE,IAAI,EAAE,iBAAiB,CAAC;IACxB,MAAM,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC;IACpC,aAAa,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IACvC,WAAW,EAAE,KAAK,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAChB,GACD;IACE,IAAI,EAAE,qBAAqB,CAAC;IAC5B,MAAM,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC;IACpC,aAAa,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IACvC,WAAW,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;IAChC,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEN,MAAM,MAAM,UAAU,GAClB;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,UAAU,EAAE,KAAK,CAAC;CACnB,GACD;IACE,IAAI,EAAE,eAAe,CAAC;IACtB,UAAU,EAAE,KAAK,CAAC;CACnB,GACD;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,UAAU,EAAE,KAAK,CAAC;CACnB,GACD;IACE,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,UAAU,CAAC;CAC7B,GACD;IACE,IAAI,EAAE,gBAAgB,CAAC;IACvB,kBAAkB,EAAE,UAAU,CAAC;CAChC,GACD;IACE,IAAI,EAAE,UAAU,CAAC;IACjB,gBAAgB,EAAE,UAAU,CAAC;IAC7B,SAAS,EAAE,KAAK,CAAC;CAClB,GACD;IACE,IAAI,EAAE,YAAY,CAAC;IACnB,cAAc,EAAE,UAAU,CAAC;IAC3B,WAAW,EAAE,KAAK,CAAC;CACpB,CAAC;AAEN,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,WAAW,CAAC,SAAS,CAAC,GAChC,SAAS,cAAc,EAAE,CAE3B;
|
|
1
|
+
{"version":3,"file":"compatibility_checker.d.ts","sourceRoot":"","sources":["../src/compatibility_checker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,MAAM,EAGN,cAAc,EACd,YAAY,EACZ,KAAK,EACN,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,MAAM,WAAW,WAAW,CAAC,CAAC;IAC5B,MAAM,EAAE,CAAC,CAAC;IACV,KAAK,EAAE,CAAC,CAAC;CACV;AAED,MAAM,MAAM,cAAc,GACtB;IACE,IAAI,EAAE,qBAAqB,CAAC;IAC5B,UAAU,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IACpC,IAAI,EAAE,WAAW,CAAC,YAAY,CAAC,CAAC;CACjC,GACD;IACE,IAAI,EAAE,eAAe,CAAC;IACtB,MAAM,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC;IACpC,gBAAgB,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IAC1C,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;CACzB,GACD;IACE,IAAI,EAAE,gBAAgB,CAAC;IACvB,MAAM,EAAE,cAAc,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACtB,GACD;IACE,IAAI,EAAE,gBAAgB,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;CAChB,GACD;IACE,IAAI,EAAE,oBAAoB,CAAC;IAC3B,MAAM,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC;IACpC,gBAAgB,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IAC1C,UAAU,EAAE,WAAW,CAAC,QAAQ,GAAG,MAAM,CAAC,CAAC;CAC5C,GACD;IACE,IAAI,EAAE,6BAA6B,CAAC;IACpC,MAAM,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC;IACpC,gBAAgB,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IAC1C,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,KAAK,CAAC;CACvB,GACD;IACE,IAAI,EAAE,iBAAiB,CAAC;IACxB,MAAM,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC;IACpC,aAAa,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IACvC,WAAW,EAAE,KAAK,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAChB,GACD;IACE,IAAI,EAAE,qBAAqB,CAAC;IAC5B,MAAM,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC;IACpC,aAAa,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IACvC,WAAW,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;IAChC,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEN,MAAM,MAAM,UAAU,GAClB;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,UAAU,EAAE,KAAK,CAAC;CACnB,GACD;IACE,IAAI,EAAE,eAAe,CAAC;IACtB,UAAU,EAAE,KAAK,CAAC;CACnB,GACD;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,UAAU,EAAE,KAAK,CAAC;CACnB,GACD;IACE,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,UAAU,CAAC;CAC7B,GACD;IACE,IAAI,EAAE,gBAAgB,CAAC;IACvB,kBAAkB,EAAE,UAAU,CAAC;CAChC,GACD;IACE,IAAI,EAAE,UAAU,CAAC;IACjB,gBAAgB,EAAE,UAAU,CAAC;IAC7B,SAAS,EAAE,KAAK,CAAC;CAClB,GACD;IACE,IAAI,EAAE,YAAY,CAAC;IACnB,cAAc,EAAE,UAAU,CAAC;IAC3B,WAAW,EAAE,KAAK,CAAC;CACpB,CAAC;AAEN,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,WAAW,CAAC,SAAS,CAAC,GAChC,SAAS,cAAc,EAAE,CAE3B;AA2RD,wBAAgB,yBAAyB,CACvC,cAAc,EAAE,cAAc,GAC7B,KAAK,GAAG,IAAI,CAqBd"}
|
|
@@ -14,6 +14,9 @@ class CompatibilityChecker {
|
|
|
14
14
|
check() {
|
|
15
15
|
for (const [, moduleBeforeResult] of this.moduleSet.before.modules) {
|
|
16
16
|
const moduleBefore = moduleBeforeResult.result;
|
|
17
|
+
if (moduleBefore.path.startsWith("@")) {
|
|
18
|
+
continue;
|
|
19
|
+
}
|
|
17
20
|
for (const methodBefore of moduleBefore.methods) {
|
|
18
21
|
const { number } = methodBefore;
|
|
19
22
|
const methodAfter = this.moduleSet.after.findMethodByNumber(number);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compatibility_checker.js","sourceRoot":"","sources":["../src/compatibility_checker.ts"],"names":[],"mappings":"AAkGA,MAAM,UAAU,kBAAkB,CAChC,SAAiC;IAEjC,OAAO,IAAI,oBAAoB,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,CAAC;AACrD,CAAC;AAED,MAAM,oBAAoB;IACxB,YAA6B,SAAiC;QAAjC,cAAS,GAAT,SAAS,CAAwB;
|
|
1
|
+
{"version":3,"file":"compatibility_checker.js","sourceRoot":"","sources":["../src/compatibility_checker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config_parser.d.ts","sourceRoot":"","sources":["../src/config_parser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"config_parser.d.ts","sourceRoot":"","sources":["../src/config_parser.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAM9C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,MAAM,WAAW,gBAAgB;IAC/B,gDAAgD;IAChD,UAAU,EAAE,UAAU,GAAG,SAAS,CAAC;IACnC,MAAM,EAAE,SAAS,eAAe,EAAE,CAAC;IACnC;;;OAGG;IACH,0BAA0B,CAAC,EAAE,OAAO,CAAC;CACtC;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,oBAAoB,CAAC;CAC9B;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,kBAAkB,CAAC;IAC1B,GAAG,EAAE,kBAAkB,CAAC;CACzB;AAED,MAAM,WAAW,kBAAkB;IACjC,cAAc;IACd,MAAM,EAAE,MAAM,CAAC;IACf,cAAc;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc;IACd,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,uDAAuD;AACvD,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,gBAAgB,CAElE;AAED,6DAA6D;AAC7D,wBAAsB,iCAAiC,CACrD,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,gBAAgB,CAAC,CAE3B;AAED,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAOjC"}
|
package/dist/config_parser.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as CcGen from "skir-cc-gen";
|
|
2
2
|
import * as DartGen from "skir-dart-gen";
|
|
3
|
+
import * as GoGen from "skir-go-gen";
|
|
3
4
|
import * as JavaGen from "skir-java-gen";
|
|
4
5
|
import * as KotlinGen from "skir-kotlin-gen";
|
|
5
6
|
import * as PythonGen from "skir-python-gen";
|
|
@@ -200,6 +201,7 @@ async function parseSkirConfigInternalAsync(yamlCode, getGenerator) {
|
|
|
200
201
|
const STATIC_GENERATORS = {
|
|
201
202
|
"skir-cc-gen": CcGen.GENERATOR,
|
|
202
203
|
"skir-dart-gen": DartGen.GENERATOR,
|
|
204
|
+
"skir-go-gen": GoGen.GENERATOR,
|
|
203
205
|
"skir-java-gen": JavaGen.GENERATOR,
|
|
204
206
|
"skir-kotlin-gen": KotlinGen.GENERATOR,
|
|
205
207
|
"skir-python-gen": PythonGen.GENERATOR,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config_parser.js","sourceRoot":"","sources":["../src/config_parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,aAAa,CAAC;AACrC,OAAO,KAAK,OAAO,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"config_parser.js","sourceRoot":"","sources":["../src/config_parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,7 +41,7 @@ export function initializeProject(rootDir) {
|
|
|
41
41
|
}
|
|
42
42
|
const SKIR_YML_CONTENT = `# Configuration file for Skir code generator
|
|
43
43
|
#
|
|
44
|
-
# Documentation: https://skir.
|
|
44
|
+
# Documentation: https://skir.build/
|
|
45
45
|
#
|
|
46
46
|
# Cheat sheet:
|
|
47
47
|
# npx skir gen Generate code from .skir files
|
|
@@ -72,6 +72,15 @@ generators:
|
|
|
72
72
|
# outDir: ./lib/skirout
|
|
73
73
|
# config: {}
|
|
74
74
|
|
|
75
|
+
# # --------------------------------------------------------------------------
|
|
76
|
+
# # Go code generator
|
|
77
|
+
# # Home: https://github.com/gepheum/skir-go-gen
|
|
78
|
+
# # To install runtime dependencies: go get github.com/gepheum/skir-go-client
|
|
79
|
+
# # --------------------------------------------------------------------------
|
|
80
|
+
# - mod: skir-go-gen
|
|
81
|
+
# outDir: ./skirout
|
|
82
|
+
# config: {}
|
|
83
|
+
|
|
75
84
|
# # --------------------------------------------------------------------------
|
|
76
85
|
# # Java code generator
|
|
77
86
|
# # Home: https://github.com/gepheum/skir-java-gen
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project_initializer.js","sourceRoot":"","sources":["../src/project_initializer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,IAAI,CAAC;AACjC,OAAO,KAAK,KAAK,MAAM,MAAM,CAAC;AAC9B,OAAO,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAC;AAElD,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAC/C,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAEpD,mCAAmC;IACnC,IAAI,UAAU,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;QACvC,OAAO,CAAC,GAAG,CACT,oFAAoF,CACrF,CAAC;QACF,OAAO;IACT,CAAC;IAED,uBAAuB;IACvB,UAAU,CAAC,aAAa,CAAC,WAAW,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAEjE,qCAAqC;IACrC,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IACnD,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QACvC,4BAA4B;QAC5B,UAAU,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAEtD,+BAA+B;QAC/B,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC;QAClE,UAAU,CAAC,aAAa,CAAC,cAAc,EAAE,wBAAwB,EAAE,OAAO,CAAC,CAAC;IAC9E,CAAC;IAED,iCAAiC;IACjC,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IACxD,IAAI,UAAU,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;QACzC,MAAM,OAAO,GAAG,UAAU,CAAC,YAAY,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QAChE,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACrC,MAAM,KAAK,GAAa,EAAE,CAAC;QAE3B,KAAK,MAAM,OAAO,IAAI,CAAC,SAAS,EAAE,eAAe,CAAC,EAAE,CAAC;YACnD,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CACvB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,OAAO,CACrD,CAAC;YACF,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,KAAK,CAAC,IAAI,CAAC,GAAG,OAAO,GAAG,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;QAED,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,MAAM,MAAM,GAAG,KAAK,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;YACzC,UAAU,CAAC,cAAc,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,sBAAsB,uBAAuB,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IAC1E,OAAO,CAAC,GAAG,CAAC,+CAA+C,CAAC,CAAC;AAC/D,CAAC;AAED,MAAM,gBAAgB,GAAG
|
|
1
|
+
{"version":3,"file":"project_initializer.js","sourceRoot":"","sources":["../src/project_initializer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,IAAI,CAAC;AACjC,OAAO,KAAK,KAAK,MAAM,MAAM,CAAC;AAC9B,OAAO,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAC;AAElD,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAC/C,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAEpD,mCAAmC;IACnC,IAAI,UAAU,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;QACvC,OAAO,CAAC,GAAG,CACT,oFAAoF,CACrF,CAAC;QACF,OAAO;IACT,CAAC;IAED,uBAAuB;IACvB,UAAU,CAAC,aAAa,CAAC,WAAW,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAEjE,qCAAqC;IACrC,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IACnD,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QACvC,4BAA4B;QAC5B,UAAU,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAEtD,+BAA+B;QAC/B,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC;QAClE,UAAU,CAAC,aAAa,CAAC,cAAc,EAAE,wBAAwB,EAAE,OAAO,CAAC,CAAC;IAC9E,CAAC;IAED,iCAAiC;IACjC,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IACxD,IAAI,UAAU,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;QACzC,MAAM,OAAO,GAAG,UAAU,CAAC,YAAY,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QAChE,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACrC,MAAM,KAAK,GAAa,EAAE,CAAC;QAE3B,KAAK,MAAM,OAAO,IAAI,CAAC,SAAS,EAAE,eAAe,CAAC,EAAE,CAAC;YACnD,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CACvB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,OAAO,CACrD,CAAC;YACF,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,KAAK,CAAC,IAAI,CAAC,GAAG,OAAO,GAAG,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;QAED,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,MAAM,MAAM,GAAG,KAAK,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;YACzC,UAAU,CAAC,cAAc,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,sBAAsB,uBAAuB,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IAC1E,OAAO,CAAC,GAAG,CAAC,+CAA+C,CAAC,CAAC;AAC/D,CAAC;AAED,MAAM,gBAAgB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8GxB,CAAC;AAEF,MAAM,wBAAwB,GAAG;;;;;;;CAOhC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "skir",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.19",
|
|
4
4
|
"description": "",
|
|
5
|
-
"homepage": "https://skir.
|
|
5
|
+
"homepage": "https://skir.build/",
|
|
6
6
|
"bugs": {
|
|
7
7
|
"url": "https://github.com/gepheum/skir/issues"
|
|
8
8
|
},
|
|
@@ -44,6 +44,7 @@
|
|
|
44
44
|
"glob": "^13.0.6",
|
|
45
45
|
"skir-cc-gen": "^1.0.7",
|
|
46
46
|
"skir-dart-gen": "^1.0.4",
|
|
47
|
+
"skir-go-gen": "^0.1.1",
|
|
47
48
|
"skir-internal": "^0.2.17",
|
|
48
49
|
"skir-java-gen": "^1.0.5",
|
|
49
50
|
"skir-kotlin-gen": "^1.0.6",
|
|
@@ -108,6 +108,9 @@ class CompatibilityChecker {
|
|
|
108
108
|
check(): readonly BreakingChange[] {
|
|
109
109
|
for (const [, moduleBeforeResult] of this.moduleSet.before.modules) {
|
|
110
110
|
const moduleBefore = moduleBeforeResult.result;
|
|
111
|
+
if (moduleBefore.path.startsWith("@")) {
|
|
112
|
+
continue;
|
|
113
|
+
}
|
|
111
114
|
for (const methodBefore of moduleBefore.methods) {
|
|
112
115
|
const { number } = methodBefore;
|
|
113
116
|
const methodAfter = this.moduleSet.after.findMethodByNumber(number);
|
package/src/config_parser.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as CcGen from "skir-cc-gen";
|
|
2
2
|
import * as DartGen from "skir-dart-gen";
|
|
3
|
+
import * as GoGen from "skir-go-gen";
|
|
3
4
|
import { CodeGenerator } from "skir-internal";
|
|
4
5
|
import * as JavaGen from "skir-java-gen";
|
|
5
6
|
import * as KotlinGen from "skir-kotlin-gen";
|
|
@@ -281,6 +282,7 @@ async function parseSkirConfigInternalAsync(
|
|
|
281
282
|
const STATIC_GENERATORS: Record<string, CodeGenerator<unknown>> = {
|
|
282
283
|
"skir-cc-gen": CcGen.GENERATOR as any as CodeGenerator<unknown>,
|
|
283
284
|
"skir-dart-gen": DartGen.GENERATOR as any as CodeGenerator<unknown>,
|
|
285
|
+
"skir-go-gen": GoGen.GENERATOR as any as CodeGenerator<unknown>,
|
|
284
286
|
"skir-java-gen": JavaGen.GENERATOR as any as CodeGenerator<unknown>,
|
|
285
287
|
"skir-kotlin-gen": KotlinGen.GENERATOR as any as CodeGenerator<unknown>,
|
|
286
288
|
"skir-python-gen": PythonGen.GENERATOR as any as CodeGenerator<unknown>,
|
|
@@ -55,7 +55,7 @@ export function initializeProject(rootDir: string): void {
|
|
|
55
55
|
|
|
56
56
|
const SKIR_YML_CONTENT = `# Configuration file for Skir code generator
|
|
57
57
|
#
|
|
58
|
-
# Documentation: https://skir.
|
|
58
|
+
# Documentation: https://skir.build/
|
|
59
59
|
#
|
|
60
60
|
# Cheat sheet:
|
|
61
61
|
# npx skir gen Generate code from .skir files
|
|
@@ -86,6 +86,15 @@ generators:
|
|
|
86
86
|
# outDir: ./lib/skirout
|
|
87
87
|
# config: {}
|
|
88
88
|
|
|
89
|
+
# # --------------------------------------------------------------------------
|
|
90
|
+
# # Go code generator
|
|
91
|
+
# # Home: https://github.com/gepheum/skir-go-gen
|
|
92
|
+
# # To install runtime dependencies: go get github.com/gepheum/skir-go-client
|
|
93
|
+
# # --------------------------------------------------------------------------
|
|
94
|
+
# - mod: skir-go-gen
|
|
95
|
+
# outDir: ./skirout
|
|
96
|
+
# config: {}
|
|
97
|
+
|
|
89
98
|
# # --------------------------------------------------------------------------
|
|
90
99
|
# # Java code generator
|
|
91
100
|
# # Home: https://github.com/gepheum/skir-java-gen
|