Merge pull request #19 from isa-group/devel

Added new features

package.json

@@ -1,6 +1,6 @@
 {
   "name": "oas-generator",
-  "version": "1.0.3",
+  "version": "2.0.1",
   "description": "OAS code generator",
   "main": "src/index.js",
   "scripts": {

specs/adafruitCom-2.0.0-swagger.yaml

@@ -2,6 +2,7 @@ openapi: 3.0.0
 servers:
   - url: 'https://io.adafruit.com/api/v2'
   - url: 'http://io.adafruit.com/api/v2'
+  - url: 'http://localhost:8080/api/v2'
 info:
   description: >+
     ### The Internet of Things for Everyone

specs/api-with-examples.yaml

@@ -1,4 +1,6 @@
 openapi: "3.0.0"
+servers:
+  - url: 'http://localhost:8080/'
 info:
   title: Simple API overview
   version: v2

specs/bbc_com1_0_0.yaml

@@ -2,6 +2,7 @@ openapi: 3.0.0
 servers:
   - url: 'http://programmes.api.bbc.com/nitro/api'
   - url: 'https://programmes.api.bbc.com/nitro/api'
+  - url: 'http://localhost:8080/nitro/api'
 info:
   contact:
     email: [email protected]

specs/callback-example.yaml

@@ -1,4 +1,6 @@
 openapi: 3.0.0
+servers:
+  - url: 'http://localhost:8080/'
 info:
   title: Callback Example
   version: 1.0.0

specs/cisco.yaml

@@ -1,6 +1,7 @@
 openapi: 3.0.0
 servers:
   - url: 'https://api.cisco.com/'
+  - url: 'http://localhost:8080/'
 info:
   contact:
     email: [email protected]

specs/complexPaths.yaml

@@ -1,4 +1,6 @@
 openapi: "3.0.0"
+servers:
+  - url: 'http://localhost:8080/'
 info:
   version: 1.0.0
   title: Pets API -> Valid OASdoc

specs/docker-engine.yaml

@@ -2,6 +2,7 @@ openapi: 3.0.0
 servers:
   - url: 'http://docker.local/v1.33'
   - url: 'https://docker.local/v1.33'
+  - url: 'http://localhost:8080/v.33'
 info:
   description: >
     The Engine API is an HTTP API served by Docker Engine. It is the API the

specs/github.yaml

@@ -1,6 +1,7 @@
 openapi: 3.0.0
 servers:
   - url: 'https://api.github.com/'
+  - url: 'http://localhost:8080/'
 x-hasEquivalentPaths: true
 info:
   description: >

specs/link-example.yaml

@@ -1,4 +1,6 @@
 openapi: 3.0.0
+servers:
+  - url: 'http://localhost:8080/'
 info:
   title: Link Example
   version: 1.0.0

specs/oai-spec-pets.json

@@ -1,5 +1,10 @@
 {
   "openapi": "3.0.0",
+  "servers": [
+    {
+      "url": "http://localhost:8080/"
+    }
+  ],
   "info": {
     "version": "1.0.0",
     "title": "Valid-OASdoc",

specs/oai-spec-pets.yaml

@@ -1,4 +1,6 @@
 openapi: "3.0.0"
+servers:
+  - url: 'http://localhost:8080/'
 info:
   version: 1.0.0
   title: Pets API -> Valid OASdoc

specs/oai-spec-sosElections.yaml

@@ -1,5 +1,6 @@
 openapi: 3.0.0
-servers: []
+servers:
+  - url: 'http://localhost:8080/'
 info:
   description: Sos API contains information about Spain's 2016 general elections results.
   contact:

specs/oai-spec-talkVotes.yaml

@@ -1,6 +1,6 @@
 openapi: 3.0.0
 servers:
-  - url: /api/v1
+  - url: http://localhost:8080/api/v1
 info:
   description: API for managing votes on talks
   version: 1.0.0

specs/openapi.json

@@ -6,6 +6,9 @@
         },
         {
             "url": "http://openapi-converter.herokuapp.com/api/v1"
+        },
+        {
+            "url": "http://localhost:8080/api/v1"
         }
     ],
     "info": {
@@ -24,7 +27,7 @@
         "termsOfService": "https://opensource.org/licenses/MIT"
     },
     "externalDocs": {
-        "uri": "https://github.com/mermade/openapi-webconverter",
+        "uri": "https://github.com/mermade/openapi-webconverter"
     },
     "security": [],
     "tags": [

specs/petstore-expanded.json

@@ -3,6 +3,9 @@
   "servers": [
     {
       "url": "http://petstore.swagger.io/api"
+    },
+    {
+      "url": "http://localhost:8080/api"
     }
   ],
   "info": {

specs/petstore-expanded.yaml

@@ -13,6 +13,7 @@ info:
     url: https://www.apache.org/licenses/LICENSE-2.0.html
 servers:
   - url: http://petstore.swagger.io/api
+  - url: http://localhost:8080/api
 paths:
   /pets:
     get:

specs/petstore-with-external-docs.yaml

@@ -1,6 +1,7 @@
 openapi: 3.0.0
 servers:
   - url: 'http://petstore.swagger.io/api'
+  - url: 'http://localhost:8080/api'
 info:
   version: 1.0.0
   title: Swagger Petstore

specs/petstore-with-external-docsERROR.yaml

@@ -1,6 +1,7 @@
 openapi: 3.0.0
 servers:
   - url: 'http://petstore.swagger.io/api'
+  - url: 'http://localhost:8080/api'
 info:
   version: 1.0.0
   title: Swagger Petstore

specs/slack.yaml

@@ -1,6 +1,7 @@
 openapi: 3.0.0
 servers:
   - url: 'https://slack.com/api'
+  - url: 'http://localhost:8080/api'
 info:
   description: >-
     One way to interact with the Slack platform is its HTTP RPC-based Web API, a

specs/spotify.yaml

@@ -1,6 +1,7 @@
 openapi: 3.0.0
 servers:
   - url: 'https://api.spotify.com/v1'
+  - url: 'http://localhost:8080/v1'
 info:
   title: Spotify
   version: v1

specs/twitter.yaml

@@ -1,6 +1,7 @@
 openapi: 3.0.0
 servers:
   - url: 'https://api.twitter.com/1.1'
+  - url: 'http://localhost:8080/1.1'
 info:
   contact:
     email: [email protected]

specs/uber.yaml

@@ -1,6 +1,7 @@
 openapi: 3.0.0
 servers:
   - url: 'https://api.uber.com/v1'
+  - url: 'http://localhost:8080/v1'
 info:
   title: Uber API
   description: Move your app forward with the Uber API

specs/uspto.yaml

@@ -8,6 +8,7 @@ servers:
           - 'https'
           - 'http'
         default: 'https'
+  - url: 'http://localhost:8080/ds-api'
 info:
   description: >-
     The Data Set API (DSAPI) allows the public users to discover and search

src/auxiliary/index.js

@@ -20,7 +20,8 @@ var options_object = {
   loglevel: 'info',
   strict: false,
   router: true,
-  validator: true
+  validator: true,
+  docs: true
 };
 
 oasTools.configure(options_object);
@@ -29,6 +30,10 @@ oasTools.initialize(oasDoc, app, function() {
   http.createServer(app).listen(serverPort, function() {
     console.log("App running at http://localhost:" + serverPort);
     console.log("________________________________________________________________");
+    if (options_object.docs !== false) {
+      console.log('API docs (Swagger UI) available on http://localhost:' + serverPort + '/docs');
+      console.log("________________________________________________________________");
+    }
   });
 });
 

src/generate.js

@@ -186,7 +186,7 @@ function generateServer(file, cmd) {
             fs.appendFileSync(process.cwd() + '/controllers/' + controllerName + "Service.js", "'use strict'\n\n");
           }
           var function_string = "module.exports." + opId + " = function " + opId + " (req, res, next) {\n" + controllerVariable + "." + opId + "(req.swagger.params, res, next);\n};\n\n";
-          var function_string_service = "module.exports." + opId + " = function " + opId + " (req, res, next) {\nres.send({message: 'This is the raw controller for " + opId + "' });\n};\n\n";
+          var function_string_service = "module.exports." + opId + " = function " + opId + " (req, res, next) {\nres.send({message: 'This is the mockup controller for " + opId + "' });\n};\n\n";
           fs.appendFileSync(process.cwd() + '/controllers/' + controllerName + ".js", function_string);
           fs.appendFileSync(process.cwd() + '/controllers/' + controllerName + "Service.js", function_string_service);
         }