xoidlabs · onurkerimov · May 7, 2024 · May 7, 2024 · Aug 16, 2024
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,16 +8,40 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ### Removed
-- `create` (both as a named export and the default export) is removed. Instead use `atom`.
+- `create` (both as a named export and the default export) is removed.
+- State getter's additional overload for consuming external sources is removed.
 
+## [1.0.0-beta.14] - 2024-05-08
 
-## [1.0.0beta-12] - 2015-02-16
+### Added
+
+- The new middleware API that's accesed via `atom.call` or `atom.bind`.
+
+### Deprecated
+
+- State getter's additional overload for consuming external sources is deprecated, instead use the new middleware API.
+
+> Before:
+> ```js
+> const $derived = atom((get) => get(store.getState, store.subscribe))
+> ```
+> After:
+> ```js
+> const $derived = atom.call({
+>   get: store.getState,
+>   subscribe: store.subscribe
+> })
+> ```
+
+
+## [1.0.0-beta.12] - 2024-05-02
 
 This version, compared to the previous one only adds deprecation notices that can be fixed by slight modifications. Underlying implementations are not changed.
 
 ### Deprecated
 
 - `create` (both as a named export and the default export) is marked as deprecated, and it has been renamed to `atom`.
+
 > Before:
 > ```js
 > import create from 'xoid'
@@ -29,6 +53,7 @@ This version, compared to the previous one only adds deprecation notices that ca
 > import { atom } from 'xoid'
 > ```
 - `inject` and `effect` exports are now exported from the root. They used to be exported from the `xoid/setup` route.
