[WIP] Refactor to use the new jotai store derive method (Attempt 2)

.eslintrc.json

@@ -25,7 +25,8 @@
     "@typescript-eslint/explicit-function-return-type": "off",
     "@typescript-eslint/explicit-module-boundary-types": "off",
     "@typescript-eslint/no-explicit-any": "off",
-    "@typescript-eslint/no-unused-vars": ["error", { "argsIgnorePattern": "^_" }],
+    "@typescript-eslint/no-non-null-asserted-optional-chain": "off",
+    "@typescript-eslint/no-unused-vars": ["warn", { "argsIgnorePattern": "^_" }],
     "react/button-has-type": "off",
     "react/jsx-filename-extension": ["error", { "extensions": [".js", ".tsx"] }],
     "react/prop-types": "off",
@@ -41,6 +42,7 @@
     "symbol-description": "off",
     "prefer-object-spread": "off",
     "no-return-assign": "off",
+    "no-sparse-arrays": "off",
     "no-use-before-define": "off",
     "no-unused-vars": "off",
     "no-redeclare": "off",

__tests__/ScopeProvider/01_basic_spec.test.tsx → __tests__/ScopeProvider2/01_basic_spec.test.tsx

@@ -8,8 +8,8 @@ import {
   type SetStateAction,
 } from 'jotai'
 import { atomWithReducer } from 'jotai/vanilla/utils'
