Clean

packages/db/native/modify/modify.zig

@@ -337,8 +337,10 @@ fn modifyInternal(env: napi.c.napi_env, info: napi.c.napi_callback_info, resCoun
     db.expire(&ctx);
 
     const newDirtyRanges = ctx.dirtyRanges.values();
+    std.debug.print("newDirtyRanges.len {d} - {d}\n", .{ newDirtyRanges.len, dirtyRanges.len });
     assert(newDirtyRanges.len < dirtyRanges.len);
     _ = napi.c.memcpy(dirtyRanges.ptr, newDirtyRanges.ptr, newDirtyRanges.len * 8);
+    std.debug.print("newDirtyRanges.len {d} - {d}\n", .{ newDirtyRanges.len, dirtyRanges.len });
     dirtyRanges[newDirtyRanges.len] = 0.0;
     writeoutPrevNodeId(&ctx, resCount, ctx.id);
 }

packages/db/src/client/index.ts

@@ -1,9 +1,9 @@
 import {
-  MigrateFns,
   parse,
-  Schema,
-  StrictSchema,
-  SchemaChecksum,
+  type Schema,
+  type SchemaIn,
+  type SchemaMigrateFns,
+  type SchemaOut,
 } from '@based/schema'
 import { BasedDbQuery, QueryByAliasObj } from './query/BasedDbQuery.js'
 import { debugMode } from '../utils.js'
@@ -38,7 +38,7 @@ export class DbClient extends DbShared {
     this.hooks = hooks
     this.maxModifySize = maxModifySize
     this.modifyCtx = new Ctx(
-      0,
+      { locales: {}, types: {}, hash: 0 },
       new Uint8Array(
         new ArrayBuffer(Math.min(1e3, maxModifySize), {
           maxByteLength: maxModifySize,
@@ -75,21 +75,21 @@ export class DbClient extends DbShared {
   }
 
   async setSchema(
-    schema: Schema,
-    transformFns?: MigrateFns,
-  ): Promise<SchemaChecksum> {
+    schema: SchemaIn,
+    transformFns?: SchemaMigrateFns,
+  ): Promise<SchemaOut['hash']> {
     const strictSchema = parse(schema).schema
     await this.drain()
     const schemaChecksum = await this.hooks.setSchema(
-      strictSchema as StrictSchema,
+      strictSchema as Schema<true>,
       transformFns,
     )
     if (this.stopped) {
-      return this.schema.hash
+      return this.schema?.hash ?? 0
     }
     if (schemaChecksum !== this.schema?.hash) {
       await this.once('schema')
-      return this.schema.hash
+      return this.schema?.hash ?? 0
     }
     return schemaChecksum
   }
@@ -261,7 +261,7 @@ export class DbClient extends DbShared {
 
   destroy() {
     this.stop()
-    delete this.listeners
+    this.listeners = {}
   }
 
   stop() {

packages/db/src/client/modify/Ctx.ts

@@ -1,38 +1,41 @@
 import { writeUint64 } from '@based/utils'
-import type { SchemaTypeDef, PropDef } from '@based/schema/def'
-import type { LangCode } from '@based/schema'
+import type { LangCode, MainDef, SchemaOut, TypeDef } from '@based/schema'
 import { type ModifyOp } from './types.js'
 import type { Tmp } from './Tmp.js'
 
 export class Ctx {
-  constructor(schemaChecksum: number, array: Uint8Array<ArrayBufferLike>) {
+  constructor(schema: SchemaOut, array: Uint8Array<ArrayBufferLike>) {
     this.array = array
     this.max = array.buffer.maxByteLength - 4 // dataLen
     this.size = array.buffer.byteLength - 4
-    writeUint64(array, schemaChecksum, 0)
+    this.schema = schema
+    writeUint64(array, schema.hash, 0)
   }
+  schema: SchemaOut
   start: number
   index: number = 8
-  schema: SchemaTypeDef
+  typeDef: TypeDef
   array: Uint8Array<ArrayBufferLike>
   max: number
   size: number
   unsafe?: boolean
   operation: ModifyOp
-  main: Map<PropDef, any> = new Map()
+  main: Map<MainDef, any> = new Map()
   draining: Promise<void>
-  scheduled: Promise<void>
+  scheduled?: Promise<void>
   locale: LangCode
   sort: number = 0
   sortText: number = 0
   defaults: number = 0
   cursor: {
     type?: number
     prop?: number
-    main?: number
+    main: number
     operation?: ModifyOp
     upserting?: boolean
-  } = {}
+  } = {
+    main: 0,
+  }
   batch: {
     count?: number
     promises?: Tmp[]