@meetploy/cli 1.14.1 → 1.15.0

package/dist/index.js

@@ -183,6 +183,19 @@ function validatePloyConfig(config, configFile = "ploy.yaml", options = {}) {
   validatedConfig.out = validateRelativePath(config.out, "out", configFile);
   validatedConfig.base = validateRelativePath(config.base, "base", configFile);
   validatedConfig.main = validateRelativePath(config.main, "main", configFile);
+  if (config.env !== void 0) {
+    if (typeof config.env !== "object" || config.env === null) {
+      throw new Error(`'env' in ${configFile} must be a map of KEY: value`);
+    }
+    for (const [key, value] of Object.entries(config.env)) {
+      if (!BINDING_NAME_REGEX.test(key)) {
+        throw new Error(`Invalid env key '${key}' in ${configFile}. Env keys must be uppercase with underscores (e.g., FOO, MY_VAR)`);
+      }
+      if (typeof value !== "string") {
+        throw new Error(`Env key '${key}' in ${configFile} must have a string value`);
+      }
+    }
+  }
   validateBindings(config.db, "db", configFile);
   validateBindings(config.queue, "queue", configFile);
   validateBindings(config.cache, "cache", configFile);
@@ -263,7 +276,50 @@ function readAndValidatePloyConfigSync(projectDir, configPath, validationOptions
   return validatePloyConfig(config, configFile, validationOptions);
 }
 function hasBindings(config) {
-  return !!(config.db ?? config.queue ?? config.cache ?? config.state ?? config.workflow ?? config.ai ?? config.auth);
+  return !!(config.env ?? config.db ?? config.queue ?? config.cache ?? config.state ?? config.workflow ?? config.ai ?? config.auth);
+}
+function parseDotEnv(content) {
+  const result = {};
+  for (const line of content.split("\n")) {
+    const trimmed = line.trim();
+    if (!trimmed || trimmed.startsWith("#")) {
+      continue;
+    }
+    const eqIndex = trimmed.indexOf("=");
+    if (eqIndex === -1) {
+      continue;
+    }
+    const key = trimmed.slice(0, eqIndex).trim();
+    let value = trimmed.slice(eqIndex + 1).trim();
+    if (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'")) {
+      value = value.slice(1, -1);
+    }
+    result[key] = value;
+  }
+  return result;
+}
+function loadDotEnvSync(projectDir) {
+  const envPath = join(projectDir, ".env");
+  if (!existsSync(envPath)) {
+    return {};
+  }
+  const content = readFileSync(envPath, "utf-8");
+  return parseDotEnv(content);
+}
+function resolveEnvVars(configEnv, dotEnv, processEnv) {
+  const result = {};
+  for (const [key, value] of Object.entries(configEnv)) {
+    if (value.startsWith("$")) {
+      const refName = value.slice(1);
+      const resolved = dotEnv[refName] ?? processEnv[refName];
+      if (resolved !== void 0) {
+        result[key] = resolved;
+      }
+    } else {
+      result[key] = value;
+    }
+  }
+  return result;
 }
 function getWorkerEntryPoint(projectDir, config) {
   if (config.main) {
@@ -306,10 +362,13 @@ __export(cli_exports, {
   getWorkerEntryPoint: () => getWorkerEntryPoint,
   hasBindings: () => hasBindings,
   isPnpmWorkspace: () => isPnpmWorkspace,
+  loadDotEnvSync: () => loadDotEnvSync,
+  parseDotEnv: () => parseDotEnv,
   readAndValidatePloyConfig: () => readAndValidatePloyConfig,
   readAndValidatePloyConfigSync: () => readAndValidatePloyConfigSync,
   readPloyConfig: () => readPloyConfig,
   readPloyConfigSync: () => readPloyConfigSync,
+  resolveEnvVars: () => resolveEnvVars,
   validatePloyConfig: () => validatePloyConfig
 });
 var init_cli = __esm({
@@ -1035,7 +1094,7 @@ export async function executeWorkflow<TInput, TOutput, TEnv>(
 `;
   }
 });
-function generateWrapperCode(config, mockServiceUrl) {
+function generateWrapperCode(config, mockServiceUrl, envVars) {
   const imports = [];
   const bindings = [];
   if (config.db) {
@@ -1125,6 +1184,11 @@ function generateWrapperCode(config, mockServiceUrl) {
       }
     }
   }` : "";
+  const envVarsEntries = envVars && Object.keys(envVars).length > 0 ? Object.entries(envVars).map(([key, value]) => `    ${JSON.stringify(key)}: ${JSON.stringify(value)}`).join(",\n") : "";
+  const envVarsCode = envVarsEntries ? `
+    injectedEnv.vars = {
+${envVarsEntries}
+    };` : "";
   return `${imports.join("\n")}
 
 const ployBindings = {
@@ -1133,7 +1197,7 @@ ${bindings.join("\n")}
 
 export default {
   async fetch(request, env, ctx) {
-    const injectedEnv = { ...env, ...ployBindings };
+    const injectedEnv = { ...env, ...ployBindings };${envVarsCode}
     ${workflowHandlerCode}
     ${queueHandlerCode}
 
@@ -1146,7 +1210,7 @@ export default {
 
   async scheduled(event, env, ctx) {
     if (userWorker.scheduled) {
-      const injectedEnv = { ...env, ...ployBindings };
+      const injectedEnv = { ...env, ...ployBindings };${envVarsCode}
       return userWorker.scheduled(event, injectedEnv, ctx);
     }
   }
@@ -1201,8 +1265,8 @@ function createRuntimePlugin(_config) {
   };
 }
 async function bundleWorker(options) {
-  const { projectDir, tempDir, entryPoint, config, mockServiceUrl } = options;
-  const wrapperCode = generateWrapperCode(config, mockServiceUrl);
+  const { projectDir, tempDir, entryPoint, config, mockServiceUrl, envVars } = options;
+  const wrapperCode = generateWrapperCode(config, mockServiceUrl, envVars);
   const wrapperPath = join(tempDir, "wrapper.ts");
   writeFileSync(wrapperPath, wrapperCode);
   const bundlePath = join(tempDir, "worker.bundle.js");
@@ -1412,6 +1476,20 @@ var init_watcher = __esm({
   }
 });
 
+// ../emulator/dist/config/env.js
+function resolveEnvVars2(projectDir, config) {
+  if (!config.env) {
+    return {};
+  }
+  const dotEnv = loadDotEnvSync(projectDir);
+  return resolveEnvVars(config.env, dotEnv, process.env);
+}
+var init_env = __esm({
+  "../emulator/dist/config/env.js"() {
+    init_cli();
+  }
+});
+
 // ../emulator/dist/config/ploy-config.js
 function readPloyConfig2(projectDir, configPath) {
   const config = readPloyConfigSync(projectDir, configPath);
@@ -3093,6 +3171,7 @@ var init_emulator = __esm({
   "../emulator/dist/emulator.js"() {
     init_bundler();
     init_watcher();
+    init_env();
     init_ploy_config2();
     init_workerd_config();
     init_mock_server();
@@ -3110,6 +3189,7 @@ var init_emulator = __esm({
       workerdProcess = null;
       fileWatcher = null;
       queueProcessor = null;
+      resolvedEnvVars = {};
       constructor(options = {}) {
         const port = options.port ?? 8787;
         this.options = {
@@ -3127,6 +3207,10 @@ var init_emulator = __esm({
         try {
           this.config = readPloyConfig2(this.projectDir, this.options.configPath);
           debug(`Loaded config: ${JSON.stringify(this.config)}`, this.options.verbose);
+          this.resolvedEnvVars = resolveEnvVars2(this.projectDir, this.config);
+          if (Object.keys(this.resolvedEnvVars).length > 0) {
+            debug(`Resolved env vars: ${Object.keys(this.resolvedEnvVars).join(", ")}`, this.options.verbose);
+          }
           this.tempDir = ensureTempDir(this.projectDir);
           ensureDataDir(this.projectDir);
           debug(`Temp dir: ${this.tempDir}`, this.options.verbose);
@@ -3174,6 +3258,9 @@ var init_emulator = __esm({
           }
           success(`Emulator running at http://${this.options.host}:${String(this.options.port)}`);
           log(`  Dashboard: http://${this.options.host}:${String(this.mockServer.port)}`);
+          if (Object.keys(this.resolvedEnvVars).length > 0) {
+            log(`  Env vars: ${Object.keys(this.resolvedEnvVars).join(", ")}`);
+          }
           if (this.config.db) {
             log(`  DB bindings: ${Object.keys(this.config.db).join(", ")}`);
           }
@@ -3202,7 +3289,8 @@ var init_emulator = __esm({
           tempDir: this.tempDir,
           entryPoint,
           config: this.config,
-          mockServiceUrl
+          mockServiceUrl,
+          envVars: this.resolvedEnvVars
         });
       }
       async startWorkerd(configPath) {
@@ -3228,9 +3316,7 @@ var init_emulator = __esm({
           let stderrOutput = "";
           this.workerdProcess.stdout?.on("data", (data) => {
             const output = data.toString();
-            if (this.options.verbose) {
-              process.stdout.write(output);
-            }
+            log(`[workerd stdout] ${output.trim()}`);
             if (!started && (output.includes("Listening") || output.includes("running"))) {
               started = true;
               resolve(void 0);
@@ -5166,6 +5252,12 @@ async function updateTsConfigInclude(cwd, outputPath) {
 function generateEnvType(config) {
   const imports = [];
   const properties = [];
+  if (config.env && Object.keys(config.env).length > 0) {
+    const varProps = Object.keys(config.env).map((key) => `		${key}: string;`).join("\n");
+    properties.push(`	vars: {
+${varProps}
+	};`);
+  }
   if (config.ai) {
     properties.push("	AI_URL: string;");
     properties.push("	AI_TOKEN: string;");
@@ -5241,7 +5333,7 @@ async function typesCommand(options = {}) {
     console.error("Error: ploy.yaml not found in current directory");
     process.exit(1);
   }
-  const hasBindings2 = config.ai || config.db || config.queue || config.cache || config.state || config.workflow;
+  const hasBindings2 = config.env || config.ai || config.db || config.queue || config.cache || config.state || config.workflow;
   if (!hasBindings2) {
     console.log("No bindings found in ploy.yaml. Generating empty Env.");
   }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@meetploy/cli",
-	"version": "1.14.1",
+	"version": "1.15.0",
 	"private": false,
 	"repository": {
 		"type": "git",