+
 > Before:
 > ```js
 > import { effect, inject } from 'xoid/setup'

diff --git a/examples/celcius-fahrenheit/package.json b/examples/celcius-fahrenheit/package.json
@@ -8,8 +8,8 @@
     "react": "17.0.0",
     "react-dom": "17.0.0",
     "react-scripts": "3.4.3",
-    "xoid": "^1.0.0-beta.12",
-    "@xoid/react": "^1.0.0-beta.12"
+    "xoid": "^1.0.0-beta.14",
+    "@xoid/react": "^1.0.0-beta.14"
   },
   "devDependencies": {
     "typescript": "3.8.3"

diff --git a/examples/counter/package.json b/examples/counter/package.json
@@ -8,8 +8,8 @@
     "react": "17.0.0",
     "react-dom": "17.0.0",
     "react-scripts": "3.4.3",
-    "xoid": "^1.0.0-beta.12",
-    "@xoid/react": "^1.0.0-beta.12"
+    "xoid": "^1.0.0-beta.14",
+    "@xoid/react": "^1.0.0-beta.14"
   },
   "devDependencies": {
     "typescript": "3.8.3"

diff --git a/examples/dots-and-arrows/package.json b/examples/dots-and-arrows/package.json
@@ -12,8 +12,8 @@
     "react": "18.0.0",
     "react-dom": "18.0.0",
     "react-scripts": "4.0.3",
-    "xoid": "^1.0.0-beta.12",
-    "@xoid/react": "^1.0.0-beta.12"
+    "xoid": "^1.0.0-beta.14",
+    "@xoid/react": "^1.0.0-beta.14"
   },
   "devDependencies": {
     "@types/react": "17.0.20",

diff --git a/examples/finite-state-stopwatch/package.json b/examples/finite-state-stopwatch/package.json
@@ -8,8 +8,8 @@
     "react": "17.0.0",
     "react-dom": "17.0.0",
     "react-scripts": "3.4.3",
-    "xoid": "^1.0.0-beta.12",
-    "@xoid/react": "^1.0.0-beta.12"
+    "xoid": "^1.0.0-beta.14",
+    "@xoid/react": "^1.0.0-beta.14"
   },
   "devDependencies": {
     "typescript": "3.8.3"

diff --git a/examples/redux-devtools-extension/package.json b/examples/redux-devtools-extension/package.json
@@ -6,11 +6,11 @@
   "main": "src/index.js",
   "dependencies": {
     "@xoid/devtools": "0.5.0",
-    "@xoid/react": "1.0.0-beta.12",
+    "@xoid/react": "1.0.0-beta.14",
     "react": "17.0.0",
     "react-dom": "17.0.0",
     "react-scripts": "3.4.3",
-    "xoid": "1.0.0-beta.12"
+    "xoid": "1.0.0-beta.14"
   },
   "devDependencies": {
     "typescript": "3.8.3"

diff --git a/examples/todos-basic/package.json b/examples/todos-basic/package.json
@@ -8,8 +8,8 @@
     "react": "17.0.0",
     "react-dom": "17.0.0",
     "react-scripts": "3.4.3",
-    "xoid": "^1.0.0-beta.12",
-    "@xoid/react": "^1.0.0-beta.12"
+    "xoid": "^1.0.0-beta.14",
+    "@xoid/react": "^1.0.0-beta.14"
   },
   "devDependencies": {
     "typescript": "3.8.3"

diff --git a/examples/todos-filtered/package.json b/examples/todos-filtered/package.json
@@ -8,8 +8,8 @@
     "react": "17.0.0",
     "react-dom": "17.0.0",
     "react-scripts": "3.4.3",
-    "xoid": "^1.0.0-beta.12",
-    "@xoid/react": "^1.0.0-beta.12"
+    "xoid": "^1.0.0-beta.14",
+    "@xoid/react": "^1.0.0-beta.14"
   },
   "devDependencies": {
     "typescript": "3.8.3"

diff --git a/examples/transient-update-resize-observer/package.json b/examples/transient-update-resize-observer/package.json
@@ -9,8 +9,8 @@
     "react-dom": "17.0.0",
     "react-scripts": "3.4.3",
     "@juggle/resize-observer": "^3.3.1",
-    "xoid": "^1.0.0-beta.12",
-    "@xoid/react": "^1.0.0-beta.12"
+    "xoid": "^1.0.0-beta.14",
+    "@xoid/react": "^1.0.0-beta.14"
   },
   "devDependencies": {
     "typescript": "3.8.3"

diff --git a/examples/use-items-abstraction/package.json b/examples/use-items-abstraction/package.json
@@ -8,8 +8,8 @@
     "react": "16.8.3",
     "react-dom": "16.8.3",
     "react-scripts": "2.1.8",
-    "xoid": "^1.0.0-beta.12",
-    "@xoid/react": "^1.0.0-beta.12"
+    "xoid": "^1.0.0-beta.14",
+    "@xoid/react": "^1.0.0-beta.14"
   },
   "devDependencies": {
     "typescript": "3.3.3"

diff --git a/examples/xoid-vs-usereducer-vs-usemethods/package.json b/examples/xoid-vs-usereducer-vs-usemethods/package.json
@@ -9,8 +9,8 @@
     "react-dom": "16.8.3",
     "react-scripts": "2.1.8",
     "use-methods": "0.4.5",
-    "xoid": "^1.0.0-beta.12",
-    "@xoid/react": "^1.0.0-beta.12"
+    "xoid": "^1.0.0-beta.14",
+    "@xoid/react": "^1.0.0-beta.14"
   },
   "devDependencies": {
     "typescript": "3.3.3"

diff --git a/packages/deprecated/lite/README.md b/packages/deprecated/lite/README.md
diff --git a/packages/deprecated/lite/package.json b/packages/deprecated/lite/package.json
diff --git a/packages/deprecated/lite/src/index.tsx b/packages/deprecated/lite/src/index.tsx
diff --git a/packages/devtools/package.json b/packages/devtools/package.json
@@ -33,6 +33,6 @@
     "observable"
   ],
   "peerDependencies": {
-    "xoid": ">=1.0.0-beta.12"
+    "xoid": ">=1.0.0-beta.14"
   }
 }
diff --git a/packages/incubator/produce/package.json b/packages/incubator/produce/package.json
@@ -29,6 +29,6 @@
     "observable"
   ],
   "peerDependencies": {
-    "xoid": ">=1.0.0-beta.12"
+    "xoid": ">=1.0.0-beta.14"
   }
 }
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@xoid/react",
-  "version": "1.0.0-beta.12",
+  "version": "1.0.0-beta.14",
   "main": "./index.js",
   "module": "./index.esm.js",
   "types": "./index.d.ts",
@@ -54,7 +54,7 @@
     "use-sync-external-store": "^1.1.0"
   },
   "peerDependencies": {
-    "xoid": ">=1.0.0-beta.12",
+    "xoid": ">=1.0.0-beta.14",
     "react": "*"
   }
 }
diff --git a/packages/reactive/package.json b/packages/reactive/package.json
@@ -29,6 +29,6 @@
     "observable"
   ],
   "peerDependencies": {
-    "xoid": ">=1.0.0-beta.12"
+    "xoid": ">=1.0.0-beta.14"
   }
 }
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
@@ -47,7 +47,7 @@
     "observable"
   ],
   "peerDependencies": {
-    "xoid": ">=1.0.0-beta.12",
+    "xoid": ">=1.0.0-beta.14",
     "svelte": "*"
   }
 }
diff --git a/packages/vue/package.json b/packages/vue/package.json
@@ -47,7 +47,7 @@
     "observable"
   ],
   "peerDependencies": {
-    "xoid": ">=1.0.0-beta.12",
+    "xoid": ">=1.0.0-beta.14",
     "vue": "<=3.1"
   }
 }
diff --git a/packages/xoid/package.json b/packages/xoid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "xoid",
-  "version": "1.0.0-beta.12",
+  "version": "1.0.0-beta.14",
   "main": "./index.js",
   "module": "./index.esm.js",
   "types": "./index.d.ts",

diff --git a/packages/xoid/src/atom.tsx b/packages/xoid/src/atom.tsx
@@ -1,6 +1,7 @@
 import type { Atom, Stream, Init, Actions } from './internal/types'
-import { createAtom, createInternal, tools } from './internal/utils'
-import { createSelector } from './internal/createSelector'
+import { createAtom, tools } from './internal/utils'
+import { derived } from './internal/derived'
+import { store } from './internal/store'
 
 /**
  * Creates an atom with the first argument as the initial state.
@@ -10,14 +11,14 @@ import { createSelector } from './internal/createSelector'
 export function atom<T>(init: Init<T>): Atom<T>
 export function atom<T, U>(init: Init<T>, getActions?: (a: Atom<T>) => U): Atom<T> & Actions<U>
 export function atom<T>(): Stream<T>
-export function atom<T, U = undefined>(init?: Init<T>, getActions?: (a: Atom<T>) => U) {
+export function atom<T, U = undefined>(this, init?: Init<T>, getActions?: (a: Atom<T>) => U) {
   // @ts-ignore
-  const internal = (typeof init === 'function' ? createSelector : createInternal)(init)
+  const baseStore = (typeof init === 'function' ? derived : store).call(this, init)
   // @ts-ignore
-  internal.isStream = !arguments.length
+  baseStore.isStream = !arguments.length
 
   // @ts-ignore
-  return createAtom(internal, getActions)
+  return createAtom(baseStore, getActions)
 }
 
 atom.plugins = [] as ((a: Atom<any>) => void)[]

diff --git a/packages/xoid/src/internal/createFocus.tsx b/packages/xoid/src/internal/createFocus.tsx
@@ -1,5 +1,6 @@
+import { Store } from './store'
 import { Atom } from './types'
-import { createAtom, Internal } from './utils'
+import { createAtom } from './utils'
 
 export const INTERNAL = Symbol()
 
@@ -43,7 +44,7 @@ const handler = {
 const pathProxy = new Proxy([], handler)
 
 export const createFocus =
-  <T,>(internal: Internal<T>, basePath: string[]): Atom<T>['focus'] =>
+  <T,>(internal: Store<T>, basePath: string[]): Atom<T>['focus'] =>
   (key: any) => {
     const relativePath = typeof key === 'function' ? key(pathProxy)[INTERNAL] : [key]
     if (!internal.cache) internal.cache = {}