Merge pull request #1 from temando/uplift

Uplift

Author: nfour

.gitignore

@@ -1,7 +1,7 @@
 node_modules
 /npm-*
-/dist
-
+/build
+.coverage
 .directory
 .DS_STORE*
 *.log

.npmignore

@@ -0,0 +1,6 @@
+**/__tests__/**
+.*
+tslint.json
+tsconfig.json
+jest.config.js
+yarn.lock

.travis.yml

@@ -0,0 +1,21 @@
+language: node_js
+node_js: ["6"]
+
+before_install:
+  - echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" > .npmrc
+
+install:
+  - yarn install
+
+script:
+  - yarn lint
+  - yarn build
+  - yarn test:build
+  - DEBUG=true yarn test:coverage
+
+deploy:
+  provider: script
+  script:
+    - npm run release
+  on:
+    tags: true

.jestrc renamed to jest.config.js

@@ -1,10 +1,12 @@
-{
+module.exports = {
   "verbose": true,
   "transform": { ".(ts|tsx)": "<rootDir>/node_modules/ts-jest/preprocessor.js" },
   "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
   "moduleFileExtensions": [ "ts", "tsx", "js" ],
+  "coverageDirectory": ".coverage",
   "testPathIgnorePatterns": [
     "/node_modules/",
+    "/build/",
     "d.ts"
   ]
 }

package.json

@@ -2,50 +2,45 @@
   "name": "serverless-openapi-documentation",
   "version": "0.0.0",
   "description": "Serverless 1.0 plugin to generate OpenAPI V3 documentation from serverless configuration",
-  "main": "dist/index.js",
+  "main": "index.js",
   "author": "Abilio Henrique <[email protected]>",
-  "license": "MIT",
-  "files": [
-    "dist"
+  "contributors": [
+    "Abilio Henrique <[email protected]>",
+    "nfour <[email protected]>"
   ],
+  "license": "MIT",
   "scripts": {
-    "test": "yarn test:unit",
-    "test:unit": "jest -i --config .jestrc",
-    "lint": "eslint src",
-    "test:watch": "jest --config .jestrc -i -t '/[^/.]+\\.test' --watch",
-    "release:npm": "cd dist && npm publish",
-    "docs": "typedoc --out ./dist/docs --target es6 --readme README.md",
-    "build": "node scripts/package"
+    "test": "jest",
+    "test:build": "jest -c '{}' build",
+    "test:coverage": "jest --coverage",
+    "lint": "tslint 'src/**/*.ts'",
+    "release": "cd build && npm publish",
+    "build": "scripts/build.bash"
   },
   "devDependencies": {
-    "@types/jest": "^19.2.2",
-    "@types/node": "^7.0.12",
-    "@types/typescript": "^2.0.0",
-    "eslint": "^3.19.0",
-    "eslint-config-airbnb-base": "^11.1.3",
-    "eslint-plugin-import": "^2.2.0",
-    "jest": "^19.0.2",
-    "serverless": "^1.11.0",
-    "ts-jest": "^19.0.8",
-    "ts-node": "^3.0.2",
-    "tslint": "^5.1.0",
-    "tslint-eslint-rules": "^4.0.0",
-    "typedoc": "^0.5.10",
-    "typescript": "^2.2.2"
+    "@types/chalk": "^0.4.31",
+    "@types/fs-extra": "^3.0.3",
+    "@types/jest": "^20.0.2",
+    "@types/js-yaml": "^3.5.31",
+    "@types/node": "^8.0.7",
+    "@types/uuid": "^3.0.0",
+    "jest": "^20.0.4",
+    "serverless": "^1.16.1",
+    "ts-jest": "^20.0.6",
+    "ts-node": "^3.1.0",
+    "tslint": "^5.4.3",
+    "tslint-config-temando": "^1.1.4",
+    "typescript": "^2.4.1"
   },
   "dependencies": {
-    "@jdw/jst": "^1.0.0-beta.10",
-    "@types/bluebird": "^3.5.2",
-    "@types/chalk": "^0.4.31",
-    "@types/fs-promise": "^1.0.3",
-    "@types/js-yaml": "^3.5.29",
-    "@types/uuid": "^2.0.29",
+    "@jdw/jst": "^1.0.0",
+    "@types/bluebird": "^3.5.8",
     "bluebird": "^3.5.0",
-    "chalk": "^1.1.3",
-    "fs-promise": "^2.0.2",
-    "js-yaml": "^3.8.3",
-    "lutils": "^1.2.5",
-    "swagger2openapi": "^2.0.3",
-    "uuid": "^3.0.1"
+    "chalk": "^2.0.1",
+    "fs-extra": "^3.0.1",
+    "js-yaml": "^3.8.4",
+    "lutils": "^2.4.0",
+    "swagger2openapi": "^2.5.0",
+    "uuid": "^3.1.0"
   }
 }

