@0xweb/hardhat 0.1.24 → 0.1.27

package/lib/index.js

@@ -1,8 +1,8 @@
 
-// source ./RootModule.js
+// source ./RootModuleWrapped.js
 (function(){
-	
-	var _src_config = {};
+
+    var _src_config = {};
 var _src_constants = {};
 var _src_utils__path = {};
 
@@ -105,6 +105,30 @@ var $path;
         return pathUtil.join(...paths).replace(/\\/g, '/');
     }
     $path.join = join;
+    function normalize(path) {
+        path = path
+            // Replace all / duplicates, but not near the protocol
+            .replace(/(?<![:/])\/{2,}/g, '/')
+            // Use forward slashes
+            .replace(/\\/g, '/')
+            // Replace "foo/./bar" with single slash: "foo/bar"
+            .replace(/\/\.\//g, '/');
+        while (true) {
+            let next = path.replace(/([^\/]+)\/\.\.\//g, (match, p1) => {
+                if (p1 !== '..' && p1 !== '.') {
+                    return '';
+                }
+                return match;
+            });
+            if (next === path) {
+                // nothing to collapse
+                break;
+            }
+            path = next;
+        }
+        return path;
+    }
+    $path.normalize = normalize;
 })($path = exports.$path || (exports.$path = {}));
 //# sourceMappingURL=$path.js.map
 //# sourceMappingURL=$path.ts.map;
@@ -145,12 +169,16 @@ const taskArgsStore = { compileAll: false };
     .addOptionalParam('root', 'Overrides root directory. If sources is also overridden must be the sub-folder of the sources dir')
     .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)
+    .addOptionalParam('install', 'CSV sol path to install, default installs all compiled contracts from sources')
     .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;
     }
