fix processing Hex HTML entities #992

jcubic · Dec 13, 2024 · 7483c09 · 7483c09
1 parent 85aec29
commit 7483c09
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@
 * fix `terminal::login()` when user already authenticated [#980](https://github.com/jcubic/jquery.terminal/issues/980)
 * improve mobile support
 * ignore empty command in Pipe extension [#984](https://github.com/jcubic/jquery.terminal/issues/984)
+* fix processing Hex HTML entities [#992](https://github.com/jcubic/jquery.terminal/issues/992)
 
 ## 2.44.1
 ### Bugfix

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
 [![npm](https://img.shields.io/badge/npm-DEV-blue.svg)](https://www.npmjs.com/package/jquery.terminal)
 ![bower](https://img.shields.io/badge/bower-DEV-yellow.svg)
 [![Build and test](https://github.com/jcubic/jquery.terminal/actions/workflows/build.yaml/badge.svg?branch=devel&event=push)](https://github.com/jcubic/jquery.terminal/actions/workflows/build.yaml)
-[![Coverage Status](https://coveralls.io/repos/github/jcubic/jquery.terminal/badge.svg?branch=devel&26ea018b3abc2f72f4987018534fef0c)](https://coveralls.io/github/jcubic/jquery.terminal?branch=devel)
+[![Coverage Status](https://coveralls.io/repos/github/jcubic/jquery.terminal/badge.svg?branch=devel&e31addf398172b261ad412bde3188469)](https://coveralls.io/github/jcubic/jquery.terminal?branch=devel)
 ![NPM Downloads](https://img.shields.io/npm/dm/jquery.terminal.svg?style=flat)
 [![jsDelivr Downloads](https://data.jsdelivr.com/v1/package/npm/jquery.terminal/badge?style=rounded&n=1)](https://www.jsdelivr.com/package/npm/jquery.terminal)
 [![Paid Support](https://img.shields.io/badge/paid-support-354465.svg)](https://support.jcubic.pl/)

diff --git a/__tests__/terminal.spec.js b/__tests__/terminal.spec.js
@@ -882,6 +882,16 @@ describe('Terminal utils', function() {
             });
         });
     });
+    describe('$.terminal.length', function() {
+        it('shoud count html entitites', () => {
+            const input = '&#x25B2;&#x25BC;&#92;';
+            expect($.terminal.length(input)).toBe(3);
+        });
+        it('should count emoji', () => {
+            const input = '💩💩💩';
+            expect($.terminal.length(input)).toBe(3);
+        });
+    });
     describe('$.terminal.is_formatting', function() {
         it('should detect terminal formatting', function() {
             var formattings = [

diff --git a/css/emoji.css b/css/emoji.css
diff --git a/css/jquery.terminal.css b/css/jquery.terminal.css
@@ -12,7 +12,7 @@
  * Copyright (c) 2011-2024 Jakub T. Jankiewicz <https://jcubic.pl/me>
  * Released under the MIT license
  *
- * Date: Mon, 18 Nov 2024 23:03:38 +0000
+ * Date: Fri, 13 Dec 2024 15:03:29 +0000
  */
 .terminal .terminal-output .format, .cmd .format,
 .cmd-prompt, .cmd-prompt div {

diff --git a/css/jquery.terminal.min.css b/css/jquery.terminal.min.css
diff --git a/css/jquery.terminal.min.css.map b/css/jquery.terminal.min.css.map
diff --git a/js/jquery.terminal-src.js b/js/jquery.terminal-src.js
@@ -4801,8 +4801,13 @@
     };
     // -------------------------------------------------------------------------
     function render_entities(str) {
-        return str.replace(/&#(x?)([0-9]+);/g, function(_, hex, code) {
-            code = parseInt(code, hex ? 16 : 10);
+        return str.replace(/&#(?:x([0-9a-f]+)|([0-9]+));/gi, function(_, hex, dec) {
+            var code;
+            if (hex) {
+                code = parseInt(hex, 16);
+            } else {
+                code = parseInt(dec, 10);
+            }
             return String.fromCharCode(code);
         }).replace(/(&[^;]+;)/g, function(_, entity) {
             return entities[entity] || entity;

diff --git a/js/jquery.terminal.js b/js/jquery.terminal.js
@@ -41,7 +41,7 @@
  *
  * broken image by Sophia Bai from the Noun Project (CC-BY)
  *
- * Date: Mon, 09 Dec 2024 20:30:04 +0000
+ * Date: Fri, 13 Dec 2024 15:04:35 +0000
  */
 /* global define, Map, BigInt */
 /* eslint-disable */
@@ -4801,8 +4801,13 @@
     };
     // -------------------------------------------------------------------------
     function render_entities(str) {
-        return str.replace(/&#(x?)([0-9]+);/g, function(_, hex, code) {
-            code = parseInt(code, hex ? 16 : 10);
+        return str.replace(/&#(?:x([0-9a-f]+)|([0-9]+));/gi, function(_, hex, dec) {
+            var code;
+            if (hex) {
+                code = parseInt(hex, 16);
+            } else {
+                code = parseInt(dec, 10);
+            }
             return String.fromCharCode(code);
         }).replace(/(&[^;]+;)/g, function(_, entity) {
             return entities[entity] || entity;
@@ -5402,7 +5407,7 @@
     // -------------------------------------------------------------------------
     $.terminal = {
         version: 'DEV',
-        date: 'Mon, 09 Dec 2024 20:30:04 +0000',
+        date: 'Fri, 13 Dec 2024 15:04:35 +0000',
         // colors from https://www.w3.org/wiki/CSS/Properties/color/keywords
         color_names: [
             'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',

diff --git a/js/jquery.terminal.min.js b/js/jquery.terminal.min.js
diff --git a/js/jquery.terminal.min.js.map b/js/jquery.terminal.min.js.map