Merge branch 'master' of github.com:mtseluiko/OpenAPI

Author: lenchvolodymyr

forward_engineering/helpers/typeHelper.js

@@ -71,6 +71,7 @@ function getTypeProps(data, key) {
 function getRef({ $ref: ref }) {
 	if (ref.startsWith('#')) {
 		ref = ref.replace('#model/definitions', '#/components');
+
 		return { $ref: prepareReferenceName(ref) };
 	}
 

reverse_engineering/api.js

@@ -62,7 +62,11 @@ module.exports = {
         } catch(e) {
             callback(commonHelper.handleErrorObject(e, 'Adapt JSON Schema'), data);
         }
-    }
+    },
+
+	resolveExternalDefinitionPath(data, logger, callback) {
+		resolveExternalDefinitionPathHelper.resolvePath(data, callback);
+	}
 };
 
 const convertOpenAPISchemaToHackolade = (openAPISchema, fieldOrder) => {
@@ -75,7 +79,7 @@ const convertOpenAPISchemaToHackolade = (openAPISchema, fieldOrder) => {
 };
 
 const getOpenAPISchema = (data, filePath) => new Promise((resolve, reject) => {
-    const { extension, fileName } = commonHelper.getPathData(filePath);
+    const { extension, fileName } = commonHelper.getPathData(data, filePath);
 
     try {
         const openAPISchemaWithModelName = dataHelper.getOpenAPIJsonSchema(data, fileName, extension);

reverse_engineering/helpers/commonHelper.js

@@ -6,6 +6,7 @@ const yaml = require('js-yaml');
 const errorHelper = require('./errorHelper');
 
 const CHOICES = ['allOf', 'oneOf', 'anyOf', 'not'];
+const ALLOWED_EXTENSIONS = ['.json', '.yaml'];
 
 const getFileData = (filePath) => new Promise((resolve, reject) => {
     fs.readFile(filePath, 'utf-8', (error, content) => {
@@ -17,10 +18,43 @@ const getFileData = (filePath) => new Promise((resolve, reject) => {
     });
 });
 
-const getPathData = (filePath) => {
+const isJson = data => {
+	try {
+		JSON.parse(data);
+
+		return true;
+	} catch (err) {
+		return false;
+	}
+};
+
+const isYaml = data => {
+	try {
+		yaml.load(data);
+
+		return true;
+	} catch (err) {
+		return false;
+	}
+};
+
+const getPathData = (data, filePath) => {
     const extension = path.extname(filePath);
     const fileName = path.basename(filePath, extension);
-    return {extension, fileName };
+
+	if (ALLOWED_EXTENSIONS.includes(extension)) {
+		return { extension, fileName };
+	}
+
+	if (isJson(data)) {
+		return { extension: '.json', fileName };
+	}
+
+	if (isYaml(data)) {
+		return { extension: '.yaml', fileName };
+	}
+
+	return { extension, fileName };
 };
 
 const handleErrorObject = (error, title) => {