diff --git a/ansi_up.js b/ansi_up.js index ad199ee..15ad36b 100644 --- a/ansi_up.js +++ b/ansi_up.js @@ -15,7 +15,7 @@ var PacketKind; })(PacketKind || (PacketKind = {})); export class AnsiUp { constructor() { - this.VERSION = "6.0.0"; + this.VERSION = "6.0.1"; this.setup_palettes(); this._use_classes = false; this.bold = false; @@ -299,6 +299,7 @@ export class AnsiUp { } else if (num === 22) { this.faint = false; + this.bold = false; } else if (num === 23) { this.italic = false; diff --git a/ansi_up.ts b/ansi_up.ts index ffc2cfe..812e01d 100644 --- a/ansi_up.ts +++ b/ansi_up.ts @@ -53,7 +53,7 @@ interface TextPacket { export class AnsiUp { - VERSION = "6.0.0"; + VERSION = "6.0.1"; // // *** SEE README ON GITHUB FOR PUBLIC API *** @@ -626,7 +626,7 @@ export class AnsiUp } else if (num === 3) { this.italic = true; } else if (num === 4) { this.underline = true; } else if (num === 21) { this.bold = false; - } else if (num === 22) { this.faint = false; + } else if (num === 22) { this.faint = false; this.bold = false; } else if (num === 23) { this.italic = false; } else if (num === 24) { this.underline = false; diff --git a/package-lock.json b/package-lock.json index 3a3c078..e7cd49d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ansi_up", - "version": "6.0.0", + "version": "6.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "ansi_up", - "version": "6.0.0", + "version": "6.0.1", "license": "MIT", "devDependencies": { "mocha": "^10.2.0", @@ -329,9 +329,9 @@ "dev": true }, "node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, "hasInstallScript": true, "optional": true, @@ -3997,9 +3997,9 @@ } }, "node_modules/typescript": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", - "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", "dev": true, "bin": { "tsc": "bin/tsc", diff --git a/package.json b/package.json index 2290dba..12fab8a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ansi_up", - "version": "6.0.0", + "version": "6.0.1", "description": "Convert ansi sequences in strings to colorful HTML", "keywords": [ "ansi", diff --git a/test/ansi_up-test.js b/test/ansi_up-test.js index f2fe7a0..662e50a 100644 --- a/test/ansi_up-test.js +++ b/test/ansi_up-test.js @@ -285,6 +285,55 @@ describe('ansi_up', function () { l.should.eql(expected); }); + it('should reset a bold attr to html', function () { + var attr = 1; + var fg = 32; + var start = "\x1B[" + attr + ";" + fg + ";21m " + attr + ";" + fg + " \x1B[0m"; + + var expected = " " + attr + ";" + fg + " "; + + var au = new AnsiUp(); + var l = au.ansi_to_html(start); + l.should.eql(expected); + }); + + it('should reset a faint attr to html', function () { + var attr = 2; + var fg = 32; + var start = "\x1B[" + attr + ";" + fg + ";22m " + attr + ";" + fg + " \x1B[0m"; + + var expected = " " + attr + ";" + fg + " "; + + var au = new AnsiUp(); + var l = au.ansi_to_html(start); + l.should.eql(expected); + }); + + it('should reset a bold and faint attr to just faint html', function () { + var attr = "1;2"; + var fg = 32; + var start = "\x1B[" + attr + ";" + fg + ";21m " + attr + ";" + fg + " \x1B[0m"; + + var expected = " " + attr + ";" + fg + " "; + + var au = new AnsiUp(); + var l = au.ansi_to_html(start); + l.should.eql(expected); + }); + + it('should reset a bold and faint attr to just html', function () { + var attr = "1;2"; + var fg = 32; + var start = "\x1B[" + attr + ";" + fg + ";22m " + attr + ";" + fg + " \x1B[0m"; + + var expected = " " + attr + ";" + fg + " "; + + var au = new AnsiUp(); + var l = au.ansi_to_html(start); + l.should.eql(expected); + }); + + it('should transform an italic attr;foreground to html', function () { var attr = 3; var fg = 32;