Run lint:fix (#309)

.prettierrc.json

@@ -2,5 +2,5 @@
   "trailingComma": "es5",
   "tabWidth": 2,
   "semi": false,
-  "singleQuote": false
+  "singleQuote": true
 }

crates/solidity/src/tests/cli-tests/src/entities.ts

@@ -1,19 +1,33 @@
-import * as path from 'path';
+import * as path from 'path'
 
-const outputDir = 'artifacts';
+const outputDir = 'artifacts'
-const binExtension = ':C.pvm';
+const binExtension = ':C.pvm'
-const asmExtension = ':C.pvmasm';
+const asmExtension = ':C.pvmasm'
-const llvmExtension = '.ll';
+const llvmExtension = '.ll'
-const contractSolFilename = 'contract.sol';
+const contractSolFilename = 'contract.sol'
-const contractYulFilename = 'contract.yul';
+const contractYulFilename = 'contract.yul'
-const contractOptimizedLLVMFilename = contractSolFilename + '.C.optimized';
+const contractOptimizedLLVMFilename = contractSolFilename + '.C.optimized'
-const contractUnoptimizedLLVMFilename = contractSolFilename + '.C.unoptimized';
+const contractUnoptimizedLLVMFilename = contractSolFilename + '.C.unoptimized'
-const pathToOutputDir = path.join(__dirname, '..', outputDir);
+const pathToOutputDir = path.join(__dirname, '..', outputDir)
-const pathToContracts = path.join(__dirname, '..', 'src', 'contracts');
+const pathToContracts = path.join(__dirname, '..', 'src', 'contracts')
-const pathToBasicYulContract = path.join(pathToContracts, 'yul', contractYulFilename);
+const pathToBasicYulContract = path.join(
-const pathToBasicSolContract = path.join(pathToContracts, 'solidity', contractSolFilename);
+  pathToContracts,
-const pathToSolBinOutputFile = path.join(pathToOutputDir, contractSolFilename + binExtension);
+  'yul',
-const pathToSolAsmOutputFile = path.join(pathToOutputDir, contractSolFilename + asmExtension);
+  contractYulFilename
+)
+const pathToBasicSolContract = path.join(
+  pathToContracts,
+  'solidity',
+  contractSolFilename
+)
+const pathToSolBinOutputFile = path.join(
+  pathToOutputDir,
+  contractSolFilename + binExtension
+)
+const pathToSolAsmOutputFile = path.join(
+  pathToOutputDir,
+  contractSolFilename + asmExtension
+)
 
 export const paths = {
   outputDir: outputDir,
@@ -30,4 +44,4 @@ export const paths = {
   pathToBasicYulContract: pathToBasicYulContract,
   pathToSolBinOutputFile: pathToSolBinOutputFile,
   pathToSolAsmOutputFile: pathToSolAsmOutputFile,
-};
+}

crates/solidity/src/tests/cli-tests/src/helper.ts

@@ -1,44 +1,51 @@
-import * as shell from 'shelljs';
+import * as shell from 'shelljs'
-import * as fs from 'fs';
+import * as fs from 'fs'
-import { spawnSync } from 'child_process';
+import { spawnSync } from 'child_process'
 
 interface CommandResult {
-    output: string;
+  output: string
-    exitCode: number;
+  exitCode: number
 }
 
-export const executeCommand = (command: string, stdin?: string): CommandResult => {
+export const executeCommand = (
-    if (stdin) {
+  command: string,
-        const process = spawnSync(command, [], {
+  stdin?: string
-            input: stdin,
+): CommandResult => {
-            shell: true,
+  if (stdin) {
-            encoding: 'utf8',
+    const process = spawnSync(command, [], {
-            maxBuffer: 30 * 1024 * 1024
+      input: stdin,
-        });
+      shell: true,
+      encoding: 'utf8',
+      maxBuffer: 30 * 1024 * 1024,
+    })
 
-        return {
-            exitCode: process.status || 0,
-            output: (process.stdout || process.stderr || '').toString()
-        };
-    }
-
-    const result = shell.exec(command, { silent: true, async: false });
     return {
-        exitCode: result.code,
+      exitCode: process.status || 0,
-        output: result.stdout || result.stderr || ''
+      output: (process.stdout || process.stderr || '').toString(),
-    };
+    }
-};
+  }
+
+  const result = shell.exec(command, { silent: true, async: false })
+  return {
+    exitCode: result.code,
+    output: result.stdout || result.stderr || '',
+  }
+}
 
 export const isFolderExist = (folder: string): boolean => {
-    return shell.test('-d', folder);
+  return shell.test('-d', folder)
-};
+}
 
-export const isFileExist = (pathToFileDir: string, fileName: string, fileExtension: string): boolean => {
+export const isFileExist = (
-    return shell.ls(pathToFileDir).stdout.includes(fileName + fileExtension);
+  pathToFileDir: string,
-};
+  fileName: string,
+  fileExtension: string
+): boolean => {
+  return shell.ls(pathToFileDir).stdout.includes(fileName + fileExtension)
+}
 
 export const isFileEmpty = (file: string): boolean => {
-    if (fs.existsSync(file)) {
+  if (fs.existsSync(file)) {
-        return (fs.readFileSync(file).length === 0);
+    return fs.readFileSync(file).length === 0
-    }
+  }
-};
+}

crates/solidity/src/tests/cli-tests/tests/asm.test.ts

@@ -1,43 +1,44 @@
-import {executeCommand} from "../src/helper";
+import { executeCommand } from '../src/helper'
-import { paths } from '../src/entities';
+import { paths } from '../src/entities'
-
 
 //id1746
-describe("Run with --asm by default", () => {
+describe('Run with --asm by default', () => {
-  const command = `resolc ${paths.pathToBasicSolContract} --asm`;
+  const command = `resolc ${paths.pathToBasicSolContract} --asm`
-  const result = executeCommand(command);
+  const result = executeCommand(command)
-  const commandInvalid = 'resolc --asm';
+  const commandInvalid = 'resolc --asm'
-  const resultInvalid = executeCommand(commandInvalid);
+  const resultInvalid = executeCommand(commandInvalid)
 
-  it("Valid command exit code = 0", () => {
+  it('Valid command exit code = 0', () => {
-    expect(result.exitCode).toBe(0);
+    expect(result.exitCode).toBe(0)
-  });
+  })
 
-  it("--asm output is presented", () => {
+  it('--asm output is presented', () => {
-    const expectedPatterns = [/(deploy)/i, /(call)/i, /(seal_return)/i];
+    const expectedPatterns = [/(deploy)/i, /(call)/i, /(seal_return)/i]
 
     for (const pattern of expectedPatterns) {
-      expect(result.output).toMatch(pattern);
+      expect(result.output).toMatch(pattern)
     }
-  });
+  })
 
-  it("solc exit code == resolc exit code", () => {
+  it('solc exit code == resolc exit code', () => {
-    const command = `solc ${paths.pathToBasicSolContract} --asm`;
+    const command = `solc ${paths.pathToBasicSolContract} --asm`
-    const solcResult = executeCommand(command);
+    const solcResult = executeCommand(command)
-    expect(solcResult.exitCode).toBe(result.exitCode);
+    expect(solcResult.exitCode).toBe(result.exitCode)
-  });
+  })
 
-  it("run invalid: resolc --asm", () => {
+  it('run invalid: resolc --asm', () => {
-    expect(resultInvalid.output).toMatch(/(No input sources specified|Compilation aborted)/i);
+    expect(resultInvalid.output).toMatch(
-  });
+      /(No input sources specified|Compilation aborted)/i
-  
+    )
-  it("Invalid command exit code = 1", () => {
+  })
-    expect(resultInvalid.exitCode).toBe(1);
-  });
 
-  it("Invalid solc exit code == Invalid resolc exit code", () => {
+  it('Invalid command exit code = 1', () => {
-    const command = 'solc --asm';
+    expect(resultInvalid.exitCode).toBe(1)
-    const solcResult = executeCommand(command);
+  })
-    expect(solcResult.exitCode).toBe(resultInvalid.exitCode);
+
-  });
+  it('Invalid solc exit code == Invalid resolc exit code', () => {
-});
+    const command = 'solc --asm'
+    const solcResult = executeCommand(command)
+    expect(solcResult.exitCode).toBe(resultInvalid.exitCode)
+  })
+})

crates/solidity/src/tests/cli-tests/tests/common.test.ts

@@ -1,191 +1,241 @@
-import { executeCommand, isFolderExist, isFileExist, isFileEmpty } from "../src/helper";
+import {
-import { paths } from '../src/entities';
+  executeCommand,
-import * as shell from 'shelljs';
+  isFolderExist,
-import * as path from 'path';
+  isFileExist,
-
+  isFileEmpty,
+} from '../src/helper'
+import { paths } from '../src/entities'
+import * as shell from 'shelljs'
+import * as path from 'path'
 
 //id1762
-describe("Run resolc without any options", () => {
+describe('Run resolc without any options', () => {
-    const command = 'resolc';
+  const command = 'resolc'
-    const result = executeCommand(command);
+  const result = executeCommand(command)
 
-    it("Info with help is presented", () => {
+  it('Info with help is presented', () => {
-        expect(result.output).toMatch(/(Usage: resolc)/i);
+    expect(result.output).toMatch(/(Usage: resolc)/i)
-    });
+  })
 
-    it("Exit code = 1", () => {
+  it('Exit code = 1', () => {
-        expect(result.exitCode).toBe(1);
+    expect(result.exitCode).toBe(1)
-    });
+  })
-
-    it("solc exit code == resolc exit code", () => {
-        const command = 'solc';
-        const solcResult = executeCommand(command);
-        expect(solcResult.exitCode).toBe(result.exitCode);
-    });
-});
 
+  it('solc exit code == resolc exit code', () => {
+    const command = 'solc'
+    const solcResult = executeCommand(command)
+    expect(solcResult.exitCode).toBe(result.exitCode)
+  })
+})
 
 //#1713
