npm - @goast/kotlin - Versions diffs - 0.3.3 → 0.3.4 - Mend

@goast/kotlin 0.3.3 → 0.3.4

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 (26) hide show

package/cjs/index.js CHANGED Viewed

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./lib/ast"), exports);
 tslib_1.__exportStar(require("./lib/common-results"), exports);
 tslib_1.__exportStar(require("./lib/config"), exports);
-tslib_1.__exportStar(require("./lib/generators"), exports);
 tslib_1.__exportStar(require("./lib/file-builder"), exports);
+tslib_1.__exportStar(require("./lib/generators"), exports);
 tslib_1.__exportStar(require("./lib/import-collection"), exports);
+tslib_1.__exportStar(require("./lib/types"), exports);
 tslib_1.__exportStar(require("./lib/utils"), exports);
-tslib_1.__exportStar(require("./lib/ast"), exports);

package/cjs/lib/ast/references/java.js CHANGED Viewed

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.optional = exports.offsetDateTime = exports.ioException = exports.unsupportedOperationException = exports.illegalStateException = exports.system = void 0;
+exports.optional = exports.offsetDateTime = exports.unsupportedOperationException = exports.system = exports.illegalStateException = exports.ioException = exports.file = void 0;
 const reference_1 = require("../nodes/reference");
+// java.io
+exports.file = reference_1.ktReference.factory('File', 'java.io');
+exports.ioException = reference_1.ktReference.factory('IOException', 'java.io');
 // java.lang
-exports.system = reference_1.ktReference.factory('System', 'java.lang');
 exports.illegalStateException = reference_1.ktReference.factory('IllegalStateException', 'java.lang');
+exports.system = reference_1.ktReference.factory('System', 'java.lang');
 exports.unsupportedOperationException = reference_1.ktReference.factory('UnsupportedOperationException', 'java.lang');
-// java.io
-exports.ioException = reference_1.ktReference.factory('IOException', 'java.io');
 // java.time
 exports.offsetDateTime = reference_1.ktReference.factory('OffsetDateTime', 'java.time');
 // java.util

package/cjs/lib/ast/references/reactor.js CHANGED Viewed

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.flux = void 0;
+exports.mono = exports.flux = void 0;
 const reference_1 = require("../nodes/reference");
 // reactor.core.publisher
 exports.flux = reference_1.ktReference.genericFactory('Flux', 'reactor.core.publisher');
+exports.mono = reference_1.ktReference.genericFactory('Mono', 'reactor.core.publisher');

package/cjs/lib/ast/references/spring.js CHANGED Viewed

@@ -1,21 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.controller = exports.httpStatus = exports.responseEntity = exports.validated = exports.autowired = exports.nativeWebRequest = exports.pathVariable = exports.requestMethod = exports.requestParam = exports.requestBody = exports.requestMapping = void 0;
+exports.nativeWebRequest = exports.requestPart = exports.requestParam = exports.requestMethod = exports.requestMapping = exports.requestBody = exports.pathVariable = exports.validated = exports.controller = exports.filePart = exports.responseEntity = exports.httpStatus = exports.autowired = void 0;
 const reference_1 = require("../nodes/reference");
-// org.springframework.web.bind.annotation
-exports.requestMapping = reference_1.ktReference.factory('RequestMapping', 'org.springframework.web.bind.annotation');
-exports.requestBody = reference_1.ktReference.factory('RequestBody', 'org.springframework.web.bind.annotation');
-exports.requestParam = reference_1.ktReference.factory('RequestParam', 'org.springframework.web.bind.annotation');
-exports.requestMethod = reference_1.ktReference.factory('RequestMethod', 'org.springframework.web.bind.annotation');
-exports.pathVariable = reference_1.ktReference.factory('PathVariable', 'org.springframework.web.bind.annotation');
-// org.springframework.web.context.request
-exports.nativeWebRequest = reference_1.ktReference.factory('NativeWebRequest', 'org.springframework.web.context.request');
 // org.springframework.beans.factory.annotation
 exports.autowired = reference_1.ktReference.factory('Autowired', 'org.springframework.beans.factory.annotation');
-// org.springframework.validation.annotation
-exports.validated = reference_1.ktReference.factory('Validated', 'org.springframework.validation.annotation');
 // org.springframework.http
-exports.responseEntity = reference_1.ktReference.genericFactory('ResponseEntity', 'org.springframework.http');
 exports.httpStatus = reference_1.ktReference.factory('HttpStatus', 'org.springframework.http');
+exports.responseEntity = reference_1.ktReference.genericFactory('ResponseEntity', 'org.springframework.http');
+// org.springframework.http.codec.multipart
+exports.filePart = reference_1.ktReference.factory('FilePart', 'org.springframework.http.codec.multipart');
 // org.springframework.stereotype
 exports.controller = reference_1.ktReference.factory('Controller', 'org.springframework.stereotype');
+// org.springframework.validation.annotation
+exports.validated = reference_1.ktReference.factory('Validated', 'org.springframework.validation.annotation');
+// org.springframework.web.bind.annotation
+exports.pathVariable = reference_1.ktReference.factory('PathVariable', 'org.springframework.web.bind.annotation');
+exports.requestBody = reference_1.ktReference.factory('RequestBody', 'org.springframework.web.bind.annotation');
+exports.requestMapping = reference_1.ktReference.factory('RequestMapping', 'org.springframework.web.bind.annotation');
+exports.requestMethod = reference_1.ktReference.factory('RequestMethod', 'org.springframework.web.bind.annotation');
+exports.requestParam = reference_1.ktReference.factory('RequestParam', 'org.springframework.web.bind.annotation');
+exports.requestPart = reference_1.ktReference.factory('RequestPart', 'org.springframework.web.bind.annotation');
+// org.springframework.web.context.request
+exports.nativeWebRequest = reference_1.ktReference.factory('NativeWebRequest', 'org.springframework.web.context.request');

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

@@ -352,6 +352,10 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
         if (!ctx.data.schemas.some((x) => x.id === schema.id)) {
             return false;
         }
