feat: simplify parameters

Author: Jakob Rosenberg

configent.js

@@ -34,7 +34,7 @@ const _defaults = {
  * @param {NodeModule} [configentOptions.module] required if multiple modules are using configent
  * @returns {options}
  */
-function configent(defaults, input = {}, configentOptions) {
+function configent(configentOptions) {
     configentOptions = { ..._defaults, ...configentOptions }
     const getParentModuleDir = createGetParentModuleDir(configentOptions)
     configentOptions.name = configentOptions.name || require(resolve(getParentModuleDir(), 'package.json')).name
@@ -57,15 +57,13 @@ function configent(defaults, input = {}, configentOptions) {
 
     function buildConfig() {
         delete (configentOptions.module)
-        const hash = JSON.stringify({ name, defaults, input, configentOptions })
+        const hash = JSON.stringify({ name, configentOptions })
         if (!instances[hash] || !cacheConfig) {
             instances[hash] = {
-                ...defaults,
                 ...useDetectDefaults && getDetectDefaults(),
                 ...usePackageConfig && getPackageConfig(),
                 ...useConfig && getUserConfig(),
                 ...useEnv && getEnvConfig(),
-                ...input
             }
         }
         return instances[hash]
@@ -81,10 +79,8 @@ function configent(defaults, input = {}, configentOptions) {
             return entries.reduce((prev, { key, value }) => ({ ...prev, [key]: value }), {})
 
         function parseField([key, value]) {
-            const shouldParseValue = k => typeof defaults[k] === 'object'
-
             key = sanitizeEnvValue(key.replace(upperCaseRE, ''))
-            value = shouldParseValue(key) ? JSON.parse(value) : value
+            try { value = JSON.parse(value) } catch { }
             return { key, value }
         }
     }
@@ -121,7 +117,7 @@ function configent(defaults, input = {}, configentOptions) {
                 .reverse()
             if (configTemplates) {
                 if (configTemplates.length > 1) // we don't care about the default template
-                console.log(`[%s] detected defaults from %s`, name, configTemplates.filter(template => template.file !== 'default.config.js').map(template => template.name).join(', '))
+                    console.log(`[%s] detected defaults from %s`, name, configTemplates.filter(template => template.file !== 'default.config.js').map(template => template.name).join(', '))
                 detectedFromDefaults[hash] = Object.assign({}, ...configTemplates.map(template => template.config({ pkgjson })))
             }
         }

test/basic/test.spec.js

@@ -1,41 +1,38 @@
-
-
 const test = require('ava').default
 const { configent } = require('../..')
 process.chdir(__dirname)
 
-
-test('no env', async t => {
-    const configentOptions = {
-        useConfig: false,
-        useDotEnv: false,
-        useEnv: false,
-        usePackageConfig: false
-    }
-    const defaults = { bar: 123, baz: 456 }
-    const result = configent(defaults, {}, configentOptions)
-    t.deepEqual(result, defaults)
+test('no env', async (t) => {
+  const configentOptions = {
+    useConfig: false,
+    useDotEnv: false,
+    useEnv: false,
+    usePackageConfig: false,
+  }
+  const defaults = { bar: 123, baz: 456 }
+  const result = { ...defaults, ...configent(configentOptions) }
+  t.deepEqual(result, defaults)
 })
 
-test('env', async t => {
-    console.log('cwd2', process.cwd())
-    process.env['BASIC_fromEnv'] = 'true'
-    const defaults = {
-        fromDefaults: true,
-        fromDotEnv: false,
-        fromEnv: false,
-        fromOptions: false,
-        fromConfig: false,
-        fromPackageJson: false,
-    }
-    const options = { fromOptions: true }
-    const result = configent(defaults, options)
-    t.deepEqual(result, {
-        fromDefaults: true,
-        fromDotEnv: 'true',
-        fromEnv: 'true',
-        fromConfig: true,
-        fromPackageJson: true,
-        fromOptions: true,
-    })
+test('env', async (t) => {
+  console.log('cwd2', process.cwd())
+  process.env['BASIC_fromEnv'] = 'true'
+  const defaults = {
+    fromDefaults: true,
+    fromDotEnv: false,
+    fromEnv: false,
+    fromOptions: false,
+    fromConfig: false,
+    fromPackageJson: false,
+  }
+  const options = { fromOptions: true }
+  const result = { ...defaults, ...configent(), ...options }
+  t.deepEqual(result, {
+    fromDefaults: true,
+    fromDotEnv: true,
+    fromEnv: true,
+    fromConfig: true,
+    fromPackageJson: true,
+    fromOptions: true,
+  })
 })

test/context-configs-circular/context.spec.js

@@ -4,20 +4,21 @@ process.chdir(__dirname) //change cwd to __dirname
 
 const defaults = { fromContext: false }
 const configentOptions = {
-    useDetectDefaults: true,
-    cacheConfig: false
+  useDetectDefaults: true,
+  cacheConfig: false,
 }
 
-test('circular tests create error', async t => {
+test('circular tests create error', async (t) => {
+  const res = await t.try(() => ({
+    ...defaults,
+    ...configent(configentOptions),
+  }))
+  res.discard()
 
-    const res = await t.try(() => {
-        configent(defaults, {}, configentOptions)
-    })
-    res.discard()
-
-    t.is(res.errors[0].savedError.message,
-        `Looks like you have circular supersedings ` +
-        `\ncircular1.config.js supersedes circular2` +
-        `\ncircular2.config.js supersedes circular1`
-    )
+  t.is(
+    res.errors[0].savedError.message,
+    `Looks like you have circular supersedings ` +
+      `\ncircular1.config.js supersedes circular2` +
+      `\ncircular2.config.js supersedes circular1`,
+  )
 })

test/context-configs/context.spec.js

@@ -4,36 +4,36 @@ process.chdir(__dirname) //change cwd to __dirname
 
 const defaults = { fromContext: false }
 const configentOptions = {
-    useDetectDefaults: true,
-    cacheConfig: false,
-    cacheDetectedDefaults: false
+  useDetectDefaults: true,
+  cacheConfig: false,
+  cacheDetectedDefaults: false,
 }
 
-test('if no context is found, defaults are unchanged', async t => {
-    const result = configent(defaults, {}, configentOptions)
-    t.deepEqual(result, { fromContext: false })
+test('if no context is found, defaults are unchanged', async (t) => {
+  const result = { ...defaults, ...configent(configentOptions) }
+  t.deepEqual(result, { fromContext: false })
 })
 
-test('if context is found, it sets defaults', async t => {
-    process.env.USE_BASIC = "1"
-    const result = configent(defaults, {}, configentOptions)
-    t.deepEqual(result, { fromContext: 'basic' })
+test('if context is found, it sets defaults', async (t) => {
+  process.env.USE_BASIC = '1'
+  const result = { ...defaults, ...configent(configentOptions) }
+  t.deepEqual(result, { fromContext: 'basic' })
 })
 
-test('if multiple contexts are found, superseder wins', async t => {
-    process.env.USE_SUPERSEDER = "1"
-    const result = configent(defaults, {}, configentOptions)
-    t.deepEqual(result, { fromContext: 'superseder' })
+test('if multiple contexts are found, superseder wins', async (t) => {
+  process.env.USE_SUPERSEDER = '1'
+  const result = { ...defaults, ...configent(configentOptions) }
+  t.deepEqual(result, { fromContext: 'superseder' })
 })
 
-test('can read package.json from cwd', async t => {
-    process.env.USE_PKGJSON = "1"
-    const result = configent(defaults, {}, configentOptions)
-    t.deepEqual(result, { fromContext: 'usepkgjson' })
+test('can read package.json from cwd', async (t) => {
+  process.env.USE_PKGJSON = '1'
+  const result = { ...defaults, ...configent(configentOptions) }
+  t.deepEqual(result, { fromContext: 'usepkgjson' })
 })
 
-test('circular tests create error', async t => {
-    process.env.USE_CIRCULAR = "1"
-    const result = configent(defaults, {}, configentOptions)
-    t.deepEqual(result, { fromContext: 'usepkgjson' })
+test('circular tests create error', async (t) => {
+  process.env.USE_CIRCULAR = '1'
+  const result = { ...defaults, ...configent(configentOptions) }
+  t.deepEqual(result, { fromContext: 'usepkgjson' })
 })