@znemz/cfn-include 2.1.20 → 2.1.22

package/bin/cli.js

@@ -3,7 +3,7 @@
 const exec = require('child_process').execSync;
 const path = require('path');
 const _ = require('lodash');
-const pathParse = require('path-parse');
+// path.parse is native in Node.js - no need for path-parse package
 
 const include = require('../index');
 const yaml = require('../lib/yaml');
@@ -118,7 +118,7 @@ if (opts.path) {
   let location;
   const protocol = opts.path.match(/^\w+:\/\//);
   if (protocol) location = opts.path;
-  else if (pathParse(opts.path).root) location = `file://${opts.path}`;
+  else if (path.parse(opts.path).root) location = `file://${opts.path}`;
   else location = `file://${path.join(process.cwd(), opts.path)}`;
   promise = include({
     url: location,

package/index.js

@@ -2,12 +2,11 @@ const url = require('url');
 const path = require('path');
 const _ = require('lodash');
 const { glob } = require('glob');
-const Promise = require('bluebird');
 const sortObject = require('@znemz/sort-object');
 const { S3Client, GetObjectCommand } = require('@aws-sdk/client-s3');
 const { addProxyToClient } = require('aws-sdk-v3-proxy');
 
-const pathParse = require('path-parse');
+// path.parse is native in Node.js - no need for path-parse package
 const deepMerge = require('deepmerge');
 const { isTaggableResource } = require('@znemz/cft-utils/src/resources/taggable');
 
@@ -26,6 +25,8 @@ const { lowerCamelCase, upperCamelCase } = require('./lib/utils');
 const { isOurExplicitFunction } = require('./lib/schema');
 const { getAwsPseudoParameters, buildResourceArn } = require('./lib/internals');
 const { cachedReadFile } = require('./lib/cache');
+const { createChildScope } = require('./lib/scope');
+const { promiseProps } = require('./lib/promise-utils');
 
 /**
  * @param  {object} options
@@ -109,7 +110,8 @@ async function recurse({ base, scope, cft, rootTemplate, caller, ...opts }) {
   if (opts.doLog) {
     console.log({ base, scope, cft, rootTemplate, caller, ...opts });
   }
-  scope = _.clone(scope);
+  // Use Object.create() for O(1) child scope creation instead of O(n) clone
+  scope = createChildScope(scope);
   if (Array.isArray(cft)) {
     return Promise.all(cft.map((o) => recurse({ base, scope, cft: o, rootTemplate, caller: 'recurse:isArray', ...opts })));
   }
@@ -137,13 +139,14 @@ async function recurse({ base, scope, cft, rootTemplate, caller, ...opts }) {
         placeholder = '_';
       }
       return PromiseExt.mapX(recurse({ base, scope, cft: list, rootTemplate, caller: 'Fn::Map', ...opts }), (replace, key) => {
-        scope = _.clone(scope);
-        scope[placeholder] = replace;
+        // Use Object.create() for O(1) child scope creation instead of O(n) clone
+        const additions = { [placeholder]: replace };
         if (hasindex) {
-          scope[idx] = key;
+          additions[idx] = key;
         }
-        const replaced = findAndReplace(scope, _.cloneDeep(body));
-        return recurse({ base, scope, cft: replaced, rootTemplate, caller: 'Fn::Map', ...opts });
+        const childScope = createChildScope(scope, additions);
+        const replaced = findAndReplace(childScope, _.cloneDeep(body));
+        return recurse({ base, scope: childScope, cft: replaced, rootTemplate, caller: 'Fn::Map', ...opts });
       }).then((_cft) => {
         if (hassize) {
           _cft = findAndReplace({ [sz]: _cft.length }, _cft);
@@ -582,7 +585,7 @@ async function recurse({ base, scope, cft, rootTemplate, caller, ...opts }) {
       });
     }
 
-    return Promise.props(
+    return promiseProps(
       _.mapValues(cft, (template, key) => recurse({ base, scope, cft: template, key, rootTemplate, caller: 'recurse:isPlainObject:end', ...opts })),
     );
   }
@@ -594,20 +597,23 @@ async function recurse({ base, scope, cft, rootTemplate, caller, ...opts }) {
 }
 
 function findAndReplace(scope, object) {
-  if (_.isString(object)) {
-    _.forEach(scope, function (replace, find) {
+  if (typeof object === 'string') {
+    // Use for...in to walk prototype chain (Object.create() based scopes)
+    for (const find in scope) {
       if (object === find) {
-        object = replace;
+        object = scope[find];
       }
-    });
+    }
   }
-  if (_.isString(object)) {
-    _.forEach(scope, function (replace, find) {
+  if (typeof object === 'string') {
+    // Use for...in to walk prototype chain (Object.create() based scopes)
+    for (const find in scope) {
+      const replace = scope[find];
       const regex = new RegExp(`\\\${${find}}`, 'g');
       if (find !== '_' && object.match(regex)) {
         object = object.replace(regex, replace);
       }
-    });
+    }
   }
   if (Array.isArray(object)) {
     object = object.map(_.bind(findAndReplace, this, scope));
@@ -615,7 +621,7 @@ function findAndReplace(scope, object) {
     object = _.mapKeys(object, function (value, key) {
       return findAndReplace(scope, key);
     });
-    _.keys(object).forEach(function (key) {
+    Object.keys(object).forEach(function (key) {
       if (key === 'Fn::Map') return;
       object[key] = findAndReplace(scope, object[key]);
     });
@@ -737,7 +743,7 @@ async function fnInclude({ base, scope, cft, ...opts }) {
     body = cachedReadFile(absolute).then(procTemplate);
     absolute = `${location.protocol}://${absolute}`;
   } else if (location.protocol === 's3') {
-    const basedir = pathParse(base.path).dir;
+    const basedir = path.parse(base.path).dir;
     const bucket = location.relative ? base.host : location.host;
 
     let key = location.relative ? url.resolve(`${basedir}/`, location.raw) : location.path;
@@ -753,7 +759,7 @@ async function fnInclude({ base, scope, cft, ...opts }) {
       .then((res) => res.Body.toString())
       .then(procTemplate);
   } else if (location.protocol && location.protocol.match(/^https?$/)) {
-    const basepath = `${pathParse(base.path).dir}/`;
+    const basepath = `${path.parse(base.path).dir}/`;
 
     absolute = location.relative
       ? url.resolve(`${location.protocol}://${base.host}${basepath}`, location.raw)

package/lib/promise-utils.js

@@ -0,0 +1,50 @@
+/**
+ * Native Promise utilities to replace bluebird.
+ * These are drop-in replacements for the bluebird methods we use.
+ */
+
+/**
+ * Promise.props replacement - resolves an object of promises.
+ * @param {Object} obj - Object with promise values
+ * @returns {Promise<Object>} Object with resolved values
+ */
+async function promiseProps(obj) {
+  const keys = Object.keys(obj);
+  const values = await Promise.all(keys.map((key) => obj[key]));
+  const result = {};
+  keys.forEach((key, i) => {
+    result[key] = values[i];
+  });
+  return result;
+}
+
+/**
+ * Promise.try replacement - wraps a function to catch sync errors.
+ * @param {Function} fn - Function to execute
+ * @returns {Promise} Promise that resolves to fn result or rejects on error
+ */
+function promiseTry(fn) {
+  return new Promise((resolve, reject) => {
+    try {
+      resolve(fn());
+    } catch (err) {
+      reject(err);
+    }
+  });
+}
+
+/**
+ * Promise.map replacement - maps over array with concurrency.
+ * @param {Array} arr - Array to map over
+ * @param {Function} fn - Async function to apply
+ * @returns {Promise<Array>} Array of resolved values
+ */
+function promiseMap(arr, fn) {
+  return Promise.all(arr.map(fn));
+}
+
+module.exports = {
+  promiseProps,
+  promiseTry,
+  promiseMap,
+};

package/lib/promise.js

@@ -1,17 +1,17 @@
-const Promise = require('bluebird');
-const _ = require('lodash');
+const { promiseTry, promiseMap } = require('./promise-utils');
 
 /*
   Maps over objects or iterables just like lodash.
 */
 const mapWhatever = (promises, cb) =>
-  Promise.try(() =>
+  promiseTry(() =>
     Promise.resolve(promises).then((arrayOrObject) => {
-      if (_.isArray(arrayOrObject)) {
-        return Promise.map(arrayOrObject, cb);
+      if (Array.isArray(arrayOrObject)) {
+        return promiseMap(arrayOrObject, cb);
       }
       const size = Object.values(arrayOrObject).length;
-      return Promise.all(_.map(arrayOrObject, (value, key) => cb(value, key, size)));
+      const entries = Object.entries(arrayOrObject);
+      return Promise.all(entries.map(([key, value]) => cb(value, key, size)));
     }),
   );
 

package/lib/scope.js

@@ -0,0 +1,58 @@
+/**
+ * Scope helper functions for lazy prototype-chain based scope management.
+ *
+ * Instead of _.clone(scope) which copies O(n) properties each time,
+ * we use Object.create(scope) which creates a child scope in O(1) time
+ * that inherits from the parent via the prototype chain.
+ */
+
+/**
+ * Create a child scope that inherits from the parent.
+ * Uses Object.create() for O(1) creation instead of cloning.
+ *
+ * @param {Object} parent - The parent scope to inherit from
+ * @param {Object} [additions={}] - Properties to add to the child scope
+ * @returns {Object} A new child scope with prototype chain to parent
+ */
+function createChildScope(parent, additions = {}) {
+  const child = Object.create(parent);
+  Object.assign(child, additions);
+  return child;
+}
+
+/**
+ * Convert a prototype-chain scope to a plain object.
+ * Uses for...in to walk the entire prototype chain.
+ *
+ * Useful when we need to pass scope to functions that don't
+ * walk the prototype chain (e.g., Object.keys, _.forEach).
+ *
+ * @param {Object} scope - The scope to flatten
+ * @returns {Object} A plain object with all inherited properties
+ */
+function scopeToObject(scope) {
+  const result = {};
+  for (const key in scope) {
+    result[key] = scope[key];
+  }
+  return result;
+}
+
+/**
+ * Iterate over all properties in a scope, including inherited ones.
+ * This is a replacement for _.forEach that walks the prototype chain.
+ *
+ * @param {Object} scope - The scope to iterate over
+ * @param {Function} callback - Function to call with (value, key)
+ */
+function forEachInScope(scope, callback) {
+  for (const key in scope) {
+    callback(scope[key], key);
+  }
+}
+
+module.exports = {
+  createChildScope,
+  scopeToObject,
+  forEachInScope,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@znemz/cfn-include",
-  "version": "2.1.20",
+  "version": "2.1.22",
   "description": "Preprocessor for CloudFormation templates with support for loops and flexible include statements",
   "keywords": [
     "aws",
@@ -48,14 +48,12 @@
     "@znemz/cft-utils": "0.1.33",
     "@znemz/sort-object": "^3.0.4",
     "aws-sdk-v3-proxy": "2.2.0",
-    "bluebird": "^3.7.2",
     "deepmerge": "^4.2.2",
     "glob": "^13.0.0",
     "jmespath": "^0.16.0",
     "js-yaml": "^4.1.1",
     "jsonminify": "^0.4.1",
     "lodash": "^4.17.21",
-    "path-parse": "~1.0.7",
     "proxy-agent": "6.5.0",
     "yargs": "~18.0.0"
   },