address comments

Author: zoeyTM

v-next/core/src/internal/config-validation.ts

@@ -5,11 +5,8 @@ import type {
 } from "../types/hooks.js";
 import type { HardhatPlugin } from "../types/plugins.js";
 
-import {
-  isOptionDefinition,
-  isPositionalArgumentDefinition,
-  isTaskDefinition,
-} from "../type-guards.js";
+import { isObject } from "@ignored/hardhat-vnext-utils/lang";
+
 import {
   ArgumentType,
   type OptionDefinition,
@@ -23,6 +20,64 @@ import {
   type TaskOverrideDefinition,
 } from "../types/tasks.js";
 
+function isValidEnumValue(
+  theEnum: Record<string, string>,
+  value: string,
+): boolean {
+  // Enums are objects that have entries that map:
+  //   1) keys to values
+  //   2) values to keys
+  const key = theEnum[value];
+  if (key === undefined) {
+    return false;
+  }
+
+  return theEnum[key] === value;
+}
+
+/**
+ * Returns true if `potential` is a `TaskDefinition`.
+ */
+function isTaskDefinition(potential: unknown): potential is TaskDefinition {
+  return (
+    typeof potential === "object" &&
+    potential !== null &&
+    "type" in potential &&
+    typeof potential.type === "string" &&
+    isValidEnumValue(TaskDefinitionType, potential.type)
+  );
+}
+
+/**
+ * Returns true if `potential` is a `OptionDefinition`.
+ */
+function isOptionDefinition(potential: unknown): potential is OptionDefinition {
+  return (
+    typeof potential === "object" &&
+    potential !== null &&
+    "type" in potential &&
+    typeof potential.type === "string" &&
+    isValidEnumValue(ArgumentType, potential.type) &&
+    !("isVariadic" in potential)
+  );
+}
+
+/**
+ * Returns true if `potential` is a `PositionalArgumentDefinition`.
+ */
+function isPositionalArgumentDefinition(
+  potential: unknown,
+): potential is PositionalArgumentDefinition {
+  return (
+    typeof potential === "object" &&
+    potential !== null &&
+    "type" in potential &&
+    typeof potential.type === "string" &&
+    isValidEnumValue(ArgumentType, potential.type) &&
+    "isVariadic" in potential
+  );
+}
+
 export async function validateUserConfig(
   hooks: HookManager,
   config: HardhatUserConfig,
@@ -166,7 +221,7 @@ export function validateNewTask(
     });
   }
 
-  if (typeof task.options === "object" && task.options !== null) {
+  if (isObject(task.options)) {
     validationErrors.push(
       ...validateOptions(task.options, [...path, "options"]),
     );
@@ -221,7 +276,7 @@ export function validateTaskOverride(
     });
   }
 
-  if (typeof task.options === "object" && task.options !== null) {
+  if (isObject(task.options)) {
     validationErrors.push(
       ...validateOptions(task.options, [...path, "options"]),
     );
@@ -348,10 +403,9 @@ export function validatePositionalArguments(
         case ArgumentType.STRING:
         case ArgumentType.FILE: {
           if (
-            (typeof arg.defaultValue !== "string" &&
-              !Array.isArray(arg.defaultValue)) ||
-            (Array.isArray(arg.defaultValue) &&
-              !arg.defaultValue.every((v) => typeof v === "string"))
+            typeof arg.defaultValue !== "string" &&
+            (!Array.isArray(arg.defaultValue) ||
+              arg.defaultValue.some((v) => typeof v !== "string"))
           ) {
             validationErrors.push({
               path: [...path, "positionalArguments", index, "defaultValue"],
@@ -364,10 +418,9 @@ export function validatePositionalArguments(
         }
         case ArgumentType.BOOLEAN: {
           if (
-            (typeof arg.defaultValue !== "boolean" &&
-              !Array.isArray(arg.defaultValue)) ||
-            (Array.isArray(arg.defaultValue) &&
-              !arg.defaultValue.every((v) => typeof v === "boolean"))
+            typeof arg.defaultValue !== "boolean" &&
+            (!Array.isArray(arg.defaultValue) ||
+              arg.defaultValue.some((v) => typeof v !== "boolean"))
           ) {
             validationErrors.push({
               path: [...path, "positionalArguments", index, "defaultValue"],
@@ -381,10 +434,9 @@ export function validatePositionalArguments(
         case ArgumentType.INT:
         case ArgumentType.FLOAT: {
           if (
-            (typeof arg.defaultValue !== "number" &&
-              !Array.isArray(arg.defaultValue)) ||
-            (Array.isArray(arg.defaultValue) &&
-              !arg.defaultValue.every((v) => typeof v === "number"))
+            typeof arg.defaultValue !== "number" &&
+            (!Array.isArray(arg.defaultValue) ||
+              arg.defaultValue.some((v) => typeof v !== "number"))
           ) {
             validationErrors.push({
               path: [...path, "positionalArguments", index, "defaultValue"],
@@ -397,10 +449,9 @@ export function validatePositionalArguments(
         }
         case ArgumentType.BIGINT: {
           if (
-            (typeof arg.defaultValue !== "bigint" &&
-              !Array.isArray(arg.defaultValue)) ||
-            (Array.isArray(arg.defaultValue) &&
-              !arg.defaultValue.every((v) => typeof v === "bigint"))
+            typeof arg.defaultValue !== "bigint" &&
+            (!Array.isArray(arg.defaultValue) ||
+              arg.defaultValue.some((v) => typeof v !== "bigint"))
           ) {
             validationErrors.push({
               path: [...path, "positionalArguments", index, "defaultValue"],