@saidulbadhon/jssm-cli 1.6.6 → 1.7.0

package/dist/index.js

@@ -4173,15 +4173,11 @@ async function getProjects(host, apiKey) {
   const url = `${host}/projects`;
   return apiRequest(url, apiKey);
 }
-async function pushEnvFile(host, apiKey, project, content, filename = ".env", environment) {
+async function pushEnvFile(host, apiKey, project, content, filename = ".env") {
   const url = `${host}/projects/${project}/files/push`;
-  const body = { content, filename };
-  if (environment) {
-    body.environment = environment;
-  }
   return apiRequest(url, apiKey, {
     method: "POST",
-    body: JSON.stringify(body)
+    body: JSON.stringify({ content, filename })
   });
 }
 async function pullEnvFile(host, apiKey, project, filename = ".env") {
@@ -4563,9 +4559,28 @@ Upload to ${projectName}?`,
 }
 
 // src/commands/pull.ts
-import { writeFile as writeFile3, mkdir as mkdir3 } from "fs/promises";
+import { writeFile as writeFile3, mkdir as mkdir3, readFile as readFile4 } from "fs/promises";
 import { join as join4, dirname } from "path";
 import { existsSync as existsSync2 } from "fs";
+function calculateLineDiff(oldContent, newContent) {
+  if (!oldContent) {
+    const lines = newContent.split("\n");
+    const nonEmptyLines = lines.filter((line) => line.trim().length > 0).length;
+    return { changedLines: nonEmptyLines, isNewFile: true };
+  }
+  const oldLines = oldContent.split("\n");
+  const newLines = newContent.split("\n");
+  const maxLength = Math.max(oldLines.length, newLines.length);
+  let changedLines = 0;
+  for (let i = 0; i < maxLength; i++) {
+    const oldLine = i < oldLines.length ? oldLines[i] : "";
+    const newLine = i < newLines.length ? newLines[i] : "";
+    if (oldLine !== newLine) {
+      changedLines++;
+    }
+  }
+  return { changedLines, isNewFile: false };
+}
 async function pullCommand2(args2) {
   const flags = {};
   let pullAll = false;
@@ -4622,13 +4637,28 @@ async function pullCommand2(args2) {
         project,
         output
       );
+      let existingContent = null;
+      if (existsSync2(outputPath)) {
+        try {
+          existingContent = await readFile4(outputPath, "utf-8");
+        } catch {
+          existingContent = null;
+        }
+      }
+      const { changedLines, isNewFile } = calculateLineDiff(
+        existingContent,
+        content
+      );
       const dir = dirname(outputPath);
       if (dir !== process.cwd()) {
         await mkdir3(dir, { recursive: true });
       }
       await writeFile3(outputPath, content, "utf-8");
       const varCount = countVariables(content);
-      console.log(`\u2705 Wrote ${output} (${varCount} variables)`);
+      const statusText = isNewFile ? "Created" : "Updated";
+      console.log(
+        `\u2705 ${statusText} ${output} (${varCount} variables, ${changedLines} line${changedLines !== 1 ? "s" : ""} changed)`
+      );
       return;
     }
     console.log(`\u{1F4E5} Checking available files in ${project}...`);
@@ -4729,6 +4759,9 @@ async function pullCommand2(args2) {
     }
     let successCount = 0;
     let failCount = 0;
+    let updatedFilesCount = 0;
+    let newFilesCount = 0;
+    let totalChangedLines = 0;
     for (const filename of selectedFiles) {
       try {
         const outputPath = join4(process.cwd(), filename);
@@ -4738,16 +4771,40 @@ async function pullCommand2(args2) {
           project,
           filename
         );
+        let existingContent = null;
+        if (existsSync2(outputPath)) {
+          try {
+            existingContent = await readFile4(outputPath, "utf-8");
+          } catch {
+            existingContent = null;
+          }
+        }
+        const { changedLines, isNewFile } = calculateLineDiff(
+          existingContent,
+          content
+        );
         const dir = dirname(outputPath);
         if (dir !== process.cwd()) {
           await mkdir3(dir, { recursive: true });
         }
         await writeFile3(outputPath, content, "utf-8");
         const varCount = countVariables(content);
+        if (isNewFile) {
+          newFilesCount++;
+        } else {
+          updatedFilesCount++;
+        }
+        totalChangedLines += changedLines;
         if (selectedFiles.length === 1) {
-          console.log(`\u2705 Wrote ${filename} (${varCount} variables)`);
+          const statusText = isNewFile ? "Created" : "Updated";
+          console.log(
+            `\u2705 ${statusText} ${filename} (${varCount} variables, ${changedLines} line${changedLines !== 1 ? "s" : ""} changed)`
+          );
         } else {
-          console.log(`\u2705 ${filename}: Pulled (${varCount} variables)`);
+          const statusText = isNewFile ? "Created" : "Updated";
+          console.log(
+            `\u2705 ${filename}: ${statusText} (${varCount} variables, ${changedLines} line${changedLines !== 1 ? "s" : ""} changed)`
+          );
         }
         successCount++;
       } catch (error) {
@@ -4762,9 +4819,29 @@ async function pullCommand2(args2) {
       if (successCount > 0) {
         console.log(`   \u2705 Success: ${successCount} file(s)`);
       }
+      if (newFilesCount > 0) {
+        console.log(`   \u{1F4C4} New files: ${newFilesCount}`);
+      }
+      if (updatedFilesCount > 0) {
+        console.log(`   \u{1F4DD} Updated files: ${updatedFilesCount}`);
+      }
+      if (totalChangedLines > 0) {
+        console.log(`   \u{1F4CF} Total lines changed: ${totalChangedLines}`);
+      }
       if (failCount > 0) {
         console.log(`   \u274C Failed: ${failCount} file(s)`);
       }
+    } else if (successCount === 1) {
+      if (newFilesCount > 0) {
+        console.log(`
+\u{1F4CA} Summary: New file created`);
+      } else if (updatedFilesCount > 0) {
+        console.log(`
+\u{1F4CA} Summary: File updated`);
+      }
+      if (totalChangedLines > 0) {
+        console.log(`   \u{1F4CF} Lines changed: ${totalChangedLines}`);
+      }
     }
     if (failCount > 0 && successCount === 0) {
       process.exit(1);
@@ -4783,8 +4860,27 @@ function countVariables(content) {
 }
 
 // src/commands/push.ts
-import { readFile as readFile4 } from "fs/promises";
+import { readFile as readFile5 } from "fs/promises";
 import { join as join5 } from "path";
+function calculateLineDiff2(oldContent, newContent) {
+  if (!oldContent) {
+    const lines = newContent.split("\n");
+    const nonEmptyLines = lines.filter((line) => line.trim().length > 0).length;
+    return { changedLines: nonEmptyLines, isNewFile: true };
+  }
+  const oldLines = oldContent.split("\n");
+  const newLines = newContent.split("\n");
+  const maxLength = Math.max(oldLines.length, newLines.length);
+  let changedLines = 0;
+  for (let i = 0; i < maxLength; i++) {
+    const oldLine = i < oldLines.length ? oldLines[i] : "";
+    const newLine = i < newLines.length ? newLines[i] : "";
+    if (oldLine !== newLine) {
+      changedLines++;
+    }
+  }
+  return { changedLines, isNewFile: false };
+}
 async function pushCommand2(args2) {
   const flags = {};
   for (let i = 0; i < args2.length; i++) {
@@ -4810,7 +4906,6 @@ async function pushCommand2(args2) {
     process.exit(1);
   }
   const project = flags.p || flags.project || config.project;
-  const environment = flags.e || flags.env;
   let inputFile = flags.in || flags.input;
   let searchDepth = 10;
   if (flags.depth) {
@@ -4882,27 +4977,27 @@ async function pushCommand2(args2) {
   } else {
     selectedFiles = [inputFile];
   }
-  const envSuffix = environment ? ` (env: ${environment})` : "";
   if (selectedFiles.length === 1) {
-    console.log(
-      `
-\u{1F4E4} Pushing ${selectedFiles[0]} to ${project}${envSuffix}...`
-    );
+    console.log(`
+\u{1F4E4} Pushing ${selectedFiles[0]} to ${project}...`);
   } else {
     console.log(
       `
-\u{1F4E4} Pushing ${selectedFiles.length} files to ${project}${envSuffix}...
+\u{1F4E4} Pushing ${selectedFiles.length} files to ${project}...
 `
     );
   }
   let successCount = 0;
   let failCount = 0;
+  let updatedFilesCount = 0;
+  let newFilesCount = 0;
+  let totalChangedLines = 0;
   for (const file of selectedFiles) {
     let fileContent = "";
     let fileSize = 0;
     try {
       const inputPath = join5(process.cwd(), file);
-      fileContent = await readFile4(inputPath, "utf-8");
+      fileContent = await readFile5(inputPath, "utf-8");
       fileSize = Buffer.byteLength(fileContent, "utf-8");
       const variables = parseVariables(fileContent, file);
       if (variables.length === 0) {
@@ -4928,27 +5023,59 @@ async function pushCommand2(args2) {
         failCount++;
         continue;
       }
-      await pushEnvFile(
+      let existingContent = null;
+      try {
+        existingContent = await pullEnvFile(
+          config.host,
+          config.authToken,
+          project,
+          file
+        );
+      } catch {
+        existingContent = null;
+      }
+      const { changedLines, isNewFile } = calculateLineDiff2(
+        existingContent,
+        fileContent
+      );
+      const result = await pushEnvFile(
         config.host,
         config.authToken,
         project,
         fileContent,
-        file,
+        file
         // Use full relative path, not just filename
-        environment
-        // Optional - defaults to "default" on server if not provided
       );
+      const tagInfo = result.environmentTag ? ` [${result.environmentTag}${result.tagSource === "auto" ? " auto" : ""}]` : "";
+      if (isNewFile) {
+        newFilesCount++;
+      } else {
+        updatedFilesCount++;
+      }
+      totalChangedLines += changedLines;
       if (selectedFiles.length === 1) {
+        const statusText = isNewFile ? "Created" : "Updated";
         console.log(
-          `\u2705 Pushed ${file} (${variables.length} variables) to ${project}${envSuffix}`
+          `\u2705 ${statusText} ${file} (${variables.length} variables, ${changedLines} line${changedLines !== 1 ? "s" : ""} changed) to ${project}${tagInfo}`
         );
       } else {
-        console.log(`\u2705 ${file}: Pushed (${variables.length} variables)`);
+        const statusText = isNewFile ? "Created" : "Updated";
+        console.log(
+          `\u2705 ${file}: ${statusText} (${variables.length} variables, ${changedLines} line${changedLines !== 1 ? "s" : ""} changed)${tagInfo}`
+        );
       }
       successCount++;
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      console.error(`\u274C ${file}: Failed to push - ${message}`);
+      let helpText = "";
+      if (message.includes("Project") && message.includes("not found")) {
+        helpText = `
+   \u{1F4A1} Hint: Make sure the project '${project}' exists. You can create it with: jssm init -p ${project}`;
+      } else if (message.includes("Insufficient permissions")) {
+        helpText = `
+   \u{1F4A1} Hint: You don't have write access to project '${project}'`;
+      }
+      console.error(`\u274C ${file}: Failed to push - ${message}${helpText}`);
       failCount++;
     }
   }
