makeconf
Advanced tools
Comparing version 1.4.3 to 1.4.4
'use strict'; | ||
const prompt = require('prompt'); | ||
const commander = require('commander'); | ||
const pkg = require('./package.json'); | ||
const cwd = require('./lib/cwd'); | ||
@@ -10,2 +12,6 @@ const load = require('./lib/load'); | ||
commander | ||
.version(pkg.version) | ||
.parse(process.argv); | ||
load(makeconfjson) | ||
@@ -12,0 +18,0 @@ .then((schema) => { |
@@ -33,4 +33,6 @@ 'use strict'; | ||
.then((configAsJson) => { | ||
buildSchema(schema, config); | ||
setSchemaDefaults(schema, config, configAsJson); | ||
if (configAsJson) { | ||
buildSchema(schema, config); | ||
setSchemaDefaults(schema, config, configAsJson); | ||
} | ||
@@ -56,4 +58,9 @@ return resolve(schema); | ||
if (util.isSchemaItem(value)) { | ||
const fallbackValue = _.get(config[key], 'default'); | ||
let defaultValue = _.get(configAsJson, key); | ||
if (!defaultValue || _.isObject(defaultValue)) { | ||
defaultValue = fallbackValue; | ||
} | ||
if (_.isNull(defaultValue)) { | ||
@@ -60,0 +67,0 @@ defaultValue = 'null'; |
{ | ||
"name": "makeconf", | ||
"version": "1.4.3", | ||
"version": "1.4.4", | ||
"description": "An interactive local config generator for better team coordination.", | ||
@@ -32,2 +32,3 @@ "main": "index.js", | ||
"cli-color": "^1.0.0", | ||
"commander": "^2.8.1", | ||
"envfile": "^1.0.0", | ||
@@ -34,0 +35,0 @@ "lodash": "^3.10.1", |
116431
404
5
+ Addedcommander@^2.8.1
+ Addedcommander@2.20.3(transitive)