-describe("Default run a command from the help", () => {
+describe('Default run a command from the help', () => {
+  const command = `resolc ${paths.pathToBasicSolContract} --overwrite -O3 --bin --output-dir "${paths.pathToOutputDir}"` // potential issue on resolc with full path on Windows cmd
+  const result = executeCommand(command)
 
-    const command = `resolc ${paths.pathToBasicSolContract} --overwrite -O3 --bin --output-dir "${paths.pathToOutputDir}"`; // potential issue on resolc with full path on Windows cmd
+  it('Compiler run successful', () => {
-    const result = executeCommand(command);
+    expect(result.output).toMatch(/(Compiler run successful.)/i)
-
+  })
-    it("Compiler run successful", () => {
+  it('Exit code = 0', () => {
-        expect(result.output).toMatch(/(Compiler run successful.)/i);
+    expect(result.exitCode).toBe(0)
-    });
+  })
-    it("Exit code = 0", () => {
+  it('Output dir is created', () => {
-        expect(result.exitCode).toBe(0);
+    expect(isFolderExist(paths.pathToOutputDir)).toBe(true)
-    });
+  })
-    it("Output dir is created", () => {
+  xit('Output file is created', () => {
-        expect(isFolderExist(paths.pathToOutputDir)).toBe(true);
+    // a bug on windows
-    });
+    expect(
-    xit("Output file is created", () => { // a bug on windows
+      isFileExist(
-        expect(isFileExist(paths.pathToOutputDir, paths.contractSolFilename, paths.binExtension)).toBe(true);
+        paths.pathToOutputDir,
-    });
+        paths.contractSolFilename,
-    it("the output file is not empty", () => {
+        paths.binExtension
-        expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false);
+      )
-    });
+    ).toBe(true)
-    it("No 'Error'/'Warning'/'Fail' in the output", () => {
+  })
-        expect(result.output).not.toMatch(/([Ee]rror|[Ww]arning|[Ff]ail)/i);
+  it('the output file is not empty', () => {
-    });
+    expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false)
-});
+  })
+  it("No 'Error'/'Warning'/'Fail' in the output", () => {
+    expect(result.output).not.toMatch(/([Ee]rror|[Ww]arning|[Ff]ail)/i)
+  })
+})
 
 //#1818
-describe("Default run a command from the help", () => {
+describe('Default run a command from the help', () => {
+  const command = `resolc ${paths.pathToBasicSolContract} --overwrite -O3 --bin --asm --output-dir "${paths.pathToOutputDir}"` // potential issue on resolc with full path on Windows cmd
+  const result = executeCommand(command)
 
-    const command = `resolc ${paths.pathToBasicSolContract} --overwrite -O3 --bin --asm --output-dir "${paths.pathToOutputDir}"`; // potential issue on resolc with full path on Windows cmd
+  it('Compiler run successful', () => {
-    const result = executeCommand(command);
+    expect(result.output).toMatch(/(Compiler run successful.)/i)
+  })
+  it('Exit code = 0', () => {
+    expect(result.exitCode).toBe(0)
+  })
+  it('Output dir is created', () => {
+    expect(isFolderExist(paths.pathToOutputDir)).toBe(true)
+  })
+  xit('Output files are created', () => {
+    // a bug on windows
+    expect(
+      isFileExist(
+        paths.pathToOutputDir,
+        paths.contractSolFilename,
+        paths.binExtension
+      )
+    ).toBe(true)
+    expect(
+      isFileExist(
+        paths.pathToOutputDir,
+        paths.contractSolFilename,
+        paths.asmExtension
+      )
+    ).toBe(true)
+  })
+  it('the output files are not empty', () => {
+    expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false)
+    expect(isFileEmpty(paths.pathToSolAsmOutputFile)).toBe(false)
+  })
+  it("No 'Error'/'Warning'/'Fail' in the output", () => {
+    expect(result.output).not.toMatch(/([Ee]rror|[Ww]arning|[Ff]ail)/i)
+  })
+})
 
-    it("Compiler run successful", () => {
+describe('Run resolc with source debug information', () => {
-        expect(result.output).toMatch(/(Compiler run successful.)/i);
+  const commands = [
-    });
+    `resolc -g ${paths.pathToBasicSolContract} --overwrite --bin --asm --output-dir "${paths.pathToOutputDir}"`,
-    it("Exit code = 0", () => {
+    `resolc --disable-solc-optimizer -g ${paths.pathToBasicSolContract} --overwrite --bin --asm --output-dir "${paths.pathToOutputDir}"`,
-        expect(result.exitCode).toBe(0);
+  ] // potential issue on resolc with full path on Windows cmd`;
-    });
-    it("Output dir is created", () => {
-        expect(isFolderExist(paths.pathToOutputDir)).toBe(true);
-    });
-    xit("Output files are created", () => { // a bug on windows
-        expect(isFileExist(paths.pathToOutputDir, paths.contractSolFilename, paths.binExtension)).toBe(true);
-        expect(isFileExist(paths.pathToOutputDir, paths.contractSolFilename, paths.asmExtension)).toBe(true);
-    });
-    it("the output files are not empty", () => {
-        expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false);
-        expect(isFileEmpty(paths.pathToSolAsmOutputFile)).toBe(false);
-    });
-    it("No 'Error'/'Warning'/'Fail' in the output", () => {
-        expect(result.output).not.toMatch(/([Ee]rror|[Ww]arning|[Ff]ail)/i);
-    });
-});
 
-describe("Run resolc with source debug information", () => {
+  for (var idx in commands) {
-    const commands = [
+    const command = commands[idx]
-        `resolc -g ${paths.pathToBasicSolContract} --overwrite --bin --asm --output-dir "${paths.pathToOutputDir}"`,
+    const result = executeCommand(command)
-        `resolc --disable-solc-optimizer -g ${paths.pathToBasicSolContract} --overwrite --bin --asm --output-dir "${paths.pathToOutputDir}"`
-    ]; // potential issue on resolc with full path on Windows cmd`;
 
-    for (var idx in commands) {
+    it('Compiler run successful', () => {
-        const command = commands[idx];
+      expect(result.output).toMatch(/(Compiler run successful.)/i)
-        const result = executeCommand(command);
+    })
+    it('Exit code = 0', () => {
+      expect(result.exitCode).toBe(0)
+    })
+    it('Output dir is created', () => {
+      expect(isFolderExist(paths.pathToOutputDir)).toBe(true)
+    })
+    it('Output files are created', () => {
+      // a bug on windows
+      expect(
+        isFileExist(
+          paths.pathToOutputDir,
+          paths.contractSolFilename,
+          paths.binExtension
+        )
+      ).toBe(true)
+      expect(
+        isFileExist(
+          paths.pathToOutputDir,
+          paths.contractSolFilename,
+          paths.asmExtension
+        )
+      ).toBe(true)
+    })
+    it('the output files are not empty', () => {
+      expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false)
+      expect(isFileEmpty(paths.pathToSolAsmOutputFile)).toBe(false)
+    })
+    it("No 'Error'/'Fail' in the output", () => {
+      expect(result.output).not.toMatch(/([Ee]rror|[Ff]ail)/i)
+    })
+  }
+})
 
-        it("Compiler run successful", () => {
+describe('Run resolc with source debug information, check LLVM debug-info', () => {
-            expect(result.output).toMatch(/(Compiler run successful.)/i);
+  const commands = [
-        });
+    `resolc -g ${paths.pathToBasicSolContract} --overwrite --debug-output-dir="${paths.pathToOutputDir}"`,
-        it("Exit code = 0", () => {
+    `resolc -g --disable-solc-optimizer ${paths.pathToBasicSolContract} --overwrite --debug-output-dir="${paths.pathToOutputDir}"`,
-            expect(result.exitCode).toBe(0);
+  ] // potential issue on resolc with full path on Windows cmd`;
-        });
-        it("Output dir is created", () => {
-            expect(isFolderExist(paths.pathToOutputDir)).toBe(true);
-        });
-        it("Output files are created", () => { // a bug on windows
-            expect(isFileExist(paths.pathToOutputDir, paths.contractSolFilename, paths.binExtension)).toBe(true);
-            expect(isFileExist(paths.pathToOutputDir, paths.contractSolFilename, paths.asmExtension)).toBe(true);
-        });
-        it("the output files are not empty", () => {
-            expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false);
-            expect(isFileEmpty(paths.pathToSolAsmOutputFile)).toBe(false);
-        });
-        it("No 'Error'/'Fail' in the output", () => {
-            expect(result.output).not.toMatch(/([Ee]rror|[Ff]ail)/i);
-        });
-    }
-});
 
-describe("Run resolc with source debug information, check LLVM debug-info", () => {
+  for (var idx in commands) {
-    const commands = [
+    const command = commands[idx]
-        `resolc -g ${paths.pathToBasicSolContract} --overwrite --debug-output-dir="${paths.pathToOutputDir}"`,
+    const result = executeCommand(command)
-        `resolc -g --disable-solc-optimizer ${paths.pathToBasicSolContract} --overwrite --debug-output-dir="${paths.pathToOutputDir}"`
-    ]; // potential issue on resolc with full path on Windows cmd`;
 
-    for (var idx in commands) {
+    it('Compiler run successful', () => {
-        const command = commands[idx];
+      expect(result.output).toMatch(/(Compiler run successful.)/i)
-        const result = executeCommand(command);
+    })
+    it('Exit code = 0', () => {
+      expect(result.exitCode).toBe(0)
+    })
+    it('Output dir is created', () => {
+      expect(isFolderExist(paths.pathToOutputDir)).toBe(true)
+    })
+    it('Output files are created', () => {
+      // a bug on windows
+      expect(
+        isFileExist(
+          paths.pathToOutputDir,
+          paths.contractOptimizedLLVMFilename,
+          paths.llvmExtension
+        )
+      ).toBe(true)
+      expect(
+        isFileExist(
+          paths.pathToOutputDir,
+          paths.contractUnoptimizedLLVMFilename,
+          paths.llvmExtension
+        )
+      ).toBe(true)
+    })
+    it('the output files are not empty', () => {
+      expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false)
+      expect(isFileEmpty(paths.pathToSolAsmOutputFile)).toBe(false)
+    })
+    it("No 'Error'/'Fail' in the output", () => {
+      expect(result.output).not.toMatch(/([Ee]rror|[Ff]ail)/i)
+    })
+  }
+})
 