+        // multipart schemas should not have its own type declaration
+        if (schema.$src.path.endsWith('/requestBody/content/multipart/form-data/schema')) {
+            return false;
+        }
         return true;
     }
     getDeclarationTypeName(ctx, args) {

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

@@ -90,7 +90,7 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
             ],
             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 }), {
+                return ast_1.kt.parameter((0, core_1.toCasing)(p.name, ctx.config.parameterNameCasing), this.getParameterType(ctx, { endpoint, parameter: p }), {
                     description: p.description,
                     default: !p.required ? ast_1.kt.toNode((_a = p.schema) === null || _a === void 0 ? void 0 : _a.default) : null,
                 });
@@ -148,7 +148,7 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
             ],
             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 }), {
+                return ast_1.kt.parameter((0, core_1.toCasing)(p.name, ctx.config.parameterNameCasing), this.getParameterType(ctx, { endpoint, parameter: p }), {
                     description: p.description,
                     default: !p.required ? ast_1.kt.toNode((_a = p.schema) === null || _a === void 0 ? void 0 : _a.default) : null,
                 });
@@ -160,14 +160,13 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
         });
     }
     getEndpointClientHttpInfoMethodBody(ctx, args) {
-        var _a;
         const { endpoint, parameters, responseSchema } = args;
         return (0, core_1.appendValueGroup)([
             (0, core_1.builderTemplate) `val localVariableConfig = ${ast_1.kt.call([(0, core_1.toCasing)(endpoint.name, 'camel') + 'RequestConfig'], parameters.map((x) => x.name))}`,
             (0, core_1.builderTemplate) `return ${ast_1.kt.call([
                 ast_1.kt.reference('request', null, {
                     generics: [
-                        this.getTypeUsage(ctx, { schema: (_a = endpoint.requestBody) === null || _a === void 0 ? void 0 : _a.content[0].schema, fallback: ast_1.kt.refs.unit() }),
+                        this.getRequestBodyType(ctx, { endpoint }),
                         this.getTypeUsage(ctx, { schema: responseSchema, fallback: ast_1.kt.refs.unit() }),
                     ],
                 }),
@@ -175,33 +174,43 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
         ], '\n');
     }
     getEndpointClientRequestConfigMethod(ctx, args) {
-        var _a;
         const { endpoint, parameters } = args;
         const operationName = (0, core_1.toCasing)(endpoint.name, ctx.config.functionNameCasing);
-        const requestSchema = (_a = endpoint.requestBody) === null || _a === void 0 ? void 0 : _a.content[0].schema;
         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 }), {
+                return ast_1.kt.parameter((0, core_1.toCasing)(p.name, ctx.config.parameterNameCasing), this.getParameterType(ctx, { endpoint, parameter: p }), {
                     description: p.description,
                     default: !p.required ? ast_1.kt.toNode((_a = p.schema) === null || _a === void 0 ? void 0 : _a.default) : null,
                 });
             }),
-            returnType: ctx.refs.requestConfig([this.getTypeUsage(ctx, { schema: requestSchema, fallback: ast_1.kt.refs.unit() })]),
-            body: this.getEndpointClientRequestConfigMethodBody(ctx, { endpoint }),
+            returnType: ctx.refs.requestConfig([this.getRequestBodyType(ctx, { endpoint })]),
+            body: this.getEndpointClientRequestConfigMethodBody(ctx, { endpoint, parameters }),
         });
     }
     getEndpointClientRequestConfigMethodBody(ctx, args) {
-        var _a, _b;
-        const { endpoint } = args;
-        const queryParameters = endpoint.parameters.filter((x) => x.target === 'query');
+        var _a, _b, _c;
+        const { endpoint, parameters } = args;
+        const queryParameters = parameters.filter((x) => x.target === 'query');
         const result = (0, core_1.appendValueGroup)([], '\n');
         if (endpoint.requestBody) {
-            const bodyParamName = (0, core_1.toCasing)(this.getRequestBodyParamName(ctx, { endpoint }), ctx.config.parameterNameCasing);
-            result.values.push(`val localVariableBody = ${bodyParamName}`);
+            if (((_a = endpoint.requestBody.content[0]) === null || _a === void 0 ? void 0 : _a.type) === 'multipart/form-data') {
+                const partConfigs = parameters
+                    .filter((x) => x.multipart)
+                    .map((param) => {
+                    var _a, _b;
+                    const paramName = (0, core_1.toCasing)(param.name, ctx.config.parameterNameCasing);
+                    return (0, core_1.builderTemplate) `"${(_b = (_a = param.multipart) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : ''}" to ${ctx.refs.partConfig.infer()}(body = ${paramName})`;
+                });
+                result.values.push((0, core_1.builderTemplate) `val localVariableBody = ${ast_1.kt.call(ast_1.kt.refs.mapOf([ast_1.kt.refs.string(), ctx.refs.partConfig(['*'])]), partConfigs)}`);
+            }
+            else {
+                const bodyParamName = (0, core_1.toCasing)(this.getRequestBodyParamName(ctx, { endpoint }), ctx.config.parameterNameCasing);
+                result.values.push(`val localVariableBody = ${bodyParamName}`);
+            }
         }
         result.values.push((0, core_1.builderTemplate) `val localVariableQuery: ${ctx.refs.multiValueMap()} = ${ast_1.kt.call([ast_1.kt.refs.mutableMapOf([ast_1.kt.refs.string(), ast_1.kt.refs.list([ast_1.kt.refs.string()])])], [])}${queryParameters.length === 0
             ? ''
@@ -220,8 +229,8 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
             }), '\n')}`}
             }`}`);
         result.values.push('val localVariableHeaders: MutableMap<String, String> = mutableMapOf()');
-        if (((_a = endpoint.requestBody) === null || _a === void 0 ? void 0 : _a.content[0]) !== undefined) {
-            result.values.push(`localVariableHeaders["Content-Type"] = "${(_b = endpoint.requestBody) === null || _b === void 0 ? void 0 : _b.content[0].type}"`);
+        if (((_b = endpoint.requestBody) === null || _b === void 0 ? void 0 : _b.content[0]) !== undefined) {
+            result.values.push(`localVariableHeaders["Content-Type"] = "${(_c = endpoint.requestBody) === null || _c === void 0 ? void 0 : _c.content[0].type}"`);
         }
         result.values.push((0, core_1.builderTemplate) `return ${ast_1.kt.call([ctx.refs.requestConfig.infer()], [
             ast_1.kt.argument.named('method', ast_1.kt.call([ctx.refs.requestMethod(), endpoint.method.toUpperCase()])),
@@ -244,6 +253,25 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
             }),
         ];
     }
+    getParameterType(ctx, args) {
+        var _a;
+        const { parameter } = args;
+        if ((_a = parameter.multipart) === null || _a === void 0 ? void 0 : _a.isFile) {
+            return ast_1.kt.refs.java.file();
+        }
+        return this.getTypeUsage(ctx, {
+            schema: parameter.schema,
+            nullable: !parameter.required,
+        });
+    }
+    getRequestBodyType(ctx, args) {
+        var _a;
+        const { endpoint } = args;
+        const content = (_a = endpoint.requestBody) === null || _a === void 0 ? void 0 : _a.content[0];
+        return (content === null || content === void 0 ? void 0 : content.type) === 'multipart/form-data'
+            ? ast_1.kt.refs.map([ast_1.kt.refs.string(), ctx.refs.partConfig(['*'])])
+            : this.getTypeUsage(ctx, { schema: content === null || content === void 0 ? void 0 : content.schema, fallback: ast_1.kt.refs.unit() });
+    }
     getTypeUsage(ctx, args) {
         const { schema, nullable, fallback } = args;
         const type = this.getSchemaType(ctx, { schema });
@@ -275,26 +303,43 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
         return schema && ctx.input.kotlin.models[schema.id].type;
     }
     getAllParameters(ctx, args) {
+        var _a, _b;
         const { endpoint } = args;
         const parameters = endpoint.parameters.filter((parameter) => parameter.target === 'query' || parameter.target === 'path');
         if (endpoint.requestBody) {
-            const schema = endpoint.requestBody.content[0].schema;
-            parameters.push({
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                $src: undefined,
-                $ref: undefined,
-                id: 'body',
-                name: this.getRequestBodyParamName(ctx, { endpoint }),
-                target: 'body',
-                schema,
-                required: endpoint.requestBody.required,
-                description: endpoint.requestBody.description,
-                allowEmptyValue: undefined,
-                allowReserved: undefined,
-                deprecated: false,
-                explode: undefined,
-                style: undefined,
-            });
+            const content = endpoint.requestBody.content[0];
+            let schema = content.schema;
+            if (content.type === 'multipart/form-data') {
+                if (schema && schema.kind === 'object') {
+                    schema = (_a = (0, core_1.resolveAnyOfAndAllOf)(schema, true)) !== null && _a !== void 0 ? _a : schema;
+                    const properties = (_b = schema.properties) !== null && _b !== void 0 ? _b : {};
+                    for (const [name, property] of properties.entries()) {
+                        parameters.push(Object.assign(this.createApiParameter({
+                            id: `multipart-${name}`,
+                            name,
+                            target: 'body',
+                            schema: property.schema,
+                            required: schema.required.has(name),
+                            description: property.schema.description,
+                        }), {
+                            multipart: {
+                                name,
+                                isFile: property.schema.kind === 'string' && property.schema.format === 'binary',
+                            },
+                        }));
+                    }
+                }
+            }
+            else {
+                parameters.push(this.createApiParameter({
+                    id: 'body',
+                    name: this.getRequestBodyParamName(ctx, { endpoint }),
+                    target: 'body',
+                    schema,
+                    required: endpoint.requestBody.required,
+                    description: endpoint.requestBody.description,
+                }));
+            }
         }
         return parameters.sort((a, b) => (a.required === b.required ? 0 : a.required ? -1 : 1));
     }
