jsrepo 1.2.3 → 1.2.4

package/dist/index.js

@@ -677,7 +677,7 @@ var schema = v.object({
   watermark: v.optional(v.boolean(), true)
 });
 var getConfig = (cwd) => {
-  if (!fs.existsSync(CONFIG_NAME)) {
+  if (!fs.existsSync(path.join(cwd, CONFIG_NAME))) {
     return Err("Could not find your configuration file! Please run `init`.");
   }
   const config = v.safeParse(
@@ -1581,6 +1581,20 @@ var join = (lines, { lineNumbers = false, prefix } = {}) => {
 };
 
 // src/utils/diff.ts
+var isWhitespace = (str) => /^\s+$/g.test(str);
+var trimSingleNewLine = (str) => {
+  let i = str.length - 1;
+  while (isWhitespace(str[i]) && i >= 0) {
+    if (str[i] === "\n") {
+      if (str[i - 1] === "\r") {
+        return str.slice(0, i - 1);
+      }
+      return str.slice(0, i);
+    }
+    i--;
+  }
+  return str;
+};
 var formatDiff = ({
   from,
   to,
@@ -1589,6 +1603,8 @@ var formatDiff = ({
   maxUnchanged = 5,
   colorRemoved = color7.red,
   colorAdded = color7.green,
+  colorCharsRemoved = color7.bgRed,
+  colorCharsAdded = color7.bgGreen,
   prefix,
   onUnchanged,
   intro: intro2
@@ -1630,7 +1646,7 @@ var formatDiff = ({
     if (!change.added && !change.removed) {
       if (!expand && change.count !== void 0 && change.count > maxUnchanged) {
         const prevLineOffset = lineOffset;
-        const ls = get(change.value.trimEnd());
+        const ls = get(trimSingleNewLine(change.value));
         let shownLines = 0;
         if (hasNextChange) shownLines += maxUnchanged;
         if (hasPreviousChange) shownLines += maxUnchanged;
@@ -1672,35 +1688,54 @@ var formatDiff = ({
         lineOffset = prevLineOffset + change.count;
         continue;
       }
-      result += `${join(get(change.value.trimEnd()), {
+      result += `${join(get(trimSingleNewLine(change.value)), {
         prefix: linePrefix
       })}
 `;
       lineOffset += change.count ?? 0;
       continue;
     }
-    const colorChange = (change2) => {
+    const colorLineChange = (change2) => {
+      if (change2.added) {
+        return colorAdded(trimSingleNewLine(change2.value));
+      }
+      if (change2.removed) {
+        return colorRemoved(trimSingleNewLine(change2.value));
+      }
+      return change2.value;
+    };
+    const colorCharChange = (change2) => {
       if (change2.added) {
-        return colorAdded(change2.value.trimEnd());
+        return colorCharsAdded(trimSingleNewLine(change2.value));
       }
       if (change2.removed) {
-        return colorRemoved(change2.value.trimEnd());
+        return colorCharsRemoved(trimSingleNewLine(change2.value));
       }
       return change2.value;
     };
-    if (change.removed && change.count === 1) {
+    if (change.removed && change.count === 1 && changes[i + 1]?.added && changes[i + 1]?.count === 1) {
       const diffedChars = diffChars(change.value, changes[i + 1].value);
-      const sentence = diffedChars.map((chg) => colorChange(chg)).join("");
+      const sentence = diffedChars.map((chg) => colorCharChange(chg)).join("");
       result += `${linePrefix(0)}${sentence}`;
       lineOffset += 1;
       i++;
     } else {
-      result += `${join(get(colorChange(change)), {
-        prefix: linePrefix
-      })}
+      if (isWhitespace(change.value)) {
+        result += `${join(get(colorCharChange(change)), {
+          prefix: (line) => `${linePrefix(line)}${colorCharChange({ removed: true, value: "   ", added: false })}`
+        })}
 `;
-      if (!change.removed) {
-        lineOffset += change.count ?? 0;
+        if (!change.removed) {
+          lineOffset += change.count ?? 0;
+        }
+      } else {
+        result += `${join(get(colorLineChange(change)), {
+          prefix: linePrefix
+        })}
+`;
+        if (!change.removed) {
+          lineOffset += change.count ?? 0;
+        }
       }
     }
   }
@@ -1830,6 +1865,8 @@ ${remoteContent}`;
           maxUnchanged: options.maxUnchanged,
           colorAdded: color8.greenBright,
           colorRemoved: color8.redBright,
+          colorCharsAdded: color8.bgGreenBright,
+          colorCharsRemoved: color8.bgRedBright,
           prefix: () => `${L}  `,
           onUnchanged: ({ from: from2, to: to2, prefix }) => `${prefix?.() ?? ""}${color8.cyan(from2)} \u2192 ${color8.gray(to2)} ${color8.gray("(unchanged)")}
 `,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jsrepo",
   "description": "A CLI to add shared code from remote repositories.",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ieedan/jsrepo"

package/src/blocks/types/result.ts

@@ -1,5 +1,5 @@
 /*
-	jsrepo 1.2.1
+	jsrepo 1.2.3
 	Installed from github/ieedan/std
 	11-21-2024
 */

package/src/blocks/utils/array-sum.ts

@@ -1,5 +1,5 @@
 /*
-	jsrepo 1.2.1
+	jsrepo 1.2.3
 	Installed from github/ieedan/std
 	11-21-2024
 */

package/src/blocks/utils/lines.ts

@@ -1,5 +1,5 @@
 /*
-	jsrepo 1.2.1
+	jsrepo 1.2.3
 	Installed from github/ieedan/std
 	11-21-2024
 */

package/src/blocks/utils/map-to-array.ts

@@ -1,5 +1,5 @@
 /*
-	jsrepo 1.2.1
+	jsrepo 1.2.3
 	Installed from github/ieedan/std
 	11-21-2024
 */

package/src/blocks/utils/pad.ts

@@ -1,5 +1,5 @@
 /*
-	jsrepo 1.2.1
+	jsrepo 1.2.3
 	Installed from github/ieedan/std
 	11-21-2024
 */

package/src/blocks/utils/strip-ansi.ts

@@ -1,5 +1,5 @@
 /*
-	jsrepo 1.2.1
+	jsrepo 1.2.3
 	Installed from github/ieedan/std
 	11-21-2024
 */

package/src/commands/diff.ts

@@ -193,6 +193,8 @@ const _diff = async (options: Options) => {
 					maxUnchanged: options.maxUnchanged,
 					colorAdded: color.greenBright,
 					colorRemoved: color.redBright,
+					colorCharsAdded: color.bgGreenBright,
+					colorCharsRemoved: color.bgRedBright,
 					prefix: () => `${L}  `,
 					onUnchanged: ({ from, to, prefix }) =>
 						`${prefix?.() ?? ''}${color.cyan(from)} → ${color.gray(to)} ${color.gray('(unchanged)')}\n`,

package/src/config/index.ts

@@ -14,7 +14,7 @@ const schema = v.object({
 });
 
 const getConfig = (cwd: string): Result<Config, string> => {
-	if (!fs.existsSync(CONFIG_NAME)) {
+	if (!fs.existsSync(path.join(cwd, CONFIG_NAME))) {
 		return Err('Could not find your configuration file! Please run `init`.');
 	}
 

package/src/utils/diff.ts

@@ -19,12 +19,46 @@ type Options = {
 	colorRemoved?: (line: string) => string;
 	/** Color the added lines */
 	colorAdded?: (line: string) => string;
+	/** Color the removed chars */
+	colorCharsRemoved?: (line: string) => string;
+	/** Color the added chars */
+	colorCharsAdded?: (line: string) => string;
 	/** Prefixes each line with the string returned from this function. */
 	prefix: () => string;
 	intro: (options: Options) => string;
 	onUnchanged: (options: Options) => string;
 };
 
+/** Check if a character is whitespace
+ *
+ * @param str
+ * @returns
+ */
+const isWhitespace = (str: string) => /^\s+$/g.test(str);
+
+/** We need to add a newline at the end of each change to make sure
+ * the next change can start correctly. So we take off just 1.
+ *
+ * @param str
+ * @returns
+ */
+const trimSingleNewLine = (str: string): string => {
+	let i = str.length - 1;
+	while (isWhitespace(str[i]) && i >= 0) {
+		if (str[i] === '\n') {
+			if (str[i - 1] === '\r') {
+				return str.slice(0, i - 1);
+			}
+
+			return str.slice(0, i);
+		}
+
+		i--;
+	}
+
+	return str;
+};
+
 const formatDiff = ({
 	from,
 	to,
@@ -33,6 +67,8 @@ const formatDiff = ({
 	maxUnchanged = 5,
 	colorRemoved = color.red,
 	colorAdded = color.green,
+	colorCharsRemoved = color.bgRed,
+	colorCharsAdded = color.bgGreen,
 	prefix,
 	onUnchanged,
 	intro,
@@ -85,7 +121,7 @@ const formatDiff = ({
 			// show collapsed
 			if (!expand && change.count !== undefined && change.count > maxUnchanged) {
 				const prevLineOffset = lineOffset;
-				const ls = lines.get(change.value.trimEnd());
+				const ls = lines.get(trimSingleNewLine(change.value));
 
 				let shownLines = 0;
 
@@ -136,7 +172,7 @@ const formatDiff = ({
 
 			// show expanded
 
-			result += `${lines.join(lines.get(change.value.trimEnd()), {
+			result += `${lines.join(lines.get(trimSingleNewLine(change.value)), {
 				prefix: linePrefix,
 			})}\n`;
 			lineOffset += change.count ?? 0;
@@ -144,23 +180,40 @@ const formatDiff = ({
 			continue;
 		}
 
-		const colorChange = (change: Change) => {
+		const colorLineChange = (change: Change) => {
 			if (change.added) {
-				return colorAdded(change.value.trimEnd());
+				return colorAdded(trimSingleNewLine(change.value));
 			}
 
 			if (change.removed) {
-				return colorRemoved(change.value.trimEnd());
+				return colorRemoved(trimSingleNewLine(change.value));
 			}
 
 			return change.value;
 		};
 
-		if (change.removed && change.count === 1) {
+		const colorCharChange = (change: Change) => {
+			if (change.added) {
+				return colorCharsAdded(trimSingleNewLine(change.value));
+			}
+
+			if (change.removed) {
+				return colorCharsRemoved(trimSingleNewLine(change.value));
+			}
+
+			return change.value;
+		};
+
+		if (
+			change.removed &&
+			change.count === 1 &&
+			changes[i + 1]?.added &&
+			changes[i + 1]?.count === 1
+		) {
 			// single line change
 			const diffedChars = diffChars(change.value, changes[i + 1].value);
 
-			const sentence = diffedChars.map((chg) => colorChange(chg)).join('');
+			const sentence = diffedChars.map((chg) => colorCharChange(chg)).join('');
 
 			result += `${linePrefix(0)}${sentence}`;
 
@@ -168,12 +221,24 @@ const formatDiff = ({
 
 			i++;
 		} else {
-			result += `${lines.join(lines.get(colorChange(change)), {
-				prefix: linePrefix,
-			})}\n`;
+			if (isWhitespace(change.value)) {
+				// adds some spaces to make sure that you can see the change
+				result += `${lines.join(lines.get(colorCharChange(change)), {
+					prefix: (line) =>
+						`${linePrefix(line)}${colorCharChange({ removed: true, value: '   ', added: false })}`,
+				})}\n`;
+
+				if (!change.removed) {
+					lineOffset += change.count ?? 0;
+				}
+			} else {
+				result += `${lines.join(lines.get(colorLineChange(change)), {
+					prefix: linePrefix,
+				})}\n`;
 
-			if (!change.removed) {
-				lineOffset += change.count ?? 0;
+				if (!change.removed) {
+					lineOffset += change.count ?? 0;
+				}
 			}
 		}
 	}