Improve ordering of impls

OpenZeppelin · Nov 28, 2023 · a75b224 · a75b224
1 parent b593868
commit a75b224
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/packages/core-cairo/src/print.ts b/packages/core-cairo/src/print.ts
@@ -97,18 +97,16 @@ function printComponentDeclarations(contract: Contract) {
 }
 
 function printImpls(contract: Contract) {
-  const lines = [];
-  for (const component of contract.components) {
-    for (const impl of component.impls) {
-      lines.push(...printImpl(impl, false));
-    }
-    if (component.internalImpl !== undefined) {
-      lines.push(...printImpl(component.internalImpl, true));
-    }
-  }
-  return lines;
+  const externalImpls = contract.components.flatMap(c => c.impls);
+  const internalImpls = contract.components.flatMap(c => c.internalImpl ? [c.internalImpl] : []);
+
+  return [
+    ...externalImpls.flatMap(impl => printImpl(impl)),
+    ...internalImpls.flatMap(impl => printImpl(impl, true))
+  ];
 }
 
+
 function printImpl(impl: Impl, internal = false) {
   const lines = [];
   if (!internal) {