@shophost/rest-api 2.0.22 → 2.0.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shophost/rest-api",
-  "version": "2.0.22",
+  "version": "2.0.24",
   "type": "module",
   "bin": {
     "shophost-rest-api": "./scripts/shophost-rest-api.mjs"

package/prisma.config.ts

@@ -2,7 +2,15 @@ import "dotenv/config";
 import { defineConfig } from "prisma/config";
 
 function firstDefined(...names: string[]) {
-  return names.find((name) => process.env[name])?.trim();
+  for (const name of names) {
+    const value = process.env[name]?.trim();
+
+    if (value) {
+      return value;
+    }
+  }
+
+  return undefined;
 }
 
 export default defineConfig({

package/scripts/shophost-rest-api.mjs

@@ -59,6 +59,34 @@ 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);
@@ -67,10 +95,12 @@ function loadEnvFiles() {
       continue;
     }
 
-    dotenv.config({
+    const result = dotenv.config({
       path: envPath,
       override: envFile === ".env.local",
     });
+
+    applyParsedEnv(result.parsed, envFile === ".env.local");
   }
 }