@goast/kotlin 0.2.6 → 0.2.8

package/cjs/lib/ast/references/kotlin.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jvmStatic = exports.mutableMapOf = exports.mapOf = exports.mutableListOf = exports.listOf = exports.mutableMap = exports.map = exports.mutableList = exports.list = exports.throws = exports.lazyFun = exports.boolean = exports.double = exports.float = exports.long = exports.int = exports.string = exports.unit = exports.nothing = exports.any = void 0;
+exports.jvmStatic = exports.mutableMapOf = exports.mapOf = exports.mutableListOf = exports.listOf = exports.mutableMap = exports.map = exports.mutableList = exports.list = exports.deprecated = exports.throws = exports.lazyFun = exports.boolean = exports.double = exports.float = exports.long = exports.int = exports.string = exports.unit = exports.nothing = exports.any = void 0;
 const reference_1 = require("../nodes/reference");
 // kotlin
 exports.any = reference_1.ktReference.factory('Any', 'kotlin');
@@ -14,6 +14,7 @@ exports.double = reference_1.ktReference.factory('Double', 'kotlin');
 exports.boolean = reference_1.ktReference.factory('Boolean', 'kotlin');
 exports.lazyFun = reference_1.ktReference.genericFactory('lazy', 'kotlin');
 exports.throws = reference_1.ktReference.factory('Throws', 'kotlin');
+exports.deprecated = reference_1.ktReference.factory('Deprecated', 'kotlin');
 // kotlin.collections
 exports.list = reference_1.ktReference.genericFactory('List', 'kotlin.collections');
 exports.mutableList = reference_1.ktReference.genericFactory('MutableList', 'kotlin.collections');

package/cjs/lib/generators/models/model-generator.js

@@ -65,6 +65,7 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
         const parameters = this.getClassProperties(ctx, { schema });
         return ast_1.kt.class(this.getDeclarationTypeName(ctx, { schema }), {
             doc: ast_1.kt.doc((_a = schema.description) === null || _a === void 0 ? void 0 : _a.trim()),
+            annotations: [schema.deprecated ? ast_1.kt.annotation(ast_1.kt.refs.deprecated(), [ast_1.kt.argument(ast_1.kt.string(''))]) : null],
             classKind: parameters.length === 0 ? null : 'data',
             implements: inheritedSchemas.map((schema) => this.getType(ctx, { schema })),
             primaryConstructor: ast_1.kt.constructor(parameters.map((property) => this.getClassParameter(ctx, Object.assign(Object.assign({}, args), { inheritedSchemas, parameters, property })))),
@@ -87,6 +88,7 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
             annotations: [
                 this.getJacksonJsonTypeInfoAnnotation(ctx, { schema }),
                 this.getJacksonJsonSubTypesAnnotation(ctx, { schema }),
+                schema.deprecated ? ast_1.kt.annotation(ast_1.kt.refs.deprecated(), [ast_1.kt.argument(ast_1.kt.string(''))]) : null,
             ].filter(core_1.notNullish),
             members: this.sortProperties(ctx, { schema, properties: schema.properties.values() }).map((property) => this.getInterfaceProperty(ctx, { schema, property })),
         });
