Refactor code and fix bugs

Author: dariocloudappi

package-lock.json

@@ -1,8 +1,9 @@
 {
   "name": "Convert schemas to examples",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "scripts": {
-    "test": "mocha"
+    "test": "mocha",
+    "debug": "node --inspect-brk index.js -f ./index.yaml"
   },
   "dependencies": {
     "chai": "^5.1.1",

package.json

@@ -14,6 +14,10 @@ module.exports = function () {
     if (depth > MAX_DEPTH_LEVEL) {
       return example;
     }
+
+    if (_.isEmpty(schema)) {
+      return example;
+    }
 
     switch(!_.isEmpty(example)) {
 
@@ -38,7 +42,7 @@ module.exports = function () {
         handleItems(schema, example, definition, depth);
         break;
       default:
-        break;
+      break;
     }
 
     return example;

src/generator/buildExample.js

@@ -1,26 +1,40 @@
-"use strict";
-
-const _path = require("path");
-const fs = require("fs");
-const argv = require("yargs").argv;
-const yaml = require("js-yaml");
-
+'use strict';
 
+const _path = require('path');
+const fs = require('fs');
+const argv = require('yargs').argv;
+const yaml = require('js-yaml');
 
 module.exports = (function () {
   return function generatedFile() {
     try {
-      const newFileYaml = _path.join(_path.dirname(argv.file), `generated-${_path.basename(argv.file)}`);
-      
-      fs.accessSync(_path.dirname(newFileYaml), fs.constants.W_OK); 
-      
-      fs.writeFileSync(newFileYaml, yaml.dump(global.definition, { noRefs: true }), "utf8");
-      
-      console.info(`The file has been saved as ${newFileYaml}`);
-    
+      const ext = _path.extname(argv.file).toLowerCase();
+      const newFileBaseName = `generated-${_path.basename(argv.file, ext)}`;
+      let newFile;
+
+      switch (ext) {
+        case '.yaml':
+        case '.yml':
+          newFile = _path.join(_path.dirname(argv.file), `${newFileBaseName}.yaml`);
+          fs.accessSync(_path.dirname(newFile), fs.constants.W_OK);
+          fs.writeFileSync(newFile, yaml.dump(global.definition, { noRefs: true }), 'utf8');
+          console.info(`The YAML file has been saved as ${newFile}`);
+          break;
+
+        case '.json':
+          newFile = _path.join(_path.dirname(argv.file), `${newFileBaseName}.json`);
+          fs.accessSync(_path.dirname(newFile), fs.constants.W_OK);
+          fs.writeFileSync(newFile, JSON.stringify(global.definition, null, 2), 'utf8');
+          console.info(`The JSON file has been saved as ${newFile}`);
+          break;
+
+        default:
+          require('../utils/error')('Unsupported file format: ' + argv.file);
+      }
+
     } catch (error) {
-      require("yargs").showHelp();
-      require("../utils/error")("The file could not be saved");
+      require('yargs').showHelp();
+      require('../utils/error')('The file could not be saved');
     }
   };
 })();

src/generator/file.js

@@ -1,25 +1,38 @@
-'use strict'
+'use strict';
 
 const yaml = require('js-yaml');
-const fs   = require('fs');
-const argv = require('yargs').argv
-const path = require('path')
+const fs = require('fs');
+const argv = require('yargs').argv;
+const path = require('path');
 
 module.exports = function() {
   return function get() {
-		try {
-			const contractFile = fs.existsSync(argv.file, 'utf8') 
-			if (!contractFile) {
-				require('../utils/error.js')('The yaml file not found');
-			}
-			if (path.extname(argv.file) !== '.yaml' && path.extname(argv.file) !== '.yml'){
-				require('../utils/error.js')('The yaml format is not correct: '+argv.file);
-			}
-			return yaml.load(fs.readFileSync(argv.file, 'utf8'));
-		} catch (e) {
-				console.info(e.message);
-				require('../utils/error.js')('The yaml file does not exist or is not correct: ' + argv.file);
-		}
-  };
+    try {
+      const contractFile = fs.existsSync(argv.file, 'utf8');
+      if (!contractFile) {
+        require('../utils/error.js')('The file not found');
+      }
+
+      const allowedExtensions = ['.yaml', '.yml', '.json'];
+      const ext = path.extname(argv.file).toLowerCase();
+      
+      if (!allowedExtensions.includes(ext)) {
+        require('../utils/error.js')('The file format is not correct: ' + argv.file);
+      }
 
-}()
+      switch (ext) {
+        case '.yaml':
+        case '.yml':
+          return yaml.load(fs.readFileSync(argv.file, 'utf8'));
+        case '.json':
+          return JSON.parse(fs.readFileSync(argv.file, 'utf8'));
+        default:
+          require('../utils/error.js')('Unsupported file format: ' + argv.file);
+      }
+
+    } catch (e) {
+      console.info(e.message);
+      require('../utils/error.js')('The file does not exist or is not correct: ' + argv.file);
+    }
+  };
+}();

src/parser/definition.js

@@ -55,35 +55,38 @@ const handleProperties = (schema, example, definition, depth) => {
         break;
       default:
         const propertyExample =  require('../generator/buildExample')(propertySchema, definition, depth + 1);
+        
         if (!_.isEmpty(propertyExample.properties)) {
           example.properties[property] = propertyExample.properties;
         }
+
+        if (!_.isEmpty(propertyExample.example)) {
+          _.set(example.example, property, propertyExample.example);
+        }
+
         example.required = _.union(example.required, propertyExample.required.map((item) => `${property}.${item}`));
         break;
     }
   });
 };
 
 const handleItems = (schema, example, definition, depth, property = null) => {
-  let arrProperties = _.isNull(property) ? example.properties : example.properties[property];
-  arrProperties = [];
-  
+  let arrProperties = property === null ? example.properties : (example.properties[property] = []);
+
   if (schema.items.example) {
     arrProperties.push(schema.items.example);
   } else {
-
     const itemsExample = require('../generator/buildExample')(schema.items, definition, depth + 1);
-    
+
     if (!_.isEmpty(itemsExample.properties)) {
       arrProperties.push(itemsExample.properties);
     }
-    
+
     if (!_.isEmpty(itemsExample.example)) {
-      let arrExample = _.isNull(property) ? example.example : example.example[property];
-      arrExample = [];
+      let arrExample = property === null ? example.example : (example.example[property] = []);
       arrExample.push(itemsExample.example);
     }
-    
+
     example.required = _.union(example.required, itemsExample.required);
   }
 };

src/utils/handlers.js

@@ -7,7 +7,7 @@ module.exports = function () {
   return function verifyProperties(obj, properties) {
     return properties.every((property) => {
 
-          const propertyPath = property.split(".").slice(0, -1);  
+          const propertyPath = property.split(".").slice(0, -1) ;  
 
           if (_.isArray(_.get(obj, propertyPath))) {