@granito/vitest-marbles 1.0.0-dev.5 → 1.0.0

package/README.md

@@ -4,7 +4,7 @@
 # Vitest Marbles
 
 A set of helper functions and [Vitest](http://vitest.dev/) matchers for
-[RxJs](https://rxjs.dev/)
+[RxJS](https://rxjs.dev/)
 [marble testing](https://rxjs.dev/guide/testing/marble-testing).
 This library will help you to test your reactive code in easy and
 clean way.
@@ -12,7 +12,7 @@ clean way.
 # Features
 
 * Typescript;
-* easy to read error messages for subscriptions.
+* easy to read error messages for subscription expectations.
 
 # Prerequisites
 

package/index.js

@@ -41,7 +41,7 @@ ${diff}`;
   toBeSubscriptions(actualSubs, expectedSubs) {
     const actual = marblize(actualSubs);
     const expected = marblize(expectedSubs);
-    const pass = subscriptionsPass(actual, expected);
+    const pass = sameSubscriptions(actual, expected);
     let message = "";
     if (!pass) {
       const diff = this.utils.diff(expected, actual, { expand: true });
@@ -62,10 +62,7 @@ ${diff}`;
     };
   },
   toHaveEmptySubscriptions(actual) {
-    const pass = !(actual && actual.length > 0);
-    let message = "";
-    if (!pass)
-      message = this.utils.matcherHint(".toHaveNoSubscriptions") + `
+    const message = this.utils.matcherHint(".toHaveNoSubscriptions") + `
 
 Expected observable to have no subscription points
 But got:
@@ -73,13 +70,13 @@ But got:
 
 `;
     return {
-      pass,
+      pass: false,
       message: () => message
     };
   }
 };
 expect.extend(internalMatchers);
-function subscriptionsPass(actualMarbleArray, expectedMarbleArray) {
+function sameSubscriptions(actualMarbleArray, expectedMarbleArray) {
   if (actualMarbleArray.length !== expectedMarbleArray.length)
     return false;
   for (const actualMarble of actualMarbleArray)
@@ -92,18 +89,20 @@ function subscriptionsPass(actualMarbleArray, expectedMarbleArray) {
 function assertDeepEqual(actual, expected) {
   if (!expected)
     return;
-  if (actualIsSubscriptionsAndExpectedIsEmpty(actual, expected))
-    expect(actual).toHaveEmptySubscriptions();
-  else if (expectedIsSubscriptionLogArray(actual, expected))
-    expect(actual).toBeSubscriptions(expected);
-  else
-    expect(actual).toBeNotifications(expected);
-}
-function actualIsSubscriptionsAndExpectedIsEmpty(actual, expected) {
-  return expected.length === 0 && actual.length !== 0 && actual[0].subscribedFrame !== void 0;
+  if (expected.length !== 0) {
+    if (isSubscriptions(expected))
+      expect(actual).toBeSubscriptions(expected);
+    else
+      expect(actual).toBeNotifications(expected);
+  } else if (actual.length !== 0) {
+    if (isSubscriptions(actual))
+      expect(actual).toHaveEmptySubscriptions();
+    else
+      expect(actual).toBeNotifications([]);
+  }
 }
-function expectedIsSubscriptionLogArray(actual, expected) {
-  return actual.length === 0 && expected.length === 0 || expected.length !== 0 && expected[0].subscribedFrame !== void 0;
+function isSubscriptions(log) {
+  return log[0].subscribedFrame !== void 0;
 }
 
 // src/lib/scheduler.ts
@@ -118,7 +117,7 @@ var Scheduler = class _Scheduler {
     return _Scheduler.instance;
   }
   static reset() {
-    _Scheduler.instance = null;
+    _Scheduler.instance = void 0;
   }
 };
 

package/lib/assert-deep-equal.d.ts

@@ -1,4 +1,3 @@
-import { SubscriptionLog, TestMessages } from './types';
+import { MessagesOrSubscriptions } from './types';
 import './internal-matchers';
-export type MessagesOrSubscriptions = TestMessages | SubscriptionLog[];
 export declare function assertDeepEqual(actual: MessagesOrSubscriptions, expected?: MessagesOrSubscriptions): void;

package/lib/scheduler.d.ts

@@ -1,6 +1,6 @@
 import { TestScheduler } from 'rxjs/testing';
 export declare class Scheduler {
-    static instance: TestScheduler | null;
+    static instance?: TestScheduler;
     static init(): void;
     static get(): TestScheduler;
     static reset(): void;

package/lib/types.d.ts

@@ -10,3 +10,4 @@ export type TestMessages = ReturnType<typeof TestScheduler.parseMarbles>;
  * Exported return type of SubscriptionLog to avoid importing internal APIs.
  */
 export type SubscriptionLog = ReturnType<typeof TestScheduler.parseMarblesAsSubscriptions>;
+export type MessagesOrSubscriptions = TestMessages | SubscriptionLog[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@granito/vitest-marbles",
-  "version": "1.0.0-dev.5",
+  "version": "1.0.0",
   "description": "Marble testing helpers library for RxJs and Vitest",
   "repository": {
     "type": "git",
@@ -40,17 +40,17 @@
     "tag": "latest"
   },
   "devDependencies": {
-    "@nx/esbuild": "22.1.2",
-    "@nx/vitest": "22.1.2",
-    "@vitest/coverage-v8": "^4.0.14",
-    "esbuild": "^0.27.0",
-    "jsdom": "~22.1.0",
-    "nx": "22.1.2",
+    "@nx/esbuild": "22.2.3",
+    "@nx/vitest": "22.2.3",
+    "@vitest/coverage-v8": "^4.0.15",
+    "esbuild": "^0.27.1",
+    "jsdom": "~27.3.0",
+    "nx": "22.2.3",
     "rxjs": "^7.8.2",
-    "tslib": "^2.3.0",
-    "typescript": "~5.9.2",
-    "vite": "^7.2.6",
-    "vitest": "^4.0.0"
+    "tslib": "^2.8.1",
+    "typescript": "~5.9.3",
+    "vite": "^7.2.7",
+    "vitest": "^4.0.15"
   },
   "peerDependencies": {
     "rxjs": "^7.0.0",