starknet 6.2.0 → 6.2.1

package/dist/index.mjs

@@ -1311,13 +1311,40 @@ function extractCairo0Tuple(type) {
   }
   return recomposed;
 }
+function getClosureOffset(input, open, close) {
+  for (let i = 0, counter = 0; i < input.length; i++) {
+    if (input[i] === open) {
+      counter++;
+    } else if (input[i] === close && --counter === 0) {
+      return i;
+    }
+  }
+  return Number.POSITIVE_INFINITY;
+}
 function extractCairo1Tuple(type) {
-  const cleanType = type.replace(/\s/g, "").slice(1, -1);
-  const { subTuple, result } = parseSubTuple(cleanType);
-  const recomposed = result.split(",").map((it) => {
-    return subTuple.length ? it.replace(" ", subTuple.shift()) : it;
-  });
-  return recomposed;
+  const input = type.slice(1, -1);
+  const result = [];
+  let currentIndex = 0;
+  let limitIndex;
+  while (currentIndex < input.length) {
+    switch (true) {
+      case input[currentIndex] === "(": {
+        limitIndex = currentIndex + getClosureOffset(input.slice(currentIndex), "(", ")") + 1;
+        break;
+      }
+      case (input.startsWith("core::result::Result::<", currentIndex) || input.startsWith("core::array::Array::<", currentIndex) || input.startsWith("core::option::Option::<", currentIndex)): {
+        limitIndex = currentIndex + getClosureOffset(input.slice(currentIndex), "<", ">") + 1;
+        break;
+      }
+      default: {
+        const commaIndex = input.indexOf(",", currentIndex);
+        limitIndex = commaIndex !== -1 ? commaIndex : Number.POSITIVE_INFINITY;
+      }
+    }
+    result.push(input.slice(currentIndex, limitIndex));
+    currentIndex = limitIndex + 2;
+  }
+  return result;
 }
 function extractTupleMemberTypes(type) {
   if (isCairo1Type(type)) {