🔮 fix tests, update types

Author: szymeo

package.json

@@ -27,8 +27,10 @@
         "vitest": "^1.1.0"
     },
     "dependencies": {
-        "@universal-di/core": "^1.0.3",
-        "react": "^18.2.0"
+        "@universal-di/core": "^1.0.3"
+    },
+    "peerDependencies": {
+        "react": "^18.0.0 || ^19.0.0"
     },
     "bugs": {
         "url": "https://github.com/universal-di/react/issues"

pnpm-lock.yaml

@@ -1,41 +1,42 @@
-import {render} from '@testing-library/react';
-import React from 'react';
-import {Injector} from '@universal-di/core';
-import {DIContext} from './di-context';
-import {describe, expect, it} from 'vitest';
-
-describe('DIContext', () => {
-    it('can access null injector', () => {
+import { render } from "@testing-library/react";
+import React from "react";
+import { DIContext } from "./di-context";
+import { describe, expect, it } from "vitest";
+import { DIContainer } from "@universal-di/core/dist/src/di-container/di-container.js";
+import { useContext } from "react";
+
+describe("DIContext", () => {
+    it("can access null injector", () => {
         const UIComponent = () => {
-            const {injector} = React.useContext(DIContext);
+            const { injector } = useContext(DIContext);
 
-            expect(injector).toBe(undefined);
+            expect(injector).toBeNull();
 
             return null;
         };
 
         render(
-            <DIContext.Provider value={{injector: undefined}}>
-                <UIComponent/>
-            </DIContext.Provider>,
+            <DIContext.Provider value={{ injector: null }}>
+                <UIComponent />
+            </DIContext.Provider>
         );
     });
 
-    it('can access non-null injector', () => {
-        const injectorStub = new Injector();
+    it("can access non-null injector", () => {
+        const injectorStub = new DIContainer();
 
         const UIComponent = () => {
-            const {injector} = React.useContext(DIContext);
+            const { injector } = useContext(DIContext);
 
             expect(injector).toBe(injectorStub);
 
             return null;
         };
 
         render(
-            <DIContext.Provider value={{injector: injectorStub}}>
-                <UIComponent/>
-            </DIContext.Provider>,
+            <DIContext.Provider value={{ injector: injectorStub }}>
+                <UIComponent />
+            </DIContext.Provider>
         );
     });
 });

src/di-context/di-context.spec.tsx

@@ -1,5 +1,7 @@
-import {createContext} from 'react';
-import {Injector} from '@universal-di/core';
-import {Optional} from "../types";
+import { createContext } from "react";
+import { Optional } from "../types.js";
+import { DIContainer } from "@universal-di/core/dist/src/di-container/di-container.js";
 
-export const DIContext = createContext<{ injector: Optional<Injector> }>({injector: undefined});
+export const DIContext = createContext<{ injector: Optional<DIContainer> }>({
+    injector: null,
+});

src/di-context/di-context.ts

@@ -1,8 +1,7 @@
 import "@testing-library/jest-dom";
 import { render, screen } from "@testing-library/react";
-import React from "react";
-import { DIContextProvider } from "../di-context/di-context-provider";
-import { useInjection } from "./useInjection";
+import { InjectionToken, InjectorStub } from "@universal-di/core";
+import { DIContainer } from "@universal-di/core/dist/src/di-container/di-container.js";
 import {
     afterEach,
     beforeEach,
@@ -12,32 +11,19 @@ import {
     MockInstance,
     vi,
 } from "vitest";
-import { InjectionToken, Injector } from "@universal-di/core";
-
-class TestInjector {
-    private readonly value: any;
-
-    constructor(value: any) {
-        this.value = value;
-    }
-
-    get() {
-        return this.value;
-    }
-}
-
-export const InjectorStub = TestInjector;
+import { DIContextProvider } from "../di-context/di-context-provider";
+import { useInjection } from "./useInjection";
 
 describe("useInjection", () => {
-    const tokenStub = new InjectionToken<string>("TOKEN_STUB");
+    const tokenStub = new InjectionToken("TOKEN_STUB");
     const valueStub = "valueStub";
     const ComponentStub = () => {
-        const injectedValue: string = useInjection(tokenStub);
+        const injectedValue = useInjection(tokenStub);
 
-        return <div>{injectedValue}</div>;
+        return <div>{injectedValue as string}</div>;
     };
 
-    let injector: Injector;
+    let injector: DIContainer;
     let consoleErrorSpy: MockInstance;
 
     beforeEach(() => {
@@ -51,23 +37,22 @@ describe("useInjection", () => {
     });
 
     it("renders children with provided injector value", () => {
-        injector = new InjectorStub(valueStub) as any;
+        injector = new InjectorStub(valueStub);
 
         render(
             <DIContextProvider injector={injector}>
                 <ComponentStub />
             </DIContextProvider>
         );
 
-        // @ts-ignore
         expect(screen.getByText(valueStub)).toBeInTheDocument();
     });
 
     it("throws error for no context", () => {
-        injector = new InjectorStub(valueStub) as any;
+        injector = new InjectorStub(valueStub);
 
         const renders = () => render(<ComponentStub />);
 
-        expect(renders).toThrowError("No DI context provided");
+        expect(renders).toThrowError("No di context provided");
     });
 });