irc-colors - npm Package Compare versions

Comparing version 1.4.2 to 1.4.3

lib/irc-colors.js

@@ -1,3 +0,1 @@
-'use strict';
-
 const colors = {
@@ -38,2 +36,4 @@ '00': ['white'],
 const zero = styles.bold + styles.bold;
+const badStr = /^,\d/;
+const colorCodeStr = new RegExp(`^${c}\\d\\d`);
 
@@ -47,11 +47,16 @@ const allColors = {
   // Foreground.
-  var fg = str => c + code + zero + str + c;
+  // If the string begins with /,\d/,
+  // it can undersirably apply a background color.
+  let fg = str => c + code + (badStr.test(str) ? zero : '') + str + c;
 
   // Background.
-  var bg = (str) => {
-    var pos = str.indexOf(c);
-    if (pos !== 0) {
+  let bg = (str) => {
+    // If the string begins with a foreground color already applied,
+    // use it to save string space.
+    if (colorCodeStr.test(str)) {
+      let str2 = str.substr(3);
+      return str.substr(0, 3) + ',' + code +
+        (str2.indexOf(zero) === 0 ? str2.substr(zero.length) : str2);
+    } else {
       return c + '01,' + code + str + c;
-    } else {
-      return (str.substr(pos, 3)) + ',' + code + (str.substr(5));
     }
@@ -70,3 +75,3 @@ };
 Object.keys(styles).forEach((style) => {
-  var code = styles[style];
+  let code = styles[style];
   exports[style] = str => code + str + code;
@@ -78,8 +83,8 @@ });
   rainbow: (str, colorArr) => {
-    var rainbow = [
+    let rainbow = [
       'red', 'olive', 'yellow', 'green', 'blue', 'navy', 'violet'
     ];
     colorArr = colorArr || rainbow;
-    var l = colorArr.length;
-    var i = 0;
+    let l = colorArr.length;
+    let i = 0;
 
@@ -103,3 +108,3 @@ return str
   stripStyle: (str) => {
-    var path = [];
+    let path = [];
     for (let i = 0, len = str.length; i < len; i++) {
@@ -127,4 +132,3 @@ let char = str[i];
     // Traverse list backwards to make removing less complicated.
-    for (let i = path.length - 1; i >= 0; i--) {
-      let char = path[i];
+    for (let char of path.reverse()) {
       if (char[0] !== c) {
@@ -154,3 +158,3 @@ let pos = char[1];
         get: () => {
-          var f = str => exports[color](fn(str));
+          let f = str => exports[color](fn(str));
           addGetters(f, [].concat(types, type));
@@ -173,3 +177,3 @@ return f;
 exports.global = () => {
-  var str, irc = {};
+  let str, irc = {};
 
@@ -181,5 +185,5 @@ String.prototype.__defineGetter__('irc', function() {
 
-  for (var type in allColors) {
+  for (let type in allColors) {
     allColors[type].forEach((color) => {
-      var fn = () => exports[color](str);
+      let fn = () => exports[color](str);
       addGetters(fn, [type]);
@@ -186,0 +190,0 @@ irc[color] = fn;

package.json

@@ -9,3 +9,3 @@ {
   ],
-  "version": "1.4.2",
+  "version": "1.4.3",
   "repository": {
@@ -12,0 +12,0 @@ "type": "git",

No alert changes

Improved metrics

Total package byte prevSize

8471

increased by3.72%

Lines of code

160

increased by3.23%

No dependency changes