@m4l/testing 0.0.10-beta.2 → 0.0.11-beta.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@m4l/testing",
   "description": "Shared testing utilities for MFs",
-  "version": "0.0.10-beta.2",
+  "version": "0.0.11-beta.1",
   "license": "UNLICENSED",
   "author": "M4L Team",
   "lint-staged": {
@@ -30,8 +30,9 @@
     "@vitest/ui": "^3.1.1",
     "cypress": "^13.14.2",
     "cypress-vite": "^1.5.0",
-    "jsdom": "^25.0.1",
     "happy-dom": "^17.1.9",
+    "jest-environment-jsdom": "^29.7.0",
+    "jsdom": "^25.0.1",
     "storybook": "^8.3.4"
   },
   "peerDependencies": {

package/testComponents/DataGrid/helpers.d.ts

@@ -2,4 +2,4 @@ import { TestingColumn, TestingColumnConfig } from './types';
 /**
  * Test the column configs
  */
-export declare const testColumnConfigs: (columns: Array<TestingColumn>, configs: readonly TestingColumnConfig[]) => void;
+export declare const testColumnConfigs: <T>(columns: Array<TestingColumn>, configs: readonly TestingColumnConfig<T>[]) => void;

package/testComponents/DataGrid/helpers.js

@@ -1,5 +1,5 @@
 import { expect as t } from "vitest";
-const h = (o) => o?.type === "nested", n = (o) => o?.type === "date", k = (o) => o?.type === "boolean", d = (o) => o?.type === "setCheck", C = (o) => o?.type === "price", p = (o) => o?.type === "points", y = (o) => o?.type === "uncertainty", f = (o) => o?.type === "concatenated", m = (o) => o?.type === "chipStatus", V = (o, a) => {
+const h = (o) => o?.type === "nested", d = (o) => o?.type === "date", n = (o) => o?.type === "boolean", k = (o) => o?.type === "setCheck", C = (o) => o?.type === "price", p = (o) => o?.type === "points", y = (o) => o?.type === "uncertainty", f = (o) => o?.type === "concatenated", m = (o) => o?.type === "chipStatus", V = (o, a) => {
   t(o).toHaveLength(a.length), a.forEach((e, s) => {
     const l = o[s], u = e.hookCall?.type ?? "none";
     describe(`Column ${s + 1}: ${e.key} (${u})`, () => {
@@ -12,17 +12,17 @@ const h = (o) => o?.type === "nested", n = (o) => o?.type === "date", k = (o) =>
             t(l.testProps).toEqual({
               fieldValue: e.hookCall.fieldValue
             });
-          else if (n(e.hookCall))
+          else if (d(e.hookCall))
             t(l.testProps).toEqual({
               fieldValue: e.hookCall.fieldValue,
               presentationType: e.hookCall.presentationType
             });
-          else if (k(e.hookCall))
+          else if (n(e.hookCall))
             t(l.testProps).toEqual({
               fieldValue: e.hookCall.fieldValue,
               presentationType: e.hookCall.presentationType
             });
-          else if (d(e.hookCall))
+          else if (k(e.hookCall))
             t(l.testProps).toEqual({
               field: e.hookCall.field,
               disabledGetter: t.any(Function),
@@ -51,8 +51,8 @@ const h = (o) => o?.type === "nested", n = (o) => o?.type === "date", k = (o) =>
             });
           else if (m(e.hookCall))
             t(l.testProps).toEqual({
-              uriLabel: e.hookCall.uriLabel,
-              uriStatus: e.hookCall.uriStatus,
+              fieldLabel: e.hookCall.fieldLabel,
+              fieldStatus: e.hookCall.fieldStatus,
               statusesColors: e.hookCall.statusesColors,
               fallbackColor: e.hookCall.fallbackColor
             });

package/testComponents/DataGrid/types.d.ts

@@ -1,40 +1,40 @@
 import { ColumnNestedValueFormatterProps, ColumnDateFormatterProps, ColumnBooleanFormatterProps, ColumnPriceFormatterProps, ColumnPointsFormatterProps, ColumnSetCheckFormatterProps, ColumnUncertaintyFormatterProps, ColumnConcatenatedValuesFormatterProps, Column, ColumnInteractiveCheckFormatterProps, ColumnChipStatusFormatterProps } from '@m4l/components';
-type BaseColumnConfig = Column<unknown, unknown>;
+type BaseColumnConfig<T> = Column<T, unknown>;
 type BaseHookCall = {
     type: 'nested' | 'date' | 'boolean' | 'price' | 'points' | 'interactiveCheck' | 'setCheck' | 'uncertainty' | 'concatenated' | 'chipStatus';
 };
-export type TestingNestedValueHookCall = BaseHookCall & ColumnNestedValueFormatterProps & {
+export type TestingNestedValueHookCall<T> = BaseHookCall & ColumnNestedValueFormatterProps<T> & {
     type: 'nested';
 };
-export type TestingDateHookCall = BaseHookCall & ColumnDateFormatterProps & {
+export type TestingDateHookCall<T> = BaseHookCall & ColumnDateFormatterProps<T> & {
     type: 'date';
 };
-export type TestingBooleanHookCall = BaseHookCall & ColumnBooleanFormatterProps & {
+export type TestingBooleanHookCall<T> = BaseHookCall & ColumnBooleanFormatterProps<T> & {
     type: 'boolean';
 };
-export type TestingPriceHookCall = BaseHookCall & ColumnPriceFormatterProps & {
+export type TestingPriceHookCall<T> = BaseHookCall & ColumnPriceFormatterProps<T> & {
     type: 'price';
 };
-export type TestingPointsHookCall = BaseHookCall & ColumnPointsFormatterProps & {
+export type TestingPointsHookCall<T> = BaseHookCall & ColumnPointsFormatterProps<T> & {
     type: 'points';
 };
-export type TestingInteractiveCheckHookCall = BaseHookCall & ColumnInteractiveCheckFormatterProps<unknown> & {
+export type TestingInteractiveCheckHookCall<T> = BaseHookCall & ColumnInteractiveCheckFormatterProps<T> & {
     type: 'interactiveCheck';
 };
-export type TestingSetCheckHookCall = BaseHookCall & ColumnSetCheckFormatterProps<unknown> & {
+export type TestingSetCheckHookCall<T> = BaseHookCall & ColumnSetCheckFormatterProps<T> & {
     type: 'setCheck';
 };
-export type TestingUncertaintyHookCall = BaseHookCall & ColumnUncertaintyFormatterProps & {
+export type TestingUncertaintyHookCall<T> = BaseHookCall & ColumnUncertaintyFormatterProps<T> & {
     type: 'uncertainty';
 };
-export type TestingConcatenatedHookCall = BaseHookCall & ColumnConcatenatedValuesFormatterProps & {
+export type TestingConcatenatedHookCall<T> = BaseHookCall & ColumnConcatenatedValuesFormatterProps<T> & {
     type: 'concatenated';
 };
-export type TestingChipStatusHookCall = BaseHookCall & ColumnChipStatusFormatterProps<unknown> & {
+export type TestingChipStatusHookCall<T> = BaseHookCall & ColumnChipStatusFormatterProps<T> & {
     type: 'chipStatus';
 };
-export type TestingColumnConfig = BaseColumnConfig & {
-    hookCall?: TestingNestedValueHookCall | TestingDateHookCall | TestingBooleanHookCall | TestingPriceHookCall | TestingPointsHookCall | TestingInteractiveCheckHookCall | TestingSetCheckHookCall | TestingUncertaintyHookCall | TestingConcatenatedHookCall | TestingChipStatusHookCall;
+export type TestingColumnConfig<T> = BaseColumnConfig<T> & {
+    hookCall?: TestingNestedValueHookCall<T> | TestingDateHookCall<T> | TestingBooleanHookCall<T> | TestingPriceHookCall<T> | TestingPointsHookCall<T> | TestingInteractiveCheckHookCall<T> | TestingSetCheckHookCall<T> | TestingUncertaintyHookCall<T> | TestingConcatenatedHookCall<T> | TestingChipStatusHookCall<T>;
 };
 export type TestingColumn = Column<unknown, unknown> & {
     testProps?: Record<string, unknown>;