fix types

Author: kepta

packages/core/src/__tests__/dependency-types-1.test.ts

@@ -0,0 +1,40 @@
+import {
+  expect,
+  jest,
+  test,
+  describe,
+  beforeEach,
+  afterEach,
+} from '@jest/globals';
+import { createKey } from '../slice/key';
+
+const sliceAKey = createKey('sliceA', []);
+
+const widescreenField = sliceAKey.field(false);
+
+const sliceA = sliceAKey.slice({
+  widescreen: widescreenField,
+});
+
+const sliceUIKey = createKey('slice-ui', [sliceA]);
+
+const widescreenFieldExported = sliceUIKey.derive((state) => {
+  return sliceA.getField(state, 'widescreen');
+});
+
+const sliceUI = sliceUIKey.slice({
+  widescreen: widescreenFieldExported,
+});
+
+test('should allow this as sliceUI is a dependency of sliceB', () => {
+  const sliceBKey = createKey('sliceB', [sliceUI]);
+
+  const sliceB = sliceBKey.slice({});
+  sliceBKey.effect((store) => {
+    // should allow this as sliceUI is a dependency of sliceB
+    const { widescreen } = sliceUI.track(store);
+    sliceUI.get(store.state);
+
+    sliceUI.getField(store.state, 'widescreen');
+  });
+});

packages/core/src/__tests__/dependency-types-2.test.ts

@@ -0,0 +1,41 @@
+import {
+  expect,
+  jest,
+  test,
+  describe,
+  beforeEach,
+  afterEach,
+} from '@jest/globals';
+import { createKey } from '../slice/key';
+
+const sliceAKey = createKey('sliceA', []);
+
+const widescreenField = sliceAKey.field(false);
+
+const sliceA = sliceAKey.slice({
+  widescreen: widescreenField,
+});
+
+const sliceUIKey = createKey('slice-ui', [sliceA]);
+
+const widescreenFieldExported = sliceUIKey.derive((state) => {
+  return sliceA.getField(state, 'widescreen');
+});
+
+const sliceUI = sliceUIKey.slice({
+  widescreen: widescreenFieldExported,
+});
+
+test('should error as sliceUI is not a dependency of sliceB', () => {
+  const sliceBKey = createKey('sliceB', []);
+
+  const sliceB = sliceBKey.slice({});
+  sliceBKey.effect((store) => {
+    // @ts-expect-error - should error as sliceUI is not a dependency of sliceB
+    const { widescreen } = sliceUI.track(store);
+    // @ts-expect-error - should error as sliceUI is not a dependency of sliceB
+    sliceUI.get(store.state);
+    // @ts-expect-error - should error as sliceUI is not a dependency of sliceB
+    sliceUI.getField(store.state, 'widescreen');
+  });
+});

packages/core/src/slice/field.ts

@@ -27,7 +27,7 @@ export abstract class BaseField<
   }
 
   abstract get<TState extends StoreState<any>>(
-    storeState: IfSubsetOfState<TName | TDep, TState>,
+    storeState: IfSubsetOfState<TName, TState>,
   ): TVal;
 
   isEqual(a: TVal, b: TVal): boolean {
@@ -73,7 +73,7 @@ export class DerivedField<
   private prevValCache = new WeakMap<StoreState<any>['_ref'], TVal>();
 
   get<TState extends StoreState<any>>(
-    storeState: IfSubsetOfState<TName | TDep, TState>,
+    storeState: IfSubsetOfState<TName, TState>,
   ): TVal {
     if (!this.id) {
       throwValidationError(
@@ -130,7 +130,7 @@ export class StateField<
   }
 
   get<TState extends StoreState<any>>(
-    storeState: IfSubsetOfState<TName | TDep, TState>,
+    storeState: IfSubsetOfState<TName, TState>,
   ): TVal {
     if (!this.id) {
       throwValidationError(

packages/core/src/slice/slice.ts

@@ -104,7 +104,7 @@ export class Slice<
   }
 
   get<TState extends StoreState<any>>(
-    storeState: IfSubsetOfState<TName | TDep, TState>,
+    storeState: IfSubsetOfState<TName, TState>,
   ): Simplify<InferSliceFieldState<TExternal>> {
     const existing = this.getCache.get(storeState);
 
@@ -171,14 +171,14 @@ export class Slice<
     T extends keyof InferSliceFieldState<TExternal>,
     TState extends StoreState<any>,
   >(
-    storeState: IfSubsetOfState<TName | TDep, TState>,
+    storeState: IfSubsetOfState<TName, TState>,
     fieldName: T,
   ): InferSliceFieldState<TExternal>[T] {
     return this._getFieldByName(fieldName as string).get(storeState) as any;
   }
 
   track<TEStore extends EffectStore>(
-    store: IfSubsetEffectStore<TName | TDep, TEStore>,
+    store: IfSubsetEffectStore<TName, TEStore>,
   ): Simplify<InferSliceFieldState<TExternal>> {
     return new Proxy(this.get(store.state), {
       get: (target, prop: string, receiver) => {