feat: changed so that options can be specified on a case-by-case basis (

#41)
Himenon · Apr 7, 2021 · 108ce3a · 108ce3a
1 parent 6961bab
commit 108ce3a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 21 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -14,13 +14,11 @@ export class CodeGenerator {
   constructor(private readonly entryPoint: string, option?: Option) {
     this.rootSchema = Api.FileSystem.loadJsonOrYaml(entryPoint);
     this.resolvedReferenceDocument = Api.ResolveReference.resolve(entryPoint, entryPoint, JSON.parse(JSON.stringify(this.rootSchema)));
-    this.parser = this.createParser(option?.allowOperationIds);
+    this.parser = this.createParser();
   }
 
-  private createParser(allowOperationIds?: string[]): Api.OpenApiTools.Parser {
-    return new Api.OpenApiTools.Parser(this.entryPoint, this.rootSchema, this.resolvedReferenceDocument, {
-      allowOperationIds: allowOperationIds,
-    });
+  private createParser(): Api.OpenApiTools.Parser {
+    return new Api.OpenApiTools.Parser(this.entryPoint, this.rootSchema, this.resolvedReferenceDocument);
   }
 
   /**
@@ -40,11 +38,11 @@ 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?: Types.CodeGenerator.CustomGenerator<any>[]): string {
+  public generateTypeDefinition(generatorTemplates?: Types.CodeGenerator.CustomGenerator<any>[], allowOperationIds?: string[]): string {
     const create = () => {
       const statements = this.parser.getOpenApiTypeDefinitionStatements();
       generatorTemplates?.forEach(generatorTemplate => {
-        const payload = this.parser.getCodeGeneratorParamsArray();
+        const payload = this.parser.getCodeGeneratorParamsArray(allowOperationIds);
         const extraStatements = Api.TsGenerator.Utils.convertIntermediateCodes(generatorTemplate.generator(payload, generatorTemplate.option));
         statements.push(...extraStatements);
       });
@@ -59,8 +57,8 @@ export class CodeGenerator {
    * @param generatorTemplate
    * @returns String of generated code
    */
-  public generateCode(generatorTemplates: Types.CodeGenerator.CustomGenerator<any>[]): string {
-    const payload = this.parser.getCodeGeneratorParamsArray();
+  public generateCode(generatorTemplates: Types.CodeGenerator.CustomGenerator<any>[], allowOperationIds?: string[]): string {
+    const payload = this.parser.getCodeGeneratorParamsArray(allowOperationIds);
     const create = () => {
       return generatorTemplates
         .map(generatorTemplate => {
@@ -74,8 +72,8 @@ export class CodeGenerator {
   /**
    * Provides parameters extracted from OpenApi Schema
    */
-  public getCodeGeneratorParamsArray(): Types.CodeGenerator.Params[] {
-    return this.parser.getCodeGeneratorParamsArray();
+  public getCodeGeneratorParamsArray(allowOperationIds?: string[]): Types.CodeGenerator.Params[] {
+    return this.parser.getCodeGeneratorParamsArray(allowOperationIds);
   }
 
   /**

diff --git a/src/internal/OpenApiTools/Parser.ts b/src/internal/OpenApiTools/Parser.ts
@@ -13,13 +13,6 @@ import * as Paths from "./paths";
 import { Store } from "./store";
 import * as TypeNodeContext from "./TypeNodeContext";
 
-export interface Option {
-  /**
-   * List of operationId to be used
-   */
-  allowOperationIds?: string[];
-}
-
 export class Parser {
   private currentPoint: string;
   private convertContext: ConvertContext.Types;
@@ -29,7 +22,6 @@ export class Parser {
     private entryPoint: string,
     private rootSchema: OpenApi.Document,
     noReferenceOpenApiSchema: OpenApi.Document,
-    private option: Option,
   ) {
     this.currentPoint = entryPoint;
     this.convertContext = ConvertContext.create();
@@ -126,8 +118,8 @@ export class Parser {
     }
   }
 
-  public getCodeGeneratorParamsArray(): CodeGenerator.Params[] {
-    return Extractor.generateCodeGeneratorParamsArray(this.store, this.convertContext, this.option.allowOperationIds);
+  public getCodeGeneratorParamsArray(allowOperationIds?: string[]): CodeGenerator.Params[] {
+    return Extractor.generateCodeGeneratorParamsArray(this.store, this.convertContext, allowOperationIds);
   }
 
   public getOpenApiTypeDefinitionStatements(): ts.Statement[] {