scripts/build.bash

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# Clean
+rm -rf build
+mkdir build
+
+# Copy latent, belonging to the index module
+rsync -am . ./build  --exclude '*/*' --include '*' 
+
+# Copy latent files from source, recursively
+rsync -am  ./src/* ./build --exclude '*.ts'
+
+# Build typescript
+yarn tsc

scripts/package.js

@@ -6,7 +6,7 @@ import * as uuid from 'uuid';
 import { IParameterConfig, IServerlessFunctionConfig, IServiceDescription } from './types';
 import { clone, merge } from './utils';
 
-export default class DocumentGenerator {
+export class DocumentGenerator {
   // The OpenAPI version we currently validate against
   private openapiVersion = '3.0.0-RC1';
 
@@ -28,7 +28,7 @@ export default class DocumentGenerator {
    * Constructor
    * @param serviceDescriptor IServiceDescription
    */
-  constructor(serviceDescriptor: IServiceDescription) {
+  constructor (serviceDescriptor: IServiceDescription) {
     this.serviceDescriptor = clone(serviceDescriptor);
 
     merge(this.config, {
@@ -51,7 +51,7 @@ export default class DocumentGenerator {
     }
   }
 
-  public generate() {
+  public generate () {
     const result: any = {};
     process.stdout.write(`${ c.bold.yellow('[VALIDATION]') } Validating OpenAPI generated output\n`);
     try {
@@ -71,7 +71,7 @@ export default class DocumentGenerator {
    * Add Paths to OpenAPI Configuration from Serverless function documentation
    * @param config Add
    */
-  public addPathsFromFunctionConfig(config: IServerlessFunctionConfig[]): void {
+  public addPathsFromFunctionConfig (config: IServerlessFunctionConfig[]): void {
     // loop through function configurations
     for (const funcConfig of config) {
       // loop through http events
@@ -103,7 +103,7 @@ export default class DocumentGenerator {
    * Cleans schema objects to make them OpenAPI compatible
    * @param schema JSON Schema Object
    */
-  private cleanSchema(schema) {
+  private cleanSchema (schema) {
     // Clone the schema for manipulation
     const cleanedSchema = clone(schema);
 
@@ -120,7 +120,7 @@ export default class DocumentGenerator {
    * Derives Path, Query and Request header parameters from Serverless documentation
    * @param documentationConfig
    */
-  private getParametersFromConfig(documentationConfig): IParameterConfig[] {
+  private getParametersFromConfig (documentationConfig): IParameterConfig[] {
     const parameters: IParameterConfig[] = [];
 
     // Build up parameters from configuration for each parameter type
@@ -164,11 +164,10 @@ export default class DocumentGenerator {
 
         if ('style' in parameter) {
           parameterConfig.style = parameter.style;
-          if (parameter.explode) {
-            parameterConfig.explode = parameter.explode;
-          } else {
-            parameterConfig.explode = parameter.explode || (parameter.style === 'form' ? true : false);
-          }
+
+          parameterConfig.explode = parameter.explode
+            ? parameter.explode
+            : parameter.style === 'form';
         }
 
         // console.log(parameter);
@@ -194,7 +193,7 @@ export default class DocumentGenerator {
    * Derives request body schemas from event documentation configuration
    * @param documentationConfig
    */
-  private getRequestBodiesFromConfig(documentationConfig) {
+  private getRequestBodiesFromConfig (documentationConfig) {
     const requestBodies = {};
 
     // Does this event have a request model?
@@ -242,7 +241,7 @@ export default class DocumentGenerator {
    * Gets response bodies from documentation config
    * @param documentationConfig
    */
-  private getResponsesFromConfig(documentationConfig) {
+  private getResponsesFromConfig (documentationConfig) {
     const responses = {};
     if (documentationConfig.methodResponses) {
       for (const response of documentationConfig.methodResponses) {
@@ -269,14 +268,14 @@ export default class DocumentGenerator {
 
         merge(responses, {
           [response.statusCode]: methodResponseConfig,
-         });
+        });
       }
     }
 
     return responses;
   }
 
-  private getResponseContent(response) {
+  private getResponseContent (response) {
     const content = {};
     for (const responseKey of Object.keys(response)) {
       const responseModel = this.serviceDescriptor.models.filter(
@@ -300,7 +299,7 @@ export default class DocumentGenerator {
     return content;
   }
 
-  private getHttpEvents(funcConfig) {
+  private getHttpEvents (funcConfig) {
     return funcConfig.filter((event) => event.http ? true : false);
   }
 }