Lint fixes 💄

Author: Deadarius

src/DefinitionGenerator.ts

@@ -1,9 +1,10 @@
+import { JSONSchema7 } from 'json-schema';
 // tslint:disable-next-line no-submodule-imports
 import { validateSync as openApiValidatorSync } from 'swagger2openapi/validate';
 import * as uuid from 'uuid';
+
 import { IDefinition, IDefinitionConfig, IOperation, IParameterConfig, IServerlessFunctionConfig } from './types';
 import { clone, isIterable, merge, omit } from './utils';
-import { JSONSchema7 } from 'json-schema';
 
 export class DefinitionGenerator {
   // The OpenAPI version we currently validate against
@@ -51,38 +52,20 @@ export class DefinitionGenerator {
 
         for (const definitionName of Object.keys(model.schema.definitions || {})) {
           const definition = model.schema.definitions[definitionName];
-          if(typeof definition !== 'boolean'){
-            this.definition.components.schemas[definitionName] = this.cleanSchema(this.updateReferences(definition))
+          if (typeof definition !== 'boolean') {
+            this.definition.components.schemas[definitionName] = this.cleanSchema(this.updateReferences(definition));
           }
         }
 
         const schemaWithoutDefinitions = omit(model.schema, ['definitions']);
 
-        this.definition.components.schemas[model.name] = this.cleanSchema(this.updateReferences(schemaWithoutDefinitions))
+        this.definition.components.schemas[model.name] = this.cleanSchema(this.updateReferences(schemaWithoutDefinitions));
       }
     }
 
     return this;
   }
 
-  private updateReferences(schema: JSONSchema7): JSONSchema7 {
-    const cloned = clone(schema) as JSONSchema7;
-
-    if(cloned.$ref) {
-      cloned.$ref = cloned.$ref.replace('#/definitions', '#/components/schemas');
-    } else {
-      for(const key of Object.getOwnPropertyNames(cloned)) {
-        const value = cloned[key];
-
-        if (typeof value === 'object') {
-          cloned[key] = this.updateReferences(value);
-        }
-      }
-    }
-
-    return cloned;
-  }
-
   public validate (): { valid: boolean, context: string[], warnings: any[], error?: any[] } {
     const payload: any = {};
 
@@ -141,6 +124,28 @@ export class DefinitionGenerator {
     return cleanedSchema;
   }
 
+  /**
+   * Walks through the schema object recursively and updates references to point to openapi's components
+   * @param schema JSON Schema Object
+   */
+  private updateReferences (schema: JSONSchema7): JSONSchema7 {
+    const cloned = clone(schema) as JSONSchema7;
+
+    if (cloned.$ref) {
+      cloned.$ref = cloned.$ref.replace('#/definitions', '#/components/schemas');
+    } else {
+      for (const key of Object.getOwnPropertyNames(cloned)) {
+        const value = cloned[key];
+
+        if (typeof value === 'object') {
+          cloned[key] = this.updateReferences(value);
+        }
+      }
+    }
+
+    return cloned;
+  }
+
   /**
    * Generate Operation objects from the Serverless Config.
    *

src/utils.ts

@@ -11,10 +11,10 @@ export function isIterable (obj) {
   return typeof obj[Symbol.iterator] === 'function';
 }
 
-export function omit<T extends Object> (obj: T, keys: string[]): T {
+export function omit<T extends object> (obj: T, keys: string[]): T {
   const cloned = clone(obj);
 
-  for(const key of keys) {
+  for (const key of keys) {
     delete cloned[key];
   }