-        it("Compiler run successful", () => {
+describe('Standard JSON compilation with path options', () => {
-            expect(result.output).toMatch(/(Compiler run successful.)/i);
+  const contractsDir = path.join(shell.tempdir(), 'contracts-test')
-        });
+  const inputFile = path.join(__dirname, '..', 'src/contracts/compiled/1.json')
-        it("Exit code = 0", () => {
-            expect(result.exitCode).toBe(0);
-        });
-        it("Output dir is created", () => {
-            expect(isFolderExist(paths.pathToOutputDir)).toBe(true);
-        });
-        it("Output files are created", () => { // a bug on windows
-            expect(isFileExist(paths.pathToOutputDir, paths.contractOptimizedLLVMFilename, paths.llvmExtension)).toBe(true);
-            expect(isFileExist(paths.pathToOutputDir, paths.contractUnoptimizedLLVMFilename, paths.llvmExtension)).toBe(true);
-        });
-        it("the output files are not empty", () => {
-            expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false);
-            expect(isFileEmpty(paths.pathToSolAsmOutputFile)).toBe(false);
-        });
-        it("No 'Error'/'Fail' in the output", () => {
-            expect(result.output).not.toMatch(/([Ee]rror|[Ff]ail)/i);
-        });
-    }
-});
 
+  beforeAll(() => {
+    shell.mkdir('-p', contractsDir)
 
+    const input = JSON.parse(shell.cat(inputFile).toString())
 
-describe("Standard JSON compilation with path options", () => {
+    Object.entries(input.sources).forEach(
-    const contractsDir = path.join(shell.tempdir(), 'contracts-test');
+      ([sourcePath, source]: [string, any]) => {
-    const inputFile = path.join(__dirname, '..', 'src/contracts/compiled/1.json');
+        const filePath = path.join(contractsDir, sourcePath)
+        shell.mkdir('-p', path.dirname(filePath))
+        shell.ShellString(source.content).to(filePath)
+      }
+    )
+  })
+
+  afterAll(() => {
+    shell.rm('-rf', contractsDir)
+  })
+
+  describe('Output with all path options', () => {
+    let result: { exitCode: number; output: string }
 
     beforeAll(() => {
-        shell.mkdir('-p', contractsDir);
+      const tempInputFile = path.join(contractsDir, 'temp-input.json')
+      shell.cp(inputFile, tempInputFile)
+      const inputContent = shell.cat(inputFile).toString()
 
-        const input = JSON.parse(shell.cat(inputFile).toString());
+      const command = `resolc --standard-json --base-path "${contractsDir}" --include-path "${contractsDir}" --allow-paths "${contractsDir}"`
 
-        Object.entries(input.sources).forEach(([sourcePath, source]: [string, any]) => {
+      result = executeCommand(command, inputContent)
-            const filePath = path.join(contractsDir, sourcePath);
-            shell.mkdir('-p', path.dirname(filePath));
-            shell.ShellString(source.content).to(filePath);
-        });
-    });
 
-    afterAll(() => {
+      shell.rm(tempInputFile)
-        shell.rm('-rf', contractsDir);
+    })
-    });
 
-    describe("Output with all path options", () => {
+    it('Compiler run successful without emiting warnings', () => {
-        let result: { exitCode: number; output: string };
+      const parsedResults = JSON.parse(result.output)
-
+      expect(
-        beforeAll(() => {
+        parsedResults.errors.filter(
-            const tempInputFile = path.join(contractsDir, 'temp-input.json');
+          (error: { type: string }) => error.type != 'Warning'
-            shell.cp(inputFile, tempInputFile);
+        )
-            const inputContent = shell.cat(inputFile).toString();
+      ).toEqual([])
-
+    })
-            const command = `resolc --standard-json --base-path "${contractsDir}" --include-path "${contractsDir}" --allow-paths "${contractsDir}"`;
+  })
-
+})
-            result = executeCommand(command, inputContent);
-
-            shell.rm(tempInputFile);
-
-        });
-
-        it("Compiler run successful without emiting warnings", () => {
-            const parsedResults = JSON.parse(result.output)
-            expect(parsedResults.errors.filter((error: { type: string; }) => error.type != 'Warning')).toEqual([]);
-        });
-    });
-});

crates/solidity/src/tests/cli-tests/tests/yul.test.ts

@@ -1,40 +1,39 @@
-import {executeCommand} from "../src/helper";
+import { executeCommand } from '../src/helper'
-import { paths } from '../src/entities';
+import { paths } from '../src/entities'
-
 
 //id1743
-describe("Run with --yul by default", () => {
+describe('Run with --yul by default', () => {
-  const command = `resolc ${paths.pathToBasicYulContract} --yul`;
+  const command = `resolc ${paths.pathToBasicYulContract} --yul`
-  const result = executeCommand(command);
+  const result = executeCommand(command)
-  const commandInvalid = 'resolc --yul';
+  const commandInvalid = 'resolc --yul'
-  const resultInvalid = executeCommand(commandInvalid);
+  const resultInvalid = executeCommand(commandInvalid)
 
-  it("Valid command exit code = 0", () => {
+  it('Valid command exit code = 0', () => {
-    expect(result.exitCode).toBe(0);
+    expect(result.exitCode).toBe(0)
-  });
+  })
 
-  it("--yul output is presented", () => {
+  it('--yul output is presented', () => {
-    expect(result.output).toMatch(/(Compiler run successful)/i);
+    expect(result.output).toMatch(/(Compiler run successful)/i)
-    expect(result.output).toMatch(/(No output requested)/i);
+    expect(result.output).toMatch(/(No output requested)/i)
-  });
+  })
 
+  xit('solc exit code == resolc exit code', () => {
+    // unknown solc issue for datatype of the contract
+    const command = `solc ${paths.pathToBasicSolContract} --yul`
+    const solcResult = executeCommand(command)
+    expect(solcResult.exitCode).toBe(result.exitCode)
+  })
 
-  xit("solc exit code == resolc exit code", () => { // unknown solc issue for datatype of the contract
+  it('run invalid: resolc --yul', () => {
-      const command = `solc ${paths.pathToBasicSolContract} --yul`;
+    expect(resultInvalid.output).toMatch(/(The input file is missing)/i)
-      const solcResult = executeCommand(command);
+  })
-      expect(solcResult.exitCode).toBe(result.exitCode);
+  it('Invalid command exit code = 1', () => {
-  });
+    expect(resultInvalid.exitCode).toBe(1)
+  })
 
-  it("run invalid: resolc --yul", () => {
+  it('Invalid solc exit code == Invalid resolc exit code', () => {
-    expect(resultInvalid.output).toMatch(/(The input file is missing)/i);
+    const command = 'solc --yul'
-  });
+    const solcResult = executeCommand(command)
-  it("Invalid command exit code = 1", () => {
+    expect(solcResult.exitCode).toBe(resultInvalid.exitCode)
-    expect(resultInvalid.exitCode).toBe(1);
+  })
-  });
+})
-
-  it("Invalid solc exit code == Invalid resolc exit code", () => {
-    const command = 'solc --yul';
-    const solcResult = executeCommand(command);
-    expect(solcResult.exitCode).toBe(resultInvalid.exitCode);
-  });
-});

crates/solidity/src/tests/combined-json.tests.ts

@@ -1,153 +1,188 @@
-import { executeCommand } from "../src/helper";
+import { executeCommand } from '../src/helper'
-import { paths } from '../src/entities';
+import { paths } from '../src/entities'
 
