@goast/kotlin 0.2.8 → 0.3.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.
Files changed (112) hide show
  1. package/README.md +36 -4
  2. package/cjs/index.js +0 -2
  3. package/cjs/lib/ast/nodes/annotation.js +1 -1
  4. package/cjs/lib/ast/nodes/argument.js +2 -2
  5. package/cjs/lib/ast/nodes/call.js +1 -1
  6. package/cjs/lib/ast/nodes/class.js +1 -1
  7. package/cjs/lib/ast/nodes/collection-literal.js +1 -1
  8. package/cjs/lib/ast/nodes/constructor.js +1 -1
  9. package/cjs/lib/ast/nodes/doc-tag.js +1 -1
  10. package/cjs/lib/ast/nodes/doc.js +1 -1
  11. package/cjs/lib/ast/nodes/enum-value.js +1 -1
  12. package/cjs/lib/ast/nodes/enum.js +1 -1
  13. package/cjs/lib/ast/nodes/function.js +1 -1
  14. package/cjs/lib/ast/nodes/generic-parameter.js +1 -1
  15. package/cjs/lib/ast/nodes/init-block.js +1 -1
  16. package/cjs/lib/ast/nodes/interface.js +1 -1
  17. package/cjs/lib/ast/nodes/lambda-type.js +1 -1
  18. package/cjs/lib/ast/nodes/lambda.js +1 -1
  19. package/cjs/lib/ast/nodes/parameter.js +2 -2
  20. package/cjs/lib/ast/nodes/property.js +1 -1
  21. package/cjs/lib/ast/nodes/reference.js +2 -2
  22. package/cjs/lib/ast/nodes/string.js +1 -1
  23. package/cjs/lib/ast/utils/get-kotlin-builder-options.js +2 -3
  24. package/cjs/lib/ast/utils/to-kt-node.js +1 -2
  25. package/cjs/lib/ast/utils/write-kt-annotations.js +1 -2
  26. package/cjs/lib/ast/utils/write-kt-arguments.js +1 -2
  27. package/cjs/lib/ast/utils/write-kt-enum-values.js +1 -2
  28. package/cjs/lib/ast/utils/write-kt-generic-parameters.js +1 -2
  29. package/cjs/lib/ast/utils/write-kt-members.js +1 -2
  30. package/cjs/lib/ast/utils/write-kt-node.js +2 -3
  31. package/cjs/lib/ast/utils/write-kt-parameters.js +1 -2
  32. package/cjs/lib/file-builder.js +2 -2
  33. package/cjs/lib/generators/models/model-generator.js +4 -5
  34. package/cjs/lib/generators/models/models-generator.js +8 -3
  35. package/cjs/lib/generators/models/models.js +9 -1
  36. package/cjs/lib/generators/services/okhttp3-clients/models.js +6 -1
  37. package/cjs/lib/generators/services/okhttp3-clients/okhttp3-client-generator.js +28 -28
  38. package/cjs/lib/generators/services/okhttp3-clients/okhttp3-clients-generator.js +8 -3
  39. package/cjs/lib/generators/services/okhttp3-clients/refs.js +1 -2
  40. package/cjs/lib/generators/services/spring-controllers/models.js +7 -1
  41. package/cjs/lib/generators/services/spring-controllers/spring-controller-generator.js +4 -4
  42. package/cjs/lib/generators/services/spring-controllers/spring-controllers-generator.js +8 -3
  43. package/cjs/lib/import-collection.js +1 -1
  44. package/cjs/lib/utils.js +3 -4
  45. package/esm/index.js +0 -2
  46. package/esm/lib/ast/nodes/annotation.js +1 -1
  47. package/esm/lib/ast/nodes/argument.js +2 -2
  48. package/esm/lib/ast/nodes/call.js +1 -1
  49. package/esm/lib/ast/nodes/class.js +1 -1
  50. package/esm/lib/ast/nodes/collection-literal.js +1 -1
  51. package/esm/lib/ast/nodes/constructor.js +1 -1
  52. package/esm/lib/ast/nodes/doc-tag.js +1 -1
  53. package/esm/lib/ast/nodes/doc.js +1 -1
  54. package/esm/lib/ast/nodes/enum-value.js +1 -1
  55. package/esm/lib/ast/nodes/enum.js +1 -1
  56. package/esm/lib/ast/nodes/function.js +1 -1
  57. package/esm/lib/ast/nodes/generic-parameter.js +1 -1
  58. package/esm/lib/ast/nodes/init-block.js +1 -1
  59. package/esm/lib/ast/nodes/interface.js +1 -1
  60. package/esm/lib/ast/nodes/lambda-type.js +1 -1
  61. package/esm/lib/ast/nodes/lambda.js +1 -1
  62. package/esm/lib/ast/nodes/parameter.js +2 -2
  63. package/esm/lib/ast/nodes/property.js +1 -1
  64. package/esm/lib/ast/nodes/reference.js +2 -2
  65. package/esm/lib/ast/nodes/string.js +1 -1
  66. package/esm/lib/ast/utils/get-kotlin-builder-options.js +1 -1
  67. package/esm/lib/generators/models/model-generator.js +4 -5
  68. package/esm/lib/generators/models/models-generator.js +8 -3
  69. package/esm/lib/generators/models/models.js +9 -1
  70. package/esm/lib/generators/services/okhttp3-clients/models.js +6 -1
  71. package/esm/lib/generators/services/okhttp3-clients/okhttp3-client-generator.js +28 -28
  72. package/esm/lib/generators/services/okhttp3-clients/okhttp3-clients-generator.js +8 -3
  73. package/esm/lib/generators/services/spring-controllers/models.js +7 -1
  74. package/esm/lib/generators/services/spring-controllers/spring-controller-generator.js +2 -2
  75. package/esm/lib/generators/services/spring-controllers/spring-controllers-generator.js +8 -3
  76. package/esm/lib/import-collection.js +1 -1
  77. package/package.json +7 -6
  78. package/types/index.d.ts +0 -1
  79. package/types/lib/ast/nodes/annotation.d.ts +1 -1
  80. package/types/lib/ast/nodes/argument.d.ts +2 -4
  81. package/types/lib/ast/nodes/call.d.ts +1 -1
  82. package/types/lib/ast/nodes/class.d.ts +1 -1
  83. package/types/lib/ast/nodes/collection-literal.d.ts +1 -1
  84. package/types/lib/ast/nodes/constructor.d.ts +1 -1
  85. package/types/lib/ast/nodes/doc-tag.d.ts +1 -1
  86. package/types/lib/ast/nodes/doc.d.ts +1 -1
  87. package/types/lib/ast/nodes/enum-value.d.ts +1 -1
  88. package/types/lib/ast/nodes/enum.d.ts +1 -1
  89. package/types/lib/ast/nodes/function.d.ts +1 -1
  90. package/types/lib/ast/nodes/generic-parameter.d.ts +1 -1
  91. package/types/lib/ast/nodes/init-block.d.ts +1 -1
  92. package/types/lib/ast/nodes/interface.d.ts +1 -1
  93. package/types/lib/ast/nodes/lambda-type.d.ts +1 -1
  94. package/types/lib/ast/nodes/lambda.d.ts +1 -1
  95. package/types/lib/ast/nodes/object.d.ts +1 -1
  96. package/types/lib/ast/nodes/parameter.d.ts +2 -12
  97. package/types/lib/ast/nodes/property.d.ts +3 -15
  98. package/types/lib/ast/nodes/reference.d.ts +7 -23
  99. package/types/lib/ast/nodes/string.d.ts +1 -1
  100. package/types/lib/ast/references/jackson.d.ts +49 -35
  101. package/types/lib/ast/references/jakarta.d.ts +21 -15
  102. package/types/lib/ast/references/java.d.ts +41 -31
  103. package/types/lib/ast/references/kotlin.d.ts +138 -114
  104. package/types/lib/ast/references/okhttp3.d.ts +14 -10
  105. package/types/lib/ast/references/reactor.d.ts +6 -6
  106. package/types/lib/ast/references/spring.d.ts +76 -56
  107. package/types/lib/ast/references/swagger.d.ts +28 -20
  108. package/types/lib/generators/models/model-generator.d.ts +1 -1
  109. package/types/lib/generators/models/models.d.ts +4 -2
  110. package/types/lib/generators/services/okhttp3-clients/models.d.ts +4 -2
  111. package/types/lib/generators/services/okhttp3-clients/refs.d.ts +137 -121
  112. package/types/lib/generators/services/spring-controllers/models.d.ts +4 -2
