configorama 0.4.9 → 0.4.10

package/lib/main.js

@@ -3,9 +3,26 @@ const path = require('path')
 const fs = require('fs')
 const promiseFinallyShim = require('promise.prototype.finally').shim()
 // @TODO only import lodash we need
-const _ = require('lodash')
+const isArray = require('lodash.isarray')
+const isString = require('lodash.isstring')
+const isNumber = require('lodash.isnumber')
+const isObject = require('lodash.isobject')
+const isDate = require('lodash.isdate')
+const isRegExp = require('lodash.isregexp')
+const isFunction = require('lodash.isfunction')
+const isEmpty = require('lodash.isempty')
+const trim = require('lodash.trim')
+const camelCase = require('lodash.camelcase')
+const kebabCase = require('lodash.kebabcase')
+const capitalize = require('lodash.capitalize')
+const split = require('lodash.split')
+const map = require('lodash.map')
+const mapValues = require('lodash.mapvalues')
+const assign = require('lodash.assign')
+const set = require('lodash.set')
+const cloneDeep = require('lodash.clonedeep')
 const findUp = require('find-up')
-const replaceall = require('replaceall')
+const replaceAll = require('replaceall')
 const traverse = require('traverse')
 const dotProp = require('dot-prop')
 /* Default Value resolvers */
@@ -78,7 +95,7 @@ class Configorama {
     }, options)
 
     
-    const defaultSyntax = '\\${((?!AWS)[ ~:a-zA-Z0-9=+!@#%*<>?._\'",|\\-\\/\\(\\)\\\\]+?)}'
+    const defaultSyntax = '\\${((?!AWS|stageVariables)[ ~:a-zA-Z0-9=+!@#%*<>?._\'",|\\-\\/\\(\\)\\\\]+?)}'
     const variableSyntax = options.syntax || defaultSyntax
     let varRegex
     if (typeof variableSyntax === 'string') {
@@ -87,6 +104,7 @@ class Configorama {
     } else if (variableSyntax instanceof RegExp) {
       varRegex = variableSyntax
     }
+    // console.log('varRegex', varRegex)
     this.variableSyntax = varRegex
 
     // Set initial config object to populate
@@ -94,7 +112,7 @@ class Configorama {
       // set config objects
       this.config = fileOrObject
       // Keep a copy
-      this.originalConfig = _.cloneDeep(fileOrObject)
+      this.originalConfig = cloneDeep(fileOrObject)
       // Set configPath for file references
       this.configPath = options.configDir || process.cwd()
     } else if (typeof fileOrObject === 'string') {
@@ -147,7 +165,7 @@ class Configorama {
       // set config objects
       this.config = configObject
       // Keep a copy
-      this.originalConfig = _.cloneDeep(configObject)
+      this.originalConfig = cloneDeep(configObject)
       // Set configPath for file references
       this.configPath = fileDirectory
     }
@@ -283,13 +301,13 @@ class Configorama {
         }
       },
       toCamelCase: (val) => {
-        return _.camelCase(val)
+        return camelCase(val)
       },
       toKebabCase: (val) => {
-        return _.kebabCase(val)
+        return kebabCase(val)
       },
       capitalize: (val) => {
-        return _.capitalize(val)
+        return capitalize(val)
       }
     }
 
