configorama 0.9.13 → 0.9.14

package/src/utils/parsing/preProcess.js

@@ -145,6 +145,11 @@ function preProcess(configObject, variableSyntax, variableTypes, options = {}) {
 
         // Comparison operators for detecting string comparison context
         const comparisonOps = ['===', '!==', '==', '!=']
+        // Pre-compile "preceded by string+op" patterns to avoid regex compilation per bare ref
+        const precededByPatterns = comparisonOps.map(op => {
+          const escaped = op.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+          return new RegExp(`["'][^"']*["']\\s*${escaped}\\s*$`)
+        })
 
         // Find and replace bare refs, skipping those inside ${...} or quoted strings
         // Only quote bare refs that are in string comparison context
@@ -171,18 +176,14 @@ function preProcess(configObject, variableSyntax, variableTypes, options = {}) {
           const afterRef = fullContent.substring(matchEnd).trimStart()
           const beforeRef = fullContent.substring(0, matchStart).trimEnd()
 
-          const isComparedToString = comparisonOps.some(op => {
+          const isComparedToString = comparisonOps.some((op, idx) => {
             // Check if followed by: op "string"
             if (afterRef.startsWith(op)) {
               const afterOp = afterRef.substring(op.length).trimStart()
               return afterOp.startsWith('"') || afterOp.startsWith("'")
             }
             // Check if preceded by: "string" op
-            for (const o of comparisonOps) {
-              const pattern = new RegExp(`["'][^"']*["']\\s*${o.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\s*$`)
-              if (pattern.test(beforeRef)) return true
-            }
-            return false
+            return precededByPatterns.some(p => p.test(beforeRef))
           })
 
           // Replace with var ref - quoted if string comparison, unquoted otherwise
@@ -367,11 +368,16 @@ function preProcess(configObject, variableSyntax, variableTypes, options = {}) {
    */
   function traverseAndFix(obj) {
     if (typeof obj === 'string') {
-      // First escape help() variables, convert bare refs in if(), then fix fallbacks
-      const withHelpEscaped = escapeHelpVariables(obj)
-      const withBareRefsConverted = convertBareRefsInIf(withHelpEscaped)
+      // Early exits: skip expensive processing when patterns are absent
+      const hasHelp = obj.indexOf('help(') !== -1
+      const hasEvalOrIf = obj.indexOf('if(') !== -1 || obj.indexOf('eval(') !== -1
+      const hasComma = obj.indexOf(',') !== -1
+
+      const withHelpEscaped = hasHelp ? escapeHelpVariables(obj) : obj
+      const withBareRefsConverted = hasEvalOrIf ? convertBareRefsInIf(withHelpEscaped) : withHelpEscaped
       // Skip fallback fixing for object configs (they handle bare refs differently)
-      return skipFallbackFix ? withBareRefsConverted : fixFallbacksInString(withBareRefsConverted)
+      if (skipFallbackFix || !hasComma) return withBareRefsConverted
+      return fixFallbacksInString(withBareRefsConverted)
     }
 
     if (Array.isArray(obj)) {

package/src/utils/regex/index.js

@@ -2,11 +2,6 @@
  * Shared regex patterns and utilities
  */
 
-// Legacy regex patterns (can't handle nested parentheses properly)
-const funcRegexSimple = /(\w+)\s*\(((?:[^()]+)*)?\s*\)\s*/
-const funcStartOfLineRegex = /^(\w+)\s*\(((?:[^()]+)*)?\s*\)\s*/
-const subFunctionRegex = /(\w+):(\w+)\s*\(((?:[^()]+)*)?\s*\)\s*/
-
 /**
  * Parse a function call with balanced parentheses support
  * Returns a regex-exec-like array: [fullMatch, funcName, args] with index and input properties
@@ -98,13 +93,10 @@ const textRefSyntax = /^text\((~?[@\{\}\:\$a-zA-Z0-9._\-\/\\%,'" =+]+?)\)/g
 
 module.exports = {
   funcRegex,
-  funcRegexSimple,
-  funcStartOfLineRegex,
-  subFunctionRegex,
   fileRefSyntax,
   textRefSyntax,
   combineRegexes,
   parseFunctionCall,
-  // Keep old export name for backwards compat
+  // Alias used by valueFromGit
   functionRegex: funcRegex
 }

package/src/utils/variables/cleanVariable.js

@@ -58,27 +58,6 @@ module.exports = function cleanVariable(
     console.log(`Clean output [${caller}]`, clean)
   }
   return clean
-
-  // Support for simple variable cleaning with no space tweaks
-  if (simple) {
-    return clean
-  }
-
-  // Support for function matches that dont need space alterations
-  if (!clean.match(fileRefSyntax) && functionRegex.exec(clean)) {
-    return clean
-  }
-
-  // If file ref, add spaces after commas
-  // Special case for file(thing, arg, argTwo)
-  if (clean.match(fileRefSyntax)) {
-    // replace spaces before and after commas
-    return clean.replace(/\s*,\s*/g, ', ')
-  }
-
-  return clean.replace(/\s+(?=([^"']*"[^"']*")*[^"']*$)/g, '')
-  // ^ trim White Space OutSide Quotes https://regex101.com/r/BuBNPN/1
-  // Needed for fallback values with spaces. ${empty, 'fallback value with space'}
 }
 
 

package/types/src/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/main.js"],"names":[],"mappings":";AA0GA;IACE,0CA4dC;IApdC,cAcW;IAuBX,gBAAqB;IAErB,mCAAoC;IAEpC,sBAAwB;IACxB,qBAAuB;IAGvB,uBAA4B;IAsB5B,uBAAoC;IAIpC,kBAAqC;IACrC,kBAAqC;IAErC,yBAA+F;IAC/F,yBAAuD;IACvD,kCAAyE;IAKvE,uBAAgD;IAKhD,YAAuB;IAEvB,oBAA0C;IAE1C,gBAAoD;IAOpD,uBAAkC;IAElC,uBAA8B;IAE9B,uBAAkC;IASpC,wBAAmC;IAGnC,mBAqHC;IAwED,4BAA8C;IAG9C,iCAAkC;IAalC,aA2EC;IAUD,oBAEC;IAGD,eAkDC;IAOD,YAAc;IACd,cAAgB;IAChB,kBAAkB;IAGpB;;;;OAIG;IACH,0BAHW,MAAM,GACJ,OAAO,CAQnB;IAED;;;;OAIG;IACH,6BAHW,MAAM,GACJ,MAAM,GAAC,IAAI,CAOvB;IAED;;;;OAIG;IACH,gCAHW,MAAM,GACJ,OAAO,CA2BnB;IAKD;;;;;OAKG;IACH,oBAFa,OAAO,CAAC,GAAG,CAAC,CA8vBxB;IA3vBC,aAA4B;IAc1B,2BAA4B;IAmB1B,sBAA0C;IAC1C,4BAAkC;IA2tBxC;;;OAGG;IACH,2BAFa,MAAM,CA6alB;IAvBC;;;;;;;;;;;;;;;MAoBC;IAIH;;;;OAIG;IACH,uCAFa,OAAO,CAAC,GAAG,CAAC,CAIxB;IACD,+CAsBC;IAKD;;;;;;;;;;;;;;;;;;;OAmBG;IACH;;;;;;;;;;;OAWG;IACH,mFAHa;;;;cAZC,QAAQ;;;;eACR,IAAI,GAAC,MAAM,SAAO;OAWD,CA6E9B;IACD;;;OAGG;IACH;;;;;OAKG;IACH,oCAHa,OAAO,CAAC;;;;cAjGP,QAAQ;;;;eACR,IAAI,GAAC,MAAM,SAAO;OAgGgB,CAAC,EAAE,CA6BlD;IACD;;;;;OAKG;IACH,iDAFa,OAAO,CAAC,IAAI,CAAC,CAWzB;IAID;;;;;OAKG;IACH;;;;OAIG;IACH,2BAFa,eAAc;;;;;;;;;;OAAa,CAavC;IACD;;;;;OAKG;IACH,yBAHW;;;;;;;;;;OAAa,gCACX,cAAS,CAOrB;IACD;;;;;;OAMG;IACH,6DAFa,GAAC,CAiLb;IAKD;;;;;;;OAOG;IACH,yDAHa,OAAO,CAAC,GAAG,CAAC,CAiCxB;IACD;;;;OAIG;IAOH;;;;;;OAMG;IACH,wFA2BC;IACD;;;;;;;;;;;OAWG;IACH,8BARG;QAAyB,KAAK,EAAtB,GAAG;QACoB,IAAI,GAA3B,MAAM,EAAE;QACa,cAAc,GAAnC,MAAM;QACc,iBAAiB;KAC7C,6CAEU;QAAC,KAAK,EAAE,GAAG,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAC;QAAC,iBAAiB,CAAC,QAAQ;QAAC,oBAAoB,CAAC,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAC,CAsa9J;IAID;;;;;;;;OAQG;IACH,qEAHa,OAAO,CAAC,GAAG,CAAC,CAoExB;IAKD;;;;;;;OAOG;IACH,0FAFa,OAAO,CAAC,GAAG,CAAC,CAiiBxB;IACD,+EA+BC;IACD,yDAiBC;IACD,oEA6BC;IAKD,8CAQC;IACD,kDAyBC;IACD;;;;;;;;;;;;;OAaG;IACH,wEAoDC;IAKD,4BAOC;IACD,sCAqEC;CACF"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/main.js"],"names":[],"mappings":";AA0GA;IACE,0CA2dC;IAndC,cAcW;IAuBX,gBAAqB;IAErB,mCAAoC;IAEpC,sBAAwB;IACxB,qBAAuB;IAGvB,uBAA4B;IAsB5B,uBAAoC;IAIpC,kBAAqC;IACrC,kBAAqC;IAErC,yBAA+F;IAC/F,yBAAuD;IACvD,kCAAyE;IAKvE,uBAAgD;IAKhD,YAAuB;IAEvB,oBAA0C;IAE1C,gBAAoD;IAOpD,uBAAkC;IAElC,uBAA8B;IAE9B,uBAAkC;IASpC,wBAAmC;IAGnC,mBAqHC;IAwED,4BAA8C;IAG9C,iCAAkC;IAalC,aA2EC;IAUD,oBAEC;IAGD,eAiDC;IAOD,YAAc;IACd,cAAgB;IAChB,kBAAkB;IAGpB;;;;OAIG;IACH,0BAHW,MAAM,GACJ,OAAO,CAQnB;IAED;;;;OAIG;IACH,6BAHW,MAAM,GACJ,MAAM,GAAC,IAAI,CAOvB;IAED;;;;OAIG;IACH,gCAHW,MAAM,GACJ,OAAO,CA2BnB;IAKD;;;;;OAKG;IACH,oBAFa,OAAO,CAAC,GAAG,CAAC,CA6vBxB;IA1vBC,aAA4B;IAc1B,2BAA4B;IAmB1B,sBAA0C;IAC1C,4BAAkC;IA0tBxC;;;OAGG;IACH,2BAFa,MAAM,CA6alB;IAvBC;;;;;;;;;;;;;;;MAoBC;IAIH;;;;OAIG;IACH,uCAFa,OAAO,CAAC,GAAG,CAAC,CAIxB;IACD,+CAsBC;IAKD;;;;;;;;;;;;;;;;;;;OAmBG;IACH;;;;;;;;;;;OAWG;IACH,mFAHa;;;;cAZC,QAAQ;;;;eACR,IAAI,GAAC,MAAM,SAAO;OAWD,CA6E9B;IACD;;;OAGG;IACH;;;;;OAKG;IACH,oCAHa,OAAO,CAAC;;;;cAjGP,QAAQ;;;;eACR,IAAI,GAAC,MAAM,SAAO;OAgGgB,CAAC,EAAE,CA6BlD;IACD;;;;;OAKG;IACH,iDAFa,OAAO,CAAC,IAAI,CAAC,CAWzB;IAID;;;;;OAKG;IACH;;;;OAIG;IACH,2BAFa,eAAc;;;;;;;;;;OAAa,CAavC;IACD;;;;;OAKG;IACH,yBAHW;;;;;;;;;;OAAa,gCACX,cAAS,CAOrB;IACD;;;;;;OAMG;IACH,6DAFa,GAAC,CAiLb;IAKD;;;;;;;OAOG;IACH,yDAHa,OAAO,CAAC,GAAG,CAAC,CAiCxB;IACD;;;;OAIG;IAOH;;;;;;OAMG;IACH,wFA2BC;IACD;;;;;;;;;;;OAWG;IACH,8BARG;QAAyB,KAAK,EAAtB,GAAG;QACoB,IAAI,GAA3B,MAAM,EAAE;QACa,cAAc,GAAnC,MAAM;QACc,iBAAiB;KAC7C,6CAEU;QAAC,KAAK,EAAE,GAAG,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAC;QAAC,iBAAiB,CAAC,QAAQ;QAAC,oBAAoB,CAAC,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAC,CAsa9J;IAID;;;;;;;;OAQG;IACH,qEAHa,OAAO,CAAC,GAAG,CAAC,CAoExB;IAKD;;;;;;;OAOG;IACH,0FAFa,OAAO,CAAC,GAAG,CAAC,CAiiBxB;IACD,+EA+BC;IACD,yDAiBC;IACD,oEA6BC;IAKD,8CAQC;IACD,kDAyBC;IACD;;;;;;;;;;;;;OAaG;IACH,wEAoDC;IAKD,4BAOC;IACD,sCAqEC;CACF"}

package/types/src/resolvers/valueFromEnv.d.ts

@@ -1,5 +1,5 @@
 declare const envRefSyntax: RegExp;
-declare function getValueFromEnv(variableString: any): Promise<string | NodeJS.ProcessEnv>;
+declare function getValueFromEnv(variableString: any): Promise<string>;
 export declare let type: string;
 export declare let source: string;
 export declare let syntax: string;

package/types/src/resolvers/valueFromEnv.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"valueFromEnv.d.ts","sourceRoot":"","sources":["../../../src/resolvers/valueFromEnv.js"],"names":[],"mappings":"AACA,mCAAqC;AAErC,2FAmBC"}
+{"version":3,"file":"valueFromEnv.d.ts","sourceRoot":"","sources":["../../../src/resolvers/valueFromEnv.js"],"names":[],"mappings":"AAGA,mCAAqC;AAErC,uEAcC"}

package/types/src/resolvers/valueFromGit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"valueFromGit.d.ts","sourceRoot":"","sources":["../../../src/resolvers/valueFromGit.js"],"names":[],"mappings":"AAoViB;;;;;;;;EAUhB"}
+{"version":3,"file":"valueFromGit.d.ts","sourceRoot":"","sources":["../../../src/resolvers/valueFromGit.js"],"names":[],"mappings":"AA2XiB;;;;;;;;EAUhB"}

package/types/src/resolvers/valueFromOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"valueFromOptions.d.ts","sourceRoot":"","sources":["../../../src/resolvers/valueFromOptions.js"],"names":[],"mappings":"AACA,mCAAqC;AAErC,sFASC"}
+{"version":3,"file":"valueFromOptions.d.ts","sourceRoot":"","sources":["../../../src/resolvers/valueFromOptions.js"],"names":[],"mappings":"AAEA,mCAAqC;AAErC,sFAIC"}

package/types/src/resolvers/valueFromParam.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"valueFromParam.d.ts","sourceRoot":"","sources":["../../../src/resolvers/valueFromParam.js"],"names":[],"mappings":"AACA,qCAAyC;AAEzC;;;;;;;;;;GAUG;AACH,mDALW,MAAM,gCAGJ,OAAO,CAAC,GAAG,CAAC,CAqExB"}
+{"version":3,"file":"valueFromParam.d.ts","sourceRoot":"","sources":["../../../src/resolvers/valueFromParam.js"],"names":[],"mappings":"AAEA,qCAAyC;AAEzC;;;;;;;;;;GAUG;AACH,mDALW,MAAM,gCAGJ,OAAO,CAAC,GAAG,CAAC,CAqExB"}

package/types/src/utils/parsing/preProcess.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preProcess.d.ts","sourceRoot":"","sources":["../../../../src/utils/parsing/preProcess.js"],"names":[],"mappings":";AASA;;;;;;;;GAQG;AACH,+DANW,MAAM,mCAGd;IAA0B,eAAe,GAAjC,OAAO;CACf,OA0XF"}
+{"version":3,"file":"preProcess.d.ts","sourceRoot":"","sources":["../../../../src/utils/parsing/preProcess.js"],"names":[],"mappings":";AASA;;;;;;;;GAQG;AACH,+DANW,MAAM,mCAGd;IAA0B,eAAe,GAAjC,OAAO;CACf,OAgYF"}

package/types/src/utils/regex/index.d.ts

@@ -4,12 +4,6 @@ export namespace funcRegex {
     export let source: string;
     export function toString(): string;
 }
-/**
- * Shared regex patterns and utilities
- */
-export const funcRegexSimple: RegExp;
-export const funcStartOfLineRegex: RegExp;
-export const subFunctionRegex: RegExp;
 export const fileRefSyntax: RegExp;
 export const textRefSyntax: RegExp;
 /**
@@ -18,6 +12,9 @@ export const textRefSyntax: RegExp;
  * @returns {RegExp} Combined regex with OR operator
  */
 export function combineRegexes(regexes: RegExp[]): RegExp;
+/**
+ * Shared regex patterns and utilities
+ */
 /**
  * Parse a function call with balanced parentheses support
  * Returns a regex-exec-like array: [fullMatch, funcName, args] with index and input properties

package/types/src/utils/regex/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/utils/regex/index.js"],"names":[],"mappings":";;IA+EQ,wCAAwC;;IAGpC,mCAAkC;;AAlF9C;;GAEG;AAGH,qCAA0D;AAC1D,0CAAgE;AAChE,sCAAiE;AAwFjE,mCAA2E;AAC3E,mCAA2E;AAX3E;;;;GAIG;AACH,wCAHW,MAAM,EAAE,GACN,MAAM,CAKlB;AApFD;;;;;;GAMG;AACH,uCAHW,MAAM,GACJ,GAAG,CAyDf"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/utils/regex/index.js"],"names":[],"mappings":";;IA0EQ,wCAAwC;;IAGpC,mCAAkC;;AAa9C,mCAA2E;AAC3E,mCAA2E;AAX3E;;;;GAIG;AACH,wCAHW,MAAM,EAAE,GACN,MAAM,CAKlB;AAxFD;;GAEG;AAEH;;;;;;GAMG;AACH,uCAHW,MAAM,GACJ,GAAG,CAyDf"}

package/types/src/utils/variables/cleanVariable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cleanVariable.d.ts","sourceRoot":"","sources":["../../../../src/utils/variables/cleanVariable.js"],"names":[],"mappings":"AAUiB,2GAFJ,MAAM,CAyElB"}
+{"version":3,"file":"cleanVariable.d.ts","sourceRoot":"","sources":["../../../../src/utils/variables/cleanVariable.js"],"names":[],"mappings":"AAUiB,2GAFJ,MAAM,CAoDlB"}