package/types/lib/ast/references/okhttp3.d.ts CHANGED
@@ -1,22 +1,26 @@
1
- export declare const okHttpClient: (<TBuilder extends import("@goast/core").SourceBuilder<never>>(options?: {
2
- nullable?: import("@goast/core").Nullable<boolean>;
3
- inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
1
+ export declare const okHttpClient: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
2
+ name: string;
3
+ packageName?: import("@goast/core").Nullable<string>;
4
4
  generics?: import("@goast/core").Nullable<import("@goast/core").Nullable<import("../_index").Type<TBuilder>>[]>;
5
+ nullable?: import("@goast/core").Nullable<boolean>;
5
6
  classReference?: import("@goast/core").Nullable<boolean>;
6
7
  subReference?: import("@goast/core").Nullable<import("../nodes/reference").KtReference<TBuilder, never> | import("../_index").Call<TBuilder, never>>;
7
- } | undefined) => import("../nodes/reference").KtReference<TBuilder, never>) & {
8
+ inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
9
+ }, "name" | "packageName">>) => import("../nodes/reference").KtReference<TBuilder, never>) & {
8
10
  refName: string;
9
11
  packageName: import("@goast/core").Nullable<string>;
10
- matches: (value: unknown) => value is import("../nodes/reference").KtReference<never, never>;
12
+ matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
11
13
  };