@@ -301,14 +319,14 @@ class Configorama {
     this.functions = {
       split: (value, delimiter, limit) => {
         const delimit = delimiter || ','
-        const splitVal = _.split(value, delimit)
+        const splitVal = split(value, delimit)
         return splitVal
       },
       join: (value, delimiter) => {
-        if (_.isString(value)) {
+        if (isString(value)) {
           value = [value]
         }
-        if (!Array.isArray(value)) {
+        if (!isArray(value)) {
           throw new Error('value must be array for join() function')
         }
         const delimit = delimiter || ','
@@ -334,10 +352,10 @@ class Configorama {
         if (typeof value === 'string' && typeof otherValue === 'string') {
           return value + otherValue
         }
-        if (Array.isArray(value) && Array.isArray(otherValue)) {
+        if (isArray(value) && isArray(otherValue)) {
           return otherValue.concat(value)
         }
-        return Object.assign({}, value, otherValue)
+        return assign({}, value, otherValue)
       },
       math: () => {},
       upperKeys: (o) => {
@@ -365,7 +383,7 @@ class Configorama {
   }
 
   /**
-   * Populate all variables in the service, conviently remove and restore the service attributes
+   * Populate all variables in the service, conveniently remove and restore the service attributes
    * that confuse the population methods.
    * @param cliOpts An options hive to use for ${opt:...} variables.
    * @returns {Promise.<TResult>|*} A promise resolving to the populated service.
@@ -462,7 +480,7 @@ class Configorama {
     } else {
       // TODO fix how commas + spaces are ned
       const splitter = splitCsv(rawArgs, ', ')
-      // console.log('splitterz', splitter)
+      // console.log('splitter', splitter)
       argsToPass = formatFunctionArgs(splitter)
     }
     // console.log('argsToPass runFunction', argsToPass)
@@ -475,7 +493,7 @@ class Configorama {
     }
 
     const funcValue = theFunction(...argsToPass)
-    // console.log('funcValuex', funcValue)
+    // console.log('funcValue', funcValue)
     // console.log('typeof funcValue', typeof funcValue)
     let replaceVal = funcValue
     if (typeof funcValue === 'string') {
@@ -525,23 +543,23 @@ class Configorama {
    * @returns {TerminalProperty[]} The terminal properties of the given root object, with the path
    * and value of each
    */
-  getProperties(root, atRoot, current, cntxt, rslts) {
-    let context = cntxt
+  getProperties(root, atRoot, current, _context, _results) {
+    let context = _context
     if (!context) {
       context = []
     }
-    let results = rslts
+    let results = _results
     if (!results) {
       results = []
     }
     const addContext = (value, key) => {
       return this.getProperties(root, false, value, context.concat(key), results)
     }
-    if (_.isArray(current)) {
-      _.map(current, addContext)
-    } else if (_.isObject(current) && !_.isDate(current) && !_.isRegExp(current) && !_.isFunction(current)) {
+    if (isArray(current)) {
+      map(current, addContext)
+    } else if (isObject(current) && !isDate(current) && !isRegExp(current) && !isFunction(current)) {
       if (atRoot || current !== root) {
-        _.mapValues(current, addContext)
+        mapValues(current, addContext)
       }
     } else {
       // TODO Add values to leaves here
@@ -559,7 +577,7 @@ class Configorama {
         originalValue = dotProp.get(this.originalConfig, parentPath)
       }
       leaf.originalSource = originalValue
-      if (originalValue && _.isString(originalValue)) {
+      if (originalValue && isString(originalValue)) {
         const varString = cleanVariable(originalValue, this.variableSyntax)
         if (varString.match(fileRefSyntax)) {
           leaf.isFileRef = true
@@ -585,13 +603,13 @@ class Configorama {
     // console.log('properties', properties)
     const variables = properties.filter((property) => {
       // Initial check if value has variable string in it
-      return _.isString(property.value) && property.value.match(this.variableSyntax)
+      return isString(property.value) && property.value.match(this.variableSyntax)
     })
-    return _.map(variables, (valueObject) => {
+    return map(variables, (valueObject) => {
       // console.log('valueObject', valueObject)
       return this.populateValue(valueObject, false)
         .then((populated) => {
-          return _.assign({}, valueObject, { populated: populated.value })
+          return assign({}, valueObject, { populated: populated.value })
         })
     })
   }
@@ -606,7 +624,7 @@ class Configorama {
     return Promise.all(populations)
       .then((results) => results.forEach((result) => {
         if (result.value !== result.populated) {
-          _.set(target, result.path, result.populated)
+          set(target, result.path, result.populated)
         }
       }))
   }
@@ -664,7 +682,7 @@ class Configorama {
     if (!matches || !matches.length) {
       return property
     }
-    return _.map(matches, match => {
+    return map(matches, match => {
       // console.log('match', match)
       return ({
         match: match,
@@ -680,7 +698,7 @@ class Configorama {
    */
   populateMatches(matches, valueObject, root) {
     // console.log('matches', matches)
-    return _.map(matches, (match) => {
+    return map(matches, (match) => {
       return this.splitAndGet(match.variable, valueObject, root)
     })
   }
@@ -699,7 +717,7 @@ class Configorama {
     let result = valueObject.value
     for (let i = 0; i < matches.length; i += 1) {
       this.warnIfNotFound(matches[i].variable, results[i])
-      // console.log('REDNER MATCHES', results[i])
+      // console.log('Render MATCHES', results[i])
       let valueToPop = results[i]
       // TODO refactor this. __internal_only_flag needed to stop clash with sync/async file resolution
       if (results[i] && typeof results[i] === 'object' && results[i].__internal_only_flag) {
@@ -719,7 +737,7 @@ class Configorama {
   /**
    * Populate the given value, recursively if root is true
    * @param valueObject The value to populate variables within
-   * @param root Whether the caller is the root populator and thereby whether to recursively
+   * @param root Whether the caller is the root populater and thereby whether to recursively
    * populate
    * @returns {PromiseLike<T>} A promise that resolves to the populated value, recursively if root
    * is true
@@ -735,7 +753,7 @@ class Configorama {
     /*
     console.log('matchesmatches', matches)
     /** */
-    if (!_.isArray(matches)) {
+    if (!isArray(matches)) {
       return Promise.resolve(property)
     }
     const populations = this.populateMatches(matches, valueObject, root)
@@ -746,7 +764,7 @@ class Configorama {
         console.log('renderMatches result', result)
         /** */
 
-        if (root && matches.length) {
+        if (root && isArray(matches)) {
           return this.populateValue({ value: result.value }, root)
         }
         return result
@@ -766,7 +784,7 @@ class Configorama {
   /**
    * Split the cleaned variable string containing one or more comma delimited variables and get a
    * final value for the entirety of the string
-   * @param varible The variable string to split and get a final value for
+   * @param variable The variable string to split and get a final value for
    * @param property The original property string the given variable was extracted from
    * @returns {Promise} A promise resolving to the final value of the given variable
    */
@@ -826,7 +844,7 @@ class Configorama {
       property = valueToPopulate
       /* Handle ${self:custom.ref, ''} with deep values */
       if (v.match(deepRefSyntax) && originalSrc.match(this.variableSyntax) && !v.match(/deep\:(\d*)\..*}$/)) {
-        // console.log('MAJAJAAJJAAJAJJAJA', this.deep)
+        // console.log('deep var', this.deep)
         // console.log('originalSrc', originalSrc)
         // console.log('value', v)
         let deepIndex = Number(v.match(/deep\:(\d*)/)[1])
@@ -839,7 +857,7 @@ class Configorama {
         property = this.deep[deepIndex]
       }
     // partial replacement, string
-    } else if (_.isString(valueToPopulate)) {
+    } else if (isString(valueToPopulate)) {
       // if (property.match(/^> function /g)) {
       //
       //   const innerFunc = /> function (\w+)\s*\(((?:[^()]+)*)?\s*\)\s*/
@@ -872,7 +890,7 @@ class Configorama {
       /** */
    
       // (replaceThis, withThis, inThis)
-      property = replaceall(currentMatchedString, valueToPopulate, property)
+      property = replaceAll(currentMatchedString, valueToPopulate, property)
       // console.log('property', property)
 
       // if (property.match(/^> function /g)) {
@@ -880,17 +898,17 @@ class Configorama {
       // }
     
     // partial replacement, number
-    } else if (_.isNumber(valueToPopulate)) {
-      property = replaceall(matchedString, String(valueToPopulate), property)
+    } else if (isNumber(valueToPopulate)) {
+      property = replaceAll(matchedString, String(valueToPopulate), property)
     // TODO This was temp fix for array value mismatch from filters. This fixes filterInner: ${commas | split(${self:inner}, 2) }
-    // } else if (_.isArray(valueToPopulate) && valueToPopulate.length === 1) {
-    //  property = replaceall(matchedString, String(valueToPopulate[0]), property)
-    } else if (_.isObject(valueToPopulate)) {
+    // } else if (isArray(valueToPopulate) && valueToPopulate.length === 1) {
+    //  property = replaceAll(matchedString, String(valueToPopulate[0]), property)
+    } else if (isObject(valueToPopulate)) {
       // console.log('OBJECT MATCH', valueToPopulate)
-      property = replaceall(matchedString, JSON.stringify(valueToPopulate), property)// .replace(/}$/, '').replace(/^\$\{/, '')
+      property = replaceAll(matchedString, JSON.stringify(valueToPopulate), property)// .replace(/}$/, '').replace(/^\$\{/, '')
       // console.log('property', property)
       // TODO run functions here
-      // console.log('othere new propetry', property)
+      // console.log('other new prop', property)
     } else {
       let missingValue = matchedString
 
@@ -938,7 +956,7 @@ ${valueObject.path}: ${valueObject.originalSource}
       const prop = cleanVariable(property, this.variableSyntax)
       // console.log('prop', prop)
       if (property.match(/^> function /g) && prop) {
-        // console.log('PRPOpropertyproperty', property)
+        // console.log('func prop', property)
         // console.log('Prop', prop)
       }
       const func = funcRegex.exec(property)
@@ -1028,8 +1046,8 @@ ${valueObject.path}: ${valueObject.originalSource}
       let deepPropertyStr = propertyString
       let deepProperties = 0
       values.forEach((value, index) => {
-        // console.log('valuevaluevaluevaluevaluevaluevaluevalue', value)
-        if (_.isString(value) && value.match(this.variableSyntax)) {
+        // console.log('───────────────────────────────> value', value)
+        if (isString(value) && value.match(this.variableSyntax)) {
           deepProperties += 1
           // console.log('makeDeepVariable overwrite', value)
           const deepVariable = this.makeDeepVariable(value)
@@ -1082,7 +1100,7 @@ ${valueObject.path}: ${valueObject.originalSource}
       const filterz = string.split('|').filter((value, index, arr) => {
         return index > 0
       }).map((f) => {
-        return _.trim(f)
+        return trim(f)
       })
       // console.log('filters to run', filterz)
 
@@ -1093,7 +1111,7 @@ ${valueObject.path}: ${valueObject.originalSource}
       }
       // console.log('HAS FILTERS', filters)
       // console.log('t', t)
-      variableString = _.trim(t[0])
+      variableString = trim(t[0])
     }
 
     let resolverFunction
@@ -1127,7 +1145,7 @@ ${valueObject.path}: ${valueObject.originalSource}
         // console.log('VALUE', val)
         if (val === null || typeof val === 'undefined' ||
           /* match deep refs as empty {}, they need resolving via functions */
-          (typeof val === 'object' && _.isEmpty(val) && variableString.match(/deep\:/))
+          (typeof val === 'object' && isEmpty(val) && variableString.match(/deep\:/))
         ) {
           // console.log('variableString', variableString)
           const cleanV = cleanVariable(propertyString, this.variableSyntax)
@@ -1189,7 +1207,7 @@ Like so: \${${variableString}, "fallbackValue"\}.`)
             if (i === 0) {
               return acc
             }
-            acc += `| ${_.trim(currentFilter)}`
+            acc += `| ${trim(currentFilter)}`
             return acc
           }, '')
 
@@ -1269,7 +1287,7 @@ Like so: \${${variableString}, "fallbackValue"\}.`)
           }, 'cleanClean.match(fileRefSyntax)')
         }
       }
-      // const fallbackValue = split[1] || split[0]
+      // const fallbackValue = split[1]
       // console.log('variableString', variableString)
       // console.log('propertyString', propertyString)
       // console.log('fallbackValue', fallbackValue)
@@ -1378,7 +1396,7 @@ Like so: \${${variableString}, "fallbackValue"\}.`)
     if (hasParams) {
       const splitter = splitCsv(hasParams[2])
       const argsFound = splitter.map((arg) => {
-        const cleanArg = _.trim(arg).replace(/^'|"/, '').replace(/'|"$/, '')
+        const cleanArg = trim(arg).replace(/^'|"/, '').replace(/'|"$/, '')
         return cleanArg
       })
 
@@ -1471,7 +1489,7 @@ Check if your javascript is exporting a function that returns a value.`
         deepProperties.splice(0, 1)
         // Trim prop keys for starting/trailing spaces
         deepProperties = deepProperties.map((prop) => {
-          return _.trim(prop)
+          return trim(prop)
         })
         return this.getDeeperValue(deepProperties, valueToPopulateResolved)
           .then((deepValueToPopulateResolved) => {
@@ -1547,14 +1565,14 @@ Please use ":" to reference sub properties`
     /*
     console.log("GET getValueFromDeep", variableString)
     console.log('deepRef', deepRef)
-    console.log('variablex', variable)
+    console.log('getValueFromDeep variable', variable)
     /** */
     let ret = this.populateValue({ value: variable })
     // console.log('variable ret', ret)
     if (deepRef.length) { // if there is a deep reference remaining
       ret = ret.then((result) => {
         // console.log('DEEP RESULT', result)
-        if (_.isString(result.value) && result.value.match(this.variableSyntax)) {
+        if (isString(result.value) && result.value.match(this.variableSyntax)) {
           // console.log('makeDeepVariable getValueFromDeep', result.value)
           const deepVariable = this.makeDeepVariable(result.value)
           return Promise.resolve(appendDeepVariable(deepVariable, deepRef))
@@ -1608,7 +1626,7 @@ Please use ":" to reference sub properties`
       // console.log(typeof reducedValue)
       // console.log('subProperty', `"${subProperty}"`)
 
-      if (_.isString(reducedValue) && reducedValue.match(deepRefSyntax)) { // build mode
+      if (isString(reducedValue) && reducedValue.match(deepRefSyntax)) { // build mode
         reducedValue = appendDeepVariable(reducedValue, subProperty)
       } else { // get mode
         if (typeof reducedValue === 'undefined') {
@@ -1629,7 +1647,7 @@ Please use ":" to reference sub properties`
           } catch (e) {}
 
           reducedValue = reducedValue[subProperty]
-        } else if (_.isString(reducedValue)) {
+        } else if (isString(reducedValue)) {
           try {
             // if JSON parse it
             reducedValue = JSON.parse(reducedValue)

package/lib/resolvers/valueFromNumber.js

@@ -1,8 +1,8 @@
-const _ = require('lodash')
+const isNumber = require('lodash.isnumber')
 
 function isNumberVariable(variableString) {
   const num = Number(variableString)
-  return !isNaN(num) && _.isNumber(num)
+  return !isNaN(num) && isNumber(num)
 }
 
 function getValueFromNumber(variableString) {

package/lib/utils/PromiseTracker.js

@@ -1,4 +1,4 @@
-const _ = require('lodash')
+const trim = require('lodash.trim')
 
 // Track promise resolution
 class PromiseTracker {
@@ -18,7 +18,7 @@ class PromiseTracker {
   report() {
     const delta = Date.now() - this.startTime
     const pending = this.getPending()
-    const dots = dotdotdot(this.cursor++, 100, '...')
+    const dots = dotDotDot(this.cursor++, 100, '...')
     console.log([
       `Fetching Async values${dots}`,
     ].concat(
@@ -41,8 +41,7 @@ class PromiseTracker {
     clearInterval(this.interval)
     this.reset()
   }
-  add(variable, prms, specifier, hasFilter) {
-    const promise = prms
+  add(variable, promise, specifier, hasFilter) {
     // Refactor promise tracker to account for multiple instances of a given variable
 
     // console.log(`${specifier} hasFilter`, hasFilter)
@@ -51,7 +50,7 @@ class PromiseTracker {
     let uniqueId = ''
     if (hasFilter) {
       uniqueId = hasFilter.reduce((acc, currentFilter, i) => {
-        acc += `|${_.trim(currentFilter)}`
+        acc += `|${trim(currentFilter)}`
         return acc
       }, '')
     }
@@ -89,7 +88,7 @@ class PromiseTracker {
   }
 }
 
-function dotdotdot(cursor, times, string) {
+function dotDotDot(cursor, times, string) {
   return Array(times - Math.abs(cursor % (times * 2) - times) + 1).join(string)
 }
 

package/lib/utils/cloudformationSchema.js

@@ -1,5 +1,9 @@
 const YAML = require('js-yaml');
-const _ = require('lodash');
+const includes = require('lodash.includes');
+const isString = require('lodash.isstring');
+const split = require('lodash.split');
+const flatten = require('lodash.flatten');
+const map = require('lodash.map');
 
 const functionNames = [
   'And',
@@ -22,13 +26,13 @@ const functionNames = [
 ];
 
 const yamlType = (name, kind) => {
-  const functionName = _.includes(['Ref', 'Condition'], name) ? name : `Fn::${name}`;
+  const functionName = includes(['Ref', 'Condition'], name) ? name : `Fn::${name}`;
   return new YAML.Type(`!${name}`, {
     kind,
     construct: data => {
       if (name === 'GetAtt') {
         // special GetAtt dot syntax
-        return { [functionName]: _.isString(data) ? _.split(data, '.', 2) : data };
+        return { [functionName]: isString(data) ? split(data, '.', 2) : data };
       }
       return { [functionName]: data };
     },
@@ -36,9 +40,9 @@ const yamlType = (name, kind) => {
 };
 
 const createSchema = () => {
-  const types = _.flatten(
-    _.map(functionNames, functionName =>
-      _.map(['mapping', 'scalar', 'sequence'], kind => yamlType(functionName, kind))
+  const types = flatten(
+    map(functionNames, functionName =>
+      map(['mapping', 'scalar', 'sequence'], kind => yamlType(functionName, kind))
     )
   );
   return YAML.Schema.create(types);

package/lib/utils/formatFunctionArgs.js

@@ -1,7 +1,7 @@
-const _ = require('lodash')
+const trim = require('lodash.trim')
 
 function formatArg(arg) {
-  const cleanArg = _.trim(arg).replace(/^('|")/, '').replace(/('|")$/, '')
+  const cleanArg = trim(arg).replace(/^('|")/, '').replace(/('|")$/, '')
   if (cleanArg.match(/^{([^}]+)}$/)) {
     return JSON.parse(cleanArg)
   }

package/lib/utils/handleSignalEvents.js

@@ -1,6 +1,7 @@
 const readline = require('readline')
 
 function handleSignalEvents() {
+  if (global.signalEventHandling) return   // Only set up handlers once
   // NOTE: instantiating this global variable here to keep track of the state
   // usually global variables should be "considered harmful" but are a good fit in this case
   global.signalEventHandling = {
@@ -8,7 +9,7 @@ function handleSignalEvents() {
     shouldExitGracefully: false
   }
 
-  let msg = `
+  const msg = `
 ───────────────────────────────────────────────────────────
 Exit received. Waiting for current operation to finish...
 ───────────────────────────────────────────────────────────
@@ -20,23 +21,25 @@ Exit received. Waiting for current operation to finish...
       output: process.stdout
     })
 
-    rl.on('SIGINT', () => {
-      process.emit('SIGINT')
-    })
-    rl.on('SIGTERM', () => {
-      process.emit('SIGTERM')
-    })
-    rl.on('SIGBREAK', () => {
-      process.emit('SIGBREAK')
-    })
+    // Clean up readline interface when done
+    process.once('exit', () => rl.close())
+    
+    // Use once() instead of on()
+    rl.once('SIGINT', () => process.emit('SIGINT'))
+    rl.once('SIGTERM', () => process.emit('SIGTERM'))
+    rl.once('SIGBREAK', () => process.emit('SIGBREAK'))
   }
 
+  // Remove any existing listeners before adding new ones
+  process.removeAllListeners('SIGINT')
+  process.removeAllListeners('SIGTERM') 
+  process.removeAllListeners('SIGBREAK')
+
   process.on('SIGINT', () => {
     global.signalEventHandling.SIGINTCount += 1
     global.signalEventHandling.shouldExitGracefully = true
     if (global.signalEventHandling.SIGINTCount < 2) {
-      msg = `${msg} Press CTRL + C again to force an exit\nNOTE: Doing so might corrupt the applications state information!`
-      console.log(msg) // eslint-disable-line no-console
+      console.log(`${msg} Press CTRL + C again to force an exit\nNOTE: Doing so might corrupt the applications state information!`)
     } else {
       process.exit(1)
     }
@@ -44,12 +47,12 @@ Exit received. Waiting for current operation to finish...
 
   process.on('SIGTERM', () => {
     global.signalEventHandling.shouldExitGracefully = true
-    console.log(msg) // eslint-disable-line no-console
+    console.log(msg)
   })
 
   process.on('SIGBREAK', () => {
     global.signalEventHandling.shouldExitGracefully = true
-    console.log(msg) // eslint-disable-line no-console
+    console.log(msg)
   })
 }
 

package/lib/utils/isValidValue.js

@@ -1,8 +1,8 @@
-const _ = require('lodash')
+const isEmpty = require('lodash.isempty')
 
 module.exports = function isValidValue(val) {
   if (typeof val === 'object' && val.hasOwnProperty('__internal_only_flag')) {
     return false
   }
-  return val !== null && typeof val !== 'undefined' && !(typeof val === 'object' && _.isEmpty(val))
+  return val !== null && typeof val !== 'undefined' && !(typeof val === 'object' && isEmpty(val))
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "configorama",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "description": "Variable support for configuration files",
   "main": "lib/index.js",
   "files": [
@@ -11,9 +11,9 @@
   ],
   "scripts": {
     "docs": "node ./scripts/docs.js",
-    "test": "ava -v",
-    "test:api": "ava ./tests/api/api.test.js -v",
-    "watch": "npm test -- --watch -v",
+    "test": "uvu tests \".*\\.test.js$\"",
+    "test:api": "uvu tests/api api.test.js",
+    "watch": "watchlist tests -- npm test",
     "publish": "git push origin && git push origin --tags",
     "release:patch": "npm version patch && npm publish",
     "release:minor": "npm version minor && npm publish",
@@ -33,26 +33,35 @@
     "git-url-parse": "^14.0.0",
     "js-yaml": "^3.14.1",
     "json5": "^2.2.3",
-    "lodash": "^4.17.21",
+    "lodash.isarray": "^4.0.0",
+    "lodash.isstring": "^4.0.1",
+    "lodash.isnumber": "^3.0.3",
+    "lodash.isobject": "^3.0.2",
+    "lodash.isdate": "^4.0.1",
+    "lodash.isregexp": "^4.0.1",
+    "lodash.isfunction": "^3.0.9",
+    "lodash.isempty": "^4.4.0",
+    "lodash.trim": "^4.5.1",
+    "lodash.camelcase": "^4.3.0",
+    "lodash.kebabcase": "^4.1.1",
+    "lodash.capitalize": "^4.2.1",
+    "lodash.split": "^4.4.2",
+    "lodash.map": "^4.6.0",
+    "lodash.mapvalues": "^4.6.0",
+    "lodash.assign": "^4.2.0",
+    "lodash.set": "^4.3.2",
+    "lodash.clonedeep": "^4.5.0",
+    "lodash.includes": "^4.3.0",
+    "lodash.flatten": "^4.4.0",
     "promise.prototype.finally": "^3.1.8",
     "replaceall": "^0.1.6",
     "sync-rpc": "^1.3.6",
     "traverse": "^0.6.8"
   },
   "devDependencies": {
-    "ava": "^2.4.0",
     "markdown-magic": "^2.6.1",
-    "minimist": "^1.2.8"
-  },
-  "ava": {
-    "files": [
-      "tests/**/*.test.js"
-    ],
-    "sources": [
-      "**/*.{js,jsx}",
-      "*.yml",
-      "**/*.yml"
-    ],
-    "verbose": true
+    "minimist": "^1.2.8",
+    "uvu": "^0.5.6",
+    "watchlist": "^0.3.1"
   }
 }