Parsers

Author: devlikepro

src/OperationParser.ts

@@ -1,37 +1,35 @@
 import {OpenAPIV3} from "openapi-types";
 import * as lodash from "lodash";
 import {OperationContext} from "./openapi/OpenAPIVisitor";
-import {toResourceName} from "./n8n/utils";
 
 export interface IOperationParser {
-    getResources(operation: OpenAPIV3.OperationObject, context: OperationContext): string[]
+    name(operation: OpenAPIV3.OperationObject, context: OperationContext): string
 
-    getOperationName(operation: OpenAPIV3.OperationObject, context: OperationContext): string
+    value(operation: OpenAPIV3.OperationObject, context: OperationContext): string
 
-    getOptionAction(operation: OpenAPIV3.OperationObject, context: OperationContext): string
+    action(operation: OpenAPIV3.OperationObject, context: OperationContext): string
 
-    getOptionDescription(operation: OpenAPIV3.OperationObject, context: OperationContext): string
+    description(operation: OpenAPIV3.OperationObject, context: OperationContext): string
 }
 
-export class N8NOperationParser implements IOperationParser {
-    getResources(operation: OpenAPIV3.OperationObject, context: OperationContext): string[] {
-        const tags = operation.tags as string[]
-        return tags.map(toResourceName)
-    }
-
-    getOperationName(operation: OpenAPIV3.OperationObject, context: OperationContext): string {
+export class DefaultOperationParser implements IOperationParser {
+    name(operation: OpenAPIV3.OperationObject, context: OperationContext): string {
         let operationId: string = operation.operationId!!.split('_').slice(1).join('_');
         if (!operationId) {
             operationId = operation.operationId as string
         }
         return lodash.startCase(operationId)
     }
 
-    getOptionAction(operation: OpenAPIV3.OperationObject, context: OperationContext): string {
-        return operation.summary || this.getOperationName(operation, context)
+    value(operation: OpenAPIV3.OperationObject, context: OperationContext): string {
+        return this.name(operation, context)
+    }
+
+    action(operation: OpenAPIV3.OperationObject, context: OperationContext): string {
+        return operation.summary || this.name(operation, context)
     }
 
-    getOptionDescription(operation: OpenAPIV3.OperationObject, context: OperationContext): string {
+    description(operation: OpenAPIV3.OperationObject, context: OperationContext): string {
         return operation.description || operation.summary || '';
     }
 

src/OperationsCollector.ts

@@ -3,10 +3,11 @@ import * as lodash from "lodash";
 import pino from "pino";
 import {OpenAPIV3} from "openapi-types";
 import {N8NINodeProperties} from "./SchemaToINodeProperties";
-import {IOperationParser, N8NOperationParser} from "./OperationParser";
+import {DefaultOperationParser, IOperationParser} from "./OperationParser";
 import {OptionsByResourceMap} from "./n8n/OptionsByResourceMap";
 import {INodeProperties} from "n8n-workflow";
 import {replacePathVarsToParameter} from "./n8n/utils";
+import {DefaultResourceParser, IResourceParser} from "../ResourceParser";
 
 export class BaseOperationsCollector implements OpenAPIVisitor {
     public readonly _fields: INodeProperties[]
@@ -15,7 +16,8 @@ export class BaseOperationsCollector implements OpenAPIVisitor {
     private n8nNodeProperties: N8NINodeProperties;
 
     // Dependency injection light version
-    protected operationParser: IOperationParser = new N8NOperationParser()
+    protected operationParser: IOperationParser = new DefaultOperationParser()
+    protected resourceParser: IResourceParser = new DefaultResourceParser()
     private bindings: any
 
     constructor(logger: pino.Logger, doc: any) {
@@ -73,12 +75,8 @@ export class BaseOperationsCollector implements OpenAPIVisitor {
     }
 
     _visitOperation(operation: OpenAPIV3.OperationObject, context: OperationContext) {
-        const tags = operation.tags;
-        if (!tags || tags.length === 0) {
-            throw new Error(`No tags found for operation '${operation}'`);
-        }
         const {option, fields: operationFields} = this.parseOperation(operation, context);
-        const resources = this.operationParser.getResources(operation, context);
+        const resources = operation.tags!!.map((tag: string) => this.resourceParser.value({name: tag}))
         for (const resourceName of resources) {
             const fields = lodash.cloneDeep(operationFields)
             const operationName = option.name;
@@ -127,14 +125,12 @@ export class BaseOperationsCollector implements OpenAPIVisitor {
     protected parseOperation(operation: OpenAPIV3.OperationObject, context: OperationContext) {
         const method = context.method
         const uri = context.pattern;
-        const operationName = this.operationParser.getOperationName(operation, context);
-        const optionAction = this.operationParser.getOptionAction(operation, context);
-        const description = this.operationParser.getOptionDescription(operation, context)
+        const parser = this.operationParser
         const option = {
-            name: operationName,
-            value: operationName,
-            action: optionAction,
-            description: description,
+            name: parser.name(operation, context),
+            value: parser.value(operation, context),
+            action: parser.action(operation, context),
+            description: parser.description(operation, context),
             routing: {
                 request: {
                     method: method.toUpperCase(),

src/ResourcePropertiesCollector.ts

@@ -1,8 +1,7 @@
 import {OpenAPIVisitor, OperationContext} from "./openapi/OpenAPIVisitor";
-import * as lodash from "lodash";
 import {OpenAPIV3} from "openapi-types";
 import {INodeProperties} from "n8n-workflow";
-import {toResourceName} from "./n8n/utils";
+import {DefaultResourceParser, IResourceParser} from "../ResourceParser";
 
 interface TagObject {
     name: string;
@@ -16,18 +15,20 @@ interface TagObject {
 export class ResourcePropertiesCollector implements OpenAPIVisitor {
     private tags: Map<string, TagObject>;
     private tagsOrder = new Map<string, number>();
+    protected resourceParser: IResourceParser = new DefaultResourceParser()
 
     constructor() {
         this.tags = new Map<string, TagObject>()
     }
 
     get iNodeProperty(): INodeProperties {
         const tags = this.sortedTags
+        const parser = this.resourceParser
         const options = tags.map((tag) => {
             return {
-                name: lodash.startCase(tag.name),
-                value: toResourceName(tag.name),
-                description: tag.description,
+                name: parser.name(tag),
+                value: parser.value(tag),
+                description: parser.description(tag),
             };
         });
         return {