@@ -320,5 +365,21 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
     getApiClientName(ctx, args) {
         return (0, core_1.toCasing)(ctx.service.name, ctx.config.typeNameCasing) + 'ApiClient';
     }
+    createApiParameter(data) {
+        return {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            $src: undefined,
+            $ref: undefined,
+            schema: undefined,
+            required: false,
+            description: undefined,
+            allowEmptyValue: undefined,
+            allowReserved: undefined,
+            deprecated: false,
+            explode: undefined,
+            style: undefined,
+            ...data,
+        };
+    }
 }
 exports.DefaultKotlinOkHttp3Generator = DefaultKotlinOkHttp3Generator;

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

@@ -107,6 +107,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
         const result = ast_1.kt.parameter((0, core_1.toCasing)(parameter.name, ctx.config.parameterNameCasing), this.getParameterType(ctx, { endpoint, parameter }), {});
         if (ctx.config.addSwaggerAnnotations) {
             const annotation = ast_1.kt.annotation(ast_1.kt.refs.swagger.parameter(), [
+                parameter.multipart ? ast_1.kt.argument.named('name', ast_1.kt.string(parameter.multipart.name)) : null,
                 parameter.description ? ast_1.kt.argument.named('description', ast_1.kt.string((_a = parameter.description) === null || _a === void 0 ? void 0 : _a.trim())) : null,
                 ast_1.kt.argument.named('required', parameter.required),
             ]);
@@ -119,7 +120,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
         if (!isCorePackage && ctx.config.addJakartaValidationAnnotations) {
             result.annotations.push(ast_1.kt.annotation(ast_1.kt.refs.jakarta.valid()));
         }
-        if (parameter.target === 'body') {
+        if (parameter.target === 'body' && !parameter.multipart) {
             result.annotations.push(ast_1.kt.annotation(ast_1.kt.refs.spring.requestBody()));
         }
         if (parameter.target === 'query') {
@@ -135,6 +136,12 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
         if (parameter.target === 'path') {
             result.annotations.push(ast_1.kt.annotation(ast_1.kt.refs.spring.pathVariable(), [ast_1.kt.string(parameter.name)]));
         }
+        if (parameter.multipart) {
+            result.annotations.push(ast_1.kt.annotation(ast_1.kt.refs.spring.requestPart(), [
+                ast_1.kt.argument.named('value', ast_1.kt.string(parameter.multipart.name)),
+                ast_1.kt.argument.named('required', parameter.required),
+            ]));
+        }
         return result;
     }
     getApiInterfaceEndpointMethodBody(ctx, endpoint, parameters) {
@@ -259,11 +266,14 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
     }
     // #endregion
     getParameterType(ctx, args) {
-        var _a;
+        var _a, _b;
         const { parameter } = args;
+        if ((_a = parameter.multipart) === null || _a === void 0 ? void 0 : _a.isFile) {
+            return ast_1.kt.refs.reactor.mono([ast_1.kt.refs.spring.filePart()]);
+        }
         const type = this.getTypeUsage(ctx, {
             schema: parameter.schema,
-            nullable: (!parameter.required && ((_a = parameter.schema) === null || _a === void 0 ? void 0 : _a.default) === undefined) || undefined,
+            nullable: (!parameter.required && ((_b = parameter.schema) === null || _b === void 0 ? void 0 : _b.default) === undefined) || undefined,
         });
         return parameter.target === 'body' ? listToFlux(type) : type;
     }
@@ -330,33 +340,66 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
         return (0, core_1.toCasing)(ctx.service.name + '_ApiDelegate', ctx.config.typeNameCasing);
     }
     getAllParameters(ctx, args) {
+        var _a, _b;
         const { endpoint } = args;
         const parameters = endpoint.parameters.filter((parameter) => parameter.target === 'query' || parameter.target === 'path');
         if (endpoint.requestBody) {
-            const schema = endpoint.requestBody.content[0].schema;
-            const schemaType = this.getSchemaType(ctx, { schema });
-            const name = !schemaType || /^Any\??$/.test(schemaType.name)
-                ? 'body'
-                : core_1.SourceBuilder.build((b) => ast_1.kt.reference.write(b, schemaType));
-            parameters.push({
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                $src: undefined,
-                $ref: undefined,
-                id: 'body',
-                name,
-                target: 'body',
-                schema,
-                required: endpoint.requestBody.required,
-                description: endpoint.requestBody.description,
-                allowEmptyValue: undefined,
-                allowReserved: undefined,
-                deprecated: false,
-                explode: undefined,
-                style: undefined,
-            });
+            const content = endpoint.requestBody.content[0];
+            let schema = content.schema;
+            if (content.type === 'multipart/form-data') {
+                if (schema && schema.kind === 'object') {
+                    schema = (_a = (0, core_1.resolveAnyOfAndAllOf)(schema, true)) !== null && _a !== void 0 ? _a : schema;
+                    const properties = (_b = schema.properties) !== null && _b !== void 0 ? _b : {};
+                    for (const [name, property] of properties.entries()) {
+                        parameters.push(Object.assign(this.createApiParameter({
+                            id: `multipart-${name}`,
+                            name,
+                            target: 'body',
+                            schema: property.schema,
+                            required: schema.required.has(name),
+                            description: property.schema.description,
+                        }), {
+                            multipart: {
+                                name,
+                                isFile: property.schema.kind === 'string' && property.schema.format === 'binary',
+                            },
+                        }));
+                    }
+                }
+            }
+            else {
+                const schemaType = this.getSchemaType(ctx, { schema });
+                const name = !schemaType || /^Any\??$/.test(schemaType.name)
+                    ? 'body'
+                    : core_1.SourceBuilder.build((b) => ast_1.kt.reference.write(b, schemaType));
+                parameters.push(this.createApiParameter({
+                    id: 'body',
+                    name,
+                    target: 'body',
+                    schema,
+                    required: endpoint.requestBody.required,
+                    description: endpoint.requestBody.description,
+                }));
+            }
         }
         return parameters;
     }
+    createApiParameter(data) {
+        return {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            $src: undefined,
+            $ref: undefined,
+            schema: undefined,
+            required: false,
+            description: undefined,
+            allowEmptyValue: undefined,
+            allowReserved: undefined,
+            deprecated: false,
+            explode: undefined,
+            style: undefined,
+            ...data,
+        };
+    }
 }
 exports.DefaultKotlinSpringControllerGenerator = DefaultKotlinSpringControllerGenerator;
 function listToFlux(type) {

package/cjs/lib/types.js ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ "use strict";
2	+ Object.defineProperty(exports, "__esModule", { value: true });

package/esm/index.js CHANGED Viewed

@@ -1,7 +1,8 @@
+export * from './lib/ast';
 export * from './lib/common-results';
 export * from './lib/config';
-export * from './lib/generators';
 export * from './lib/file-builder';
+export * from './lib/generators';
 export * from './lib/import-collection';
+export * from './lib/types';
 export * from './lib/utils';
-export * from './lib/ast';

package/esm/lib/ast/references/java.js CHANGED Viewed

@@ -1,10 +1,11 @@
 import { ktReference } from '../nodes/reference';
+// java.io
+export const file = ktReference.factory('File', 'java.io');
+export const ioException = ktReference.factory('IOException', 'java.io');
 // java.lang
-export const system = ktReference.factory('System', 'java.lang');
 export const illegalStateException = ktReference.factory('IllegalStateException', 'java.lang');
+export const system = ktReference.factory('System', 'java.lang');
 export const unsupportedOperationException = ktReference.factory('UnsupportedOperationException', 'java.lang');
-// java.io
-export const ioException = ktReference.factory('IOException', 'java.io');
 // java.time
 export const offsetDateTime = ktReference.factory('OffsetDateTime', 'java.time');
 // java.util

package/esm/lib/ast/references/reactor.js CHANGED Viewed

@@ -1,3 +1,4 @@
 import { ktReference } from '../nodes/reference';
 // reactor.core.publisher
 export const flux = ktReference.genericFactory('Flux', 'reactor.core.publisher');
+export const mono = ktReference.genericFactory('Mono', 'reactor.core.publisher');

package/esm/lib/ast/references/spring.js CHANGED Viewed

@@ -1,18 +1,21 @@
 import { ktReference } from '../nodes/reference';
-// org.springframework.web.bind.annotation
-export const requestMapping = ktReference.factory('RequestMapping', 'org.springframework.web.bind.annotation');
-export const requestBody = ktReference.factory('RequestBody', 'org.springframework.web.bind.annotation');
-export const requestParam = ktReference.factory('RequestParam', 'org.springframework.web.bind.annotation');
-export const requestMethod = ktReference.factory('RequestMethod', 'org.springframework.web.bind.annotation');
-export const pathVariable = ktReference.factory('PathVariable', 'org.springframework.web.bind.annotation');
-// org.springframework.web.context.request
-export const nativeWebRequest = ktReference.factory('NativeWebRequest', 'org.springframework.web.context.request');
 // org.springframework.beans.factory.annotation
 export const autowired = ktReference.factory('Autowired', 'org.springframework.beans.factory.annotation');
-// org.springframework.validation.annotation
-export const validated = ktReference.factory('Validated', 'org.springframework.validation.annotation');
 // org.springframework.http
-export const responseEntity = ktReference.genericFactory('ResponseEntity', 'org.springframework.http');
 export const httpStatus = ktReference.factory('HttpStatus', 'org.springframework.http');
+export const responseEntity = ktReference.genericFactory('ResponseEntity', 'org.springframework.http');
+// org.springframework.http.codec.multipart
+export const filePart = ktReference.factory('FilePart', 'org.springframework.http.codec.multipart');
 // org.springframework.stereotype
 export const controller = ktReference.factory('Controller', 'org.springframework.stereotype');
+// org.springframework.validation.annotation
+export const validated = ktReference.factory('Validated', 'org.springframework.validation.annotation');
+// org.springframework.web.bind.annotation
+export const pathVariable = ktReference.factory('PathVariable', 'org.springframework.web.bind.annotation');
+export const requestBody = ktReference.factory('RequestBody', 'org.springframework.web.bind.annotation');
+export const requestMapping = ktReference.factory('RequestMapping', 'org.springframework.web.bind.annotation');
+export const requestMethod = ktReference.factory('RequestMethod', 'org.springframework.web.bind.annotation');
+export const requestParam = ktReference.factory('RequestParam', 'org.springframework.web.bind.annotation');
+export const requestPart = ktReference.factory('RequestPart', 'org.springframework.web.bind.annotation');
+// org.springframework.web.context.request
+export const nativeWebRequest = ktReference.factory('NativeWebRequest', 'org.springframework.web.context.request');

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

@@ -349,6 +349,10 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
         if (!ctx.data.schemas.some((x) => x.id === schema.id)) {
             return false;
         }
+        // multipart schemas should not have its own type declaration
+        if (schema.$src.path.endsWith('/requestBody/content/multipart/form-data/schema')) {
+            return false;
+        }
         return true;
     }
     getDeclarationTypeName(ctx, args) {

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

@@ -2,7 +2,7 @@
 import { writeFileSync } from 'fs';
 import { dirname } from 'path';
 import { ensureDirSync } from 'fs-extra';
-import { SourceBuilder, appendValueGroup, builderTemplate as s, createOverwriteProxy, toCasing, } from '@goast/core';
+import { SourceBuilder, appendValueGroup, builderTemplate as s, createOverwriteProxy, toCasing, resolveAnyOfAndAllOf, } from '@goast/core';
 import { kt } from '../../../ast';
 import { KotlinFileBuilder } from '../../../file-builder';
 import { modifyString } from '../../../utils';
@@ -87,7 +87,7 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
             ],
             parameters: parameters.map((p) => {
                 var _a;
-                return kt.parameter(toCasing(p.name, ctx.config.parameterNameCasing), this.getTypeUsage(ctx, { schema: p.schema, nullable: !p.required }), {
+                return kt.parameter(toCasing(p.name, ctx.config.parameterNameCasing), this.getParameterType(ctx, { endpoint, parameter: p }), {
                     description: p.description,
                     default: !p.required ? kt.toNode((_a = p.schema) === null || _a === void 0 ? void 0 : _a.default) : null,
                 });
@@ -145,7 +145,7 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
             ],
             parameters: parameters.map((p) => {
                 var _a;
-                return kt.parameter(toCasing(p.name, ctx.config.parameterNameCasing), this.getTypeUsage(ctx, { schema: p.schema, nullable: !p.required }), {
+                return kt.parameter(toCasing(p.name, ctx.config.parameterNameCasing), this.getParameterType(ctx, { endpoint, parameter: p }), {
                     description: p.description,
                     default: !p.required ? kt.toNode((_a = p.schema) === null || _a === void 0 ? void 0 : _a.default) : null,
                 });
@@ -157,14 +157,13 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
         });
     }
     getEndpointClientHttpInfoMethodBody(ctx, args) {
-        var _a;
         const { endpoint, parameters, responseSchema } = args;
         return appendValueGroup([
             s `val localVariableConfig = ${kt.call([toCasing(endpoint.name, 'camel') + 'RequestConfig'], parameters.map((x) => x.name))}`,
             s `return ${kt.call([
                 kt.reference('request', null, {
                     generics: [
-                        this.getTypeUsage(ctx, { schema: (_a = endpoint.requestBody) === null || _a === void 0 ? void 0 : _a.content[0].schema, fallback: kt.refs.unit() }),
+                        this.getRequestBodyType(ctx, { endpoint }),
                         this.getTypeUsage(ctx, { schema: responseSchema, fallback: kt.refs.unit() }),
                     ],
                 }),
@@ -172,33 +171,43 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
         ], '\n');
     }
     getEndpointClientRequestConfigMethod(ctx, args) {
-        var _a;
         const { endpoint, parameters } = args;
         const operationName = toCasing(endpoint.name, ctx.config.functionNameCasing);
-        const requestSchema = (_a = endpoint.requestBody) === null || _a === void 0 ? void 0 : _a.content[0].schema;
         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 }), {
+                return kt.parameter(toCasing(p.name, ctx.config.parameterNameCasing), this.getParameterType(ctx, { endpoint, parameter: p }), {
                     description: p.description,
                     default: !p.required ? kt.toNode((_a = p.schema) === null || _a === void 0 ? void 0 : _a.default) : null,
                 });
             }),
-            returnType: ctx.refs.requestConfig([this.getTypeUsage(ctx, { schema: requestSchema, fallback: kt.refs.unit() })]),
-            body: this.getEndpointClientRequestConfigMethodBody(ctx, { endpoint }),
+            returnType: ctx.refs.requestConfig([this.getRequestBodyType(ctx, { endpoint })]),
+            body: this.getEndpointClientRequestConfigMethodBody(ctx, { endpoint, parameters }),
         });
     }
     getEndpointClientRequestConfigMethodBody(ctx, args) {
-        var _a, _b;
-        const { endpoint } = args;
-        const queryParameters = endpoint.parameters.filter((x) => x.target === 'query');
+        var _a, _b, _c;
+        const { endpoint, parameters } = args;
+        const queryParameters = parameters.filter((x) => x.target === 'query');
         const result = appendValueGroup([], '\n');
         if (endpoint.requestBody) {
-            const bodyParamName = toCasing(this.getRequestBodyParamName(ctx, { endpoint }), ctx.config.parameterNameCasing);
-            result.values.push(`val localVariableBody = ${bodyParamName}`);
+            if (((_a = endpoint.requestBody.content[0]) === null || _a === void 0 ? void 0 : _a.type) === 'multipart/form-data') {
+                const partConfigs = parameters
+                    .filter((x) => x.multipart)
+                    .map((param) => {
+                    var _a, _b;
+                    const paramName = toCasing(param.name, ctx.config.parameterNameCasing);
+                    return s `"${(_b = (_a = param.multipart) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : ''}" to ${ctx.refs.partConfig.infer()}(body = ${paramName})`;
+                });
+                result.values.push(s `val localVariableBody = ${kt.call(kt.refs.mapOf([kt.refs.string(), ctx.refs.partConfig(['*'])]), partConfigs)}`);
+            }
+            else {
+                const bodyParamName = toCasing(this.getRequestBodyParamName(ctx, { endpoint }), ctx.config.parameterNameCasing);
+                result.values.push(`val localVariableBody = ${bodyParamName}`);
+            }
         }
         result.values.push(s `val localVariableQuery: ${ctx.refs.multiValueMap()} = ${kt.call([kt.refs.mutableMapOf([kt.refs.string(), kt.refs.list([kt.refs.string()])])], [])}${queryParameters.length === 0
             ? ''
@@ -217,8 +226,8 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
             }), '\n')}`}
             }`}`);
         result.values.push('val localVariableHeaders: MutableMap<String, String> = mutableMapOf()');
-        if (((_a = endpoint.requestBody) === null || _a === void 0 ? void 0 : _a.content[0]) !== undefined) {
-            result.values.push(`localVariableHeaders["Content-Type"] = "${(_b = endpoint.requestBody) === null || _b === void 0 ? void 0 : _b.content[0].type}"`);
+        if (((_b = endpoint.requestBody) === null || _b === void 0 ? void 0 : _b.content[0]) !== undefined) {
+            result.values.push(`localVariableHeaders["Content-Type"] = "${(_c = endpoint.requestBody) === null || _c === void 0 ? void 0 : _c.content[0].type}"`);
         }
         result.values.push(s `return ${kt.call([ctx.refs.requestConfig.infer()], [
             kt.argument.named('method', kt.call([ctx.refs.requestMethod(), endpoint.method.toUpperCase()])),
@@ -241,6 +250,25 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
             }),
         ];
     }
+    getParameterType(ctx, args) {
+        var _a;
+        const { parameter } = args;
+        if ((_a = parameter.multipart) === null || _a === void 0 ? void 0 : _a.isFile) {
+            return kt.refs.java.file();
+        }
+        return this.getTypeUsage(ctx, {
+            schema: parameter.schema,
+            nullable: !parameter.required,
+        });
+    }
+    getRequestBodyType(ctx, args) {
+        var _a;
+        const { endpoint } = args;
+        const content = (_a = endpoint.requestBody) === null || _a === void 0 ? void 0 : _a.content[0];
+        return (content === null || content === void 0 ? void 0 : content.type) === 'multipart/form-data'
+            ? kt.refs.map([kt.refs.string(), ctx.refs.partConfig(['*'])])
+            : this.getTypeUsage(ctx, { schema: content === null || content === void 0 ? void 0 : content.schema, fallback: kt.refs.unit() });
+    }
     getTypeUsage(ctx, args) {
         const { schema, nullable, fallback } = args;
         const type = this.getSchemaType(ctx, { schema });
@@ -272,26 +300,43 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
         return schema && ctx.input.kotlin.models[schema.id].type;
     }
     getAllParameters(ctx, args) {
+        var _a, _b;
         const { endpoint } = args;
         const parameters = endpoint.parameters.filter((parameter) => parameter.target === 'query' || parameter.target === 'path');
         if (endpoint.requestBody) {
-            const schema = endpoint.requestBody.content[0].schema;
-            parameters.push({
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                $src: undefined,
-                $ref: undefined,
-                id: 'body',
-                name: this.getRequestBodyParamName(ctx, { endpoint }),
-                target: 'body',
-                schema,
-                required: endpoint.requestBody.required,
-                description: endpoint.requestBody.description,
-                allowEmptyValue: undefined,
-                allowReserved: undefined,
-                deprecated: false,
-                explode: undefined,
-                style: undefined,
-            });
+            const content = endpoint.requestBody.content[0];
+            let schema = content.schema;
+            if (content.type === 'multipart/form-data') {
+                if (schema && schema.kind === 'object') {
+                    schema = (_a = resolveAnyOfAndAllOf(schema, true)) !== null && _a !== void 0 ? _a : schema;
+                    const properties = (_b = schema.properties) !== null && _b !== void 0 ? _b : {};
+                    for (const [name, property] of properties.entries()) {
+                        parameters.push(Object.assign(this.createApiParameter({
+                            id: `multipart-${name}`,
+                            name,
+                            target: 'body',
+                            schema: property.schema,
+                            required: schema.required.has(name),
+                            description: property.schema.description,
+                        }), {
+                            multipart: {
+                                name,
+                                isFile: property.schema.kind === 'string' && property.schema.format === 'binary',
+                            },
+                        }));
+                    }
+                }
+            }
+            else {
+                parameters.push(this.createApiParameter({
+                    id: 'body',
+                    name: this.getRequestBodyParamName(ctx, { endpoint }),
+                    target: 'body',
+                    schema,
+                    required: endpoint.requestBody.required,
+                    description: endpoint.requestBody.description,
+                }));
+            }
         }
         return parameters.sort((a, b) => (a.required === b.required ? 0 : a.required ? -1 : 1));
     }
@@ -317,4 +362,20 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
     getApiClientName(ctx, args) {
         return toCasing(ctx.service.name, ctx.config.typeNameCasing) + 'ApiClient';
     }
+    createApiParameter(data) {
+        return {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            $src: undefined,
+            $ref: undefined,
+            schema: undefined,
+            required: false,
+            description: undefined,
+            allowEmptyValue: undefined,
+            allowReserved: undefined,
+            deprecated: false,
+            explode: undefined,
+            style: undefined,
+            ...data,
+        };
+    }
 }

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

@@ -1,6 +1,6 @@
 /* eslint-disable unused-imports/no-unused-vars */
 import { ensureDirSync, writeFileSync } from 'fs-extra';
-import { SourceBuilder, appendValueGroup, builderTemplate as s, createOverwriteProxy, notNullish, toCasing, } from '@goast/core';
+import { SourceBuilder, appendValueGroup, builderTemplate as s, createOverwriteProxy, notNullish, toCasing, resolveAnyOfAndAllOf, } from '@goast/core';
 import { kt } from '../../../ast';
 import { KotlinFileBuilder } from '../../../file-builder';
 import { modifyString } from '../../../utils';
@@ -103,6 +103,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
         const result = kt.parameter(toCasing(parameter.name, ctx.config.parameterNameCasing), this.getParameterType(ctx, { endpoint, parameter }), {});
         if (ctx.config.addSwaggerAnnotations) {
             const annotation = kt.annotation(kt.refs.swagger.parameter(), [
+                parameter.multipart ? kt.argument.named('name', kt.string(parameter.multipart.name)) : null,
                 parameter.description ? kt.argument.named('description', kt.string((_a = parameter.description) === null || _a === void 0 ? void 0 : _a.trim())) : null,
                 kt.argument.named('required', parameter.required),
             ]);
@@ -115,7 +116,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
         if (!isCorePackage && ctx.config.addJakartaValidationAnnotations) {
             result.annotations.push(kt.annotation(kt.refs.jakarta.valid()));
         }
-        if (parameter.target === 'body') {
+        if (parameter.target === 'body' && !parameter.multipart) {
             result.annotations.push(kt.annotation(kt.refs.spring.requestBody()));
         }
         if (parameter.target === 'query') {
@@ -131,6 +132,12 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
         if (parameter.target === 'path') {
             result.annotations.push(kt.annotation(kt.refs.spring.pathVariable(), [kt.string(parameter.name)]));
         }
+        if (parameter.multipart) {
+            result.annotations.push(kt.annotation(kt.refs.spring.requestPart(), [
+                kt.argument.named('value', kt.string(parameter.multipart.name)),
+                kt.argument.named('required', parameter.required),
+            ]));
+        }
         return result;
     }
     getApiInterfaceEndpointMethodBody(ctx, endpoint, parameters) {
@@ -255,11 +262,14 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
     }
     // #endregion
     getParameterType(ctx, args) {
-        var _a;
+        var _a, _b;
         const { parameter } = args;
+        if ((_a = parameter.multipart) === null || _a === void 0 ? void 0 : _a.isFile) {
+            return kt.refs.reactor.mono([kt.refs.spring.filePart()]);
+        }
         const type = this.getTypeUsage(ctx, {
             schema: parameter.schema,
-            nullable: (!parameter.required && ((_a = parameter.schema) === null || _a === void 0 ? void 0 : _a.default) === undefined) || undefined,
+            nullable: (!parameter.required && ((_b = parameter.schema) === null || _b === void 0 ? void 0 : _b.default) === undefined) || undefined,
         });
         return parameter.target === 'body' ? listToFlux(type) : type;
     }
@@ -326,33 +336,66 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
         return toCasing(ctx.service.name + '_ApiDelegate', ctx.config.typeNameCasing);
     }
     getAllParameters(ctx, args) {
+        var _a, _b;
         const { endpoint } = args;
         const parameters = endpoint.parameters.filter((parameter) => parameter.target === 'query' || parameter.target === 'path');
         if (endpoint.requestBody) {
-            const schema = endpoint.requestBody.content[0].schema;
-            const schemaType = this.getSchemaType(ctx, { schema });
-            const name = !schemaType || /^Any\??$/.test(schemaType.name)
-                ? 'body'
-                : SourceBuilder.build((b) => kt.reference.write(b, schemaType));
-            parameters.push({
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                $src: undefined,
-                $ref: undefined,
-                id: 'body',
-                name,
-                target: 'body',
-                schema,
-                required: endpoint.requestBody.required,
-                description: endpoint.requestBody.description,
-                allowEmptyValue: undefined,
-                allowReserved: undefined,
-                deprecated: false,
-                explode: undefined,
-                style: undefined,
-            });
+            const content = endpoint.requestBody.content[0];
+            let schema = content.schema;
+            if (content.type === 'multipart/form-data') {
+                if (schema && schema.kind === 'object') {
+                    schema = (_a = resolveAnyOfAndAllOf(schema, true)) !== null && _a !== void 0 ? _a : schema;
+                    const properties = (_b = schema.properties) !== null && _b !== void 0 ? _b : {};
+                    for (const [name, property] of properties.entries()) {
+                        parameters.push(Object.assign(this.createApiParameter({
+                            id: `multipart-${name}`,
+                            name,
+                            target: 'body',
+                            schema: property.schema,
+                            required: schema.required.has(name),
+                            description: property.schema.description,
+                        }), {
+                            multipart: {
+                                name,
+                                isFile: property.schema.kind === 'string' && property.schema.format === 'binary',
+                            },
+                        }));
+                    }
+                }
+            }
+            else {
+                const schemaType = this.getSchemaType(ctx, { schema });
+                const name = !schemaType || /^Any\??$/.test(schemaType.name)
+                    ? 'body'
+                    : SourceBuilder.build((b) => kt.reference.write(b, schemaType));
+                parameters.push(this.createApiParameter({
+                    id: 'body',
+                    name,
+                    target: 'body',
+                    schema,
+                    required: endpoint.requestBody.required,
+                    description: endpoint.requestBody.description,
+                }));
+            }
         }
         return parameters;
     }
+    createApiParameter(data) {
+        return {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            $src: undefined,
+            $ref: undefined,
+            schema: undefined,
+            required: false,
+            description: undefined,
+            allowEmptyValue: undefined,
+            allowReserved: undefined,
+            deprecated: false,
+            explode: undefined,
+            style: undefined,
+            ...data,
+        };
+    }
 }
 export function listToFlux(type) {
     return kt.refs.list.matches(type) ? kt.refs.reactor.flux([type.generics[0]]) : type;

package/esm/lib/types.js ADDED Viewed

	@@ -0,0 +1 @@
1	+ export {};

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@goast/kotlin",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "repository": "https://github.com/MaSch0212/goast.git",
   "description": "Provides gOAst generators for generating Kotlin code from OpenAPI specifications.",
   "keywords": [

package/types/index.d.ts CHANGED Viewed

@@ -1,7 +1,8 @@
+export * from './lib/ast';
 export * from './lib/common-results';
 export * from './lib/config';
-export * from './lib/generators';
 export * from './lib/file-builder';
+export * from './lib/generators';
 export * from './lib/import-collection';
+export * from './lib/types';
 export * from './lib/utils';
-export * from './lib/ast';

package/types/lib/ast/references/java.d.ts CHANGED Viewed

@@ -1,4 +1,17 @@
-export declare const system: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
+export declare const file: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
+    name: string;
+    packageName?: import("@goast/core").Nullable<string>;
+    generics?: import("@goast/core").Nullable<import("@goast/core").Nullable<import("../_index").Type<TBuilder>>[]>;
+    nullable?: import("@goast/core").Nullable<boolean>;
+    classReference?: import("@goast/core").Nullable<boolean>;
+    subReference?: import("@goast/core").Nullable<import("../nodes/reference").KtReference<TBuilder, never> | import("../_index").Call<TBuilder, never>>;
+    inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
+}, "name" | "packageName">>) => import("../nodes/reference").KtReference<TBuilder, never>) & {
+    refName: string;
+    packageName: import("@goast/core").Nullable<string>;
+    matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
+};
+export declare const ioException: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
     name: string;
     packageName?: import("@goast/core").Nullable<string>;
     generics?: import("@goast/core").Nullable<import("@goast/core").Nullable<import("../_index").Type<TBuilder>>[]>;
