Introduce theme to use colors/safe

bcaudan · Sep 20, 2020 · 99112ba · 99112ba
1 parent cfa2cef
commit 99112ba
Show file tree

Hide file tree

Showing 13 changed files with 93 additions and 54 deletions.
diff --git a/docs/customize-output.md b/docs/customize-output.md
@@ -41,7 +41,7 @@ For our example:
 ```node
 var DisplayProcessor = require('jasmine-spec-reporter').DisplayProcessor;
 
-function TimeProcessor(configuration) {
+function TimeProcessor(configuration, theme) {
 }
 
 function getTime() {

diff --git a/spec/helpers/test-processor.ts b/spec/helpers/test-processor.ts
@@ -1,11 +1,12 @@
 import {Configuration} from "../../built/configuration";
 import {DisplayProcessor} from "../../built/main";
+import {Theme} from "../../src/theme";
 
 export class TestProcessor extends DisplayProcessor {
     private test: string;
 
-    constructor(configuration: Configuration) {
-        super(configuration);
+    constructor(configuration: Configuration, theme: Theme) {
+        super(configuration, theme);
         this.test = configuration.customOptions.test;
     }
 

diff --git a/src/configuration-parser.ts b/src/configuration-parser.ts
@@ -71,7 +71,7 @@ function merge(template: any, override: any): Configuration {
             && Object.keys(override).indexOf(key) !== -1) {
             result[key] = override[key];
             if (key === "displayStacktrace" && typeof override[key] === "boolean") {
-                console.warn("WARN: jasmine-spec-reporter 'displayStacktrace' option supports value ('none', 'raw', 'pretty'), default to 'none'\n".yellow);
+                console.warn("WARN: jasmine-spec-reporter 'displayStacktrace' option supports value ('none', 'raw', 'pretty'), default to 'none'\n");
                 result[key] = StacktraceOption.NONE;
             }
         } else {

diff --git a/src/display-processor.ts b/src/display-processor.ts
@@ -1,12 +1,15 @@
 import {Configuration} from "./configuration";
 import {CustomReporterResult} from "./spec-reporter";
+import {Theme} from "./theme";
 import SuiteInfo = jasmine.SuiteInfo;
 
 export class DisplayProcessor {
     protected configuration: Configuration;
+    protected theme: Theme;
 
-    constructor(configuration: Configuration) {
+    constructor(configuration: Configuration, theme: Theme) {
         this.configuration = configuration;
+        this.theme = theme;
     }
 
     public displayJasmineStarted(info: SuiteInfo, log: string): string {

diff --git a/src/display/colors-display.ts b/src/display/colors-display.ts
diff --git a/src/display/colors-theme.ts b/src/display/colors-theme.ts
diff --git a/src/display/execution-display.ts b/src/display/execution-display.ts
@@ -1,7 +1,6 @@
 import {Configuration} from "../configuration";
 import {DisplayProcessor} from "../display-processor";
 import {CustomReporterResult, ExecutedSpecs} from "../spec-reporter";
-import * as ColorsDisplay from "./colors-display";
 import {Logger} from "./logger";
 
 import SuiteInfo = jasmine.SuiteInfo;
@@ -23,7 +22,6 @@ export class ExecutionDisplay {
 
     constructor(private configuration: Configuration, private logger: Logger, private specs: ExecutedSpecs,
                 displayProcessors: DisplayProcessor[]) {
-        ColorsDisplay.init(this.configuration);
         this.hasCustomDisplaySpecStarted = ExecutionDisplay.hasCustomDisplaySpecStarted(displayProcessors);
     }
 

diff --git a/src/display/summary-display.ts b/src/display/summary-display.ts
@@ -2,10 +2,11 @@ import {Configuration} from "../configuration";
 import {DisplayProcessor} from "../display-processor";
 import {ExecutionMetrics} from "../execution-metrics";
 import {CustomReporterResult, ExecutedSpecs} from "../spec-reporter";
+import {Theme} from "../theme";
 import {Logger} from "./logger";
 
 export class SummaryDisplay {
-    constructor(private logger: Logger, private configuration: Configuration, private specs: ExecutedSpecs) {
+    constructor(private configuration: Configuration, private theme: Theme, private logger: Logger, private specs: ExecutedSpecs) {
     }
 
     public display(metrics: ExecutionMetrics) {
@@ -14,7 +15,7 @@ export class SummaryDisplay {
         let status = "";
         if (metrics.failedSpecs === 0 && metrics.globalErrors.length === 0) {
             status = (metrics.totalSpecsDefined === metrics.executedSpecs) ?
-                " SUCCESS".successful : " INCOMPLETE".pending;
+                this.theme.successful(" SUCCESS") : this.theme.pending(" INCOMPLETE");
         }
         const failed = (metrics.failedSpecs > 0) ? ` (${metrics.failedSpecs} FAILED)` : "";
         const pending = (metrics.pendingSpecs > 0) ? ` (${metrics.pendingSpecs} PENDING)` : "";
@@ -37,8 +38,8 @@ export class SummaryDisplay {
         if (this.configuration.summary.displayPending && metrics.pendingSpecs > 0) {
             this.pendingsSummary();
         }
-        this.logger.log(execution + status + errors.failed + failed.failed
-            + pending.pending + skipped.pending + duration + ".");
+        this.logger.log(execution + status + this.theme.failed(errors) + this.theme.failed(failed)
+            + this.theme.pending(pending) + this.theme.pending(skipped) + duration + ".");
 
         if (metrics.random) {
             this.logger.log(`Randomized with seed ${metrics.seed}.`);
@@ -106,7 +107,7 @@ export class SummaryDisplay {
         this.logger.log(`${index}) ${spec.fullName}`);
         this.logger.increaseIndent();
         const pendingReason = spec.pendingReason ? spec.pendingReason : "No reason given";
-        this.logger.log(pendingReason.pending);
+        this.logger.log(this.theme.pending(pendingReason));
         this.logger.resetIndent();
     }
 

diff --git a/src/processors/default-processor.ts b/src/processors/default-processor.ts
@@ -38,7 +38,7 @@ export class DefaultProcessor extends DisplayProcessor {
     private displayErrorMessages(spec: CustomReporterResult, stacktraceOption: StacktraceOption): string {
         const logs: string[] = [];
         for (const failedExpectation of spec.failedExpectations) {
-            logs.push("- ".failed + failedExpectation.message.failed);
+            logs.push(this.theme.failed("- ") + this.theme.failed(failedExpectation.message));
             if (stacktraceOption === StacktraceOption.RAW && failedExpectation.stack) {
                 logs.push(this.configuration.stacktrace.filter(failedExpectation.stack));
             }

diff --git a/src/processors/pretty-stacktrace-processor.ts b/src/processors/pretty-stacktrace-processor.ts
@@ -19,7 +19,7 @@ export class PrettyStacktraceProcessor extends DisplayProcessor {
     private displayErrorMessages(spec: CustomReporterResult) {
         const logs: string[] = [];
         for (const failedExpectation of spec.failedExpectations) {
-            logs.push("- ".failed + failedExpectation.message.failed);
+            logs.push(this.theme.failed("- ") + this.theme.failed(failedExpectation.message));
             if (failedExpectation.stack) {
                 logs.push(this.prettifyStack(failedExpectation.stack));
             }
@@ -40,7 +40,7 @@ export class PrettyStacktraceProcessor extends DisplayProcessor {
                     parseInt(columnNumber, 10)
                 );
 
-                logs.push(`${filename.prettyStacktraceFilename}:${lineNumber.prettyStacktraceLineNumber}:${columnNumber.prettyStacktraceColumnNumber}`);
+                logs.push(`${this.theme.prettyStacktraceFilename(filename)}:${this.theme.prettyStacktraceLineNumber(lineNumber)}:${this.theme.prettyStacktraceColumnNumber(columnNumber)}`);
                 logs.push(`${errorContext}\n`);
             }
         });
@@ -63,7 +63,7 @@ export class PrettyStacktraceProcessor extends DisplayProcessor {
                 logs.push(fileLines[i]);
             }
             if (i === errorLine) {
-                logs.push(" ".repeat(columnNb - 1) + "~".red);
+                logs.push(" ".repeat(columnNb - 1) + this.theme.prettyStacktraceError("~"));
             }
         }
         return logs.join("\n");

diff --git a/src/processors/spec-colors-processor.ts b/src/processors/spec-colors-processor.ts
@@ -3,14 +3,14 @@ import {CustomReporterResult} from "../spec-reporter";
 
 export class SpecColorsProcessor extends DisplayProcessor {
     public displaySuccessfulSpec(spec: CustomReporterResult, log: string): string {
-        return log.successful;
+        return this.theme.successful(log);
     }
 
     public displayFailedSpec(spec: CustomReporterResult, log: string): string {
-        return log.failed;
+        return this.theme.failed(log);
     }
 
     public displayPendingSpec(spec: CustomReporterResult, log: string): string {
-        return log.pending;
+        return this.theme.pending(log);
     }
 }
diff --git a/src/spec-reporter.ts b/src/spec-reporter.ts
@@ -11,6 +11,7 @@ import {SpecColorsProcessor} from "./processors/spec-colors-processor";
 import {SpecDurationsProcessor} from "./processors/spec-durations-processor";
 import {SpecPrefixesProcessor} from "./processors/spec-prefixes-processor";
 import {SuiteNumberingProcessor} from "./processors/suite-numbering-processor";
+import {Theme} from "./theme";
 
 import CustomReporter = jasmine.CustomReporter;
 import SuiteInfo = jasmine.SuiteInfo;
@@ -27,25 +28,25 @@ export interface ExecutedSpecs {
 }
 
 export class SpecReporter implements CustomReporter {
-    private static initProcessors(configuration: Configuration): DisplayProcessor[] {
+    private static initProcessors(configuration: Configuration, theme: Theme): DisplayProcessor[] {
         const displayProcessors: DisplayProcessor[] = [
-            new DefaultProcessor(configuration),
-            new SpecPrefixesProcessor(configuration),
-            new SpecColorsProcessor(configuration),
-            new PrettyStacktraceProcessor(configuration)
+            new DefaultProcessor(configuration, theme),
+            new SpecPrefixesProcessor(configuration, theme),
+            new SpecColorsProcessor(configuration, theme),
+            new PrettyStacktraceProcessor(configuration, theme)
         ];
 
         if (configuration.spec.displayDuration) {
-            displayProcessors.push(new SpecDurationsProcessor(configuration));
+            displayProcessors.push(new SpecDurationsProcessor(configuration, theme));
         }
 
         if (configuration.suite.displayNumber) {
-            displayProcessors.push(new SuiteNumberingProcessor(configuration));
+            displayProcessors.push(new SuiteNumberingProcessor(configuration, theme));
         }
 
         if (configuration.customProcessors) {
             configuration.customProcessors.forEach((Processor: typeof DisplayProcessor) => {
-                displayProcessors.push(new Processor(configuration));
+                displayProcessors.push(new Processor(configuration, theme));
             });
         }
 
@@ -62,14 +63,16 @@ export class SpecReporter implements CustomReporter {
     private summary: SummaryDisplay;
     private metrics: ExecutionMetrics;
     private configuration: Configuration;
+    private theme: Theme;
 
     constructor(configuration?: Configuration) {
         this.configuration = ConfigurationParser.parse(configuration);
-        const displayProcessors = SpecReporter.initProcessors(this.configuration);
+        this.theme = new Theme(this.configuration);
+        const displayProcessors = SpecReporter.initProcessors(this.configuration, this.theme);
         const print = this.configuration.print;
         this.logger = new Logger(displayProcessors, print);
         this.display = new ExecutionDisplay(this.configuration, this.logger, this.specs, displayProcessors);
-        this.summary = new SummaryDisplay(this.logger, this.configuration, this.specs);
+        this.summary = new SummaryDisplay(this.configuration, this.theme, this.logger, this.specs);
         this.metrics = new ExecutionMetrics();
     }
 

diff --git a/src/theme.ts b/src/theme.ts
@@ -0,0 +1,58 @@
+// tslint:disable-next-line:no-submodule-imports
+import * as colors from "colors/safe";
+import {Configuration} from "./configuration";
+
+interface ColorsTheme {
+    successful(str: string): string;
+    failed(str: string): string;
+    pending(str: string): string;
+    prettyStacktraceFilename(str: string): string;
+    prettyStacktraceLineNumber(str: string): string;
+    prettyStacktraceColumnNumber(str: string): string;
+    prettyStacktraceError(str: string): string;
+}
+
+const colorsTheme = colors as unknown as ColorsTheme;
+
+export class Theme {
+    constructor(configuration: Configuration) {
+        configuration.colors.enabled ? colors.enable() : colors.disable();
+        colors.setTheme({
+            failed: configuration.colors.failed,
+            pending: configuration.colors.pending,
+            successful: configuration.colors.successful,
+            prettyStacktraceFilename: configuration.colors.prettyStacktraceFilename,
+            prettyStacktraceLineNumber: configuration.colors.prettyStacktraceLineNumber,
+            prettyStacktraceColumnNumber: configuration.colors.prettyStacktraceColumnNumber,
+            prettyStacktraceError: configuration.colors.prettyStacktraceError,
+        });
+    }
+
+    successful(str: string) {
+        return colorsTheme.successful(str);
+    }
+
+    failed(str: string) {
+        return colorsTheme.failed(str);
+    }
+
+    pending(str: string) {
+        return colorsTheme.pending(str);
+    }
+
+    prettyStacktraceFilename(str: string) {
+        return colorsTheme.prettyStacktraceFilename(str);
+    }
+
+    prettyStacktraceLineNumber(str: string) {
+        return colorsTheme.prettyStacktraceLineNumber(str);
+    }
+
+    prettyStacktraceColumnNumber(str: string) {
+        return colorsTheme.prettyStacktraceColumnNumber(str);
+    }
+
+    prettyStacktraceError(str: string) {
+        return colorsTheme.prettyStacktraceError(str);
+    }
+}