12
- export declare const httpUrl: (<TBuilder extends import("@goast/core").SourceBuilder<never>>(options?: {
13
- nullable?: import("@goast/core").Nullable<boolean>;
14
- inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
14
+ export declare const httpUrl: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
15
+ name: string;
16
+ packageName?: import("@goast/core").Nullable<string>;
15
17
  generics?: import("@goast/core").Nullable<import("@goast/core").Nullable<import("../_index").Type<TBuilder>>[]>;
18
+ nullable?: import("@goast/core").Nullable<boolean>;
16
19
  classReference?: import("@goast/core").Nullable<boolean>;
17
20
  subReference?: import("@goast/core").Nullable<import("../nodes/reference").KtReference<TBuilder, never> | import("../_index").Call<TBuilder, never>>;
18
- } | undefined) => import("../nodes/reference").KtReference<TBuilder, never>) & {
21
+ inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
22
+ }, "name" | "packageName">>) => import("../nodes/reference").KtReference<TBuilder, never>) & {
19
23
  refName: string;
20
24
  packageName: import("@goast/core").Nullable<string>;
21
- matches: (value: unknown) => value is import("../nodes/reference").KtReference<never, never>;
25
+ matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
22
26
  };
package/types/lib/ast/references/reactor.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- export declare const flux: (<TBuilder extends import("@goast/core").SourceBuilder<never>>(generics: [import("../_index").Type<TBuilder>], options?: {
1
+ export declare const flux: (<TBuilder extends import("@goast/core").SourceBuilder>(generics: [import("../_index").Type<TBuilder>], options?: {
2
2
  nullable?: import("@goast/core").Nullable<boolean>;
3
3
  inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
4
4
  classReference?: import("@goast/core").Nullable<boolean>;
@@ -6,11 +6,11 @@ export declare const flux: (<TBuilder extends import("@goast/core").SourceBuilde
6
6
  } | undefined) => import("../nodes/reference").KtReference<TBuilder, never>) & {
7
7
  refName: string;
8
8
  packageName: import("@goast/core").Nullable<string>;
9
- infer: <TBuilder_1 extends import("@goast/core").SourceBuilder<never>>(options?: {
9
+ infer: <TBuilder extends import("@goast/core").SourceBuilder>(options?: {
10
10
  nullable?: import("@goast/core").Nullable<boolean>;
11
- inject?: import("@goast/core").AstNodeInject<TBuilder_1, ""> | undefined;
11
+ inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
12
12
  classReference?: import("@goast/core").Nullable<boolean>;
13
- subReference?: import("@goast/core").Nullable<import("../nodes/reference").KtReference<TBuilder_1, never> | import("../_index").Call<TBuilder_1, never>>;
14
- } | undefined) => import("../nodes/reference").KtReference<TBuilder_1, never>;
15
- matches: (value: unknown) => value is import("../nodes/reference").KtReference<never, never>;
13
+ subReference?: import("@goast/core").Nullable<import("../nodes/reference").KtReference<TBuilder, never> | import("../_index").Call<TBuilder, never>>;
14
+ } | undefined) => import("../nodes/reference").KtReference<TBuilder, never>;
15
+ matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
16
16
  };
package/types/lib/ast/references/spring.d.ts CHANGED
@@ -1,92 +1,108 @@
1
- export declare const requestMapping: (<TBuilder extends import("@goast/core").SourceBuilder<never>>(options?: {
2
- nullable?: import("@goast/core").Nullable<boolean>;
3
- inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
1
+ export declare const requestMapping: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
2
+ name: string;
3
+ packageName?: import("@goast/core").Nullable<string>;
4
4
  generics?: import("@goast/core").Nullable<import("@goast/core").Nullable<import("../_index").Type<TBuilder>>[]>;
5
+ nullable?: import("@goast/core").Nullable<boolean>;
5
6
  classReference?: import("@goast/core").Nullable<boolean>;
6
7
  subReference?: import("@goast/core").Nullable<import("../nodes/reference").KtReference<TBuilder, never> | import("../_index").Call<TBuilder, never>>;
7
- } | undefined) => import("../nodes/reference").KtReference<TBuilder, never>) & {
8
+ inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
9
+ }, "name" | "packageName">>) => import("../nodes/reference").KtReference<TBuilder, never>) & {
8
10
  refName: string;
9
11
  packageName: import("@goast/core").Nullable<string>;
10
- matches: (value: unknown) => value is import("../nodes/reference").KtReference<never, never>;
12
+ matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
11
13
  };
12
- export declare const requestBody: (<TBuilder extends import("@goast/core").SourceBuilder<never>>(options?: {
13
- nullable?: import("@goast/core").Nullable<boolean>;
14
- inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
14
+ export declare const requestBody: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
15
+ name: string;
16
+ packageName?: import("@goast/core").Nullable<string>;
15
17
  generics?: import("@goast/core").Nullable<import("@goast/core").Nullable<import("../_index").Type<TBuilder>>[]>;
18
+ nullable?: import("@goast/core").Nullable<boolean>;
16
19
  classReference?: import("@goast/core").Nullable<boolean>;
17
20
  subReference?: import("@goast/core").Nullable<import("../nodes/reference").KtReference<TBuilder, never> | import("../_index").Call<TBuilder, never>>;
18
- } | undefined) => import("../nodes/reference").KtReference<TBuilder, never>) & {
21
+ inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
22
+ }, "name" | "packageName">>) => import("../nodes/reference").KtReference<TBuilder, never>) & {
19
23
  refName: string;
20
24
  packageName: import("@goast/core").Nullable<string>;
21
- matches: (value: unknown) => value is import("../nodes/reference").KtReference<never, never>;
25
+ matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
22
26
  };
