refactor: more strict type checks

Author: pi0

src/drivers/azure-key-vault.ts

@@ -1,5 +1,8 @@
 import { createError, createRequiredError, defineDriver } from "./utils";
-import { SecretClient, SecretClientOptions } from "@azure/keyvault-secrets";
+import {
+  SecretClient,
+  type SecretClientOptions,
+} from "@azure/keyvault-secrets";
 import { DefaultAzureCredential } from "@azure/identity";
 
 export interface AzureKeyVaultOptions {
@@ -118,7 +121,7 @@ function encode(value: string): string {
   for (const key in base64Map) {
     encoded = encoded.replace(
       new RegExp(key.replace(/[$()*+.?[\\\]^{|}]/g, "\\$&"), "g"),
-      base64Map[key]
+      base64Map[key]!
     );
   }
   return encoded;

src/drivers/azure-storage-table.ts

@@ -3,7 +3,7 @@ import {
   TableClient,
   AzureNamedKeyCredential,
   AzureSASCredential,
-  TableEntity,
+  type TableEntity,
 } from "@azure/data-tables";
 import { DefaultAzureCredential } from "@azure/identity";
 

src/drivers/cloudflare-kv-http.ts

@@ -198,7 +198,7 @@ export default defineDriver<KVHTTPOptions>((opts) => {
         if (i % 10_000 === 0) {
           acc.push([]);
         }
-        acc[acc.length - 1].push(key);
+        acc[acc.length - 1]!.push(key);
         return acc;
       },
       [[]]

src/drivers/fs.ts

@@ -1,6 +1,10 @@
 import { existsSync, promises as fsp, Stats } from "node:fs";
 import { resolve, relative, join } from "node:path";
-import { FSWatcher, WatchOptions as ChokidarOptions, watch } from "chokidar";
+import {
+  FSWatcher,
+  type WatchOptions as ChokidarOptions,
+  watch,
+} from "chokidar";
 import { createError, createRequiredError, defineDriver } from "./utils";
 import {
   readFile,

src/drivers/redis.ts

@@ -1,9 +1,9 @@
 import { defineDriver, joinKeys } from "./utils";
 import Redis, {
   Cluster,
-  ClusterNode,
-  ClusterOptions,
-  RedisOptions as _RedisOptions,
+  type ClusterNode,
+  type ClusterOptions,
+  type RedisOptions as _RedisOptions,
 } from "ioredis";
 
 export interface RedisOptions extends _RedisOptions {

src/server.ts

@@ -8,7 +8,7 @@ import {
   getRequestHeader,
   setResponseHeader,
   readRawBody,
-  EventHandler,
+  type EventHandler,
   H3Event,
 } from "h3";
 import type { Storage, TransactionOptions, StorageMeta } from "./types";

src/storage.ts

@@ -41,14 +41,14 @@ export function createStorage<T extends StorageValue>(
         return {
           base,
           relativeKey: key.slice(base.length),
-          driver: context.mounts[base],
+          driver: context.mounts[base]!,
         };
       }
     }
     return {
       base: "",
       relativeKey: key,
-      driver: context.mounts[""],
+      driver: context.mounts[""]!,
     };
   };
 
@@ -65,7 +65,7 @@ export function createStorage<T extends StorageValue>(
             ? base!.slice(mountpoint.length)
             : undefined,
         mountpoint,
-        driver: context.mounts[mountpoint],
+        driver: context.mounts[mountpoint]!,
       }));
   };
 
