recon-generate 0.0.32 → 0.0.33

package/dist/templates/targets/admin-targets.js

@@ -19,7 +19,7 @@ import {vm} from "@chimera/Hevm.sol";
 // Helpers
 import {Panic} from "@recon/Panic.sol";
 {{#each extraImports}}
-import "{{this}}";
+import { {{this.name}} } from "{{this.path}}";
 {{/each}}
 
 abstract contract AdminTargets is

package/dist/templates/targets/targets.js

@@ -21,7 +21,7 @@ import {Panic} from "@recon/Panic.sol";
 
 {{#if path}}import "{{path}}";{{/if}}
 {{#each extraImports}}
-import "{{this}}";
+import { {{this.name}} } from "{{this.path}}";
 {{/each}}
 
 abstract contract {{pascal contractName}}Targets is

package/dist/utils.d.ts

@@ -91,9 +91,13 @@ export interface SymbolsInfo {
  * - definedIn: symbol name → file path where it's actually defined (top-level definitions)
  */
 export declare function buildExportedSymbolsMap(buildOutput: any): SymbolsInfo;
+export interface ExtraImport {
+    name: string;
+    path: string;
+}
 /**
  * Given imported file paths, function definitions, and symbol maps, returns a list of
- * extra import paths needed for types referenced in function parameters but not available
+ * named imports needed for types referenced in function parameters but not available
  * through already-imported files.
  */
-export declare function resolveExtraImports(importedPaths: string[], functions: FunctionDefinitionParams[], symbolsInfo: SymbolsInfo): string[];
+export declare function resolveExtraImports(importedPaths: string[], functions: FunctionDefinitionParams[], symbolsInfo: SymbolsInfo): ExtraImport[];

package/dist/utils.js

@@ -647,7 +647,7 @@ function buildExportedSymbolsMap(buildOutput) {
 }
 /**
  * Given imported file paths, function definitions, and symbol maps, returns a list of
- * extra import paths needed for types referenced in function parameters but not available
+ * named imports needed for types referenced in function parameters but not available
  * through already-imported files.
  */
 function resolveExtraImports(importedPaths, functions, symbolsInfo) {
@@ -673,14 +673,16 @@ function resolveExtraImports(importedPaths, functions, symbolsInfo) {
         }
     }
     // For each referenced type not available, find its definition file
-    const extraPaths = new Set();
-    for (const typeName of referenced) {
+    const results = [];
+    const seen = new Set();
+    for (const typeName of Array.from(referenced).sort()) {
         if (available.has(typeName))
             continue;
         const defFile = symbolsInfo.definedIn.get(typeName);
-        if (defFile) {
-            extraPaths.add(defFile);
+        if (defFile && !seen.has(typeName)) {
+            seen.add(typeName);
+            results.push({ name: typeName, path: defFile });
         }
     }
-    return Array.from(extraPaths).sort();
+    return results;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "recon-generate",
-  "version": "0.0.32",
+  "version": "0.0.33",
   "description": "CLI to scaffold Recon fuzzing suite inside Foundry projects",
   "main": "dist/index.js",
   "bin": {