23
- export declare const requestParam: (<TBuilder extends import("@goast/core").SourceBuilder<never>>(options?: {
24
- nullable?: import("@goast/core").Nullable<boolean>;
25
- inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
27
+ export declare const requestParam: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
28
+ name: string;
29
+ packageName?: import("@goast/core").Nullable<string>;
26
30
  generics?: import("@goast/core").Nullable<import("@goast/core").Nullable<import("../_index").Type<TBuilder>>[]>;
31
+ nullable?: import("@goast/core").Nullable<boolean>;
27
32
  classReference?: import("@goast/core").Nullable<boolean>;
28
33
  subReference?: import("@goast/core").Nullable<import("../nodes/reference").KtReference<TBuilder, never> | import("../_index").Call<TBuilder, never>>;
29
- } | undefined) => import("../nodes/reference").KtReference<TBuilder, never>) & {
34
+ inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
35
+ }, "name" | "packageName">>) => import("../nodes/reference").KtReference<TBuilder, never>) & {
30
36
  refName: string;
31
37
  packageName: import("@goast/core").Nullable<string>;
32
- matches: (value: unknown) => value is import("../nodes/reference").KtReference<never, never>;
38
+ matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
33
39
  };
34
- export declare const requestMethod: (<TBuilder extends import("@goast/core").SourceBuilder<never>>(options?: {
35
- nullable?: import("@goast/core").Nullable<boolean>;
36
- inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
40
+ export declare const requestMethod: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
41
+ name: string;
42
+ packageName?: import("@goast/core").Nullable<string>;
37
43
  generics?: import("@goast/core").Nullable<import("@goast/core").Nullable<import("../_index").Type<TBuilder>>[]>;
44
+ nullable?: import("@goast/core").Nullable<boolean>;
38
45
  classReference?: import("@goast/core").Nullable<boolean>;
39
46
  subReference?: import("@goast/core").Nullable<import("../nodes/reference").KtReference<TBuilder, never> | import("../_index").Call<TBuilder, never>>;
40
- } | undefined) => import("../nodes/reference").KtReference<TBuilder, never>) & {
47
+ inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
48
+ }, "name" | "packageName">>) => import("../nodes/reference").KtReference<TBuilder, never>) & {
41
49
  refName: string;
42
50
  packageName: import("@goast/core").Nullable<string>;
43
- matches: (value: unknown) => value is import("../nodes/reference").KtReference<never, never>;
51
+ matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
44
52
  };
