'bump'

Author: tenbits

lib/index.js

@@ -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;
@@ -237,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,
@@ -299,7 +323,7 @@ async function getCompiledAbis(config, compileSolOutput) {
                     return shouldInstall;
                 }
                 if (sources != null) {
-                    return x.sourceFile.toLowerCase().startsWith(`file://${sources.toLowerCase()}`);
+                    return _path_1.$path.normalize(x.sourceFile).toLowerCase().startsWith(`file://${_path_1.$path.normalize(sources).toLowerCase()}`);
                 }
                 return false;
             })

package.json

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

src/index.ts

@@ -141,7 +141,7 @@ subtask(TASK_0xWEB_GENERATE)
         const app = new App();
         await alot(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,
@@ -189,9 +189,9 @@ async function getCompiledAbis(config: {
         // system path directory with the contract sources
         sources: string
     }
-    '0xweb': {
+    '0xweb'?: {
         // SOL files or contract names as CSV
-        install: string
+        install?: string
     }
 }, compileSolOutput: {
     artifactsEmittedPerJob: {
@@ -227,7 +227,7 @@ async function getCompiledAbis(config: {
                     return shouldInstall;
                 }
                 if (sources != null) {
-                    return x.sourceFile.toLowerCase().startsWith(`file://${sources.toLowerCase()}`);
+                    return $path.normalize(x.sourceFile).toLowerCase().startsWith(`file://${$path.normalize(sources).toLowerCase()}`);
                 }
                 return false;
             })

src/utils/$path.ts

@@ -11,4 +11,28 @@ export namespace $path {
     export function join (...paths: string[]) {
         return pathUtil.join(...paths).replace(/\\/g, '/');
     }
+    export function normalize (path: string) {
+        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;
+    }
 }