Merge branch 'tim-smart:main' into main

Josh-a-e · web-flow · commit 68438dd8a796 · 2026-01-15T10:36:18.000Z
diff --git a/docs/atom-livestore/AtomLivestore.ts.md b/docs/atom-livestore/AtomLivestore.ts.md
@@ -29,7 +29,7 @@ Added in v1.0.0
 ```ts
 export declare const Tag: <Self>() => <const Id extends string, S extends LiveStoreSchema, Context = {}>(
   id: Id,
-  options: Options<Id, S, Context> | Atom.Atom<Options<Id, S, Context>>
+  options: Options<S, Context> | ((get: Atom.Context) => Options<S, Context>)
 ) => AtomLiveStore<Self, Id, S, Context>
 ```
 
@@ -87,10 +87,7 @@ Added in v1.0.0
 **Signature**
 
 ```ts
-export type Options<const Id extends string, S extends LiveStoreSchema, Context = {}> = CreateStoreOptions<
-  S,
-  Context
-> & {
+export type Options<S extends LiveStoreSchema, Context = {}> = CreateStoreOptions<S, Context> & {
   readonly otelOptions?: Partial<OtelOptions> | undefined
 }
 ```
diff --git a/docs/atom/Atom.ts.md b/docs/atom/Atom.ts.md
@@ -92,11 +92,6 @@ Added in v1.0.0
   - [Interrupt (type alias)](#interrupt-type-alias)
   - [Reset](#reset)
   - [Reset (type alias)](#reset-type-alias)
-- [type ids](#type-ids)
-  - [TypeId](#typeid)
-  - [TypeId (type alias)](#typeid-type-alias)
-  - [WritableTypeId](#writabletypeid)
-  - [WritableTypeId (type alias)](#writabletypeid-type-alias)
 - [utils](#utils)
   - [Failure (type alias)](#failure-type-alias)
   - [PullSuccess (type alias)](#pullsuccess-type-alias)
@@ -1211,48 +1206,6 @@ export type Reset = typeof Reset
 
 Added in v1.0.0
 
-# type ids
-
-## TypeId
-
-**Signature**
-
-```ts
-export declare const TypeId: "~effect-atom/atom/Atom"
-```
-
-Added in v1.0.0
-
-## TypeId (type alias)
-
-**Signature**
-
-```ts
-export type TypeId = "~effect-atom/atom/Atom"
-```
-
-Added in v1.0.0
-
-## WritableTypeId
-
-**Signature**
-
-```ts
-export declare const WritableTypeId: "~effect-atom/atom/Atom/Writable"
-```
-
-Added in v1.0.0
-
-## WritableTypeId (type alias)
-
-**Signature**
-
-```ts
-export type WritableTypeId = "~effect-atom/atom/Atom/Writable"
-```
-
-Added in v1.0.0
-
 # utils
 
 ## Failure (type alias)
diff --git a/docs/atom/AtomRef.ts.md b/docs/atom/AtomRef.ts.md
@@ -19,9 +19,6 @@ Added in v1.0.0
   - [AtomRef (interface)](#atomref-interface)
   - [Collection (interface)](#collection-interface)
   - [ReadonlyRef (interface)](#readonlyref-interface)
-- [type ids](#type-ids)
-  - [TypeId](#typeid)
-  - [TypeId (type alias)](#typeid-type-alias)
 
 ---
 
@@ -93,25 +90,3 @@ export interface ReadonlyRef<A> extends Equal.Equal {
 ```
 
 Added in v1.0.0
-
-# type ids
-
-## TypeId
-
-**Signature**
-
-```ts
-export declare const TypeId: "~effect-atom/atom/AtomRef"
-```
-
-Added in v1.0.0
-
-## TypeId (type alias)
-
-**Signature**
-
-```ts
-export type TypeId = "~effect-atom/atom/AtomRef"
-```
-
-Added in v1.0.0
diff --git a/docs/atom/Registry.ts.md b/docs/atom/Registry.ts.md
@@ -27,9 +27,6 @@ Added in v1.0.0
   - [isRegistry](#isregistry)
 - [models](#models)
   - [Registry (interface)](#registry-interface)
-- [type ids](#type-ids)
-  - [TypeId](#typeid)
-  - [TypeId (type alias)](#typeid-type-alias)
 
 ---
 
@@ -183,25 +180,3 @@ export interface Registry {
 ```
 
 Added in v1.0.0
-
-# type ids
-
-## TypeId
-
-**Signature**
-
-```ts
-export declare const TypeId: "~effect-atom/atom/Registry"
-```
-
-Added in v1.0.0
-
-## TypeId (type alias)
-
-**Signature**
-
-```ts
-export type TypeId = "~effect-atom/atom/Registry"
-```
-
-Added in v1.0.0
diff --git a/docs/atom/Result.ts.md b/docs/atom/Result.ts.md
@@ -66,9 +66,6 @@ Added in v1.0.0
   - [isNotInitial](#isnotinitial)
   - [isSuccess](#issuccess)
   - [isWaiting](#iswaiting)
-- [type ids](#type-ids)
-  - [TypeId](#typeid)
-  - [TypeId (type alias)](#typeid-type-alias)
 - [utils](#utils)
   - [With (type alias)](#with-type-alias)
 
@@ -755,28 +752,6 @@ export declare const isWaiting: <A, E>(result: Result<A, E>) => boolean
 
 Added in v1.0.0
 
-# type ids
-
-## TypeId
-
-**Signature**
-
-```ts
-export declare const TypeId: typeof TypeId
-```
-
-Added in v1.0.0
-
-## TypeId (type alias)
-
-**Signature**
-
-```ts
-export type TypeId = typeof TypeId
-```
-
-Added in v1.0.0
-
 # utils
 
 ## With (type alias)
diff --git a/packages/atom-livestore/CHANGELOG.md b/packages/atom-livestore/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @effect-rx/rx-livestore
 
+## 0.4.8
+
+### Patch Changes
+
+- [`c874a58`](https://github.com/tim-smart/effect-atom/commit/c874a58df3d7bf921d987bbdce5cd219587c8755) Thanks [@tim-smart](https://github.com/tim-smart)! - try hiding type ids to fix declaration emit errors
+
+- Updated dependencies [[`c874a58`](https://github.com/tim-smart/effect-atom/commit/c874a58df3d7bf921d987bbdce5cd219587c8755)]:
+  - @effect-atom/atom@0.4.12
+
 ## 0.4.7
 
 ### Patch Changes
diff --git a/packages/atom-livestore/package.json b/packages/atom-livestore/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@effect-atom/atom-livestore",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "description": "effect-atom bindings to livestore",
   "type": "module",
   "publishConfig": {
diff --git a/packages/atom-react/CHANGELOG.md b/packages/atom-react/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @effect-rx/rx-react
 
+## 0.4.5
+
+### Patch Changes
+
+- [`c874a58`](https://github.com/tim-smart/effect-atom/commit/c874a58df3d7bf921d987bbdce5cd219587c8755) Thanks [@tim-smart](https://github.com/tim-smart)! - try hiding type ids to fix declaration emit errors
+
+- Updated dependencies [[`c874a58`](https://github.com/tim-smart/effect-atom/commit/c874a58df3d7bf921d987bbdce5cd219587c8755)]:
+  - @effect-atom/atom@0.4.12
+
 ## 0.4.4
 
 ### Patch Changes
diff --git a/packages/atom-react/package.json b/packages/atom-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@effect-atom/atom-react",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "description": "Reactive toolkit for Effect",
   "type": "module",
   "publishConfig": {
diff --git a/packages/atom-vue/CHANGELOG.md b/packages/atom-vue/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @effect-rx/rx-vue
 
+## 0.4.5
+
+### Patch Changes
+
+- [`c874a58`](https://github.com/tim-smart/effect-atom/commit/c874a58df3d7bf921d987bbdce5cd219587c8755) Thanks [@tim-smart](https://github.com/tim-smart)! - try hiding type ids to fix declaration emit errors
+
+- Updated dependencies [[`c874a58`](https://github.com/tim-smart/effect-atom/commit/c874a58df3d7bf921d987bbdce5cd219587c8755)]:
+  - @effect-atom/atom@0.4.12
+
 ## 0.4.4
 
 ### Patch Changes
diff --git a/packages/atom-vue/package.json b/packages/atom-vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@effect-atom/atom-vue",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "description": "Reactive toolkit for Effect",
   "type": "module",
   "publishConfig": {
diff --git a/packages/atom-vue/src/index.ts b/packages/atom-vue/src/index.ts
@@ -52,7 +52,7 @@ export * as AtomRpc from "@effect-atom/atom/AtomRpc"
  * @since 1.0.0
  * @category registry
  */
-export const registryKey = Symbol.for(Registry.TypeId) as InjectionKey<Registry.Registry>
+export const registryKey = Symbol.for("@effect-atom/atom-vue/registryKey") as InjectionKey<Registry.Registry>
 
 /**
  * @since 1.0.0
diff --git a/packages/atom/CHANGELOG.md b/packages/atom/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @effect-rx/rx
 
+## 0.4.13
+
+### Patch Changes
+
+- [`02b8cec`](https://github.com/tim-smart/effect-atom/commit/02b8cec7f204146b50990f0040fe9355d94fed25) Thanks [@tim-smart](https://github.com/tim-smart)! - don't overwrite kvs values with defaultValue
+
+## 0.4.12
+
+### Patch Changes
+
+- [`c874a58`](https://github.com/tim-smart/effect-atom/commit/c874a58df3d7bf921d987bbdce5cd219587c8755) Thanks [@tim-smart](https://github.com/tim-smart)! - try hiding type ids to fix declaration emit errors
+
 ## 0.4.11
 
 ### Patch Changes
diff --git a/packages/atom/package.json b/packages/atom/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@effect-atom/atom",
-  "version": "0.4.11",
+  "version": "0.4.13",
   "description": "Reactive toolkit for Effect",
   "type": "module",
   "publishConfig": {
diff --git a/packages/atom/src/Atom.ts b/packages/atom/src/Atom.ts
@@ -40,17 +40,8 @@ import * as Registry from "./Registry.js"
 import { AtomRegistry as AtomRegistry } from "./Registry.js"
 import * as Result from "./Result.js"
 
-/**
- * @since 1.0.0
- * @category type ids
- */
-export const TypeId: TypeId = "~effect-atom/atom/Atom"
-
-/**
- * @since 1.0.0
- * @category type ids
- */
-export type TypeId = "~effect-atom/atom/Atom"
+const TypeId: TypeId = "~effect-atom/atom/Atom"
+type TypeId = "~effect-atom/atom/Atom"
 
 /**
  * @since 1.0.0
@@ -98,17 +89,8 @@ export type Failure<T extends Atom<any>> = T extends Atom<Result.Result<infer _,
 export type WithoutSerializable<T extends Atom<any>> = T extends Writable<infer R, infer W> ? Writable<R, W>
   : Atom<Type<T>>
 
-/**
- * @since 1.0.0
- * @category type ids
- */
-export const WritableTypeId: WritableTypeId = "~effect-atom/atom/Atom/Writable"
-
-/**
- * @since 1.0.0
- * @category type ids
- */
-export type WritableTypeId = "~effect-atom/atom/Atom/Writable"
+type WritableTypeId = "~effect-atom/atom/Atom/Writable"
+const WritableTypeId: WritableTypeId = "~effect-atom/atom/Atom/Writable"
 
 /**
  * @since 1.0.0
@@ -1820,19 +1802,23 @@ export const kvs = <A>(options: {
   const resultAtom = options.runtime.atom(
     Effect.flatMap(
       KeyValueStore.KeyValueStore,
-      (store) => Effect.flatten(store.forSchema(options.schema).get(options.key))
+      (store) => store.forSchema(options.schema).get(options.key)
     )
   )
   return writable(
     (get) => {
       get.mount(setAtom)
-      const value = Result.value(get(resultAtom))
-      if (Option.isSome(value)) {
-        return value.value
-      }
-      const defaultValue = options.defaultValue()
-      get.set(setAtom, defaultValue)
-      return defaultValue
+      get.subscribe(resultAtom, (result) => {
+        if (!Result.isSuccess(result)) return
+        if (Option.isSome(result.value)) {
+          get.setSelf(result.value.value)
+        } else {
+          const value = Option.getOrElse(get.self<A>(), options.defaultValue)
+          get.setSelf(value)
+          get.set(setAtom, value)
+        }
+      }, { immediate: true })
+      return Option.getOrElse(get.self<A>(), options.defaultValue)
     },
     (ctx, value: A) => {
       ctx.set(setAtom, value as any)
diff --git a/packages/atom/src/AtomRef.ts b/packages/atom/src/AtomRef.ts
@@ -5,17 +5,8 @@ import * as Equal from "effect/Equal"
 import { globalValue } from "effect/GlobalValue"
 import * as Hash from "effect/Hash"
 
-/**
- * @since 1.0.0
- * @category type ids
- */
-export const TypeId: TypeId = "~effect-atom/atom/AtomRef"
-
-/**
- * @since 1.0.0
- * @category type ids
- */
-export type TypeId = "~effect-atom/atom/AtomRef"
+const TypeId: TypeId = "~effect-atom/atom/AtomRef"
+type TypeId = "~effect-atom/atom/AtomRef"
 
 /**
  * @since 1.0.0
diff --git a/packages/atom/src/Registry.ts b/packages/atom/src/Registry.ts
diff --git a/packages/atom/src/Result.ts b/packages/atom/src/Result.ts
diff --git a/packages/atom/src/internal/registry.ts b/packages/atom/src/internal/registry.ts
diff --git a/packages/atom/test/Atom.test.ts b/packages/atom/test/Atom.test.ts

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@effect-atom/atom-livestore",`
`3`		`- "version": "0.4.7",`
	`3`	`+ "version": "0.4.8",`
`4`	`4`	`"description": "effect-atom bindings to livestore",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"publishConfig": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@effect-atom/atom-react",`
`3`		`- "version": "0.4.4",`
	`3`	`+ "version": "0.4.5",`
`4`	`4`	`"description": "Reactive toolkit for Effect",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"publishConfig": {`