@goast/kotlin 0.5.11 → 0.5.12-beta.1
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/LICENSE +21 -21
- package/README.md +45 -45
- package/assets/client/okhttp3/ApiAbstractions.kt +30 -30
- package/assets/client/okhttp3/ApiClient.kt +252 -252
- package/assets/client/okhttp3/ApiResponse.kt +43 -43
- package/assets/client/okhttp3/Errors.kt +21 -21
- package/assets/client/okhttp3/PartConfig.kt +11 -11
- package/assets/client/okhttp3/RequestConfig.kt +18 -18
- package/assets/client/okhttp3/RequestMethod.kt +8 -8
- package/assets/client/okhttp3/ResponseExtensions.kt +24 -24
- package/assets/client/spring-reactive-web-clients/ApiRequestFile.kt +33 -33
- package/esm/src/generators/models/model-generator.d.ts.map +1 -1
- package/esm/src/generators/models/model-generator.js +12 -3
- package/esm/src/generators/services/okhttp3-clients/okhttp3-client-generator.d.ts.map +1 -1
- package/esm/src/generators/services/okhttp3-clients/okhttp3-client-generator.js +19 -12
- package/esm/src/generators/services/spring-controllers/spring-controller-generator.d.ts.map +1 -1
- package/esm/src/generators/services/spring-controllers/spring-controller-generator.js +30 -22
- package/esm/src/generators/services/spring-reactive-web-clients/spring-reactive-web-client-generator.d.ts.map +1 -1
- package/esm/src/generators/services/spring-reactive-web-clients/spring-reactive-web-client-generator.js +25 -16
- package/esm/src/utils.d.ts +3 -1
- package/esm/src/utils.d.ts.map +1 -1
- package/esm/src/utils.js +7 -0
- package/package.json +1 -1
- package/script/src/generators/models/model-generator.d.ts.map +1 -1
- package/script/src/generators/models/model-generator.js +11 -2
- package/script/src/generators/services/okhttp3-clients/okhttp3-client-generator.d.ts.map +1 -1
- package/script/src/generators/services/okhttp3-clients/okhttp3-client-generator.js +18 -11
- package/script/src/generators/services/spring-controllers/spring-controller-generator.d.ts.map +1 -1
- package/script/src/generators/services/spring-controllers/spring-controller-generator.js +29 -21
- package/script/src/generators/services/spring-reactive-web-clients/spring-reactive-web-client-generator.d.ts.map +1 -1
- package/script/src/generators/services/spring-reactive-web-clients/spring-reactive-web-client-generator.js +24 -15
- package/script/src/utils.d.ts +3 -1
- package/script/src/utils.d.ts.map +1 -1
- package/script/src/utils.js +9 -0
- package/src/mod.ts +0 -8
- package/src/src/assets.ts +0 -9
- package/src/src/ast/_index.ts +0 -66
- package/src/src/ast/common.ts +0 -1
- package/src/src/ast/index.ts +0 -1
- package/src/src/ast/node.ts +0 -10
- package/src/src/ast/nodes/annotation.ts +0 -79
- package/src/src/ast/nodes/argument.ts +0 -62
- package/src/src/ast/nodes/call.ts +0 -75
- package/src/src/ast/nodes/class.ts +0 -178
- package/src/src/ast/nodes/collection-literal.ts +0 -49
- package/src/src/ast/nodes/constructor.ts +0 -126
- package/src/src/ast/nodes/doc-tag.ts +0 -138
- package/src/src/ast/nodes/doc.ts +0 -111
- package/src/src/ast/nodes/enum-value.ts +0 -100
- package/src/src/ast/nodes/enum.ts +0 -163
- package/src/src/ast/nodes/function.ts +0 -178
- package/src/src/ast/nodes/generic-parameter.ts +0 -54
- package/src/src/ast/nodes/init-block.ts +0 -38
- package/src/src/ast/nodes/interface.ts +0 -133
- package/src/src/ast/nodes/lambda-type.ts +0 -73
- package/src/src/ast/nodes/lambda.ts +0 -74
- package/src/src/ast/nodes/object.ts +0 -102
- package/src/src/ast/nodes/parameter.ts +0 -118
- package/src/src/ast/nodes/property.ts +0 -225
- package/src/src/ast/nodes/reference.ts +0 -178
- package/src/src/ast/nodes/string.ts +0 -114
- package/src/src/ast/nodes/types.ts +0 -23
- package/src/src/ast/references/index.ts +0 -10
- package/src/src/ast/references/jackson.ts +0 -59
- package/src/src/ast/references/jakarta.ts +0 -14
- package/src/src/ast/references/java.ts +0 -27
- package/src/src/ast/references/kotlin.ts +0 -41
- package/src/src/ast/references/kotlinx.ts +0 -14
- package/src/src/ast/references/okhttp3.ts +0 -5
- package/src/src/ast/references/reactor.ts +0 -5
- package/src/src/ast/references/spring-reactive.ts +0 -37
- package/src/src/ast/references/spring.ts +0 -86
- package/src/src/ast/references/swagger.ts +0 -23
- package/src/src/ast/utils/get-kotlin-builder-options.ts +0 -19
- package/src/src/ast/utils/to-kt-node.ts +0 -31
- package/src/src/ast/utils/write-kt-annotations.ts +0 -15
- package/src/src/ast/utils/write-kt-arguments.ts +0 -45
- package/src/src/ast/utils/write-kt-enum-values.ts +0 -27
- package/src/src/ast/utils/write-kt-generic-parameters.ts +0 -12
- package/src/src/ast/utils/write-kt-members.ts +0 -25
- package/src/src/ast/utils/write-kt-node.ts +0 -37
- package/src/src/ast/utils/write-kt-parameters.ts +0 -25
- package/src/src/common-results.ts +0 -4
- package/src/src/config.ts +0 -61
- package/src/src/file-builder.ts +0 -112
- package/src/src/generators/file-generator.ts +0 -29
- package/src/src/generators/index.ts +0 -5
- package/src/src/generators/models/args.ts +0 -136
- package/src/src/generators/models/index.ts +0 -4
- package/src/src/generators/models/model-generator.ts +0 -725
- package/src/src/generators/models/models-generator.ts +0 -65
- package/src/src/generators/models/models.ts +0 -95
- package/src/src/generators/services/okhttp3-clients/args.ts +0 -90
- package/src/src/generators/services/okhttp3-clients/index.ts +0 -4
- package/src/src/generators/services/okhttp3-clients/models.ts +0 -73
- package/src/src/generators/services/okhttp3-clients/okhttp3-client-generator.ts +0 -613
- package/src/src/generators/services/okhttp3-clients/okhttp3-clients-generator.ts +0 -188
- package/src/src/generators/services/okhttp3-clients/refs.ts +0 -59
- package/src/src/generators/services/spring-controllers/args.ts +0 -95
- package/src/src/generators/services/spring-controllers/index.ts +0 -4
- package/src/src/generators/services/spring-controllers/models.ts +0 -76
- package/src/src/generators/services/spring-controllers/refs.ts +0 -17
- package/src/src/generators/services/spring-controllers/spring-controller-generator.ts +0 -1109
- package/src/src/generators/services/spring-controllers/spring-controllers-generator.ts +0 -140
- package/src/src/generators/services/spring-reactive-web-clients/args.ts +0 -103
- package/src/src/generators/services/spring-reactive-web-clients/index.ts +0 -4
- package/src/src/generators/services/spring-reactive-web-clients/models.ts +0 -62
- package/src/src/generators/services/spring-reactive-web-clients/refs.ts +0 -11
- package/src/src/generators/services/spring-reactive-web-clients/spring-reactive-web-client-generator.ts +0 -579
- package/src/src/generators/services/spring-reactive-web-clients/spring-reactive-web-clients-generator.ts +0 -125
- package/src/src/import-collection.ts +0 -98
- package/src/src/types.ts +0 -3
- package/src/src/utils.ts +0 -47
|
@@ -215,8 +215,17 @@ class DefaultKotlinModelGenerator extends file_generator_js_1.KotlinFileGenerato
|
|
|
215
215
|
return schema.enum && schema.enum.length > 0
|
|
216
216
|
? index_js_1.kt.call([this.getType(ctx, { schema }), (0, core_1.toCasing)(String(schema.default), ctx.config.enumValueNameCasing)])
|
|
217
217
|
: index_js_1.kt.string(String(schema.default));
|
|
218
|
-
case 'array':
|
|
219
|
-
|
|
218
|
+
case 'array': {
|
|
219
|
+
const itemEnumSchema = (0, utils_js_1.getStringEnumSchema)(schema.items);
|
|
220
|
+
return index_js_1.kt.call(index_js_1.kt.refs.listOf.infer(), Array.isArray(schema.default)
|
|
221
|
+
? schema.default.map((x) => itemEnumSchema
|
|
222
|
+
? index_js_1.kt.call([
|
|
223
|
+
this.getType(ctx, { schema: itemEnumSchema }),
|
|
224
|
+
(0, core_1.toCasing)(String(x), ctx.config.enumValueNameCasing),
|
|
225
|
+
])
|
|
226
|
+
: index_js_1.kt.toNode(x))
|
|
227
|
+
: []);
|
|
228
|
+
}
|
|
220
229
|
default:
|
|
221
230
|
return 'null';
|
|
222
231
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"okhttp3-client-generator.d.ts","sourceRoot":"","sources":["../../../../../src/src/generators/services/okhttp3-clients/okhttp3-client-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,SAAS,EACd,KAAK,gBAAgB,EAErB,KAAK,gBAAgB,EAIrB,KAAK,YAAY,EAGjB,aAAa,EAEd,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,EAAE,EAAE,MAAM,uBAAuB,CAAC;AAE3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,mBAAmB,CAAC;AAEvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EAAE,iCAAiC,IAAI,IAAI,EAAE,MAAM,YAAY,CAAC;AAC5E,OAAO,KAAK,EAAE,mCAAmC,EAAE,kCAAkC,EAAE,MAAM,aAAa,CAAC;AAE3G,KAAK,OAAO,GAAG,mCAAmC,CAAC;AACnD,KAAK,MAAM,GAAG,kCAAkC,CAAC;AACjD,KAAK,OAAO,GAAG,iBAAiB,CAAC;AAEjC,MAAM,WAAW,sBAAsB,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM;IACrE,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;CAC/C;AAED,qBAAa,6BAA8B,SAAQ,mBAAmB,CAAC,OAAO,EAAE,MAAM,CACpF,YAAW,sBAAsB;IAC1B,QAAQ,CAAC,GAAG,EAAE,mCAAmC,GAAG,YAAY,CAAC,MAAM,CAAC;IAkB/E,SAAS,CAAC,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,oBAAoB,GAAG,gBAAgB,CAAC,OAAO,CAAC;IAIzG,SAAS,CAAC,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC;IAwCrF,SAAS,CAAC,wBAAwB,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,wBAAwB,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC;IAuB1G,SAAS,CAAC,wBAAwB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,wBAAwB,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE;IAUhH,SAAS,CAAC,uBAAuB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,uBAAuB,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC;IAwCzG,SAAS,CAAC,2BAA2B,CACnC,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,CAAC,2BAA2B,GACrC,gBAAgB,CAAC,OAAO,CAAC;IA+C5B,SAAS,CAAC,+BAA+B,CACvC,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,CAAC,+BAA+B,GACzC,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC;IAgCvB,SAAS,CAAC,mCAAmC,CAC3C,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,CAAC,mCAAmC,GAC7C,gBAAgB,CAAC,OAAO,CAAC;IA6B5B,SAAS,CAAC,oCAAoC,CAC5C,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,CAAC,oCAAoC,GAC9C,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC;IAuBvB,SAAS,CAAC,wCAAwC,CAChD,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,CAAC,wCAAwC,GAClD,gBAAgB,CAAC,OAAO,CAAC;IAoF5B,SAAS,CAAC,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,oBAAoB,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"okhttp3-client-generator.d.ts","sourceRoot":"","sources":["../../../../../src/src/generators/services/okhttp3-clients/okhttp3-client-generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -248,13 +248,14 @@ class DefaultKotlinOkHttp3Generator extends file_generator_js_1.KotlinFileGenera
|
|
|
248
248
|
return result;
|
|
249
249
|
}
|
|
250
250
|
getParameterToString(ctx, args) {
|
|
251
|
-
var _a
|
|
251
|
+
var _a;
|
|
252
252
|
const { parameter } = args;
|
|
253
253
|
if (((_a = parameter.schema) === null || _a === void 0 ? void 0 : _a.kind) === 'array') {
|
|
254
|
-
|
|
254
|
+
const itemEnumSchema = (0, utils_js_1.getArrayItemStringEnumSchema)(parameter.schema);
|
|
255
|
+
const itemEnumType = itemEnumSchema && this.getSchemaType(ctx, { schema: itemEnumSchema });
|
|
256
|
+
return itemEnumType ? (0, core_1.builderTemplate) `.joinToString(transform = ${itemEnumType}::value)` : '.joinToString()';
|
|
255
257
|
}
|
|
256
|
-
else if ((
|
|
257
|
-
this.getSchemaType(ctx, { schema: parameter.schema })) {
|
|
258
|
+
else if ((0, utils_js_1.getStringEnumSchema)(parameter.schema) && this.getSchemaType(ctx, { schema: parameter.schema })) {
|
|
258
259
|
return '.value';
|
|
259
260
|
}
|
|
260
261
|
else {
|
|
@@ -292,13 +293,19 @@ class DefaultKotlinOkHttp3Generator extends file_generator_js_1.KotlinFileGenera
|
|
|
292
293
|
: this.getTypeUsage(ctx, { schema: content === null || content === void 0 ? void 0 : content.schema, fallback: index_js_1.kt.refs.unit() });
|
|
293
294
|
}
|
|
294
295
|
getParameterDefaultValue(ctx, args) {
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
296
|
+
const { schema } = args.parameter;
|
|
297
|
+
if (args.parameter.required) {
|
|
298
|
+
return null;
|
|
299
|
+
}
|
|
300
|
+
if ((0, utils_js_1.getStringEnumSchema)(schema) && (schema === null || schema === void 0 ? void 0 : schema.default)) {
|
|
301
|
+
return (0, core_1.builderTemplate) `${this.getTypeUsage(ctx, { schema, nullable: false })}.${(0, core_1.toCasing)(String(schema.default), ctx.config.enumValueNameCasing)}`;
|
|
302
|
+
}
|
|
303
|
+
const itemEnumSchema = (0, utils_js_1.getArrayItemStringEnumSchema)(schema);
|
|
304
|
+
if (itemEnumSchema && Array.isArray(schema === null || schema === void 0 ? void 0 : schema.default)) {
|
|
305
|
+
const itemType = this.getTypeUsage(ctx, { schema: itemEnumSchema, nullable: false });
|
|
306
|
+
return index_js_1.kt.call(index_js_1.kt.refs.listOf.infer(), schema.default.map((x) => (0, core_1.builderTemplate) `${itemType}.${(0, core_1.toCasing)(String(x), ctx.config.enumValueNameCasing)}`));
|
|
307
|
+
}
|
|
308
|
+
return index_js_1.kt.toNode(schema === null || schema === void 0 ? void 0 : schema.default);
|
|
302
309
|
}
|
|
303
310
|
getTypeUsage(ctx, args) {
|
|
304
311
|
const { schema, nullable, fallback } = args;
|
package/script/src/generators/services/spring-controllers/spring-controller-generator.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spring-controller-generator.d.ts","sourceRoot":"","sources":["../../../../../src/src/generators/services/spring-controllers/spring-controller-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,WAAW,EAEhB,KAAK,gBAAgB,EAErB,KAAK,gBAAgB,EAIrB,KAAK,YAAY,EAGjB,aAAa,EAEd,MAAM,aAAa,CAAC;AAGrB,OAAO,EAAE,EAAE,EAAE,MAAM,uBAAuB,CAAC;AAC3C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,mBAAmB,CAAC;AAEvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EAAE,0CAA0C,IAAI,IAAI,EAAE,MAAM,YAAY,CAAC;AACrF,OAAO,KAAK,EAAE,6BAA6B,EAAE,4BAA4B,EAAE,MAAM,aAAa,CAAC;AAE/F,KAAK,OAAO,GAAG,6BAA6B,CAAC;AAC7C,KAAK,MAAM,GAAG,4BAA4B,CAAC;AAC3C,KAAK,OAAO,GAAG,iBAAiB,CAAC;AAIjC,MAAM,WAAW,+BAA+B,CAC9C,OAAO,SAAS,MAAM,GAAG,MAAM;IAE/B,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;CAC/C;AAED,qBAAa,sCAAuC,SAAQ,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAC7F,YAAW,+BAA+B;IACnC,QAAQ,CACb,GAAG,EAAE,6BAA6B,GACjC,YAAY,CAAC,4BAA4B,CAAC;IA4B7C,SAAS,CAAC,wBAAwB,CAChC,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,CAAC,wBAAwB,GAClC,YAAY;IAgBf,SAAS,CAAC,0BAA0B,CAClC,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,CAAC,0BAA0B,GACpC,gBAAgB,CAAC,OAAO,CAAC;IAQ5B,SAAS,CAAC,eAAe,CACvB,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,CAAC,eAAe,GACzB,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC;IAiBxB,SAAS,CAAC,0BAA0B,CAAC,GAAG,EAAE,OAAO,GAAG,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;IAQ5E,SAAS,CAAC,sBAAsB,CAAC,GAAG,EAAE,OAAO,GAAG,EAAE,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE;IAgC7E,SAAS,CAAC,6BAA6B,CACrC,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,CAAC,6BAA6B,GACvC,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC;IAiBvB,SAAS,CAAC,yCAAyC,CACjD,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,WAAW,GACpB,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;IA0H3B,SAAS,CAAC,sCAAsC,CAC9C,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,WAAW,EACrB,SAAS,EAAE,6BAA6B,GACvC,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"spring-controller-generator.d.ts","sourceRoot":"","sources":["../../../../../src/src/generators/services/spring-controllers/spring-controller-generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -174,37 +174,42 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_js_1.KotlinF
|
|
|
174
174
|
return annotations;
|
|
175
175
|
}
|
|
176
176
|
getApiInterfaceEndpointMethodParameter(ctx, endpoint, parameter) {
|
|
177
|
-
var _a, _b, _c, _d, _e, _f, _g, _h
|
|
178
|
-
const
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
!parameter.multipart;
|
|
177
|
+
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
178
|
+
const enumItemSchema = parameter.multipart ? undefined : (0, utils_js_1.getArrayItemStringEnumSchema)(parameter.schema);
|
|
179
|
+
const enumSchema = parameter.multipart ? undefined : (0, utils_js_1.getStringEnumSchema)(parameter.schema);
|
|
180
|
+
const enumValueSchema = enumSchema !== null && enumSchema !== void 0 ? enumSchema : enumItemSchema;
|
|
182
181
|
const actualType = this.getSchemaType(ctx, { schema: parameter.schema });
|
|
183
|
-
const
|
|
182
|
+
const isEnumSchema = !!enumValueSchema && !!actualType &&
|
|
183
|
+
!!this.getSchemaType(ctx, { schema: enumValueSchema });
|
|
184
|
+
const schemaType = !isEnumSchema
|
|
185
|
+
? actualType
|
|
186
|
+
: enumItemSchema
|
|
187
|
+
? index_js_1.kt.refs.list([index_js_1.kt.refs.string()], { nullable: actualType === null || actualType === void 0 ? void 0 : actualType.nullable })
|
|
188
|
+
: index_js_1.kt.refs.string({ nullable: actualType === null || actualType === void 0 ? void 0 : actualType.nullable });
|
|
184
189
|
const result = index_js_1.kt.parameter((0, core_1.toCasing)(parameter.name, ctx.config.parameterNameCasing), this.getParameterType(ctx, {
|
|
185
190
|
endpoint,
|
|
186
191
|
parameter,
|
|
187
192
|
type: isEnumSchema ? schemaType : undefined,
|
|
188
193
|
}), {
|
|
189
|
-
default: parameter.multipart && ((
|
|
190
|
-
? index_js_1.kt.toNode((
|
|
194
|
+
default: parameter.multipart && ((_a = parameter.schema) === null || _a === void 0 ? void 0 : _a.default) !== undefined
|
|
195
|
+
? index_js_1.kt.toNode((_b = parameter.schema) === null || _b === void 0 ? void 0 : _b.default)
|
|
191
196
|
: null,
|
|
192
197
|
});
|
|
193
198
|
if (ctx.config.addSwaggerAnnotations) {
|
|
194
199
|
const annotation = index_js_1.kt.annotation(index_js_1.kt.refs.swagger.parameter(), [
|
|
195
200
|
parameter.multipart ? index_js_1.kt.argument.named('name', index_js_1.kt.string(parameter.multipart.name)) : null,
|
|
196
201
|
parameter.description
|
|
197
|
-
? index_js_1.kt.argument.named('description', index_js_1.kt.string((
|
|
202
|
+
? index_js_1.kt.argument.named('description', index_js_1.kt.string((_c = parameter.description) === null || _c === void 0 ? void 0 : _c.trim()))
|
|
198
203
|
: null,
|
|
199
204
|
index_js_1.kt.argument.named('required', parameter.required),
|
|
200
205
|
parameter.target === 'header' ? index_js_1.kt.argument.named('hidden', index_js_1.kt.toNode(true)) : null,
|
|
201
206
|
]);
|
|
202
207
|
const schemaArgs = [];
|
|
203
|
-
if (((
|
|
204
|
-
schemaArgs.push(index_js_1.kt.argument.named('defaultValue', index_js_1.kt.string(String((
|
|
208
|
+
if (((_d = parameter.schema) === null || _d === void 0 ? void 0 : _d.default) !== undefined) {
|
|
209
|
+
schemaArgs.push(index_js_1.kt.argument.named('defaultValue', index_js_1.kt.string(String((_e = parameter.schema) === null || _e === void 0 ? void 0 : _e.default))));
|
|
205
210
|
}
|
|
206
211
|
if (isEnumSchema) {
|
|
207
|
-
schemaArgs.push(index_js_1.kt.argument.named('allowableValues', index_js_1.kt.collectionLiteral((
|
|
212
|
+
schemaArgs.push(index_js_1.kt.argument.named('allowableValues', index_js_1.kt.collectionLiteral((_f = enumValueSchema === null || enumValueSchema === void 0 ? void 0 : enumValueSchema.enum) === null || _f === void 0 ? void 0 : _f.map((x) => index_js_1.kt.string(x === null || x === void 0 ? void 0 : x.toString())))));
|
|
208
213
|
}
|
|
209
214
|
if (schemaArgs.length) {
|
|
210
215
|
annotation.arguments.push(index_js_1.kt.argument.named('schema', index_js_1.kt.call([index_js_1.kt.refs.swagger.schema()], schemaArgs)));
|
|
@@ -224,8 +229,8 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_js_1.KotlinF
|
|
|
224
229
|
index_js_1.kt.argument.named('value', index_js_1.kt.string(parameter.name)),
|
|
225
230
|
index_js_1.kt.argument.named('required', parameter.required),
|
|
226
231
|
]);
|
|
227
|
-
if (((
|
|
228
|
-
annotation.arguments.push(index_js_1.kt.argument.named('defaultValue', index_js_1.kt.string(String((
|
|
232
|
+
if (((_g = parameter.schema) === null || _g === void 0 ? void 0 : _g.default) !== undefined) {
|
|
233
|
+
annotation.arguments.push(index_js_1.kt.argument.named('defaultValue', index_js_1.kt.string(String((_h = parameter.schema) === null || _h === void 0 ? void 0 : _h.default))));
|
|
229
234
|
}
|
|
230
235
|
result.annotations.push(annotation);
|
|
231
236
|
}
|
|
@@ -252,13 +257,16 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_js_1.KotlinF
|
|
|
252
257
|
parameters.forEach((x) => {
|
|
253
258
|
var _a, _b;
|
|
254
259
|
const paramName = (0, core_1.toCasing)(x.name, ctx.config.parameterNameCasing);
|
|
255
|
-
if (
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
260
|
+
if (x.multipart)
|
|
261
|
+
return;
|
|
262
|
+
const enumItemSchema = (0, utils_js_1.getArrayItemStringEnumSchema)(x.schema);
|
|
263
|
+
const enumValueSchema = (_a = (0, utils_js_1.getStringEnumSchema)(x.schema)) !== null && _a !== void 0 ? _a : enumItemSchema;
|
|
264
|
+
if (!enumValueSchema)
|
|
265
|
+
return;
|
|
266
|
+
const schemaType = this.getSchemaType(ctx, { schema: x.schema });
|
|
267
|
+
const enumType = this.getSchemaType(ctx, { schema: enumValueSchema });
|
|
268
|
+
if (schemaType && enumType) {
|
|
269
|
+
body.values.push((0, core_1.builderTemplate) `val ${paramName} = ${paramName}${schemaType.nullable || (!x.required && !((_b = x.schema) === null || _b === void 0 ? void 0 : _b.default)) ? '?' : ''}.${enumItemSchema ? 'map' : 'let'} { ${enumType}.fromValue(it) ?: return ${index_js_1.kt.refs.spring.responseEntity.infer()}.status(${index_js_1.kt.refs.spring.httpStatus()}.BAD_REQUEST).body(${index_js_1.kt.string(`Invalid value for parameter ${x.name}`)}) }`);
|
|
262
270
|
}
|
|
263
271
|
});
|
|
264
272
|
body.values.push((0, core_1.builderTemplate) `try {${core_1.builderTemplate.indent `
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spring-reactive-web-client-generator.d.ts","sourceRoot":"","sources":["../../../../../src/src/generators/services/spring-reactive-web-clients/spring-reactive-web-client-generator.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"spring-reactive-web-client-generator.d.ts","sourceRoot":"","sources":["../../../../../src/src/generators/services/spring-reactive-web-clients/spring-reactive-web-client-generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -192,9 +192,9 @@ class DefaultKotlinSpringReactiveWebClientGenerator extends file_generator_js_1.
|
|
|
192
192
|
const parameterName = (0, core_1.toCasing)(p.name, ctx.config.parameterNameCasing);
|
|
193
193
|
const toString = this.getParameterToString(ctx, { endpoint, parameter: p });
|
|
194
194
|
return p.required && !((_a = p.schema) === null || _a === void 0 ? void 0 : _a.nullable)
|
|
195
|
-
? index_js_1.kt.call(['headers', 'add'], [index_js_1.kt.string(p.name),
|
|
195
|
+
? index_js_1.kt.call(['headers', 'add'], [index_js_1.kt.string(p.name), (0, core_1.builderTemplate) `${parameterName}${toString}`])
|
|
196
196
|
: index_js_1.kt.call([`${parameterName}?`, 'also'], [
|
|
197
|
-
index_js_1.kt.lambda([], index_js_1.kt.call(['headers', 'add'], [index_js_1.kt.string(p.name),
|
|
197
|
+
index_js_1.kt.lambda([], index_js_1.kt.call(['headers', 'add'], [index_js_1.kt.string(p.name), (0, core_1.builderTemplate) `it${toString}`]), {
|
|
198
198
|
singleline: true,
|
|
199
199
|
}),
|
|
200
200
|
]);
|
|
@@ -228,9 +228,11 @@ class DefaultKotlinSpringReactiveWebClientGenerator extends file_generator_js_1.
|
|
|
228
228
|
const parameterName = (0, core_1.toCasing)(p.name, ctx.config.parameterNameCasing);
|
|
229
229
|
const toString = this.getParameterToString(ctx, { endpoint, parameter: p });
|
|
230
230
|
return p.required && !((_a = p.schema) === null || _a === void 0 ? void 0 : _a.nullable)
|
|
231
|
-
? index_js_1.kt.call('queryParam', [index_js_1.kt.string(p.name),
|
|
231
|
+
? index_js_1.kt.call('queryParam', [index_js_1.kt.string(p.name), (0, core_1.builderTemplate) `${parameterName}${toString}`])
|
|
232
232
|
: index_js_1.kt.call([`${parameterName}?`, 'also'], [
|
|
233
|
-
index_js_1.kt.lambda([], index_js_1.kt.call('queryParam', [index_js_1.kt.string(p.name),
|
|
233
|
+
index_js_1.kt.lambda([], index_js_1.kt.call('queryParam', [index_js_1.kt.string(p.name), (0, core_1.builderTemplate) `it${toString}`]), {
|
|
234
|
+
singleline: true,
|
|
235
|
+
}),
|
|
234
236
|
]);
|
|
235
237
|
}), '\n'))]));
|
|
236
238
|
}
|
|
@@ -247,13 +249,14 @@ class DefaultKotlinSpringReactiveWebClientGenerator extends file_generator_js_1.
|
|
|
247
249
|
return result;
|
|
248
250
|
}
|
|
249
251
|
getParameterToString(ctx, args) {
|
|
250
|
-
var _a
|
|
252
|
+
var _a;
|
|
251
253
|
const { parameter } = args;
|
|
252
254
|
if (((_a = parameter.schema) === null || _a === void 0 ? void 0 : _a.kind) === 'array') {
|
|
253
|
-
|
|
255
|
+
const itemEnumSchema = (0, utils_js_1.getArrayItemStringEnumSchema)(parameter.schema);
|
|
256
|
+
const itemEnumType = itemEnumSchema && this.getSchemaType(ctx, { schema: itemEnumSchema });
|
|
257
|
+
return itemEnumType ? (0, core_1.builderTemplate) `.joinToString(transform = ${itemEnumType}::value)` : '.joinToString()';
|
|
254
258
|
}
|
|
255
|
-
else if ((
|
|
256
|
-
this.getSchemaType(ctx, { schema: parameter.schema })) {
|
|
259
|
+
else if ((0, utils_js_1.getStringEnumSchema)(parameter.schema) && this.getSchemaType(ctx, { schema: parameter.schema })) {
|
|
257
260
|
return '.value';
|
|
258
261
|
}
|
|
259
262
|
else {
|
|
@@ -272,13 +275,19 @@ class DefaultKotlinSpringReactiveWebClientGenerator extends file_generator_js_1.
|
|
|
272
275
|
});
|
|
273
276
|
}
|
|
274
277
|
getParameterDefaultValue(ctx, args) {
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
278
|
+
const { schema } = args.parameter;
|
|
279
|
+
if (args.parameter.required) {
|
|
280
|
+
return null;
|
|
281
|
+
}
|
|
282
|
+
if ((0, utils_js_1.getStringEnumSchema)(schema) && (schema === null || schema === void 0 ? void 0 : schema.default)) {
|
|
283
|
+
return (0, core_1.builderTemplate) `${this.getTypeUsage(ctx, { schema, nullable: false })}.${(0, core_1.toCasing)(String(schema.default), ctx.config.enumValueNameCasing)}`;
|
|
284
|
+
}
|
|
285
|
+
const itemEnumSchema = (0, utils_js_1.getArrayItemStringEnumSchema)(schema);
|
|
286
|
+
if (itemEnumSchema && Array.isArray(schema === null || schema === void 0 ? void 0 : schema.default)) {
|
|
287
|
+
const itemType = this.getTypeUsage(ctx, { schema: itemEnumSchema, nullable: false });
|
|
288
|
+
return index_js_1.kt.call(index_js_1.kt.refs.listOf.infer(), schema.default.map((x) => (0, core_1.builderTemplate) `${itemType}.${(0, core_1.toCasing)(String(x), ctx.config.enumValueNameCasing)}`));
|
|
289
|
+
}
|
|
290
|
+
return index_js_1.kt.toNode(schema === null || schema === void 0 ? void 0 : schema.default);
|
|
282
291
|
}
|
|
283
292
|
getTypeUsage(ctx, args) {
|
|
284
293
|
const { schema, nullable, fallback } = args;
|
package/script/src/utils.d.ts
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
|
-
import type { ApiComponent, Nullable } from '@goast/core';
|
|
1
|
+
import type { ApiComponent, ApiSchema, Nullable } from '@goast/core';
|
|
2
2
|
export declare function toKotlinStringLiteral(value: Nullable<string>): string;
|
|
3
3
|
export declare function toKotlinPropertyName(value: string): string;
|
|
4
4
|
export declare function modifyString<TArgs extends unknown[]>(value: string, modifier: string | RegExp | ((value: string, ...args: TArgs) => string) | undefined, ...args: TArgs): string;
|
|
5
5
|
export declare function getSourceDocLine<T>(component: ApiComponent<T>): string;
|
|
6
|
+
export declare function getStringEnumSchema(schema: Nullable<ApiSchema>): ApiSchema<'string'> | undefined;
|
|
7
|
+
export declare function getArrayItemStringEnumSchema(schema: Nullable<ApiSchema>): ApiSchema<'string'> | undefined;
|
|
6
8
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIrE,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,MAAM,CAWrE;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAK1D;AAED,wBAAgB,YAAY,CAAC,KAAK,SAAS,OAAO,EAAE,EAClD,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,KAAK,KAAK,MAAM,CAAC,GAAG,SAAS,EACnF,GAAG,IAAI,EAAE,KAAK,GACb,MAAM,CAYR;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,MAAM,CAItE;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,SAAS,CAEhG;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,SAAS,CAEzG"}
|
package/script/src/utils.js
CHANGED
|
@@ -4,6 +4,8 @@ exports.toKotlinStringLiteral = toKotlinStringLiteral;
|
|
|
4
4
|
exports.toKotlinPropertyName = toKotlinPropertyName;
|
|
5
5
|
exports.modifyString = modifyString;
|
|
6
6
|
exports.getSourceDocLine = getSourceDocLine;
|
|
7
|
+
exports.getStringEnumSchema = getStringEnumSchema;
|
|
8
|
+
exports.getArrayItemStringEnumSchema = getArrayItemStringEnumSchema;
|
|
7
9
|
const tslib_1 = require("tslib");
|
|
8
10
|
const node_path_1 = tslib_1.__importDefault(require("node:path"));
|
|
9
11
|
const node_process_1 = tslib_1.__importDefault(require("node:process"));
|
|
@@ -43,3 +45,10 @@ function getSourceDocLine(component) {
|
|
|
43
45
|
const { line, col } = component.$src.pos;
|
|
44
46
|
return `Source: ${file}:${line}:${col} (${component.$src.path})`;
|
|
45
47
|
}
|
|
48
|
+
function getStringEnumSchema(schema) {
|
|
49
|
+
var _a;
|
|
50
|
+
return (schema === null || schema === void 0 ? void 0 : schema.kind) === 'string' && ((_a = schema.enum) === null || _a === void 0 ? void 0 : _a.length) ? schema : undefined;
|
|
51
|
+
}
|
|
52
|
+
function getArrayItemStringEnumSchema(schema) {
|
|
53
|
+
return (schema === null || schema === void 0 ? void 0 : schema.kind) === 'array' ? getStringEnumSchema(schema.items) : undefined;
|
|
54
|
+
}
|
package/src/mod.ts
DELETED
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
export * from './src/ast/index.js';
|
|
2
|
-
export * from './src/common-results.js';
|
|
3
|
-
export * from './src/config.js';
|
|
4
|
-
export * from './src/file-builder.js';
|
|
5
|
-
export * from './src/generators/index.js';
|
|
6
|
-
export * from './src/import-collection.js';
|
|
7
|
-
export * from './src/types.js';
|
|
8
|
-
export * from './src/utils.js';
|
package/src/src/assets.ts
DELETED
|
@@ -1,9 +0,0 @@
|
|
|
1
|
-
import { AssetManager } from '@goast/core';
|
|
2
|
-
import { pathToFileURL, URL } from 'node:url';
|
|
3
|
-
|
|
4
|
-
declare const __filename: string | undefined;
|
|
5
|
-
const scriptUrl = typeof __filename === 'undefined' ? import.meta.url : pathToFileURL(__filename);
|
|
6
|
-
|
|
7
|
-
const manager = new AssetManager(new URL('../assets/', scriptUrl));
|
|
8
|
-
export const getAssetFileContent = manager.getAssetFileContent.bind(manager);
|
|
9
|
-
export const copyAssetFile = manager.copyAssetFile.bind(manager);
|
package/src/src/ast/_index.ts
DELETED
|
@@ -1,66 +0,0 @@
|
|
|
1
|
-
export { type KtAccessModifier as AccessModifier } from './common.js';
|
|
2
|
-
export { KtNode as Node } from './node.js';
|
|
3
|
-
export {
|
|
4
|
-
KtAnnotation as Annotation,
|
|
5
|
-
ktAnnotation as annotation,
|
|
6
|
-
type KtAnnotationTarget as AnnotationTarget,
|
|
7
|
-
} from './nodes/annotation.js';
|
|
8
|
-
export { KtArgument as Argument, ktArgument as argument } from './nodes/argument.js';
|
|
9
|
-
export { KtCall as Call, ktCall as call } from './nodes/call.js';
|
|
10
|
-
export {
|
|
11
|
-
KtClass as Class,
|
|
12
|
-
ktClass as class,
|
|
13
|
-
type KtClassKind as ClassKind,
|
|
14
|
-
type KtClassMember as ClassMember,
|
|
15
|
-
} from './nodes/class.js';
|
|
16
|
-
export {
|
|
17
|
-
KtCollectionLiteral as CollectionLiteral,
|
|
18
|
-
ktCollectionLiteral as collectionLiteral,
|
|
19
|
-
} from './nodes/collection-literal.js';
|
|
20
|
-
export {
|
|
21
|
-
KtConstructor as Constructor,
|
|
22
|
-
ktConstructor as constructor,
|
|
23
|
-
type KtDelegateTarget as DelegateTarget,
|
|
24
|
-
} from './nodes/constructor.js';
|
|
25
|
-
export { KtDocTag as DocTag, ktDocTag as docTag } from './nodes/doc-tag.js';
|
|
26
|
-
export { KtDoc as Doc, ktDoc as doc } from './nodes/doc.js';
|
|
27
|
-
export {
|
|
28
|
-
KtEnumValue as EnumValue,
|
|
29
|
-
ktEnumValue as enumValue,
|
|
30
|
-
type KtEnumValueMember as EnumValueMember,
|
|
31
|
-
} from './nodes/enum-value.js';
|
|
32
|
-
export { KtEnum as Enum, ktEnum as enum, type KtEnumMember as EnumMember } from './nodes/enum.js';
|
|
33
|
-
export { KtFunction as Function, ktFunction as function } from './nodes/function.js';
|
|
34
|
-
export {
|
|
35
|
-
KtGenericParameter as GenericParameter,
|
|
36
|
-
ktGenericParameter as genericParameter,
|
|
37
|
-
} from './nodes/generic-parameter.js';
|
|
38
|
-
export { KtInitBlock as InitBlock, ktInitBlock as initBlock } from './nodes/init-block.js';
|
|
39
|
-
export {
|
|
40
|
-
KtInterface as Interface,
|
|
41
|
-
ktInterface as interface,
|
|
42
|
-
type KtInterfaceMember as InterfaceMember,
|
|
43
|
-
} from './nodes/interface.js';
|
|
44
|
-
export { KtLambdaType as LambdaType, ktLambdaType as lambdaType } from './nodes/lambda-type.js';
|
|
45
|
-
export { KtLambda as Lambda, ktLambda as lambda } from './nodes/lambda.js';
|
|
46
|
-
export { KtObject as Object, ktObject as object, type KtObjectMember as ObjectMember } from './nodes/object.js';
|
|
47
|
-
export { KtParameter as Parameter, ktParameter as parameter } from './nodes/parameter.js';
|
|
48
|
-
export {
|
|
49
|
-
KtProperty as Property,
|
|
50
|
-
ktProperty as property,
|
|
51
|
-
KtPropertyAccessor as PropertyAccessor,
|
|
52
|
-
KtPropertyGetter as PropertyGetter,
|
|
53
|
-
KtPropertySetter as PropertySetter,
|
|
54
|
-
} from './nodes/property.js';
|
|
55
|
-
export {
|
|
56
|
-
type KtGenericReferenceFactory as GenericReferenceFactory,
|
|
57
|
-
KtReference as Reference,
|
|
58
|
-
ktReference as reference,
|
|
59
|
-
type KtReferenceFactory as ReferenceFactory,
|
|
60
|
-
} from './nodes/reference.js';
|
|
61
|
-
export { KtString as String, ktString as string } from './nodes/string.js';
|
|
62
|
-
export { type KtType as Type, type KtValue as Value } from './nodes/types.js';
|
|
63
|
-
export * as refs from './references/index.js';
|
|
64
|
-
export { getKotlinBuilderOptions as getBuilderOptions } from './utils/get-kotlin-builder-options.js';
|
|
65
|
-
export { toKtNode as toNode } from './utils/to-kt-node.js';
|
|
66
|
-
export { writeKtNode as writeNode, writeKtNodes as writeNodes } from './utils/write-kt-node.js';
|
package/src/src/ast/common.ts
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export type KtAccessModifier = 'public' | 'protected' | 'internal' | 'private';
|
package/src/src/ast/index.ts
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export * as kt from './_index.js';
|
package/src/src/ast/node.ts
DELETED
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
import { AstNode, type AstNodeOptions, type SourceBuilder } from '@goast/core';
|
|
2
|
-
|
|
3
|
-
export abstract class KtNode<TBuilder extends SourceBuilder, TInjects extends string = never> extends AstNode<
|
|
4
|
-
TBuilder,
|
|
5
|
-
TInjects
|
|
6
|
-
> {
|
|
7
|
-
constructor(options: AstNodeOptions<typeof AstNode<TBuilder, TInjects>>) {
|
|
8
|
-
super(options);
|
|
9
|
-
}
|
|
10
|
-
}
|
|
@@ -1,79 +0,0 @@
|
|
|
1
|
-
import { type AstNodeOptions, notNullish, type Nullable, type Prettify, type SourceBuilder } from '@goast/core';
|
|
2
|
-
|
|
3
|
-
import { KtNode } from '../node.js';
|
|
4
|
-
import { writeKtAnnotations } from '../utils/write-kt-annotations.js';
|
|
5
|
-
import { writeKtNode } from '../utils/write-kt-node.js';
|
|
6
|
-
import { type KtArgument, ktArgument } from './argument.js';
|
|
7
|
-
import type { KtType, KtValue } from './types.js';
|
|
8
|
-
|
|
9
|
-
type Injects = 'class' | 'target' | 'arguments';
|
|
10
|
-
|
|
11
|
-
type Options<TBuilder extends SourceBuilder, TInjects extends string = never> = AstNodeOptions<
|
|
12
|
-
typeof KtNode<TBuilder, TInjects | Injects>,
|
|
13
|
-
{
|
|
14
|
-
class: KtType<TBuilder>;
|
|
15
|
-
arguments?: Nullable<Nullable<KtArgument<TBuilder> | KtValue<TBuilder>>[]>;
|
|
16
|
-
target?: Nullable<KtAnnotationTarget>;
|
|
17
|
-
}
|
|
18
|
-
>;
|
|
19
|
-
|
|
20
|
-
export type KtAnnotationTarget =
|
|
21
|
-
| 'file'
|
|
22
|
-
| 'property'
|
|
23
|
-
| 'field'
|
|
24
|
-
| 'get'
|
|
25
|
-
| 'set'
|
|
26
|
-
| 'receiver'
|
|
27
|
-
| 'param'
|
|
28
|
-
| 'setparam'
|
|
29
|
-
| 'delegate';
|
|
30
|
-
|
|
31
|
-
export class KtAnnotation<TBuilder extends SourceBuilder, TInjects extends string = never> extends KtNode<
|
|
32
|
-
TBuilder,
|
|
33
|
-
TInjects | Injects
|
|
34
|
-
> {
|
|
35
|
-
public class: KtType<TBuilder>;
|
|
36
|
-
public arguments: (KtArgument<TBuilder> | KtValue<TBuilder>)[];
|
|
37
|
-
public target: KtAnnotationTarget | null;
|
|
38
|
-
|
|
39
|
-
constructor(options: Options<TBuilder, TInjects>) {
|
|
40
|
-
super(options);
|
|
41
|
-
this.class = options.class;
|
|
42
|
-
this.arguments = options.arguments?.filter(notNullish) ?? [];
|
|
43
|
-
this.target = options.target ?? null;
|
|
44
|
-
}
|
|
45
|
-
|
|
46
|
-
protected override onWrite(builder: TBuilder): void {
|
|
47
|
-
builder.append('@');
|
|
48
|
-
|
|
49
|
-
if (this.target) {
|
|
50
|
-
builder.append(this.inject.beforeTarget);
|
|
51
|
-
builder.append(this.target);
|
|
52
|
-
builder.append(this.inject.afterTarget);
|
|
53
|
-
builder.append(':');
|
|
54
|
-
}
|
|
55
|
-
|
|
56
|
-
builder.append(this.inject.beforeClass);
|
|
57
|
-
writeKtNode(builder, this.class);
|
|
58
|
-
builder.append(this.inject.afterClass);
|
|
59
|
-
|
|
60
|
-
if (this.arguments.length > 0) {
|
|
61
|
-
builder.append(this.inject.beforeArguments);
|
|
62
|
-
ktArgument.write(builder, this.arguments);
|
|
63
|
-
builder.append(this.inject.afterArguments);
|
|
64
|
-
}
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
|
-
|
|
68
|
-
const createAnnotation = <TBuilder extends SourceBuilder>(
|
|
69
|
-
$class: Options<TBuilder>['class'],
|
|
70
|
-
$arguments?: Options<TBuilder>['arguments'],
|
|
71
|
-
options?: Prettify<Omit<Options<TBuilder>, 'class' | 'arguments'>>,
|
|
72
|
-
): KtAnnotation<TBuilder> => new KtAnnotation<TBuilder>({ ...options, class: $class, arguments: $arguments });
|
|
73
|
-
|
|
74
|
-
export const ktAnnotation: typeof createAnnotation & { write: typeof writeKtAnnotations } = Object.assign(
|
|
75
|
-
createAnnotation,
|
|
76
|
-
{
|
|
77
|
-
write: writeKtAnnotations,
|
|
78
|
-
},
|
|
79
|
-
);
|
|
@@ -1,62 +0,0 @@
|
|
|
1
|
-
import type { AstNodeOptions, Nullable, Prettify, SourceBuilder } from '@goast/core';
|
|
2
|
-
|
|
3
|
-
import { KtNode } from '../node.js';
|
|
4
|
-
import { writeKtArguments } from '../utils/write-kt-arguments.js';
|
|
5
|
-
import { writeKtNode } from '../utils/write-kt-node.js';
|
|
6
|
-
import type { KtValue } from './types.js';
|
|
7
|
-
|
|
8
|
-
type Injects = 'name' | 'value';
|
|
9
|
-
|
|
10
|
-
type Options<TBuilder extends SourceBuilder, TInjects extends string = never> = AstNodeOptions<
|
|
11
|
-
typeof KtNode<TBuilder, TInjects | Injects>,
|
|
12
|
-
{
|
|
13
|
-
name?: Nullable<string>;
|
|
14
|
-
value: KtValue<TBuilder>;
|
|
15
|
-
}
|
|
16
|
-
>;
|
|
17
|
-
|
|
18
|
-
export class KtArgument<TBuilder extends SourceBuilder, TInjects extends string = never> extends KtNode<
|
|
19
|
-
TBuilder,
|
|
20
|
-
TInjects | Injects
|
|
21
|
-
> {
|
|
22
|
-
public name: string | null;
|
|
23
|
-
public value: KtValue<TBuilder>;
|
|
24
|
-
|
|
25
|
-
constructor(options: Options<TBuilder, TInjects>) {
|
|
26
|
-
super(options);
|
|
27
|
-
this.name = options?.name ?? null;
|
|
28
|
-
this.value = options.value;
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
protected override onWrite(builder: TBuilder): void {
|
|
32
|
-
if (this.name) {
|
|
33
|
-
builder.append(this.inject.beforeName);
|
|
34
|
-
builder.append(this.name);
|
|
35
|
-
builder.append(this.inject.afterName);
|
|
36
|
-
builder.append(' = ');
|
|
37
|
-
}
|
|
38
|
-
|
|
39
|
-
builder.append(this.inject.beforeValue);
|
|
40
|
-
writeKtNode(builder, this.value);
|
|
41
|
-
builder.append(this.inject.afterValue);
|
|
42
|
-
}
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
const createArgument = <TBuilder extends SourceBuilder>(
|
|
46
|
-
value: Options<TBuilder>['value'],
|
|
47
|
-
options?: Prettify<Omit<Options<TBuilder>, 'value'>>,
|
|
48
|
-
): KtArgument<TBuilder> => new KtArgument<TBuilder>({ ...options, value });
|
|
49
|
-
|
|
50
|
-
const createNamedArgument = <TBuilder extends SourceBuilder>(
|
|
51
|
-
name: Options<TBuilder>['name'],
|
|
52
|
-
value: Options<TBuilder>['value'],
|
|
53
|
-
options?: Prettify<Omit<Options<TBuilder>, 'value' | 'name'>>,
|
|
54
|
-
): KtArgument<TBuilder> => new KtArgument<TBuilder>({ ...options, value, name });
|
|
55
|
-
|
|
56
|
-
export const ktArgument: typeof createArgument & {
|
|
57
|
-
named: typeof createNamedArgument;
|
|
58
|
-
write: typeof writeKtArguments;
|
|
59
|
-
} = Object.assign(createArgument, {
|
|
60
|
-
named: createNamedArgument,
|
|
61
|
-
write: writeKtArguments,
|
|
62
|
-
});
|