minor fixes

iliakan · iliakan · commit adf1c592e34d · 2024-11-05T14:05:38.000+01:00
diff --git a/text-utils/capitalizeKeys.js b/text-utils/capitalizeKeys.js
@@ -1,30 +1,48 @@
-
-function capitalizeKeys(obj, mapper, seen = new WeakSet()) {
-  if (Array.isArray(obj)) {
-    return obj.map(item => capitalizeKeys(item, mapper, seen));
-  }
-
-  if (Object.prototype.toString.call(obj) !== '[object Object]') {
-    return obj;
-  }
-
-  if (seen.has(obj)) {
-    throw new Error("Circular reference detected");
+function capitalizeKeys(obj, mapper) {
+  const seen = new WeakSet();
+  const stack = [{ input: obj, output: Array.isArray(obj) ? [] : {} }];
+  const rootOutput = stack[0].output;
+
+  while (stack.length > 0) {
+    const { input, output } = stack.pop();
+
+    if (seen.has(input)) {
+      console.error("Circular reference in capitalizeKeys", obj);
+      throw new Error("Circular reference detected");
+    }
+    seen.add(input);
+
+    if (Array.isArray(input)) {
+      input.forEach((item, index) => {
+        if (Array.isArray(item)) {
+          output[index] = [];
+          stack.push({ input: item, output: output[index] });
+        } else if (typeof item === 'object' && item !== null) {
+          output[index] = {};
+          stack.push({ input: item, output: output[index] });
+        } else {
+          output[index] = item;
+        }
+      });
+    } else if (typeof input === 'object' && input !== null) {
+      Object.entries(input).forEach(([key, value]) => {
+        let keyCapitalized = key.replace(/_(\w)/g, (_, letter) => letter.toUpperCase());
+        if (mapper) keyCapitalized = mapper(keyCapitalized);
+
+        if (Array.isArray(value)) {
+          output[keyCapitalized] = [];
+          stack.push({ input: value, output: output[keyCapitalized] });
+        } else if (typeof value === 'object' && value !== null) {
+          output[keyCapitalized] = {};
+          stack.push({ input: value, output: output[keyCapitalized] });
+        } else {
+          output[keyCapitalized] = value;
+        }
+      });
+    }
   }
 
-  seen.add(obj); // Mark the object as visited.
-
-  let output = {};
-
-  for (let key in obj) {
-    let keyCapitalized = key.replace(/_(\w)/g, (match, letter) => letter.toUpperCase());
-    if (mapper) keyCapitalized = mapper(keyCapitalized);
-    output[keyCapitalized] = capitalizeKeys(obj[key], mapper, seen);
-  }
-
-  seen.delete(obj); // Remove from `seen` after processing to allow for reuse in non-circular parts.
-
-  return output;
+  return rootOutput;
 }
 
 module.exports = capitalizeKeys;