@@ -24,7 +37,7 @@ export declare const illegalStateException: (<TBuilder extends import("@goast/co
     packageName: import("@goast/core").Nullable<string>;
     matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
 };
-export declare const unsupportedOperationException: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
+export declare const system: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
     name: string;
     packageName?: import("@goast/core").Nullable<string>;
     generics?: import("@goast/core").Nullable<import("@goast/core").Nullable<import("../_index").Type<TBuilder>>[]>;
@@ -37,7 +50,7 @@ export declare const unsupportedOperationException: (<TBuilder extends import("@
     packageName: import("@goast/core").Nullable<string>;
     matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
 };
-export declare const ioException: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
+export declare const unsupportedOperationException: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
     name: string;
     packageName?: import("@goast/core").Nullable<string>;
     generics?: import("@goast/core").Nullable<import("@goast/core").Nullable<import("../_index").Type<TBuilder>>[]>;

package/types/lib/ast/references/reactor.d.ts CHANGED Viewed

@@ -14,3 +14,19 @@ export declare const flux: (<TBuilder extends import("@goast/core").SourceBuilde
     } | undefined) => import("../nodes/reference").KtReference<TBuilder, never>;
     matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
 };
+export declare const mono: (<TBuilder extends import("@goast/core").SourceBuilder>(generics: [import("../_index").Type<TBuilder>], options?: {
+    nullable?: import("@goast/core").Nullable<boolean>;
+    inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
+    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>;
+    infer: <TBuilder extends import("@goast/core").SourceBuilder>(options?: {
+        nullable?: import("@goast/core").Nullable<boolean>;
+        inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
+        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>;
+    matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
+};

package/types/lib/ast/references/spring.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-export declare const requestMapping: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
+export declare const autowired: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
     name: string;
     packageName?: import("@goast/core").Nullable<string>;
     generics?: import("@goast/core").Nullable<import("@goast/core").Nullable<import("../_index").Type<TBuilder>>[]>;
@@ -11,7 +11,7 @@ export declare const requestMapping: (<TBuilder extends import("@goast/core").So
     packageName: import("@goast/core").Nullable<string>;
     matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
 };
-export declare const requestBody: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
+export declare const httpStatus: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
     name: string;
     packageName?: import("@goast/core").Nullable<string>;
     generics?: import("@goast/core").Nullable<import("@goast/core").Nullable<import("../_index").Type<TBuilder>>[]>;
@@ -24,7 +24,23 @@ export declare const requestBody: (<TBuilder extends import("@goast/core").Sourc
     packageName: import("@goast/core").Nullable<string>;
     matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
 };
-export declare const requestParam: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
+export declare const responseEntity: (<TBuilder extends import("@goast/core").SourceBuilder>(generics: [import("../_index").Type<TBuilder>], options?: {
+    nullable?: import("@goast/core").Nullable<boolean>;
+    inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
+    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>;
+    infer: <TBuilder extends import("@goast/core").SourceBuilder>(options?: {
+        nullable?: import("@goast/core").Nullable<boolean>;
+        inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
+        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>;
+    matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
+};
+export declare const filePart: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
     name: string;
     packageName?: import("@goast/core").Nullable<string>;
     generics?: import("@goast/core").Nullable<import("@goast/core").Nullable<import("../_index").Type<TBuilder>>[]>;
@@ -37,7 +53,7 @@ export declare const requestParam: (<TBuilder extends import("@goast/core").Sour
     packageName: import("@goast/core").Nullable<string>;
     matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
 };
-export declare const requestMethod: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
+export declare const controller: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
     name: string;
     packageName?: import("@goast/core").Nullable<string>;
     generics?: import("@goast/core").Nullable<import("@goast/core").Nullable<import("../_index").Type<TBuilder>>[]>;
@@ -50,7 +66,7 @@ export declare const requestMethod: (<TBuilder extends import("@goast/core").Sou
     packageName: import("@goast/core").Nullable<string>;
     matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
 };
-export declare const pathVariable: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
+export declare const validated: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
     name: string;
     packageName?: import("@goast/core").Nullable<string>;
     generics?: import("@goast/core").Nullable<import("@goast/core").Nullable<import("../_index").Type<TBuilder>>[]>;
@@ -63,7 +79,7 @@ export declare const pathVariable: (<TBuilder extends import("@goast/core").Sour
     packageName: import("@goast/core").Nullable<string>;
     matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
 };
-export declare const nativeWebRequest: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
+export declare const pathVariable: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
     name: string;
     packageName?: import("@goast/core").Nullable<string>;
     generics?: import("@goast/core").Nullable<import("@goast/core").Nullable<import("../_index").Type<TBuilder>>[]>;
@@ -76,7 +92,7 @@ export declare const nativeWebRequest: (<TBuilder extends import("@goast/core").
     packageName: import("@goast/core").Nullable<string>;
     matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
 };
-export declare const autowired: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
+export declare const requestBody: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
     name: string;
     packageName?: import("@goast/core").Nullable<string>;
     generics?: import("@goast/core").Nullable<import("@goast/core").Nullable<import("../_index").Type<TBuilder>>[]>;
@@ -89,7 +105,7 @@ export declare const autowired: (<TBuilder extends import("@goast/core").SourceB
     packageName: import("@goast/core").Nullable<string>;
     matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
 };
-export declare const validated: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
+export declare const requestMapping: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
     name: string;
     packageName?: import("@goast/core").Nullable<string>;
     generics?: import("@goast/core").Nullable<import("@goast/core").Nullable<import("../_index").Type<TBuilder>>[]>;
@@ -102,23 +118,33 @@ export declare const validated: (<TBuilder extends import("@goast/core").SourceB
     packageName: import("@goast/core").Nullable<string>;
     matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
 };
-export declare const responseEntity: (<TBuilder extends import("@goast/core").SourceBuilder>(generics: [import("../_index").Type<TBuilder>], options?: {
+export declare const requestMethod: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
+    name: string;
+    packageName?: import("@goast/core").Nullable<string>;
+    generics?: import("@goast/core").Nullable<import("@goast/core").Nullable<import("../_index").Type<TBuilder>>[]>;
     nullable?: import("@goast/core").Nullable<boolean>;
+    classReference?: import("@goast/core").Nullable<boolean>;
+    subReference?: import("@goast/core").Nullable<import("../nodes/reference").KtReference<TBuilder, never> | import("../_index").Call<TBuilder, never>>;
     inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
+}, "name" | "packageName">>) => import("../nodes/reference").KtReference<TBuilder, never>) & {
+    refName: string;
+    packageName: import("@goast/core").Nullable<string>;
+    matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
+};
+export declare const requestParam: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
+    name: string;
+    packageName?: import("@goast/core").Nullable<string>;
+    generics?: import("@goast/core").Nullable<import("@goast/core").Nullable<import("../_index").Type<TBuilder>>[]>;
+    nullable?: import("@goast/core").Nullable<boolean>;
     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>) & {
+    inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
+}, "name" | "packageName">>) => import("../nodes/reference").KtReference<TBuilder, never>) & {
     refName: string;
     packageName: import("@goast/core").Nullable<string>;
-    infer: <TBuilder extends import("@goast/core").SourceBuilder>(options?: {
-        nullable?: import("@goast/core").Nullable<boolean>;
-        inject?: import("@goast/core").AstNodeInject<TBuilder, ""> | undefined;
-        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>;
     matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
 };
-export declare const httpStatus: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
+export declare const requestPart: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
     name: string;
     packageName?: import("@goast/core").Nullable<string>;
     generics?: import("@goast/core").Nullable<import("@goast/core").Nullable<import("../_index").Type<TBuilder>>[]>;
@@ -131,7 +157,7 @@ export declare const httpStatus: (<TBuilder extends import("@goast/core").Source
     packageName: import("@goast/core").Nullable<string>;
     matches: (value: unknown) => value is import("../nodes/reference").KtReference<never>;
 };
-export declare const controller: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
+export declare const nativeWebRequest: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: import("@goast/core").Prettify<Omit<{
     name: string;
     packageName?: import("@goast/core").Nullable<string>;
     generics?: import("@goast/core").Nullable<import("@goast/core").Nullable<import("../_index").Type<TBuilder>>[]>;

package/types/lib/generators/services/okhttp3-clients/args.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 import { ApiEndpoint, ApiParameter, ApiSchema, SourceBuilder } from '@goast/core';
 import { kt } from '../../../ast';
+import { ApiParameterWithMultipartInfo } from '../../../types';
 export type GetClientFileContent = {};
 export type GetClientClass = {};
 export type GetClientCompanionObject = {};
@@ -33,8 +34,16 @@ export type GetEndpointClientRequestConfigMethod = {
 };
 export type GetEndpointClientRequestConfigMethodBody = {
     endpoint: ApiEndpoint;
+    parameters: ApiParameterWithMultipartInfo[];
 };
 export type GetAdditionalClientMembers = {};
+export type GetParameterType = {
+    endpoint: ApiEndpoint;
+    parameter: ApiParameterWithMultipartInfo;
+};
+export type GetRequestBodyType = {
+    endpoint: ApiEndpoint;
+};
 export type GetTypeUsage<TBuilder extends SourceBuilder> = {
     schema: ApiSchema | undefined;
     nullable?: boolean;

package/types/lib/generators/services/okhttp3-clients/okhttp3-client-generator.d.ts CHANGED Viewed

@@ -1,9 +1,10 @@
-import { ApiParameter, ApiSchema, AppendValueGroup, SourceBuilder } from '@goast/core';
+import { ApiSchema, AppendValueGroup, SourceBuilder } from '@goast/core';
 import { DefaultKotlinOkHttp3GeneratorArgs as Args } from '.';
 import { KotlinOkHttp3ClientGeneratorContext, KotlinOkHttp3ClientGeneratorOutput } from './models';
 import { kt } from '../../../ast';
 import { KotlinImport } from '../../../common-results';
 import { KotlinFileBuilder } from '../../../file-builder';
+import { ApiParameterWithMultipartInfo } from '../../../types';
 import { KotlinFileGenerator } from '../../file-generator';
 type Context = KotlinOkHttp3ClientGeneratorContext;
 type Output = KotlinOkHttp3ClientGeneratorOutput;
@@ -24,16 +25,19 @@ export declare class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator<C
     protected getEndpointClientRequestConfigMethod(ctx: Context, args: Args.GetEndpointClientRequestConfigMethod): kt.Function<Builder>;
     protected getEndpointClientRequestConfigMethodBody(ctx: Context, args: Args.GetEndpointClientRequestConfigMethodBody): AppendValueGroup<Builder>;
     protected getAdditionalClientMembers(ctx: Context, args: Args.GetAdditionalClientMembers): kt.ClassMember<Builder>[];
+    protected getParameterType(ctx: Context, args: Args.GetParameterType): kt.Type<Builder>;
+    protected getRequestBodyType(ctx: Context, args: Args.GetRequestBodyType): kt.Type<Builder>;
     protected getTypeUsage(ctx: Context, args: Args.GetTypeUsage<Builder>): kt.Type<Builder>;
     protected getPackageName(ctx: Context, args: Args.GetPackageName): string;
     protected getPathWithInterpolation(ctx: Context, args: Args.GetPathWithInterpolation): string;
     protected getResponseSchema(ctx: Context, args: Args.GetResponseSchema): ApiSchema | undefined;
     protected getSchemaType(ctx: Context, args: Args.GetSchemaType): kt.Reference<SourceBuilder<never>, never> | undefined;
-    protected getAllParameters(ctx: Context, args: Args.GetAllParameters): ApiParameter[];
+    protected getAllParameters(ctx: Context, args: Args.GetAllParameters): ApiParameterWithMultipartInfo[];
     protected getRequestBodyParamName(ctx: Context, args: Args.GetRequestBodyParamName): string;
     protected getBasePath(ctx: Context, args: Args.GetBasePath): string;
     protected getEndpointPath(ctx: Context, args: Args.GetEndpointPath): string;
     protected getFilePath(ctx: Context, args: Args.GetFilePath): string;
     protected getApiClientName(ctx: Context, args: Args.GetApiClientName): string;
+    private createApiParameter;
 }
 export {};

package/types/lib/generators/services/spring-controllers/args.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
-import { ApiEndpoint, ApiParameter, ApiSchema, SourceBuilder } from '@goast/core';
+import { ApiEndpoint, ApiSchema, SourceBuilder } from '@goast/core';
 import { kt } from '../../../ast';
+import { ApiParameterWithMultipartInfo } from '../../../types';
 export type GenerateApiInterfaceFile = {
     dirPath: string;
     packageName: string;
@@ -38,7 +39,7 @@ export type GetApiDelegateInterfaceEndpointMethod = {
 };
 export type GetParameterType = {
     endpoint: ApiEndpoint;
-    parameter: ApiParameter;
+    parameter: ApiParameterWithMultipartInfo;
 };
 export type GetResponseType = {
     endpoint: ApiEndpoint;

package/types/lib/generators/services/spring-controllers/spring-controller-generator.d.ts CHANGED Viewed

@@ -1,9 +1,10 @@
-import { ApiParameter, AppendValueGroup, SourceBuilder } from '@goast/core';
+import { AppendValueGroup, SourceBuilder } from '@goast/core';
 import { DefaultKotlinSpringControllerGeneratorArgs as Args } from '.';
 import { KotlinServiceGeneratorContext, KotlinServiceGeneratorOutput } from './models';
 import { kt } from '../../../ast';
 import { KotlinImport } from '../../../common-results';
 import { KotlinFileBuilder } from '../../../file-builder';
+import { ApiParameterWithMultipartInfo } from '../../../types';
 import { KotlinFileGenerator } from '../../file-generator';
 type Context = KotlinServiceGeneratorContext;
 type Output = KotlinServiceGeneratorOutput;
@@ -45,7 +46,8 @@ export declare class DefaultKotlinSpringControllerGenerator extends KotlinFileGe
     protected getApiInterfaceName(ctx: Context, args: Args.GetApiInterfaceName): string;
     protected getApiControllerName(ctx: Context, args: Args.GetApiControllerName): string;
     protected getApiDelegateInterfaceName(ctx: Context, args: Args.GetApiDelegateInterfaceName): string;
-    protected getAllParameters(ctx: Context, args: Args.GetAllParameters): ApiParameter[];
+    protected getAllParameters(ctx: Context, args: Args.GetAllParameters): ApiParameterWithMultipartInfo[];
+    private createApiParameter;
 }
 export declare function listToFlux<T>(type: T): T;
 export {};

package/types/lib/types.d.ts ADDED Viewed

@@ -0,0 +1,7 @@
+import { ApiParameter } from '@goast/core';
+export type ApiParameterWithMultipartInfo = ApiParameter & {
+    multipart?: {
+        name: string;
+        isFile: boolean;
+    };
+};