Parsers

Author: devlikepro

ResourceParser.ts

@@ -1,6 +1,5 @@
 import {OpenAPIV3} from "openapi-types";
 import * as lodash from "lodash";
-import {toResourceName} from "./src/n8n/utils";
 
 export interface IResourceParser {
     name(tag: OpenAPIV3.TagObject): string
@@ -16,9 +15,7 @@ export class DefaultResourceParser {
     }
 
     value(tag: Pick<OpenAPIV3.TagObject, "name">): string {
-        // TODO: use startCase by default
-        return toResourceName(tag.name)
-        // return lodash.startCase(tag.name);
+        return lodash.startCase(tag.name)
     }
 
     description(tag: OpenAPIV3.TagObject): string {

src/N8NPropertiesBuilder.spec.ts

@@ -5,6 +5,7 @@ import {OpenAPIV3} from "openapi-types";
 import {OperationContext} from "./openapi/OpenAPIVisitor";
 import * as lodash from "lodash";
 import {DefaultOperationParser} from "./OperationParser";
+import {DefaultResourceParser} from "../ResourceParser";
 
 export class CustomOperationParser extends DefaultOperationParser {
     name(operation: OpenAPIV3.OperationObject, context: OperationContext): string {
@@ -28,6 +29,12 @@ export class CustomOperationParser extends DefaultOperationParser {
     }
 }
 
+export class CustomResourceParser extends DefaultResourceParser {
+    value(tag: OpenAPIV3.TagObject): string {
+        return lodash.startCase(tag.name.replace(/[^a-zA-Z0-9_-]/g, ''));
+    }
+}
+
 test('query param', () => {
     const paths = {
         '/api/entities': {
@@ -51,7 +58,10 @@ test('query param', () => {
         },
     };
 
-    const parser = new N8NPropertiesBuilder({paths}, {operation: new CustomOperationParser()});
+    const parser = new N8NPropertiesBuilder({paths}, {
+        operation: new CustomOperationParser(),
+        resource: new CustomResourceParser(),
+    });
     const result = parser.build()
 
     expect(result).toEqual([
@@ -159,7 +169,8 @@ test('path param', () => {
 
     const parser = new N8NPropertiesBuilder({paths}, {
         OperationsCollector: BaseOperationsCollector,
-        operation: new CustomOperationParser()
+        operation: new CustomOperationParser(),
+        resource: new CustomResourceParser(),
     });
     const result = parser.build()
     expect(result).toEqual([
@@ -277,7 +288,8 @@ test('request body', () => {
 
     const parser = new N8NPropertiesBuilder({paths, components}, {
         OperationsCollector: BaseOperationsCollector,
-        operation: new CustomOperationParser()
+        operation: new CustomOperationParser(),
+        resource: new CustomResourceParser(),
     });
     const result = parser.build()
 
@@ -419,7 +431,8 @@ test('enum schema', () => {
     // @ts-ignore
     const parser = new N8NPropertiesBuilder({paths}, {
         OperationsCollector: BaseOperationsCollector,
-        operation: new CustomOperationParser()
+        operation: new CustomOperationParser(),
+        resource: new CustomResourceParser(),
     });
     const result = parser.build()
 
@@ -524,7 +537,8 @@ test('body "array" param', () => {
 
     const parser = new N8NPropertiesBuilder({paths}, {
         OperationsCollector: BaseOperationsCollector,
-        operation: new CustomOperationParser()
+        operation: new CustomOperationParser(),
+        resource: new CustomResourceParser(),
     });
     const result = parser.build()
 
@@ -670,7 +684,8 @@ test('test overrides', () => {
 
     const parser = new N8NPropertiesBuilder({paths, components}, {
         OperationsCollector: BaseOperationsCollector,
-        operation: new CustomOperationParser()
+        operation: new CustomOperationParser(),
+        resource: new CustomResourceParser(),
     });
     const result = parser.build(customDefaults)
 
@@ -809,7 +824,8 @@ test('multiple tags', () => {
     };
 
     const parser = new N8NPropertiesBuilder({paths}, {
-        operation: new CustomOperationParser()
+        operation: new CustomOperationParser(),
+        resource: new CustomResourceParser(),
     })
     const result = parser.build()
 
@@ -1004,7 +1020,8 @@ test('no tags - default tag', () => {
     };
 
     const parser = new N8NPropertiesBuilder({paths}, {
-        operation: new CustomOperationParser()
+        operation: new CustomOperationParser(),
+        resource: new CustomResourceParser(),
     });
     const result = parser.build()
 

src/n8n/utils.ts

@@ -1,14 +1,3 @@
-import * as lodash from "lodash";
-
-/**
- * Convert a string to a resource name
- * @param name
- */
-export function toResourceName(name: string) {
-    // keep only ascii, no emojis
-    return lodash.startCase(name.replace(/[^a-zA-Z0-9_-]/g, ''));
-}
-
 /**
  * /api/entities/{entity} => /api/entities/{{$parameter["entity"]}}
  */

tests/waha.spec.ts

@@ -4,6 +4,7 @@ import {OpenAPIV3} from "openapi-types";
 import {OperationContext} from "../src/openapi/OpenAPIVisitor";
 import {DefaultOperationParser} from "../src/OperationParser";
 import * as lodash from "lodash";
+import {DefaultResourceParser} from "../ResourceParser";
 
 function sessionFirst(a: any, b: any) {
     if (a.name === 'session') {
@@ -15,6 +16,12 @@ function sessionFirst(a: any, b: any) {
     return 0;
 }
 
+export class WAHAResourceParser extends DefaultResourceParser {
+    value(tag: OpenAPIV3.TagObject): string {
+        return lodash.startCase(tag.name.replace(/[^a-zA-Z0-9_-]/g, ''));
+    }
+}
+
 export class WAHAOperationParser extends DefaultOperationParser {
     name(operation: OpenAPIV3.OperationObject, context: OperationContext): string {
         let operationId: string = operation.operationId!!.split('_').slice(1).join('_');
@@ -50,6 +57,7 @@ test('waha.json', () => {
     const config: N8NPropertiesBuilderConfig = {
         OperationsCollector: WAHAOperationsCollector,
         operation: new WAHAOperationParser(),
+        resource: new WAHAResourceParser(),
     }
     const parser = new N8NPropertiesBuilder(doc, config);
     const result = parser.build()