@envmanager-cli/cli 0.1.6 → 0.1.8

package/dist/bin/envmanager.js

@@ -2,6 +2,9 @@
 
 // src/bin/envmanager.ts
 import { Command as Command15 } from "commander";
+import { readFileSync as readFileSync10 } from "fs";
+import { dirname as dirname3, resolve as resolve9 } from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
 
 // src/commands/login.ts
 import { Command } from "commander";
@@ -88,7 +91,7 @@ function escapeHtml(str) {
   return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#039;");
 }
 async function startCallbackServer(expectedState, port = 8976) {
-  return new Promise((resolve9, reject) => {
+  return new Promise((resolve10, reject) => {
     const timeout = setTimeout(() => {
       server.close();
       reject(new Error("Authentication timed out after 5 minutes"));
@@ -161,9 +164,9 @@ async function startCallbackServer(expectedState, port = 8976) {
         clearTimeout(timeout);
         server.close();
         if (apiKey) {
-          resolve9({ apiKey });
+          resolve10({ apiKey });
         } else {
-          resolve9({
+          resolve10({
             accessToken,
             refreshToken,
             expiresIn: parseInt(expiresIn || "3600", 10)
@@ -1479,7 +1482,9 @@ async function subscribeToVariableChanges(environmentId, onEvent, onStatus) {
       table: "variables"
     },
     (payload) => {
-      const record = payload.new || payload.old;
+      const newRecord = payload.new;
+      const oldRecord = payload.old;
+      const record = newRecord && Object.keys(newRecord).length > 0 ? newRecord : oldRecord;
       if (!record) return;
       const recordEnvId = record.environment_id;
       if (recordEnvId !== environmentId) {
@@ -1493,8 +1498,7 @@ async function subscribeToVariableChanges(environmentId, onEvent, onStatus) {
         is_secret: record.is_secret,
         timestamp: Date.now() / 1e3
       };
-      if (payload.eventType === "UPDATE" && payload.old) {
-        const oldRecord = payload.old;
+      if (payload.eventType === "UPDATE" && oldRecord) {
         if (oldRecord.key !== record.key) {
           event.old_key = oldRecord.key;
         }
@@ -1511,11 +1515,11 @@ async function subscribeToVariableChanges(environmentId, onEvent, onStatus) {
       onStatus?.("connected");
     }
   });
-  const subscription = await new Promise((resolve9, reject) => {
+  const subscription = await new Promise((resolve10, reject) => {
     channel.subscribe(async (status, err) => {
       if (status === "SUBSCRIBED") {
         onStatus?.("connected");
-        resolve9({
+        resolve10({
           channel,
           environmentId,
           unsubscribe: async () => {
@@ -1664,9 +1668,12 @@ function mergeWithRemote(local, remoteVariables, strategy) {
         result.set(key, value);
       }
       break;
-    case "remote_wins":
+    case "remote_wins": {
+      const remoteKeys = new Set(remoteVariables.map((v) => v.key));
       for (const [key, value] of local) {
-        result.set(key, value);
+        if (remoteKeys.has(key)) {
+          result.set(key, value);
+        }
       }
       for (const v of remoteVariables) {
         if (v.value !== null) {
@@ -1674,6 +1681,7 @@ function mergeWithRemote(local, remoteVariables, strategy) {
         }
       }
       break;
+    }
     case "merge_new":
       for (const [key, value] of local) {
         result.set(key, value);
@@ -2986,9 +2994,9 @@ import { fileURLToPath } from "url";
 import { dirname as dirname2, resolve as resolve8 } from "path";
 function getCliVersion() {
   try {
-    const __dirname2 = dirname2(fileURLToPath(import.meta.url));
-    const pkg = JSON.parse(readFileSync9(resolve8(__dirname2, "../../package.json"), "utf-8"));
-    return pkg.version || "unknown";
+    const __dirname3 = dirname2(fileURLToPath(import.meta.url));
+    const pkg2 = JSON.parse(readFileSync9(resolve8(__dirname3, "../../package.json"), "utf-8"));
+    return pkg2.version || "unknown";
   } catch {
     return "unknown";
   }
@@ -3080,8 +3088,10 @@ var debugCommand = new Command14("debug").description("Collect diagnostic info f
 });
 
 // src/bin/envmanager.ts
+var __dirname2 = dirname3(fileURLToPath2(import.meta.url));
+var pkg = JSON.parse(readFileSync10(resolve9(__dirname2, "../../package.json"), "utf-8"));
 var program = new Command15();
-program.name("envmanager").description("CLI for EnvManager - secure environment variable management").version("0.1.0");
+program.name("envmanager").description("CLI for EnvManager - secure environment variable management").version(pkg.version);
 program.addCommand(loginCommand);
 program.addCommand(logoutCommand);
 program.addCommand(whoamiCommand);