+describe('Set of --combined-json tests', () => {
+  const zksolcCommand = 'zksolc'
+  const solcCommand = 'solc'
+  const json_args: string[] = [
+    `abi`,
+    `hashes`,
+    `metadata`,
+    `devdoc`,
+    `userdoc`,
+    `storage-layout`,
+    `ast`,
+    `asm`,
+    `bin`,
+    `bin-runtime`,
+  ]
 
-describe("Set of --combined-json tests", () => {
+  //id1742:I
-    const zksolcCommand = 'zksolc';
+  describe(`Run ${zksolcCommand} with just --combined-json`, () => {
-    const solcCommand = 'solc';
+    const args = [`--combined-json`]
-    const json_args: string[] = [`abi`, `hashes`, `metadata`, `devdoc`, `userdoc`, `storage-layout`, `ast`, `asm`, `bin`, `bin-runtime`];
+    const result = executeCommand(zksolcCommand, args)
 
-    //id1742:I
+    it('Valid command exit code = 1', () => {
-    describe(`Run ${zksolcCommand} with just --combined-json`, () => {
+      expect(result.exitCode).toBe(1)
-        const args = [`--combined-json`];
+    })
-        const result = executeCommand(zksolcCommand, args);
 
-        it("Valid command exit code = 1", () => {
+    it('--combined-json error is presented', () => {
-            expect(result.exitCode).toBe(1);
+      expect(result.output).toMatch(/(requires a value but none was supplied)/i)
-        });
+    })
 
-        it("--combined-json error is presented", () => {
+    it('solc exit code == zksolc exit code', () => {
-            expect(result.output).toMatch(/(requires a value but none was supplied)/i);
+      const solcResult = executeCommand(solcCommand, args)
-        });
+      expect(solcResult.exitCode).toBe(result.exitCode)
+    })
+  })
 
-        it("solc exit code == zksolc exit code", () => {
+  //id1742:II
-            const solcResult = executeCommand(solcCommand, args);
+  describe(`Run ${zksolcCommand} with Sol contract and --combined-json`, () => {
-            expect(solcResult.exitCode).toBe(result.exitCode);
+    const args = [`${paths.pathToBasicSolContract}`, `--combined-json`]
-        });
+    const result = executeCommand(zksolcCommand, args)
-    });
 
-    //id1742:II
+    it('Valid command exit code = 1', () => {
-    describe(`Run ${zksolcCommand} with Sol contract and --combined-json`, () => {
+      expect(result.exitCode).toBe(1)
-        const args = [`${paths.pathToBasicSolContract}`, `--combined-json`];
+    })
-        const result = executeCommand(zksolcCommand, args);
 
-        it("Valid command exit code = 1", () => {
+    it('--combined-json error is presented', () => {
-            expect(result.exitCode).toBe(1);
+      expect(result.output).toMatch(/(requires a value but none was supplied)/i)
-        });
+    })
 
-        it("--combined-json error is presented", () => {
+    it('solc exit code == zksolc exit code', () => {
-            expect(result.output).toMatch(/(requires a value but none was supplied)/i);
+      const solcResult = executeCommand(solcCommand, args)
-        });
+      expect(solcResult.exitCode).toBe(result.exitCode)
+    })
+  })
 
-        it("solc exit code == zksolc exit code", () => {
+  //id1742:III
-            const solcResult = executeCommand(solcCommand, args);
+  for (let i = 0; i < json_args.length; i++) {
-            expect(solcResult.exitCode).toBe(result.exitCode);
+    describe(`Run ${zksolcCommand} with Sol, --combined-json and ARG: ${json_args[i]}`, () => {
-        });
+      const args = [
-    });
+        `${paths.pathToBasicSolContract}`,
+        `--combined-json`,
+        `${json_args[i]}`,
+      ]
+      const result = executeCommand(zksolcCommand, args)
 
-    //id1742:III
+      it('Valid command exit code = 0', () => {
-    for (let i = 0; i < json_args.length; i++) {
+        expect(result.exitCode).toBe(0)
-        describe(`Run ${zksolcCommand} with Sol, --combined-json and ARG: ${json_args[i]}`, () => {
+      })
-            const args = [`${paths.pathToBasicSolContract}`, `--combined-json`, `${json_args[i]}`];
-            const result = executeCommand(zksolcCommand, args);
 
-            it("Valid command exit code = 0", () => {
+      it('--combined-json error is presented', () => {
-                expect(result.exitCode).toBe(0);
+        expect(result.output).toMatch(/(contracts)/i)
-            });
+      })
 
-            it("--combined-json error is presented", () => {
+      it('solc exit code == zksolc exit code', () => {
-                expect(result.output).toMatch(/(contracts)/i);
+        const solcResult = executeCommand(solcCommand, args)
-            });
+        expect(solcResult.exitCode).toBe(result.exitCode)
+      })
+    })
+  }
 
-            it("solc exit code == zksolc exit code", () => {
+  //id1829:I
-                const solcResult = executeCommand(solcCommand, args);
+  for (let i = 0; i < json_args.length; i++) {
-                expect(solcResult.exitCode).toBe(result.exitCode);
+    describe(`Run ${zksolcCommand} with Sol, --combined-json and wrong ARG: --${json_args[i]}`, () => {
-            });
+      const args = [
-        });
+        `${paths.pathToBasicSolContract}`,
-    }
+        `--combined-json`,
+        `--${json_args[i]}`,
+      ]
+      const result = executeCommand(zksolcCommand, args)
 
-    //id1829:I
+      it('Valid command exit code = 1', () => {
-    for (let i = 0; i < json_args.length; i++) {
+        expect(result.exitCode).toBe(1)
-        describe(`Run ${zksolcCommand} with Sol, --combined-json and wrong ARG: --${json_args[i]}`, () => {
+      })
-            const args = [`${paths.pathToBasicSolContract}`, `--combined-json`, `--${json_args[i]}`];
-            const result = executeCommand(zksolcCommand, args);
 
-            it("Valid command exit code = 1", () => {
+      it('--combined-json error is presented', () => {
-                expect(result.exitCode).toBe(1);
+        expect(result.output).toMatch(/(Invalid option|error)/i)
-            });
+      })
 
-            it("--combined-json error is presented", () => {
+      it('solc exit code == zksolc exit code', () => {
-                expect(result.output).toMatch(/(Invalid option|error)/i);
+        const solcResult = executeCommand(solcCommand, args)
-            });
+        expect(solcResult.exitCode).toBe(result.exitCode)
+      })
+    })
+  }
 
-            it("solc exit code == zksolc exit code", () => {
+  //id1829:II
-                const solcResult = executeCommand(solcCommand, args);
+  for (let i = 0; i < json_args.length; i++) {
-                expect(solcResult.exitCode).toBe(result.exitCode);
+    describe(`Run ${zksolcCommand} with Sol, --combined-json and multiple ARG: ${json_args[i]} ${json_args[i]}`, () => {
-            });
+      const args = [
-        });
+        `${paths.pathToBasicSolContract}`,
-    }
+        `--combined-json`,
+        `${json_args[i]}`,
+        `${json_args[i]}`,
+      ]
+      const result = executeCommand(zksolcCommand, args)
 
-    //id1829:II
+      xit('Valid command exit code = 1', () => {
-    for (let i = 0; i < json_args.length; i++) {
+        expect(result.exitCode).toBe(1)
-        describe(`Run ${zksolcCommand} with Sol, --combined-json and multiple ARG: ${json_args[i]} ${json_args[i]}`, () => {
+      })
-            const args = [`${paths.pathToBasicSolContract}`, `--combined-json`, `${json_args[i]}`, `${json_args[i]}`];
-            const result = executeCommand(zksolcCommand, args);
 
-            xit("Valid command exit code = 1", () => {
+      it('--combined-json error is presented', () => {
-                expect(result.exitCode).toBe(1);
+        expect(result.output).toMatch(
-            });
+          /(No such file or directory|cannot find the file specified)/i
+        ) // Hopefully we should have more precise message here!
+      })
 
-            it("--combined-json error is presented", () => {
+      xit('solc exit code == zksolc exit code', () => {
-                expect(result.output).toMatch(/(No such file or directory|cannot find the file specified)/i); // Hopefully we should have more precise message here!
+        const solcResult = executeCommand(solcCommand, args)
-            });
+        expect(solcResult.exitCode).toBe(result.exitCode)
+      })
+    })
+  }
 
-            xit("solc exit code == zksolc exit code", () => {
+  //id1829:III
-                const solcResult = executeCommand(solcCommand, args);
+  for (let i = 0; i < json_args.length; i++) {
-                expect(solcResult.exitCode).toBe(result.exitCode);
+    describe(`Run ${zksolcCommand} with Sol, and multiple (--combined-json ${json_args[i]})`, () => {
-            });
+      const args = [
-        });
+        `${paths.pathToBasicSolContract}`,
-    }
+        `--combined-json`,
+        `${json_args[i]}`,
+        `--combined-json`,
+        `${json_args[i]}`,
+      ]
+      const result = executeCommand(zksolcCommand, args)
 
-    //id1829:III
+      it('Valid command exit code = 1', () => {
-    for (let i = 0; i < json_args.length; i++) {
+        expect(result.exitCode).toBe(1)
-        describe(`Run ${zksolcCommand} with Sol, and multiple (--combined-json ${json_args[i]})`, () => {
+      })
-            const args = [`${paths.pathToBasicSolContract}`, `--combined-json`, `${json_args[i]}`, `--combined-json`, `${json_args[i]}`];
-            const result = executeCommand(zksolcCommand, args);
 
-            it("Valid command exit code = 1", () => {
+      it('--combined-json error is presented', () => {
-                expect(result.exitCode).toBe(1);
+        expect(result.output).toMatch(/(cannot be used multiple times)/i)
-            });
+      })
 
-            it("--combined-json error is presented", () => {
+      it('solc exit code == zksolc exit code', () => {
-                expect(result.output).toMatch(/(cannot be used multiple times)/i);
+        const solcResult = executeCommand(solcCommand, args)
-            });
+        expect(solcResult.exitCode).toBe(result.exitCode)
+      })
+    })
+  }
 
-            it("solc exit code == zksolc exit code", () => {
+  //id1830
-                const solcResult = executeCommand(solcCommand, args);
+  for (let i = 0; i < json_args.length; i++) {
-                expect(solcResult.exitCode).toBe(result.exitCode);
+    describe(`Run ${zksolcCommand} with Yul, and --combined-json ${json_args[i]}`, () => {
-            });
+      const args = [
-        });
+        `${paths.pathToBasicYulContract}`,
-    }
+        `--combined-json`,
+        `${json_args[i]}`,
+      ]
+      const result = executeCommand(zksolcCommand, args)
 
-    //id1830
+      it('Valid command exit code = 1', () => {
-    for (let i = 0; i < json_args.length; i++) {
+        expect(result.exitCode).toBe(1)
-        describe(`Run ${zksolcCommand} with Yul, and --combined-json ${json_args[i]}`, () => {
+      })
-            const args = [`${paths.pathToBasicYulContract}`, `--combined-json`, `${json_args[i]}`];
-            const result = executeCommand(zksolcCommand, args);
 
-            it("Valid command exit code = 1", () => {
+      it('--combined-json error is presented', () => {
-                expect(result.exitCode).toBe(1);
+        expect(result.output).toMatch(/(ParserError: Expected identifier)/i)
-            });
+      })
+      asd
 
-            it("--combined-json error is presented", () => {
+      it('solc exit code == zksolc exit code', () => {
-                expect(result.output).toMatch(/(ParserError: Expected identifier)/i);
+        const solcResult = executeCommand(solcCommand, args)
-            });
+        expect(solcResult.exitCode).toBe(result.exitCode)
-            asd
+      })
-
+    })
-            it("solc exit code == zksolc exit code", () => {
+  }
-                const solcResult = executeCommand(solcCommand, args);
+})
-                expect(solcResult.exitCode).toBe(result.exitCode);
-            });
-        });
-    }
-});

eslint.config.mjs

@@ -4,8 +4,8 @@ import tseslint from 'typescript-eslint'
 
 /** @type {import('eslint').Linter.Config[]} */
 export default [
-    { files: ['**/*.{mjs,ts}'] },
+  { files: ['**/*.{mjs,ts}'] },
-    { languageOptions: { globals: globals.browser } },
+  { languageOptions: { globals: globals.browser } },
-    pluginJs.configs.recommended,
+  pluginJs.configs.recommended,
-    ...tseslint.configs.recommended,
+  ...tseslint.configs.recommended,
 ]

js/emscripten/tests/node.test.mjs

@@ -1,142 +1,138 @@
-import { expect } from "chai";
+import { expect } from 'chai'
-import { compile } from "../examples/node/revive.js";
+import { compile } from '../examples/node/revive.js'
-import { fileURLToPath } from "url";
+import { fileURLToPath } from 'url'
-import path from "path";
+import path from 'path'
-import fs from "fs";
+import fs from 'fs'
-const __filename = fileURLToPath(import.meta.url);
+const __filename = fileURLToPath(import.meta.url)
-const __dirname = path.dirname(__filename);
+const __dirname = path.dirname(__filename)
 
 function loadFixture(fixture) {
-  const fixturePath = path.resolve(__dirname, `../fixtures/${fixture}`);
+  const fixturePath = path.resolve(__dirname, `../fixtures/${fixture}`)
-  return JSON.parse(fs.readFileSync(fixturePath, "utf-8"));
+  return JSON.parse(fs.readFileSync(fixturePath, 'utf-8'))
 }
 
