@0xweb/hardhat 0.1.17 → 0.1.19

package/lib/index.js

@@ -128,12 +128,12 @@ var $path;
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const alot_1 = require("alot");
+const atma_io_1 = require("atma-io");
+const _0xweb_1 = require("0xweb");
 const task_names_1 = require("hardhat/builtin-tasks/task-names");
 const config_1 = require("hardhat/config");
 const config_2 = _src_config;
 const constants_1 = _src_constants;
-const atma_io_1 = require("atma-io");
-const _0xweb_1 = require("0xweb");
 const _path_1 = _src_utils__path;
 const taskArgsStore = { compileAll: false };
 (0, config_1.extendConfig)((config) => {
@@ -143,31 +143,23 @@ const taskArgsStore = { compileAll: false };
     .addOptionalParam('sources', 'Override the sources directory')
     .addOptionalParam('artifacts', 'Override the artifacts output directory')
     .addOptionalParam('root', 'Overrides root directory. If sources is also overridden must be the sub-folder of the sources dir')
-    .addOptionalParam('watch', 'Re-runs compilation task on changes', false, {
-    name: 'boolean',
-    validate(argName, argumentValue) { },
-    parse(val) {
-        if (val === '' || val === '1' || val === true || val === 'true') {
-            return true;
-        }
-        return false;
-    }
-})
-    .addOptionalParam('tsgen', 'Skip the TypeScript class generation', true, {
-    name: 'boolean',
-    validate(key, value) { },
-    parse(key, value) {
-        if (value === '0' || value === 0 || value === false || value === 'false') {
-            return false;
-        }
-        return true;
-    }
-})
+    .addOptionalParam('package', 'Compile the contracts within a specific mono-repo package. Artifacts and 0xc classes will be placed in the package directory')
+    .addOptionalParam('tsgen', 'Skip the TypeScript class generation', true, config_1.types.boolean)
+    .addFlag('watch', 'Watch sources directory and reruns compilation task on changes')
     .setAction(async (compilationArgs, { run, config, artifacts }, runSuper) => {
+    ConfigHelper.resetPaths(config.paths);
     if (compilationArgs.tsgen === false) {
         config['0xweb'].tsgen = false;
     }
-    ConfigHelper.resetPaths(config.paths);
+    if (compilationArgs.package != null) {
+        config['0xweb'].package = compilationArgs.package;
+        if (compilationArgs.artifacts == null) {
+            compilationArgs.artifacts = _path_1.$path.join(compilationArgs.package, 'artifacts');
+        }
+        if (compilationArgs.sources == null) {
+            compilationArgs.sources = _path_1.$path.join(compilationArgs.sources, 'contracts');
+        }
+    }
     // Re-set Artifacts Path manually, as Hardhat initializes the Artifacts Instance before this task runs.
     // Other paths (sources, cache) will be resolved later by hardhat from config
     const artifactsInstance = artifacts;
@@ -224,13 +216,22 @@ const taskArgsStore = { compileAll: false };
         return;
     }
     const contracts = await getCompiledAbis(config, compileSolOutput);
+    const pkg = config['0xweb'].package;
     const app = new _0xweb_1.App();
     await (0, alot_1.default)(contracts)
         .forEachAsync(async (contract, i) => {
         console.log(`Generation ${contract.name}(${contract.path}) ${i}/${contracts.length}`);
-        await app.execute([`install`, `${contract.path}`, '--name', contract.name, '--chain', 'hardhat']);
+        const params = [
+            `install`, `${contract.path}`,
+            '--name', contract.name,
+            '--chain', 'hardhat'
+        ];
+        if (pkg != null) {
+            params.push('--output', _path_1.$path.join(pkg, '0xc'));
+        }
+        await app.execute(params);
     })
-        .toArrayAsync({ threads: 1 });
+        .toArrayAsync({ threads: 4 });
 });
 (0, config_1.task)(constants_1.TASK_0xWEB, 'Generate 0xWeb classes for compiled contracts')
     .setAction(async (_, { run }) => {
@@ -242,7 +243,7 @@ const taskArgsStore = { compileAll: false };
     if (global) {
         return;
     }
-    const dir = `/0xweb/hardhat/`;
+    const dir = `/0xc/hardhat/`;
     if (await atma_io_1.Directory.existsAsync(dir)) {
         await atma_io_1.Directory.removeAsync(dir);
     }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@0xweb/hardhat",
     "description": "0xweb plugin for Hardhat",
-    "version": "0.1.17",
+    "version": "0.1.19",
     "main": "./lib/index.js",
     "author": {
         "name": "Alex Kit",