Merge pull request #5350 from NomicFoundation/replace-utils

Use isObject & kebabToCamelCase in v-next

Author: schaable

Diff for: v-next/core/src/internal/hook-manager.ts

@@ -306,7 +306,7 @@ export class HookManagerImplementation implements HookManager {
 
     const category = await factory();
 
-    // TODO: Assert that category is not undefined and it's an object
+    // TODO: Assert that category is not undefined and it's an object -- should use !isObject(category)
     if (typeof category !== "object" || category === null) {
       throw new Error(
         `Plugin ${pluginId} doesn't export a valid factory for category ${hookCategoryName} in ${path}, it didn't return an object`,

Diff for: v-next/hardhat-errors/src/errors.ts

@@ -1,4 +1,5 @@
 import { CustomError } from "@nomicfoundation/hardhat-utils/error";
+import { isObject } from "@nomicfoundation/hardhat-utils/lang";
 
 import { ERRORS, ErrorDescriptor } from "./descriptors.js";
 
@@ -81,7 +82,7 @@ export class HardhatError<
       messageArgumentsOrParentError === undefined ||
       messageArgumentsOrParentError instanceof Error
     ) {
-      /* eslint-disable @typescript-eslint/consistent-type-assertions -- 
+      /* eslint-disable @typescript-eslint/consistent-type-assertions --
       Typescript inference get's lost here, but we know that if we didn't get
       arguments, it's because the error doesn't have any. */
       this.#arguments = {} as MessagetTemplateArguments<
@@ -116,7 +117,7 @@ export class HardhatError<
     other: unknown,
     descriptor?: ErrorDescriptor,
   ): other is HardhatError<ErrorDescriptor> {
-    if (typeof other !== "object" || other === null) {
+    if (!isObject(other) || other === null) {
       return false;
     }
 
@@ -130,7 +131,7 @@ export class HardhatError<
       // If an error descriptor is provided, check if its number matches the Hardhat error number
       (descriptor === undefined
         ? true
-        : (other as HardhatError<ErrorDescriptor>).number === descriptor.number)
+        : "number" in other && other.number === descriptor.number)
     );
   }
 

Diff for: v-next/hardhat-utils/package.json

@@ -21,7 +21,8 @@
     "./lang": "./dist/src/lang.js",
     "./number": "./dist/src/number.js",
     "./package": "./dist/src/package.js",
-    "./request": "./dist/src/request.js"
+    "./request": "./dist/src/request.js",
+    "./string": "./dist/src/string.js"
   },
   "keywords": [
     "ethereum",

Diff for: v-next/hardhat/src/internal/cli/main.ts

@@ -24,6 +24,7 @@ import {
   assertHardhatInvariant,
 } from "@nomicfoundation/hardhat-errors";
 import { isCi } from "@nomicfoundation/hardhat-utils/ci";
+import { kebabToCamelCase } from "@nomicfoundation/hardhat-utils/string";
 
 import { builtinPlugins } from "../builtin-plugins/index.js";
 import {
@@ -56,7 +57,10 @@ export async function main(cliArguments: string[]) {
   try {
     const userConfig = await importUserConfig(hardhatSpecialArgs.configPath);
 
-    const plugins = [...builtinPlugins, ...(userConfig.plugins ?? [])];
+    const configPlugins = Array.isArray(userConfig.plugins)
+      ? userConfig.plugins
+      : [];
+    const plugins = [...builtinPlugins, ...configPlugins];
     const resolvedPlugins = await resolvePluginList(
       plugins,
       hardhatSpecialArgs.configPath,
@@ -511,10 +515,6 @@ function validateRequiredParameters(
   );
 }
 
-function kebabToCamelCase(str: string) {
-  return str.replace(/-./g, (match) => match.charAt(1).toUpperCase());
-}
-
 function parseParameterValue(
   strValue: string,
   type: ParameterType,

Diff for: v-next/hardhat/src/internal/helpers/config-loading.ts

@@ -3,6 +3,7 @@ import { pathToFileURL } from "node:url";
 
 import { HardhatError } from "@nomicfoundation/hardhat-errors";
 import { findUp } from "@nomicfoundation/hardhat-utils/fs";
+import { isObject } from "@nomicfoundation/hardhat-utils/lang";
 
 import { ERRORS } from "../../../../hardhat-errors/src/descriptors.js";
 
@@ -51,7 +52,7 @@ export async function importUserConfig(configPath: string) {
 
   const config = imported.default;
 
-  if (typeof config !== "object" || config === null) {
+  if (!isObject(config) || config === null) {
     throw new HardhatError(ERRORS.GENERAL.INVALID_CONFIG_OBJECT, {
       configPath,
     });