@znemz/cfn-include 2.1.17 → 2.1.19

package/lib/replaceEnv.js

@@ -1,6 +1,34 @@
 const passThrough = (template) => template
 const replaceProcessEnv = (template) => replaceEnv(template, process.env, false)
 
+// Cache for compiled regex patterns to avoid re-creating them
+const regexCache = new Map();
+
+/**
+ * Escape special regex characters in a string
+ * @param {string} str - String to escape
+ * @returns {string} Escaped string safe for regex
+ */
+function escapeRegExp(str) {
+  return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+/**
+ * Get a cached regex for variable substitution
+ * @param {string} key - Variable name
+ * @param {boolean} withBraces - Whether to match ${key} format (true) or $key format (false)
+ * @returns {RegExp} Cached regex pattern
+ */
+function getVarRegex(key, withBraces) {
+  const cacheKey = `${key}:${withBraces}`;
+  if (!regexCache.has(cacheKey)) {
+    const escaped = escapeRegExp(key);
+    const pattern = withBraces ? `\\$\\{${escaped}\\}` : `\\$${escaped}`;
+    regexCache.set(cacheKey, new RegExp(pattern, 'g'));
+  }
+  return regexCache.get(cacheKey);
+}
+
 const replaceEnv = (template, inject = {}, doEnv) => {
   processTemplate = doEnv ? replaceProcessEnv : passThrough;
 
@@ -15,9 +43,17 @@ const replaceEnv = (template, inject = {}, doEnv) => {
     const key = keys[i];
     let val = inject[key];
 
+    // Use cached regex patterns instead of creating new ones each time
+    const bareRegex = getVarRegex(key, false);
+    const bracedRegex = getVarRegex(key, true);
+    
+    // Reset lastIndex for global regex reuse
+    bareRegex.lastIndex = 0;
+    bracedRegex.lastIndex = 0;
+    
     template = template
-      .replace(new RegExp(`\\$${key}`, "g"), val)
-      .replace(new RegExp(`\\$\{${key}}`, "g"), val);
+      .replace(bareRegex, val)
+      .replace(bracedRegex, val);
   }
 
   // return template;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@znemz/cfn-include",
-  "version": "2.1.17",
+  "version": "2.1.19",
   "description": "Preprocessor for CloudFormation templates with support for loops and flexible include statements",
   "keywords": [
     "aws",
@@ -45,7 +45,7 @@
   "dependencies": {
     "@aws-sdk/client-cloudformation": "^3.637.0",
     "@aws-sdk/client-s3": "^3.637.0",
-    "@znemz/cft-utils": "0.1.31",
+    "@znemz/cft-utils": "0.1.33",
     "@znemz/sort-object": "^3.0.4",
     "aws-sdk-v3-proxy": "2.2.0",
     "bluebird": "^3.7.2",
@@ -73,7 +73,7 @@
     "npm-run-all": "4.1.5",
     "prettier": "3",
     "serve": "14.2.5",
-    "sort-package-json": "3.6.0"
+    "sort-package-json": "3.6.1"
   },
   "engines": {
     "node": ">=20.19"