@vitest/expect 2.0.1 → 2.0.2

package/dist/index.d.ts

@@ -1,17 +1,15 @@
-import * as _vitest_utils from '@vitest/utils';
+import * as tinyrainbow from 'tinyrainbow';
+import { Formatter } from 'tinyrainbow';
 import { stringify, Constructable } from '@vitest/utils';
-export { setupColors } from '@vitest/utils';
 import { diff } from '@vitest/utils/diff';
 export { DiffOptions } from '@vitest/utils/diff';
 
-type Formatter = (input: string | number | null | undefined) => string;
-
 declare function getMatcherUtils(): {
-    EXPECTED_COLOR: _vitest_utils.ColorMethod;
-    RECEIVED_COLOR: _vitest_utils.ColorMethod;
-    INVERTED_COLOR: _vitest_utils.ColorMethod;
-    BOLD_WEIGHT: _vitest_utils.ColorMethod;
-    DIM_COLOR: _vitest_utils.ColorMethod;
+    EXPECTED_COLOR: tinyrainbow.Formatter;
+    RECEIVED_COLOR: tinyrainbow.Formatter;
+    INVERTED_COLOR: tinyrainbow.Formatter;
+    BOLD_WEIGHT: tinyrainbow.Formatter;
+    DIM_COLOR: tinyrainbow.Formatter;
     matcherHint: (matcherName: string, received?: string, expected?: string, options?: MatcherHintOptions) => string;
     printReceived: (object: unknown) => string;
     printExpected: (value: unknown) => string;

package/dist/index.js

@@ -1,5 +1,5 @@
-import { getType, getColors, stringify, isObject, assertTypes } from '@vitest/utils';
-export { setupColors } from '@vitest/utils';
+import { getType, stringify, isObject, assertTypes } from '@vitest/utils';
+import c from 'tinyrainbow';
 import { diff } from '@vitest/utils/diff';
 import { isMockFunction } from '@vitest/spy';
 import { processError } from '@vitest/utils/error';
@@ -43,12 +43,11 @@ function setState(state, expect) {
 }
 
 function getMatcherUtils() {
-  const c = () => getColors();
-  const EXPECTED_COLOR = c().green;
-  const RECEIVED_COLOR = c().red;
-  const INVERTED_COLOR = c().inverse;
-  const BOLD_WEIGHT = c().bold;
-  const DIM_COLOR = c().dim;
+  const EXPECTED_COLOR = c.green;
+  const RECEIVED_COLOR = c.red;
+  const INVERTED_COLOR = c.inverse;
+  const BOLD_WEIGHT = c.bold;
+  const DIM_COLOR = c.dim;
   function matcherHint(matcherName, received = "received", expected = "expected", options = {}) {
     const {
       comment = "",
@@ -929,7 +928,6 @@ function wrapSoft(utils, fn) {
 
 const JestChaiExpect = (chai, utils) => {
   const { AssertionError } = chai;
-  const c = () => getColors();
   const customTesters = getCustomEqualityTesters();
   function def(name, fn) {
     const addMethod = (n) => {
@@ -1337,13 +1335,13 @@ const JestChaiExpect = (chai, utils) => {
   };
   const formatCalls = (spy, msg, showActualCall) => {
     if (spy.mock.calls) {
-      msg += c().gray(
+      msg += c.gray(
         `
 
 Received: 
 
 ${spy.mock.calls.map((callArg, i) => {
-          let methodCall = c().bold(
+          let methodCall = c.bold(
             `  ${ordinalOf(i + 1)} ${spy.getMockName()} call:
 
 `
@@ -1360,22 +1358,22 @@ ${spy.mock.calls.map((callArg, i) => {
         }).join("\n")}`
       );
     }
-    msg += c().gray(
+    msg += c.gray(
       `
 
-Number of calls: ${c().bold(spy.mock.calls.length)}
+Number of calls: ${c.bold(spy.mock.calls.length)}
 `
     );
     return msg;
   };
   const formatReturns = (spy, results, msg, showActualReturn) => {
-    msg += c().gray(
+    msg += c.gray(
       `
 
 Received: 
 
 ${results.map((callReturn, i) => {
-        let methodCall = c().bold(
+        let methodCall = c.bold(
           `  ${ordinalOf(i + 1)} ${spy.getMockName()} call return:
 
 `
@@ -1391,10 +1389,10 @@ ${results.map((callReturn, i) => {
         return methodCall;
       }).join("\n")}`
     );
-    msg += c().gray(
+    msg += c.gray(
       `
 
-Number of calls: ${c().bold(spy.mock.calls.length)}
+Number of calls: ${c.bold(spy.mock.calls.length)}
 `
     );
     return msg;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/expect",
   "type": "module",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Jest's expect matchers as a Chai plugin",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -31,14 +31,14 @@
   ],
   "dependencies": {
     "chai": "^5.1.1",
-    "@vitest/spy": "2.0.1",
-    "@vitest/utils": "2.0.1"
+    "tinyrainbow": "^1.2.0",
+    "@vitest/spy": "2.0.2",
+    "@vitest/utils": "2.0.2"
   },
   "devDependencies": {
     "@types/chai": "4.3.6",
-    "picocolors": "^1.0.1",
     "rollup-plugin-copy": "^3.5.0",
-    "@vitest/runner": "2.0.1"
+    "@vitest/runner": "2.0.2"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",