Better cleanup of service and operation names

Author: ferdikoomen

src/openApi/v2/parser/getOperationName.spec.ts

@@ -9,5 +9,10 @@ describe('getOperationName', () => {
         expect(getOperationName('foo-bar')).toEqual('fooBar');
         expect(getOperationName('foo_bar')).toEqual('fooBar');
         expect(getOperationName('foo.bar')).toEqual('fooBar');
+        expect(getOperationName('@foo.bar')).toEqual('fooBar');
+        expect(getOperationName('$foo.bar')).toEqual('fooBar');
+        expect(getOperationName('_foo.bar')).toEqual('fooBar');
+        expect(getOperationName('-foo.bar')).toEqual('fooBar');
+        expect(getOperationName('123.foo.bar')).toEqual('fooBar');
     });
 });

src/openApi/v2/parser/getOperationName.ts

@@ -6,6 +6,9 @@ import camelCase from 'camelcase';
  * the most popular Javascript and Typescript writing style.
  */
 export function getOperationName(value: string): string {
-    const clean = value.replace(/[^\w\s\-]+/g, '-').trim();
+    const clean = value
+        .replace(/^[^a-zA-Z]+/g, '')
+        .replace(/[^\w\-]+/g, '-')
+        .trim();
     return camelCase(clean);
 }

src/openApi/v2/parser/getOperationParameterName.spec.ts

@@ -5,9 +5,12 @@ describe('getOperationParameterName', () => {
         expect(getOperationParameterName('')).toEqual('');
         expect(getOperationParameterName('foobar')).toEqual('foobar');
         expect(getOperationParameterName('fooBar')).toEqual('fooBar');
-        expect(getOperationParameterName('foo-bar')).toEqual('fooBar');
         expect(getOperationParameterName('foo_bar')).toEqual('fooBar');
+        expect(getOperationParameterName('foo-bar')).toEqual('fooBar');
         expect(getOperationParameterName('foo.bar')).toEqual('fooBar');
+        expect(getOperationParameterName('@foo.bar')).toEqual('fooBar');
+        expect(getOperationParameterName('$foo.bar')).toEqual('fooBar');
+        expect(getOperationParameterName('123.foo.bar')).toEqual('fooBar');
         expect(getOperationParameterName('Foo-Bar')).toEqual('fooBar');
         expect(getOperationParameterName('FOO-BAR')).toEqual('fooBar');
     });

src/openApi/v2/parser/getOperationParameterName.ts

@@ -5,6 +5,9 @@ import camelCase from 'camelcase';
  * For example: 'filter.someProperty' becomes 'filterSomeProperty'.
  */
 export function getOperationParameterName(value: string): string {
-    const clean = value.replace(/[^\w\s\-]+/g, '-').trim();
+    const clean = value
+        .replace(/^[^a-zA-Z]+/g, '')
+        .replace(/[^\w\-]+/g, '-')
+        .trim();
     return camelCase(clean);
 }

src/openApi/v2/parser/getServiceClassName.spec.ts

@@ -9,5 +9,8 @@ describe('getServiceClassName', () => {
         expect(getServiceClassName('FooBarService')).toEqual('FooBarService');
         expect(getServiceClassName('Foo Bar Service')).toEqual('FooBarService');
         expect(getServiceClassName('foo bar service')).toEqual('FooBarService');
+        expect(getServiceClassName('@fooBar')).toEqual('FooBarService');
+        expect(getServiceClassName('$fooBar')).toEqual('FooBarService');
+        expect(getServiceClassName('123fooBar')).toEqual('FooBarService');
     });
 });

src/openApi/v2/parser/getServiceClassName.ts

@@ -5,7 +5,10 @@ import camelCase from 'camelcase';
  * the input string to PascalCase and appends the "Service" prefix if needed.
  */
 export function getServiceClassName(value: string): string {
-    const clean = value.replace(/[^\w\s\-]+/g, '-').trim();
+    const clean = value
+        .replace(/^[^a-zA-Z]+/g, '')
+        .replace(/[^\w\-]+/g, '-')
+        .trim();
     const name = camelCase(clean, { pascalCase: true });
     if (name && !name.endsWith('Service')) {
         return `${name}Service`;

src/openApi/v3/parser/getOperationName.spec.ts

@@ -9,5 +9,10 @@ describe('getOperationName', () => {
         expect(getOperationName('foo-bar')).toEqual('fooBar');
         expect(getOperationName('foo_bar')).toEqual('fooBar');
         expect(getOperationName('foo.bar')).toEqual('fooBar');
+        expect(getOperationName('@foo.bar')).toEqual('fooBar');
+        expect(getOperationName('$foo.bar')).toEqual('fooBar');
+        expect(getOperationName('_foo.bar')).toEqual('fooBar');
+        expect(getOperationName('-foo.bar')).toEqual('fooBar');
+        expect(getOperationName('123.foo.bar')).toEqual('fooBar');
     });
 });

src/openApi/v3/parser/getOperationName.ts

@@ -6,6 +6,9 @@ import camelCase from 'camelcase';
  * the most popular Javascript and Typescript writing style.
  */
 export function getOperationName(value: string): string {
-    const clean = value.replace(/[^\w\s\-]+/g, '-').trim();
+    const clean = value
+        .replace(/^[^a-zA-Z]+/g, '')
+        .replace(/[^\w\-]+/g, '-')
+        .trim();
     return camelCase(clean);
 }

src/openApi/v3/parser/getOperationParameterName.spec.ts

@@ -5,9 +5,12 @@ describe('getOperationParameterName', () => {
         expect(getOperationParameterName('')).toEqual('');
         expect(getOperationParameterName('foobar')).toEqual('foobar');
         expect(getOperationParameterName('fooBar')).toEqual('fooBar');
-        expect(getOperationParameterName('foo-bar')).toEqual('fooBar');
         expect(getOperationParameterName('foo_bar')).toEqual('fooBar');
+        expect(getOperationParameterName('foo-bar')).toEqual('fooBar');
         expect(getOperationParameterName('foo.bar')).toEqual('fooBar');
+        expect(getOperationParameterName('@foo.bar')).toEqual('fooBar');
+        expect(getOperationParameterName('$foo.bar')).toEqual('fooBar');
+        expect(getOperationParameterName('123.foo.bar')).toEqual('fooBar');
         expect(getOperationParameterName('Foo-Bar')).toEqual('fooBar');
         expect(getOperationParameterName('FOO-BAR')).toEqual('fooBar');
     });

src/openApi/v3/parser/getOperationParameterName.ts

@@ -5,6 +5,9 @@ import camelCase from 'camelcase';
  * For example: 'filter.someProperty' becomes 'filterSomeProperty'.
  */
 export function getOperationParameterName(value: string): string {
-    const clean = value.replace(/[^\w\s\-]+/g, '-').trim();
+    const clean = value
+        .replace(/^[^a-zA-Z]+/g, '')
+        .replace(/[^\w\-]+/g, '-')
+        .trim();
     return camelCase(clean);
 }