Merge pull request #7030 from NomicFoundation/parse-flag

fix: global flag option parsing

Author: kanej

.changeset/spicy-ravens-type.md

@@ -0,0 +1,5 @@
+---
+"hardhat": patch
+---
+
+Fixed global flag option parsing ([#7028](https://github.com/NomicFoundation/hardhat/issues/7028))

v-next/hardhat/src/internal/core/arguments.ts

@@ -185,12 +185,7 @@ export function parseArgumentValue(
     case ArgumentType.BOOLEAN:
       return validateAndParseBoolean(name, value);
     case ArgumentType.FLAG:
-      throw new HardhatError(
-        HardhatError.ERRORS.CORE.INTERNAL.ASSERTION_ERROR,
-        {
-          message: "Flags should never accept values",
-        },
-      );
+      return validateAndParseFlag(name, value);
   }
 }
 
@@ -281,3 +276,20 @@ function validateAndParseBoolean(name: string, value: string): boolean {
 
   return normalizedValue === "true";
 }
+
+function validateAndParseFlag(name: string, value: string): boolean {
+  const normalizedValue = value.toLowerCase();
+
+  if (normalizedValue !== "true" && normalizedValue !== "false") {
+    throw new HardhatError(
+      HardhatError.ERRORS.CORE.ARGUMENTS.INVALID_VALUE_FOR_TYPE,
+      {
+        value,
+        name,
+        type: ArgumentType.FLAG,
+      },
+    );
+  }
+
+  return normalizedValue === "true";
+}

v-next/hardhat/test/internal/core/arguments.ts

@@ -183,16 +183,8 @@ describe("Arguments", () => {
       );
     });
 
-    it("should throw when parsing flag arguments values", () => {
-      assertThrowsHardhatError(
-        () => {
-          parseArgumentValue("true", ArgumentType.FLAG, "name");
-        },
-        HardhatError.ERRORS.CORE.INTERNAL.ASSERTION_ERROR,
-        {
-          message: "Flags should never accept values",
-        },
-      );
+    it("should parse flag arguments", () => {
+      assert.equal(parseArgumentValue("true", ArgumentType.FLAG, "name"), true);
     });
 
     it("should parse level arguments", () => {
@@ -245,9 +237,11 @@ describe("Arguments", () => {
           () => {
             parseArgumentValue("foo", ArgumentType.FLAG, "name");
           },
-          HardhatError.ERRORS.CORE.INTERNAL.ASSERTION_ERROR,
+          HardhatError.ERRORS.CORE.ARGUMENTS.INVALID_VALUE_FOR_TYPE,
           {
-            message: "Flags should never accept values",
+            value: "foo",
+            name: "name",
+            type: ArgumentType.FLAG,
           },
         );
       });

v-next/hardhat/test/internal/core/global-options.ts

@@ -10,7 +10,11 @@ import {
   RESERVED_ARGUMENT_NAMES,
   RESERVED_ARGUMENT_SHORT_NAMES,
 } from "../../../src/internal/core/arguments.js";
-import { globalOption } from "../../../src/internal/core/config.js";
+import {
+  globalFlag,
+  globalLevel,
+  globalOption,
+} from "../../../src/internal/core/config.js";
 import {
   buildGlobalOptionDefinition,
   buildGlobalOptionDefinitions,
@@ -457,11 +461,29 @@ describe("Global Options", () => {
               type: ArgumentType.BIGINT,
               defaultValue: 0n,
             }),
+            globalFlag({
+              name: "globalOption4",
+              description: "globalOption4 description",
+            }),
+            globalFlag({
+              name: "globalOption5",
+              description: "globalOption5 description",
+            }),
+            globalLevel({
+              name: "globalOption6",
+              description: "globalOption6 description",
+            }),
+            globalLevel({
+              name: "globalOption7",
+              description: "globalOption7 description",
+            }),
           ],
         },
       ]);
 
       setEnvVar("HARDHAT_GLOBAL_OPTION_3", "5n");
+      setEnvVar("HARDHAT_GLOBAL_OPTION_5", "true");
+      setEnvVar("HARDHAT_GLOBAL_OPTION_7", "2");
 
       const globalOptions = resolveGlobalOptions(
         /* eslint-disable-next-line @typescript-eslint/consistent-type-assertions  --
@@ -470,6 +492,8 @@ describe("Global Options", () => {
         {
           globalOption1: false,
           globalOption2: "user",
+          globalOption4: true,
+          globalOption6: 2,
         } as Partial<GlobalOptions>,
         globalOptionDefinitions,
       );
@@ -478,6 +502,10 @@ describe("Global Options", () => {
         globalOption1: false,
         globalOption2: "user",
         globalOption3: 5n,
+        globalOption4: true,
+        globalOption5: true,
+        globalOption6: 2,
+        globalOption7: 2,
       });
     });