ENG-815:

There are circular dependencies within `packages/database`,
especially of stepdefs.ts on dbDotEnv, which is why I made it a mjs module.

The alternative is to not compile stepdefs; cucumber can use it by reference.
Then dbDotEnv can then be a mts module. We then have to require it everywhere.
Ensure stepdef and scripts are type-checked, now that they're not compiled.

Author: maparent

apps/roam/scripts/compile.ts

@@ -18,18 +18,7 @@ const getVersion = (): string => {
 const getBuildDate = (): string => {
   return new Date().toISOString().split("T")[0]; // YYYY-MM-DD format
 };
-let envContents = null;
-
-try {
-  const dbDotEnv = require("@repo/database/dbDotEnv");
-  envContents = dbDotEnv.envContents;
-} catch (error) {
-  if ((error as Error).message.includes("Cannot find module")) {
-    console.error("Build the database module before compiling roam");
-    process.exit(1);
-  }
-  throw error;
-}
+const { envContents } = require("@repo/database/dbDotEnv");
 
 // https://github.com/evanw/esbuild/issues/337#issuecomment-954633403
 const importAsGlobals = (

apps/roam/scripts/deploy.ts

@@ -2,7 +2,7 @@ import { put } from "@vercel/blob";
 import fs, { readFileSync } from "fs";
 import { join } from "path";
 import { compile } from "./compile";
-import { config } from "@repo/database/dbDotEnv";
+const { config } = require("@repo/database/dbDotEnv");
 import { execSync } from "child_process";
 
 if (process.env.NODE_ENV !== "production") {

apps/website/app/utils/supabase/middleware.ts

@@ -1,6 +1,6 @@
 import { createServerClient } from "@supabase/ssr";
 import { NextResponse, type NextRequest } from "next/server";
-import { envContents } from "@repo/database/dbDotEnv";
+const { envContents } = require("@repo/database/dbDotEnv");
 
 // Inspired by https://supabase.com/ui/docs/nextjs/password-based-auth
 

apps/website/app/utils/supabase/server.ts

@@ -1,7 +1,7 @@
 import { createServerClient, type CookieOptions } from "@supabase/ssr";
 import { cookies } from "next/headers";
 import type { Database } from "@repo/database/dbTypes";
-import { envContents } from "@repo/database/dbDotEnv";
+const { envContents } = require("@repo/database/dbDotEnv");
 
 // Inspired by https://supabase.com/ui/docs/nextjs/password-based-auth
 

apps/website/next.config.ts

@@ -1,5 +1,5 @@
 import type { NextConfig } from "next";
-import { config } from "@repo/database/dbDotEnv";
+const { config } = require("@repo/database/dbDotEnv");
 
 config();
 

packages/database/features/step-definitions/stepdefs.ts

@@ -2,7 +2,7 @@ import assert from "assert";
 import { Given, When, Then, world, type DataTable } from "@cucumber/cucumber";
 import { createClient } from "@supabase/supabase-js";
 import { Constants, type Database, type Enums } from "@repo/database/dbTypes";
-import { getVariant, config } from "@repo/database/dbDotEnv";
+const { getVariant, config } = require("@repo/database/dbDotEnv");
 
 import {
   spaceAnonUserEmail,

packages/database/package.json

@@ -10,10 +10,10 @@
       "default": "./dist/src/lib/*.js"
     },
     "./dbDotEnv": {
-      "types": "./types/dbDotEnv.d.ts",
-      "import": "./src/dbDotEnv.mjs",
-      "require": "./src/dbDotEnv.mjs",
-      "default": "./src/dbDotEnv.mjs"
+      "types": "./dist/src/dbDotEnv.d.mts",
+      "import": "./dist/src/dbDotEnv.mjs",
+      "require": "./dist/src/dbDotEnv.mjs",
+      "default": "./dist/src/dbDotEnv.mjs"
     },
     "./dbTypes": {
       "types": "./dist/src/dbTypes.d.ts",
@@ -31,7 +31,7 @@
         "dist/src/lib/*.d.ts"
       ],
       "./dbDotEnv": [
-        "src/dbDotEnv.d.ts"
+        "dist/src/dbDotEnv.d.mts"
       ],
       "./dbTypes": [
         "dist/src/dbTypes.d.ts"
@@ -47,7 +47,7 @@
     "compile": "tsc",
     "serve": "supabase start && tsx scripts/createEnv.mts && supabase functions serve",
     "stop": "supabase stop",
-    "check-types": "tsc --emitDeclarationOnly --skipLibCheck",
+    "check-types": "tsc -p tsconfig_lint.json",
     "check-schema": "tsx scripts/lint.ts && supabase stop && npm run dbdiff",
     "lint": "eslint . && tsx scripts/lint.ts",
     "lint:fix": "tsx scripts/lint.ts -f",
@@ -77,6 +77,7 @@
     "supabase": "^2.39.2",
     "ts-node-maintained": "^10.9.5",
     "tsx": "^4.20.3",
+    "typescript": "^5.9.2",
     "vercel": "46.1.1"
   },
   "prettier": {

packages/database/scripts/build.ts

@@ -1,7 +1,7 @@
 import { execSync } from "node:child_process";
 import { writeFileSync } from "fs";
 import { join, dirname } from "path";
-import { getVariant } from "@repo/database/dbDotEnv";
+import { getVariant } from "../src/dbDotEnv.mts";
 
 const __dirname = dirname(__filename);
 const projectRoot = join(__dirname, "..");

packages/database/scripts/dev.ts

@@ -1,6 +1,6 @@
 import { execSync } from "node:child_process";
 import { join, dirname } from "path";
-import { getVariant } from "@repo/database/dbDotEnv";
+import { getVariant } from "../src/dbDotEnv.mts";
 
 const __dirname = dirname(__filename);
 const projectRoot = join(__dirname, "..");

packages/database/src/dbDotEnv.mjs packages/database/src/dbDotEnv.mtspackages/database/src/dbDotEnv.mjs renamed to packages/database/src/dbDotEnv.mts

@@ -3,9 +3,12 @@ import { join, dirname, basename } from "node:path";
 import { fileURLToPath } from "node:url";
 import dotenv from "dotenv";
 
-// Note: This file is written as mjs so it can be used before typescript compilation.
-// This means the corresponding .d.ts file is currently maintained by hand.
-// Remember to update it as needed.
+export type Variant =
+  | "none"
+  | "local"
+  | "branch"
+  | "production"
+  | "implicit";
 
 const findRoot = () => {
   let dir = fileURLToPath(import.meta.url);
@@ -15,20 +18,24 @@ const findRoot = () => {
   return dir;
 };
 
-export const getVariant = () => {
+const VARIANTS = new Set<Variant>([
+    "none",
+    "local",
+    "branch",
+    "production",
+    "implicit",
+  ]);
+
+export const getVariant = (): Variant => {
   const processHasVars =
     !!process.env["SUPABASE_URL"] && !!process.env["SUPABASE_ANON_KEY"];
   const useDbArgPos = (process.argv || []).indexOf("--use-db");
   let variant =
-    useDbArgPos > 0
-      ? process.argv[useDbArgPos + 1]
-      : process.env["SUPABASE_USE_DB"];
+      (useDbArgPos > 0
+        ? (process.argv[useDbArgPos + 1])
+        : (process.env["SUPABASE_USE_DB"])) as Variant | undefined;
 
-  if (
-    ["local", "branch", "production", "none", "implicit", undefined].indexOf(
-      variant,
-    ) === -1
-  ) {
+  if (variant !== undefined && !VARIANTS.has(variant)) {
     throw new Error("Invalid variant: " + variant);
   }
 
@@ -57,14 +64,14 @@ export const getVariant = () => {
   return variant;
 };
 
-export const envFilePath = () => {
+export const envFilePath = (): string | null => {
   const variant = getVariant();
   if (variant === "implicit" || variant === "none") return null;
   const name = join(findRoot(), `.env.${variant}`);
   return existsSync(name) ? name : null;
 };
 
-export const envContents = () => {
+export const envContents = (): Partial<Record<string, string>> => {
   const path = envFilePath();
   if (!path) {
     // Fallback to process.env when running in production environments
@@ -81,7 +88,7 @@ export const envContents = () => {
 
 let configDone = false;
 
-export const config = () => {
+export const config = (): void => {
   if (configDone) return;
   const path = envFilePath();
   if (path) dotenv.config({ path });