45
- export declare const pathVariable: (<TBuilder extends import("@goast/core").SourceBuilder<never>>(options?: {
46
- nullable?: import("@goast/core").Nullable<boolean>;
47
- inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
53
+ export declare const pathVariable: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
54
+ name: string;
55
+ packageName?: import("@goast/core").Nullable<string>;
48
56
  generics?: import("@goast/core").Nullable<import("@goast/core").Nullable<import("../_index").Type<TBuilder>>[]>;
57
+ nullable?: import("@goast/core").Nullable<boolean>;
49
58
  classReference?: import("@goast/core").Nullable<boolean>;
50
59
  subReference?: import("@goast/core").Nullable<import("../nodes/reference").KtReference<TBuilder, never> | import("../_index").Call<TBuilder, never>>;
51
- } | undefined) => import("../nodes/reference").KtReference<TBuilder, never>) & {
60
+ inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
61
+ }, "name" | "packageName">>) => import("../nodes/reference").KtReference<TBuilder, never>) & {
52
62
  refName: string;
53
63
  packageName: import("@goast/core").Nullable<string>;
54
- matches: (value: unknown) => value is import("../nodes/reference").KtReference<never, never>;
64
+ matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
55
65
  };
56
- export declare const nativeWebRequest: (<TBuilder extends import("@goast/core").SourceBuilder<never>>(options?: {
57
- nullable?: import("@goast/core").Nullable<boolean>;
58
- inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
66
+ export declare const nativeWebRequest: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
67
+ name: string;
68
+ packageName?: import("@goast/core").Nullable<string>;
59
69
  generics?: import("@goast/core").Nullable<import("@goast/core").Nullable<import("../_index").Type<TBuilder>>[]>;
70
+ nullable?: import("@goast/core").Nullable<boolean>;
60
71
  classReference?: import("@goast/core").Nullable<boolean>;
61
72
  subReference?: import("@goast/core").Nullable<import("../nodes/reference").KtReference<TBuilder, never> | import("../_index").Call<TBuilder, never>>;
62
- } | undefined) => import("../nodes/reference").KtReference<TBuilder, never>) & {
73
+ inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
74
+ }, "name" | "packageName">>) => import("../nodes/reference").KtReference<TBuilder, never>) & {
63
75
  refName: string;
64
76
  packageName: import("@goast/core").Nullable<string>;
65
- matches: (value: unknown) => value is import("../nodes/reference").KtReference<never, never>;
77
+ matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
66
78
  };
67
- export declare const autowired: (<TBuilder extends import("@goast/core").SourceBuilder<never>>(options?: {
68
- nullable?: import("@goast/core").Nullable<boolean>;
69
- inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
79
+ export declare const autowired: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
80
+ name: string;
81
+ packageName?: import("@goast/core").Nullable<string>;
70
82
  generics?: import("@goast/core").Nullable<import("@goast/core").Nullable<import("../_index").Type<TBuilder>>[]>;
83
+ nullable?: import("@goast/core").Nullable<boolean>;
71
84
  classReference?: import("@goast/core").Nullable<boolean>;
72
85
  subReference?: import("@goast/core").Nullable<import("../nodes/reference").KtReference<TBuilder, never> | import("../_index").Call<TBuilder, never>>;
73
- } | undefined) => import("../nodes/reference").KtReference<TBuilder, never>) & {
86
+ inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
87
+ }, "name" | "packageName">>) => import("../nodes/reference").KtReference<TBuilder, never>) & {
74
88
  refName: string;
75
89
  packageName: import("@goast/core").Nullable<string>;
76
- matches: (value: unknown) => value is import("../nodes/reference").KtReference<never, never>;
90
+ matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
77
91
  };
