feat: Added 141 X11 web colors, added test for background color

lisaychuang · Aug 2, 2018 · e8a3c02 · e8a3c02
1 parent 86b47a5
commit e8a3c02
Show file tree

Hide file tree

Showing 6 changed files with 192 additions and 11 deletions.
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
diff --git a/src/color.ts b/src/color.ts
diff --git a/src/colors.ts b/src/colors.ts
@@ -0,0 +1,145 @@
+const X11_COLORS = [
+    'aliceBlue',
+    'antiqueWhite',
+    'aqua',
+    'aquamarine',
+    'azure',
+    'beige',
+    'bisque',
+    'black',
+    'blanchedAlmond',
+    'blue',
+    'blueViolet',
+    'brown',
+    'burlyWood',
+    'cadetBlue',
+    'chartreuse',
+    'chocolate',
+    'coral',
+    'cornflowerBlue',
+    'cornsilk',
+    'crimson',
+    'cyan',
+    'darkBlue',
+    'darkCyan',
+    'darkGoldenrod',
+    'darkGray',
+    'darkGreen',
+    'darkKhaki',
+    'darkMagenta',
+    'darkOliveGreen',
+    'darkOrange',
+    'darkOrchid',
+    'darkRed',
+    'darkSalmon',
+    'darkSeaGreen',
+    'darkSlateBlue',
+    'darkSlateGray',
+    'darkTurquoise',
+    'darkViolet',
+    'deepPink',
+    'deepSkyBlue',
+    'dimGray',
+    'dodgerBlue',
+    'fireBrick',
+    'floralWhite',
+    'forestGreen',
+    'fuchsia',
+    'gainsboro',
+    'ghostWhite',
+    'gold',
+    'goldenrod',
+    'gray',
+    'green',
+    'greenYellow',
+    'honeydew',
+    'hotPink',
+    'indianRed',
+    'indigo',
+    'ivory',
+    'khaki',
+    'lavender',
+    'lavenderBlush',
+    'lawnGreen',
+    'lemonChiffon',
+    'lightBlue',
+    'lightCoral',
+    'lightCyan',
+    'lightGoldenrodYellow',
+    'lightGray',
+    'lightGreen',
+    'lightPink',
+    'lightSalmon',
+    'lightSeaGreen',
+    'lightSkyBlue',
+    'lightSlateGray',
+    'lightSteelBlue',
+    'lightYellow',
+    'lime',
+    'limeGreen',
+    'linen',
+    'magenta',
+    'maroon',
+    'mediumAquamarine',
+    'mediumBlue',
+    'mediumOrchid',
+    'mediumPurple',
+    'mediumSeaGreen',
+    'mediumSlateBlue',
+    'mediumSpringGreen',
+    'mediumTurquoise',
+    'mediumVioletRed',
+    'midnightBlue',
+    'mintCream',
+    'mistyRose',
+    'moccasin',
+    'navajoWhite',
+    'navy',
+    'oldLace',
+    'olive',
+    'oliveDrab',
+    'orange',
+    'orangeRed',
+    'orchid',
+    'paleGoldenrod',
+    'paleGreen',
+    'paleTurquoise',
+    'paleVioletRed',
+    'papayaWhip',
+    'peachPuff',
+    'peru',
+    'pink',
+    'plum',
+    'powderBlue',
+    'purple',
+    'rebeccaPurple',
+    'red',
+    'rosyBrown',
+    'royalBlue',
+    'saddleBrown',
+    'salmon',
+    'sandyBrown',
+    'seaGreen',
+    'seashell',
+    'sienna',
+    'silver',
+    'skyBlue',
+    'slateBlue',
+    'slateGray',
+    'snow',
+    'springGreen',
+    'steelBlue',
+    'tan',
+    'teal',
+    'thistle',
+    'tomato',
+    'turquoise',
+    'violet',
+    'wheat',
+    'white',
+    'whiteSmoke',
+    'yellow',
+    'yellowGreen'
+];
+
+export default X11_COLORS;
diff --git a/src/index.ts b/src/index.ts
@@ -1,4 +1,4 @@
-import COLORS from './color';
+import COLOR_STYLES from './styles';
 
 // Log levels (lower number are more severe)
 const LVL_ERROR = 1;
@@ -27,7 +27,7 @@ export interface Printer {
 }
 
 export type ILoggerInstance = Printer & {
-  [K in keyof typeof COLORS]: ILoggerInstance
+  [K in keyof typeof COLOR_STYLES]: ILoggerInstance
 } & {
   txt(str: string): ILoggerInstance
 };
@@ -97,7 +97,7 @@ class Logger {
   }
 
   /**
-   * According to the styles in './color.ts', set up
+   * According to the COLOR_STYLES in './style.ts', set up
    * a property for each, kind of like
    * ```ts
    *   {
@@ -110,15 +110,15 @@ class Logger {
    */
   private setupStyles() {
     // Loop over each style name (i.e. "red")
-    for (let c in COLORS) {
+    for (let c in COLOR_STYLES) {
       // Make sure the property is on the instance, not the prototype
-      if (COLORS.hasOwnProperty(c)) {
+      if (COLOR_STYLES.hasOwnProperty(c)) {
         // Define a new property on this, of name c (i.e. "red")
         //  that is getter-based (instead of value based)
         const self = this;
         Object.defineProperty(this, c, {
           get() {
-            const cStyle = COLORS[c as keyof typeof COLORS]; // i.e. ('color: red;')
+            const cStyle = COLOR_STYLES[c as keyof typeof COLOR_STYLES]; // i.e. ('color: red;')
             self.stylesInProgress.push(cStyle);
             return this;
           }

diff --git a/src/styles.ts b/src/styles.ts
@@ -0,0 +1,20 @@
+import X11_COLORS from './colors';
+
+interface StyleObj { [k: string]: string; };
+
+const COLOR_STYLES: StyleObj = { };
+for (let c of X11_COLORS) {
+  // i.e. "Red"
+  COLOR_STYLES[c] = `color: ${c};`;
+  // i.e. "bgRed"
+  COLOR_STYLES[`bg${c[0].toUpperCase()}${c.substring(1)}`] = `background-color: ${c};`;
+}
+
+// const fontStyles: StyleObj = {
+//   bold: 'font-weight: 500;'
+// };
+
+export default {
+  ...COLOR_STYLES,
+  // ...fontStyles
+};
diff --git a/test/colors-test.ts b/test/colors-test.ts
@@ -24,6 +24,27 @@ QUnit.test('Logger in red works', assert => {
   );
 });
 
+QUnit.test('Logger in blue background works', assert => {
+    const printer = makeTestPrinter();
+    const logger = new Logger(4, printer);
+    assert.ok(logger.bgBlue instanceof Logger, 'logger.bgBlue is a logger');
+    assert.equal(
+      typeof logger.bgBlue.log,
+      'function',
+      'logger.bgBlue.log is a function'
+    );
+    logger.bgBlue.log('my background is blue');
+
+    logCountAssert(
+      {
+        message: 'after logging with blue background, we should see one log message',
+        assert,
+        printer
+      },
+      { e: 0, w: 0, l: 1, d: 0 }
+    );
+  });
+
 // logger.red().log('foo')
 
 // logger