@goast/kotlin 0.4.18 → 0.4.20

package/src/src/ast/references/spring.ts

@@ -8,10 +8,18 @@ export const autowired: KtReferenceFactory = ktReference.factory(
 
 // org.springframework.http
 export const httpStatus: KtReferenceFactory = ktReference.factory('HttpStatus', 'org.springframework.http');
+export const httpMethod: KtReferenceFactory = ktReference.factory('HttpMethod', 'org.springframework.http');
 export const responseEntity: KtGenericReferenceFactory<1> = ktReference.genericFactory<1>(
   'ResponseEntity',
   'org.springframework.http',
 );
+export const mediaType: KtReferenceFactory = ktReference.factory('MediaType', 'org.springframework.http');
+
+// org.springframework.http.client
+export const multipartBodyBuilder: KtReferenceFactory = ktReference.factory(
+  'MultipartBodyBuilder',
+  'org.springframework.http.client',
+);
 
 // org.springframework.http.codec.multipart
 export const filePart: KtReferenceFactory = ktReference.factory('FilePart', 'org.springframework.http.codec.multipart');
@@ -70,3 +78,9 @@ export const nativeWebRequest: KtReferenceFactory = ktReference.factory(
   'NativeWebRequest',
   'org.springframework.web.context.request',
 );
+
+// org.springframework.web.util
+export const uriComponentsBuilder: KtReferenceFactory = ktReference.factory(
+  'UriComponentsBuilder',
+  'org.springframework.web.util',
+);

package/src/src/generators/index.ts

@@ -2,3 +2,4 @@ export * from './file-generator.js';
 export * from './models/index.js';
 export * from './services/okhttp3-clients/index.js';
 export * from './services/spring-controllers/index.js';
+export * from './services/spring-reactive-web-clients/index.js';

package/src/src/generators/services/okhttp3-clients/okhttp3-client-generator.ts

@@ -18,7 +18,6 @@ import {
 
 import { kt } from '../../../ast/index.js';
 import type { KtValue } from '../../../ast/nodes/types.js';
-import type { KotlinImport } from '../../../common-results.js';
 import { KotlinFileBuilder } from '../../../file-builder.js';
 import type { ApiParameterWithMultipartInfo } from '../../../types.js';
 import { modifyString } from '../../../utils.js';
@@ -36,7 +35,7 @@ export interface KotlinOkHttp3Generator<TOutput extends Output = Output> {
 
 export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator<Context, Output>
   implements KotlinOkHttp3Generator {
-  public generate(ctx: KotlinOkHttp3ClientGeneratorContext): MaybePromise<KotlinImport> {
+  public generate(ctx: KotlinOkHttp3ClientGeneratorContext): MaybePromise<Output> {
     const typeName = this.getApiClientName(ctx, {});
     const packageName = this.getPackageName(ctx, {});
     const filePath = this.getFilePath(ctx, { packageName });

package/src/src/generators/services/spring-reactive-web-clients/args.ts

@@ -0,0 +1,101 @@
+import type { ApiEndpoint, ApiParameter, ApiSchema, SourceBuilder } from '@goast/core';
+import type { kt } from '../../../ast/index.js';
+import type { ApiParameterWithMultipartInfo } from '../../../types.js';
+
+export type GetClientFileContent = object;
+
+export type GetRequestsObject = object;
+
+export type GetEndpointMembers = { endpoint: ApiEndpoint; parameters: ApiParameterWithMultipartInfo[] };
+
+export type GetEndpointFunctionName = { endpoint: ApiEndpoint };
+
+export type GetEndpointFunction = {
+  endpoint: ApiEndpoint;
+  parameters: ApiParameterWithMultipartInfo[];
+  responseSchema: ApiSchema | undefined;
+};
+
+export type GetEndpointFunctionBody = {
+  endpoint: ApiEndpoint;
+  parameters: ApiParameterWithMultipartInfo[];
+  responseSchema: ApiSchema | undefined;
+};
+
+export type GetEndpointRequestFunctionName = { endpoint: ApiEndpoint };
+
+export type GetEndpointRequestFunction = {
+  endpoint: ApiEndpoint;
+  parameters: ApiParameterWithMultipartInfo[];
+  responseSchema: ApiSchema | undefined;
+};
+
+export type GetEndpointRequestFunctionBody = {
+  endpoint: ApiEndpoint;
+  parameters: ApiParameterWithMultipartInfo[];
+  responseSchema: ApiSchema | undefined;
+};
+
+export type GetEndpointFunctionWithHandler = {
+  endpoint: ApiEndpoint;
+  parameters: ApiParameterWithMultipartInfo[];
+  responseSchema: ApiSchema | undefined;
+};
+
+export type GetEndpointFunctionWithHandlerBody = {
+  endpoint: ApiEndpoint;
+  parameters: ApiParameterWithMultipartInfo[];
+  responseSchema: ApiSchema | undefined;
+};
+
+export type GetEndpointUriFunctionName = { endpoint: ApiEndpoint };
+
+export type GetEndpointUriFunction = {
+  endpoint: ApiEndpoint;
+  parameters: ApiParameterWithMultipartInfo[];
+};
+
+export type GetEndpointUriFunctionBody = {
+  endpoint: ApiEndpoint;
+  parameters: ApiParameterWithMultipartInfo[];
+};
+
+export type GetParameterToString = {
+  endpoint: ApiEndpoint;
+  parameter: ApiParameterWithMultipartInfo;
+};
+
+export type GetAdditionalClientMembers = object;
+
+export type GetParameterType = { endpoint: ApiEndpoint; parameter: ApiParameterWithMultipartInfo };
+
+export type GetRequestBodyType = { endpoint: ApiEndpoint };
+
+export type GetParameterDefaultValue = {
+  endpoint: ApiEndpoint;
+  parameter: ApiParameter;
+};
+
+export type GetTypeUsage<TBuilder extends SourceBuilder> = {
+  schema: ApiSchema | undefined;
+  nullable?: boolean;
+  fallback?: kt.Type<TBuilder>;
+};
+
+export type GetPackageName = object;
+
+export type GetResponseSchema = { endpoint: ApiEndpoint };
+
+export type GetSchemaType = { schema: ApiSchema | undefined };
+
+export type GetAllParameters = { endpoint: ApiEndpoint };
+
+export type GetRequestBodyParamName = { endpoint: ApiEndpoint };
+
+export type GetBasePath = object;
+
+export type GetEndpointPath = { endpoint: ApiEndpoint };
+
+export type GetFilePath = { packageName: string };
+
+export type GetRequestsObjectName = object;

package/src/src/generators/services/spring-reactive-web-clients/index.ts

@@ -0,0 +1,4 @@
+export * as DefaultKotlinSpringReactiveWebClientGeneratorArgs from './args.js';
+export * from './models.js';
+export * from './spring-reactive-web-client-generator.js';
+export * from './spring-reactive-web-clients-generator.js';

package/src/src/generators/services/spring-reactive-web-clients/models.ts

@@ -0,0 +1,62 @@
+import type {
+  ApiEndpoint,
+  ApiService,
+  DefaultGenerationProviderConfig,
+  OpenApiServicesGenerationProviderContext,
+} from '@goast/core';
+
+import type { KotlinImport } from '../../../common-results.js';
+import { defaultKotlinGeneratorConfig, type KotlinGeneratorConfig } from '../../../config.js';
+import type { KotlinModelsGeneratorOutput } from '../../models/index.js';
+import type { getReferenceFactories } from './refs.js';
+
+export type KotlinSpringReactiveWebClientsGeneratorConfig = KotlinGeneratorConfig & {
+  packageName: string;
+  packageSuffix: string | ((service?: ApiService) => string);
+  infrastructurePackageName:
+    | string
+    | { mode: 'append-package-name' | 'append-full-package-name' | 'replace'; value: string };
+
+  basePath?: string | RegExp | ((basePath: string, service: ApiService) => string);
+  pathModifier?: RegExp | ((path: string, endpoint: ApiEndpoint) => string);
+  serializerJsonInclude: 'always' | 'non-null' | 'non-absent' | 'non-default' | 'non-empty' | 'use-defaults';
+};
+
+export const defaultKotlinSpringReactiveWebClientsGeneratorConfig: DefaultGenerationProviderConfig<
+  KotlinSpringReactiveWebClientsGeneratorConfig
+> = {
+  ...defaultKotlinGeneratorConfig,
+
+  packageName: 'com.openapi.generated',
+  packageSuffix: '.api.client',
+  infrastructurePackageName: { mode: 'append-full-package-name', value: '.infrastructure' },
+  serializerJsonInclude: 'non-absent',
+};
+
+export type KotlinSpringReactiveWebClientsGeneratorInput = KotlinModelsGeneratorOutput;
+
+export type KotlinSpringReactiveWebClientsGeneratorOutput = {
+  kotlin: {
+    clients: {
+      [serviceId: string]: KotlinSpringReactiveWebClientGeneratorOutput;
+    };
+  };
+};
+
+export type KotlinSpringReactiveWebClientGeneratorOutput = KotlinImport;
+
+export type KotlinSpringReactiveWebClientsGeneratorContext =
+  & OpenApiServicesGenerationProviderContext<
+    KotlinSpringReactiveWebClientsGeneratorInput,
+    KotlinSpringReactiveWebClientsGeneratorOutput,
+    KotlinSpringReactiveWebClientsGeneratorConfig,
+    KotlinSpringReactiveWebClientGeneratorOutput
+  >
+  & {
+    infrastructurePackageName: string;
+    refs: ReturnType<typeof getReferenceFactories>;
+  };
+
+export type KotlinSpringReactiveWebClientGeneratorContext = KotlinSpringReactiveWebClientsGeneratorContext & {
+  service: ApiService;
+};

package/src/src/generators/services/spring-reactive-web-clients/refs.ts

@@ -0,0 +1,11 @@
+import { kt } from '../../../ast/index.js';
+
+// See packages/kotlin/assets/client/spring-reactive-web-clients for reference
+export function getReferenceFactories(infrastructurePackageName: string): {
+  apiRequestFile: kt.ReferenceFactory;
+} {
+  return {
+    // ApiRequestFile.kt
+    apiRequestFile: kt.reference.factory('ApiRequestFile', infrastructurePackageName),
+  };
+}