78
- export declare const validated: (<TBuilder extends import("@goast/core").SourceBuilder<never>>(options?: {
79
- nullable?: import("@goast/core").Nullable<boolean>;
80
- inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
92
+ export declare const validated: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
93
+ name: string;
94
+ packageName?: import("@goast/core").Nullable<string>;
81
95
  generics?: import("@goast/core").Nullable<import("@goast/core").Nullable<import("../_index").Type<TBuilder>>[]>;
96
+ nullable?: import("@goast/core").Nullable<boolean>;
82
97
  classReference?: import("@goast/core").Nullable<boolean>;
83
98
  subReference?: import("@goast/core").Nullable<import("../nodes/reference").KtReference<TBuilder, never> | import("../_index").Call<TBuilder, never>>;
84
- } | undefined) => import("../nodes/reference").KtReference<TBuilder, never>) & {
99
+ inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
100
+ }, "name" | "packageName">>) => import("../nodes/reference").KtReference<TBuilder, never>) & {
85
101
  refName: string;
86
102
  packageName: import("@goast/core").Nullable<string>;
87
- matches: (value: unknown) => value is import("../nodes/reference").KtReference<never, never>;
103
+ matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
88
104
  };
89
- export declare const responseEntity: (<TBuilder extends import("@goast/core").SourceBuilder<never>>(generics: [import("../_index").Type<TBuilder>], options?: {
105
+ export declare const responseEntity: (<TBuilder extends import("@goast/core").SourceBuilder>(generics: [import("../_index").Type<TBuilder>], options?: {
90
106
  nullable?: import("@goast/core").Nullable<boolean>;
91
107
  inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
92
108
  classReference?: import("@goast/core").Nullable<boolean>;
@@ -94,33 +110,37 @@ export declare const responseEntity: (<TBuilder extends import("@goast/core").So
94
110
  } | undefined) => import("../nodes/reference").KtReference<TBuilder, never>) & {
95
111
  refName: string;
96
112
  packageName: import("@goast/core").Nullable<string>;
97
- infer: <TBuilder_1 extends import("@goast/core").SourceBuilder<never>>(options?: {
113
+ infer: <TBuilder extends import("@goast/core").SourceBuilder>(options?: {
98
114
  nullable?: import("@goast/core").Nullable<boolean>;
99
- inject?: import("@goast/core").AstNodeInject<TBuilder_1, ""> | undefined;
115
+ inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
100
116
  classReference?: import("@goast/core").Nullable<boolean>;
101
- subReference?: import("@goast/core").Nullable<import("../nodes/reference").KtReference<TBuilder_1, never> | import("../_index").Call<TBuilder_1, never>>;
102
- } | undefined) => import("../nodes/reference").KtReference<TBuilder_1, never>;
103
- matches: (value: unknown) => value is import("../nodes/reference").KtReference<never, never>;
117
+ subReference?: import("@goast/core").Nullable<import("../nodes/reference").KtReference<TBuilder, never> | import("../_index").Call<TBuilder, never>>;
118
+ } | undefined) => import("../nodes/reference").KtReference<TBuilder, never>;
119
+ matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
104
120
  };
105
- export declare const httpStatus: (<TBuilder extends import("@goast/core").SourceBuilder<never>>(options?: {
106
- nullable?: import("@goast/core").Nullable<boolean>;
107
- inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
121
+ export declare const httpStatus: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
122
+ name: string;
123
+ packageName?: import("@goast/core").Nullable<string>;
108
124
  generics?: import("@goast/core").Nullable<import("@goast/core").Nullable<import("../_index").Type<TBuilder>>[]>;
125
+ nullable?: import("@goast/core").Nullable<boolean>;
109
126
  classReference?: import("@goast/core").Nullable<boolean>;
110
127
  subReference?: import("@goast/core").Nullable<import("../nodes/reference").KtReference<TBuilder, never> | import("../_index").Call<TBuilder, never>>;
111
- } | undefined) => import("../nodes/reference").KtReference<TBuilder, never>) & {
128
+ inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
129
+ }, "name" | "packageName">>) => import("../nodes/reference").KtReference<TBuilder, never>) & {
112
130
  refName: string;
113
131
  packageName: import("@goast/core").Nullable<string>;
114
- matches: (value: unknown) => value is import("../nodes/reference").KtReference<never, never>;
132
+ matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
115
133
  };
116
- export declare const controller: (<TBuilder extends import("@goast/core").SourceBuilder<never>>(options?: {
117
- nullable?: import("@goast/core").Nullable<boolean>;
118
- inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
134
+ export declare const controller: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
135
+ name: string;
136
+ packageName?: import("@goast/core").Nullable<string>;
119
137
  generics?: import("@goast/core").Nullable<import("@goast/core").Nullable<import("../_index").Type<TBuilder>>[]>;
138
+ nullable?: import("@goast/core").Nullable<boolean>;
120
139
  classReference?: import("@goast/core").Nullable<boolean>;
121
140
  subReference?: import("@goast/core").Nullable<import("../nodes/reference").KtReference<TBuilder, never> | import("../_index").Call<TBuilder, never>>;
122
- } | undefined) => import("../nodes/reference").KtReference<TBuilder, never>) & {
141
+ inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
142
+ }, "name" | "packageName">>) => import("../nodes/reference").KtReference<TBuilder, never>) & {
123
143
  refName: string;
124
144
  packageName: import("@goast/core").Nullable<string>;
125
- matches: (value: unknown) => value is import("../nodes/reference").KtReference<never, never>;
145
+ matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
126
146
  };
