feat: provide a convenient experimental API for code extension (#35)

Himenon · web-flow · commit 5ce24d3a8b45 · 2021-04-06T23:35:11.000+09:00
* refactor: change interface name

* feat: add additional comment option

* test: udpate option

* feat: providing experimental APIs

* test: add generator params test
diff --git a/scripts/build.ts b/scripts/build.ts
@@ -1,9 +1,9 @@
 import "./clean";
 
+import { cherryPick } from "./tools/cherry-pick";
 import { copyPackageSet } from "./tools/copyPackageSet";
 import { generateExportsField } from "./tools/dualPackageSupport";
 import { shell } from "./tools/shell";
-import { cherryPick } from "./tools/cherry-pick";
 
 const main = async () => {
   await Promise.all([
diff --git a/scripts/testCodeGen.ts b/scripts/testCodeGen.ts
@@ -1,7 +1,7 @@
 import * as fs from "fs";
 import { posix as path } from "path";
 
-import { CodeGenerator, GeneratorTemplate } from "../lib";
+import { CodeGenerator, CustomCodeGenerator } from "../lib";
 import * as Templates from "../lib/templates";
 
 const writeText = (filename: string, text: string): void => {
@@ -34,7 +34,7 @@ const generateTemplateCodeOnly = (
     });
   }
 
-  const apiClientGeneratorTemplate: GeneratorTemplate<Templates.ApiClient.Option> = {
+  const apiClientGeneratorTemplate: CustomCodeGenerator<Templates.ApiClient.Option> = {
     generator: Templates.ApiClient.generator,
     option: option,
   };
@@ -58,11 +58,7 @@ const generateTypedefWithTemplateCode = (
   }
 
   const code = codeGenerator.generateTypeDefinition([
-    {
-      generator: () => {
-        return codeGenerator.getAdditionalTypeStatements();
-      },
-    },
+    codeGenerator.getAdditionalTypeDefinitionCustomCodeGenerator(),
     {
       generator: Templates.ApiClient.generator,
       option: option,
@@ -75,9 +71,9 @@ const generateTypedefWithTemplateCode = (
 const generateSplitCode = (inputFilename: string, outputDir: string) => {
   const codeGenerator = new CodeGenerator(inputFilename);
 
-  const apiClientGeneratorTemplate: GeneratorTemplate<Templates.ApiClient.Option> = {
+  const apiClientGeneratorTemplate: CustomCodeGenerator<Templates.ApiClient.Option> = {
     generator: Templates.ApiClient.generator,
-    option: { sync: false },
+    option: { sync: false, additionalMethodComment: true },
   };
 
   const typeDefCode = codeGenerator.generateTypeDefinition();
@@ -87,18 +83,19 @@ const generateSplitCode = (inputFilename: string, outputDir: string) => {
         return [`import { Schemas } from "./types";`];
       },
     },
-    {
-      generator: () => {
-        return codeGenerator.getAdditionalTypeStatements();
-      },
-    },
+    codeGenerator.getAdditionalTypeDefinitionCustomCodeGenerator(),
     apiClientGeneratorTemplate,
   ]);
 
   writeText(path.join(outputDir, "types.ts"), typeDefCode);
   writeText(path.join(outputDir, "apiClient.ts"), apiClientCode);
 };
 
+const generateParameter = (inputFilename: string, outputFilename: string) => {
+  const codeGenerator = new CodeGenerator(inputFilename);
+  writeText(outputFilename, JSON.stringify(codeGenerator.getCodeGeneratorParamsArray(), null, 2));
+};
+
 const main = () => {
   generateTypedefCodeOnly("test/api.test.domain/index.yml", "test/code/typedef-only/api.test.domain.ts", true);
   generateTypedefCodeOnly("test/infer.domain/index.yml", "test/code/typedef-only/infer.domain.ts", false);
@@ -116,6 +113,9 @@ const main = () => {
   generateTypedefWithTemplateCode("test/infer.domain/index.yml", "test/code/typedef-with-template/infer.domain.ts", false, { sync: false });
 
   generateSplitCode("test/api.test.domain/index.yml", "test/code/split");
+
+  generateParameter("test/api.test.domain/index.yml", "test/code/parameter/api.test.domain.json");
+  generateParameter("test/infer.domain/index.yml", "test/code/parameter/infer.domain.json");
 };
 
 main();
diff --git a/src/api.ts b/src/api.ts
@@ -3,4 +3,3 @@ export * as OpenApiTools from "./internal/OpenApiTools";
 export { FileSystem } from "./internal/FileSystem";
 export * as ResolveReference from "./internal/ResolveReference";
 export * as Validator from "./internal/Validator";
-
diff --git a/src/code-templates/api-client/ApiClientClass/ApiClientInterface.ts b/src/code-templates/api-client/ApiClientClass/ApiClientInterface.ts
@@ -2,6 +2,7 @@ import ts from "typescript";
 
 import type { TsGenerator } from "../../../api";
 import type { CodeGenerator } from "../../../types";
+import type { Option } from "../types";
 
 const httpMethodList: string[] = ["GET", "PUT", "POST", "DELETE", "OPTIONS", "HEAD", "PATCH", "TRACE"];
 
@@ -104,7 +105,7 @@ const createObjectLikeInterface = (factory: TsGenerator.Factory.Type) => {
   });
 };
 
-export const create = (factory: TsGenerator.Factory.Type, list: CodeGenerator.Params[], option: { sync?: boolean }): ts.Statement[] => {
+export const create = (factory: TsGenerator.Factory.Type, list: CodeGenerator.Params[], option: Option): ts.Statement[] => {
   const objectLikeOrAnyType = factory.UnionTypeNode.create({
     typeNodes: [
       factory.TypeReferenceNode.create({
diff --git a/src/code-templates/api-client/ApiClientClass/Method.ts b/src/code-templates/api-client/ApiClientClass/Method.ts
@@ -1,7 +1,10 @@
+import { EOL } from "os";
+
 import ts from "typescript";
 
 import type { TsGenerator } from "../../../api";
 import type { CodeGenerator } from "../../../types";
+import type { Option } from "../types";
 import * as MethodBody from "./MethodBody";
 
 export { MethodBody };
@@ -36,7 +39,7 @@ const generateResponseReturnType = (
   factory: TsGenerator.Factory.Type,
   successResponseNameList: string[],
   successResponseContentTypeList: string[],
-  option: { sync?: boolean },
+  option: Option,
 ) => {
   let objectType: ts.TypeNode = factory.TypeNode.create({
     type: "void",
@@ -121,7 +124,7 @@ const methodTypeParameters = (factory: TsGenerator.Factory.Type, params: CodeGen
  *
  * }
  */
-export const create = (factory: TsGenerator.Factory.Type, params: CodeGenerator.Params, option: { sync?: boolean }): ts.MethodDeclaration => {
+export const create = (factory: TsGenerator.Factory.Type, params: CodeGenerator.Params, option: Option): ts.MethodDeclaration => {
   const typeParameters: ts.TypeParameterDeclaration[] = methodTypeParameters(factory, params);
   const methodArguments: ts.ParameterDeclaration[] = [];
   const hasParamsArguments =
@@ -148,7 +151,9 @@ export const create = (factory: TsGenerator.Factory.Type, params: CodeGenerator.
     name: params.functionName,
     async: !option.sync,
     parameters: methodArguments,
-    comment: params.comment,
+    comment: option.additionalMethodComment
+      ? [params.comment, `operationId: ${params.operationId}`, `Request URI: ${params.rawRequestUri}`].filter(t => !!t).join(EOL)
+      : params.comment,
     deprecated: params.deprecated,
     type: returnType,
     typeParameters: typeParameters,
diff --git a/src/code-templates/api-client/ApiClientClass/MethodBody/PathParameter.ts b/src/code-templates/api-client/ApiClientClass/MethodBody/PathParameter.ts
@@ -11,7 +11,10 @@ export const isPathParameter = (params: any): params is CodeGenerator.PickedPara
 /**
  * const url = this.baseUrl + `[head]${params.parameter.[parameterName]}`;
  */
-const generateUrlVariableStatement = (factory: TsGenerator.Factory.Type, urlTemplate: Utils.Params$TemplateExpression): ts.VariableStatement => {
+const generateUrlVariableStatement = (
+  factory: TsGenerator.Factory.Type,
+  urlTemplate: Utils.Params$TemplateExpression,
+): ts.VariableStatement => {
   return factory.VariableStatement.create({
     declarationList: factory.VariableDeclarationList.create({
       declarations: [
@@ -93,7 +96,11 @@ export const generateUrlTemplateExpression = (
   return urlTemplate;
 };
 
-export const create = (factory: TsGenerator.Factory.Type, requestUri: string, pathParameters: CodeGenerator.PickedParameter[]): ts.VariableStatement => {
+export const create = (
+  factory: TsGenerator.Factory.Type,
+  requestUri: string,
+  pathParameters: CodeGenerator.PickedParameter[],
+): ts.VariableStatement => {
   if (pathParameters.length > 0) {
     const urlTemplate = generateUrlTemplateExpression(factory, requestUri, pathParameters);
     return generateUrlVariableStatement(factory, urlTemplate);
diff --git a/src/code-templates/api-client/ApiClientClass/index.ts b/src/code-templates/api-client/ApiClientClass/index.ts
@@ -2,14 +2,15 @@ import ts from "typescript";
 
 import type { TsGenerator } from "../../../api";
 import type { CodeGenerator } from "../../../types";
+import type { Option } from "../types";
 import * as ApiClientInterface from "./ApiClientInterface";
 import * as Class from "./Class";
 import * as Constructor from "./Constructor";
 import * as Method from "./Method";
 
 export { Method };
 
-export const create = (factory: TsGenerator.Factory.Type, list: CodeGenerator.Params[], option: { sync?: boolean }): ts.Statement[] => {
+export const create = (factory: TsGenerator.Factory.Type, list: CodeGenerator.Params[], option: Option): ts.Statement[] => {
   const methodList = list.map(params => {
     return Method.create(factory, params, option);
   });
diff --git a/src/code-templates/api-client/index.ts b/src/code-templates/api-client/index.ts
@@ -4,10 +4,9 @@ import { TsGenerator } from "../../api";
 import type { CodeGenerator } from "../../types";
 import * as ApiClientArgument from "./ApiClientArgument";
 import * as ApiClientClass from "./ApiClientClass";
+import type { Option } from "./types";
 
-export interface Option {
-  sync?: boolean;
-}
+export { Option };
 
 export const generator: CodeGenerator.GenerateFunction<Option> = (
   codeGeneratorParamsList: CodeGenerator.Params[],
diff --git a/src/code-templates/api-client/types.ts b/src/code-templates/api-client/types.ts
@@ -0,0 +1,6 @@
+export interface Option {
+  /** default false */
+  sync?: boolean;
+  /** default false */
+  additionalMethodComment?: boolean;
+}
diff --git a/src/index.ts b/src/index.ts
@@ -1,11 +1,9 @@
 import { EOL } from "os";
 
-import ts from "typescript";
-
 import * as Api from "./api";
 import type * as Types from "./types";
 
-export interface GeneratorTemplate<T> {
+export interface CustomCodeGenerator<T> {
   generator: Types.CodeGenerator.GenerateFunction<T>;
   option?: T;
 }
@@ -43,7 +41,7 @@ export class CodeGenerator {
    * @param generatorTemplate Template for when you want to change the code following a type definition
    * @returns String of generated code
    */
-  public generateTypeDefinition(generatorTemplates?: GeneratorTemplate<any>[]): string {
+  public generateTypeDefinition(generatorTemplates?: CustomCodeGenerator<any>[]): string {
     const create = () => {
       const statements = this.parser.getOpenApiTypeDefinitionStatements();
       generatorTemplates?.forEach(generatorTemplate => {
@@ -62,7 +60,7 @@ export class CodeGenerator {
    * @param generatorTemplate
    * @returns String of generated code
    */
-  public generateCode(generatorTemplates: GeneratorTemplate<any>[]): string {
+  public generateCode(generatorTemplates: CustomCodeGenerator<any>[]): string {
     const payload = this.parser.getCodeGeneratorParamsArray();
     const create = () => {
       return generatorTemplates
@@ -81,7 +79,14 @@ export class CodeGenerator {
     return this.parser.getCodeGeneratorParamsArray();
   }
 
-  public getAdditionalTypeStatements(): ts.Statement[] {
-    return this.parser.getAdditionalTypeStatements();
+  /**
+   * Provides types for parameters for Templates.ApiClient.
+   *
+   * This API will be moved to Templates in the future.
+   */
+  public getAdditionalTypeDefinitionCustomCodeGenerator(): CustomCodeGenerator<undefined> {
+    return {
+      generator: () => this.parser.getAdditionalTypeStatements(),
+    };
   }
 }
diff --git a/src/internal/FileSystem/index.ts b/src/internal/FileSystem/index.ts
@@ -13,7 +13,7 @@ export interface Type {
 
 export class FileSystem {
   private static FRAGMENT = "#/";
-  private static internalLoadJsonOrYaml (filename: string): any {
+  private static internalLoadJsonOrYaml(filename: string): any {
     const ext = path.extname(filename);
     const data = fs.readFileSync(filename, { encoding: "utf-8" });
     switch (ext) {
@@ -25,7 +25,7 @@ export class FileSystem {
       default:
         throw new UnSupportError(`Not support file: ${filename}`);
     }
-  };
+  }
 
   public static existSync(entryPoint: string): boolean {
     return !!(fs.existsSync(entryPoint) && fs.statSync(entryPoint).isFile());
@@ -39,5 +39,5 @@ export class FileSystem {
       return Dot.get(data, fragment.replace(/\//g, "."));
     }
     return this.internalLoadJsonOrYaml(entryPoint);
-  };
+  }
 }
diff --git a/src/internal/OpenApiTools/Extractor.ts b/src/internal/OpenApiTools/Extractor.ts
@@ -1,4 +1,4 @@
-import type { CodeGenerator, OpenApi } from "../../types";
+import type { CodeGenerator, OpenApi, Experimental } from "../../types";
 import * as ConverterContext from "./ConverterContext";
 import { Store } from "./store";
 
@@ -111,7 +111,8 @@ export const generateCodeGeneratorParamsArray = (
       //
       hasAdditionalHeaders: hasOver2RequestContentTypes || hasOver2SuccessNames,
       hasQueryParameters: hasQueryParameters(item.parameters),
-      // Response Success Name
+      
+      experimentalOpenApiOperation: item,
     };
     params.push(formatParams);
   });
diff --git a/src/internal/OpenApiTools/TypeNodeContext.ts b/src/internal/OpenApiTools/TypeNodeContext.ts
@@ -2,8 +2,8 @@ import * as Path from "path";
 
 import ts from "typescript";
 
-import * as TypeScriptCodeGenerator from "../TsGenerator";
 import { DevelopmentError } from "../Exception";
+import * as TypeScriptCodeGenerator from "../TsGenerator";
 import * as ConverterContext from "./ConverterContext";
 import { Store } from "./store";
 import * as ToTypeNode from "./toTypeNode";
diff --git a/src/internal/OpenApiTools/components/Headers.ts b/src/internal/OpenApiTools/components/Headers.ts
@@ -1,6 +1,6 @@
 import type { OpenApi } from "../../../types";
-import { Factory } from "../../TsGenerator";
 import { UndefinedComponent } from "../../Exception";
+import { Factory } from "../../TsGenerator";
 import * as ConverterContext from "../ConverterContext";
 import * as Guard from "../Guard";
 import * as Name from "../Name";
diff --git a/src/internal/OpenApiTools/components/Parameters.ts b/src/internal/OpenApiTools/components/Parameters.ts
@@ -1,6 +1,6 @@
 import type { OpenApi } from "../../../types";
-import { Factory } from "../../TsGenerator";
 import { UnSupportError } from "../../Exception";
+import { Factory } from "../../TsGenerator";
 import * as ConverterContext from "../ConverterContext";
 import * as Guard from "../Guard";
 import * as Name from "../Name";
diff --git a/src/internal/OpenApiTools/components/PathItems.ts b/src/internal/OpenApiTools/components/PathItems.ts
@@ -1,6 +1,6 @@
 import type { OpenApi } from "../../../types";
-import { Factory } from "../../TsGenerator";
 import { FeatureDevelopmentError, UnSupportError } from "../../Exception";
+import { Factory } from "../../TsGenerator";
 import * as ConverterContext from "../ConverterContext";
 import * as Guard from "../Guard";
 import * as Name from "../Name";
diff --git a/src/internal/OpenApiTools/components/Responses.ts b/src/internal/OpenApiTools/components/Responses.ts
@@ -3,8 +3,8 @@ import * as path from "path";
 import ts from "typescript";
 
 import type { OpenApi } from "../../../types";
-import { Factory } from "../../TsGenerator";
 import { UndefinedComponent } from "../../Exception";
+import { Factory } from "../../TsGenerator";
 import * as ConverterContext from "../ConverterContext";
 import * as Guard from "../Guard";
 import * as Name from "../Name";
diff --git a/src/internal/OpenApiTools/components/Schema.ts b/src/internal/OpenApiTools/components/Schema.ts
@@ -1,8 +1,8 @@
 import ts from "typescript";
 
 import type { OpenApi } from "../../../types";
-import { Factory } from "../../TsGenerator";
 import { FeatureDevelopmentError } from "../../Exception";
+import { Factory } from "../../TsGenerator";
 import * as ConvertContext from "../ConverterContext";
 import * as Guard from "../Guard";
 import { Store } from "../store";
diff --git a/src/internal/OpenApiTools/components/Schemas.ts b/src/internal/OpenApiTools/components/Schemas.ts
@@ -1,6 +1,6 @@
 import type { OpenApi } from "../../../types";
-import { Factory } from "../../TsGenerator";
 import { UnSupportError } from "../../Exception";
+import { Factory } from "../../TsGenerator";
 import * as ConverterContext from "../ConverterContext";
 import * as Guard from "../Guard";
 import * as InferredType from "../InferredType";
diff --git a/src/internal/OpenApiTools/components/SecuritySchemas.ts b/src/internal/OpenApiTools/components/SecuritySchemas.ts
@@ -1,6 +1,6 @@
 import type { OpenApi } from "../../../types";
-import { Factory } from "../../TsGenerator";
 import { UndefinedComponent } from "../../Exception";
+import { Factory } from "../../TsGenerator";
 import * as Guard from "../Guard";
 import * as Name from "../Name";
 import { Store } from "../store";
diff --git a/src/internal/OpenApiTools/store/Operation.ts b/src/internal/OpenApiTools/store/Operation.ts
diff --git a/src/internal/OpenApiTools/toTypeNode.ts b/src/internal/OpenApiTools/toTypeNode.ts
diff --git a/src/internal/ResolveReference/index.ts b/src/internal/ResolveReference/index.ts
diff --git a/src/typedef/CodeGenerator.ts b/src/typedef/CodeGenerator.ts
diff --git a/src/typedef/Experimental.ts b/src/typedef/Experimental.ts
diff --git a/src/types.ts b/src/types.ts
diff --git a/test/__tests__/__snapshots__/parameter-test.ts.snap b/test/__tests__/__snapshots__/parameter-test.ts.snap
diff --git a/test/__tests__/__snapshots__/spit-code-test.ts.snap b/test/__tests__/__snapshots__/spit-code-test.ts.snap
diff --git a/test/__tests__/parameter-test.ts b/test/__tests__/parameter-test.ts
diff --git a/test/utils.ts b/test/utils.ts