@@ -4956,9 +5083,29 @@ async function pushCommand2(args2) {
     console.log(`
 \u{1F4CA} Summary:`);
     console.log(`   \u2705 Success: ${successCount} file(s)`);
+    if (newFilesCount > 0) {
+      console.log(`   \u{1F4C4} New files: ${newFilesCount}`);
+    }
+    if (updatedFilesCount > 0) {
+      console.log(`   \u{1F4DD} Updated files: ${updatedFilesCount}`);
+    }
+    if (totalChangedLines > 0) {
+      console.log(`   \u{1F4CF} Total lines changed: ${totalChangedLines}`);
+    }
     if (failCount > 0) {
       console.log(`   \u274C Failed: ${failCount} file(s)`);
     }
+  } else if (successCount === 1) {
+    if (newFilesCount > 0) {
+      console.log(`
+\u{1F4CA} Summary: New file created`);
+    } else if (updatedFilesCount > 0) {
+      console.log(`
+\u{1F4CA} Summary: File updated`);
+    }
+    if (totalChangedLines > 0) {
+      console.log(`   \u{1F4CF} Lines changed: ${totalChangedLines}`);
+    }
   }
   if (failCount > 0) {
     process.exit(1);
@@ -5883,7 +6030,7 @@ ${import_chalk.default.bold("Usage in Docker:")}
 
 // src/utils/versionCheck.ts
 var PACKAGE_NAME = "@saidulbadhon/jssm-cli";
-var CURRENT_VERSION = "1.6.6";
+var CURRENT_VERSION = "1.7.0";
 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.6",
+  "version": "1.7.0",
   "private": false,
   "description": "CLI for JSSM - Simple environment variable manager",
   "author": "Saidul Badhon",