cf-envsync 0.3.8 → 0.3.10

package/dist/index.js

@@ -13268,7 +13268,7 @@ var init_env_file = __esm(() => {
 });
 
 // src/core/resolver.ts
-import { normalize, relative } from "node:path";
+import { join as join4, normalize, relative } from "node:path";
 async function resolveAppEnv(config, app, environment) {
   const layers = [];
   const encryption = config.raw.encryption;
@@ -13281,8 +13281,8 @@ async function resolveAppEnv(config, app, environment) {
   if (Object.keys(rootEnv).length > 0) {
     layers.push({ source: rootEnvPath, map: rootEnv });
   }
-  if (config.raw.envFiles.perApp && environment !== "local") {
-    const appEnvPath = getAppEnvPath(config, app, environment);
+  if (config.raw.envFiles.perApp) {
+    const appEnvPath = environment === "local" ? join4(app.absolutePath, config.raw.envFiles.local) : getAppEnvPath(config, app, environment);
     if (normalize(appEnvPath) !== normalize(rootEnvPath)) {
       const appEnv = await loadEnvFile(appEnvPath, environment, config.projectRoot, encryption);
       if (Object.keys(appEnv).length > 0) {
@@ -13332,7 +13332,7 @@ var exports_dev = {};
 __export(exports_dev, {
   default: () => dev_default
 });
-import { join as join4, relative as relative2 } from "node:path";
+import { join as join5, relative as relative2 } from "node:path";
 function parseAppNames(args) {
   const rest = args._;
   return rest?.length ? rest : undefined;
@@ -13399,7 +13399,7 @@ var init_dev = __esm(() => {
           continue;
         }
         for (const devFileName of app.devFiles) {
-          const devFilePath = join4(app.absolutePath, devFileName);
+          const devFilePath = join5(app.absolutePath, devFileName);
           const relDevFile = relative2(config.projectRoot, devFilePath);
           if (args["dry-run"]) {
             consola.log(`
@@ -13485,6 +13485,48 @@ async function exec(command, options = {}) {
 var init_process = () => {};
 
 // src/core/wrangler.ts
+import { join as join6 } from "node:path";
+function stripJsonc(text) {
+  let result = "";
+  let i2 = 0;
+  let inString = false;
+  while (i2 < text.length) {
+    if (inString) {
+      result += text[i2];
+      if (text[i2] === "\\" && i2 + 1 < text.length) {
+        result += text[i2 + 1];
+        i2 += 2;
+        continue;
+      }
+      if (text[i2] === '"')
+        inString = false;
+      i2++;
+      continue;
+    }
+    if (text[i2] === '"') {
+      inString = true;
+      result += text[i2];
+      i2++;
+      continue;
+    }
+    if (text[i2] === "/" && text[i2 + 1] === "/") {
+      while (i2 < text.length && text[i2] !== `
+`)
+        i2++;
+      continue;
+    }
+    if (text[i2] === "/" && text[i2 + 1] === "*") {
+      i2 += 2;
+      while (i2 < text.length && !(text[i2] === "*" && text[i2 + 1] === "/"))
+        i2++;
+      i2 += 2;
+      continue;
+    }
+    result += text[i2];
+    i2++;
+  }
+  return result.replace(/,(\s*[}\]])/g, "$1");
+}
 async function checkWrangler() {
   const result = await exec(["npx", "wrangler", "--version"]);
   return result.success;
@@ -13531,9 +13573,31 @@ async function listSecrets(workerName, _environment, cwd) {
 `).map((line) => line.trim()).filter((line) => line.length > 0);
   }
 }
+function findWranglerConfig(appPath) {
+  for (const name of ["wrangler.jsonc", "wrangler.json"]) {
+    const p = join6(appPath, name);
+    if (fileExists(p))
+      return p;
+  }
+  return;
+}
+async function updateWranglerVars(appPath, vars) {
+  const configPath = findWranglerConfig(appPath);
+  if (!configPath) {
+    return { success: false, updatedCount: 0 };
+  }
+  const content = await readFile(configPath);
+  const stripped = stripJsonc(content);
+  const config = JSON.parse(stripped);
+  config.vars = { ...config.vars || {}, ...vars };
+  await writeFile(configPath, JSON.stringify(config, null, 2) + `
+`);
+  return { success: true, filePath: configPath, updatedCount: Object.keys(vars).length };
+}
 var init_wrangler = __esm(() => {
   init_dist2();
   init_process();
+  init_fs();
 });
 
 // src/commands/push.ts
@@ -13555,7 +13619,7 @@ var init_push = __esm(() => {
   push_default = defineCommand({
     meta: {
       name: "push",
-      description: "Push env vars to Cloudflare Workers secrets"
+      description: "Push secrets (wrangler) and vars (wrangler.jsonc) to Cloudflare Workers"
     },
     args: {
       env: {
@@ -13636,52 +13700,88 @@ var init_push = __esm(() => {
           consola.warn(`${progress}No worker defined for ${app.name} in ${environment}. Skipping.`);
           continue;
         }
-        consola.start(`${progress}Pushing secrets for ${app.name} → ${workerName} (${environment})...`);
+        consola.start(`${progress}Pushing ${app.name} → ${workerName} (${environment})...`);
         const resolved = await resolveAppEnv(config, app, environment);
         let secretsToPush;
+        let varsToPush;
+        const secretKeySet = new Set(app.secrets ?? []);
+        const varsKeySet = new Set(app.vars ?? []);
         if (args.shared) {
           secretsToPush = {};
+          varsToPush = {};
           for (const [key, value] of Object.entries(resolved.map)) {
             if (sharedKeys.has(key)) {
-              secretsToPush[key] = value;
+              if (secretKeySet.has(key)) {
+                secretsToPush[key] = value;
+              } else if (varsKeySet.has(key)) {
+                varsToPush[key] = value;
+              }
             }
           }
         } else {
-          const secretKeySet = new Set(app.secrets ?? []);
           secretsToPush = {};
+          varsToPush = {};
           for (const [key, value] of Object.entries(resolved.map)) {
             if (secretKeySet.has(key)) {
               secretsToPush[key] = value;
+            } else if (varsKeySet.has(key)) {
+              varsToPush[key] = value;
             }
           }
         }
-        const keyCount = Object.keys(secretsToPush).length;
-        if (keyCount === 0) {
+        const secretCount = Object.keys(secretsToPush).length;
+        const varsCount = Object.keys(varsToPush).length;
+        if (secretCount === 0 && varsCount === 0) {
           const reason = args.shared ? " (no shared keys for this app)" : "";
-          consola.warn(`  No secrets to push for ${app.name}${reason}. Skipping.`);
+          consola.warn(`  Nothing to push for ${app.name}${reason}. Skipping.`);
           continue;
         }
         if (args["dry-run"]) {
-          consola.info(`  Would push ${keyCount} secrets to worker "${workerName}"`);
-          for (const key of Object.keys(secretsToPush)) {
-            const isShared = sharedKeys.has(key) ? " (shared)" : "";
-            consola.log(`    ${key}${isShared}`);
+          if (secretCount > 0) {
+            consola.info(`  Would push ${secretCount} secrets to worker "${workerName}"`);
+            for (const key of Object.keys(secretsToPush)) {
+              const isShared = sharedKeys.has(key) ? " (shared)" : "";
+              consola.log(`    ${key}${isShared}`);
+            }
+          }
+          if (varsCount > 0) {
+            consola.info(`  Would write ${varsCount} vars to wrangler config`);
+            for (const key of Object.keys(varsToPush)) {
+              const isShared = sharedKeys.has(key) ? " (shared)" : "";
+              consola.log(`    ${key}${isShared}`);
+            }
           }
           continue;
         }
         if (!args.force) {
-          const confirmed = await consola.prompt(`  Push ${keyCount} secrets to worker "${workerName}" (${environment})?`, { type: "confirm" });
+          const parts = [];
+          if (secretCount > 0)
+            parts.push(`${secretCount} secrets`);
+          if (varsCount > 0)
+            parts.push(`${varsCount} vars`);
+          const confirmed = await consola.prompt(`  Push ${parts.join(" + ")} to "${workerName}" (${environment})?`, { type: "confirm" });
           if (!confirmed) {
             consola.info(`  Skipped ${app.name}.`);
             continue;
           }
         }
-        const result = await pushSecrets(workerName, secretsToPush, environment, app.absolutePath);
-        if (result.success) {
-          consola.success(`  Pushed ${keyCount} secrets to ${workerName}`);
-        } else {
-          consola.error(`  Failed to push secrets to ${workerName}`);
-          hasFailure = true;
+        if (secretCount > 0) {
+          const result = await pushSecrets(workerName, secretsToPush, environment, app.absolutePath);
+          if (result.success) {
+            consola.success(`  Pushed ${secretCount} secrets to ${workerName}`);
+          } else {
+            consola.error(`  Failed to push secrets to ${workerName}`);
+            hasFailure = true;
+          }
+        }
+        if (varsCount > 0) {
+          const varsResult = await updateWranglerVars(app.absolutePath, varsToPush);
+          if (varsResult.success) {
+            consola.success(`  Wrote ${varsCount} vars to ${varsResult.filePath}`);
+          } else {
+            consola.error(`  No wrangler.jsonc found in ${app.absolutePath}. Cannot write vars.`);
+            hasFailure = true;
+          }
         }
       }
       if (hasFailure) {
@@ -13785,7 +13885,7 @@ var exports_validate = {};
 __export(exports_validate, {
   default: () => validate_default
 });
-import { join as join5 } from "node:path";
+import { join as join7 } from "node:path";
 function parseAppNames4(args, skip = 1) {
   const rest = args._?.slice(skip);
   return rest?.length ? rest : undefined;
@@ -13840,7 +13940,7 @@ var init_validate = __esm(() => {
         appNames = undefined;
       }
       const apps = resolveApps(config, appNames);
-      const examplePath = join5(config.projectRoot, ".env.example");
+      const examplePath = join7(config.projectRoot, ".env.example");
       if (!fileExists(examplePath)) {
         consola.error("No .env.example found at project root.");
         process.exit(1);
@@ -14128,7 +14228,7 @@ var exports_init = {};
 __export(exports_init, {
   default: () => init_default
 });
-import { join as join6, relative as relative3, basename } from "node:path";
+import { join as join8, relative as relative3, basename } from "node:path";
 function generateConfigTS(config) {
   const lines = [
     `import { defineConfig } from "cf-envsync";`,
@@ -14209,10 +14309,10 @@ var init_init = __esm(() => {
     },
     async run({ args }) {
       const cwd = process.cwd();
-      const existingConfig = CONFIG_FILES.find((f3) => fileExists(join6(cwd, f3)));
+      const existingConfig = CONFIG_FILES.find((f3) => fileExists(join8(cwd, f3)));
       if (existingConfig) {
         consola.warn(`${existingConfig} already exists.`);
-        const existingContent = await readFile(join6(cwd, existingConfig));
+        const existingContent = await readFile(join8(cwd, existingConfig));
         const lines = existingContent.split(`
 `);
         const preview = lines.length > 20 ? [...lines.slice(0, 20), `  ... (${lines.length - 20} more lines)`].join(`
@@ -14252,8 +14352,8 @@ ${preview}
 ` + "  Falling back to manual configuration.");
         }
         for (const wranglerFile of wranglerFiles.sort()) {
-          const fullPath = join6(cwd, wranglerFile);
-          const appDir = join6(cwd, wranglerFile, "..");
+          const fullPath = join8(cwd, wranglerFile);
+          const appDir = join8(cwd, wranglerFile, "..");
           const appPath = relative3(cwd, appDir);
           const appName = basename(appDir);
           consola.info(`  Found ${wranglerFile}`);
@@ -14354,10 +14454,10 @@ ${preview}
         apps,
         ...shared.length > 0 ? { shared } : {}
       };
-      const configPath = join6(cwd, "envsync.config.ts");
+      const configPath = join8(cwd, "envsync.config.ts");
       const tsContent = generateConfigTS(config);
       if (existingConfig && existingConfig !== "envsync.config.ts") {
-        const oldPath = join6(cwd, existingConfig);
+        const oldPath = join8(cwd, existingConfig);
         if (fileExists(oldPath)) {
           const { unlink } = await import("node:fs/promises");
           await unlink(oldPath);
@@ -14365,7 +14465,7 @@ ${preview}
       }
       await writeFile(configPath, tsContent);
       consola.success("Created envsync.config.ts");
-      const examplePath = join6(cwd, ".env.example");
+      const examplePath = join8(cwd, ".env.example");
       if (!fileExists(examplePath)) {
         const allKeys = new Set;
         for (const app of Object.values(apps)) {
@@ -14388,20 +14488,20 @@ ${preview}
       for (const env2 of environments) {
         if (env2 === "local")
           continue;
-        const envFile = join6(cwd, `.env.${env2}`);
+        const envFile = join8(cwd, `.env.${env2}`);
         if (!fileExists(envFile)) {
           await writeFile(envFile, `# ${env2} environment variables
 `);
           consola.success(`Created .env.${env2}`);
         }
       }
-      const rootEnv = join6(cwd, ".env");
+      const rootEnv = join8(cwd, ".env");
       if (!fileExists(rootEnv)) {
         await writeFile(rootEnv, `# Local environment variables
 `);
         consola.success("Created .env");
       }
-      const gitignorePath = join6(cwd, ".gitignore");
+      const gitignorePath = join8(cwd, ".gitignore");
       const gitignoreEntries = [".env.local", ".env.keys", ".env.password", "**/.dev.vars"];
       if (fileExists(gitignorePath)) {
         const existing = await readFile(gitignorePath);
@@ -14422,7 +14522,7 @@ ${preview}
 `);
         consola.success(`Created .gitignore`);
       }
-      const gitattrsPath = join6(cwd, ".gitattributes");
+      const gitattrsPath = join8(cwd, ".gitattributes");
       const mergeDriverLines = `.env merge=envsync
 .env.* merge=envsync
 `;
@@ -14438,7 +14538,7 @@ ${preview}
         await writeFile(gitattrsPath, mergeDriverLines);
         consola.success("Created .gitattributes with merge driver");
       }
-      const gitConfigPath = join6(cwd, ".git", "config");
+      const gitConfigPath = join8(cwd, ".git", "config");
       if (fileExists(gitConfigPath)) {
         const gitConfig = await readFile(gitConfigPath);
         if (!gitConfig.includes('[merge "envsync"]')) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cf-envsync",
-  "version": "0.3.8",
+  "version": "0.3.10",
   "description": "Sync .env files to Cloudflare Workers secrets, .dev.vars, and more",
   "type": "module",
   "exports": {