Merge pull request #149 from Codex-/upgrade_jiti

Upgrade to Jiti 2

Author: Codex-

.github/workflows/build.yml

@@ -42,6 +42,15 @@ jobs:
       - name: Import with both CJS and ESM
         if: ${{ always() }}
         run: node smoke-tests/smoke-test.js
+      - name: Import synchronously with CJS
+        if: ${{ always() }}
+        run: node smoke-tests/smoke-test-cjs-sync.cjs
+      - name: Import synchronously with ESM
+        if: ${{ always() }}
+        run: node smoke-tests/smoke-test-esm-sync.mjs
+      - name: Import synchronously with both CJS and ESM
+        if: ${{ always() }}
+        run: node smoke-tests/smoke-test-sync.js
       - name: lint
         if: ${{ always() }}
         run: pnpm lint

.release-it.json

@@ -1,11 +1,11 @@
 {
   "git": {
-    "changelog": "npx auto-changelog --stdout --commit-limit false --unreleased --template https://raw.githubusercontent.com/release-it/release-it/master/templates/changelog-compact.hbs"
+    "changelog": "pnpm exec auto-changelog --stdout --commit-limit false --unreleased --template https://raw.githubusercontent.com/release-it/release-it/master/templates/changelog-compact.hbs"
   },
   "github": {
     "release": true
   },
   "hooks": {
-    "after:bump": "npx auto-changelog -p"
+    "after:bump": "pnpm exec auto-changelog -p"
   }
 }

README.md

@@ -8,7 +8,7 @@
 
 ## Usage
 
-Simply add `TypeScriptLoader` to the list of loaders for the `.ts` file type:
+Simply add `TypeScriptLoader` to the list of loaders for the `.ts` file type, and `await` loading:
 
 ```ts
 import { cosmiconfig } from "cosmiconfig";
@@ -34,7 +34,7 @@ const explorer = cosmiconfig("test", {
   },
 });
 
-const cfg = explorer.load("./");
+const cfg = await explorer.load("./");
 ```
 
 Or more simply if you only support loading of a TypeScript based configuration file:
@@ -50,6 +50,24 @@ const explorer = cosmiconfig("test", {
   },
 });
 
