@acala-network/chopsticks-testing 0.9.5-1 → 0.9.5-3

package/dist/cjs/check.d.ts

@@ -12,9 +12,14 @@ export type RedactOptions = {
     redactKeys?: RegExp;
     removeKeys?: RegExp;
 };
+export type ExpectFn = (value: any) => {
+    toMatchSnapshot: (msg?: string) => void;
+    toMatch(value: any, msg?: string): void;
+    toMatchObject(value: any, msg?: string): void;
+};
 export declare class Checker {
     #private;
-    constructor(value: any, message?: string);
+    constructor(expectFn: ExpectFn, value: any, message?: string);
     toHuman(): this;
     toHex(): this;
     toJson(): this;
@@ -25,15 +30,22 @@ export declare class Checker {
     pipe(fn?: (value: Checker) => Checker): Checker;
     value(): Promise<any>;
     toMatchSnapshot(msg?: string): Promise<void>;
+    toMatch(value: any, msg?: string): Promise<void>;
+    toMatchObject(value: any, msg?: string): Promise<void>;
 }
-export declare const check: (value: any, msg?: string) => Checker;
-type Api = {
-    api: ApiPromise;
+export declare const withExpect: (expectFn: ExpectFn) => {
+    check: (value: any, msg?: string) => Checker;
+    checkEvents: ({ events }: {
+        events: Promise<Codec[] | Codec>;
+    }, ...filters: EventFilter[]) => Checker;
+    checkSystemEvents: ({ api }: {
+        api: ApiPromise;
+    }, ...filters: EventFilter[]) => Checker;
+    checkUmp: ({ api }: {
+        api: ApiPromise;
+    }) => Checker;
+    checkHrmp: ({ api }: {
+        api: ApiPromise;
+    }) => Checker;
+    checkHex: (value: any, msg?: string) => Checker;
 };
-export declare const checkEvents: ({ events }: {
-    events: Promise<Codec[] | Codec>;
-}, ...filters: EventFilter[]) => Checker;
-export declare const checkSystemEvents: ({ api }: Api, ...filters: EventFilter[]) => Checker;
-export declare const checkUmp: ({ api }: Api) => Checker;
-export declare const checkHrmp: ({ api }: Api) => Checker;
-export {};

package/dist/cjs/check.js

@@ -12,23 +12,10 @@ _export(exports, {
     Checker: function() {
         return Checker;
     },
-    check: function() {
-        return check;
-    },
-    checkEvents: function() {
-        return checkEvents;
-    },
-    checkHrmp: function() {
-        return checkHrmp;
-    },
-    checkSystemEvents: function() {
-        return checkSystemEvents;
-    },
-    checkUmp: function() {
-        return checkUmp;
+    withExpect: function() {
+        return withExpect;
     }
 });
-const _vitest = require("vitest");
 function _check_private_redeclaration(obj, privateCollection) {
     if (privateCollection.has(obj)) {
         throw new TypeError("Cannot initialize the same private elements twice on an object");
@@ -83,7 +70,7 @@ const processCodecOrArray = (codec, fn)=>Array.isArray(codec) ? codec.map(fn) :
 const toHuman = (codec)=>processCodecOrArray(codec, (c)=>c?.toHuman?.() ?? c);
 const toHex = (codec)=>processCodecOrArray(codec, (c)=>c?.toHex?.() ?? c);
 const toJson = (codec)=>processCodecOrArray(codec, (c)=>c?.toJSON?.() ?? c);
-var _value = /*#__PURE__*/ new WeakMap(), _pipeline = /*#__PURE__*/ new WeakMap(), _format = /*#__PURE__*/ new WeakMap(), _message = /*#__PURE__*/ new WeakMap(), _redactOptions = /*#__PURE__*/ new WeakMap(), _redact = /*#__PURE__*/ new WeakSet();
+var _expectFn = /*#__PURE__*/ new WeakMap(), _value = /*#__PURE__*/ new WeakMap(), _pipeline = /*#__PURE__*/ new WeakMap(), _format = /*#__PURE__*/ new WeakMap(), _message = /*#__PURE__*/ new WeakMap(), _redactOptions = /*#__PURE__*/ new WeakMap(), _redact = /*#__PURE__*/ new WeakSet();
 class Checker {
     toHuman() {
         _class_private_field_set(this, _format, 'human');
@@ -158,10 +145,20 @@ class Checker {
         return value;
     }
     async toMatchSnapshot(msg) {
-        return (0, _vitest.expect)(await this.value()).toMatchSnapshot(msg ?? _class_private_field_get(this, _message));
+        return _class_private_field_get(this, _expectFn).call(this, await this.value()).toMatchSnapshot(msg ?? _class_private_field_get(this, _message));
     }
-    constructor(value, message){
+    async toMatch(value, msg) {
+        return _class_private_field_get(this, _expectFn).call(this, await this.value()).toMatch(value, msg ?? _class_private_field_get(this, _message));
+    }
+    async toMatchObject(value, msg) {
+        return _class_private_field_get(this, _expectFn).call(this, await this.value()).toMatchObject(value, msg ?? _class_private_field_get(this, _message));
+    }
+    constructor(expectFn, value, message){
         _class_private_method_init(this, _redact);
+        _class_private_field_init(this, _expectFn, {
+            writable: true,
+            value: void 0
+        });
         _class_private_field_init(this, _value, {
             writable: true,
             value: void 0
@@ -182,6 +179,7 @@ class Checker {
             writable: true,
             value: void 0
         });
+        _class_private_field_set(this, _expectFn, expectFn);
         _class_private_field_set(this, _value, value);
         _class_private_field_set(this, _message, message);
     }
@@ -259,19 +257,30 @@ function redact(value) {
     };
     return process(value);
 }
-const check = (value, msg)=>{
-    if (value instanceof Checker) {
-        if (msg) {
-            return value.message(msg);
+const withExpect = (expectFn)=>{
+    const check = (value, msg)=>{
+        if (value instanceof Checker) {
+            if (msg) {
+                return value.message(msg);
+            }
+            return value;
         }
-        return value;
-    }
-    return new Checker(value, msg);
+        return new Checker(expectFn, value, msg);
+    };
+    const checkEvents = ({ events }, ...filters)=>check(events, 'events').filterEvents(...filters).redact();
+    const checkSystemEvents = ({ api }, ...filters)=>check(api.query.system.events(), 'system events').filterEvents(...filters).redact();
+    const checkUmp = ({ api })=>check(api.query.parachainSystem.upwardMessages(), 'ump').map((value)=>api.createType('Vec<XcmVersionedXcm>', value).toJSON());
+    const checkHrmp = ({ api })=>check(api.query.parachainSystem.hrmpOutboundMessages(), 'hrmp').map((value)=>value.map(({ recipient, data })=>({
+                    data: api.createType('(XcmpMessageFormat, XcmVersionedXcm)', data).toJSON(),
+                    recipient
+                })));
+    const checkHex = (value, msg)=>check(value, msg).toHex();
+    return {
+        check,
+        checkEvents,
+        checkSystemEvents,
+        checkUmp,
+        checkHrmp,
+        checkHex
+    };
 };
-const checkEvents = ({ events }, ...filters)=>check(events, 'events').filterEvents(...filters).redact();
-const checkSystemEvents = ({ api }, ...filters)=>check(api.query.system.events(), 'system events').filterEvents(...filters).redact();
-const checkUmp = ({ api })=>check(api.query.parachainSystem.upwardMessages(), 'ump').map((value)=>api.createType('Vec<XcmVersionedXcm>', value).toJSON());
-const checkHrmp = ({ api })=>check(api.query.parachainSystem.hrmpOutboundMessages(), 'hrmp').map((value)=>value.map(({ recipient, data })=>({
-                data: api.createType('(XcmpMessageFormat, XcmVersionedXcm)', data).toJSON(),
-                recipient
-            })));

package/dist/cjs/index.d.ts

@@ -1,16 +1,2 @@
-import { ApiPromise } from '@polkadot/api';
-import { Codec } from '@polkadot/types/types';
 export * from './check.js';
 export * from '@acala-network/chopsticks-utils';
-type CodecOrArray = Codec | Codec[];
-export declare const expectJson: (codec: CodecOrArray) => import("@vitest/expect").Assertion<any>;
-export declare const expectHex: (codec: CodecOrArray) => import("@vitest/expect").Assertion<any>;
-type EventFilter = string | {
-    method: string;
-    section: string;
-};
-export declare const matchEvents: (events: Promise<Codec[] | Codec>, ...filters: EventFilter[]) => Promise<void>;
-export declare const matchSystemEvents: ({ api }: {
-    api: ApiPromise;
-}, ...filters: EventFilter[]) => Promise<void>;
-export declare const redact: (data: any | Promise<any>) => Promise<any>;

package/dist/cjs/index.js

@@ -2,30 +2,6 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: all[name]
-    });
-}
-_export(exports, {
-    expectHex: function() {
-        return expectHex;
-    },
-    expectJson: function() {
-        return expectJson;
-    },
-    matchEvents: function() {
-        return matchEvents;
-    },
-    matchSystemEvents: function() {
-        return matchSystemEvents;
-    },
-    redact: function() {
-        return redact;
-    }
-});
-const _vitest = require("vitest");
 _export_star(require("./check.js"), exports);
 _export_star(require("@acala-network/chopsticks-utils"), exports);
 function _export_star(from, to) {
@@ -41,77 +17,3 @@ function _export_star(from, to) {
     });
     return from;
 }
-const processCodecOrArray = (codec, fn)=>Array.isArray(codec) ? codec.map(fn) : fn(codec);
-const toHuman = (codec)=>processCodecOrArray(codec, (c)=>c?.toHuman?.() ?? c);
-const toJson = (codec)=>processCodecOrArray(codec, (c)=>c?.toJSON?.() ?? c);
-const toHex = (codec)=>processCodecOrArray(codec, (c)=>c?.toHex?.() ?? c);
-const expectJson = (codec)=>{
-    return (0, _vitest.expect)(toJson(codec));
-};
-const expectHex = (codec)=>{
-    return (0, _vitest.expect)(toHex(codec));
-};
-const _matchEvents = async (msg, events, ...filters)=>{
-    let data = toHuman(await events).map(({ event: { index: _, ...event } })=>event);
-    if (filters.length > 0) {
-        const filtersArr = Array.isArray(filters) ? filters : [
-            filters
-        ];
-        data = data.filter((evt)=>{
-            return filtersArr.some((filter)=>{
-                if (typeof filter === 'string') {
-                    return evt.section === filter;
-                }
-                const { section, method } = filter;
-                return evt.section === section && evt.method === method;
-            });
-        });
-    }
-    return (0, _vitest.expect)(data).toMatchSnapshot(msg);
-};
-const matchEvents = async (events, ...filters)=>{
-    return _matchEvents('events', redact(events), ...filters);
-};
-const matchSystemEvents = async ({ api }, ...filters)=>{
-    await _matchEvents('system events', redact(api.query.system.events()), ...filters);
-};
-const redact = async (data)=>{
-    const json = toHuman(await data);
-    const process = (obj)=>{
-        if (obj == null) {
-            return obj;
-        }
-        if (Array.isArray(obj)) {
-            return obj.map(process);
-        }
-        if (typeof obj === 'number') {
-            const rounded = parseFloat(obj.toPrecision(2));
-            if (rounded === obj) {
-                return rounded;
-            }
-            return `(rounded ${rounded})`;
-        }
-        if (typeof obj === 'string') {
-            if (obj.match(/0x[0-9a-f]{64}/)) {
-                return '(hash)';
-            }
-            if (obj.match(/^[\d,]+$/)) {
-                const num = parseInt(obj.replace(/,/g, ''));
-                const rounded = parseFloat(num.toPrecision(2));
-                if (rounded === num) {
-                    return rounded;
-                }
-                return `(rounded ${rounded})`;
-            }
-            return obj;
-        }
-        if (typeof obj === 'object') {
-            return Object.fromEntries(Object.entries(obj).map(([k, v])=>[
-                    k,
-                    process(v)
-                ]));
-        }
-        return obj;
-    };
-    return process(json);
-};

package/dist/esm/check.d.ts

@@ -12,9 +12,14 @@ export type RedactOptions = {
     redactKeys?: RegExp;
     removeKeys?: RegExp;
 };
+export type ExpectFn = (value: any) => {
+    toMatchSnapshot: (msg?: string) => void;
+    toMatch(value: any, msg?: string): void;
+    toMatchObject(value: any, msg?: string): void;
+};
 export declare class Checker {
     #private;
-    constructor(value: any, message?: string);
+    constructor(expectFn: ExpectFn, value: any, message?: string);
     toHuman(): this;
     toHex(): this;
     toJson(): this;
@@ -25,15 +30,22 @@ export declare class Checker {
     pipe(fn?: (value: Checker) => Checker): Checker;
     value(): Promise<any>;
     toMatchSnapshot(msg?: string): Promise<void>;
+    toMatch(value: any, msg?: string): Promise<void>;
+    toMatchObject(value: any, msg?: string): Promise<void>;
 }
-export declare const check: (value: any, msg?: string) => Checker;
-type Api = {
-    api: ApiPromise;
+export declare const withExpect: (expectFn: ExpectFn) => {
+    check: (value: any, msg?: string) => Checker;
+    checkEvents: ({ events }: {
+        events: Promise<Codec[] | Codec>;
+    }, ...filters: EventFilter[]) => Checker;
+    checkSystemEvents: ({ api }: {
+        api: ApiPromise;
+    }, ...filters: EventFilter[]) => Checker;
+    checkUmp: ({ api }: {
+        api: ApiPromise;
+    }) => Checker;
+    checkHrmp: ({ api }: {
+        api: ApiPromise;
+    }) => Checker;
+    checkHex: (value: any, msg?: string) => Checker;
 };
-export declare const checkEvents: ({ events }: {
-    events: Promise<Codec[] | Codec>;
-}, ...filters: EventFilter[]) => Checker;
-export declare const checkSystemEvents: ({ api }: Api, ...filters: EventFilter[]) => Checker;
-export declare const checkUmp: ({ api }: Api) => Checker;
-export declare const checkHrmp: ({ api }: Api) => Checker;
-export {};

package/dist/esm/check.js

@@ -1,15 +1,16 @@
-import { expect } from 'vitest';
 const processCodecOrArray = (codec, fn)=>Array.isArray(codec) ? codec.map(fn) : fn(codec);
 const toHuman = (codec)=>processCodecOrArray(codec, (c)=>c?.toHuman?.() ?? c);
 const toHex = (codec)=>processCodecOrArray(codec, (c)=>c?.toHex?.() ?? c);
 const toJson = (codec)=>processCodecOrArray(codec, (c)=>c?.toJSON?.() ?? c);
 export class Checker {
+    #expectFn;
     #value;
     #pipeline = [];
     #format = 'json';
     #message;
     #redactOptions;
-    constructor(value, message){
+    constructor(expectFn, value, message){
+        this.#expectFn = expectFn;
         this.#value = value;
         this.#message = message;
     }
@@ -159,22 +160,39 @@ export class Checker {
         return value;
     }
     async toMatchSnapshot(msg) {
-        return expect(await this.value()).toMatchSnapshot(msg ?? this.#message);
+        return this.#expectFn(await this.value()).toMatchSnapshot(msg ?? this.#message);
+    }
+    async toMatch(value, msg) {
+        return this.#expectFn(await this.value()).toMatch(value, msg ?? this.#message);
+    }
+    async toMatchObject(value, msg) {
+        return this.#expectFn(await this.value()).toMatchObject(value, msg ?? this.#message);
     }
 }
-export const check = (value, msg)=>{
-    if (value instanceof Checker) {
-        if (msg) {
-            return value.message(msg);
+export const withExpect = (expectFn)=>{
+    const check = (value, msg)=>{
+        if (value instanceof Checker) {
+            if (msg) {
+                return value.message(msg);
+            }
+            return value;
         }
-        return value;
-    }
-    return new Checker(value, msg);
+        return new Checker(expectFn, value, msg);
+    };
+    const checkEvents = ({ events }, ...filters)=>check(events, 'events').filterEvents(...filters).redact();
+    const checkSystemEvents = ({ api }, ...filters)=>check(api.query.system.events(), 'system events').filterEvents(...filters).redact();
+    const checkUmp = ({ api })=>check(api.query.parachainSystem.upwardMessages(), 'ump').map((value)=>api.createType('Vec<XcmVersionedXcm>', value).toJSON());
+    const checkHrmp = ({ api })=>check(api.query.parachainSystem.hrmpOutboundMessages(), 'hrmp').map((value)=>value.map(({ recipient, data })=>({
+                    data: api.createType('(XcmpMessageFormat, XcmVersionedXcm)', data).toJSON(),
+                    recipient
+                })));
+    const checkHex = (value, msg)=>check(value, msg).toHex();
+    return {
+        check,
+        checkEvents,
+        checkSystemEvents,
+        checkUmp,
+        checkHrmp,
+        checkHex
+    };
 };
-export const checkEvents = ({ events }, ...filters)=>check(events, 'events').filterEvents(...filters).redact();
-export const checkSystemEvents = ({ api }, ...filters)=>check(api.query.system.events(), 'system events').filterEvents(...filters).redact();
-export const checkUmp = ({ api })=>check(api.query.parachainSystem.upwardMessages(), 'ump').map((value)=>api.createType('Vec<XcmVersionedXcm>', value).toJSON());
-export const checkHrmp = ({ api })=>check(api.query.parachainSystem.hrmpOutboundMessages(), 'hrmp').map((value)=>value.map(({ recipient, data })=>({
-                data: api.createType('(XcmpMessageFormat, XcmVersionedXcm)', data).toJSON(),
-                recipient
-            })));

package/dist/esm/index.d.ts

@@ -1,16 +1,2 @@
-import { ApiPromise } from '@polkadot/api';
-import { Codec } from '@polkadot/types/types';
 export * from './check.js';
 export * from '@acala-network/chopsticks-utils';
-type CodecOrArray = Codec | Codec[];
-export declare const expectJson: (codec: CodecOrArray) => import("@vitest/expect").Assertion<any>;
-export declare const expectHex: (codec: CodecOrArray) => import("@vitest/expect").Assertion<any>;
-type EventFilter = string | {
-    method: string;
-    section: string;
-};
-export declare const matchEvents: (events: Promise<Codec[] | Codec>, ...filters: EventFilter[]) => Promise<void>;
-export declare const matchSystemEvents: ({ api }: {
-    api: ApiPromise;
-}, ...filters: EventFilter[]) => Promise<void>;
-export declare const redact: (data: any | Promise<any>) => Promise<any>;

package/dist/esm/index.js

@@ -1,77 +1,2 @@
-import { expect } from 'vitest';
 export * from './check.js';
 export * from '@acala-network/chopsticks-utils';
-const processCodecOrArray = (codec, fn)=>Array.isArray(codec) ? codec.map(fn) : fn(codec);
-const toHuman = (codec)=>processCodecOrArray(codec, (c)=>c?.toHuman?.() ?? c);
-const toJson = (codec)=>processCodecOrArray(codec, (c)=>c?.toJSON?.() ?? c);
-const toHex = (codec)=>processCodecOrArray(codec, (c)=>c?.toHex?.() ?? c);
-export const expectJson = (codec)=>{
-    return expect(toJson(codec));
-};
-export const expectHex = (codec)=>{
-    return expect(toHex(codec));
-};
-const _matchEvents = async (msg, events, ...filters)=>{
-    let data = toHuman(await events).map(({ event: { index: _, ...event } })=>event);
-    if (filters.length > 0) {
-        const filtersArr = Array.isArray(filters) ? filters : [
-            filters
-        ];
-        data = data.filter((evt)=>{
-            return filtersArr.some((filter)=>{
-                if (typeof filter === 'string') {
-                    return evt.section === filter;
-                }
-                const { section, method } = filter;
-                return evt.section === section && evt.method === method;
-            });
-        });
-    }
-    return expect(data).toMatchSnapshot(msg);
-};
-export const matchEvents = async (events, ...filters)=>{
-    return _matchEvents('events', redact(events), ...filters);
-};
-export const matchSystemEvents = async ({ api }, ...filters)=>{
-    await _matchEvents('system events', redact(api.query.system.events()), ...filters);
-};
-export const redact = async (data)=>{
-    const json = toHuman(await data);
-    const process = (obj)=>{
-        if (obj == null) {
-            return obj;
-        }
-        if (Array.isArray(obj)) {
-            return obj.map(process);
-        }
-        if (typeof obj === 'number') {
-            const rounded = parseFloat(obj.toPrecision(2));
-            if (rounded === obj) {
-                return rounded;
-            }
-            return `(rounded ${rounded})`;
-        }
-        if (typeof obj === 'string') {
-            if (obj.match(/0x[0-9a-f]{64}/)) {
-                return '(hash)';
-            }
-            if (obj.match(/^[\d,]+$/)) {
-                const num = parseInt(obj.replace(/,/g, ''));
-                const rounded = parseFloat(num.toPrecision(2));
-                if (rounded === num) {
-                    return rounded;
-                }
-                return `(rounded ${rounded})`;
-            }
-            return obj;
-        }
-        if (typeof obj === 'object') {
-            return Object.fromEntries(Object.entries(obj).map(([k, v])=>[
-                    k,
-                    process(v)
-                ]));
-        }
-        return obj;
-    };
-    return process(json);
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks-testing",
-  "version": "0.9.5-1",
+  "version": "0.9.5-3",
   "author": "Acala Developers <hello@acala.network>",
   "license": "Apache-2.0",
   "type": "module",
@@ -11,13 +11,10 @@
     "build:esm": "swc ./src --config-file ../../.esmswcrc -d dist/esm && tsc -p tsconfig.json --declarationDir dist/esm"
   },
   "dependencies": {
-    "@acala-network/chopsticks-utils": "0.9.5-1",
+    "@acala-network/chopsticks-utils": "0.9.5-3",
     "@polkadot/api": "^10.10.1",
     "@polkadot/types": "^10.10.1"
   },
-  "peerDependencies": {
-    "vitest": "*"
-  },
   "devDependencies": {
     "@swc/cli": "0.1.63",
     "@swc/core": "^1.3.100",