Refactor primitive check and count steps

MetaMask · Oct 3, 2024 · cca668c · cca668c
1 parent 21eb563
commit cca668c
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/shared/modules/sizeof.js b/shared/modules/sizeof.js
@@ -41,6 +41,10 @@ function getPrimitiveSize(data, dataType) {
   }
 }
 
+function isPrimitive(data, dataType) {
+  return data === null || dataType !== 'object';
+}
+
 /**
  * Main module's entry point
  * Calculates Bytes for the provided parameter
@@ -51,26 +55,28 @@ function getPrimitiveSize(data, dataType) {
  */
 export function assertObjectMaxSize(data, maxSize = 0) {
   let size = 0;
-  const topLevelType = typeof data;
-  if (data === null || topLevelType !== 'object') {
-    size = getPrimitiveSize(data, topLevelType);
+
+  function countPrimitiveSize(value, valueType) {
+    size += getPrimitiveSize(value, valueType);
     if (size > maxSize) {
       throw new Error('object exceeded max size');
     }
+  }
+
+  const topLevelType = typeof data;
+  if (isPrimitive(data, topLevelType)) {
+    countPrimitiveSize(data, topLevelType);
     return;
   }
 
   const objects = [data];
 
   function countValueSize(value) {
     const valueType = typeof value;
-    if (value !== null && valueType === 'object') {
-      objects.push(value);
+    if (isPrimitive(value, valueType)) {
+      countPrimitiveSize(value, valueType);
     } else {
-      size += getPrimitiveSize(value, valueType);
-      if (size > maxSize) {
-        throw new Error('object exceeded max size');
-      }
+      objects.push(value);
     }
   }