-describe("Compile Function Tests", function () {
+describe('Compile Function Tests', function () {
-  it("should successfully compile valid Solidity code", async function () {
+  it('should successfully compile valid Solidity code', async function () {
-    const standardInput = loadFixture("storage.json");
+    const standardInput = loadFixture('storage.json')
 
-    const result = await compile(standardInput);
+    const result = await compile(standardInput)
-    expect(result).to.be.a("string");
+    expect(result).to.be.a('string')
-    const output = JSON.parse(result);
+    const output = JSON.parse(result)
-    expect(output).to.have.property("contracts");
+    expect(output).to.have.property('contracts')
-    expect(output.contracts["fixtures/storage.sol"]).to.have.property(
+    expect(output.contracts['fixtures/storage.sol']).to.have.property('Storage')
-      "Storage",
+    expect(output.contracts['fixtures/storage.sol'].Storage).to.have.property(
-    );
+      'abi'
-    expect(output.contracts["fixtures/storage.sol"].Storage).to.have.property(
+    )
-      "abi",
+    expect(output.contracts['fixtures/storage.sol'].Storage).to.have.property(
-    );
+      'evm'
-    expect(output.contracts["fixtures/storage.sol"].Storage).to.have.property(
+    )
-      "evm",
-    );
     expect(
-      output.contracts["fixtures/storage.sol"].Storage.evm,
+      output.contracts['fixtures/storage.sol'].Storage.evm
-    ).to.have.property("bytecode");
+    ).to.have.property('bytecode')
-  });
+  })
 
-  if (typeof globalThis.Bun == "undefined") {
+  if (typeof globalThis.Bun == 'undefined') {
     // Running this test with Bun on a Linux host causes:
     // RuntimeError: Out of bounds memory access (evaluating 'getWasmTableEntry(index)(a1, a2, a3, a4, a5)')
     // Once this issue is resolved, the test will be re-enabled.
-    it("should successfully compile large Solidity code", async function () {
+    it('should successfully compile large Solidity code', async function () {
-      const standardInput = loadFixture("token.json");
+      const standardInput = loadFixture('token.json')
 
-      const result = await compile(standardInput);
+      const result = await compile(standardInput)
-      expect(result).to.be.a("string");
+      expect(result).to.be.a('string')
-      const output = JSON.parse(result);
+      const output = JSON.parse(result)
-      expect(output).to.have.property("contracts");
+      expect(output).to.have.property('contracts')
-      expect(output.contracts["fixtures/token.sol"]).to.have.property(
+      expect(output.contracts['fixtures/token.sol']).to.have.property('MyToken')
-        "MyToken",
+      expect(output.contracts['fixtures/token.sol'].MyToken).to.have.property(
-      );
+        'abi'
-      expect(output.contracts["fixtures/token.sol"].MyToken).to.have.property(
+      )
-        "abi",
+      expect(output.contracts['fixtures/token.sol'].MyToken).to.have.property(
-      );
+        'evm'
-      expect(output.contracts["fixtures/token.sol"].MyToken).to.have.property(
+      )
-        "evm",
-      );
       expect(
-        output.contracts["fixtures/token.sol"].MyToken.evm,
+        output.contracts['fixtures/token.sol'].MyToken.evm
-      ).to.have.property("bytecode");
+      ).to.have.property('bytecode')
-    });
+    })
 
-    it("should successfully compile a valid Solidity contract that instantiates the token contracts", async function () {
+    it('should successfully compile a valid Solidity contract that instantiates the token contracts', async function () {
-      const standardInput = loadFixture("instantiate_tokens.json");
+      const standardInput = loadFixture('instantiate_tokens.json')
 
-      const result = await compile(standardInput);
+      const result = await compile(standardInput)
-      expect(result).to.be.a("string");
+      expect(result).to.be.a('string')
-      const output = JSON.parse(result);
+      const output = JSON.parse(result)
-      expect(output).to.have.property("contracts");
+      expect(output).to.have.property('contracts')
       expect(
-        output.contracts["fixtures/instantiate_tokens.sol"],
+        output.contracts['fixtures/instantiate_tokens.sol']
-      ).to.have.property("TokensFactory");
+      ).to.have.property('TokensFactory')
       expect(
-        output.contracts["fixtures/instantiate_tokens.sol"].TokensFactory,
+        output.contracts['fixtures/instantiate_tokens.sol'].TokensFactory
-      ).to.have.property("abi");
+      ).to.have.property('abi')
       expect(
-        output.contracts["fixtures/instantiate_tokens.sol"].TokensFactory,
+        output.contracts['fixtures/instantiate_tokens.sol'].TokensFactory
-      ).to.have.property("evm");
+      ).to.have.property('evm')
       expect(
-        output.contracts["fixtures/instantiate_tokens.sol"].TokensFactory.evm,
+        output.contracts['fixtures/instantiate_tokens.sol'].TokensFactory.evm
-      ).to.have.property("bytecode");
+      ).to.have.property('bytecode')
-    });
+    })
   }
 
-  it("should throw an error for invalid Solidity code", async function () {
+  it('should throw an error for invalid Solidity code', async function () {
-    const standardInput = loadFixture("invalid_contract_content.json");
+    const standardInput = loadFixture('invalid_contract_content.json')
 
-    const result = await compile(standardInput);
+    const result = await compile(standardInput)
-    expect(result).to.be.a("string");
+    expect(result).to.be.a('string')
-    const output = JSON.parse(result);
+    const output = JSON.parse(result)
-    expect(output).to.have.property("errors");
+    expect(output).to.have.property('errors')
-    expect(output.errors).to.be.an("array");
+    expect(output.errors).to.be.an('array')
-    expect(output.errors.length).to.be.greaterThan(0);
+    expect(output.errors.length).to.be.greaterThan(0)
-    expect(output.errors[0].type).to.exist;
+    expect(output.errors[0].type).to.exist
-    expect(output.errors[0].type).to.contain("ParserError");
+    expect(output.errors[0].type).to.contain('ParserError')
-  });
+  })
 
-  it("should return not found error for missing imports", async function () {
+  it('should return not found error for missing imports', async function () {
-    const standardInput = loadFixture("missing_import.json");
+    const standardInput = loadFixture('missing_import.json')
 
-    const result = await compile(standardInput);
+    const result = await compile(standardInput)
-    const output = JSON.parse(result);
+    const output = JSON.parse(result)
-    expect(output).to.have.property("errors");
+    expect(output).to.have.property('errors')
-    expect(output.errors).to.be.an("array");
+    expect(output.errors).to.be.an('array')
-    expect(output.errors.length).to.be.greaterThan(0);
+    expect(output.errors.length).to.be.greaterThan(0)
-    expect(output.errors[0].message).to.exist;
+    expect(output.errors[0].message).to.exist
     expect(output.errors[0].message).to.include(
-      'Source "nonexistent/console.sol" not found',
+      'Source "nonexistent/console.sol" not found'
-    );
+    )
-  });
+  })
 
-  it("should successfully compile a valid Solidity contract that instantiates another contract", async function () {
+  it('should successfully compile a valid Solidity contract that instantiates another contract', async function () {
-    const standardInput = loadFixture("instantiate.json");
+    const standardInput = loadFixture('instantiate.json')
 
-    const result = await compile(standardInput);
+    const result = await compile(standardInput)
-    expect(result).to.be.a("string");
+    expect(result).to.be.a('string')
-    const output = JSON.parse(result);
+    const output = JSON.parse(result)
-    expect(output).to.have.property("contracts");
+    expect(output).to.have.property('contracts')
-    expect(output.contracts["fixtures/instantiate.sol"]).to.have.property(
+    expect(output.contracts['fixtures/instantiate.sol']).to.have.property(
-      "ChildContract",
+      'ChildContract'
-    );
+    )
     expect(
-      output.contracts["fixtures/instantiate.sol"].ChildContract,
+      output.contracts['fixtures/instantiate.sol'].ChildContract
-    ).to.have.property("abi");
+    ).to.have.property('abi')
     expect(
-      output.contracts["fixtures/instantiate.sol"].ChildContract,
+      output.contracts['fixtures/instantiate.sol'].ChildContract
-    ).to.have.property("evm");
+    ).to.have.property('evm')
     expect(
-      output.contracts["fixtures/instantiate.sol"].ChildContract.evm,
+      output.contracts['fixtures/instantiate.sol'].ChildContract.evm
-    ).to.have.property("bytecode");
+    ).to.have.property('bytecode')
-    expect(output.contracts["fixtures/instantiate.sol"]).to.have.property(
+    expect(output.contracts['fixtures/instantiate.sol']).to.have.property(
-      "MainContract",
+      'MainContract'
-    );
+    )
     expect(
-      output.contracts["fixtures/instantiate.sol"].MainContract,
+      output.contracts['fixtures/instantiate.sol'].MainContract
-    ).to.have.property("abi");
+    ).to.have.property('abi')
     expect(
-      output.contracts["fixtures/instantiate.sol"].MainContract,
+      output.contracts['fixtures/instantiate.sol'].MainContract
-    ).to.have.property("evm");
+    ).to.have.property('evm')
     expect(
-      output.contracts["fixtures/instantiate.sol"].MainContract.evm,
+      output.contracts['fixtures/instantiate.sol'].MainContract.evm
-    ).to.have.property("bytecode");
+    ).to.have.property('bytecode')
-  });
+  })
-});
+})

js/resolc/src/bin.ts