+const cfg = await explorer.load("./amazing.config.ts");
+```
+
+### Synchronously loading
+
+With the release of Jiti 2, the synchronous loader has now been deprecated. It can still be used by using the `TypeScriptLoaderSync` export:
+
+```ts
+import { cosmiconfig } from "cosmiconfig";
+import { TypeScriptLoaderSync } from "cosmiconfig-typescript-loader";
+
+const moduleName = "module";
+const explorer = cosmiconfig("test", {
+  loaders: {
+    ".ts": TypeScriptLoaderSync(),
+  },
+});
+
 const cfg = explorer.load("./amazing.config.ts");
 ```
 

lib/index.spec.ts

@@ -1,15 +1,18 @@
+/* eslint-disable @typescript-eslint/no-deprecated */
+
 import path from "node:path";
 
 import { cosmiconfig, cosmiconfigSync } from "cosmiconfig";
 
-import { TypeScriptLoader } from ".";
+import { TypeScriptLoader, TypeScriptLoaderSync } from ".";
 
 describe("TypeScriptLoader", () => {
   const fixturesPath = path.resolve(__dirname, "__fixtures__");
 
   describe("exports", () => {
     it("should export the loader function as a default", () => {
       expect(typeof TypeScriptLoader).toStrictEqual("function");
+      expect(typeof TypeScriptLoaderSync).toStrictEqual("function");
     });
   });
 
@@ -18,7 +21,7 @@ describe("TypeScriptLoader", () => {
       it("should load a valid TS file", () => {
         const cfg = cosmiconfigSync("test", {
           loaders: {
-            ".ts": TypeScriptLoader(),
+            ".ts": TypeScriptLoaderSync(),
           },
         });
         const loadedCfg = cfg.load(
@@ -33,7 +36,7 @@ describe("TypeScriptLoader", () => {
       it("should throw an error on loading an invalid TS file", () => {
         const cfg = cosmiconfigSync("test", {
           loaders: {
-            ".ts": TypeScriptLoader(),
+            ".ts": TypeScriptLoaderSync(),
           },
         });
 
@@ -80,33 +83,4 @@ describe("TypeScriptLoader", () => {
       });
     });
   });
-
-  describe("cosmiconfigSync", () => {
-    it("should load a valid TS file", () => {
-      const cfg = cosmiconfigSync("test", {
-        loaders: {
-          ".ts": TypeScriptLoader(),
-        },
-      });
-      const loadedCfg = cfg.load(
-        path.resolve(fixturesPath, "valid.fixture.ts"),
-      );
-
-      expect(typeof loadedCfg!.config).toStrictEqual("object");
-      expect(typeof loadedCfg!.config.test).toStrictEqual("object");
-      expect(loadedCfg!.config.test.cake).toStrictEqual("a lie");
-    });
-
-    it("should throw an error on loading an invalid TS file", () => {
-      const cfg = cosmiconfigSync("test", {
-        loaders: {
-          ".ts": TypeScriptLoader(),
-        },
-      });
-
-      expect(() =>
-        cfg.load(path.resolve(fixturesPath, "invalid.fixture.ts")),
-      ).toThrow();
-    });
-  });
 });

lib/index.ts

@@ -1,2 +1,2 @@
-export { TypeScriptLoader } from "./loader.js";
+export { TypeScriptLoader, TypeScriptLoaderSync } from "./loader.js";
 export type { TypeScriptCompileError } from "./typescript-compile-error.js";

lib/loader.spec.ts

@@ -1,94 +1,156 @@
 import fs from "node:fs";
 import path from "node:path";
 
-import { Loader } from "cosmiconfig";
+import type { LoaderResult, LoaderSync } from "cosmiconfig";
 import * as jiti from "jiti";
 
-import { TypeScriptLoader } from "./loader";
+import { TypeScriptLoader, TypeScriptLoaderSync } from "./loader";
 import { TypeScriptCompileError } from "./typescript-compile-error";
 
 // Handle jiti using `export default`
 jest.mock("jiti", () => {
   const actual = jest.requireActual("jiti");
   return {
     __esModule: true,
-    default: jest.fn(actual),
+    createJiti: actual.createJiti,
   };
 });
 
 describe("TypeScriptLoader", () => {
   const fixturesPath = path.resolve(__dirname, "__fixtures__");
-  const jitiSpy = jest.spyOn(jiti, "default");
-
-  let loader: Loader;
+  let jitiCreateJitiSpy: jest.SpyInstance<typeof jiti.createJiti>;
 
   function readFixtureContent(file: string): string {
     return fs.readFileSync(file).toString();
   }
 
-  beforeAll(() => {
-    loader = TypeScriptLoader();
+  beforeEach(() => {
+    jitiCreateJitiSpy = jest.spyOn(jiti, "createJiti");
   });
 
-  it("should parse a valid TS file", () => {
-    const filePath = path.resolve(fixturesPath, "valid.fixture.ts");
-    loader(filePath, readFixtureContent(filePath));
+  afterEach(() => {
+    jest.restoreAllMocks();
   });
 
-  it("should fail on parsing an invalid TS file", () => {
-    const filePath = path.resolve(fixturesPath, "invalid.fixture.ts");
-    expect((): unknown =>
-      loader(filePath, readFixtureContent(filePath)),
-    ).toThrow();
-  });
+  describe("asynchronous", () => {
+    let loader: (filepath: string, content: string) => Promise<LoaderResult>;
 
-  it("should use the same instance of jiti across multiple calls", () => {
-    const filePath = path.resolve(fixturesPath, "valid.fixture.ts");
-    loader(filePath, readFixtureContent(filePath));
-    loader(filePath, readFixtureContent(filePath));
-    expect(jitiSpy).toHaveBeenCalledTimes(1);
-  });
+    beforeEach(() => {
+      loader = TypeScriptLoader();
+    });
+
+    it("should parse a valid TS file", async () => {
+      const filePath = path.resolve(fixturesPath, "valid.fixture.ts");
+      await loader(filePath, readFixtureContent(filePath));
+    });
 
-  it("should throw a TypeScriptCompileError on error", () => {
-    try {
+    it("should fail on parsing an invalid TS file", async () => {
       const filePath = path.resolve(fixturesPath, "invalid.fixture.ts");
-      loader(filePath, readFixtureContent(filePath));
-      fail(
-        "Error should be thrown upon failing to transpile an invalid TS file.",
-      );
-    } catch (error: unknown) {
-      expect(error).toBeInstanceOf(TypeScriptCompileError);
-    }
-  });
+      await expect(
+        loader(filePath, readFixtureContent(filePath)),
+      ).rejects.toThrow();
+    });
 
-  describe("jiti", () => {
-    const unknownError = "Test Error";
+    it("should use the same instance of jiti across multiple calls", async () => {
+      const filePath = path.resolve(fixturesPath, "valid.fixture.ts");
+      await loader(filePath, readFixtureContent(filePath));
+      await loader(filePath, readFixtureContent(filePath));
+      expect(jitiCreateJitiSpy).toHaveBeenCalledTimes(1);
+    });
 
-    let stub: jest.SpyInstance;
+    it("should throw a TypeScriptCompileError on error", async () => {
+      const filePath = path.resolve(fixturesPath, "invalid.fixture.ts");
+      await expect(
+        loader(filePath, readFixtureContent(filePath)),
+      ).rejects.toThrow(TypeScriptCompileError);
+    });
+
+    describe("jiti", () => {
+      const unknownError = "Test Error";
+
+      beforeEach(() => {
+        jitiCreateJitiSpy.mockImplementation((() => ({
+          import: () => {
+            // eslint-disable-next-line @typescript-eslint/only-throw-error
+            throw unknownError;
+          },
+        })) as never);
+
+        loader = TypeScriptLoader();
+      });
+
+      it("rethrows an error if it is not an instance of Error", async () => {
+        try {
+          await loader("filePath", "invalidInput");
+          fail(
+            "Error should be thrown upon failing to transpile an invalid TS file.",
+          );
+        } catch (error: unknown) {
+          expect(error).not.toBeInstanceOf(TypeScriptCompileError);
+          expect(error).toStrictEqual(unknownError);
+        }
+      });
+    });
+  });
+
+  describe("synchronous", () => {
+    let loader: LoaderSync;
 
     beforeEach(() => {
-      stub = jest.spyOn(jiti, "default").mockImplementation((() => () => {
-        // eslint-disable-next-line @typescript-eslint/only-throw-error
-        throw unknownError;
-      }) as never);
+      // eslint-disable-next-line @typescript-eslint/no-deprecated
+      loader = TypeScriptLoaderSync();
+    });
 
-      loader = TypeScriptLoader();
+    it("should parse a valid TS file", () => {
+      const filePath = path.resolve(fixturesPath, "valid.fixture.ts");
+      loader(filePath, readFixtureContent(filePath));
+    });
+
+    it("should fail on parsing an invalid TS file", () => {
+      const filePath = path.resolve(fixturesPath, "invalid.fixture.ts");
+      expect((): unknown =>
+        loader(filePath, readFixtureContent(filePath)),
+      ).toThrow();
     });
 
-    afterEach(() => {
-      stub.mockRestore();
+    it("should use the same instance of jiti across multiple calls", () => {
+      const filePath = path.resolve(fixturesPath, "valid.fixture.ts");
+      loader(filePath, readFixtureContent(filePath));
+      loader(filePath, readFixtureContent(filePath));
+      expect(jitiCreateJitiSpy).toHaveBeenCalledTimes(1);
+    });
+
+    it("should throw a TypeScriptCompileError on error", () => {
+      const filePath = path.resolve(fixturesPath, "invalid.fixture.ts");
+      expect((): unknown =>
+        loader(filePath, readFixtureContent(filePath)),
+      ).toThrow(TypeScriptCompileError);
     });
 
-    it("rethrows an error if it is not an instance of Error", () => {
-      try {
-        loader("filePath", "readFixtureContent(filePath)");
-        fail(
-          "Error should be thrown upon failing to transpile an invalid TS file.",
-        );
-      } catch (error: unknown) {
-        expect(error).not.toBeInstanceOf(TypeScriptCompileError);
-        expect(error).toStrictEqual(unknownError);
-      }
+    describe("jiti", () => {
+      const unknownError = "Test Error";
+
+      beforeEach(() => {
+        jitiCreateJitiSpy.mockImplementation((() => () => {
+          // eslint-disable-next-line @typescript-eslint/only-throw-error
+          throw unknownError;
+        }) as never);
+
+        // eslint-disable-next-line @typescript-eslint/no-deprecated
+        loader = TypeScriptLoaderSync();
+      });
+
+      it("rethrows an error if it is not an instance of Error", () => {
+        try {
+          loader("filePath", "invalidInput");
+          fail(
+            "Error should be thrown upon failing to transpile an invalid TS file.",
+          );
+        } catch (error: unknown) {
+          expect(error).not.toBeInstanceOf(TypeScriptCompileError);
+          expect(error).toStrictEqual(unknownError);
+        }
+      });
     });
   });
 });