@apollo-deploy/tesseract 1.3.0 → 1.5.0
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/dist/adapters/kotlin/index.d.ts.map +1 -1
- package/dist/adapters/kotlin/index.js +26 -6
- package/dist/adapters/kotlin/index.js.map +1 -1
- package/package.json +1 -1
- package/templates/kotlin/build-gradle.hbs +9 -0
- package/templates/kotlin/settings-gradle.hbs +20 -0
- package/templates/kotlin/transport.hbs +20 -33
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/adapters/kotlin/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/adapters/kotlin/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAiG5D,qBAAa,aAAc,YAAW,eAAe;IACnD,QAAQ,CAAC,QAAQ,YAAY;IAEvB,IAAI,CACR,QAAQ,EAAE,aAAa,EACvB,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,cAAc,GACtB,OAAO,CAAC,UAAU,CAAC;CAyJvB"}
|
|
@@ -34,20 +34,40 @@ function kotlinType(tsType) {
|
|
|
34
34
|
if (arrMatch) {
|
|
35
35
|
return `List<${kotlinType(arrMatch[1])}>`;
|
|
36
36
|
}
|
|
37
|
-
// Record<K, V> → Map<K,
|
|
37
|
+
// Record<K, V> → Map<kotlinType(K), JsonElement>
|
|
38
|
+
// Record values are open-ended objects — collapse to JsonElement to avoid
|
|
39
|
+
// leaking TypeScript idioms like Map<String, Map<string, unknown>> into Kotlin.
|
|
38
40
|
const recMatch = t.match(/^Record<(.+),\s*(.+)>$/);
|
|
39
41
|
if (recMatch) {
|
|
40
|
-
return `Map<${kotlinType(recMatch[1])},
|
|
42
|
+
return `Map<${kotlinType(recMatch[1])}, kotlinx.serialization.json.JsonElement>`;
|
|
41
43
|
}
|
|
42
|
-
// Map<
|
|
44
|
+
// Map<K, V> (two-arg form emitted by some intake paths)
|
|
45
|
+
const mapTwoMatch = t.match(/^Map<([^,]+),\s*(.+)>$/);
|
|
46
|
+
if (mapTwoMatch) {
|
|
47
|
+
return `Map<${kotlinType(mapTwoMatch[1])}, ${kotlinType(mapTwoMatch[2])}>`;
|
|
48
|
+
}
|
|
49
|
+
// Map<V> (one-arg shorthand) → Map<String, V>
|
|
43
50
|
const mapMatch = t.match(/^Map<(.+)>$/);
|
|
44
51
|
if (mapMatch) {
|
|
45
52
|
return `Map<String, ${kotlinType(mapMatch[1])}>`;
|
|
46
53
|
}
|
|
47
|
-
// Union type `A | B
|
|
54
|
+
// Union type `A | B`:
|
|
55
|
+
// - If the union contains a primitive (string/number/…) alongside a complex
|
|
56
|
+
// type, the combination has no idiomatic Kotlin equivalent — collapse to
|
|
57
|
+
// JsonElement so we don't leak "StringOr…" aliases into the generated code.
|
|
58
|
+
// - Pure non-primitive unions keep the sealed-class approximation.
|
|
48
59
|
if (t.includes(" | ")) {
|
|
49
|
-
const parts = t.split(" | ").map((p) =>
|
|
50
|
-
|
|
60
|
+
const parts = t.split(" | ").map((p) => p.trim());
|
|
61
|
+
const primitives = new Set(["string", "number", "integer", "boolean"]);
|
|
62
|
+
const hasPrimitive = parts.some((p) => primitives.has(p));
|
|
63
|
+
const hasComplex = parts.some((p) => !primitives.has(p) &&
|
|
64
|
+
p !== "null" &&
|
|
65
|
+
!KOTLIN_TYPE_MAP[p]);
|
|
66
|
+
if (hasPrimitive && hasComplex) {
|
|
67
|
+
return "kotlinx.serialization.json.JsonElement";
|
|
68
|
+
}
|
|
69
|
+
const mapped = parts.map((p) => kotlinType(p));
|
|
70
|
+
return mapped.join("Or").replace(/\s/g, "");
|
|
51
71
|
}
|
|
52
72
|
// Intersection type — approximate
|
|
53
73
|
if (t.includes(" & ")) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/adapters/kotlin/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,UAAU,MAAM,YAAY,CAAC;AAMpC,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE3F,gFAAgF;AAChF,sBAAsB;AACtB,gFAAgF;AAEhF,MAAM,eAAe,GAA2B;IAC9C,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,MAAM;IACf,OAAO,EAAE,SAAS;IAClB,GAAG,EAAE,wCAAwC;IAC7C,OAAO,EAAE,wCAAwC;IACjD,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,UAAU;CACjB,CAAC;AAEF,SAAS,UAAU,CAAC,MAAc;IAChC,MAAM,CAAC,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;IAExB,IAAI,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;QACvB,OAAO,eAAe,CAAC,CAAC,CAAC,CAAC;IAC5B,CAAC;IAED,8BAA8B;IAC9B,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;IACjD,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IACxC,CAAC;IAED,qBAAqB;IACrB,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAC1C,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO,QAAQ,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IAC5C,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/adapters/kotlin/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -13,6 +13,15 @@ repositories {
|
|
|
13
13
|
mavenCentral()
|
|
14
14
|
}
|
|
15
15
|
|
|
16
|
+
configurations.all {
|
|
17
|
+
resolutionStrategy.eachDependency {
|
|
18
|
+
if (requested.group == "org.jetbrains.kotlin") {
|
|
19
|
+
useVersion("2.3.21")
|
|
20
|
+
because("Align all Kotlin stdlib/reflect artifacts to the compiler version")
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
|
|
16
25
|
dependencies {
|
|
17
26
|
api(kotlin("stdlib"))
|
|
18
27
|
api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.11.0")
|
|
@@ -1 +1,21 @@
|
|
|
1
|
+
pluginManagement {
|
|
2
|
+
resolutionStrategy {
|
|
3
|
+
eachPlugin {
|
|
4
|
+
if (requested.id.id.startsWith("org.jetbrains.kotlin")) {
|
|
5
|
+
useVersion("2.3.21")
|
|
6
|
+
}
|
|
7
|
+
}
|
|
8
|
+
}
|
|
9
|
+
repositories {
|
|
10
|
+
gradlePluginPortal()
|
|
11
|
+
mavenCentral()
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
dependencyResolutionManagement {
|
|
16
|
+
repositories {
|
|
17
|
+
mavenCentral()
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
|
|
1
21
|
rootProject.name = "{{artifactId}}"
|
|
@@ -22,6 +22,8 @@ data class TransportConfig(
|
|
|
22
22
|
{{#each securitySchemes}}
|
|
23
23
|
val {{configKey}}: String? = null,
|
|
24
24
|
{{/each}}
|
|
25
|
+
val defaultHeaders: Map<String, String> = emptyMap(),
|
|
26
|
+
val serviceToken: String? = null,
|
|
25
27
|
val timeoutMs: Long = 15000,
|
|
26
28
|
val maxRetries: Int = 3,
|
|
27
29
|
)
|
|
@@ -35,7 +37,7 @@ data class TransportConfig(
|
|
|
35
37
|
class Transport(
|
|
36
38
|
private val config: TransportConfig
|
|
37
39
|
) {
|
|
38
|
-
|
|
40
|
+
internal val json = Json {
|
|
39
41
|
ignoreUnknownKeys = true
|
|
40
42
|
isLenient = true
|
|
41
43
|
encodeDefaults = true
|
|
@@ -57,6 +59,23 @@ class Transport(
|
|
|
57
59
|
url(config.baseUrl)
|
|
58
60
|
contentType(ContentType.Application.Json)
|
|
59
61
|
accept(ContentType.Application.Json)
|
|
62
|
+
{{#each securitySchemes}}
|
|
63
|
+
{{#if (eq type "apiKey")}}
|
|
64
|
+
{{#if (eq in "header")}}
|
|
65
|
+
config.{{configKey}}?.let { key -> headers.append("{{paramName}}", key) }
|
|
66
|
+
{{/if}}
|
|
67
|
+
{{/if}}
|
|
68
|
+
{{#if (and (eq type "http") (eq scheme "bearer"))}}
|
|
69
|
+
config.{{configKey}}?.let { token -> headers.append("Authorization", "Bearer $token") }
|
|
70
|
+
{{/if}}
|
|
71
|
+
{{#if (eq type "oauth2")}}
|
|
72
|
+
config.{{configKey}}?.let { token -> headers.append("Authorization", "Bearer $token") }
|
|
73
|
+
{{/if}}
|
|
74
|
+
{{#if (eq type "openIdConnect")}}
|
|
75
|
+
config.{{configKey}}?.let { token -> headers.append("Authorization", "Bearer $token") }
|
|
76
|
+
{{/if}}
|
|
77
|
+
{{/each}}
|
|
78
|
+
config.defaultHeaders.forEach { (k, v) -> headers.append(k, v) }
|
|
60
79
|
}
|
|
61
80
|
}
|
|
62
81
|
|
|
@@ -130,9 +149,6 @@ class Transport(
|
|
|
130
149
|
headers?.forEach { (key, value) ->
|
|
131
150
|
this.headers.append(key, value)
|
|
132
151
|
}
|
|
133
|
-
|
|
134
|
-
// Apply authentication
|
|
135
|
-
applyAuth()
|
|
136
152
|
}
|
|
137
153
|
|
|
138
154
|
val status = response.status.value
|
|
@@ -215,33 +231,4 @@ class Transport(
|
|
|
215
231
|
)
|
|
216
232
|
}
|
|
217
233
|
|
|
218
|
-
private fun HttpRequestBuilder.applyAuth() {
|
|
219
|
-
{{#each securitySchemes}}
|
|
220
|
-
{{#if (eq type "apiKey")}}
|
|
221
|
-
{{#if (eq in "header")}}
|
|
222
|
-
config.{{configKey}}?.let { key ->
|
|
223
|
-
headers.append("{{paramName}}", key)
|
|
224
|
-
}
|
|
225
|
-
{{/if}}
|
|
226
|
-
{{#if (eq in "query")}}
|
|
227
|
-
// API key via query parameter handled during URL construction
|
|
228
|
-
{{/if}}
|
|
229
|
-
{{/if}}
|
|
230
|
-
{{#if (and (eq type "http") (eq scheme "bearer"))}}
|
|
231
|
-
config.{{configKey}}?.let { token ->
|
|
232
|
-
headers.append("Authorization", "Bearer $token")
|
|
233
|
-
}
|
|
234
|
-
{{/if}}
|
|
235
|
-
{{#if (eq type "oauth2")}}
|
|
236
|
-
config.{{configKey}}?.let { token ->
|
|
237
|
-
headers.append("Authorization", "Bearer $token")
|
|
238
|
-
}
|
|
239
|
-
{{/if}}
|
|
240
|
-
{{#if (eq type "openIdConnect")}}
|
|
241
|
-
config.{{configKey}}?.let { token ->
|
|
242
|
-
headers.append("Authorization", "Bearer $token")
|
|
243
|
-
}
|
|
244
|
-
{{/if}}
|
|
245
|
-
{{/each}}
|
|
246
|
-
}
|
|
247
234
|
}
|