storymaps 1.2.6 → 1.2.7

package/lib/commands/diff.js

@@ -29,14 +29,17 @@ export async function diffCommand(source, target, opts) {
     const sourcePath = resolve(source || 'storymap.yml');
     const sourceYaml = await readAndNormalise(sourcePath);
 
-    let targetYaml;
-    let targetLabel;
+    // Show changes from old to new. Two local files go from the first to the second. Against the
+    // remote, the local file is the new side, so the diff shows what a push would change.
+    let oldYaml, newYaml, oldLabel, newLabel;
 
     if (target) {
         // Two local files
         const targetPath = resolve(target);
-        targetYaml = await readAndNormalise(targetPath);
-        targetLabel = targetPath;
+        oldYaml = sourceYaml;
+        newYaml = await readAndNormalise(targetPath);
+        oldLabel = sourcePath;
+        newLabel = targetPath;
     } else {
         // Local vs remote
         const { id, baseUrl } = await resolveTarget(undefined, sourcePath);
@@ -44,11 +47,13 @@ export async function diffCommand(source, target, opts) {
         // Normalise remote YAML the same way
         const obj = jsyaml.load(data);
         const json = yamlObjToJson(obj);
-        targetYaml = exportToYaml(json);
-        targetLabel = `${baseUrl}/${id}`;
+        oldYaml = exportToYaml(json);
+        newYaml = sourceYaml;
+        oldLabel = `remote: ${baseUrl}/${id}`;
+        newLabel = `local: ${sourcePath}`;
     }
 
-    const changes = diffLines(sourceYaml, targetYaml);
+    const changes = diffLines(oldYaml, newYaml);
     const hasChanges = changes.some(c => c.added || c.removed);
 
     if (!hasChanges) {
@@ -57,7 +62,7 @@ export async function diffCommand(source, target, opts) {
     }
 
     if (!opts.full) {
-        printChangeSummary(sourceYaml, targetYaml);
+        printChangeSummary(oldYaml, newYaml);
         console.log(chalk.dim(`\nRun ${chalk.cyan('storymaps diff --full')} for the full file diff.`));
         return;
     }
@@ -65,25 +70,25 @@ export async function diffCommand(source, target, opts) {
     // --full: show line-level diff
     const CONTEXT = 3;
     const lines = [];
-    let srcLine = 1;
-    let dstLine = 1;
+    let oldLine = 1;
+    let newLine = 1;
     for (const part of changes) {
         for (const text of part.value.replace(/\n$/, '').split('\n')) {
             if (part.added) {
-                lines.push({ tag: '+', text, src: null, dst: dstLine++ });
+                lines.push({ tag: '+', text, oldNum: null, newNum: newLine++ });
             } else if (part.removed) {
-                lines.push({ tag: '-', text, src: srcLine++, dst: null });
+                lines.push({ tag: '-', text, oldNum: oldLine++, newNum: null });
             } else {
-                lines.push({ tag: ' ', text, src: srcLine++, dst: dstLine++ });
+                lines.push({ tag: ' ', text, oldNum: oldLine++, newNum: newLine++ });
             }
         }
     }
 
-    const width = String(Math.max(srcLine, dstLine)).length;
+    const width = String(Math.max(oldLine, newLine)).length;
     const pad = n => n === null ? ' '.repeat(width) : String(n).padStart(width);
 
-    console.log(chalk.bold(`--- local: ${sourcePath}`));
-    console.log(chalk.bold(`+++ remote: ${targetLabel}`));
+    console.log(chalk.bold(`--- ${oldLabel}`));
+    console.log(chalk.bold(`+++ ${newLabel}`));
 
     let lastPrinted = -1;
     for (let i = 0; i < lines.length; i++) {
@@ -92,8 +97,8 @@ export async function diffCommand(source, target, opts) {
         if (lastPrinted !== -1 && i - lastPrinted > 1) {
             console.log(chalk.dim(`${'·'.repeat(width * 2 + 5)}`));
         }
-        const { tag, text, src, dst } = lines[i];
-        const num = chalk.dim(`${pad(src)} ${pad(dst)}`);
+        const { tag, text, oldNum, newNum } = lines[i];
+        const num = chalk.dim(`${pad(oldNum)} ${pad(newNum)}`);
         if (tag === '+') console.log(`${num} ${chalk.green(`+ ${text}`)}`);
         else if (tag === '-') console.log(`${num} ${chalk.red(`- ${text}`)}`);
         else console.log(`${num} ${chalk.dim(`  ${text}`)}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "storymaps",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "description": "CLI tool for storymaps.io - import, export, validate, and manage user story maps from the terminal",
   "type": "module",
   "bin": {