Add cts,cjs hardhat config file support

arowana-official · arowana-official · commit 2fd0c0d5158b · 2025-10-21T02:51:21.000Z
diff --git a/client/README.md b/client/README.md
@@ -191,7 +191,7 @@ If the Solidity file is not part of a project or the project cannot be determine
 
 ### Hardhat
 
-Hardhat projects are detected by looking for a `hardhat.config.{js,ts}` file.
+Hardhat projects are detected by looking for a `hardhat.config.{ts,cts,js,cjs}` file.
 
 Inline validation (the display of compiler errors and warnings against the code) is based on your Hardhat configuration file. The version of the `solc` solidity compiler used for validation is set within this file, see the [Hardhat documentation](https://hardhat.org/config/#solidity-configuration) for more details.
 
diff --git a/client/package.json b/client/package.json
@@ -39,7 +39,7 @@
     "vscode": "^1.99.0"
   },
   "activationEvents": [
-    "workspaceContains:**/hardhat.config.{ts,js}",
+    "workspaceContains:**/hardhat.config.{ts,cts,js,cjs}",
     "workspaceContains:**/foundry.toml",
     "workspaceContains:**/truffle-config.js",
     "workspaceContains:**/ape-config.yaml"
diff --git a/client/src/setup/indexHardhatProjects.ts b/client/src/setup/indexHardhatProjects.ts
@@ -4,7 +4,7 @@ import { ExtensionState } from "../types";
 
 export async function indexHardhatProjects(state: ExtensionState) {
   const hardhatConfigs = await vscode.workspace.findFiles(
-    "**/hardhat.config.{ts,js}",
+    "**/hardhat.config.{ts,cts,js,cjs}",
     "**/node_modules/**"
   );
 
diff --git a/client/src/setup/setupLanguageServerHooks.ts b/client/src/setup/setupLanguageServerHooks.ts
@@ -50,7 +50,7 @@ const startLanguageServer = async (
     ],
     synchronize: {
       fileEvents: [
-        workspace.createFileSystemWatcher("**/hardhat.config.{ts,js}"),
+        workspace.createFileSystemWatcher("**/hardhat.config.{ts,cts,js,cjs}"),
         workspace.createFileSystemWatcher("**/{truffle-config,truffle}.js"),
         workspace.createFileSystemWatcher("**/foundry.toml"),
         workspace.createFileSystemWatcher("**/ape-config.yaml"),
diff --git a/coc/README.md b/coc/README.md
@@ -171,7 +171,7 @@ If the Solidity file is not part of a project or the project cannot be determine
 
 ### Hardhat
 
-Hardhat projects are detected by looking for a `hardhat.config.{js,ts}` file.
+Hardhat projects are detected by looking for a `hardhat.config.{ts,cts,js,cjs}` file.
 
 Inline validation (the display of compiler errors and warnings against the code) is based on your Hardhat configuration file. The version of the `solc` solidity compiler used for validation is set within this file, see the [Hardhat documentation](https://hardhat.org/config/#solidity-configuration) for more details.
 
diff --git a/coc/src/index.ts b/coc/src/index.ts
@@ -23,7 +23,7 @@ export async function activate(context: ExtensionContext): Promise<void> {
       synchronize: {
         configurationSection: "solidity",
         fileEvents: [
-          coc.workspace.createFileSystemWatcher("**/hardhat.config.{ts,js}"),
+          coc.workspace.createFileSystemWatcher("**/hardhat.config.{ts,cts,js,cjs}"),
           coc.workspace.createFileSystemWatcher("**/foundry.toml"),
           coc.workspace.createFileSystemWatcher(
             "**/{truffle-config,truffle}.js"
diff --git a/docs/codebase.md b/docs/codebase.md
@@ -156,7 +156,7 @@ Source files are associated to projects during the initial indexing phase, and t
 
 As of now, the responsibilities that are put behind the abstraction are the following:
 
-- Scan directories to find projects (look for `hardhat.config.{js,ts}` for instance)
+- Scan directories to find projects (look for `hardhat.config.{ts,cts,js,cjs}` for instance)
 - Initialize, and perform any setup tasks for the project
 - Determine whether a Solidity file belongs to the project
 - Resolve the path of a Solidity import statement
@@ -171,7 +171,7 @@ As of now, the responsibilities that are put behind the abstraction are the foll
 
 Hardhat validation is our most sophisticated framework adapter. It leverages the hardhat library local to a project.
 
-The Hardhat adapter identifies Hardhat project by the presence of `hardhat.config.{ts,js}` files. Each found Hardhat project is then initialized by forking into its own child process. This is necessary because we need to load multiple Hardhat libraries (because we support multiple open projects) as node.js modules. If we were to attempt to load them in the same process, they would be cached and we wouldn't be able to reference the per project HRE object.
+The Hardhat adapter identifies Hardhat project by the presence of `hardhat.config.{ts,cts,js,cjs}` files. Each found Hardhat project is then initialized by forking into its own child process. This is necessary because we need to load multiple Hardhat libraries (because we support multiple open projects) as node.js modules. If we were to attempt to load them in the same process, they would be cached and we wouldn't be able to reference the per project HRE object.
 
 This model of forking into child processes adds overhead to communication, since we can't just call javascript functions from the parent process to the child process. We need to leverage a protocol using the IPC transport. Each time we need a service that involves using the HRE, we send a message to the child process and wait for a response.
 
diff --git a/docs/features.md b/docs/features.md
@@ -148,7 +148,7 @@ If the Solidity file is not part of a project or the project cannot be determine
 
 ### Hardhat
 
-Hardhat projects are detected by looking for a `hardhat.config.{js,ts}` file.
+Hardhat projects are detected by looking for a `hardhat.config.{ts,cts,js,cjs}` file.
 
 Inline validation (the display of compiler errors and warnings against the code) is based on your Hardhat configuration file. The version of the `solc` solidity compiler used for validation is set within this file, see the [Hardhat documentation](https://hardhat.org/config/#solidity-configuration) for more details.
 
diff --git a/server/README.md b/server/README.md
@@ -199,7 +199,7 @@ If the Solidity file is not part of a project or the project cannot be determine
 
 ### Hardhat
 
-Hardhat projects are detected by looking for a `hardhat.config.{js,ts}` file.
+Hardhat projects are detected by looking for a `hardhat.config.{ts,cts,js,cjs}` file.
 
 Inline validation (the display of compiler errors and warnings against the code) is based on your Hardhat configuration file. The version of the `solc` solidity compiler used for validation is set within this file, see the [Hardhat documentation](https://hardhat.org/config/#solidity-configuration) for more details.
 
diff --git a/server/src/frameworks/Hardhat/HardhatIndexer.ts b/server/src/frameworks/Hardhat/HardhatIndexer.ts
@@ -16,7 +16,7 @@ export class HardhatIndexer extends ProjectIndexer {
     // Find all hardhat.config files in the workspace folder
     const configFiles = await this.fileRetriever.findFiles(
       uri,
-      "**/hardhat.config.{ts,js}",
+      "**/hardhat.config.{ts,cts,js,cjs}",
       ["**/node_modules/**"]
     );
 
diff --git a/server/src/services/hover/onHover.ts b/server/src/services/hover/onHover.ts
@@ -5,7 +5,12 @@ import {
 } from "@analyzer/utils/typeGuards";
 import { getParserPositionFromVSCodePosition } from "@common/utils";
 import { HoverParams, Hover } from "vscode-languageserver/node";
-import { ISolFileEntry, IdentifierNode, MemberAccessNode, Node } from "@common/types";
+import {
+  ISolFileEntry,
+  IdentifierNode,
+  MemberAccessNode,
+  Node,
+} from "@common/types";
 import { onCommand } from "@utils/onCommand";
 import { ServerState } from "../../types";
 import { astToText } from "./utils/astToText";
@@ -43,7 +48,11 @@ function findHoverForNodeAtPosition(
     return null;
   }
 
-  if (!isIdentifierNode(node) && !isMemberAccessNode(node) && !isUserDefinedTypeNameNode(node)) {
+  if (
+    !isIdentifierNode(node) &&
+    !isMemberAccessNode(node) &&
+    !isUserDefinedTypeNameNode(node)
+  ) {
     return null;
   }
 
diff --git a/server/src/services/hover/utils/astToText.ts b/server/src/services/hover/utils/astToText.ts
@@ -11,7 +11,12 @@ import {
   isStructDefinition,
   isEnumDefinition,
 } from "@analyzer/utils/typeGuards";
-import { EmptyNodeType, StructDefinition, EnumDefinition, ContractDefinition } from "@common/types";
+import {
+  EmptyNodeType,
+  StructDefinition,
+  EnumDefinition,
+  ContractDefinition,
+} from "@common/types";
 import {
   BaseASTNode,
   CustomErrorDefinition,
diff --git a/server/test/helpers/setupMockWorkspaceFileRetriever.ts b/server/test/helpers/setupMockWorkspaceFileRetriever.ts
@@ -16,7 +16,7 @@ export function setupMockWorkspaceFileRetriever(
       simplifiedUri = `/${simplifiedUri}`;
     }
 
-    if (globPattern === "**/hardhat.config.{ts,js}") {
+    if (globPattern === "**/hardhat.config.{ts,cts,js,cjs}") {
       if (simplifiedUri in projects) {
         return projects[simplifiedUri];
       } else {
diff --git a/server/test/services/hover/typeIdentifier.ts b/server/test/services/hover/typeIdentifier.ts
@@ -58,10 +58,7 @@ describe("Parser", () => {
 
       describe("Contract Type", () => {
         it("should display contract definition when hovering over contract type name", () =>
-          assertHover(
-            { line: 32, character: 4 },
-            "contract BaseContract"
-          ));
+          assertHover({ line: 32, character: 4 }, "contract BaseContract"));
       });
 
       describe("Nested Struct Type", () => {
