Convert names containing spaces to use underscores

Author: svnv

src/swagger-2.ts

@@ -54,6 +54,10 @@ function sanitize(name: string): string {
   return name.includes('-') ? `'${name}'` : name;
 }
 
+function spacesToUnderscores(name: string): string {
+  return name.replace(/\s/g, '_');
+}
+
 function parse(spec: Swagger2, options: Swagger2Options = {}): string {
   const shouldUseWrapper = options.wrapper !== false;
   const wrapper =
@@ -172,12 +176,12 @@ function parse(spec: Swagger2, options: Swagger2Options = {}): string {
     // Open interface
     const isExtending = includes.length ? ` extends ${includes.join(', ')}` : '';
 
-    output.push(`export interface ${shouldCamelCase ? camelCase(ID) : ID}${isExtending} {`);
+    output.push(`export interface ${shouldCamelCase ? camelCase(ID) : spacesToUnderscores(ID)}${isExtending} {`);
 
     // Populate interface
     Object.entries(allProperties).forEach(([key, value]): void => {
       const optional = !Array.isArray(required) || required.indexOf(key) === -1;
-      const formattedKey = shouldCamelCase ? camelCase(key) : key;
+      const formattedKey = shouldCamelCase ? camelCase(key) : spacesToUnderscores(key);
       const name = `${sanitize(formattedKey)}${optional ? '?' : ''}`;
       const newID = `${ID}${capitalize(formattedKey)}`;
       const interfaceType = getType(value, newID);

tests/swagger-2.test.ts

@@ -15,9 +15,9 @@ function format(
 ): string {
   return prettier.format(
     `
-    ${injectWarning ? `${warningMessage} \n` : ''} 
-    ${wrapper} { 
-      ${spec} 
+    ${injectWarning ? `${warningMessage} \n` : ''}
+    ${wrapper} {
+      ${spec}
     }
     `,
     {
@@ -384,6 +384,28 @@ describe('Swagger 2 spec', () => {
 
       expect(swaggerToTS(swagger)).toBe(ts);
     });
+
+    it('converts names with spaces to names with underscores', () => {
+      const swagger: Swagger2 = {
+        definitions: {
+          'User 1': {
+            properties: {
+              'profile image': { type: 'string' },
+              'address line 1': { type: 'string' },
+            },
+            type: 'object',
+          },
+        },
+      };
+
+      const ts = format(`
+      export interface User_1 {
+        'profile_image'?: string;
+        'address_line_1'?: string;
+      }`);
+
+      expect(swaggerToTS(swagger)).toBe(ts);
+    });
   });
 
   describe('TS features', () => {