Use import syntax for matcher

Author: mayank1513

lib/package.json

@@ -34,9 +34,13 @@
   "devDependencies": {
     "@repo/eslint-config": "workspace:*",
     "@repo/typescript-config": "workspace:*",
+    "@types/micromatch": "^4.0.9",
     "@types/node": "^24.3.0",
+    "@types/picomatch": "^4.0.2",
     "@vitest/coverage-v8": "^3.2.4",
     "esbuild-plugin-rdi": "^0.0.0",
+    "micromatch": "^4.0.8",
+    "picomatch": "^4.0.3",
     "tsup": "^8.5.0",
     "typescript": "^5.9.2",
     "vite-tsconfig-paths": "^5.1.4",

lib/src/matcher.test.ts

@@ -1,4 +1,4 @@
-import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+import { describe, it, expect } from "vitest";
 import { basicMatcher, loadMatcher } from "./matcher";
 
 describe("basicMatcher", () => {
@@ -44,34 +44,24 @@ describe("basicMatcher", () => {
     expect(basicMatcher.isMatch("a.b.c", ["a.**"])).toBe(true);
     expect(basicMatcher.isMatch("a.b.c", ["a.\\*\\*"])).toBe(false);
     expect(basicMatcher.isMatch("a.**", ["a.\\*\\*"])).toBe(true);
+    expect(basicMatcher.isMatch("a.c.b", ["a.***"])).toBe(false);
   });
 });
 
 describe("loadMatcher", () => {
-  const realRequire = require;
-
-  beforeEach(() => {
-    vi.resetModules();
-  });
-
-  afterEach(() => {
-    // restore require if patched
-    global.require = realRequire;
-  });
-
-  it("loads micromatch when available", () => {
-    const mm = loadMatcher("micromatch");
+  it("loads micromatch when available", async () => {
+    const mm = await loadMatcher("micromatch");
     expect(mm.isMatch("foo", ["foo"])).toBe(true);
     expect(mm.isMatch("bar", ["foo"])).toBe(false);
   });
 
-  it("loads picomatch when available", () => {
-    const pm = loadMatcher("picomatch");
+  it("loads picomatch when available", async () => {
+    const pm = await loadMatcher("picomatch");
     expect(pm.isMatch("okmyfield", ["ok*"])).toBe(true);
     expect(pm.isMatch("fail", ["pattern"])).toBe(false);
   });
 
   it("throws on unknown matcher", () => {
-    expect(() => loadMatcher("invalid" as any)).toThrow(/Unknown matcher/);
+    expect(() => loadMatcher("invalid" as any)).rejects.toThrow(/Unknown matcher/);
   });
 });

lib/src/matcher.ts

@@ -35,12 +35,13 @@ export const basicMatcher: Matcher = {
  * @returns A Matcher implementation.
  */
 
-export const loadMatcher = (name: "micromatch" | "picomatch"): Matcher => {
+export const loadMatcher = async (name: "micromatch" | "picomatch"): Promise<Matcher> => {
   if (name === "micromatch") {
     let micromatch: any;
     try {
-      micromatch = require("micromatch");
+      micromatch = await import("micromatch");
     } catch {
+      /* v8 ignore next 4 - difficult to simulate this case with micromatch in devDeps */
       throw new Error(
         `micromatch is not installed. Please add it as a dependency if you want to use it.`,
       );
@@ -51,6 +52,7 @@ export const loadMatcher = (name: "micromatch" | "picomatch"): Matcher => {
         try {
           return micromatch.isMatch(str, pats);
         } catch (err) {
+          /* v8 ignore next 4 - difficult to simulate this case with micromatch/picomatch in devDeps */
           throw new Error(`micromatch failed to run isMatch: ${(err as Error).message}`);
         }
       },
@@ -60,8 +62,9 @@ export const loadMatcher = (name: "micromatch" | "picomatch"): Matcher => {
   if (name === "picomatch") {
     let picomatch: any;
     try {
-      picomatch = require("picomatch");
+      picomatch = (await import("picomatch")).default;
     } catch {
+      /* v8 ignore next 4 - difficult to simulate this case with micromatch/picomatch in devDeps */
       throw new Error(
         `picomatch is not installed. Please add it as a dependency if you want to use it.`,
       );
@@ -73,6 +76,7 @@ export const loadMatcher = (name: "micromatch" | "picomatch"): Matcher => {
           const fn = picomatch(pats);
           return fn(str);
         } catch (err) {
+          /* v8 ignore next 4 - difficult to simulate this case with micromatch/picomatch in devDeps */
           throw new Error(`picomatch failed to run isMatch: ${(err as Error).message}`);
         }
       },
@@ -139,6 +143,7 @@ const matchSegments = (strSegments: string[], patternSegments: string[]): boolea
           return true;
         }
       }
+      /* v8 ignore next 2 - unreachable in most cases */
       return false;
     }