Merge pull request #26 from smollweide/develop

v0.12.0
smollweide · Apr 9, 2017 · af4a57c · af4a57c
2 parents 9217e91 + 601e3e6
commit af4a57c
Show file tree

Hide file tree

Showing 173 changed files with 4,282 additions and 5,773 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1,7 @@
+/.idea/
+/node_modules/
+/test/
+/src/libraries/
+/src/swagger/
+/src/templates/
+/demo/
diff --git a/.eslintrc b/.eslintrc
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -0,0 +1,9 @@
+module.exports = {
+	"extends": "@namics/eslint-config/configurations/es5-node.js",
+	"rules": {
+		"complexity": 0,
+		"valid-jsdoc": 0,
+		"require-jsdoc": 0,
+		"no-useless-escape": 0,
+	},
+};
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,9 @@
 .idea
 node_modules
 /preferences.json
-/example_rest_folder/*/*/*/mock/response.txt
-rest
+/demo/rest/*/*/*/mock/response.txt
 /test/tmp
 /test/func-imported
 /tmp
 npm-debug.log
-/func-imported
+/func-imported
diff --git a/.npmignore b/.npmignore
@@ -1,18 +1,20 @@
-/example_rest_folder
-example_rest_folder
-/func
-func
-/func2
-func2
+/demo/rest
+demo/rest
+/demo/func
+demo/func
+/demo/func2
+demo/func2
 /test
 test
+/doc
+doc
 /.idea
 .idea
 /src/swagger
 src/swagger
 /tmp
 tmp
-/func-imported
-func-imported
+/demo/func-imported
+demo/func-imported
 npm-debug.log
 .eslintrc
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,4 @@
 language: node_js
 node_js:
   - "6"
-  - "5"
   - "4"
-  - "0.12"
diff --git a/app.js b/app.js
diff --git a/appveyor.yml b/appveyor.yml
@@ -3,9 +3,7 @@
 
 environment:
   matrix:
-    - nodejs_version: 0.12
     - nodejs_version: 4
-    - nodejs_version: 5
     - nodejs_version: 6
 
 version: "{build}"
@@ -24,4 +22,4 @@ install:
 test_script:
   - node --version
   - npm --version
