configorama 0.6.9 → 0.6.11

package/cli.js

@@ -5,6 +5,8 @@ const minimist = require('minimist')
 const Configorama = require('./src/main')
 const deepLog = require('./src/utils/deep-log')
 const { logHeader } = require('./src/utils/logs')
+const configorama = require('./src')
+const { makeBox } = require('@davidwells/box-logger')
 
 // Parse command line arguments
 const argv = minimist(process.argv.slice(2), {
@@ -77,32 +79,39 @@ if (!fs.existsSync(inputFile)) {
 const options = {
   allowUnknownVars: argv['allow-unknown'] || false,
   allowUndefinedValues: argv['allow-undefined'] || false,
+  allowUnknownFileRefs: argv['allow-unknown-file-refs'] || false,
+  returnMetadata: argv['return-metadata'] || false,
+  returnPreResolvedVariableDetails: argv['setup'] || false,
   dynamicArgs: argv
 }
 
+const dynamicArgs = options.dynamicArgs || {}
+const { 
+  _, 
+  verbose, 
+  v,
+  verify,
+  debug, 
+  d, 
+  help, 
+  h, 
+  version,
+  f,
+  format,
+  list,
+  l,
+  info,
+  i,
+  'allow-unknown': allowUnknown, 
+  'allow-undefined': allowUndefined,
+  'allow-unknown-file-refs': allowUnknownFileRefs,
+  'return-metadata': returnMetadata,
+  ...rest 
+} = dynamicArgs
+
+
 if (options.dynamicArgs.verbose) {
   logHeader('Config Input Options')
-  const dynamicArgs = options.dynamicArgs || {}
-  const { 
-    _, 
-    verbose, 
-    v,
-    verify,
-    debug, 
-    d, 
-    help, 
-    h, 
-    version,
-    f,
-    format,
-    list,
-    l,
-    info,
-    i,
-    'allow-unknown': allowUnknown, 
-    'allow-undefined': allowUndefined, 
-    ...rest 
-  } = dynamicArgs
 
   console.log()
   if (Object.keys(rest).length) {
@@ -118,12 +127,11 @@ if (argv._.length) {
   isSetupMode = argv._.includes('setup')
 }
 
-// Create Configorama instance
-const configorama = new Configorama(inputFile, options)
-// console.log('configorama', configorama)
+// Set -- flags as options
+options.options = rest
 
 // Process the configuration
-configorama.init(argv)
+configorama(inputFile, options)
   .then((config) => {
     let output
 
@@ -131,15 +139,27 @@ configorama.init(argv)
     switch (argv.format.toLowerCase()) {
       case 'yaml':
       case 'yml':
-        const YAML = require('./lib/parsers/yaml')
+        const YAML = require('./src/parsers/yaml')
         output = YAML.dump(config)
         break
+      case 'esm':
+      case 'mjs':
+      case 'module':
+        output = `export default ${JSON.stringify(config, null, 2)}`
+        break
       case 'js':
+      case 'cjs':
+      case 'commonjs':
       case 'javascript':
         output = `module.exports = ${JSON.stringify(config, null, 2)}`
         break
       case 'json':
+      case 'json5':
       default:
+        if (returnMetadata) {
+          // turn regex into string
+          config.variableSyntax = config.variableSyntax ? config.variableSyntax.source : undefined
+        }
         output = JSON.stringify(config, null, 2)
     }
 
@@ -151,11 +171,20 @@ configorama.init(argv)
       if (!argv.verbose) {
         console.log(output)
       }
+      if (argv.format && argv.verbose) {
+        console.log('Output Format:', argv.format)
+        console.log(output)
+      }
     }
   })
   .catch((error) => {
-    console.error(`Error processing configuration: ${inputFile}`)
-    console.error(error.message)
+    const errorMsg = makeBox({
+      title: `Error Processing Configuration: ${inputFile}`,
+      minWidth: '100%',
+      content: error.message,
+      type: 'error',
+    })
+    console.log(errorMsg)
     if (argv.debug) {
       console.error(error.stack)
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "configorama",
-  "version": "0.6.9",
+  "version": "0.6.11",
   "description": "Variable support for configuration files",
   "main": "src/index.js",
   "types": "index.d.ts",
@@ -17,6 +17,7 @@
     "configorama": "./cli.js"
   },
   "scripts": {
+    "info": "repomix --include \"cli.js,src/**/*.js\" --ignore \"**/*.test.js\" --copy",
     "docs": "node ./scripts/docs.js",
     "t": "./scripts/run-tests.sh",
     "test": "npm run test:lib && uvu tests \".*\\.test.js$\" ",
@@ -37,7 +38,8 @@
     "url": "https://github.com/DavidWells/configorama"
   },
   "dependencies": {
-    "@davidwells/box-logger": "^1.0.20",
+    "@clack/prompts": "^0.11.0",
+    "@davidwells/box-logger": "^2.0.3",
     "@iarna/toml": "^2.2.5",
     "alias-hq": "^6.2.3",
     "dot-prop": "^5.3.0",

package/src/index.js

@@ -28,15 +28,52 @@ module.exports = async (configPathOrObject, settings = {}) => {
   if (settings.returnMetadata) {
     const metadata = instance.collectVariableMetadata()
 
+    // console.log('instance.fileRefsFound', instance.fileRefsFound)
+    // console.log('instance.resolutionTracking', instance.resolutionTracking)
+    // process.exit(1)
+
     // Enrich metadata with resolution tracking data collected during execution
-    const enrichedMetadata = enrichMetadata(metadata, instance.resolutionTracking, instance.variableSyntax)
+    const enrichedMetadata = enrichMetadata(
+      metadata,
+      instance.resolutionTracking,
+      instance.variableSyntax,
+      instance.fileRefsFound,
+      instance.originalConfig,
+      instance.configFilePath,
+      Object.keys(instance.filters)
+    )
+
+    // Add resolvedPropertyValue to resolutionTracking
+    const resolutionHistoryWithResolvedValues = {}
+    for (const pathKey in instance.resolutionTracking) {
+      const tracking = instance.resolutionTracking[pathKey]
+      const keys = pathKey.split('.')
+      let resolvedValue = config
+
+      // Navigate to the resolved value in the config
+      for (const key of keys) {
+        if (resolvedValue && typeof resolvedValue === 'object') {
+          resolvedValue = resolvedValue[key]
+        } else {
+          resolvedValue = undefined
+          break
+        }
+      }
+
+      resolutionHistoryWithResolvedValues[pathKey] = {
+        ...tracking,
+        resolvedPropertyValue: resolvedValue
+      }
+    }
 
     return {
+      variableSyntax: instance.variableSyntax,
+      variableTypes: instance.variableTypes,
       config,
       originalConfig: instance.originalConfig,
       metadata: enrichedMetadata,
       // Include resolution history per path for debugging and advanced use cases
-      resolutionHistory: instance.resolutionTracking
+      resolutionHistory: resolutionHistoryWithResolvedValues,
     }
   }