Upgrade

Author: grigorii-horos

bin/html.js

@@ -1,19 +1,19 @@
 #!/usr/bin/env node
 
-import fs, { createReadStream } from "node:fs";
+import fs, { createReadStream } from 'node:fs';
 
 import concat from 'concat-stream';
-import envPaths from "env-paths";
-import { parse } from "yaml";
+import envPaths from 'env-paths';
+import { parse } from 'yaml';
 
 import cliHtml from '../index.js';
 
-const paths = envPaths("cli-html", {
-  suffix: "",
+const paths = envPaths('cli-html', {
+  suffix: '',
 });
-let fileContent = "";
+let fileContent = '';
 try {
-  fileContent = fs.readFileSync(`${paths.config}/theme.yml`, "utf8");
+  fileContent = fs.readFileSync(`${paths.config}/theme.yml`, 'utf8');
 } catch {}
 
 const theme = parse(fileContent) || {};

examples/defs.html

@@ -0,0 +1,7 @@
+<dl>
+  <dt>Coffee</dt>
+  <dd>Black hot drink</dd>
+  <dt>Milk</dt>
+  <dd>White cold drink</dd>
+</dl>
+

lib/tag-helpers/text-node.js

@@ -12,7 +12,7 @@ export const textNode = (tag, context) => {
     };
   }
 
-  const normalized = [...normalizeWhitespace(tag.value).replaceAll('\n', ' ')];
+  const normalized = [...(normalizeWhitespace(tag.value) || '').replaceAll('\n', ' ')];
 
   const pre = [' ', '\n'].includes(normalized[0]) ? normalized.shift() : null;
   const post = [' ', '\n'].includes(normalized.at(-1)) ? normalized.pop() : null;

lib/tags/blockquote.js

@@ -6,8 +6,7 @@ import { indentify } from '../utils.js';
 
 export const blockquote = (tag, context) => blockTag(
   compose(
-    (value, tag) => indentify(context.theme.blockquote('│ '))(value),
-    (value, tag) => value,
+    indentify(context.theme.blockquote('│ ')),
   ),
   { marginTop: 1, marginBottom: 1 },
 )(tag, { ...context, lineWidth: context.lineWidth - 2 });

lib/tags/definitions.js

@@ -4,11 +4,14 @@ import { blockTag } from '../tag-helpers/block-tag.js';
 import { indentify } from '../utils.js';
 
 export const dt = (tag, context) => blockTag(
-  compose((value) => context.theme.dt(value)),
+  context.theme.dt,
   { marginTop: 1, marginBottom: 1 },
 )(tag, { ...context, lineWidth: context.lineWidth - 1 });
 
-export const dd = (tag, context) => blockTag(indentify('  '), { marginTop: 1, marginBottom: 1 })(tag, {
+export const dd = (tag, context) => blockTag(compose(
+  context.theme.dd,
+  indentify('  '),
+), { marginTop: 1, marginBottom: 1 })(tag, {
   ...context,
   lineWidth: context.lineWidth - 3,
 });

lib/tags/inputs.js

@@ -4,7 +4,7 @@ import inlineTag from '../tag-helpers/inline-tag.js';
 import { getAttribute } from '../utils.js';
 
 const {
-  grey, red, bgBlack,
+  grey, red, green, bgBlack,
 } = chalk;
 
 export const button = inlineTag(
@@ -22,7 +22,7 @@ export const input = (tag) => {
     return {
       pre: null,
       value: `${grey('[')}${
-        getAttribute(tag, 'checked', ' ') === '' ? red.bold('✓') : red.bold(' ')
+        getAttribute(tag, 'checked', ' ') === '' ? green.bold('✓') : ' '
       }${grey(']')}`,
       post: null,
       type: 'inline',

lib/utils/get-theme.js

@@ -17,6 +17,7 @@ export const getTheme = (customTheme) => ({
   codeNumbers: (value) => style(customTheme.codeNumbers || 'blackBright dim', value),
 
   dt: (value) => style(customTheme.dt || 'blue bold', value),
+  dd: (value) => style(customTheme.dt || 'cyan', value),
   del: (value) => style(customTheme.del || 'bgRed black', value),
   ins: (value) => style(customTheme.ins || 'bgGreen black', value),
   italic: (value) => style(customTheme.italic || 'italic', value),

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cli-html",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "description": "Render HTML to Terminal",
   "main": "index.js",
   "type": "module",
@@ -35,39 +35,41 @@
     "ansi-escapes": "^6.2.0",
     "boxen": "^7.1.1",
     "chalk": "^5.3.0",
-    "chalk-string": "^2.0.0",
-    "change-case": "^4.1.2",
+    "chalk-string": "^3.0.0",
+    "change-case": "^5.3.0",
     "cli-highlight": "^2.1.11",
     "cli-table3": "^0.6.3",
     "color-namer": "^1.4.0",
     "compose-function": "^3.0.3",
     "concat-stream": "^2.0.0",
     "env-paths": "^3.0.0",
     "he": "^1.2.0",
-    "inline-style-parser": "^0.1.1",
+    "inline-style-parser": "^0.2.2",
     "languages-aliases": "^3.0.0",
     "longest-line": "0.0.3",
     "normalize-html-whitespace": "^1.0.0",
     "number-to-alphabet": "^1.0.0",
     "parse5": "^7.1.1",
     "romanize": "^1.1.1",
     "supports-hyperlinks": "^3.0.0",
-    "term-size": "^3.0.1",
-    "wrap-ansi": "^8.1.0",
-    "yaml": "^2.3.1"
+    "term-size": "^4.0.0",
+    "wrap-ansi": "^9.0.0",
+    "yaml": "^2.3.4"
   },
   "devDependencies": {
     "confusing-browser-globals": "^1.0.11",
-    "eslint": "^8.44.0",
+    "eslint": "^8.55.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-standard-jsdoc": "^9.3.0",
     "eslint-plugin-async-await": "0.0.0",
-    "eslint-plugin-jsdoc": "^46.4.3",
+    "eslint-plugin-jsdoc": "^46.9.0",
     "eslint-plugin-json": "^3.1.0",
     "eslint-plugin-no-loops": "^0.3.0",
     "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-perfectionist": "^2.5.0",
     "eslint-plugin-prefer-object-spread": "^1.2.1",
     "eslint-plugin-simple-import-sort": "^10.0.0",
-    "eslint-plugin-unicorn": "^47.0.0"
+    "eslint-plugin-unicorn": "^48.0.1",
+    "globals": "^13.23.0"
   }
 }