@saidulbadhon/jssm-cli 1.6.4 → 1.6.6

package/dist/index.js

@@ -4143,10 +4143,19 @@ async function apiRequest(url, authToken, options = {}) {
     headers
   });
   if (!response.ok) {
-    const error = await response.json().catch(() => ({
+    const errorBody = await response.json().catch(() => ({
       error: `HTTP ${response.status} ${response.statusText}`
     }));
-    const message = typeof error === "object" && error !== null && "error" in error && error.error ? String(error.error) : void 0;
+    let message;
+    if (typeof errorBody.error === "string") {
+      message = errorBody.error;
+    } else if (typeof errorBody.error === "object" && errorBody.error !== null && "message" in errorBody.error && typeof errorBody.error.message === "string") {
+      message = errorBody.error.message;
+    } else if (typeof errorBody.message === "string") {
+      message = errorBody.message;
+    } else if (errorBody.error) {
+      message = JSON.stringify(errorBody.error);
+    }
     throw new Error(
       message || `HTTP ${response.status} ${response.statusText}`
     );
@@ -4481,12 +4490,15 @@ async function initCommand(args2) {
           console.log(`  ${f.relativePath} (${f.variableCount} variables)`);
         });
         const confirmUpload = await dist_default3({
-          message: "\nProceed with upload?",
+          message: `
+Upload to ${projectName}?`,
           default: true
         });
         if (confirmUpload) {
-          console.log(`
-\u2B06\uFE0F  Uploading ${selectedFileInfos.length} file(s)...`);
+          console.log(
+            `
+\u2B06\uFE0F  Uploading ${selectedFileInfos.length} file(s) to ${projectName}...`
+          );
           let successCount = 0;
           let failCount = 0;
           for (const fileInfo of selectedFileInfos) {
@@ -4499,6 +4511,7 @@ async function initCommand(args2) {
                 projectName,
                 content,
                 fileInfo.relativePath
+                // environment not specified - defaults to "default" on server
               );
               console.log(`  \u2705 ${fileInfo.relativePath}`);
               successCount++;
@@ -4552,12 +4565,16 @@ async function initCommand(args2) {
 // src/commands/pull.ts
 import { writeFile as writeFile3, mkdir as mkdir3 } from "fs/promises";
 import { join as join4, dirname } from "path";
+import { existsSync as existsSync2 } from "fs";
 async function pullCommand2(args2) {
   const flags = {};
   let pullAll = false;
+  let forceOverwrite = false;
   for (let i = 0; i < args2.length; i++) {
     if (args2[i] === "--all" || args2[i] === "-a") {
       pullAll = true;
+    } else if (args2[i] === "--force" || args2[i] === "-f") {
+      forceOverwrite = true;
     } else if (args2[i].startsWith("-")) {
       const key = args2[i].replace(/^-+/, "");
       const value = args2[i + 1];
@@ -4587,6 +4604,17 @@ async function pullCommand2(args2) {
   }
   try {
     if (output) {
+      const outputPath = join4(process.cwd(), output);
+      if (existsSync2(outputPath) && !forceOverwrite) {
+        const shouldOverwrite = await dist_default3({
+          message: `\u26A0\uFE0F  ${output} already exists. Overwrite?`,
+          default: false
+        });
+        if (!shouldOverwrite) {
+          console.log(`\u23ED\uFE0F  Skipped ${output}`);
+          return;
+        }
+      }
       console.log(`\u{1F4E5} Pulling ${output} from ${project}...`);
       const content = await pullEnvFile(
         config.host,
@@ -4594,7 +4622,6 @@ async function pullCommand2(args2) {
         project,
         output
       );
-      const outputPath = join4(process.cwd(), output);
       const dir = dirname(outputPath);
       if (dir !== process.cwd()) {
         await mkdir3(dir, { recursive: true });
@@ -4662,6 +4689,36 @@ async function pullCommand2(args2) {
         });
       }
     }
+    const existingFiles = selectedFiles.filter(
+      (f) => existsSync2(join4(process.cwd(), f))
+    );
+    if (existingFiles.length > 0 && !forceOverwrite) {
+      console.log(`
+\u26A0\uFE0F  The following local files already exist:`);
+      existingFiles.forEach((f) => console.log(`   \u2022 ${f}`));
+      const overwriteChoice = await dist_default6({
+        message: "\nHow would you like to proceed?",
+        choices: [
+          {
+            name: "\u23ED\uFE0F  Skip existing files (only pull new ones)",
+            value: "skip"
+          },
+          { name: "\u{1F4DD} Overwrite all existing files", value: "overwrite" },
+          { name: "\u274C Cancel", value: "cancel" }
+        ]
+      });
+      if (overwriteChoice === "cancel") {
+        console.log("\u274C Cancelled");
+        return;
+      }
+      if (overwriteChoice === "skip") {
+        selectedFiles = selectedFiles.filter((f) => !existingFiles.includes(f));
+        if (selectedFiles.length === 0) {
+          console.log("\u23ED\uFE0F  No new files to pull");
+          return;
+        }
+      }
+    }
     if (selectedFiles.length === 1) {
       console.log(`
 \u{1F4E5} Pulling ${selectedFiles[0]}...`);
@@ -4674,13 +4731,13 @@ async function pullCommand2(args2) {
     let failCount = 0;
     for (const filename of selectedFiles) {
       try {
+        const outputPath = join4(process.cwd(), filename);
         const content = await pullEnvFile(
           config.host,
           config.authToken,
           project,
           filename
         );
-        const outputPath = join4(process.cwd(), filename);
         const dir = dirname(outputPath);
         if (dir !== process.cwd()) {
           await mkdir3(dir, { recursive: true });
@@ -4754,7 +4811,7 @@ async function pushCommand2(args2) {
   }
   const project = flags.p || flags.project || config.project;
   const environment = flags.e || flags.env;
-  let input = flags.in || flags.input;
+  let inputFile = flags.in || flags.input;
   let searchDepth = 10;
   if (flags.depth) {
     const parsedDepth = parseInt(flags.depth, 10);
@@ -4767,7 +4824,7 @@ async function pushCommand2(args2) {
     console.log(`   This directory is initialized for ${config.project}`);
   }
   let selectedFiles = [];
-  if (!input) {
+  if (!inputFile) {
     const cwd = process.cwd();
     const envFiles = await findEnvFiles(cwd, searchDepth);
     if (envFiles.length === 0) {
@@ -4823,7 +4880,7 @@ async function pushCommand2(args2) {
       }
     }
   } else {
-    selectedFiles = [input];
+    selectedFiles = [inputFile];
   }
   const envSuffix = environment ? ` (env: ${environment})` : "";
   if (selectedFiles.length === 1) {
@@ -4879,7 +4936,7 @@ async function pushCommand2(args2) {
         file,
         // Use full relative path, not just filename
         environment
-        // Optional environment tag
+        // Optional - defaults to "default" on server if not provided
       );
       if (selectedFiles.length === 1) {
         console.log(
@@ -5826,7 +5883,7 @@ ${import_chalk.default.bold("Usage in Docker:")}
 
 // src/utils/versionCheck.ts
 var PACKAGE_NAME = "@saidulbadhon/jssm-cli";
-var CURRENT_VERSION = "1.6.4";
+var CURRENT_VERSION = "1.6.6";
 async function getLatestVersion() {
   try {
     const response = await fetch(`https://registry.npmjs.org/${PACKAGE_NAME}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saidulbadhon/jssm-cli",
-  "version": "1.6.4",
+  "version": "1.6.6",
   "private": false,
   "description": "CLI for JSSM - Simple environment variable manager",
   "author": "Saidul Badhon",