fix: result json file consist old arguments

Closes #56
linterhub · Jul 26, 2018 · fee6ca7 · fee6ca7
1 parent 1d043a3
commit fee6ca7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/src/handle.js b/src/handle.js
@@ -5,17 +5,16 @@ const context = require('./template/context.js');
 
 const handle = (help, config) => {
     try {
+        context.options = [];
         Object.keys(context.section).forEach((sectionName) => {
             let section = context.section[sectionName];
             let sectionTitle = config.section[sectionName].name;
-            section.data = findSection(sectionTitle, help);
-            if (section.data.length > 0) {
-                section.data.forEach((data) =>
-                    section.func(data, context, argumentTemplate));
+            const data = findSection(sectionTitle, help);
+            if (data.length > 0) {
+                data.forEach((object) =>
+                    section.func(object, context, argumentTemplate));
             } else if (section.required) {
-                const sectionNotFound =
-                    new TypeError(`Required section ${sectionName} not found`);
-                throw sectionNotFound;
+                throw new Error(`Required section ${sectionName} not found`);
             }
         });
         return context;

diff --git a/src/template/context.js b/src/template/context.js
@@ -3,17 +3,14 @@ const parseSection = require('./../parseSection.js');
 const context = {
     section: {
         options: {
-            data: [],
             required: true,
             func: parseSection.options,
         },
         usage: {
-            data: [],
             required: false,
             func: parseSection.usage,
         },
         examples: {
-            data: [],
             required: false,
             func: parseSection.examples,
         },

diff --git a/src/templatizer.js b/src/templatizer.js
@@ -1,9 +1,10 @@
 'use strict';
+const fs = require('fs');
+const argumentsTemplate = JSON.parse(fs.readFileSync('./src/template/args.json'));
+const optionTemplate = require('./template/option.json');
 
 const templatizer = (context) => {
-    const argumentsTemplate = require('./template/args.json');
-    const optionTemplate = require('./template/option.json');
-
+    argumentsTemplate.definitions.arguments.properties = {};
     let result = argumentsTemplate;
     context.options.map((option) => {
         let optionSchema = Object.assign({}, optionTemplate);
@@ -37,7 +38,7 @@ const templatizer = (context) => {
                 // TODO: argument types
         }
         optionSchema.description = option.description;
-        optionSchema.default = option.defaultValues;
+        optionSchema.default = option.defaultValue;
         result.definitions.arguments.properties[argumentName] = optionSchema;
     });