configorama 0.7.1 → 0.7.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "configorama",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "Variable support for configuration files",
   "main": "src/index.js",
   "types": "index.d.ts",

package/src/utils/paths/filePathUtils.js

@@ -34,20 +34,44 @@ function normalizePath(filePath) {
 }
 
 /**
- * Extract file path from a file() or text() variable string
+ * Extract file path from a file() or text() variable string using balanced paren matching
  * @param {string} variableString - The variable string (with or without ${} wrapper)
  * @returns {object|null} Object with filePath, or null if no match
  */
 function extractFilePath(variableString) {
-  // Match both ${file(...)} and file(...) formats
-  const fileMatch = variableString.match(/^(?:\$\{)?(?:file|text)\((.*?)\)/)
-  if (!fileMatch || !fileMatch[1]) {
+  // Match the file( or text( prefix
+  const prefixMatch = variableString.match(/^(?:\$\{)?(file|text)\(/)
+  if (!prefixMatch) {
+    return null
+  }
+
+  // Find matching closing paren using depth tracking
+  const startIndex = prefixMatch[0].length - 1 // Position of opening (
+  let depth = 1
+  let i = startIndex + 1
+
+  while (i < variableString.length && depth > 0) {
+    if (variableString[i] === '(') {
+      depth++
+    } else if (variableString[i] === ')') {
+      depth--
+    }
+    i++
+  }
+
+  if (depth !== 0) {
+    return null
+  }
+
+  // Extract content between balanced parens
+  const fileContent = variableString.substring(startIndex + 1, i - 1).trim()
+  if (!fileContent) {
     return null
   }
 
   const { trimSurroundingQuotes } = require('../strings/quoteUtils')
-  const fileContent = fileMatch[1].trim()
-  const parts = splitCsv(fileContent)
+  // Protect ${} variables from being split (e.g., file paths with default values)
+  const parts = splitCsv(fileContent, undefined, { protectVariables: true })
   let filePath = parts[0].trim()
 
   // Remove quotes if present

package/src/utils/paths/filePathUtils.test.js

@@ -103,6 +103,22 @@ test('extractFilePath - handles bare filename', () => {
   assert.is(result.filePath, 'config.json')
 })
 
+test('extractFilePath - handles nested variable with default value in path', () => {
+  // This is the bug case: ${self:provider.stage, 'dev'} has a comma inside
+  const result = extractFilePath("file(./env.${self:provider.stage, 'dev'}.yml):FOO")
+  assert.is(result.filePath, "./env.${self:provider.stage, 'dev'}.yml")
+})
+
+test('extractFilePath - handles nested variable without default in path', () => {
+  const result = extractFilePath("file(./env.${self:provider.stage}.yml):FOO")
+  assert.is(result.filePath, "./env.${self:provider.stage}.yml")
+})
+
+test('extractFilePath - handles multiple nested variables in path', () => {
+  const result = extractFilePath("file(./config-${self:stage, 'dev'}-${self:region}.yml)")
+  assert.is(result.filePath, "./config-${self:stage, 'dev'}-${self:region}.yml")
+})
+
 // normalizeFileVariable tests
 
 test('normalizeFileVariable - returns non-file strings unchanged', () => {

package/src/utils/strings/splitCsv.js

@@ -1,14 +1,19 @@
 const { splitByComma } = require('./splitByComma')
 
+// Regex to match ${...} variables (used for protection during file path splitting)
+const VARIABLE_SYNTAX = /\${[^}]+}/g
+
 /**
  * Split a string by comma while preserving quoted content
  * NOTE: This is a simpler version that delegates to splitByComma for consistency.
  * For advanced use cases with bracket depth tracking and regex protection, use splitByComma directly.
  * @param {string} str - String to split
  * @param {string} [splitter] - Optional custom splitter (defaults to ',')
+ * @param {object} [options] - Options object
+ * @param {boolean} [options.protectVariables] - If true, protect ${} variables from splitting
  * @returns {string[]} Array of split strings
  */
-function splitCsv(str, splitter) {
+function splitCsv(str, splitter, options = {}) {
   // If custom splitter is provided, fall back to original simple implementation
   if (splitter && splitter !== ',') {
     const splitSyntax = splitter
@@ -32,6 +37,10 @@ function splitCsv(str, splitter) {
   }
 
   // For standard comma splitting, use the more robust splitByComma
+  // Pass VARIABLE_SYNTAX if protectVariables is true to protect ${} from splitting
+  if (options.protectVariables) {
+    return splitByComma(str, VARIABLE_SYNTAX)
+  }
   return splitByComma(str)
 }
 

package/types/src/utils/paths/filePathUtils.d.ts

@@ -5,7 +5,7 @@
  */
 export function normalizePath(filePath: string): string | null;
 /**
- * Extract file path from a file() or text() variable string
+ * Extract file path from a file() or text() variable string using balanced paren matching
  * @param {string} variableString - The variable string (with or without ${} wrapper)
  * @returns {object|null} Object with filePath, or null if no match
  */

package/types/src/utils/paths/filePathUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filePathUtils.d.ts","sourceRoot":"","sources":["../../../../src/utils/paths/filePathUtils.js"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,wCAHW,MAAM,GACJ,MAAM,GAAC,IAAI,CA0BvB;AAED;;;;GAIG;AACH,gDAHW,MAAM,GACJ,MAAM,GAAC,IAAI,CAkBvB;AAED;;;;;GAKG;AACH,sDAHW,MAAM,GACJ,MAAM,CAkBlB;AAED;;;;;;;GAOG;AACH,2CANW,MAAM,kBACN,MAAM,UACN,MAAM,sBAEJ;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,OAAO,CAAA;CAAC,CAwCnD"}
+{"version":3,"file":"filePathUtils.d.ts","sourceRoot":"","sources":["../../../../src/utils/paths/filePathUtils.js"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,wCAHW,MAAM,GACJ,MAAM,GAAC,IAAI,CA0BvB;AAED;;;;GAIG;AACH,gDAHW,MAAM,GACJ,MAAM,GAAC,IAAI,CA0CvB;AAED;;;;;GAKG;AACH,sDAHW,MAAM,GACJ,MAAM,CAkBlB;AAED;;;;;;;GAOG;AACH,2CANW,MAAM,kBACN,MAAM,UACN,MAAM,sBAEJ;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,OAAO,CAAA;CAAC,CAwCnD"}

package/types/src/utils/strings/splitCsv.d.ts

@@ -4,7 +4,11 @@
  * For advanced use cases with bracket depth tracking and regex protection, use splitByComma directly.
  * @param {string} str - String to split
  * @param {string} [splitter] - Optional custom splitter (defaults to ',')
+ * @param {object} [options] - Options object
+ * @param {boolean} [options.protectVariables] - If true, protect ${} variables from splitting
  * @returns {string[]} Array of split strings
  */
-export function splitCsv(str: string, splitter?: string): string[];
+export function splitCsv(str: string, splitter?: string, options?: {
+    protectVariables?: boolean;
+}): string[];
 //# sourceMappingURL=splitCsv.d.ts.map

package/types/src/utils/strings/splitCsv.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"splitCsv.d.ts","sourceRoot":"","sources":["../../../../src/utils/strings/splitCsv.js"],"names":[],"mappings":"AAEA;;;;;;;GAOG;AACH,8BAJW,MAAM,aACN,MAAM,GACJ,MAAM,EAAE,CA2BpB"}
+{"version":3,"file":"splitCsv.d.ts","sourceRoot":"","sources":["../../../../src/utils/strings/splitCsv.js"],"names":[],"mappings":"AAKA;;;;;;;;;GASG;AACH,8BANW,MAAM,aACN,MAAM,YAEd;IAA0B,gBAAgB,GAAlC,OAAO;CACf,GAAU,MAAM,EAAE,CA+BpB"}