+    if (compilationArgs.install != null) {
+        config['0xweb'].install = compilationArgs.install;
+    }
     if (compilationArgs.package != null) {
         config['0xweb'].package = compilationArgs.package;
         if (compilationArgs.artifacts == null) {
@@ -233,7 +261,7 @@ const taskArgsStore = { compileAll: false };
     const app = new _0xweb_1.App();
     await (0, alot_1.default)(contracts)
         .forEachAsync(async (contract, i) => {
-        console.log(`Generate ${contract.name}(${contract.path}) ${i}/${contracts.length}`);
+        console.log(`⏳ Generate ${contract.name}(${contract.path}) ${i}/${contracts.length}`);
         const params = [
             `install`, `${contract.path}`,
             '--name', contract.name,
@@ -271,33 +299,54 @@ const taskArgsStore = { compileAll: false };
     await runSuper();
 });
 async function getCompiledAbis(config, compileSolOutput) {
+    var _a, _b, _c;
+    const sources = config.paths.sources;
+    const installs = (_c = (_b = (_a = config['0xweb']) === null || _a === void 0 ? void 0 : _a.install) === null || _b === void 0 ? void 0 : _b.split(',').map(x => x.trim())) !== null && _c !== void 0 ? _c : null;
     const emittedArtifacts = (0, alot_1.default)(compileSolOutput.artifactsEmittedPerJob).mapMany((a) => {
         return (0, alot_1.default)(a.artifactsEmittedPerFile).mapMany((artifactPerFile) => {
             return (0, alot_1.default)(artifactPerFile.artifactsEmitted).map((artifactName) => {
                 return {
-                    name: artifactName,
+                    // Contract Name
+                    artifactName: artifactName,
+                    // Contract local path, aka import
+                    sourceName: artifactPerFile.file.sourceName,
+                    // Contract system path, aka file path
                     sourceFile: 'file://' + artifactPerFile.file.absolutePath
                 };
             })
-                .filter(x => x.sourceFile.includes('@openzeppelin') === false)
+                .filter(x => {
+                if (installs != null) {
+                    let shouldInstall = installs.some(toInstall => {
+                        var _a;
+                        return x.artifactName === toInstall || ((_a = x.sourceName) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === toInstall.toLowerCase();
+                    });
+                    return shouldInstall;
+                }
+                if (sources != null) {
+                    return _path_1.$path.normalize(x.sourceFile).toLowerCase().startsWith(`file://${_path_1.$path.normalize(sources).toLowerCase()}`);
+                }
+                return false;
+            })
+                //.filter(x => x.sourceFile.includes('@openzeppelin') === false)
                 .toArray();
         }).toArray();
     }).toArray();
-    let namesHash = (0, alot_1.default)(emittedArtifacts).toDictionary(x => x.name);
+    let namesHash = (0, alot_1.default)(emittedArtifacts).toDictionary(x => x.artifactName);
     let files = await atma_io_1.Directory.readFilesAsync(`file://${config.paths.artifacts}/`, '**.json');
     let compileAll = taskArgsStore.compileAll;
     let arr = files
         .map(file => {
         let path = file.uri.toString();
-        let match = /(?<name>[^\\\/]+)\.sol[\\\/]/.exec(path);
+        let match = /(?<sourceFileName>[^\\\/]+)\.sol[\\\/]/.exec(path);
         if (match == null) {
             return null;
         }
-        let name = match.groups.name;
+        // assume artifactName === sourceFileName @TODO consider to handle different file-contract names
+        let name = match.groups.sourceFileName;
         if (compileAll !== true && name in namesHash === false) {
             return null;
         }
-        if (new RegExp(`${name}\\.json$`).test(path) === false) {
+        if (new RegExp(`[\\\/]${name}\\.json$`).test(path) === false) {
             return null;
         }
         return {
@@ -324,4 +373,5 @@ var ConfigHelper;
 //# sourceMappingURL=index.ts.map
 
 }());
-// end:source ./RootModule.js
+
+// end:source ./RootModuleWrapped.js

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@0xweb/hardhat",
     "description": "0xweb plugin for Hardhat",
-    "version": "0.1.24",
+    "version": "0.1.27",
     "main": "./lib/index.js",
     "author": {
         "name": "Alex Kit",
@@ -18,9 +18,9 @@
     ],
     "license": "MIT",
     "dependencies": {
-        "0xweb": "^0.10.40",
+        "0xweb": "^0.10.69",
         "alot": "^0.3.0",
-        "atma-io": "^1.2.65",
+        "atma-io": "^1.3.5",
         "memd": "^0.3.10"
     },
     "peerDependencies": {
@@ -33,8 +33,9 @@
         "release": "atma bump && npm run build && git add -A && git commit -am 'bump' && git push && git push origin master:release"
     },
     "devDependencies": {
-        "app-bundler": "^0.1.7",
-        "atma": "^0.15.17",
+        "app-bundler": "^0.2.14",
+        "atma": "^0.15.23",
+        "atma-loader-ts": "^1.2.7",
         "shellbee": "^0.5.22"
     },
     "app-bundler": {

package/readme.md

@@ -2,7 +2,7 @@
 
 
 ----
-[![npm version](https://badge.fury.io/js/0xc%2Fhardhat.svg)](https://badge.fury.io/js/0xc%2Fhardhat)
+[![npm version](https://badge.fury.io/js/@0xweb%2Fhardhat.svg)](https://badge.fury.io/js/@0xweb%2Fhardhat)
 [![CircleCI](https://circleci.com/gh/0xweb-org/hardhat.svg?style=svg)](https://circleci.com/gh/0xweb-org/hardhat)
 
 
@@ -95,7 +95,7 @@ const text = await foo.name();
 - `npx hardhat compile --sources /foo/bar/qux` - compiles solidity files which are located outside the `/contracts` folder
 - `npx hardhat compile --artifacts /dist` - set custom folder for artifacts (ABI JSONs and TS contracts)
 - `npx hardhat compile --watch` - Compile the sources and waits to recompile on changes
-- `npx hardhat compile --tsgen false` - Do not generate the TS classes
 - `npx hardhat compile --package path/to/package/folder` - You can split your project into packages, and with the command compile the contracts in a package, the sources will be searched in that directory, and the artifacts output will be written to that directory
-
+- `npx hardhat compile --tsgen false` - Do not generate the TS classes. Installs all the contracts from the sources directory.
+- `npx hardhat compile --install TimelockController` - Installs only specified Artifact name or *.sol paths. Comma separated.
 ----