Fix tests and call signatures

Author: nfour

src/DefinitionGenerator.ts

@@ -1,40 +1,28 @@
 import { dereference } from '@jdw/jst';
-import * as c from 'chalk';
 import * as openApiValidator from 'swagger2openapi/validate';
 
 import * as uuid from 'uuid';
-import { IDefinitionConfig, ILog, IParameterConfig, IServerlessFunctionConfig } from './types';
+import { IDefinition, IDefinitionConfig, IParameterConfig, IServerlessFunctionConfig } from './types';
 import { clone, merge } from './utils';
 
 export class DefinitionGenerator {
   // The OpenAPI version we currently validate against
   public version = '3.0.0-RC1';
 
   // Base configuration object
-  public definition = {
+  public definition = <IDefinition> {
     openapi: this.version,
-    description: '',
-    version: '0.0.0',
-    title: '',
-    paths: {},
-    components: {
-      schemas: {},
-    },
+    components: {},
   };
 
-  private config: IDefinitionConfig;
-  private log: ILog;
+  public config: IDefinitionConfig;
 
   /**
    * Constructor
    * @param serviceDescriptor IServiceDescription
    */
-  constructor ({ log, config }: {
-    log: ILog,
-    config: IDefinitionConfig,
-  }) {
+  constructor (config: IDefinitionConfig) {
     this.config = clone(config);
-    this.log = log;
   }
 
   public parse () {
@@ -47,7 +35,6 @@ export class DefinitionGenerator {
 
     merge(this.definition, {
       openapi: this.version,
-      servers: [],
       info: { title, description, version },
       paths: {},
       components: {

src/ServerlessOpenApiDocumentation.ts

@@ -104,10 +104,7 @@ export class ServerlessOpenApiDocumentation {
   private generate () {
     this.log(c.bold.underline('OpenAPI v3 Documentation Generator\n\n'));
     // Instantiate DocumentGenerator
-    const generator = new DefinitionGenerator({
-      config: this.customVars.documentation,
-      log: this.log,
-    });
+    const generator = new DefinitionGenerator(this.customVars.documentation);
 
     generator.parse();
 

src/types.ts

@@ -44,4 +44,12 @@ export interface IParameterConfig {
   examples?: [any];
 }
 
+// FIXME:
+export interface IDefinition {
+  openapi: string;
+  components: any;
+  info: any;
+  paths: any;
+}
+
 export type ILog = (...str: string[]) => void;