-import { ScopeProvider } from '../../src/index'
-import { clickButton, getTextContents } from '../utils'
+import { ScopeProvider } from 'src/ScopeProvider2/ScopeProvider'
+import { clickButton, getTextContents } from './utils'
 
 describe('Counter', () => {
   /*
@@ -408,7 +408,7 @@ describe('Counter', () => {
   })
 
   /*
-    base, derivedA(base), derivemB(base)
+    base, derivedA(base), derivedB(base)
     S0[derivedA, derivedB]: derivedA0(base0), derivedB0(base0)
     S1[derivedA, derivedB]: derivedA1(base1), derivedB1(base1)
   */

__tests__/ScopeProvider/02_removeScope.test.tsx → __tests__/ScopeProvider2/02_removeScope.test.tsx

@@ -2,8 +2,8 @@ import { render } from '@testing-library/react'
 import type { PropsWithChildren } from 'react'
 import { atom, useAtom, useAtomValue } from 'jotai'
 import { atomWithReducer } from 'jotai/vanilla/utils'
-import { ScopeProvider } from '../../src/index'
-import { clickButton, getTextContents } from '../utils'
+import { ScopeProvider } from 'src/ScopeProvider2/ScopeProvider'
+import { clickButton, getTextContents } from './utils'
 
 const baseAtom1 = atomWithReducer(0, (v) => v + 1)
 const baseAtom2 = atomWithReducer(0, (v) => v + 1)

__tests__/ScopeProvider/03_nested.test.tsx → __tests__/ScopeProvider2/03_nested.test.tsx

@@ -1,9 +1,9 @@
 import { render } from '@testing-library/react'
 import { atom, useAtom, useAtomValue, useSetAtom } from 'jotai'
 import { atomWithReducer } from 'jotai/vanilla/utils'
-import { clickButton, getTextContents } from '../utils'
+import { clickButton, getTextContents } from './utils'
 
-import { ScopeProvider } from '../../src/index'
+import { ScopeProvider } from 'src/ScopeProvider2/ScopeProvider'
 
 const baseAtom1 = atomWithReducer(0, (v) => v + 1)
 const baseAtom2 = atomWithReducer(0, (v) => v + 1)

__tests__/ScopeProvider/04_derived.test.tsx → __tests__/ScopeProvider2/04_derived.test.tsx

@@ -1,7 +1,7 @@
 import { render } from '@testing-library/react'
 import { atom, useAtom } from 'jotai'
-import { clickButton, getTextContents } from '../utils'
-import { ScopeProvider } from '../../src/index'
+import { clickButton, getTextContents } from './utils'
+import { ScopeProvider } from 'src/ScopeProvider2/ScopeProvider'
 
 const atomValueSelectors = [
   '.case1.base',

__tests__/ScopeProvider/05_derived_self.test.tsx → __tests__/ScopeProvider2/05_derived_self.test.tsx

@@ -1,8 +1,8 @@
 import { render } from '@testing-library/react'
 import { atom, useAtom } from 'jotai'
 import { useHydrateAtoms } from 'jotai/utils'
-import { getTextContents } from '../utils'
-import { ScopeProvider } from '../../src/index'
+import { getTextContents } from './utils'
+import { ScopeProvider } from 'src/ScopeProvider2/ScopeProvider'
 
 const baseAtom = atom(0)
 const derivedAtom1 = atom(

__tests__/ScopeProvider/06_implicit_parent.test.tsx → __tests__/ScopeProvider2/06_implicit_parent.test.tsx

@@ -2,8 +2,8 @@
 import { render } from '@testing-library/react'
 import { atom, useAtom, useAtomValue } from 'jotai'
 import { atomWithReducer } from 'jotai/vanilla/utils'
-import { clickButton, getTextContents } from '../utils'
-import { ScopeProvider } from '../../src/index'
+import { clickButton, getTextContents } from './utils'
+import { ScopeProvider } from 'src/ScopeProvider2/ScopeProvider'
 
 function renderWithOrder(level1: 'BD' | 'DB', level2: 'BD' | 'DB') {
   const baseAtom = atomWithReducer(0, (v) => v + 1)

__tests__/ScopeProvider/07_writable.test.tsx → __tests__/ScopeProvider2/07_writable.test.tsx

@@ -1,7 +1,7 @@
 import { render } from '@testing-library/react'
 import { type WritableAtom, type PrimitiveAtom, atom, useAtom } from 'jotai'
-import { clickButton, getTextContents } from '../utils'
-import { ScopeProvider } from '../../src/index'
+import { clickButton, getTextContents } from './utils'
+import { ScopeProvider } from 'src/ScopeProvider2/ScopeProvider'
 
 let baseAtom: PrimitiveAtom<number>
 

__tests__/ScopeProvider/08_family.test.tsx → __tests__/ScopeProvider2/08_family.test.tsx

@@ -1,8 +1,8 @@
 import { render, act } from '@testing-library/react'
 import { useAtom, atom, useSetAtom } from 'jotai'
 import { atomFamily, atomWithReducer } from 'jotai/utils'
-import { ScopeProvider } from '../../src/index'
-import { clickButton, getTextContents } from '../utils'
+import { ScopeProvider } from 'src/ScopeProvider2/ScopeProvider'
+import { clickButton, getTextContents } from './utils'
 
 describe('AtomFamily with ScopeProvider', () => {
   /*

__tests__/ScopeProvider/09_mount.test.tsx → __tests__/ScopeProvider2/09_mount.test.tsx

@@ -1,8 +1,8 @@
 import { useState } from 'react'
 import { render, act } from '@testing-library/react'
 import { atom, useAtomValue } from 'jotai'
-import { ScopeProvider } from '../../src/index'
-import { clickButton } from '../utils'
+import { ScopeProvider } from 'src/ScopeProvider2/ScopeProvider'
+import { clickButton } from './utils'
 
 describe('ScopeProvider', () => {
   it('mounts and unmounts successfully', () => {

__tests__/utils.ts → __tests__/ScopeProvider2/utils.ts

@@ -1,5 +1,5 @@
 import { fireEvent } from '@testing-library/react'
-import { Store } from 'src/ScopeProvider/types'
+import type { Store } from 'src/ScopeProvider3/types'
 
 function getElements(container: HTMLElement, querySelectors: string[]): Element[] {
   return querySelectors.map((querySelector) => {
@@ -23,17 +23,10 @@ export function clickButton(container: HTMLElement, querySelector: string) {
   fireEvent.click(button)
 }
 
-type PrdStore = Exclude<Store, { dev4_get_internal_weak_map: any }>
-type DevStoreRev4 = Omit<Extract<Store, { dev4_get_internal_weak_map: any }>, keyof PrdStore>
+export type PrdStore = Exclude<Store, { dev4_get_internal_weak_map: any }>
+export type DevStoreRev4 = Omit<Extract<Store, { dev4_get_internal_weak_map: any }>, keyof PrdStore>
 
-export function getDevStore(store: Store): PrdStore & DevStoreRev4 {
-  if (!isDevStore(store)) {
-    throw new Error('Store is not a dev store')
-  }
-  return store
-}
-
-export function isDevStore(store: Store): store is PrdStore & DevStoreRev4 {
+function isDevStore(store: Store): store is PrdStore & DevStoreRev4 {
   return (
     'dev4_get_internal_weak_map' in store &&
     'dev4_get_mounted_atoms' in store &&
@@ -50,3 +43,6 @@ export function assertIsDevStore(store: Store): asserts store is PrdStore & DevS
 export function delay(ms: number) {
   return new Promise((resolve) => setTimeout(resolve, ms))
 }
+
+export type WithJestMock<T extends (...args: any[]) => any> = T &
+  jest.Mock<ReturnType<T>, Parameters<T>>