upgrade and add colorScheme

Author: daleyjem

package.json

@@ -81,7 +81,7 @@
   },
   "dependencies": {
     "clipboardy": "^3.0.0",
-    "diff2html": "^3.4.19",
+    "diff2html": "^3.4.46",
     "node-fetch": "^3.3.2",
     "open": "^9.1.0",
     "yargs": "^17.6.0"

src/__tests__/main-tests.ts

@@ -50,6 +50,7 @@ describe('cli', () => {
         maxLineSizeInBlockForComparison: 200,
         outputFormat: 'line-by-line',
         renderNothingWhenEmpty: false,
+        colorScheme: 'auto',
       },
       {
         diffyType: undefined,

src/configuration.ts

@@ -34,6 +34,7 @@ export function parseArgv(argv: Argv): [Diff2HtmlConfig, Configuration] {
     renderNothingWhenEmpty: argv.renderNothingWhenEmpty,
     maxLineSizeInBlockForComparison: argv.maxLineSizeInBlockForComparison,
     maxLineLengthHighlight: argv.maxLineLengthHighlight,
+    colorScheme: argv.colorScheme,
   };
 
   const defaultPageTitle = 'Diff to HTML by rtfpessoa';

src/yargs.ts

@@ -1,4 +1,5 @@
 import yargs from 'yargs';
+import { ColorSchemeType } from 'diff2html/lib/types.js';
 
 import {
   StyleType,
@@ -35,6 +36,7 @@ export type Argv = {
   title?: string;
   ignore?: string[];
   extraArguments: string[];
+  colorScheme: ColorSchemeType;
 };
 
 const defaults: Argv = {
@@ -59,6 +61,7 @@ const defaults: Argv = {
   htmlWrapperTemplate: undefined,
   title: undefined,
   extraArguments: [],
+  colorScheme: ColorSchemeType.AUTO,
 };
 
 type ArgvChoices = {
@@ -70,6 +73,7 @@ type ArgvChoices = {
   input: ReadonlyArray<InputType>;
   output: ReadonlyArray<OutputType>;
   diffy: ReadonlyArray<DiffyType>;
+  colorScheme: ReadonlyArray<ColorSchemeType>;
 };
 
 const choices: ArgvChoices = {
@@ -81,6 +85,7 @@ const choices: ArgvChoices = {
   input: ['file', 'command', 'stdin'],
   output: ['preview', 'stdout'],
   diffy: ['browser', 'pbcopy', 'print'],
+  colorScheme: [ColorSchemeType.AUTO, ColorSchemeType.DARK, ColorSchemeType.LIGHT],
 };
 
 export async function setup(): Promise<Argv> {
@@ -229,6 +234,12 @@ export async function setup(): Promise<Argv> {
       type: 'array',
       default: defaults.ignore,
     })
+    .option('colorScheme', {
+      alias: 'cs',
+      describe: 'Color scheme of HTML output',
+      choices: choices.colorScheme,
+      default: defaults.colorScheme,
+    })
     .example(
       'diff2html -s line -f html -d word -i command -o preview -- -M HEAD~1',
       'diff last commit, line by line, word comparison between lines,' +

yarn.lock

@@ -2331,15 +2331,15 @@ diff-sequences@^29.4.3:
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.4.3.tgz#9314bc1fabe09267ffeca9cbafc457d8499a13f2"
   integrity sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==
 
-diff2html@^3.4.19:
-  version "3.4.35"
-  resolved "https://registry.yarnpkg.com/diff2html/-/diff2html-3.4.35.tgz#75b83c0a7edd8b9521db9bebf8c657cd57f52d3e"
-  integrity sha512-+pKs1BrA7l8DAwY33awHyznE3iuTIo58xmINmDBUwGsnou2KvBoSr6dAa6AvQAM7SH+nGtuOKNXmxumgbGp/Pw==
+diff2html@^3.4.46:
+  version "3.4.46"
+  resolved "https://registry.yarnpkg.com/diff2html/-/diff2html-3.4.46.tgz#55344db9c9315787944357621a93659e92fcf8d9"
+  integrity sha512-z1SkrH7jDLfmsOYgwJmGiDTdzsbpw7p4vx084kNzeYqER+/Kqp8+v/L7lMsIWpFzlX3NaJDJna280Y/HFqel+Q==
   dependencies:
     diff "5.1.0"
     hogan.js "3.0.2"
   optionalDependencies:
-    highlight.js "11.6.0"
+    highlight.js "11.8.0"
 
 diff@5.1.0:
   version "5.1.0"
@@ -3158,10 +3158,10 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
-highlight.js@11.6.0:
-  version "11.6.0"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-11.6.0.tgz#a50e9da05763f1bb0c1322c8f4f755242cff3f5a"
-  integrity sha512-ig1eqDzJaB0pqEvlPVIpSSyMaO92bH1N2rJpLMN/nX396wTpDA4Eq0uK+7I/2XG17pFaaKE0kjV/XPeGt7Evjw==
+highlight.js@11.8.0:
+  version "11.8.0"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-11.8.0.tgz#966518ea83257bae2e7c9a48596231856555bb65"
+  integrity sha512-MedQhoqVdr0U6SSnWPzfiadUcDHfN/Wzq25AkXiQv9oiOO/sG0S7XkvpFIqWBl9Yq1UYyYOOVORs5UW2XlPyzg==
 
 hogan.js@3.0.2:
   version "3.0.2"