@@ -8,196 +8,193 @@ import * as resolc from '.'
 import { SolcInput } from '.'
 
 async function main() {
-    // hold on to any exception handlers that existed prior to this script running, we'll be adding them back at the end
+  // hold on to any exception handlers that existed prior to this script running, we'll be adding them back at the end
-    const originalUncaughtExceptionListeners =
+  const originalUncaughtExceptionListeners =
-        process.listeners('uncaughtException')
+    process.listeners('uncaughtException')
-    // FIXME: remove annoying exception catcher of Emscripten
+  // FIXME: remove annoying exception catcher of Emscripten
-    //        see https://github.com/chriseth/browser-solidity/issues/167
+  //        see https://github.com/chriseth/browser-solidity/issues/167
-    process.removeAllListeners('uncaughtException')
+  process.removeAllListeners('uncaughtException')
 
-    const program = new commander.Command()
+  const program = new commander.Command()
 
-    program.name('solcjs')
+  program.name('solcjs')
-    program.version(resolc.version())
+  program.version(resolc.version())
-    program
+  program
-        .option('--bin', 'Binary of the contracts in hex.')
+    .option('--bin', 'Binary of the contracts in hex.')
-        .option('--abi', 'ABI of the contracts.')
+    .option('--abi', 'ABI of the contracts.')
-        .option(
+    .option(
-            '--base-path <path>',
+      '--base-path <path>',
-            'Root of the project source tree. ' +
+      'Root of the project source tree. ' +
-                'The import callback will attempt to interpret all import paths as relative to this directory.'
+        'The import callback will attempt to interpret all import paths as relative to this directory.'
-        )
+    )
-        .option(
+    .option(
-            '--include-path <path...>',
+      '--include-path <path...>',
-            'Extra source directories available to the import callback. ' +
+      'Extra source directories available to the import callback. ' +
-                'When using a package manager to install libraries, use this option to specify directories where packages are installed. ' +
+        'When using a package manager to install libraries, use this option to specify directories where packages are installed. ' +
-                'Can be used multiple times to provide multiple locations.'
+        'Can be used multiple times to provide multiple locations.'
-        )
+    )
-        .option(
+    .option(
-            '-o, --output-dir <output-directory>',
+      '-o, --output-dir <output-directory>',
-            'Output directory for the contracts.'
+      'Output directory for the contracts.'
-        )
+    )
-        .option('-p, --pretty-json', 'Pretty-print all JSON output.', false)
+    .option('-p, --pretty-json', 'Pretty-print all JSON output.', false)
-        .option('-v, --verbose', 'More detailed console output.', false)
+    .option('-v, --verbose', 'More detailed console output.', false)
-        .argument('<files...>')
+    .argument('<files...>')
 
-    program.parse(process.argv)
+  program.parse(process.argv)
-    const options = program.opts<{
+  const options = program.opts<{
-        verbose: boolean
+    verbose: boolean
-        abi: boolean
+    abi: boolean
-        bin: boolean
+    bin: boolean
-        outputDir?: string
+    outputDir?: string
-        prettyJson: boolean
+    prettyJson: boolean
-        basePath?: string
+    basePath?: string
-        includePath?: string[]
+    includePath?: string[]
-    }>()
+  }>()
-    const files: string[] = program.args
+  const files: string[] = program.args
-    const destination = options.outputDir ?? '.'
+  const destination = options.outputDir ?? '.'
 
-    function abort(msg: string) {
+  function abort(msg: string) {
-        console.error(msg || 'Error occurred')
+    console.error(msg || 'Error occurred')
-        process.exit(1)
+    process.exit(1)
+  }
+
+  function withUnixPathSeparators(filePath: string) {
+    // On UNIX-like systems forward slashes in paths are just a part of the file name.
+    if (os.platform() !== 'win32') {
+      return filePath
     }
 
-    function withUnixPathSeparators(filePath: string) {
+    return filePath.replace(/\\/g, '/')
-        // On UNIX-like systems forward slashes in paths are just a part of the file name.
+  }
-        if (os.platform() !== 'win32') {
-            return filePath
-        }
 
-        return filePath.replace(/\\/g, '/')
+  function makeSourcePathRelativeIfPossible(sourcePath: string) {
-    }
+    const absoluteBasePath = options.basePath
-
+      ? path.resolve(options.basePath)
-    function makeSourcePathRelativeIfPossible(sourcePath: string) {
+      : path.resolve('.')
-        const absoluteBasePath = options.basePath
+    const absoluteIncludePaths = options.includePath
-            ? path.resolve(options.basePath)
+      ? options.includePath.map((prefix: string) => {
-            : path.resolve('.')
+          return path.resolve(prefix)
-        const absoluteIncludePaths = options.includePath
-            ? options.includePath.map((prefix: string) => {
-                  return path.resolve(prefix)
-              })
-            : []
-
-        // Compared to base path stripping logic in solc this is much simpler because path.resolve()
-        // handles symlinks correctly (does not resolve them except in work dir) and strips .. segments
-        // from paths going beyond root (e.g. `/../../a/b/c` -> `/a/b/c/`). It's simpler also because it
-        // ignores less important corner cases: drive letters are not stripped from absolute paths on
-        // Windows and UNC paths are not handled in a special way (at least on Linux). Finally, it has
-        // very little test coverage so there might be more differences that we are just not aware of.
-        const absoluteSourcePath = path.resolve(sourcePath)
-
-        for (const absolutePrefix of [absoluteBasePath].concat(
-            absoluteIncludePaths
-        )) {
-            const relativeSourcePath = path.relative(
-                absolutePrefix,
-                absoluteSourcePath
-            )
-
-            if (!relativeSourcePath.startsWith('../')) {
-                return withUnixPathSeparators(relativeSourcePath)
-            }
-        }
-
-        // File is not located inside base path or include paths so use its absolute path.
-        return withUnixPathSeparators(absoluteSourcePath)
-    }
-
-    function toFormattedJson<T>(input: T) {
-        return JSON.stringify(input, null, options.prettyJson ? 4 : 0)
-    }
-
-    if (files.length === 0) {
-        console.error('Must provide a file')
-        process.exit(1)
-    }
-
-    if (!(options.bin || options.abi)) {
-        abort('Invalid option selected, must specify either --bin or --abi')
-    }
-
-    const sources: SolcInput = {}
-
-    for (let i = 0; i < files.length; i++) {
-        try {
-            sources[makeSourcePathRelativeIfPossible(files[i])] = {
-                content: fs.readFileSync(files[i]).toString(),
-            }
-        } catch (e) {
-            abort('Error reading ' + files[i] + ': ' + e)
-        }
-    }
-
-    if (options.verbose) {
-        console.log('>>> Compiling:\n' + toFormattedJson(sources) + '\n')
-    }
-
-    const output = await resolc.compile(sources)
-    let hasError = false
-
-    if (!output) {
-        abort('No output from compiler')
-    } else if (output.errors) {
-        for (const error in output.errors) {
-            const message = output.errors[error]
-            if (message.severity === 'warning') {
-                console.log(message.formattedMessage)
-            } else {
-                console.error(message.formattedMessage)
-                hasError = true
-            }
-        }
-    }
-
-    fs.mkdirSync(destination, { recursive: true })
-
-    function writeFile(file: string, content: Buffer | string) {
-        file = path.join(destination, file)
-        fs.writeFile(file, content, function (err) {
-            if (err) {
-                console.error('Failed to write ' + file + ': ' + err)
-            }
         })
+      : []
+
+    // Compared to base path stripping logic in solc this is much simpler because path.resolve()
+    // handles symlinks correctly (does not resolve them except in work dir) and strips .. segments
+    // from paths going beyond root (e.g. `/../../a/b/c` -> `/a/b/c/`). It's simpler also because it
+    // ignores less important corner cases: drive letters are not stripped from absolute paths on
+    // Windows and UNC paths are not handled in a special way (at least on Linux). Finally, it has
+    // very little test coverage so there might be more differences that we are just not aware of.
+    const absoluteSourcePath = path.resolve(sourcePath)
+
+    for (const absolutePrefix of [absoluteBasePath].concat(
+      absoluteIncludePaths
+    )) {
+      const relativeSourcePath = path.relative(
+        absolutePrefix,
+        absoluteSourcePath
+      )
+
+      if (!relativeSourcePath.startsWith('../')) {
+        return withUnixPathSeparators(relativeSourcePath)
+      }
     }
 
-    for (const fileName in output.contracts) {
+    // File is not located inside base path or include paths so use its absolute path.
-        for (const contractName in output.contracts[fileName]) {
+    return withUnixPathSeparators(absoluteSourcePath)
-            let contractFileName = fileName + ':' + contractName
+  }
-            contractFileName = contractFileName.replace(/[:./\\]/g, '_')
 
-            if (options.bin) {
+  function toFormattedJson<T>(input: T) {
-                writeFile(
+    return JSON.stringify(input, null, options.prettyJson ? 4 : 0)
-                    contractFileName + '.polkavm',
+  }
-                    Buffer.from(
-                        output.contracts[fileName][contractName].evm.bytecode
-                            .object,
-                        'hex'
-                    )
-                )
-            }
 
-            if (options.abi) {
+  if (files.length === 0) {
-                writeFile(
+    console.error('Must provide a file')
-                    contractFileName + '.abi',
+    process.exit(1)
-                    toFormattedJson(
+  }
-                        output.contracts[fileName][contractName].abi
+
-                    )
+  if (!(options.bin || options.abi)) {
-                )
+    abort('Invalid option selected, must specify either --bin or --abi')
-            }
+  }
-        }
+
+  const sources: SolcInput = {}
+
+  for (let i = 0; i < files.length; i++) {
+    try {
+      sources[makeSourcePathRelativeIfPossible(files[i])] = {
+        content: fs.readFileSync(files[i]).toString(),
+      }
+    } catch (e) {
+      abort('Error reading ' + files[i] + ': ' + e)
     }
+  }
 
-    // Put back original exception handlers.
+  if (options.verbose) {
-    originalUncaughtExceptionListeners.forEach(function (listener) {
+    console.log('>>> Compiling:\n' + toFormattedJson(sources) + '\n')
-        process.addListener('uncaughtException', listener)
+  }
+
+  const output = await resolc.compile(sources)
+  let hasError = false
+
+  if (!output) {
+    abort('No output from compiler')
+  } else if (output.errors) {
+    for (const error in output.errors) {
+      const message = output.errors[error]
+      if (message.severity === 'warning') {
+        console.log(message.formattedMessage)
+      } else {
+        console.error(message.formattedMessage)
+        hasError = true
+      }
+    }
+  }
+
+  fs.mkdirSync(destination, { recursive: true })
+
+  function writeFile(file: string, content: Buffer | string) {
+    file = path.join(destination, file)
+    fs.writeFile(file, content, function (err) {
+      if (err) {
+        console.error('Failed to write ' + file + ': ' + err)
+      }
     })
+  }
 
-    if (hasError) {
+  for (const fileName in output.contracts) {
-        process.exit(1)
+    for (const contractName in output.contracts[fileName]) {
+      let contractFileName = fileName + ':' + contractName
+      contractFileName = contractFileName.replace(/[:./\\]/g, '_')
+
+      if (options.bin) {
+        writeFile(
+          contractFileName + '.polkavm',
+          Buffer.from(
+            output.contracts[fileName][contractName].evm.bytecode.object,
+            'hex'
+          )
+        )
+      }
+
+      if (options.abi) {
+        writeFile(
+          contractFileName + '.abi',
+          toFormattedJson(output.contracts[fileName][contractName].abi)
+        )
+      }
     }
+  }
+
+  // Put back original exception handlers.
+  originalUncaughtExceptionListeners.forEach(function (listener) {
+    process.addListener('uncaughtException', listener)
+  })
+
+  if (hasError) {
+    process.exit(1)
+  }
 }
 
 main().catch((err) => {
-    console.error('Error:', err)
+  console.error('Error:', err)
-    process.exit(1)
+  process.exit(1)
 })

js/resolc/src/index.test.ts

@@ -4,112 +4,113 @@ import assert from 'node:assert'
 import { compile, tryResolveImport } from '.'
 import { resolve } from 'node:path'
 
-
 const compileOptions = [{}]
 if (existsSync('../../target/release/resolc')) {
-    compileOptions.push({ bin: '../../target/release/resolc' })
+  compileOptions.push({ bin: '../../target/release/resolc' })
 }
 
 for (const options of compileOptions) {
-    test(`check Ok output with option ${JSON.stringify(options)}`, async () => {
+  test(`check Ok output with option ${JSON.stringify(options)}`, async () => {
-        const contract = 'fixtures/token.sol'
+    const contract = 'fixtures/token.sol'
-        const sources = {
+    const sources = {
-            [contract]: {
+      [contract]: {
-                content: readFileSync('fixtures/storage.sol', 'utf8'),
+        content: readFileSync('fixtures/storage.sol', 'utf8'),
-            },
+      },
-        }
+    }
 
-        const out = await compile(sources, options)
+    const out = await compile(sources, options)
-        assert(out.contracts[contract].Storage.abi != null)
+    assert(out.contracts[contract].Storage.abi != null)
-        assert(out.contracts[contract].Storage.evm.bytecode != null)
+    assert(out.contracts[contract].Storage.evm.bytecode != null)
-    })
+  })
 }
 
 test('check Err output', async () => {
-    const sources = {
+  const sources = {
-        bad: {
+    bad: {
-            content: readFileSync('fixtures/storage_bad.sol', 'utf8'),
+      content: readFileSync('fixtures/storage_bad.sol', 'utf8'),
-        },
+    },
-    }
+  }
 
-    const out = await compile(sources)
+  const out = await compile(sources)
-    assert(
+  assert(
-        out?.errors?.[0].message.includes(
+    out?.errors?.[0].message.includes(
-            'SPDX license identifier not provided in source file'
+      'SPDX license identifier not provided in source file'
-        )
     )
-    assert(
+  )
-        out?.errors?.[1].message.includes(
+  assert(
-            'Source file does not specify required compiler version'
+    out?.errors?.[1].message.includes(
-        )
+      'Source file does not specify required compiler version'
     )
+  )
 })
 
 test('check Err from stderr', async () => {
-    const sources = {
+  const sources = {
-        bad: {
+    bad: {
-            content: readFileSync('fixtures/bad_pragma.sol', 'utf8'),
+      content: readFileSync('fixtures/bad_pragma.sol', 'utf8'),
-        },
+    },
-    }
+  }
 
-    try {
+  try {
-        await compile(sources)
+    await compile(sources)
-        assert(false, 'Expected error')
+    assert(false, 'Expected error')
-    } catch (error) {
+  } catch (error) {
-        assert(
+    assert(
-            String(error).includes(
+      String(error).includes('Source file requires different compiler version')
-                'Source file requires different compiler version'
+    )
-            )
+  }
-        )
-    }
 })
 
 test('resolve import', () => {
-    const cases = [
+  const cases = [
-        // local
+    // local
-        {
+    {
-            file: './fixtures/storage.sol',
+      file: './fixtures/storage.sol',
-            expected: resolve('fixtures/storage.sol'),
+      expected: resolve('fixtures/storage.sol'),
-        },
+    },
-        // scopped module with version
+    // scopped module with version
-        {
+    {
-            file: '@openzeppelin/contracts@5.1.0/token/ERC20/ERC20.sol',
+      file: '@openzeppelin/contracts@5.1.0/token/ERC20/ERC20.sol',
-            expected: require.resolve('@openzeppelin/contracts/token/ERC20/ERC20.sol'),
+      expected: require.resolve(
-        },
+        '@openzeppelin/contracts/token/ERC20/ERC20.sol'
-        // scopped module without version
+      ),
-        {
+    },
-            file: '@openzeppelin/contracts/token/ERC20/ERC20.sol',
+    // scopped module without version
-            expected: require.resolve('@openzeppelin/contracts/token/ERC20/ERC20.sol'),
+    {
-        },
+      file: '@openzeppelin/contracts/token/ERC20/ERC20.sol',
-        // scopped module with wrong version
+      expected: require.resolve(
-        {
+        '@openzeppelin/contracts/token/ERC20/ERC20.sol'
-            file: '@openzeppelin/contracts@4.8.3/token/ERC20/ERC20.sol',
+      ),
-            expected: `Error: Version mismatch: Specified @openzeppelin/contracts@4.8.3, but installed version is 5.1.0`,
+    },
-        },
+    // scopped module with wrong version
-        // module without version
+    {
-        {
+      file: '@openzeppelin/contracts@4.8.3/token/ERC20/ERC20.sol',
-            file: '@openzeppelin/contracts/package.json',
+      expected: `Error: Version mismatch: Specified @openzeppelin/contracts@4.8.3, but installed version is 5.1.0`,
-            expected: require.resolve('@openzeppelin/contracts/package.json'),
+    },
-        },
+    // module without version
-        // scopped module with version
+    {
-        {
+      file: '@openzeppelin/contracts/package.json',
-            file: '@openzeppelin/contracts@5.1.0/package.json',
+      expected: require.resolve('@openzeppelin/contracts/package.json'),
-            expected: require.resolve('@openzeppelin/contracts/package.json'),
+    },
-        },
+    // scopped module with version
-    ]
+    {
+      file: '@openzeppelin/contracts@5.1.0/package.json',
+      expected: require.resolve('@openzeppelin/contracts/package.json'),
+    },
+  ]
 
-    for (const { file, expected } of cases) {
+  for (const { file, expected } of cases) {
-        try {
+    try {
-            const resolved = tryResolveImport(file)
+      const resolved = tryResolveImport(file)
-            assert(
+      assert(
-                resolved === expected,
+        resolved === expected,
-                `\nGot:\n${resolved}\nExpected:\n${expected}`
+        `\nGot:\n${resolved}\nExpected:\n${expected}`
-            )
+      )
-        } catch (error) {
+    } catch (error) {
-            assert(
+      assert(
-                String(error) == expected,
+        String(error) == expected,
-                `\nGot:\n${String(error)}\nExpected:\n${expected}`
+        `\nGot:\n${String(error)}\nExpected:\n${expected}`
-            )
+      )
-        }
     }
+  }
 })

js/resolc/src/index.ts

@@ -5,114 +5,114 @@ import path from 'path'
 import { existsSync, readFileSync } from 'fs'
 
 export type SolcInput = {
-    [contractName: string]: {
+  [contractName: string]: {
-        content: string
+    content: string
-    }
+  }
 }
 
 export type SolcError = {
-    component: string
+  component: string
-    errorCode: string
+  errorCode: string
-    formattedMessage: string
+  formattedMessage: string
-    message: string
+  message: string
-    severity: string
+  severity: string
-    sourceLocation?: {
+  sourceLocation?: {
-        file: string
+    file: string
-        start: number
+    start: number
-        end: number
+    end: number
-    }
+  }
-    type: string
+  type: string
 }
 
 export type SolcOutput = {
-    contracts: {
+  contracts: {
-        [contractPath: string]: {
+    [contractPath: string]: {
-            [contractName: string]: {
+      [contractName: string]: {
-                abi: Array<{
+        abi: Array<{
-                    name: string
+          name: string
-                    inputs: Array<{ name: string; type: string }>
+          inputs: Array<{ name: string; type: string }>
-                    outputs: Array<{ name: string; type: string }>
+          outputs: Array<{ name: string; type: string }>
-                    stateMutability: string
+          stateMutability: string
-                    type: string
+          type: string
-                }>
+        }>
-                evm: {
+        evm: {
-                    bytecode: { object: string }
+          bytecode: { object: string }
-                }
-            }
         }
+      }
     }
-    errors?: Array<SolcError>
+  }
+  errors?: Array<SolcError>
 }
 
 export function resolveInputs(sources: SolcInput): SolcInput {
-    const input = {
+  const input = {
-        language: 'Solidity',
+    language: 'Solidity',
-        sources,
+    sources,
-        settings: {
+    settings: {
-            outputSelection: {
+      outputSelection: {
-                '*': {
+        '*': {
-                    '*': ['evm.bytecode.object'],
+          '*': ['evm.bytecode.object'],
-                },
-            },
         },
-    }
+      },
+    },
+  }
 
-    const out = solc.compile(JSON.stringify(input), {
+  const out = solc.compile(JSON.stringify(input), {
-        import: (path: string) => {
+    import: (path: string) => {
-            return {
+      return {
-                contents: readFileSync(tryResolveImport(path), 'utf8'),
+        contents: readFileSync(tryResolveImport(path), 'utf8'),
-            }
+      }
+    },
+  })
+
+  const output = JSON.parse(out) as {
+    sources: { [fileName: string]: { id: number } }
+    errors: Array<SolcError>
+  }
+
+  if (output.errors && Object.keys(output.sources).length === 0) {
+    throw new Error(output.errors[0].formattedMessage)
+  }
+
+  return Object.fromEntries(
+    Object.keys(output.sources).map((fileName) => {
+      return [
+        fileName,
+        sources[fileName] ?? {
+          content: readFileSync(tryResolveImport(fileName), 'utf8'),
         },
+      ]
     })
-
+  )
-    const output = JSON.parse(out) as {
-        sources: { [fileName: string]: { id: number } }
-        errors: Array<SolcError>
-    }
-
-    if (output.errors && Object.keys(output.sources).length === 0) {
-        throw new Error(output.errors[0].formattedMessage)
-    }
-
-    return Object.fromEntries(
-        Object.keys(output.sources).map((fileName) => {
-            return [
-                fileName,
-                sources[fileName] ?? {
-                    content: readFileSync(tryResolveImport(fileName), 'utf8'),
-                },
-            ]
-        })
-    )
 }
 
 export function version(): string {
-    const v = resolcVersion()
+  const v = resolcVersion()
-    return v.split(' ').pop() ?? v
+  return v.split(' ').pop() ?? v
 }
 
 export async function compile(
-    sources: SolcInput,
+  sources: SolcInput,
-    option: { bin?: string } = {}
+  option: { bin?: string } = {}
 ): Promise<SolcOutput> {
-    const input = JSON.stringify({
+  const input = JSON.stringify({
-        language: 'Solidity',
+    language: 'Solidity',
-        sources: resolveInputs(sources),
+    sources: resolveInputs(sources),
-        settings: {
+    settings: {
-            optimizer: { enabled: true, runs: 200 },
+      optimizer: { enabled: true, runs: 200 },
-            outputSelection: {
+      outputSelection: {
-                '*': {
+        '*': {
-                    '*': ['abi'],
+          '*': ['abi'],
-                },
-            },
         },
-    })
+      },
+    },
+  })
 
-    if (option.bin) {
+  if (option.bin) {
-        return compileWithBin(input, option.bin)
+    return compileWithBin(input, option.bin)
-    }
+  }
 
-    return resolc(input)
+  return resolc(input)
 }
 
 /**
@@ -120,83 +120,81 @@ export async function compile(
  * @param importPath - The import path to resolve.
  */
 export function tryResolveImport(importPath: string) {
-    // resolve local path
+  // resolve local path
-    if (existsSync(importPath)) {
+  if (existsSync(importPath)) {
-        return path.resolve(importPath)
+    return path.resolve(importPath)
+  }
+
+  const importRegex = /^(@?[^@/]+(?:\/[^@/]+)?)(?:@([^/]+))?(\/.+)$/
+  const match = importPath.match(importRegex)
+
+  if (!match) {
+    throw new Error('Invalid import path format.')
+  }
+
+  const basePackage = match[1] // "foo", "@scope/foo"
+  const specifiedVersion = match[2] // "1.2.3" (optional)
+  const relativePath = match[3] // "/path/to/file.sol"
+
+  let packageJsonPath
+  try {
+    packageJsonPath = require.resolve(path.join(basePackage, 'package.json'))
+  } catch {
+    throw new Error(`Could not resolve package ${basePackage}`)
+  }
+
+  // Check if a version was specified and compare with the installed version
+  if (specifiedVersion) {
+    const installedVersion = JSON.parse(
+      readFileSync(packageJsonPath, 'utf-8')
+    ).version
+
+    if (installedVersion !== specifiedVersion) {
+      throw new Error(
+        `Version mismatch: Specified ${basePackage}@${specifiedVersion}, but installed version is ${installedVersion}`
+      )
     }
+  }
 
-    const importRegex = /^(@?[^@/]+(?:\/[^@/]+)?)(?:@([^/]+))?(\/.+)$/
+  const packageRoot = path.dirname(packageJsonPath)
-    const match = importPath.match(importRegex)
 
-    if (!match) {
+  // Construct full path to the requested file
-        throw new Error('Invalid import path format.')
+  const resolvedPath = path.join(packageRoot, relativePath)
-    }
+  if (existsSync(resolvedPath)) {
-
+    return resolvedPath
-    const basePackage = match[1] // "foo", "@scope/foo"
+  } else {
-    const specifiedVersion = match[2] // "1.2.3" (optional)
+    throw new Error(`Resolved path ${resolvedPath} does not exist.`)
-    const relativePath = match[3] // "/path/to/file.sol"
+  }
-
-    let packageJsonPath
-    try {
-        packageJsonPath = require.resolve(
-            path.join(basePackage, 'package.json')
-        )
-    } catch {
-        throw new Error(`Could not resolve package ${basePackage}`)
-    }
-
-    // Check if a version was specified and compare with the installed version
-    if (specifiedVersion) {
-        const installedVersion = JSON.parse(
-            readFileSync(packageJsonPath, 'utf-8')
-        ).version
-
-        if (installedVersion !== specifiedVersion) {
-            throw new Error(
-                `Version mismatch: Specified ${basePackage}@${specifiedVersion}, but installed version is ${installedVersion}`
-            )
-        }
-    }
-
-    const packageRoot = path.dirname(packageJsonPath)
-
-    // Construct full path to the requested file
-    const resolvedPath = path.join(packageRoot, relativePath)
-    if (existsSync(resolvedPath)) {
-        return resolvedPath
-    } else {
-        throw new Error(`Resolved path ${resolvedPath} does not exist.`)
-    }
 }
 function compileWithBin(input: string, bin: string): PromiseLike<SolcOutput> {
-    return new Promise((resolve, reject) => {
+  return new Promise((resolve, reject) => {
-        const process = spawn(bin, ['--standard-json'])
+    const process = spawn(bin, ['--standard-json'])
 
-        let output = ''
+    let output = ''
-        let error = ''
+    let error = ''
 
-        process.stdin.write(input)
+    process.stdin.write(input)
-        process.stdin.end()
+    process.stdin.end()
 
-        process.stdout.on('data', (data) => {
+    process.stdout.on('data', (data) => {
-            output += data.toString()
+      output += data.toString()
-        })
-
-        process.stderr.on('data', (data) => {
-            error += data.toString()
-        })
-
-        process.on('close', (code) => {
-            if (code === 0) {
-                try {
-                    const result: SolcOutput = JSON.parse(output)
-                    resolve(result)
-                } catch {
-                    reject(new Error(`Failed to parse output`))
-                }
-            } else {
-                reject(new Error(`Process exited with code ${code}: ${error}`))
-            }
-        })
     })
+
+    process.stderr.on('data', (data) => {
+      error += data.toString()
+    })
+
+    process.on('close', (code) => {
+      if (code === 0) {
+        try {
+          const result: SolcOutput = JSON.parse(output)
+          resolve(result)
+        } catch {
+          reject(new Error(`Failed to parse output`))
+        }
+      } else {
+        reject(new Error(`Process exited with code ${code}: ${error}`))
+      }
+    })
+  })
 }

js/resolc/src/resolc.ts

@@ -3,28 +3,28 @@ import Resolc from './resolc/resolc'
 import type { SolcOutput } from '.'
 
 export function resolc(input: string): SolcOutput {
-    const m = Resolc() as any // eslint-disable-line @typescript-eslint/no-explicit-any
+  const m = Resolc() as any // eslint-disable-line @typescript-eslint/no-explicit-any
-    m.soljson = soljson
+  m.soljson = soljson
-    m.writeToStdin(input)
+  m.writeToStdin(input)
-    m.callMain(['--standard-json'])
+  m.callMain(['--standard-json'])
-    const err = m.readFromStderr()
+  const err = m.readFromStderr()
 
-    if (err) {
+  if (err) {
-        throw new Error(err)
+    throw new Error(err)
-    }
+  }
 
-    return JSON.parse(m.readFromStdout()) as SolcOutput
+  return JSON.parse(m.readFromStdout()) as SolcOutput
 }
 
 export function version(): string {
-    const m = Resolc() as any // eslint-disable-line @typescript-eslint/no-explicit-any
+  const m = Resolc() as any // eslint-disable-line @typescript-eslint/no-explicit-any
-    m.soljson = soljson
+  m.soljson = soljson
-    m.callMain(['--version'])
+  m.callMain(['--version'])
-    const err = m.readFromStderr()
+  const err = m.readFromStderr()
 
-    if (err) {
+  if (err) {
-        throw new Error(err)
+    throw new Error(err)
-    }
+  }
 
-    return m.readFromStdout()
+  return m.readFromStdout()
 }

js/resolc/src/solc.d.ts

@@ -1,95 +1,95 @@
 declare module 'solc/soljson' {}
 
 declare module 'solc' {
-    // Basic types for input/output handling
+  // Basic types for input/output handling
-    export interface CompileInput {
+  export interface CompileInput {
-        language: string
+    language: string
-        sources: {
+    sources: {
-            [fileName: string]: {
+      [fileName: string]: {
-                content: string
+        content: string
-            }
+      }
+    }
+    settings?: {
+      optimizer?: {
+        enabled: boolean
+        runs: number
+      }
+      outputSelection: {
+        [fileName: string]: {
+          [contractName: string]: string[]
         }
-        settings?: {
+      }
-            optimizer?: {
+    }
-                enabled: boolean
+  }
-                runs: number
+
-            }
+  export interface CompileOutput {
-            outputSelection: {
+    errors?: Array<{
+      component: string
+      errorCode: string
+      formattedMessage: string
+      message: string
+      severity: string
+      sourceLocation?: {
+        file: string
+        start: number
+        end: number
+      }
+      type: string
+    }>
+    sources?: {
+      [fileName: string]: {
+        id: number
+        ast: object
+      }
+    }
+    contracts?: {
+      [fileName: string]: {
+        [contractName: string]: {
+          abi: object[]
+          evm: {
+            bytecode: {
+              object: string
+              sourceMap: string
+              linkReferences: {
                 [fileName: string]: {
-                    [contractName: string]: string[]
+                  [libraryName: string]: Array<{
+                    start: number
+                    length: number
+                  }>
                 }
+              }
             }
-        }
+            deployedBytecode: {
-    }
+              object: string
-
+              sourceMap: string
-    export interface CompileOutput {
+              linkReferences: {
-        errors?: Array<{
+                [fileName: string]: {
-            component: string
+                  [libraryName: string]: Array<{
-            errorCode: string
+                    start: number
-            formattedMessage: string
+                    length: number
-            message: string
+                  }>
-            severity: string
-            sourceLocation?: {
-                file: string
-                start: number
-                end: number
-            }
-            type: string
-        }>
-        sources?: {
-            [fileName: string]: {
-                id: number
-                ast: object
-            }
-        }
-        contracts?: {
-            [fileName: string]: {
-                [contractName: string]: {
-                    abi: object[]
-                    evm: {
-                        bytecode: {
-                            object: string
-                            sourceMap: string
-                            linkReferences: {
-                                [fileName: string]: {
-                                    [libraryName: string]: Array<{
-                                        start: number
-                                        length: number
-                                    }>
-                                }
-                            }
-                        }
-                        deployedBytecode: {
-                            object: string
-                            sourceMap: string
-                            linkReferences: {
-                                [fileName: string]: {
-                                    [libraryName: string]: Array<{
-                                        start: number
-                                        length: number
-                                    }>
-                                }
-                            }
-                        }
-                    }
                 }
+              }
             }
+          }
         }
+      }
     }
+  }
 
-    // Main exported functions
+  // Main exported functions
-    export function compile(
+  export function compile(
-        input: string | CompileInput,
+    input: string | CompileInput,
-        options?: {
+    options?: {
-            import: (path: string) =>
+      import: (path: string) =>
-                | {
+        | {
-                      contents: string
+            contents: string
-                      error?: undefined
+            error?: undefined
-                  }
+          }
-                | {
+        | {
-                      error: string
+            error: string
-                      contents?: undefined
+            contents?: undefined
-                  }
+          }
-        }
+    }
-    ): string
+  ): string
 }