fix: interfaces paths (#52)

defi-wonderland · Oct 2, 2023 · af0efd7 · af0efd7
1 parent 6d0c948
commit af0efd7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/package.json b/package.json
@@ -1,7 +1,6 @@
 {
   "name": "interface-exporter-action",
   "version": "1.0.0",
-  "private": true,
   "description": "An action to generate npm packages based on Solidity contract interfaces",
   "main": "lib/main.js",
   "scripts": {

diff --git a/src/createPackage.ts b/src/createPackage.ts
@@ -15,8 +15,9 @@ export const createPackage = (
   packageJson: PackageJson,
   typingType: TypingType,
 ) => {
-  const abiDir = `${exportDir}/abi`;
-  const contractsDir = `${exportDir}/contracts`;
+  const abiDestination = `${exportDir}/abi`;
+  const contractsDestination = `${exportDir}/${contractsExportDir}`;
+  const interfacesDestination = `${exportDir}/${interfacesDir}`;
 
   const interfacesGlob = `${interfacesDir}/**/*.sol`;
   const contractsGlob = `${contractsExportDir}/**/*.sol`;
@@ -37,13 +38,13 @@ export const createPackage = (
       const relativeInterfaceFile = transformRemappings(interfaceFile);
 
       const contractPath = interfacePath.substring(interfacesDir.length + 1);
-      fse.outputFileSync(path.join(contractsDir, contractPath), relativeInterfaceFile);
+      fse.outputFileSync(path.join(interfacesDestination, contractPath), relativeInterfaceFile);
 
       // get the interface name
       const interfaceName = interfacePath.substring(interfacePath.lastIndexOf('/') + 1, interfacePath.lastIndexOf('.'));
 
       // copy interface abi to the export directory
-      fse.copySync(`${outDir}/${interfaceName}.sol/${interfaceName}.json`, `${abiDir}/${interfaceName}.json`);
+      fse.copySync(`${outDir}/${interfaceName}.sol/${interfaceName}.json`, `${abiDestination}/${interfaceName}.json`);
     }
     console.log(`Copied ${interfacePaths.length} interfaces`);
 
@@ -56,10 +57,10 @@ export const createPackage = (
           const relativeContractFile = transformRemappings(contractFile);
 
           const relativeContractPath = contractPath.substring(contractsExportDir.length + 1);
-          fse.outputFileSync(path.join(exportDir, relativeContractPath), relativeContractFile);
+          fse.outputFileSync(path.join(contractsDestination, relativeContractPath), relativeContractFile);
 
           const contractName = contractPath.substring(contractPath.lastIndexOf('/') + 1, contractPath.lastIndexOf('.'));
-          fse.copySync(`${outDir}/${contractName}.sol/${contractName}.json`, `${abiDir}/${contractName}.json`);
+          fse.copySync(`${outDir}/${contractName}.sol/${contractName}.json`, `${abiDestination}/${contractName}.json`);
         }
         console.log(`Copied ${contractPaths.length} contracts`);
       });