-  - npm test
+  - npm test
diff --git a/func/price.js → demo/func/price.js b/func/price.js → demo/func/price.js
diff --git a/func2/image.js → demo/func2/image.js b/func2/image.js → demo/func2/image.js
diff --git a/demo/index.js b/demo/index.js
@@ -0,0 +1,35 @@
+
+var mockServer = require('./../mock-server.js');
+var dest = __dirname + '/rest';
+var replacePathsStr = '/v2/{baseSiteId}';
+var responseFuncPath = __dirname + '/func-imported';
+
+// http://petstore.swagger.io/v2/swagger.json
+
+mockServer({
+	restPath: dest,
+	dirName: __dirname,
+	funcPath: [
+		__dirname + '/func',
+		__dirname + '/func2',
+		responseFuncPath,
+	],
+	headers: {
+		'Global-Custom-Header': 'Global-Custom-Header',
+	},
+	customDTOToClassTemplate: __dirname + '/templates/dto_es6flow.ejs',
+	swaggerImport: {
+		protocol: 'http',
+		authUser: undefined,
+		authPass: undefined,
+		host: 'petstore.swagger.io',
+		port: 80,
+		path: '/v2/swagger.json',
+		dest: dest,
+		replacePathsStr: replacePathsStr,
+		createErrorFile: true,
+		createEmptyFile: true,
+		overwriteExistingDescriptions: true,
+		responseFuncPath: responseFuncPath,
+	},
+});
diff --git a/demo/rest/_DTO/AddressComponent.json b/demo/rest/_DTO/AddressComponent.json
@@ -0,0 +1,5 @@
+{
+	"long_name": "string",
+	"short_name": "string",
+	"types": [ "string" ]
+}
diff --git a/...older/products/#/GET/response_schema.json → demo/rest/_DTO/AddressResponseWsDTO.json b/...older/products/#/GET/response_schema.json → demo/rest/_DTO/AddressResponseWsDTO.json
diff --git a/demo/rest/_DTO/AddressWsDTO.json b/demo/rest/_DTO/AddressWsDTO.json
@@ -0,0 +1,26 @@
+{
+  "country": "$ref-CountryWsDTO",
+  "countryIsocode": "string",
+  "country2": "$ref-CountryWsDTO",
+  "email": "string",
+  "firstName": "string",
+  "id": "string",
+  "lastName": "string",
+  "line1": "string",
+  "phone": "string",
+  "postalCode": "string",
+  "streetName": "string",
+  "streetNumber": "string",
+  "title": "string",
+  "titleCode": "string",
+  "town": "string",
+  "list": [
+    {
+      "country": "$ref-CountryWsDTO",
+      "email": "string"
+    }
+  ],
+  "items": [
+    "$ref-CountryWsDTO"
+  ]
+}
diff --git a/example_rest_folder/_DTO/CardDTO.json → demo/rest/_DTO/CardDTO.json b/example_rest_folder/_DTO/CardDTO.json → demo/rest/_DTO/CardDTO.json
@@ -1,12 +1,19 @@
 {
   "name": "string",
+  "id": "number",
+  "isActive": "boolean",
   "username": "string",
   "email": "string",
   "phone": "string",
   "website": "string",
+  "card": "$ref-CardDTO",
+  "user": "$ref-UserDTO",
   "entries": [
     "$ref-CardDTO"
   ],
+  "users": [
+    "$ref-UserDTO"
+  ],
   "posts": [
     {
       "words": "string",

diff --git a/demo/rest/_DTO/ComplexDTO.json b/demo/rest/_DTO/ComplexDTO.json
@@ -0,0 +1,14 @@
+{
+  "list": [
+    {
+      "country": "$ref-CountryWsDTO",
+      "email": "string"
+    }
+  ],
+  "items": [
+    "$ref-ImageDTO"
+  ],
+  "parameters": {
+    "additional": "string"
+  }
+}
diff --git a/demo/rest/_DTO/CountryWsDTO.json b/demo/rest/_DTO/CountryWsDTO.json
@@ -0,0 +1,5 @@
+{
+  "code": "string",
+  "name": "string",
+  "value": "string"
+}
diff --git a/demo/rest/_DTO/Geocode.json b/demo/rest/_DTO/Geocode.json
@@ -0,0 +1,6 @@
+{
+	"results": [
+		"$ref-GeocodeResult"
+	],
+	"status": "string"
+}
diff --git a/demo/rest/_DTO/GeocodeResult.json b/demo/rest/_DTO/GeocodeResult.json
@@ -0,0 +1,6 @@
+{
+	"address_components": [
+		"$ref-AddressComponent"
+	],
+	"formatted_address": "string"
+}
diff --git a/example_rest_folder/_DTO/PriceDTO.json → demo/rest/_DTO/PriceDTO.json b/example_rest_folder/_DTO/PriceDTO.json → demo/rest/_DTO/PriceDTO.json
diff --git a/demo/rest/_DTO/ResponseFuncLoopDTO.json b/demo/rest/_DTO/ResponseFuncLoopDTO.json
@@ -0,0 +1,3 @@
+{
+  "funcLoop": "$ref-ResponseFuncLoopDTO"
+}
diff --git a/demo/rest/_DTO/ResponseFuncTestDTO.json b/demo/rest/_DTO/ResponseFuncTestDTO.json
@@ -0,0 +1,31 @@
+{
+  "list": [
+    {
+      "country": "$ref-CountryWsDTO",
+      "email": "string"
+    }
+  ],
+  "items": [
+    "$ref-CountryWsDTO"
+  ],
+  "image": "$ref-CountryWsDTO",
+  "exampleString": "string",
+  "exampleNumber": "number",
+  "exampleInteger": "number",
+  "name": "string",
+  "firstName": "string",
+  "lastName": "string",
+  "country": "$ref-CountryWsDTO",
+  "countryIsocode": "string",
+  "email": "string",
+  "phone": "string",
+  "postalCode": "string",
+  "streetName": "string",
+  "streetNumber": "string",
+  "title": "string",
+  "titleCode": "string",
+  "town": "string",
+  "parameters": {
+    "additional": "string"
+  }
+}
diff --git a/demo/rest/_DTO/RuleWsDTO.json b/demo/rest/_DTO/RuleWsDTO.json
@@ -0,0 +1,3 @@
+{
+  "value": "string"
+}
diff --git a/...t_folder/products/#search/GET/.store.json → demo/rest/products/#/GET/.store.json b/...t_folder/products/#search/GET/.store.json → demo/rest/products/#/GET/.store.json
@@ -2,6 +2,9 @@
   "validation": {
     "success": {
       "counter": 0
+    },
+    "success.headers": {
+      "counter": 1
     }
   }
 }
diff --git a/example_rest_folder/products/#/GET/desc.json → demo/rest/products/#/GET/desc.json b/example_rest_folder/products/#/GET/desc.json → demo/rest/products/#/GET/desc.json
diff --git a/...est_folder/products/#/GET/mock/error.json → demo/rest/products/#/GET/mock/error.json b/...est_folder/products/#/GET/mock/error.json → demo/rest/products/#/GET/mock/error.json
diff --git a/.../products/#/GET/mock/success.headers.json → .../products/#/GET/mock/success.headers.json b/.../products/#/GET/mock/success.headers.json → .../products/#/GET/mock/success.headers.json
diff --git a/...t_folder/products/#/GET/mock/success.json → demo/rest/products/#/GET/mock/success.json b/...t_folder/products/#/GET/mock/success.json → demo/rest/products/#/GET/mock/success.json
diff --git a/...folder/products/#/GET/request_schema.json → demo/rest/products/#/GET/request_schema.json b/...folder/products/#/GET/request_schema.json → demo/rest/products/#/GET/request_schema.json
diff --git a/...products/#search/GET/response_schema.json → .../rest/products/#/GET/response_schema.json b/...products/#search/GET/response_schema.json → .../rest/products/#/GET/response_schema.json
diff --git a/...le_rest_folder/products/#/GET/.store.json → demo/rest/products/#search/GET/.store.json b/...le_rest_folder/products/#/GET/.store.json → demo/rest/products/#search/GET/.store.json
diff --git a/...est_folder/products/#search/GET/desc.json → demo/rest/products/#search/GET/desc.json b/...est_folder/products/#search/GET/desc.json → demo/rest/products/#search/GET/desc.json
diff --git a/...lder/products/#search/GET/mock/error.json → ...rest/products/#search/GET/mock/error.json b/...lder/products/#search/GET/mock/error.json → ...rest/products/#search/GET/mock/error.json
diff --git a/...er/products/#search/GET/mock/success.json → ...st/products/#search/GET/mock/success.json b/...er/products/#search/GET/mock/success.json → ...st/products/#search/GET/mock/success.json
diff --git a/.../products/#search/GET/request_schema.json → .../products/#search/GET/request_schema.json b/.../products/#search/GET/request_schema.json → .../products/#search/GET/request_schema.json
diff --git a/demo/rest/products/#search/GET/response_schema.json b/demo/rest/products/#search/GET/response_schema.json
@@ -0,0 +1,3 @@
+{
+  "success": "boolean"
+}
diff --git a/...r/products/#{productCode}/GET/.store.json → ...t/products/#{productCode}/GET/.store.json b/...r/products/#{productCode}/GET/.store.json → ...t/products/#{productCode}/GET/.store.json
diff --git a/...der/products/#{productCode}/GET/desc.json → ...est/products/#{productCode}/GET/desc.json b/...der/products/#{productCode}/GET/desc.json → ...est/products/#{productCode}/GET/desc.json
diff --git a/...{productCode}/GET/mock/.request_data.json → ...{productCode}/GET/mock/.request_data.json b/...{productCode}/GET/mock/.request_data.json → ...{productCode}/GET/mock/.request_data.json
diff --git a/...roductCode}/GET/mock/deep-validation.json → ...roductCode}/GET/mock/deep-validation.json b/...roductCode}/GET/mock/deep-validation.json → ...roductCode}/GET/mock/deep-validation.json
diff --git a/...oducts/#{productCode}/GET/mock/error.json → ...oducts/#{productCode}/GET/mock/error.json b/...oducts/#{productCode}/GET/mock/error.json → ...oducts/#{productCode}/GET/mock/error.json
diff --git a/...oducts/#{productCode}/GET/mock/faker.json → ...oducts/#{productCode}/GET/mock/faker.json b/...oducts/#{productCode}/GET/mock/faker.json → ...oducts/#{productCode}/GET/mock/faker.json
diff --git a/...roducts/#{productCode}/GET/mock/func.json → ...roducts/#{productCode}/GET/mock/func.json b/...roducts/#{productCode}/GET/mock/func.json → ...roducts/#{productCode}/GET/mock/func.json
diff --git a/...#{productCode}/GET/mock/request-data.json → ...#{productCode}/GET/mock/request-data.json b/...#{productCode}/GET/mock/request-data.json → ...#{productCode}/GET/mock/request-data.json
diff --git a/...ts/#{productCode}/GET/mock/success-1.json → ...ts/#{productCode}/GET/mock/success-1.json b/...ts/#{productCode}/GET/mock/success-1.json → ...ts/#{productCode}/GET/mock/success-1.json
diff --git a/...ts/#{productCode}/GET/mock/success-2.json → ...ts/#{productCode}/GET/mock/success-2.json b/...ts/#{productCode}/GET/mock/success-2.json → ...ts/#{productCode}/GET/mock/success-2.json
diff --git a/...roductCode}/GET/mock/success-default.json → ...roductCode}/GET/mock/success-default.json b/...roductCode}/GET/mock/success-default.json → ...roductCode}/GET/mock/success-default.json
diff --git a/...ucts/#{productCode}/GET/mock/success.json → ...ucts/#{productCode}/GET/mock/success.json b/...ucts/#{productCode}/GET/mock/success.json → ...ucts/#{productCode}/GET/mock/success.json
diff --git a/...ts/#{productCode}/GET/request_schema.json → ...ts/#{productCode}/GET/request_schema.json b/...ts/#{productCode}/GET/request_schema.json → ...ts/#{productCode}/GET/request_schema.json
diff --git a/...s/#{productCode}/GET/response_schema.json → ...s/#{productCode}/GET/response_schema.json b/...s/#{productCode}/GET/response_schema.json → ...s/#{productCode}/GET/response_schema.json
diff --git a/.../products/#{productCode}/POST/.store.json → .../products/#{productCode}/POST/.store.json b/.../products/#{productCode}/POST/.store.json → .../products/#{productCode}/POST/.store.json
diff --git a/...er/products/#{productCode}/POST/desc.json → ...st/products/#{productCode}/POST/desc.json b/...er/products/#{productCode}/POST/desc.json → ...st/products/#{productCode}/POST/desc.json
diff --git a/...roductCode}/POST/mock/.success_validation → ...roductCode}/POST/mock/.success_validation b/...roductCode}/POST/mock/.success_validation → ...roductCode}/POST/mock/.success_validation
diff --git a/...ducts/#{productCode}/POST/mock/error.json → ...ducts/#{productCode}/POST/mock/error.json b/...ducts/#{productCode}/POST/mock/error.json → ...ducts/#{productCode}/POST/mock/error.json
diff --git a/...cts/#{productCode}/POST/mock/success.json → ...cts/#{productCode}/POST/mock/success.json b/...cts/#{productCode}/POST/mock/success.json → ...cts/#{productCode}/POST/mock/success.json
diff --git a/...s/#{productCode}/POST/request_schema.json → ...s/#{productCode}/POST/request_schema.json b/...s/#{productCode}/POST/request_schema.json → ...s/#{productCode}/POST/request_schema.json
diff --git a/.../#{productCode}/POST/response_schema.json → .../#{productCode}/POST/response_schema.json b/.../#{productCode}/POST/response_schema.json → .../#{productCode}/POST/response_schema.json
diff --git a/...arch.{query}.results.json/GET/.store.json → ...arch.{query}.results.json/GET/.store.json b/...arch.{query}.results.json/GET/.store.json → ...arch.{query}.results.json/GET/.store.json
diff --git a/...search.{query}.results.json/GET/desc.json → ...search.{query}.results.json/GET/desc.json b/...search.{query}.results.json/GET/desc.json → ...search.{query}.results.json/GET/desc.json
diff --git a/...ery}.results.json/GET/mock/error-401.json → ...ery}.results.json/GET/mock/error-401.json b/...ery}.results.json/GET/mock/error-401.json → ...ery}.results.json/GET/mock/error-401.json
diff --git a/....{query}.results.json/GET/mock/error.json → ....{query}.results.json/GET/mock/error.json b/....{query}.results.json/GET/mock/error.json → ....{query}.results.json/GET/mock/error.json
diff --git a/...query}.results.json/GET/mock/success.json → ...query}.results.json/GET/mock/success.json b/...query}.results.json/GET/mock/success.json → ...query}.results.json/GET/mock/success.json
diff --git a/...ery}.results.json/GET/request_schema.json → ...ery}.results.json/GET/request_schema.json b/...ery}.results.json/GET/request_schema.json → ...ery}.results.json/GET/request_schema.json
diff --git a/...ry}.results.json/GET/response_schema.json → ...ry}.results.json/GET/response_schema.json b/...ry}.results.json/GET/response_schema.json → ...ry}.results.json/GET/response_schema.json
diff --git a/...s#{productCode}#available/GET/.store.json → ...s#{productCode}#available/GET/.store.json b/...s#{productCode}#available/GET/.store.json → ...s#{productCode}#available/GET/.store.json
diff --git a/...cts#{productCode}#available/GET/desc.json → ...cts#{productCode}#available/GET/desc.json b/...cts#{productCode}#available/GET/desc.json → ...cts#{productCode}#available/GET/desc.json
diff --git a/...roductCode}#available/GET/mock/error.json → ...roductCode}#available/GET/mock/error.json b/...roductCode}#available/GET/mock/error.json → ...roductCode}#available/GET/mock/error.json
diff --git a/...ductCode}#available/GET/mock/success.json → ...ductCode}#available/GET/mock/success.json b/...ductCode}#available/GET/mock/success.json → ...ductCode}#available/GET/mock/success.json
diff --git a/...ctCode}#available/GET/request_schema.json → ...ctCode}#available/GET/request_schema.json b/...ctCode}#available/GET/request_schema.json → ...ctCode}#available/GET/request_schema.json
diff --git a/...tCode}#available/GET/response_schema.json → ...tCode}#available/GET/response_schema.json b/...tCode}#available/GET/response_schema.json → ...tCode}#available/GET/response_schema.json