package/types/lib/ast/references/swagger.d.ts CHANGED
@@ -1,44 +1,52 @@
1
- export declare const parameter: (<TBuilder extends import("@goast/core").SourceBuilder<never>>(options?: {
2
- nullable?: import("@goast/core").Nullable<boolean>;
3
- inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
1
+ export declare const parameter: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
2
+ name: string;
3
+ packageName?: import("@goast/core").Nullable<string>;
4
4
  generics?: import("@goast/core").Nullable<import("@goast/core").Nullable<import("../_index").Type<TBuilder>>[]>;
5
+ nullable?: import("@goast/core").Nullable<boolean>;
5
6
  classReference?: import("@goast/core").Nullable<boolean>;
6
7
  subReference?: import("@goast/core").Nullable<import("../nodes/reference").KtReference<TBuilder, never> | import("../_index").Call<TBuilder, never>>;
7
- } | undefined) => import("../nodes/reference").KtReference<TBuilder, never>) & {
8
+ inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
9
+ }, "name" | "packageName">>) => import("../nodes/reference").KtReference<TBuilder, never>) & {
8
10
  refName: string;
9
11
  packageName: import("@goast/core").Nullable<string>;
10
- matches: (value: unknown) => value is import("../nodes/reference").KtReference<never, never>;
12
+ matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
11
13
  };
12
- export declare const operation: (<TBuilder extends import("@goast/core").SourceBuilder<never>>(options?: {
13
- nullable?: import("@goast/core").Nullable<boolean>;
14
- inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
14
+ export declare const operation: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
15
+ name: string;
16
+ packageName?: import("@goast/core").Nullable<string>;
15
17
  generics?: import("@goast/core").Nullable<import("@goast/core").Nullable<import("../_index").Type<TBuilder>>[]>;
18
+ nullable?: import("@goast/core").Nullable<boolean>;
16
19
  classReference?: import("@goast/core").Nullable<boolean>;
17
20
  subReference?: import("@goast/core").Nullable<import("../nodes/reference").KtReference<TBuilder, never> | import("../_index").Call<TBuilder, never>>;
18
- } | undefined) => import("../nodes/reference").KtReference<TBuilder, never>) & {
21
+ inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
22
+ }, "name" | "packageName">>) => import("../nodes/reference").KtReference<TBuilder, never>) & {
19
23
  refName: string;
20
24
  packageName: import("@goast/core").Nullable<string>;
21
- matches: (value: unknown) => value is import("../nodes/reference").KtReference<never, never>;
25
+ matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
22
26
  };
23
- export declare const schema: (<TBuilder extends import("@goast/core").SourceBuilder<never>>(options?: {
24
- nullable?: import("@goast/core").Nullable<boolean>;
25
- inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
27
+ export declare const schema: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
28
+ name: string;
29
+ packageName?: import("@goast/core").Nullable<string>;
26
30
  generics?: import("@goast/core").Nullable<import("@goast/core").Nullable<import("../_index").Type<TBuilder>>[]>;
31
+ nullable?: import("@goast/core").Nullable<boolean>;
27
32
  classReference?: import("@goast/core").Nullable<boolean>;
28
33
  subReference?: import("@goast/core").Nullable<import("../nodes/reference").KtReference<TBuilder, never> | import("../_index").Call<TBuilder, never>>;
29
- } | undefined) => import("../nodes/reference").KtReference<TBuilder, never>) & {
34
+ inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
35
+ }, "name" | "packageName">>) => import("../nodes/reference").KtReference<TBuilder, never>) & {
30
36
  refName: string;
31
37
  packageName: import("@goast/core").Nullable<string>;
32
- matches: (value: unknown) => value is import("../nodes/reference").KtReference<never, never>;
38
+ matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
33
39
  };
