@etsoo/react 1.8.20 → 1.8.22

package/__tests__/EventWatcher.tsx

@@ -13,11 +13,12 @@ function App(props: { callback: () => void }) {
       once: true
     });
   }, []);
+
   return <button onClick={(event) => watcher.do(event)}></button>;
 }
 
 test("Tests for EventWatcher", () => {
-  const callback = jest.fn();
+  const callback = vi.fn();
   render(<App callback={callback} />);
   const button = screen.getByRole<HTMLButtonElement>("button");
   button.click();

package/__tests__/States.tsx

@@ -1,39 +1,37 @@
-import React from 'react';
-import { render, screen } from '@testing-library/react';
-import { useAsyncState } from '../src/uses/useAsyncState';
-import { act } from 'react';
+import React from "react";
+import { render, screen } from "@testing-library/react";
+import { useAsyncState } from "../src/uses/useAsyncState";
+import { act } from "react";
 
 function App(props: { callback: (state: number) => void }) {
-    const { callback } = props;
-    const [state, setState] = useAsyncState(0);
+  const { callback } = props;
+  const [state, setState] = useAsyncState(0);
 
-    const [state1] = useAsyncState<number>();
-    expect(state1).toBeUndefined();
+  const [state1] = useAsyncState<number>();
+  expect(state1).toBeUndefined();
 
-    const click = async () => {
-        const currentState = await setState((prev) => prev + 1);
-        callback(currentState + 1);
-    };
-    callback(state);
-    return <button onClick={click}>State: {state}</button>;
+  const click = async () => {
+    const currentState = await setState((prev) => prev + 1);
+    callback(currentState + 1);
+  };
+  callback(state);
+  return <button onClick={click}>State: {state}</button>;
 }
 
-test('Tests for useAsyncState', (done) => {
-    const callback = jest.fn();
-    render(<App callback={callback} />);
-    const button = screen.getByRole<HTMLButtonElement>('button');
-    expect(button.innerHTML).toBe('State: 0');
-    act(() => {
-        button.click();
-    });
+test("Tests for useAsyncState", async () => {
+  const callback = vi.fn();
+  render(<App callback={callback} />);
+  const button = screen.getByRole<HTMLButtonElement>("button");
+  expect(button.innerHTML).toBe("State: 0");
+  act(() => {
+    button.click();
+  });
 
-    expect(button.innerHTML).toBe('State: 1');
+  expect(button.innerHTML).toBe("State: 1");
 
-    setTimeout(function () {
-        // Expect to happen
-        expect(callback).toHaveBeenLastCalledWith(2);
+  // Wait for the state to be updated
+  await new Promise((resolve) => setTimeout(resolve, 100));
 
-        // Notify jest to complete
-        done();
-    }, 100);
+  // Expect to happen
+  expect(callback).toHaveBeenLastCalledWith(2);
 });

package/__tests__/tsconfig.json

@@ -1,8 +1,8 @@
 {
   "compilerOptions": {
-    "target": "ES2020",
-    "module": "ESNext",
-    "moduleResolution": "Node10",
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "bundler",
     "allowJs": false,
     "skipLibCheck": true,
     "esModuleInterop": true,
@@ -13,7 +13,8 @@
     "isolatedModules": true,
     "noEmit": true,
     "jsx": "react",
-    "declaration": true
+    "declaration": true,
+    "types": ["vitest/globals"]
   },
   "include": [".."]
 }

package/lib/index.d.ts

@@ -26,6 +26,7 @@ export * from "./uses/useDelayedExecutor";
 export * from "./uses/useDimensions";
 export * from "./uses/useParamsEx";
 export * from "./uses/useRefs";
+export * from "./uses/useRequiredContext";
 export * from "./uses/useSearchParamsEx";
 export * from "./uses/useTimeout";
 export * from "./uses/useWindowScroll";

package/lib/index.js

@@ -31,6 +31,7 @@ export * from "./uses/useDelayedExecutor";
 export * from "./uses/useDimensions";
 export * from "./uses/useParamsEx";
 export * from "./uses/useRefs";
+export * from "./uses/useRequiredContext";
 export * from "./uses/useSearchParamsEx";
 export * from "./uses/useTimeout";
 export * from "./uses/useWindowScroll";

package/lib/uses/useRequiredContext.d.ts

@@ -0,0 +1,7 @@
+import React from "react";
+/**
+ * Required context
+ * @param context Context
+ * @returns Value
+ */
+export declare function useRequiredContext<T>(context: React.Context<T>): NonNullable<T>;

package/lib/uses/useRequiredContext.js

@@ -0,0 +1,13 @@
+import React from "react";
+/**
+ * Required context
+ * @param context Context
+ * @returns Value
+ */
+export function useRequiredContext(context) {
+    const value = React.useContext(context);
+    if (value == null) {
+        throw new Error(`useRequiredContext: ${context.displayName} is required`);
+    }
+    return value;
+}

package/package.json

@@ -1,27 +1,13 @@
 {
   "name": "@etsoo/react",
-  "version": "1.8.20",
+  "version": "1.8.22",
   "description": "TypeScript ReactJs UI Independent Framework",
   "main": "lib/index.js",
+  "type": "module",
   "types": "lib/index.d.ts",
   "scripts": {
     "build": "tsc",
-    "test": "jest",
-    "test:debug": "node --inspect-brk ./node_modules/jest/bin/jest.js --runInBand"
-  },
-  "jest": {
-    "automock": false,
-    "testMatch": [
-      "<rootDir>/__tests__/**/*.{ts,tsx}"
-    ],
-    "testEnvironment": "jsdom",
-    "transform": {
-      ".+\\.jsx?$": "babel-jest",
-      ".+\\.tsx?$": "ts-jest"
-    },
-    "transformIgnorePatterns": [
-      "/node_modules/(?!@etsoo/).+\\.js$"
-    ]
+    "test": "vitest"
   },
   "repository": {
     "type": "git",
@@ -56,6 +42,11 @@
     "react-router-dom": "^7.1.1",
     "react-window": "^1.8.10"
   },
+  "overrides": {
+    "react": "$react",
+    "react-dom": "$react-dom",
+    "@emotion/react": "$@emotion/react"
+  },
   "devDependencies": {
     "@babel/cli": "^7.25.9",
     "@babel/core": "^7.26.0",
@@ -68,9 +59,9 @@
     "@types/react": "^18.3.18",
     "@types/react-dom": "^18.3.1",
     "@types/react-window": "^1.8.8",
-    "jest": "^29.7.0",
-    "jest-environment-jsdom": "^29.7.0",
-    "ts-jest": "^29.2.5",
-    "typescript": "^5.7.3"
+    "@vitejs/plugin-react": "^4.3.4",
+    "jsdom": "^26.0.0",
+    "typescript": "^5.7.3",
+    "vitest": "^2.1.8"
   }
 }

package/src/index.ts

@@ -41,6 +41,7 @@ export * from "./uses/useDelayedExecutor";
 export * from "./uses/useDimensions";
 export * from "./uses/useParamsEx";
 export * from "./uses/useRefs";
+export * from "./uses/useRequiredContext";
 export * from "./uses/useSearchParamsEx";
 export * from "./uses/useTimeout";
 export * from "./uses/useWindowScroll";

package/src/uses/useRequiredContext.ts

@@ -0,0 +1,16 @@
+import React from "react";
+
+/**
+ * Required context
+ * @param context Context
+ * @returns Value
+ */
+export function useRequiredContext<T>(context: React.Context<T>) {
+  const value = React.useContext(context);
+
+  if (value == null) {
+    throw new Error(`useRequiredContext: ${context.displayName} is required`);
+  }
+
+  return value;
+}

package/tsconfig.json

@@ -2,7 +2,7 @@
   "compilerOptions": {
     /* Visit https://aka.ms/tsconfig.json to read more about this file */
     "target": "ES2020",
-    "module": "ESNext",
+    "module": "ES2020",
     "moduleResolution": "bundler",
     "allowJs": false,
     "isolatedModules": true,

package/vite.config.ts

@@ -0,0 +1,11 @@
+import { defineConfig } from "vitest/config";
+import react from "@vitejs/plugin-react";
+
+export default defineConfig({
+  plugins: [react()],
+  test: {
+    globals: true,
+    environment: "jsdom",
+    include: ["__tests__/**/*.ts(x)?"]
+  }
+});