@@ -99,6 +101,7 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
             arguments: [ast_1.kt.argument(ast_1.kt.string(String(x)))],
         }))) !== null && _b !== void 0 ? _b : [], {
             doc: ast_1.kt.doc((_c = schema.description) === null || _c === void 0 ? void 0 : _c.trim()),
+            annotations: [schema.deprecated ? ast_1.kt.annotation(ast_1.kt.refs.deprecated(), [ast_1.kt.argument(ast_1.kt.string(''))]) : null],
             primaryConstructor: ast_1.kt.constructor([
                 ast_1.kt.parameter.class((0, core_1.toCasing)('value', ctx.config.propertyNameCasing), ast_1.kt.refs.string(), {
                     property: 'readonly',
@@ -201,6 +204,7 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
                 this.getSwaggerSchemaAnnotation(ctx, { schema, property }),
                 this.getJacksonJsonPropertyAnnotation(ctx, { schema, property }),
                 (0, core_1.modify)(this.getJacksonJsonIncludeAnnotation(ctx, { schema, property }), (x) => (x.target = 'get')),
+                property.schema.deprecated ? ast_1.kt.annotation(ast_1.kt.refs.deprecated(), [ast_1.kt.argument(ast_1.kt.string(''))]) : null,
             ].filter(core_1.notNullish),
             override: inheritedSchemas.some((schema) => this.hasProperty(ctx, { schema, propertyName: property.name })),
             property: 'readonly',
@@ -217,6 +221,7 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
             annotations: (0, core_1.modifyEach)([
                 this.getJacksonJsonPropertyAnnotation(ctx, { schema, property }),
                 this.getJacksonJsonIncludeAnnotation(ctx, { schema, property }),
+                property.schema.deprecated ? ast_1.kt.annotation(ast_1.kt.refs.deprecated(), [ast_1.kt.argument(ast_1.kt.string(''))]) : null,
             ].filter(core_1.notNullish), (x) => (x.target = 'get')),
             type: this.getType(ctx, {
                 schema: property.schema,
@@ -321,6 +326,9 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
                 property.schema.description !== undefined
                     ? ast_1.kt.argument.named('description', ast_1.kt.string(property.schema.description))
                     : null,
+                property.schema.deprecated !== undefined
+                    ? ast_1.kt.argument.named('deprecated', ast_1.kt.toNode(property.schema.deprecated))
+                    : null,
             ])
             : null;
     }
@@ -355,6 +363,10 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
         if (schema.kind === 'object' && schema.properties.size === 0 && schema.additionalProperties) {
             return false;
         }
+        // Dynamically generated schemas do not have its own type declaration
+        if (!ctx.data.schemas.some((x) => x.id === schema.id)) {
+            return false;
+        }
         return true;
     }
     getDeclarationTypeName(ctx, args) {

package/cjs/lib/generators/services/okhttp3-clients/okhttp3-client-generator.js

@@ -27,6 +27,11 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
     }
     getClientClass(ctx, args) {
         return ast_1.kt.class(this.getApiClientName(ctx, {}), {
+            annotations: [
+                ctx.service.endpoints.length === 0 || ctx.service.endpoints.some((x) => !x.deprecated)
+                    ? null
+                    : ast_1.kt.annotation(ast_1.kt.refs.deprecated(), [ast_1.kt.argument(ast_1.kt.string(''))]),
+            ],
             extends: ctx.refs.apiClient(),
             primaryConstructor: ast_1.kt.constructor([
                 ast_1.kt.parameter('basePath', ast_1.kt.refs.string(), { default: 'defaultBasePath' }),
@@ -81,6 +86,7 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
                     ctx.refs.clientException({ classReference: true }),
                     ctx.refs.serverException({ classReference: true }),
                 ]),
+                endpoint.deprecated ? ast_1.kt.annotation(ast_1.kt.refs.deprecated(), [ast_1.kt.argument(ast_1.kt.string(''))]) : null,
             ],
             parameters: parameters.map((p) => {
                 var _a;
@@ -138,6 +144,7 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
                     ast_1.kt.refs.java.illegalStateException({ classReference: true }),
                     ast_1.kt.refs.java.ioException({ classReference: true }),
                 ]),
+                endpoint.deprecated ? ast_1.kt.annotation(ast_1.kt.refs.deprecated(), [ast_1.kt.argument(ast_1.kt.string(''))]) : null,
             ],
             parameters: parameters.map((p) => {
                 var _a;
@@ -175,6 +182,7 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
         return ast_1.kt.function((0, core_1.toCasing)(args.endpoint.name, ctx.config.functionNameCasing) + 'RequestConfig', {
             accessModifier: 'private',
             doc: ast_1.kt.doc(`To obtain the request config of the operation ${operationName}`),
+            annotations: [endpoint.deprecated ? ast_1.kt.annotation(ast_1.kt.refs.deprecated(), [ast_1.kt.argument(ast_1.kt.string(''))]) : null],
             parameters: parameters.map((p) => {
                 var _a;
                 return ast_1.kt.parameter((0, core_1.toCasing)(p.name, ctx.config.parameterNameCasing), this.getTypeUsage(ctx, { schema: p.schema, nullable: !p.required }), {

package/cjs/lib/generators/services/spring-controllers/spring-controller-generator.js

@@ -89,6 +89,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
                     response.description ? ast_1.kt.argument.named('description', ast_1.kt.string((_b = response.description) === null || _b === void 0 ? void 0 : _b.trim())) : null,
                 ]);
             }))),
+            endpoint.deprecated !== undefined ? ast_1.kt.argument.named('deprecated', ast_1.kt.toNode(endpoint.deprecated)) : null,
         ]);
         const requestMapping = ast_1.kt.annotation(ast_1.kt.refs.spring.requestMapping(), [
             ast_1.kt.argument.named('method', ast_1.kt.collectionLiteral([ast_1.kt.call([ast_1.kt.refs.spring.requestMethod(), endpoint.method.toUpperCase()])])),

package/esm/lib/ast/references/kotlin.js

@@ -11,6 +11,7 @@ export const double = ktReference.factory('Double', 'kotlin');
 export const boolean = ktReference.factory('Boolean', 'kotlin');
 export const lazyFun = ktReference.genericFactory('lazy', 'kotlin');
 export const throws = ktReference.factory('Throws', 'kotlin');
+export const deprecated = ktReference.factory('Deprecated', 'kotlin');
 // kotlin.collections
 export const list = ktReference.genericFactory('List', 'kotlin.collections');
 export const mutableList = ktReference.genericFactory('MutableList', 'kotlin.collections');

package/esm/lib/generators/models/model-generator.js

@@ -62,6 +62,7 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
         const parameters = this.getClassProperties(ctx, { schema });
         return kt.class(this.getDeclarationTypeName(ctx, { schema }), {
             doc: kt.doc((_a = schema.description) === null || _a === void 0 ? void 0 : _a.trim()),
+            annotations: [schema.deprecated ? kt.annotation(kt.refs.deprecated(), [kt.argument(kt.string(''))]) : null],
             classKind: parameters.length === 0 ? null : 'data',
             implements: inheritedSchemas.map((schema) => this.getType(ctx, { schema })),
             primaryConstructor: kt.constructor(parameters.map((property) => this.getClassParameter(ctx, Object.assign(Object.assign({}, args), { inheritedSchemas, parameters, property })))),
@@ -84,6 +85,7 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
             annotations: [
                 this.getJacksonJsonTypeInfoAnnotation(ctx, { schema }),
                 this.getJacksonJsonSubTypesAnnotation(ctx, { schema }),
+                schema.deprecated ? kt.annotation(kt.refs.deprecated(), [kt.argument(kt.string(''))]) : null,
             ].filter(notNullish),
             members: this.sortProperties(ctx, { schema, properties: schema.properties.values() }).map((property) => this.getInterfaceProperty(ctx, { schema, property })),
         });
@@ -96,6 +98,7 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
             arguments: [kt.argument(kt.string(String(x)))],
         }))) !== null && _b !== void 0 ? _b : [], {
             doc: kt.doc((_c = schema.description) === null || _c === void 0 ? void 0 : _c.trim()),
+            annotations: [schema.deprecated ? kt.annotation(kt.refs.deprecated(), [kt.argument(kt.string(''))]) : null],
             primaryConstructor: kt.constructor([
                 kt.parameter.class(toCasing('value', ctx.config.propertyNameCasing), kt.refs.string(), {
                     property: 'readonly',
@@ -198,6 +201,7 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
                 this.getSwaggerSchemaAnnotation(ctx, { schema, property }),
                 this.getJacksonJsonPropertyAnnotation(ctx, { schema, property }),
                 modify(this.getJacksonJsonIncludeAnnotation(ctx, { schema, property }), (x) => (x.target = 'get')),
+                property.schema.deprecated ? kt.annotation(kt.refs.deprecated(), [kt.argument(kt.string(''))]) : null,
             ].filter(notNullish),
             override: inheritedSchemas.some((schema) => this.hasProperty(ctx, { schema, propertyName: property.name })),
             property: 'readonly',
@@ -214,6 +218,7 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
             annotations: modifyEach([
                 this.getJacksonJsonPropertyAnnotation(ctx, { schema, property }),
                 this.getJacksonJsonIncludeAnnotation(ctx, { schema, property }),
+                property.schema.deprecated ? kt.annotation(kt.refs.deprecated(), [kt.argument(kt.string(''))]) : null,
             ].filter(notNullish), (x) => (x.target = 'get')),
             type: this.getType(ctx, {
                 schema: property.schema,
@@ -318,6 +323,9 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
                 property.schema.description !== undefined
                     ? kt.argument.named('description', kt.string(property.schema.description))
                     : null,
+                property.schema.deprecated !== undefined
+                    ? kt.argument.named('deprecated', kt.toNode(property.schema.deprecated))
+                    : null,
             ])
             : null;
     }
@@ -352,6 +360,10 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
         if (schema.kind === 'object' && schema.properties.size === 0 && schema.additionalProperties) {
             return false;
         }
+        // Dynamically generated schemas do not have its own type declaration
+        if (!ctx.data.schemas.some((x) => x.id === schema.id)) {
+            return false;
+        }
         return true;
     }
     getDeclarationTypeName(ctx, args) {

package/esm/lib/generators/services/okhttp3-clients/okhttp3-client-generator.js

@@ -24,6 +24,11 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
     }
     getClientClass(ctx, args) {
         return kt.class(this.getApiClientName(ctx, {}), {
+            annotations: [
+                ctx.service.endpoints.length === 0 || ctx.service.endpoints.some((x) => !x.deprecated)
+                    ? null
+                    : kt.annotation(kt.refs.deprecated(), [kt.argument(kt.string(''))]),
+            ],
             extends: ctx.refs.apiClient(),
             primaryConstructor: kt.constructor([
                 kt.parameter('basePath', kt.refs.string(), { default: 'defaultBasePath' }),
@@ -78,6 +83,7 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
                     ctx.refs.clientException({ classReference: true }),
                     ctx.refs.serverException({ classReference: true }),
                 ]),
+                endpoint.deprecated ? kt.annotation(kt.refs.deprecated(), [kt.argument(kt.string(''))]) : null,
             ],
             parameters: parameters.map((p) => {
                 var _a;
@@ -135,6 +141,7 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
                     kt.refs.java.illegalStateException({ classReference: true }),
                     kt.refs.java.ioException({ classReference: true }),
                 ]),
+                endpoint.deprecated ? kt.annotation(kt.refs.deprecated(), [kt.argument(kt.string(''))]) : null,
             ],
             parameters: parameters.map((p) => {
                 var _a;
@@ -172,6 +179,7 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
         return kt.function(toCasing(args.endpoint.name, ctx.config.functionNameCasing) + 'RequestConfig', {
             accessModifier: 'private',
             doc: kt.doc(`To obtain the request config of the operation ${operationName}`),
+            annotations: [endpoint.deprecated ? kt.annotation(kt.refs.deprecated(), [kt.argument(kt.string(''))]) : null],
             parameters: parameters.map((p) => {
                 var _a;
                 return kt.parameter(toCasing(p.name, ctx.config.parameterNameCasing), this.getTypeUsage(ctx, { schema: p.schema, nullable: !p.required }), {

package/esm/lib/generators/services/spring-controllers/spring-controller-generator.js

@@ -86,6 +86,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
                     response.description ? kt.argument.named('description', kt.string((_b = response.description) === null || _b === void 0 ? void 0 : _b.trim())) : null,
                 ]);
             }))),
+            endpoint.deprecated !== undefined ? kt.argument.named('deprecated', kt.toNode(endpoint.deprecated)) : null,
         ]);
         const requestMapping = kt.annotation(kt.refs.spring.requestMapping(), [
             kt.argument.named('method', kt.collectionLiteral([kt.call([kt.refs.spring.requestMethod(), endpoint.method.toUpperCase()])])),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/kotlin",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "repository": "https://github.com/MaSch0212/goast.git",
   "author": {
     "name": "Marc Schmidt (MaSch0212)",
@@ -12,7 +12,7 @@
     "fs-extra": "^11.2.0",
     "node-fetch": "^2.7.0",
     "yaml": "^2.4.1",
-    "@goast/core": "0.2.1",
+    "@goast/core": "0.2.2",
     "tslib": "2.6.2"
   },
   "module": "./esm/index.js",

package/types/lib/ast/references/kotlin.d.ts

@@ -124,6 +124,17 @@ export declare const throws: (<TBuilder extends import("@goast/core").SourceBuil
     packageName: import("@goast/core").Nullable<string>;
     matches: (value: unknown) => value is import("../nodes/reference").KtReference<never, never>;
 };
+export declare const deprecated: (<TBuilder extends import("@goast/core").SourceBuilder<never>>(options?: {
+    nullable?: import("@goast/core").Nullable<boolean>;
+    inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
+    generics?: import("@goast/core").Nullable<import("@goast/core").Nullable<import("../_index").Type<TBuilder>>[]>;
+    classReference?: import("@goast/core").Nullable<boolean>;
+    subReference?: import("@goast/core").Nullable<import("../nodes/reference").KtReference<TBuilder, never> | import("../_index").Call<TBuilder, never>>;
+} | undefined) => import("../nodes/reference").KtReference<TBuilder, never>) & {
+    refName: string;
+    packageName: import("@goast/core").Nullable<string>;
+    matches: (value: unknown) => value is import("../nodes/reference").KtReference<never, never>;
+};
 export declare const list: (<TBuilder extends import("@goast/core").SourceBuilder<never>>(generics: [import("../_index").Type<TBuilder>], options?: {
     nullable?: import("@goast/core").Nullable<boolean>;
     inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;