Merge pull request #27 from oliver-oloughlin/patch/fix-atomic-generics

Patch/fix atomic generics

README.md

@@ -14,7 +14,7 @@ Optional and nullable properties are allowed. If you wish to use Zod, you can
 create your Zod object schema and use its type as your model.
 
 ```ts
-import type { Model } from "https://deno.land/x/[email protected].0/mod.ts"
+import type { Model } from "https://deno.land/x/[email protected].1/mod.ts"
 
 interface User extends Model {
   username: string
@@ -35,7 +35,7 @@ The "createDb" function is used for creating a new database instance. It takes a
 Deno KV instance and a schema builder function as arguments.
 
 ```ts
-import { createDb } from "https://deno.land/x/[email protected].0/mod.ts"
+import { createDb } from "https://deno.land/x/[email protected].1/mod.ts"
 
 const kv = await Deno.openKv()
 
@@ -425,7 +425,7 @@ result will be an object containing: id, versionstamp and all the entries in the
 document value.
 
 ```ts
-import { flatten } from "https://deno.land/x/[email protected].0/mod.ts"
+import { flatten } from "https://deno.land/x/[email protected].1/mod.ts"
 
 // We assume the document exists in the KV store
 const doc = await db.users.find(123n)

src/atomic_builder.ts

@@ -27,12 +27,11 @@ import {
 export class AtomicBuilder<
   const TSchema extends Schema,
   const TValue extends KvValue,
-  const TCollection extends Collection<TValue>,
 > {
   private kv: Deno.Kv
   private schema: TSchema
   private operations: Operations
-  private collection: TCollection
+  private collection: Collection<TValue>
 
   /**
    * Create a new AtomicBuilder for building and executing atomic operations in the KV store.
@@ -45,7 +44,7 @@ export class AtomicBuilder<
   constructor(
     kv: Deno.Kv,
     schema: TSchema,
-    collection: TCollection,
+    collection: Collection<TValue>,
     operations?: Operations,
   ) {
     this.kv = kv
@@ -73,7 +72,7 @@ export class AtomicBuilder<
    * @returns A new AtomicBuilder instance.
    */
   select<const TValue extends KvValue>(
-    selector: CollectionSelector<TSchema, TValue, Collection<TValue>>,
+    selector: CollectionSelector<TSchema, TValue>,
   ) {
     return new AtomicBuilder(
       this.kv,

src/types.ts

@@ -5,8 +5,7 @@ import type { AtomicBuilder } from "./atomic_builder.ts"
 export type CollectionSelector<
   T1 extends Schema,
   T2 extends KvValue,
-  T3 extends Collection<T2>,
-> = (schema: T1) => T3
+> = (schema: T1) => Collection<T2>
 
 export type AtomicOperationFn = (
   op: Deno.AtomicOperation,
@@ -55,15 +54,15 @@ export type AtomicMutation<T extends KvValue> =
     }
     | {
       type: "sum"
-      value: Deno.KvU64
+      value: T extends Deno.KvU64 ? T : never
     }
     | {
       type: "min"
-      value: Deno.KvU64
+      value: T extends Deno.KvU64 ? T : never
     }
     | {
       type: "max"
-      value: Deno.KvU64
+      value: T extends Deno.KvU64 ? T : never
     }
     | {
       type: "delete"
@@ -154,10 +153,9 @@ export type DB<TSchema extends Schema> = TSchema & {
    */
   atomic: <
     const TValue extends KvValue,
-    const TCollection extends Collection<TValue>,
   >(
-    selector: CollectionSelector<TSchema, TValue, TCollection>,
-  ) => AtomicBuilder<TSchema, TValue, TCollection>
+    selector: CollectionSelector<TSchema, TValue>,
+  ) => AtomicBuilder<TSchema, TValue>
 }
 
 // KV Types