@@ -86,7 +86,7 @@ export function createStorage<T extends StorageValue>(
     context.watching = true;
     for (const mountpoint in context.mounts) {
       context.unwatch[mountpoint] = await watch(
-        context.mounts[mountpoint],
+        context.mounts[mountpoint]!,
         onChange,
         mountpoint
       );
@@ -98,7 +98,7 @@ export function createStorage<T extends StorageValue>(
       return;
     }
     for (const mountpoint in context.unwatch) {
-      await context.unwatch[mountpoint]();
+      await context.unwatch[mountpoint]!();
     }
     context.unwatch = {};
     context.watching = false;
@@ -426,11 +426,11 @@ export function createStorage<T extends StorageValue>(
         return;
       }
       if (context.watching && base in context.unwatch) {
-        context.unwatch[base]();
+        context.unwatch[base]?.();
         delete context.unwatch[base];
       }
       if (_dispose) {
-        await dispose(context.mounts[base]);
+        await dispose(context.mounts[base]!);
       }
       context.mountpoints = context.mountpoints.filter((key) => key !== base);
       delete context.mounts[base];

src/utils.ts

@@ -46,11 +46,13 @@ export function normalizeKey(key?: string) {
   if (!key) {
     return "";
   }
-  return key
-    .split("?")[0]
-    .replace(/[/\\]/g, ":")
-    .replace(/:+/g, ":")
-    .replace(/^:|:$/g, "");
+  return (
+    key
+      .split("?")[0]
+      ?.replace(/[/\\]/g, ":")
+      .replace(/:+/g, ":")
+      .replace(/^:|:$/g, "") || ""
+  );
 }
 
 export function joinKeys(...keys: string[]) {

test/drivers/cloudflare-kv-binding.test.ts

@@ -7,9 +7,9 @@ import { getPlatformProxy } from "wrangler";
 
 describe("drivers: cloudflare-kv", async () => {
   const cfProxy = await getPlatformProxy();
-  globalThis.__env__ = cfProxy.env;
+  (globalThis as any).__env__ = cfProxy.env;
   afterAll(async () => {
-    globalThis.__env__ = undefined;
+    (globalThis as any).__env__ = undefined;
     await cfProxy.dispose();
   });
   testDriver({

test/drivers/cloudflare-kv-http.test.ts

@@ -1,5 +1,7 @@
 import { afterAll, beforeAll, describe, expect, test } from "vitest";
-import driver, { KVHTTPOptions } from "../../src/drivers/cloudflare-kv-http";
+import driver, {
+  type KVHTTPOptions,
+} from "../../src/drivers/cloudflare-kv-http";
 import { testDriver } from "./utils";
 import { rest } from "msw";
 import { setupServer } from "msw/node";
@@ -78,7 +80,8 @@ const mockOptions: KVHTTPOptions = {
 };
 
 // TODO: Fix msw compatibility with Node 18
-const isNode18 = Number.parseInt(process.version.slice(1).split(".")[0]) >= 18;
+const isNode18 =
+  Number.parseInt(process.version.slice(1).split(".")[0] || "") >= 18;
 describe.skipIf(isNode18)("drivers: cloudflare-kv-http", () => {
   beforeAll(() => {
     // Establish requests interception layer before all tests.

test/drivers/cloudflare-r2-binding.test.ts

@@ -7,9 +7,9 @@ import { getPlatformProxy } from "wrangler";
 
 describe("drivers: cloudflare-r2-binding", async () => {
   const cfProxy = await getPlatformProxy();
-  globalThis.__env__ = cfProxy.env;
+  (globalThis as any).__env__ = cfProxy.env;
   afterAll(async () => {
-    globalThis.__env__ = undefined;
+    (globalThis as any).__env__ = undefined;
     await cfProxy.dispose();
   });
 

test/drivers/lru-cache.test.ts

@@ -4,7 +4,7 @@ import { testDriver } from "./utils";
 
 describe("drivers: lru-cache", () => {
   testDriver({
-    driver: driver(),
+    driver: driver({}),
   });
 });
 

test/drivers/redis.test.ts

@@ -42,7 +42,7 @@ describe("drivers: redis", () => {
       });
 
       it("exposes instance", () => {
-        expect(driver.getInstance()).toBeInstanceOf(ioredis.default);
+        expect(driver.getInstance?.()).toBeInstanceOf(ioredis.default);
       });
     },
   });

test/drivers/utils.ts

@@ -1,5 +1,10 @@
 import { it, expect } from "vitest";
-import { Storage, Driver, createStorage, restoreSnapshot } from "../../src";
+import {
+  type Storage,
+  type Driver,
+  createStorage,
+  restoreSnapshot,
+} from "../../src";
 
 export interface TestContext {
   storage: Storage;

tsconfig.json

@@ -1,11 +1,19 @@
 {
   "compilerOptions": {
     "target": "ESNext",
-    "module": "ESNext",
-    "moduleResolution": "Node",
+    "module": "preserve",
+    "moduleDetection": "force",
     "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "allowJs": true,
+    "resolveJsonModule": true,
     "strict": true,
-    "skipLibCheck": true
-  },
-  "include": ["src"]
+    "isolatedModules": true,
+    "verbatimModuleSyntax": true,
+    "noUncheckedIndexedAccess": true,
+    "forceConsistentCasingInFileNames": true,
+    "noImplicitOverride": true,
+    "noEmit": true,
+    "allowImportingTsExtensions": true,
+  }
 }

vite.config.ts

@@ -0,0 +1,9 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    typecheck: {
+      enabled: true,
+    },
+  },
+});