Merge pull request #56 from rtfpessoa/fix-diff-by-char

fix: Bring back diff by char

Author: rtfpessoa

package.json

@@ -53,13 +53,12 @@
   "main": "./build/main.js",
   "dependencies": {
     "clipboardy": "^2.1.0",
-    "diff2html": "^2.11.2",
+    "diff2html": "^2.12.1",
     "open": "^6.4.0",
     "request": "^2.88.0",
     "yargs": "^14.0.0"
   },
   "devDependencies": {
-    "@types/diff2html": "0.0.5",
     "@types/jest": "24.0.18",
     "@types/node": "^12.7.2",
     "@types/request": "2.48.2",

src/configuration.ts

@@ -8,6 +8,7 @@ export function parseArgv(argv: Argv): [Diff2Html.Options, Configuration] {
     inputFormat: "diff",
     outputFormat: argv.style === "side" ? "side-by-side" : "line-by-line",
     showFiles: argv.summary !== "hidden",
+    diffStyle: argv.diffStyle,
     matching: argv.matching,
     matchWordsThreshold: argv.matchWordsThreshold,
     matchingMaxComparisons: argv.matchingMaxComparisons

src/types.ts

@@ -1,5 +1,6 @@
 export type StyleType = "line" | "side";
 export type SummaryType = "closed" | "open" | "hidden";
+export type DiffStyleType = "word" | "char";
 export type LineMatchingType = "lines" | "words" | "none";
 export type FormatType = "html" | "json";
 export type InputType = "file" | "command" | "stdin";

src/yargs.ts

@@ -1,11 +1,21 @@
 import * as yargs from "yargs";
 
-import { StyleType, SummaryType, LineMatchingType, FormatType, InputType, OutputType, DiffyType } from "./types";
+import {
+  StyleType,
+  SummaryType,
+  LineMatchingType,
+  FormatType,
+  InputType,
+  OutputType,
+  DiffyType,
+  DiffStyleType
+} from "./types";
 
 export type Argv = {
   style: StyleType;
   synchronisedScroll: boolean;
   highlightCode: boolean;
+  diffStyle: DiffStyleType;
   summary: SummaryType;
   matching: LineMatchingType;
   matchWordsThreshold: number;
@@ -25,6 +35,7 @@ export function setup(): Argv {
 
   const styleChoices: StyleType[] = ["line", "side"];
   const summaryChoices: SummaryType[] = ["closed", "open", "hidden"];
+  const diffStyleChoices: DiffStyleType[] = ["word", "char"];
   const matchingChoices: LineMatchingType[] = ["lines", "words", "none"];
   const formatChoices: FormatType[] = ["html", "json"];
   const inputChoices: InputType[] = ["file", "command", "stdin"];
@@ -68,6 +79,16 @@ export function setup(): Argv {
         default: "closed"
       }
     })
+    .options({
+      diff: {
+        alias: "d",
+        describe: "Diff style",
+        nargs: 1,
+        type: "string",
+        choices: diffStyleChoices,
+        default: "word"
+      }
+    })
     .options({
       matching: {
         alias: "lm",
@@ -184,6 +205,7 @@ export function setup(): Argv {
     ...argv,
     style: argv.style as StyleType,
     summary: argv.summary as SummaryType,
+    diffStyle: argv.diffStyle as DiffStyleType,
     matching: argv.matching as LineMatchingType,
     format: argv.format as FormatType,
     input: argv.input as InputType,