34
- export declare const apiResponse: (<TBuilder extends import("@goast/core").SourceBuilder<never>>(options?: {
35
- nullable?: import("@goast/core").Nullable<boolean>;
36
- inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
40
+ export declare const apiResponse: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
41
+ name: string;
42
+ packageName?: import("@goast/core").Nullable<string>;
37
43
  generics?: import("@goast/core").Nullable<import("@goast/core").Nullable<import("../_index").Type<TBuilder>>[]>;
44
+ nullable?: import("@goast/core").Nullable<boolean>;
38
45
  classReference?: import("@goast/core").Nullable<boolean>;
39
46
  subReference?: import("@goast/core").Nullable<import("../nodes/reference").KtReference<TBuilder, never> | import("../_index").Call<TBuilder, never>>;
40
- } | undefined) => import("../nodes/reference").KtReference<TBuilder, never>) & {
47
+ inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
48
+ }, "name" | "packageName">>) => import("../nodes/reference").KtReference<TBuilder, never>) & {
41
49
  refName: string;
42
50
  packageName: import("@goast/core").Nullable<string>;
43
- matches: (value: unknown) => value is import("../nodes/reference").KtReference<never, never>;
51
+ matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
44
52
  };
package/types/lib/generators/models/model-generator.d.ts CHANGED
@@ -37,7 +37,7 @@ export declare class DefaultKotlinModelGenerator extends KotlinFileGenerator<Con
37
37
  protected shouldGenerateTypeDeclaration(ctx: Context, args: Args.ShouldGenerateTypeDeclaration): boolean;
38
38
  protected getDeclarationTypeName(ctx: Context, args: Args.GetDeclarationTypeName): string;
39
39
  protected getInheritedSchemas(ctx: Context, args: Args.GetInheritedSchemas): (ApiSchema<import("@goast/core").ApiSchemaKind> & {
40
- discriminator: import("@goast/core").ApiSchemaDiscriminator;
40
+ discriminator: NonNullable<ApiSchema["discriminator"]>;
41
41
  })[];
42
42
  protected getClassProperties(ctx: Context, args: Args.GetClassProperties): ApiSchemaProperty[];
43
43
  protected sortProperties(ctx: Context, args: Args.SortProperties): ApiSchemaProperty[];
package/types/lib/generators/models/models.d.ts CHANGED
@@ -12,8 +12,10 @@ export type KotlinModelsGeneratorConfig = KotlinGeneratorConfig & {
12
12
  export declare const defaultKotlinModelsGeneratorConfig: DefaultGenerationProviderConfig<KotlinModelsGeneratorConfig>;
13
13
  export type KotlinModelsGeneratorInput = {};
14
14
  export type KotlinModelsGeneratorOutput = {
15
- models: {
16
- [schemaId: string]: KotlinModelGeneratorOutput;
15
+ kotlin: {
16
+ models: {
17
+ [schemaId: string]: KotlinModelGeneratorOutput;
18
+ };
17
19
  };
18
20
  };
19
21
  export type KotlinModelGeneratorOutput = {
package/types/lib/generators/services/okhttp3-clients/models.d.ts CHANGED
@@ -16,8 +16,10 @@ export type KotlinOkHttp3ClientsGeneratorConfig = KotlinGeneratorConfig & {
16
16
  export declare const defaultKotlinOkHttp3ClientsGeneratorConfig: DefaultGenerationProviderConfig<KotlinOkHttp3ClientsGeneratorConfig>;
17
17
  export type KotlinOkHttp3ClientsGeneratorInput = KotlinModelsGeneratorOutput;
18
18
  export type KotlinOkHttp3ClientsGeneratorOutput = {
19
- clients: {
20
- [serviceId: string]: KotlinOkHttp3ClientGeneratorOutput;
19
+ kotlin: {
20
+ clients: {
21
+ [serviceId: string]: KotlinOkHttp3ClientGeneratorOutput;
22
+ };
21
23
  };
22
24
  };
23
25
  export type KotlinOkHttp3ClientGeneratorOutput = KotlinImport;