@shophost/rest-api 2.0.21 → 2.0.23

package/README.md

@@ -46,7 +46,7 @@ import { ManufacturerSchema } from "@shophost/rest-api/schemas";
 
 The published package now includes a small CLI so a fresh project can push the packaged Prisma schema to its own database.
 
-1. Set one of these environment variables in your app:
+1. Set one of these environment variables in your app shell, `.env`, or `.env.local`:
    - `DATABASE_URL`
    - `POSTGRES_PRISMA_URL`
 2. Run:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shophost/rest-api",
-  "version": "2.0.21",
+  "version": "2.0.23",
   "type": "module",
   "bin": {
     "shophost-rest-api": "./scripts/shophost-rest-api.mjs"
@@ -76,6 +76,7 @@
     "axios": "^1.8.2",
     "better-auth": "^1.5.5",
     "date-fns": "^4.1.0",
+    "dotenv": "^16.4.7",
     "hono": "^4.10.6",
     "http-status-codes": "^2.3.0",
     "nanoid": "^5.1.3",

package/scripts/shophost-rest-api.mjs

@@ -5,6 +5,7 @@ import { existsSync } from "node:fs";
 import { createRequire } from "node:module";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
+import dotenv from "dotenv";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const packageRoot = join(__dirname, "..");
@@ -26,6 +27,8 @@ Examples:
   shophost-rest-api db push --url "postgres://..."
 
 Environment:
+  .env.local
+  .env
   DATABASE_URL
   POSTGRES_PRISMA_URL
 `);
@@ -56,6 +59,51 @@ function getDbPushArgs(argv) {
   return argv.slice(2);
 }
 
+function expandEnvValue(value, env) {
+  return value.replace(
+    /\\?\$(?:\{([A-Za-z_][A-Za-z0-9_]*)\}|([A-Za-z_][A-Za-z0-9_]*))/g,
+    (match, bracedName, plainName) => {
+      if (match.startsWith("\\")) {
+        return match.slice(1);
+      }
+
+      const variableName = bracedName ?? plainName;
+      return env[variableName] ?? "";
+    }
+  );
+}
+
+function applyParsedEnv(parsed, shouldOverride) {
+  if (!parsed) {
+    return;
+  }
+
+  for (const [key, rawValue] of Object.entries(parsed)) {
+    if (!shouldOverride && process.env[key] !== undefined) {
+      continue;
+    }
+
+    process.env[key] = expandEnvValue(rawValue, process.env);
+  }
+}
+
+function loadEnvFiles() {
+  for (const envFile of [".env", ".env.local"]) {
+    const envPath = join(process.cwd(), envFile);
+
+    if (!existsSync(envPath)) {
+      continue;
+    }
+
+    const result = dotenv.config({
+      path: envPath,
+      override: envFile === ".env.local",
+    });
+
+    applyParsedEnv(result.parsed, envFile === ".env.local");
+  }
+}
+
 const argv = process.argv.slice(2);
 
 if (
@@ -89,6 +137,8 @@ if (reservedFlag) {
   process.exit(1);
 }
 
+loadEnvFiles();
+
 if (!existsSync(schemaPath)) {
   console.error(`Missing Prisma schema at ${schemaPath}`);
   process.exit(1);
@@ -113,7 +163,7 @@ if (
   !process.env.POSTGRES_PRISMA_URL
 ) {
   console.error(
-    "Set DATABASE_URL or POSTGRES_PRISMA_URL before running `shophost-rest-api db push`."
+    "Set DATABASE_URL or POSTGRES_PRISMA_URL, or add it to `.env.local` / `.env`, before running `shophost-rest-api db push`."
   );
   process.exit(1);
 }