@goast/kotlin 0.3.9 → 0.3.11
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/cjs/lib/generators/models/model-generator.js +3 -1
- package/esm/index.js +8 -8
- package/esm/lib/ast/_index.js +26 -26
- package/esm/lib/ast/index.js +1 -1
- package/esm/lib/ast/node.js +1 -1
- package/esm/lib/ast/nodes/annotation.js +5 -5
- package/esm/lib/ast/nodes/argument.js +3 -3
- package/esm/lib/ast/nodes/call.js +4 -4
- package/esm/lib/ast/nodes/class.js +9 -9
- package/esm/lib/ast/nodes/collection-literal.js +3 -3
- package/esm/lib/ast/nodes/constructor.js +6 -6
- package/esm/lib/ast/nodes/doc-tag.js +4 -4
- package/esm/lib/ast/nodes/doc.js +6 -6
- package/esm/lib/ast/nodes/enum-value.js +6 -6
- package/esm/lib/ast/nodes/enum.js +8 -8
- package/esm/lib/ast/nodes/function.js +7 -7
- package/esm/lib/ast/nodes/generic-parameter.js +3 -3
- package/esm/lib/ast/nodes/init-block.js +2 -2
- package/esm/lib/ast/nodes/interface.js +7 -7
- package/esm/lib/ast/nodes/lambda-type.js +4 -4
- package/esm/lib/ast/nodes/lambda.js +3 -3
- package/esm/lib/ast/nodes/object.js +5 -5
- package/esm/lib/ast/nodes/parameter.js +5 -5
- package/esm/lib/ast/nodes/property.js +5 -5
- package/esm/lib/ast/nodes/reference.js +5 -5
- package/esm/lib/ast/nodes/string.js +4 -4
- package/esm/lib/ast/references/index.js +8 -8
- package/esm/lib/ast/references/jackson.js +1 -1
- package/esm/lib/ast/references/jakarta.js +1 -1
- package/esm/lib/ast/references/java.js +1 -1
- package/esm/lib/ast/references/kotlin.js +1 -1
- package/esm/lib/ast/references/okhttp3.js +1 -1
- package/esm/lib/ast/references/reactor.js +1 -1
- package/esm/lib/ast/references/spring.js +1 -1
- package/esm/lib/ast/references/swagger.js +1 -1
- package/esm/lib/ast/utils/get-kotlin-builder-options.js +3 -3
- package/esm/lib/ast/utils/to-kt-node.js +3 -3
- package/esm/lib/ast/utils/write-kt-annotations.js +2 -2
- package/esm/lib/ast/utils/write-kt-arguments.js +3 -3
- package/esm/lib/ast/utils/write-kt-enum-values.js +2 -2
- package/esm/lib/ast/utils/write-kt-generic-parameters.js +2 -2
- package/esm/lib/ast/utils/write-kt-members.js +3 -3
- package/esm/lib/ast/utils/write-kt-node.js +2 -2
- package/esm/lib/ast/utils/write-kt-parameters.js +2 -2
- package/esm/lib/file-builder.js +4 -4
- package/esm/lib/generators/file-generator.js +2 -2
- package/esm/lib/generators/index.js +4 -4
- package/esm/lib/generators/models/index.js +4 -4
- package/esm/lib/generators/models/model-generator.js +7 -5
- package/esm/lib/generators/models/models-generator.js +3 -3
- package/esm/lib/generators/models/models.js +1 -1
- package/esm/lib/generators/services/okhttp3-clients/index.js +4 -4
- package/esm/lib/generators/services/okhttp3-clients/models.js +1 -1
- package/esm/lib/generators/services/okhttp3-clients/okhttp3-client-generator.js +5 -5
- package/esm/lib/generators/services/okhttp3-clients/okhttp3-clients-generator.js +4 -4
- package/esm/lib/generators/services/okhttp3-clients/refs.js +1 -1
- package/esm/lib/generators/services/spring-controllers/index.js +4 -4
- package/esm/lib/generators/services/spring-controllers/models.js +1 -1
- package/esm/lib/generators/services/spring-controllers/spring-controller-generator.js +5 -5
- package/esm/lib/generators/services/spring-controllers/spring-controllers-generator.js +3 -3
- package/esm/lib/import-collection.js +2 -2
- package/package.json +2 -2
- package/types/lib/ast/node.d.ts +1 -1
- package/types/lib/ast/nodes/annotation.d.ts +1 -1
- package/types/lib/ast/nodes/argument.d.ts +1 -1
- package/types/lib/ast/nodes/call.d.ts +1 -1
- package/types/lib/ast/nodes/class.d.ts +1 -1
- package/types/lib/ast/nodes/collection-literal.d.ts +1 -1
- package/types/lib/ast/nodes/constructor.d.ts +1 -1
- package/types/lib/ast/nodes/doc-tag.d.ts +1 -1
- package/types/lib/ast/nodes/doc.d.ts +1 -1
- package/types/lib/ast/nodes/enum-value.d.ts +1 -1
- package/types/lib/ast/nodes/enum.d.ts +1 -1
- package/types/lib/ast/nodes/function.d.ts +1 -1
- package/types/lib/ast/nodes/generic-parameter.d.ts +1 -1
- package/types/lib/ast/nodes/init-block.d.ts +1 -1
- package/types/lib/ast/nodes/interface.d.ts +1 -1
- package/types/lib/ast/nodes/lambda-type.d.ts +1 -1
- package/types/lib/ast/nodes/lambda.d.ts +1 -1
- package/types/lib/ast/nodes/object.d.ts +1 -1
- package/types/lib/ast/nodes/parameter.d.ts +1 -1
- package/types/lib/ast/nodes/property.d.ts +1 -1
- package/types/lib/ast/nodes/reference.d.ts +1 -1
- package/types/lib/ast/nodes/string.d.ts +1 -1
- package/types/lib/ast/nodes/types.d.ts +1 -1
- package/types/lib/ast/references/jackson.d.ts +56 -56
- package/types/lib/ast/references/jakarta.d.ts +24 -24
- package/types/lib/ast/references/java.d.ts +59 -59
- package/types/lib/ast/references/kotlin.d.ts +195 -195
- package/types/lib/ast/references/okhttp3.d.ts +16 -16
- package/types/lib/ast/references/reactor.d.ts +22 -22
- package/types/lib/ast/references/spring.d.ts +107 -107
- package/types/lib/ast/references/swagger.d.ts +32 -32
- package/types/lib/ast/utils/get-kotlin-builder-options.d.ts +1 -1
- package/types/lib/ast/utils/to-kt-node.d.ts +1 -1
- package/types/lib/ast/utils/write-kt-annotations.d.ts +1 -1
- package/types/lib/ast/utils/write-kt-arguments.d.ts +1 -1
- package/types/lib/ast/utils/write-kt-enum-values.d.ts +1 -1
- package/types/lib/ast/utils/write-kt-generic-parameters.d.ts +1 -1
- package/types/lib/ast/utils/write-kt-members.d.ts +1 -1
- package/types/lib/ast/utils/write-kt-node.d.ts +1 -1
- package/types/lib/ast/utils/write-kt-parameters.d.ts +1 -1
- package/types/lib/config.d.ts +1 -1
- package/types/lib/file-builder.d.ts +1 -1
- package/types/lib/generators/file-generator.d.ts +1 -1
- package/types/lib/generators/models/args.d.ts +1 -1
- package/types/lib/generators/models/model-generator.d.ts +2 -2
- package/types/lib/generators/models/models-generator.d.ts +1 -1
- package/types/lib/generators/models/models.d.ts +1 -1
- package/types/lib/generators/services/okhttp3-clients/args.d.ts +1 -1
- package/types/lib/generators/services/okhttp3-clients/models.d.ts +1 -1
- package/types/lib/generators/services/okhttp3-clients/okhttp3-client-generator.d.ts +1 -1
- package/types/lib/generators/services/okhttp3-clients/okhttp3-clients-generator.d.ts +1 -1
- package/types/lib/generators/services/okhttp3-clients/refs.d.ts +163 -163
- package/types/lib/generators/services/spring-controllers/args.d.ts +1 -1
- package/types/lib/generators/services/spring-controllers/models.d.ts +1 -1
- package/types/lib/generators/services/spring-controllers/spring-controller-generator.d.ts +1 -1
- package/types/lib/generators/services/spring-controllers/spring-controllers-generator.d.ts +1 -1
- package/types/lib/import-collection.d.ts +1 -1
- package/types/lib/types.d.ts +1 -1
- package/types/lib/utils.d.ts +1 -1
|
@@ -249,7 +249,9 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
|
|
|
249
249
|
return ctx.config.addJacksonAnnotations && schema.discriminator
|
|
250
250
|
? ast_1.kt.annotation(ast_1.kt.refs.jackson.jsonTypeInfo(), [
|
|
251
251
|
ast_1.kt.argument.named('use', 'JsonTypeInfo.Id.NAME'),
|
|
252
|
-
ast_1.kt.argument.named('include', '
|
|
252
|
+
ast_1.kt.argument.named('include', 'properties' in schema && schema.properties.has(schema.discriminator.propertyName)
|
|
253
|
+
? 'JsonTypeInfo.As.EXISTING_PROPERTY'
|
|
254
|
+
: 'JsonTypeInfo.As.PROPERTY'),
|
|
253
255
|
ast_1.kt.argument.named('property', ast_1.kt.string(schema.discriminator.propertyName)),
|
|
254
256
|
ast_1.kt.argument.named('visible', 'true'),
|
|
255
257
|
])
|
package/esm/index.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
export * from './lib/ast';
|
|
2
|
-
export * from './lib/common-results';
|
|
3
|
-
export * from './lib/config';
|
|
4
|
-
export * from './lib/file-builder';
|
|
5
|
-
export * from './lib/generators';
|
|
6
|
-
export * from './lib/import-collection';
|
|
7
|
-
export * from './lib/types';
|
|
8
|
-
export * from './lib/utils';
|
|
1
|
+
export * from './lib/ast/index.js';
|
|
2
|
+
export * from './lib/common-results.js';
|
|
3
|
+
export * from './lib/config.js';
|
|
4
|
+
export * from './lib/file-builder.js';
|
|
5
|
+
export * from './lib/generators/index.js';
|
|
6
|
+
export * from './lib/import-collection.js';
|
|
7
|
+
export * from './lib/types.js';
|
|
8
|
+
export * from './lib/utils.js';
|
package/esm/lib/ast/_index.js
CHANGED
|
@@ -1,27 +1,27 @@
|
|
|
1
|
-
export { KtNode as Node } from './node';
|
|
2
|
-
export { KtAnnotation as Annotation, ktAnnotation as annotation, } from './nodes/annotation';
|
|
3
|
-
export { KtArgument as Argument, ktArgument as argument } from './nodes/argument';
|
|
4
|
-
export { KtCall as Call, ktCall as call } from './nodes/call';
|
|
5
|
-
export { KtClass as Class, ktClass as class, } from './nodes/class';
|
|
6
|
-
export { KtCollectionLiteral as CollectionLiteral, ktCollectionLiteral as collectionLiteral, } from './nodes/collection-literal';
|
|
7
|
-
export { KtConstructor as Constructor, ktConstructor as constructor, } from './nodes/constructor';
|
|
8
|
-
export { KtDoc as Doc, ktDoc as doc } from './nodes/doc';
|
|
9
|
-
export { KtDocTag as DocTag, ktDocTag as docTag } from './nodes/doc-tag';
|
|
10
|
-
export { KtEnum as Enum, ktEnum as enum } from './nodes/enum';
|
|
11
|
-
export { KtEnumValue as EnumValue, ktEnumValue as enumValue, } from './nodes/enum-value';
|
|
12
|
-
export { KtFunction as Function, ktFunction as function } from './nodes/function';
|
|
13
|
-
export { KtGenericParameter as GenericParameter, ktGenericParameter as genericParameter, } from './nodes/generic-parameter';
|
|
14
|
-
export { KtInitBlock as InitBlock, ktInitBlock as initBlock } from './nodes/init-block';
|
|
15
|
-
export { KtInterface as Interface, ktInterface as interface, } from './nodes/interface';
|
|
16
|
-
export { KtLambda as Lambda, ktLambda as lambda } from './nodes/lambda';
|
|
17
|
-
export { KtLambdaType as LambdaType, ktLambdaType as lambdaType } from './nodes/lambda-type';
|
|
18
|
-
export { KtObject as Object, ktObject as object } from './nodes/object';
|
|
19
|
-
export { KtParameter as Parameter, ktParameter as parameter } from './nodes/parameter';
|
|
20
|
-
export { KtProperty as Property, KtPropertyAccessor as PropertyAccessor, KtPropertyGetter as PropertyGetter, KtPropertySetter as PropertySetter, ktProperty as property, } from './nodes/property';
|
|
21
|
-
export { KtReference as Reference, ktReference as reference } from './nodes/reference';
|
|
22
|
-
export { KtString as String, ktString as string } from './nodes/string';
|
|
23
|
-
import * as refs_1 from './references';
|
|
1
|
+
export { KtNode as Node } from './node.js';
|
|
2
|
+
export { KtAnnotation as Annotation, ktAnnotation as annotation, } from './nodes/annotation.js';
|
|
3
|
+
export { KtArgument as Argument, ktArgument as argument } from './nodes/argument.js';
|
|
4
|
+
export { KtCall as Call, ktCall as call } from './nodes/call.js';
|
|
5
|
+
export { KtClass as Class, ktClass as class, } from './nodes/class.js';
|
|
6
|
+
export { KtCollectionLiteral as CollectionLiteral, ktCollectionLiteral as collectionLiteral, } from './nodes/collection-literal.js';
|
|
7
|
+
export { KtConstructor as Constructor, ktConstructor as constructor, } from './nodes/constructor.js';
|
|
8
|
+
export { KtDoc as Doc, ktDoc as doc } from './nodes/doc.js';
|
|
9
|
+
export { KtDocTag as DocTag, ktDocTag as docTag } from './nodes/doc-tag.js';
|
|
10
|
+
export { KtEnum as Enum, ktEnum as enum } from './nodes/enum.js';
|
|
11
|
+
export { KtEnumValue as EnumValue, ktEnumValue as enumValue, } from './nodes/enum-value.js';
|
|
12
|
+
export { KtFunction as Function, ktFunction as function } from './nodes/function.js';
|
|
13
|
+
export { KtGenericParameter as GenericParameter, ktGenericParameter as genericParameter, } from './nodes/generic-parameter.js';
|
|
14
|
+
export { KtInitBlock as InitBlock, ktInitBlock as initBlock } from './nodes/init-block.js';
|
|
15
|
+
export { KtInterface as Interface, ktInterface as interface, } from './nodes/interface.js';
|
|
16
|
+
export { KtLambda as Lambda, ktLambda as lambda } from './nodes/lambda.js';
|
|
17
|
+
export { KtLambdaType as LambdaType, ktLambdaType as lambdaType } from './nodes/lambda-type.js';
|
|
18
|
+
export { KtObject as Object, ktObject as object } from './nodes/object.js';
|
|
19
|
+
export { KtParameter as Parameter, ktParameter as parameter } from './nodes/parameter.js';
|
|
20
|
+
export { KtProperty as Property, KtPropertyAccessor as PropertyAccessor, KtPropertyGetter as PropertyGetter, KtPropertySetter as PropertySetter, ktProperty as property, } from './nodes/property.js';
|
|
21
|
+
export { KtReference as Reference, ktReference as reference } from './nodes/reference.js';
|
|
22
|
+
export { KtString as String, ktString as string } from './nodes/string.js';
|
|
23
|
+
import * as refs_1 from './references/index.js';
|
|
24
24
|
export { refs_1 as refs };
|
|
25
|
-
export { getKotlinBuilderOptions as getBuilderOptions } from './utils/get-kotlin-builder-options';
|
|
26
|
-
export { toKtNode as toNode } from './utils/to-kt-node';
|
|
27
|
-
export { writeKtNode as writeNode, writeKtNodes as writeNodes } from './utils/write-kt-node';
|
|
25
|
+
export { getKotlinBuilderOptions as getBuilderOptions } from './utils/get-kotlin-builder-options.js';
|
|
26
|
+
export { toKtNode as toNode } from './utils/to-kt-node.js';
|
|
27
|
+
export { writeKtNode as writeNode, writeKtNodes as writeNodes } from './utils/write-kt-node.js';
|
package/esm/lib/ast/index.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import * as kt_1 from './_index';
|
|
1
|
+
import * as kt_1 from './_index.js';
|
|
2
2
|
export { kt_1 as kt };
|
package/esm/lib/ast/node.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { notNullish } from '
|
|
2
|
-
import { ktArgument } from './argument';
|
|
3
|
-
import { KtNode } from '../node';
|
|
4
|
-
import { writeKtAnnotations } from '../utils/write-kt-annotations';
|
|
5
|
-
import { writeKtNode } from '../utils/write-kt-node';
|
|
1
|
+
import { notNullish } from '../../../index.js';
|
|
2
|
+
import { ktArgument } from './argument.js';
|
|
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
6
|
export class KtAnnotation extends KtNode {
|
|
7
7
|
constructor(options) {
|
|
8
8
|
var _a, _b, _c;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { KtNode } from '../node';
|
|
2
|
-
import { writeKtArguments } from '../utils/write-kt-arguments';
|
|
3
|
-
import { writeKtNode } from '../utils/write-kt-node';
|
|
1
|
+
import { KtNode } from '../node.js';
|
|
2
|
+
import { writeKtArguments } from '../utils/write-kt-arguments.js';
|
|
3
|
+
import { writeKtNode } from '../utils/write-kt-node.js';
|
|
4
4
|
export class KtArgument extends KtNode {
|
|
5
5
|
constructor(options) {
|
|
6
6
|
var _a;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { notNullish } from '
|
|
2
|
-
import { ktArgument } from './argument';
|
|
3
|
-
import { KtNode } from '../node';
|
|
4
|
-
import { writeKtNode, writeKtNodes } from '../utils/write-kt-node';
|
|
1
|
+
import { notNullish } from '../../../index.js';
|
|
2
|
+
import { ktArgument } from './argument.js';
|
|
3
|
+
import { KtNode } from '../node.js';
|
|
4
|
+
import { writeKtNode, writeKtNodes } from '../utils/write-kt-node.js';
|
|
5
5
|
export class KtCall extends KtNode {
|
|
6
6
|
constructor(options) {
|
|
7
7
|
var _a, _b, _c;
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import { createOverwriteProxy, notNullish, } from '
|
|
2
|
-
import { ktAnnotation } from './annotation';
|
|
3
|
-
import { ktArgument } from './argument';
|
|
4
|
-
import { ktDoc } from './doc';
|
|
5
|
-
import { ktGenericParameter } from './generic-parameter';
|
|
6
|
-
import { ktInitBlock } from './init-block';
|
|
7
|
-
import { KtNode } from '../node';
|
|
8
|
-
import { writeKtMembers } from '../utils/write-kt-members';
|
|
9
|
-
import { writeKtNode, writeKtNodes } from '../utils/write-kt-node';
|
|
1
|
+
import { createOverwriteProxy, notNullish, } from '../../../index.js';
|
|
2
|
+
import { ktAnnotation } from './annotation.js';
|
|
3
|
+
import { ktArgument } from './argument.js';
|
|
4
|
+
import { ktDoc } from './doc.js';
|
|
5
|
+
import { ktGenericParameter } from './generic-parameter.js';
|
|
6
|
+
import { ktInitBlock } from './init-block.js';
|
|
7
|
+
import { KtNode } from '../node.js';
|
|
8
|
+
import { writeKtMembers } from '../utils/write-kt-members.js';
|
|
9
|
+
import { writeKtNode, writeKtNodes } from '../utils/write-kt-node.js';
|
|
10
10
|
export class KtClass extends KtNode {
|
|
11
11
|
constructor(options) {
|
|
12
12
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { notNullish } from '
|
|
2
|
-
import { KtNode } from '../node';
|
|
3
|
-
import { writeKtNodes } from '../utils/write-kt-node';
|
|
1
|
+
import { notNullish } from '../../../index.js';
|
|
2
|
+
import { KtNode } from '../node.js';
|
|
3
|
+
import { writeKtNodes } from '../utils/write-kt-node.js';
|
|
4
4
|
export class KtCollectionLiteral extends KtNode {
|
|
5
5
|
constructor(options) {
|
|
6
6
|
var _a, _b;
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { notNullish, } from '
|
|
2
|
-
import { ktAnnotation } from './annotation';
|
|
3
|
-
import { ktArgument } from './argument';
|
|
4
|
-
import { ktParameter } from './parameter';
|
|
5
|
-
import { KtNode } from '../node';
|
|
6
|
-
import { writeKtNodes } from '../utils/write-kt-node';
|
|
1
|
+
import { notNullish, } from '../../../index.js';
|
|
2
|
+
import { ktAnnotation } from './annotation.js';
|
|
3
|
+
import { ktArgument } from './argument.js';
|
|
4
|
+
import { ktParameter } from './parameter.js';
|
|
5
|
+
import { KtNode } from '../node.js';
|
|
6
|
+
import { writeKtNodes } from '../utils/write-kt-node.js';
|
|
7
7
|
export class KtConstructor extends KtNode {
|
|
8
8
|
constructor(options) {
|
|
9
9
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { notNullish, basicAppendValueGroup, } from '
|
|
2
|
-
import { isKotlinAppendValue } from '../../file-builder';
|
|
3
|
-
import { KtNode } from '../node';
|
|
4
|
-
import { writeKtNodes } from '../utils/write-kt-node';
|
|
1
|
+
import { notNullish, basicAppendValueGroup, } from '../../../index.js';
|
|
2
|
+
import { isKotlinAppendValue } from '../../file-builder.js';
|
|
3
|
+
import { KtNode } from '../node.js';
|
|
4
|
+
import { writeKtNodes } from '../utils/write-kt-node.js';
|
|
5
5
|
export class KtDocTag extends KtNode {
|
|
6
6
|
constructor(options) {
|
|
7
7
|
var _a, _b, _c;
|
package/esm/lib/ast/nodes/doc.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { createOverwriteProxy, notNullish, getIsInstanceOf, } from '
|
|
2
|
-
import { ktDocTag } from './doc-tag';
|
|
3
|
-
import { KtGenericParameter } from './generic-parameter';
|
|
4
|
-
import { KtParameter } from './parameter';
|
|
5
|
-
import { KtNode } from '../node';
|
|
6
|
-
import { writeKtNodes } from '../utils/write-kt-node';
|
|
1
|
+
import { createOverwriteProxy, notNullish, getIsInstanceOf, } from '../../../index.js';
|
|
2
|
+
import { ktDocTag } from './doc-tag.js';
|
|
3
|
+
import { KtGenericParameter } from './generic-parameter.js';
|
|
4
|
+
import { KtParameter } from './parameter.js';
|
|
5
|
+
import { KtNode } from '../node.js';
|
|
6
|
+
import { writeKtNodes } from '../utils/write-kt-node.js';
|
|
7
7
|
export class KtDoc extends KtNode {
|
|
8
8
|
constructor(options) {
|
|
9
9
|
var _a, _b, _c;
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { notNullish } from '
|
|
2
|
-
import { ktAnnotation } from './annotation';
|
|
3
|
-
import { ktArgument } from './argument';
|
|
4
|
-
import { KtNode } from '../node';
|
|
5
|
-
import { writeKtEnumValues } from '../utils/write-kt-enum-values';
|
|
6
|
-
import { writeKtMembers } from '../utils/write-kt-members';
|
|
1
|
+
import { notNullish } from '../../../index.js';
|
|
2
|
+
import { ktAnnotation } from './annotation.js';
|
|
3
|
+
import { ktArgument } from './argument.js';
|
|
4
|
+
import { KtNode } from '../node.js';
|
|
5
|
+
import { writeKtEnumValues } from '../utils/write-kt-enum-values.js';
|
|
6
|
+
import { writeKtMembers } from '../utils/write-kt-members.js';
|
|
7
7
|
export class KtEnumValue extends KtNode {
|
|
8
8
|
constructor(options) {
|
|
9
9
|
var _a, _b, _c, _d, _e, _f, _g;
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import { createOverwriteProxy, notNullish, } from '
|
|
2
|
-
import { ktAnnotation } from './annotation';
|
|
3
|
-
import { ktDoc } from './doc';
|
|
4
|
-
import { ktEnumValue } from './enum-value';
|
|
5
|
-
import { ktInitBlock } from './init-block';
|
|
6
|
-
import { KtNode } from '../node';
|
|
7
|
-
import { writeKtMembers } from '../utils/write-kt-members';
|
|
8
|
-
import { writeKtNodes } from '../utils/write-kt-node';
|
|
1
|
+
import { createOverwriteProxy, notNullish, } from '../../../index.js';
|
|
2
|
+
import { ktAnnotation } from './annotation.js';
|
|
3
|
+
import { ktDoc } from './doc.js';
|
|
4
|
+
import { ktEnumValue } from './enum-value.js';
|
|
5
|
+
import { ktInitBlock } from './init-block.js';
|
|
6
|
+
import { KtNode } from '../node.js';
|
|
7
|
+
import { writeKtMembers } from '../utils/write-kt-members.js';
|
|
8
|
+
import { writeKtNodes } from '../utils/write-kt-node.js';
|
|
9
9
|
export class KtEnum extends KtNode {
|
|
10
10
|
constructor(options) {
|
|
11
11
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { notNullish, } from '
|
|
2
|
-
import { ktAnnotation } from './annotation';
|
|
3
|
-
import { ktDoc } from './doc';
|
|
4
|
-
import { ktGenericParameter } from './generic-parameter';
|
|
5
|
-
import { ktParameter } from './parameter';
|
|
6
|
-
import { KtNode } from '../node';
|
|
7
|
-
import { writeKtNode, writeKtNodes } from '../utils/write-kt-node';
|
|
1
|
+
import { notNullish, } from '../../../index.js';
|
|
2
|
+
import { ktAnnotation } from './annotation.js';
|
|
3
|
+
import { ktDoc } from './doc.js';
|
|
4
|
+
import { ktGenericParameter } from './generic-parameter.js';
|
|
5
|
+
import { ktParameter } from './parameter.js';
|
|
6
|
+
import { KtNode } from '../node.js';
|
|
7
|
+
import { writeKtNode, writeKtNodes } from '../utils/write-kt-node.js';
|
|
8
8
|
export class KtFunction extends KtNode {
|
|
9
9
|
constructor(options) {
|
|
10
10
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { KtNode } from '../node';
|
|
2
|
-
import { writeKtGenericParameters } from '../utils/write-kt-generic-parameters';
|
|
3
|
-
import { writeKtNode } from '../utils/write-kt-node';
|
|
1
|
+
import { KtNode } from '../node.js';
|
|
2
|
+
import { writeKtGenericParameters } from '../utils/write-kt-generic-parameters.js';
|
|
3
|
+
import { writeKtNode } from '../utils/write-kt-node.js';
|
|
4
4
|
export class KtGenericParameter extends KtNode {
|
|
5
5
|
constructor(options) {
|
|
6
6
|
var _a, _b;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { KtNode } from '../node';
|
|
2
|
-
import { writeKtNodes } from '../utils/write-kt-node';
|
|
1
|
+
import { KtNode } from '../node.js';
|
|
2
|
+
import { writeKtNodes } from '../utils/write-kt-node.js';
|
|
3
3
|
export class KtInitBlock extends KtNode {
|
|
4
4
|
constructor(options) {
|
|
5
5
|
super(options);
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { notNullish, createOverwriteProxy, } from '
|
|
2
|
-
import { ktAnnotation } from './annotation';
|
|
3
|
-
import { ktDoc } from './doc';
|
|
4
|
-
import { ktGenericParameter } from './generic-parameter';
|
|
5
|
-
import { KtNode } from '../node';
|
|
6
|
-
import { writeKtMembers } from '../utils/write-kt-members';
|
|
7
|
-
import { writeKtNodes } from '../utils/write-kt-node';
|
|
1
|
+
import { notNullish, createOverwriteProxy, } from '../../../index.js';
|
|
2
|
+
import { ktAnnotation } from './annotation.js';
|
|
3
|
+
import { ktDoc } from './doc.js';
|
|
4
|
+
import { ktGenericParameter } from './generic-parameter.js';
|
|
5
|
+
import { KtNode } from '../node.js';
|
|
6
|
+
import { writeKtMembers } from '../utils/write-kt-members.js';
|
|
7
|
+
import { writeKtNodes } from '../utils/write-kt-node.js';
|
|
8
8
|
export class KtInterface extends KtNode {
|
|
9
9
|
constructor(options) {
|
|
10
10
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { notNullish } from '
|
|
2
|
-
import { ktParameter } from './parameter';
|
|
3
|
-
import { KtNode } from '../node';
|
|
4
|
-
import { writeKtNode, writeKtNodes } from '../utils/write-kt-node';
|
|
1
|
+
import { notNullish } from '../../../index.js';
|
|
2
|
+
import { ktParameter } from './parameter.js';
|
|
3
|
+
import { KtNode } from '../node.js';
|
|
4
|
+
import { writeKtNode, writeKtNodes } from '../utils/write-kt-node.js';
|
|
5
5
|
export class KtLambdaType extends KtNode {
|
|
6
6
|
constructor(options) {
|
|
7
7
|
var _a, _b, _c;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { notNullish } from '
|
|
2
|
-
import { KtNode } from '../node';
|
|
3
|
-
import { writeKtNodes } from '../utils/write-kt-node';
|
|
1
|
+
import { notNullish } from '../../../index.js';
|
|
2
|
+
import { KtNode } from '../node.js';
|
|
3
|
+
import { writeKtNodes } from '../utils/write-kt-node.js';
|
|
4
4
|
export class KtLambda extends KtNode {
|
|
5
5
|
constructor(options) {
|
|
6
6
|
var _a, _b, _c, _d;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { notNullish } from '
|
|
2
|
-
import { ktArgument } from './argument';
|
|
3
|
-
import { KtNode } from '../node';
|
|
4
|
-
import { writeKtMembers } from '../utils/write-kt-members';
|
|
5
|
-
import { writeKtNode, writeKtNodes } from '../utils/write-kt-node';
|
|
1
|
+
import { notNullish } from '../../../index.js';
|
|
2
|
+
import { ktArgument } from './argument.js';
|
|
3
|
+
import { KtNode } from '../node.js';
|
|
4
|
+
import { writeKtMembers } from '../utils/write-kt-members.js';
|
|
5
|
+
import { writeKtNode, writeKtNodes } from '../utils/write-kt-node.js';
|
|
6
6
|
export class KtObject extends KtNode {
|
|
7
7
|
constructor(options) {
|
|
8
8
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { notNullish } from '
|
|
2
|
-
import { ktAnnotation } from './annotation';
|
|
3
|
-
import { KtNode } from '../node';
|
|
4
|
-
import { writeKtNode } from '../utils/write-kt-node';
|
|
5
|
-
import { writeKtParameters } from '../utils/write-kt-parameters';
|
|
1
|
+
import { notNullish } from '../../../index.js';
|
|
2
|
+
import { ktAnnotation } from './annotation.js';
|
|
3
|
+
import { KtNode } from '../node.js';
|
|
4
|
+
import { writeKtNode } from '../utils/write-kt-node.js';
|
|
5
|
+
import { writeKtParameters } from '../utils/write-kt-parameters.js';
|
|
6
6
|
export class KtParameter extends KtNode {
|
|
7
7
|
constructor(options) {
|
|
8
8
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-non-null-assertion */
|
|
2
|
-
import { notNullish } from '
|
|
3
|
-
import { ktAnnotation } from './annotation';
|
|
4
|
-
import { ktArgument } from './argument';
|
|
5
|
-
import { KtNode } from '../node';
|
|
6
|
-
import { writeKtNode, writeKtNodes } from '../utils/write-kt-node';
|
|
2
|
+
import { notNullish } from '../../../index.js';
|
|
3
|
+
import { ktAnnotation } from './annotation.js';
|
|
4
|
+
import { ktArgument } from './argument.js';
|
|
5
|
+
import { KtNode } from '../node.js';
|
|
6
|
+
import { writeKtNode, writeKtNodes } from '../utils/write-kt-node.js';
|
|
7
7
|
export class KtPropertyAccessor extends KtNode {
|
|
8
8
|
constructor(options) {
|
|
9
9
|
var _a, _b, _c, _d, _e;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { notNullish } from '
|
|
2
|
-
import { ktGenericParameter } from './generic-parameter';
|
|
3
|
-
import { KotlinFileBuilder } from '../../file-builder';
|
|
4
|
-
import { KtNode } from '../node';
|
|
5
|
-
import { writeKtNode, writeKtNodes } from '../utils/write-kt-node';
|
|
1
|
+
import { notNullish } from '../../../index.js';
|
|
2
|
+
import { ktGenericParameter } from './generic-parameter.js';
|
|
3
|
+
import { KotlinFileBuilder } from '../../file-builder.js';
|
|
4
|
+
import { KtNode } from '../node.js';
|
|
5
|
+
import { writeKtNode, writeKtNodes } from '../utils/write-kt-node.js';
|
|
6
6
|
export class KtReference extends KtNode {
|
|
7
7
|
constructor(options) {
|
|
8
8
|
var _a, _b, _c, _d, _e, _f;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { spliceString } from '
|
|
2
|
-
import { ktArgument } from './argument';
|
|
3
|
-
import { KtNode } from '../node';
|
|
4
|
-
import { writeKtNodes } from '../utils/write-kt-node';
|
|
1
|
+
import { spliceString } from '../../../index.js';
|
|
2
|
+
import { ktArgument } from './argument.js';
|
|
3
|
+
import { KtNode } from '../node.js';
|
|
4
|
+
import { writeKtNodes } from '../utils/write-kt-node.js';
|
|
5
5
|
export class KtString extends KtNode {
|
|
6
6
|
constructor(options) {
|
|
7
7
|
var _a, _b, _c, _d, _e, _f;
|
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
import * as jackson_1 from './jackson';
|
|
1
|
+
import * as jackson_1 from './jackson.js';
|
|
2
2
|
export { jackson_1 as jackson };
|
|
3
|
-
import * as jakarta_1 from './jakarta';
|
|
3
|
+
import * as jakarta_1 from './jakarta.js';
|
|
4
4
|
export { jakarta_1 as jakarta };
|
|
5
|
-
import * as java_1 from './java';
|
|
5
|
+
import * as java_1 from './java.js';
|
|
6
6
|
export { java_1 as java };
|
|
7
|
-
export * from './kotlin';
|
|
8
|
-
import * as okhttp3_1 from './okhttp3';
|
|
7
|
+
export * from './kotlin.js';
|
|
8
|
+
import * as okhttp3_1 from './okhttp3.js';
|
|
9
9
|
export { okhttp3_1 as okhttp3 };
|
|
10
|
-
import * as reactor_1 from './reactor';
|
|
10
|
+
import * as reactor_1 from './reactor.js';
|
|
11
11
|
export { reactor_1 as reactor };
|
|
12
|
-
import * as spring_1 from './spring';
|
|
12
|
+
import * as spring_1 from './spring.js';
|
|
13
13
|
export { spring_1 as spring };
|
|
14
|
-
import * as swagger_1 from './swagger';
|
|
14
|
+
import * as swagger_1 from './swagger.js';
|
|
15
15
|
export { swagger_1 as swagger };
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ktReference } from '../nodes/reference';
|
|
1
|
+
import { ktReference } from '../nodes/reference.js';
|
|
2
2
|
// com.fasterxml.jackson.annotation
|
|
3
3
|
export const jsonTypeInfo = ktReference.factory('JsonTypeInfo', 'com.fasterxml.jackson.annotation');
|
|
4
4
|
export const jsonSubTypes = ktReference.factory('JsonSubTypes', 'com.fasterxml.jackson.annotation');
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ktReference } from '../nodes/reference';
|
|
1
|
+
import { ktReference } from '../nodes/reference.js';
|
|
2
2
|
// reactor.core.publisher
|
|
3
3
|
export const flux = ktReference.genericFactory('Flux', 'reactor.core.publisher');
|
|
4
4
|
export const mono = ktReference.genericFactory('Mono', 'reactor.core.publisher');
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ktReference } from '../nodes/reference';
|
|
1
|
+
import { ktReference } from '../nodes/reference.js';
|
|
2
2
|
// org.springframework.beans.factory.annotation
|
|
3
3
|
export const autowired = ktReference.factory('Autowired', 'org.springframework.beans.factory.annotation');
|
|
4
4
|
// org.springframework.http
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ktReference } from '../nodes/reference';
|
|
1
|
+
import { ktReference } from '../nodes/reference.js';
|
|
2
2
|
// io.swagger.v3.oas.annotations
|
|
3
3
|
export const parameter = ktReference.factory('Parameter', 'io.swagger.v3.oas.annotations');
|
|
4
4
|
export const operation = ktReference.factory('Operation', 'io.swagger.v3.oas.annotations');
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { defaultOpenApiGeneratorConfig } from '
|
|
2
|
-
import { defaultKotlinGeneratorConfig } from '../../config';
|
|
3
|
-
import { KotlinFileBuilder } from '../../file-builder';
|
|
1
|
+
import { defaultOpenApiGeneratorConfig } from '../../../index.js';
|
|
2
|
+
import { defaultKotlinGeneratorConfig } from '../../config.js';
|
|
3
|
+
import { KotlinFileBuilder } from '../../file-builder.js';
|
|
4
4
|
const ktConfigSymbol = Symbol();
|
|
5
5
|
export function getKotlinBuilderOptions(builder) {
|
|
6
6
|
if (builder instanceof KotlinFileBuilder) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { ktCall } from '../nodes/call';
|
|
2
|
-
import { ktString } from '../nodes/string';
|
|
3
|
-
import { listOf, mapOf } from '../references';
|
|
1
|
+
import { ktCall } from '../nodes/call.js';
|
|
2
|
+
import { ktString } from '../nodes/string.js';
|
|
3
|
+
import { listOf, mapOf } from '../references/index.js';
|
|
4
4
|
export function toKtNode(value) {
|
|
5
5
|
if (Array.isArray(value)) {
|
|
6
6
|
return ktCall([listOf.infer()], value.map((x) => toKtNode(x)));
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { toArray, notNullish } from '
|
|
2
|
-
import { writeKtNode } from './write-kt-node';
|
|
1
|
+
import { toArray, notNullish } from '../../../index.js';
|
|
2
|
+
import { writeKtNode } from './write-kt-node.js';
|
|
3
3
|
export function writeKtAnnotations(builder, nodes, options) {
|
|
4
4
|
const filteredNodes = toArray(nodes).filter(notNullish);
|
|
5
5
|
builder.forEach(filteredNodes, (b, a) => {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { notNullish, toArray } from '
|
|
2
|
-
import { writeKtNode, writeKtNodes } from './write-kt-node';
|
|
3
|
-
import { KtLambda } from '../nodes/lambda';
|
|
1
|
+
import { notNullish, toArray } from '../../../index.js';
|
|
2
|
+
import { writeKtNode, writeKtNodes } from './write-kt-node.js';
|
|
3
|
+
import { KtLambda } from '../nodes/lambda.js';
|
|
4
4
|
export function writeKtArguments(builder, nodes) {
|
|
5
5
|
const filteredNodes = toArray(nodes).filter(notNullish);
|
|
6
6
|
if (filteredNodes.length === 0) {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { toArray, notNullish } from '
|
|
2
|
-
import { writeKtNode } from './write-kt-node';
|
|
1
|
+
import { toArray, notNullish } from '../../../index.js';
|
|
2
|
+
import { writeKtNode } from './write-kt-node.js';
|
|
3
3
|
export function writeKtEnumValues(builder, nodes) {
|
|
4
4
|
const filteredNodes = toArray(nodes).filter(notNullish);
|
|
5
5
|
const spacing = filteredNodes.some((v) => typeof v === 'object' &&
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { toArray, notNullish } from '
|
|
2
|
-
import { writeKtNode } from './write-kt-node';
|
|
1
|
+
import { toArray, notNullish } from '../../../index.js';
|
|
2
|
+
import { writeKtNode } from './write-kt-node.js';
|
|
3
3
|
export function writeKtGenericParameters(builder, nodes) {
|
|
4
4
|
const filteredNodes = toArray(nodes).filter(notNullish);
|
|
5
5
|
if (filteredNodes.length === 0)
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { notNullish, isAppendValue, isAppendValueGroup } from '
|
|
2
|
-
import { writeKtNode } from './write-kt-node';
|
|
3
|
-
import { KtProperty } from '../nodes/property';
|
|
1
|
+
import { notNullish, isAppendValue, isAppendValueGroup } from '../../../index.js';
|
|
2
|
+
import { writeKtNode } from './write-kt-node.js';
|
|
3
|
+
import { KtProperty } from '../nodes/property.js';
|
|
4
4
|
export function writeKtMembers(builder, members, options) {
|
|
5
5
|
const filteredMembers = members.filter(notNullish);
|
|
6
6
|
builder.forEach(filteredMembers, (b, m, i) => b.if(() => !(m instanceof KtProperty && !m.doc && m.annotations.length === 0) &&
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { toArray, notNullish } from '
|
|
2
|
-
import { KtNode } from '../node';
|
|
1
|
+
import { toArray, notNullish } from '../../../index.js';
|
|
2
|
+
import { KtNode } from '../node.js';
|
|
3
3
|
export function writeKtNode(builder, node) {
|
|
4
4
|
if (node instanceof KtNode) {
|
|
5
5
|
node.write(builder);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { toArray, notNullish } from '
|
|
2
|
-
import { writeKtNode } from './write-kt-node';
|
|
1
|
+
import { toArray, notNullish } from '../../../index.js';
|
|
2
|
+
import { writeKtNode } from './write-kt-node.js';
|
|
3
3
|
export function writeKtParameters(builder, nodes) {
|
|
4
4
|
const filteredNodes = toArray(nodes).filter(notNullish);
|
|
5
5
|
const hasAnnotations = filteredNodes.some((p) => typeof p === 'object' && 'annotations' in p && Array.isArray(p.annotations) && p.annotations.length > 0);
|
package/esm/lib/file-builder.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { SourceBuilder, isAppendValue } from '
|
|
2
|
-
import { KtNode } from './ast/node';
|
|
3
|
-
import { defaultKotlinGeneratorConfig } from './config';
|
|
4
|
-
import { ImportCollection } from './import-collection';
|
|
1
|
+
import { SourceBuilder, isAppendValue } from '../index.js';
|
|
2
|
+
import { KtNode } from './ast/node.js';
|
|
3
|
+
import { defaultKotlinGeneratorConfig } from './config.js';
|
|
4
|
+
import { ImportCollection } from './import-collection.js';
|
|
5
5
|
export function isKotlinAppendValue(value) {
|
|
6
6
|
return isAppendValue(value) || value instanceof KtNode;
|
|
7
7
|
}
|