js-bao 0.3.0-alpha.0 → 0.3.0-alpha.2

package/dist/cloudflare-do.cjs

@@ -1979,6 +1979,7 @@ function createDatabaseDO(config = {}) {
         if (request.method === "DELETE" && path === "/destroy") {
           await this._doState.storage.deleteAll();
           this._initialized = false;
+          this._engine.initialized = false;
           return Response.json({
             deleted: true,
             deletedAt: (/* @__PURE__ */ new Date()).toISOString()
@@ -2026,6 +2027,8 @@ function createDatabaseDO(config = {}) {
             return this._handleHealth();
           case "/describe":
             return this._handleDescribe(request);
+          case "/models":
+            return this._handleModelList();
           default:
             return this._errorResponse("Not found", 404);
         }
@@ -2047,6 +2050,7 @@ function createDatabaseDO(config = {}) {
           modelName,
           docId,
           request,
+          engine: this._engine,
           filter,
           options
         };
@@ -2065,7 +2069,18 @@ function createDatabaseDO(config = {}) {
       });
       const { sql, params, sortFields } = translator.translateFind(filter, options);
       const rawResults = this._engine.execSqlSync(sql, params);
-      const data = rawResults.map((row) => this._parseRow(row));
+      let data = rawResults.map((row) => this._parseRow(row));
+      if (hooks?.afterQuery) {
+        const ctx = {
+          modelName,
+          docId,
+          request,
+          engine: this._engine,
+          results: data
+        };
+        const result = await hooks.afterQuery(ctx);
+        data = result.results;
+      }
       const limit = options?.limit;
       const hasMore = CursorManager.hasMoreResults(limit, data.length);
       const isFirstPage = !options?.uniqueStartKey;
@@ -2083,6 +2098,18 @@ function createDatabaseDO(config = {}) {
       };
       return Response.json(response);
     }
+    /** @internal — Check for reserved field names in record data */
+    _checkReservedFields(data) {
+      for (const key of Object.keys(data)) {
+        if (key === "type") {
+          return `Field 'type' is reserved and cannot be used in record data`;
+        }
+        if (key.startsWith("_meta")) {
+          return `Field '${key}' is reserved (fields starting with '_meta' are internal) and cannot be used in record data`;
+        }
+      }
+      return null;
+    }
     /** @internal */
     async _handleSave(request, docId) {
       const body = await request.json();
@@ -2090,6 +2117,15 @@ function createDatabaseDO(config = {}) {
       if (!modelName || !id) {
         return this._errorResponse("modelName and id are required", 400);
       }
+      if (!data) {
+        return this._errorResponse("data is required", 400);
+      }
+      if (data) {
+        const reservedError = this._checkReservedFields(data);
+        if (reservedError) {
+          return this._errorResponse(reservedError, 400);
+        }
+      }
       if (condition && !this._checkCondition(modelName, id, condition)) {
         return this._errorResponse(
           `Condition not met for ${modelName}/${id}`,
@@ -2108,6 +2144,7 @@ function createDatabaseDO(config = {}) {
           modelName,
           docId,
           request,
+          engine: this._engine,
           id,
           data,
           stringSets,
@@ -2146,6 +2183,10 @@ function createDatabaseDO(config = {}) {
       if (!modelName || !id || !data) {
         return this._errorResponse("modelName, id, and data are required", 400);
       }
+      const reservedError = this._checkReservedFields(data);
+      if (reservedError) {
+        return this._errorResponse(reservedError, 400);
+      }
       if (!this._engine.recordExists(modelName, id)) {
         return this._errorResponse(`Record ${modelName}/${id} not found`, 404);
       }
@@ -2160,6 +2201,7 @@ function createDatabaseDO(config = {}) {
           modelName,
           docId,
           request,
+          engine: this._engine,
           id,
           data,
           stringSets,
@@ -2205,11 +2247,21 @@ function createDatabaseDO(config = {}) {
         );
       }
       if (hooks?.beforeDelete) {
+        let record = null;
+        const rows = this._engine.execSqlSync(
+          "SELECT id, type, data_json FROM records WHERE id = ? AND type = ?",
+          [id, modelName]
+        );
+        if (rows.length > 0) {
+          record = this._parseRow(rows[0]);
+        }
         const ctx = {
           modelName,
           docId,
           request,
-          id
+          engine: this._engine,
+          id,
+          record
         };
         const result = await hooks.beforeDelete(ctx);
         if (!result.allow) {
@@ -2243,12 +2295,20 @@ function createDatabaseDO(config = {}) {
               400
             );
           }
+          const reservedError = this._checkReservedFields(op.data);
+          if (reservedError) {
+            return this._errorResponse(
+              `Operation ${i}: ${reservedError}`,
+              400
+            );
+          }
           if (hooks?.beforeSave) {
             const isNew = op.op === "save" ? !this._engine.recordExists(op.modelName, op.id) : false;
             const ctx = {
               modelName: op.modelName,
               docId,
               request,
+              engine: this._engine,
               id: op.id,
               data: op.data,
               stringSets: op.stringSets,
@@ -2261,11 +2321,21 @@ function createDatabaseDO(config = {}) {
           }
         } else if (op.op === "delete") {
           if (hooks?.beforeDelete) {
+            let record = null;
+            const rows = this._engine.execSqlSync(
+              "SELECT id, type, data_json FROM records WHERE id = ? AND type = ?",
+              [op.id, op.modelName]
+            );
+            if (rows.length > 0) {
+              record = this._parseRow(rows[0]);
+            }
             const ctx = {
               modelName: op.modelName,
               docId,
               request,
-              id: op.id
+              engine: this._engine,
+              id: op.id,
+              record
             };
             const result = await hooks.beforeDelete(ctx);
             if (!result.allow) {
@@ -2490,6 +2560,7 @@ function createDatabaseDO(config = {}) {
           modelName,
           docId,
           request,
+          engine: this._engine,
           filter
         };
         const result = await hooks.beforeQuery(ctx);
@@ -2602,6 +2673,7 @@ function createDatabaseDO(config = {}) {
           modelName,
           docId,
           request,
+          engine: this._engine,
           filter
         };
         const result = await hooks.beforeQuery(ctx);
@@ -3087,6 +3159,23 @@ function createDatabaseDO(config = {}) {
       const response = { modelName, fields };
       return Response.json(response);
     }
+    /** @internal — List all known model names from records and _model_fields */
+    _handleModelList() {
+      const fromRecords = this._engine.execSqlSync(
+        "SELECT DISTINCT type FROM records ORDER BY type"
+      );
+      const fromFields = this._engine.execSqlSync(
+        "SELECT DISTINCT model_name FROM _model_fields ORDER BY model_name"
+      );
+      const fromIndexes = this._engine.execSqlSync(
+        "SELECT DISTINCT model_name FROM _indexes ORDER BY model_name"
+      );
+      const modelSet = /* @__PURE__ */ new Set();
+      for (const row of fromRecords) modelSet.add(row.type);
+      for (const row of fromFields) modelSet.add(row.model_name);
+      for (const row of fromIndexes) modelSet.add(row.model_name);
+      return Response.json({ models: Array.from(modelSet).sort() });
+    }
     /** @internal */
     _errorResponse(message, status) {
       const body = { error: message };

package/dist/cloudflare-do.d.cts

@@ -194,7 +194,7 @@ interface JsonSchemaEngineOptions extends JsonSchemaOptions {
 }
 declare abstract class JsonSchemaEngine extends DatabaseEngine {
     protected schemaOptions: JsonSchemaEngineOptions;
-    protected initialized: boolean;
+    initialized: boolean;
     constructor(options: JsonSchemaEngineOptions);
     /**
      * Execute SQL and return results.
@@ -880,6 +880,8 @@ interface HookContext {
     docId: string;
     /** The raw request (for reading headers, auth tokens, etc.) */
     request: Request;
+    /** The DO's SQLite engine (for direct queries, e.g. lookup functions) */
+    engine: any;
 }
 /** Context for beforeSave hooks */
 interface BeforeSaveContext extends HookContext {
@@ -896,6 +898,8 @@ interface BeforeSaveContext extends HookContext {
 interface BeforeDeleteContext extends HookContext {
     /** Record ID being deleted */
     id: string;
+    /** The existing record being deleted (parsed from data_json) */
+    record: Record<string, any> | null;
 }
 /** Context for beforeQuery hooks */
 interface BeforeQueryContext extends HookContext {
@@ -904,6 +908,11 @@ interface BeforeQueryContext extends HookContext {
     /** Query options (sort, limit, etc.) */
     options?: QueryOptions;
 }
+/** Context for afterQuery hooks */
+interface AfterQueryContext extends HookContext {
+    /** The query results to filter */
+    results: Record<string, any>[];
+}
 /** Result from beforeSave/beforeDelete hooks */
 interface HookResult {
     allow: boolean;
@@ -915,11 +924,17 @@ interface BeforeQueryResult extends HookResult {
     /** Additional filter merged into the query via $and */
     injectFilter?: DocumentFilter;
 }
+/** Result from afterQuery hooks — returns filtered results */
+interface AfterQueryResult {
+    /** The filtered results to return */
+    results: Record<string, any>[];
+}
 /** Hook definitions for createDatabaseDO */
 interface DatabaseDOHooks {
     beforeSave?: (ctx: BeforeSaveContext) => Promise<HookResult>;
     beforeDelete?: (ctx: BeforeDeleteContext) => Promise<HookResult>;
     beforeQuery?: (ctx: BeforeQueryContext) => Promise<BeforeQueryResult>;
+    afterQuery?: (ctx: AfterQueryContext) => Promise<AfterQueryResult>;
 }
 
 /**
@@ -1151,6 +1166,8 @@ declare function createDatabaseDO(config?: DatabaseDOConfig): {
         fetch(request: Request): Promise<Response>;
         /** @internal */
         _handleQuery(request: Request, docId: string): Promise<Response>;
+        /** @internal — Check for reserved field names in record data */
+        _checkReservedFields(data: Record<string, any>): string | null;
         /** @internal */
         _handleSave(request: Request, docId: string): Promise<Response>;
         /** @internal — Partial update: merge provided fields into existing record */
@@ -1231,6 +1248,8 @@ declare function createDatabaseDO(config?: DatabaseDOConfig): {
         _handleHealth(): Response;
         /** @internal — Return tracked field names and types for a model */
         _handleDescribe(request: Request): Response;
+        /** @internal — List all known model names from records and _model_fields */
+        _handleModelList(): Response;
         /** @internal */
         _errorResponse(message: string, status: number): Response;
         /** @internal */
@@ -1300,4 +1319,4 @@ interface Env {
  */
 declare function handleRequest(request: Request, env: Env): Promise<Response>;
 
-export { type AggregateRequest, type AggregateResponse, type AggregationOperation, type AggregationOptions, type AggregationResult, type BatchOperation, type BatchOperationResult, type BatchRequest, type BatchResponse, type BeforeDeleteContext, type BeforeQueryContext, type BeforeQueryResult, type BeforeSaveContext, type CountRequest, type CountResponse, type DatabaseDOConfig, type DatabaseDOHooks, type DeleteRequest, type DeleteResponse, type DocumentDOConfig, type DropIndexRequest, type DropIndexResponse, type DropUniqueConstraintRequest, type DropUniqueConstraintResponse, DurableObjectEngine, type DurableObjectEngineOptions, type DurableObjectId, type DurableObjectNamespace, type DurableObjectState, type DurableObjectStorage, type DurableObjectStub, type Env, type ErrorResponse, type GroupByField, type HookContext, type HookResult, type IncrementRequest, type IncrementResponse, type IndexEntry, type IndexListResponse, JsonQueryTranslator, type JsonQueryTranslatorOptions, JsonSchemaDDL, type JsonSchemaOptions, type PatchRequest, type PatchResponse, type QueryRequest, type QueryResponse, type RegisterIndexRequest, type RegisterIndexResponse, type RegisterUniqueConstraintRequest, type RegisterUniqueConstraintResponse, type SaveRequest, type SaveResponse, type SqlStorage, type SqlStorageCursor, type StringSetMembership, type StringSetUpdateRequest, type StringSetUpdateResponse, type SyncIndexesRequest, type SyncIndexesResponse, type UniqueConstraintEntry, type UniqueConstraintListResponse, createDatabaseDO, createDocumentDO, handleRequest };
+export { type AfterQueryContext, type AfterQueryResult, type AggregateRequest, type AggregateResponse, type AggregationOperation, type AggregationOptions, type AggregationResult, type BatchOperation, type BatchOperationResult, type BatchRequest, type BatchResponse, type BeforeDeleteContext, type BeforeQueryContext, type BeforeQueryResult, type BeforeSaveContext, type CountRequest, type CountResponse, type DatabaseDOConfig, type DatabaseDOHooks, type DeleteRequest, type DeleteResponse, type DocumentDOConfig, type DropIndexRequest, type DropIndexResponse, type DropUniqueConstraintRequest, type DropUniqueConstraintResponse, DurableObjectEngine, type DurableObjectEngineOptions, type DurableObjectId, type DurableObjectNamespace, type DurableObjectState, type DurableObjectStorage, type DurableObjectStub, type Env, type ErrorResponse, type GroupByField, type HookContext, type HookResult, type IncrementRequest, type IncrementResponse, type IndexEntry, type IndexListResponse, JsonQueryTranslator, type JsonQueryTranslatorOptions, JsonSchemaDDL, type JsonSchemaOptions, type PatchRequest, type PatchResponse, type QueryRequest, type QueryResponse, type RegisterIndexRequest, type RegisterIndexResponse, type RegisterUniqueConstraintRequest, type RegisterUniqueConstraintResponse, type SaveRequest, type SaveResponse, type SqlStorage, type SqlStorageCursor, type StringSetMembership, type StringSetUpdateRequest, type StringSetUpdateResponse, type SyncIndexesRequest, type SyncIndexesResponse, type UniqueConstraintEntry, type UniqueConstraintListResponse, createDatabaseDO, createDocumentDO, handleRequest };

package/dist/cloudflare-do.d.ts

@@ -194,7 +194,7 @@ interface JsonSchemaEngineOptions extends JsonSchemaOptions {
 }
 declare abstract class JsonSchemaEngine extends DatabaseEngine {
     protected schemaOptions: JsonSchemaEngineOptions;
-    protected initialized: boolean;
+    initialized: boolean;
     constructor(options: JsonSchemaEngineOptions);
     /**
      * Execute SQL and return results.
@@ -880,6 +880,8 @@ interface HookContext {
     docId: string;
     /** The raw request (for reading headers, auth tokens, etc.) */
     request: Request;
+    /** The DO's SQLite engine (for direct queries, e.g. lookup functions) */
+    engine: any;
 }
 /** Context for beforeSave hooks */
 interface BeforeSaveContext extends HookContext {
@@ -896,6 +898,8 @@ interface BeforeSaveContext extends HookContext {
 interface BeforeDeleteContext extends HookContext {
     /** Record ID being deleted */
     id: string;
+    /** The existing record being deleted (parsed from data_json) */
+    record: Record<string, any> | null;
 }
 /** Context for beforeQuery hooks */
 interface BeforeQueryContext extends HookContext {
@@ -904,6 +908,11 @@ interface BeforeQueryContext extends HookContext {
     /** Query options (sort, limit, etc.) */
     options?: QueryOptions;
 }
+/** Context for afterQuery hooks */
+interface AfterQueryContext extends HookContext {
+    /** The query results to filter */
+    results: Record<string, any>[];
+}
 /** Result from beforeSave/beforeDelete hooks */
 interface HookResult {
     allow: boolean;
@@ -915,11 +924,17 @@ interface BeforeQueryResult extends HookResult {
     /** Additional filter merged into the query via $and */
     injectFilter?: DocumentFilter;
 }
+/** Result from afterQuery hooks — returns filtered results */
+interface AfterQueryResult {
+    /** The filtered results to return */
+    results: Record<string, any>[];
+}
 /** Hook definitions for createDatabaseDO */
 interface DatabaseDOHooks {
     beforeSave?: (ctx: BeforeSaveContext) => Promise<HookResult>;
     beforeDelete?: (ctx: BeforeDeleteContext) => Promise<HookResult>;
     beforeQuery?: (ctx: BeforeQueryContext) => Promise<BeforeQueryResult>;
+    afterQuery?: (ctx: AfterQueryContext) => Promise<AfterQueryResult>;
 }
 
 /**
@@ -1151,6 +1166,8 @@ declare function createDatabaseDO(config?: DatabaseDOConfig): {
         fetch(request: Request): Promise<Response>;
         /** @internal */
         _handleQuery(request: Request, docId: string): Promise<Response>;
+        /** @internal — Check for reserved field names in record data */
+        _checkReservedFields(data: Record<string, any>): string | null;
         /** @internal */
         _handleSave(request: Request, docId: string): Promise<Response>;
         /** @internal — Partial update: merge provided fields into existing record */
@@ -1231,6 +1248,8 @@ declare function createDatabaseDO(config?: DatabaseDOConfig): {
         _handleHealth(): Response;
         /** @internal — Return tracked field names and types for a model */
         _handleDescribe(request: Request): Response;
+        /** @internal — List all known model names from records and _model_fields */
+        _handleModelList(): Response;
         /** @internal */
         _errorResponse(message: string, status: number): Response;
         /** @internal */
@@ -1300,4 +1319,4 @@ interface Env {
  */
 declare function handleRequest(request: Request, env: Env): Promise<Response>;
 
-export { type AggregateRequest, type AggregateResponse, type AggregationOperation, type AggregationOptions, type AggregationResult, type BatchOperation, type BatchOperationResult, type BatchRequest, type BatchResponse, type BeforeDeleteContext, type BeforeQueryContext, type BeforeQueryResult, type BeforeSaveContext, type CountRequest, type CountResponse, type DatabaseDOConfig, type DatabaseDOHooks, type DeleteRequest, type DeleteResponse, type DocumentDOConfig, type DropIndexRequest, type DropIndexResponse, type DropUniqueConstraintRequest, type DropUniqueConstraintResponse, DurableObjectEngine, type DurableObjectEngineOptions, type DurableObjectId, type DurableObjectNamespace, type DurableObjectState, type DurableObjectStorage, type DurableObjectStub, type Env, type ErrorResponse, type GroupByField, type HookContext, type HookResult, type IncrementRequest, type IncrementResponse, type IndexEntry, type IndexListResponse, JsonQueryTranslator, type JsonQueryTranslatorOptions, JsonSchemaDDL, type JsonSchemaOptions, type PatchRequest, type PatchResponse, type QueryRequest, type QueryResponse, type RegisterIndexRequest, type RegisterIndexResponse, type RegisterUniqueConstraintRequest, type RegisterUniqueConstraintResponse, type SaveRequest, type SaveResponse, type SqlStorage, type SqlStorageCursor, type StringSetMembership, type StringSetUpdateRequest, type StringSetUpdateResponse, type SyncIndexesRequest, type SyncIndexesResponse, type UniqueConstraintEntry, type UniqueConstraintListResponse, createDatabaseDO, createDocumentDO, handleRequest };
+export { type AfterQueryContext, type AfterQueryResult, type AggregateRequest, type AggregateResponse, type AggregationOperation, type AggregationOptions, type AggregationResult, type BatchOperation, type BatchOperationResult, type BatchRequest, type BatchResponse, type BeforeDeleteContext, type BeforeQueryContext, type BeforeQueryResult, type BeforeSaveContext, type CountRequest, type CountResponse, type DatabaseDOConfig, type DatabaseDOHooks, type DeleteRequest, type DeleteResponse, type DocumentDOConfig, type DropIndexRequest, type DropIndexResponse, type DropUniqueConstraintRequest, type DropUniqueConstraintResponse, DurableObjectEngine, type DurableObjectEngineOptions, type DurableObjectId, type DurableObjectNamespace, type DurableObjectState, type DurableObjectStorage, type DurableObjectStub, type Env, type ErrorResponse, type GroupByField, type HookContext, type HookResult, type IncrementRequest, type IncrementResponse, type IndexEntry, type IndexListResponse, JsonQueryTranslator, type JsonQueryTranslatorOptions, JsonSchemaDDL, type JsonSchemaOptions, type PatchRequest, type PatchResponse, type QueryRequest, type QueryResponse, type RegisterIndexRequest, type RegisterIndexResponse, type RegisterUniqueConstraintRequest, type RegisterUniqueConstraintResponse, type SaveRequest, type SaveResponse, type SqlStorage, type SqlStorageCursor, type StringSetMembership, type StringSetUpdateRequest, type StringSetUpdateResponse, type SyncIndexesRequest, type SyncIndexesResponse, type UniqueConstraintEntry, type UniqueConstraintListResponse, createDatabaseDO, createDocumentDO, handleRequest };

package/dist/cloudflare-do.js

@@ -1948,6 +1948,7 @@ function createDatabaseDO(config = {}) {
         if (request.method === "DELETE" && path === "/destroy") {
           await this._doState.storage.deleteAll();
           this._initialized = false;
+          this._engine.initialized = false;
           return Response.json({
             deleted: true,
             deletedAt: (/* @__PURE__ */ new Date()).toISOString()
@@ -1995,6 +1996,8 @@ function createDatabaseDO(config = {}) {
             return this._handleHealth();
           case "/describe":
             return this._handleDescribe(request);
+          case "/models":
+            return this._handleModelList();
           default:
             return this._errorResponse("Not found", 404);
         }
@@ -2016,6 +2019,7 @@ function createDatabaseDO(config = {}) {
           modelName,
           docId,
           request,
+          engine: this._engine,
           filter,
           options
         };
@@ -2034,7 +2038,18 @@ function createDatabaseDO(config = {}) {
       });
       const { sql, params, sortFields } = translator.translateFind(filter, options);
       const rawResults = this._engine.execSqlSync(sql, params);
-      const data = rawResults.map((row) => this._parseRow(row));
+      let data = rawResults.map((row) => this._parseRow(row));
+      if (hooks?.afterQuery) {
+        const ctx = {
+          modelName,
+          docId,
+          request,
+          engine: this._engine,
+          results: data
+        };
+        const result = await hooks.afterQuery(ctx);
+        data = result.results;
+      }
       const limit = options?.limit;
       const hasMore = CursorManager.hasMoreResults(limit, data.length);
       const isFirstPage = !options?.uniqueStartKey;
@@ -2052,6 +2067,18 @@ function createDatabaseDO(config = {}) {
       };
       return Response.json(response);
     }
+    /** @internal — Check for reserved field names in record data */
+    _checkReservedFields(data) {
+      for (const key of Object.keys(data)) {
+        if (key === "type") {
+          return `Field 'type' is reserved and cannot be used in record data`;
+        }
+        if (key.startsWith("_meta")) {
+          return `Field '${key}' is reserved (fields starting with '_meta' are internal) and cannot be used in record data`;
+        }
+      }
+      return null;
+    }
     /** @internal */
     async _handleSave(request, docId) {
       const body = await request.json();
@@ -2059,6 +2086,15 @@ function createDatabaseDO(config = {}) {
       if (!modelName || !id) {
         return this._errorResponse("modelName and id are required", 400);
       }
+      if (!data) {
+        return this._errorResponse("data is required", 400);
+      }
+      if (data) {
+        const reservedError = this._checkReservedFields(data);
+        if (reservedError) {
+          return this._errorResponse(reservedError, 400);
+        }
+      }
       if (condition && !this._checkCondition(modelName, id, condition)) {
         return this._errorResponse(
           `Condition not met for ${modelName}/${id}`,
@@ -2077,6 +2113,7 @@ function createDatabaseDO(config = {}) {
           modelName,
           docId,
           request,
+          engine: this._engine,
           id,
           data,
           stringSets,
@@ -2115,6 +2152,10 @@ function createDatabaseDO(config = {}) {
       if (!modelName || !id || !data) {
         return this._errorResponse("modelName, id, and data are required", 400);
       }
+      const reservedError = this._checkReservedFields(data);
+      if (reservedError) {
+        return this._errorResponse(reservedError, 400);
+      }
       if (!this._engine.recordExists(modelName, id)) {
         return this._errorResponse(`Record ${modelName}/${id} not found`, 404);
       }
@@ -2129,6 +2170,7 @@ function createDatabaseDO(config = {}) {
           modelName,
           docId,
           request,
+          engine: this._engine,
           id,
           data,
           stringSets,
@@ -2174,11 +2216,21 @@ function createDatabaseDO(config = {}) {
         );
       }
       if (hooks?.beforeDelete) {
+        let record = null;
+        const rows = this._engine.execSqlSync(
+          "SELECT id, type, data_json FROM records WHERE id = ? AND type = ?",
+          [id, modelName]
+        );
+        if (rows.length > 0) {
+          record = this._parseRow(rows[0]);
+        }
         const ctx = {
           modelName,
           docId,
           request,
-          id
+          engine: this._engine,
+          id,
+          record
         };
         const result = await hooks.beforeDelete(ctx);
         if (!result.allow) {
@@ -2212,12 +2264,20 @@ function createDatabaseDO(config = {}) {
               400
             );
           }
+          const reservedError = this._checkReservedFields(op.data);
+          if (reservedError) {
+            return this._errorResponse(
+              `Operation ${i}: ${reservedError}`,
+              400
+            );
+          }
           if (hooks?.beforeSave) {
             const isNew = op.op === "save" ? !this._engine.recordExists(op.modelName, op.id) : false;
             const ctx = {
               modelName: op.modelName,
               docId,
               request,
+              engine: this._engine,
               id: op.id,
               data: op.data,
               stringSets: op.stringSets,
@@ -2230,11 +2290,21 @@ function createDatabaseDO(config = {}) {
           }
         } else if (op.op === "delete") {
           if (hooks?.beforeDelete) {
+            let record = null;
+            const rows = this._engine.execSqlSync(
+              "SELECT id, type, data_json FROM records WHERE id = ? AND type = ?",
+              [op.id, op.modelName]
+            );
+            if (rows.length > 0) {
+              record = this._parseRow(rows[0]);
+            }
             const ctx = {
               modelName: op.modelName,
               docId,
               request,
-              id: op.id
+              engine: this._engine,
+              id: op.id,
+              record
             };
             const result = await hooks.beforeDelete(ctx);
             if (!result.allow) {
@@ -2459,6 +2529,7 @@ function createDatabaseDO(config = {}) {
           modelName,
           docId,
           request,
+          engine: this._engine,
           filter
         };
         const result = await hooks.beforeQuery(ctx);
@@ -2571,6 +2642,7 @@ function createDatabaseDO(config = {}) {
           modelName,
           docId,
           request,
+          engine: this._engine,
           filter
         };
         const result = await hooks.beforeQuery(ctx);
@@ -3056,6 +3128,23 @@ function createDatabaseDO(config = {}) {
       const response = { modelName, fields };
       return Response.json(response);
     }
+    /** @internal — List all known model names from records and _model_fields */
+    _handleModelList() {
+      const fromRecords = this._engine.execSqlSync(
+        "SELECT DISTINCT type FROM records ORDER BY type"
+      );
+      const fromFields = this._engine.execSqlSync(
+        "SELECT DISTINCT model_name FROM _model_fields ORDER BY model_name"
+      );
+      const fromIndexes = this._engine.execSqlSync(
+        "SELECT DISTINCT model_name FROM _indexes ORDER BY model_name"
+      );
+      const modelSet = /* @__PURE__ */ new Set();
+      for (const row of fromRecords) modelSet.add(row.type);
+      for (const row of fromFields) modelSet.add(row.model_name);
+      for (const row of fromIndexes) modelSet.add(row.model_name);
+      return Response.json({ models: Array.from(modelSet).sort() });
+    }
     /** @internal */
     _errorResponse(message, status) {
       const body = { error: message };

package/dist/cloudflare.d.cts

@@ -608,6 +608,8 @@ interface HookContext {
     docId: string;
     /** The raw request (for reading headers, auth tokens, etc.) */
     request: Request;
+    /** The DO's SQLite engine (for direct queries, e.g. lookup functions) */
+    engine: any;
 }
 /** Context for beforeSave hooks */
 interface BeforeSaveContext extends HookContext {
@@ -624,6 +626,8 @@ interface BeforeSaveContext extends HookContext {
 interface BeforeDeleteContext extends HookContext {
     /** Record ID being deleted */
     id: string;
+    /** The existing record being deleted (parsed from data_json) */
+    record: Record<string, any> | null;
 }
 /** Context for beforeQuery hooks */
 interface BeforeQueryContext extends HookContext {
@@ -632,6 +636,11 @@ interface BeforeQueryContext extends HookContext {
     /** Query options (sort, limit, etc.) */
     options?: QueryOptions;
 }
+/** Context for afterQuery hooks */
+interface AfterQueryContext extends HookContext {
+    /** The query results to filter */
+    results: Record<string, any>[];
+}
 /** Result from beforeSave/beforeDelete hooks */
 interface HookResult {
     allow: boolean;
@@ -643,11 +652,17 @@ interface BeforeQueryResult extends HookResult {
     /** Additional filter merged into the query via $and */
     injectFilter?: DocumentFilter;
 }
+/** Result from afterQuery hooks — returns filtered results */
+interface AfterQueryResult {
+    /** The filtered results to return */
+    results: Record<string, any>[];
+}
 /** Hook definitions for createDatabaseDO */
 interface DatabaseDOHooks {
     beforeSave?: (ctx: BeforeSaveContext) => Promise<HookResult>;
     beforeDelete?: (ctx: BeforeDeleteContext) => Promise<HookResult>;
     beforeQuery?: (ctx: BeforeQueryContext) => Promise<BeforeQueryResult>;
+    afterQuery?: (ctx: AfterQueryContext) => Promise<AfterQueryResult>;
 }
 
 /**
@@ -1346,4 +1361,4 @@ interface DoDb {
  */
 declare function connectDoDb(options: ConnectDoDbOptions): DoDb;
 
-export { type AggregateRequest, type AggregateResponse, type AggregationOperation, type AggregationOptions, type AggregationResult, type BatchOperation, type BatchOperationResult, type BatchRequest, type BatchResponse, type BeforeDeleteContext, type BeforeQueryContext, type BeforeQueryResult, type BeforeSaveContext, type ConnectDoDbOptions, type CountRequest, type CountResponse, DOClientEngine, type DOClientEngineConfig, type DatabaseDOHooks, type DeleteRequest, type DeleteResponse, type DoDb, type DocumentFilter, type DropIndexRequest, type DropIndexResponse, type DropUniqueConstraintRequest, type DropUniqueConstraintResponse, type ErrorResponse, type GroupByField, type HookContext, type HookResult, type IncrementRequest, type IncrementResponse, type IndexEntry, type IndexListResponse, type InitJsBaoDOOptions, type InitJsBaoDOResult, type ModelAccessor, type PaginatedResult, type PatchOptions, type PatchRequest, type PatchResponse, type ProjectionSpec, type QueryOptions, type QueryRequest, type QueryResponse, type RegisterIndexRequest, type RegisterIndexResponse, type RegisterUniqueConstraintRequest, type RegisterUniqueConstraintResponse, type SaveOptions, type SaveRequest, type SaveResponse, type SortSpec, type StringSetMembership, type StringSetUpdateRequest, type StringSetUpdateResponse, type SyncIndexesRequest, type SyncIndexesResponse, type UniqueConstraintEntry, type UniqueConstraintListResponse, type WriteCondition, connectDoDb, getActiveDOEngine, initJsBaoDO, resetJsBaoDO };
+export { type AfterQueryContext, type AfterQueryResult, type AggregateRequest, type AggregateResponse, type AggregationOperation, type AggregationOptions, type AggregationResult, type BatchOperation, type BatchOperationResult, type BatchRequest, type BatchResponse, type BeforeDeleteContext, type BeforeQueryContext, type BeforeQueryResult, type BeforeSaveContext, type ConnectDoDbOptions, type CountRequest, type CountResponse, DOClientEngine, type DOClientEngineConfig, type DatabaseDOHooks, type DeleteRequest, type DeleteResponse, type DoDb, type DocumentFilter, type DropIndexRequest, type DropIndexResponse, type DropUniqueConstraintRequest, type DropUniqueConstraintResponse, type ErrorResponse, type GroupByField, type HookContext, type HookResult, type IncrementRequest, type IncrementResponse, type IndexEntry, type IndexListResponse, type InitJsBaoDOOptions, type InitJsBaoDOResult, type ModelAccessor, type PaginatedResult, type PatchOptions, type PatchRequest, type PatchResponse, type ProjectionSpec, type QueryOptions, type QueryRequest, type QueryResponse, type RegisterIndexRequest, type RegisterIndexResponse, type RegisterUniqueConstraintRequest, type RegisterUniqueConstraintResponse, type SaveOptions, type SaveRequest, type SaveResponse, type SortSpec, type StringSetMembership, type StringSetUpdateRequest, type StringSetUpdateResponse, type SyncIndexesRequest, type SyncIndexesResponse, type UniqueConstraintEntry, type UniqueConstraintListResponse, type WriteCondition, connectDoDb, getActiveDOEngine, initJsBaoDO, resetJsBaoDO };

package/dist/cloudflare.d.ts

@@ -608,6 +608,8 @@ interface HookContext {
     docId: string;
     /** The raw request (for reading headers, auth tokens, etc.) */
     request: Request;
+    /** The DO's SQLite engine (for direct queries, e.g. lookup functions) */
+    engine: any;
 }
 /** Context for beforeSave hooks */
 interface BeforeSaveContext extends HookContext {
@@ -624,6 +626,8 @@ interface BeforeSaveContext extends HookContext {
 interface BeforeDeleteContext extends HookContext {
     /** Record ID being deleted */
     id: string;
+    /** The existing record being deleted (parsed from data_json) */
+    record: Record<string, any> | null;
 }
 /** Context for beforeQuery hooks */
 interface BeforeQueryContext extends HookContext {
@@ -632,6 +636,11 @@ interface BeforeQueryContext extends HookContext {
     /** Query options (sort, limit, etc.) */
     options?: QueryOptions;
 }
+/** Context for afterQuery hooks */
+interface AfterQueryContext extends HookContext {
+    /** The query results to filter */
+    results: Record<string, any>[];
+}
 /** Result from beforeSave/beforeDelete hooks */
 interface HookResult {
     allow: boolean;
@@ -643,11 +652,17 @@ interface BeforeQueryResult extends HookResult {
     /** Additional filter merged into the query via $and */
     injectFilter?: DocumentFilter;
 }
+/** Result from afterQuery hooks — returns filtered results */
+interface AfterQueryResult {
+    /** The filtered results to return */
+    results: Record<string, any>[];
+}
 /** Hook definitions for createDatabaseDO */
 interface DatabaseDOHooks {
     beforeSave?: (ctx: BeforeSaveContext) => Promise<HookResult>;
     beforeDelete?: (ctx: BeforeDeleteContext) => Promise<HookResult>;
     beforeQuery?: (ctx: BeforeQueryContext) => Promise<BeforeQueryResult>;
+    afterQuery?: (ctx: AfterQueryContext) => Promise<AfterQueryResult>;
 }
 
 /**
@@ -1346,4 +1361,4 @@ interface DoDb {
  */
 declare function connectDoDb(options: ConnectDoDbOptions): DoDb;
 
-export { type AggregateRequest, type AggregateResponse, type AggregationOperation, type AggregationOptions, type AggregationResult, type BatchOperation, type BatchOperationResult, type BatchRequest, type BatchResponse, type BeforeDeleteContext, type BeforeQueryContext, type BeforeQueryResult, type BeforeSaveContext, type ConnectDoDbOptions, type CountRequest, type CountResponse, DOClientEngine, type DOClientEngineConfig, type DatabaseDOHooks, type DeleteRequest, type DeleteResponse, type DoDb, type DocumentFilter, type DropIndexRequest, type DropIndexResponse, type DropUniqueConstraintRequest, type DropUniqueConstraintResponse, type ErrorResponse, type GroupByField, type HookContext, type HookResult, type IncrementRequest, type IncrementResponse, type IndexEntry, type IndexListResponse, type InitJsBaoDOOptions, type InitJsBaoDOResult, type ModelAccessor, type PaginatedResult, type PatchOptions, type PatchRequest, type PatchResponse, type ProjectionSpec, type QueryOptions, type QueryRequest, type QueryResponse, type RegisterIndexRequest, type RegisterIndexResponse, type RegisterUniqueConstraintRequest, type RegisterUniqueConstraintResponse, type SaveOptions, type SaveRequest, type SaveResponse, type SortSpec, type StringSetMembership, type StringSetUpdateRequest, type StringSetUpdateResponse, type SyncIndexesRequest, type SyncIndexesResponse, type UniqueConstraintEntry, type UniqueConstraintListResponse, type WriteCondition, connectDoDb, getActiveDOEngine, initJsBaoDO, resetJsBaoDO };
+export { type AfterQueryContext, type AfterQueryResult, type AggregateRequest, type AggregateResponse, type AggregationOperation, type AggregationOptions, type AggregationResult, type BatchOperation, type BatchOperationResult, type BatchRequest, type BatchResponse, type BeforeDeleteContext, type BeforeQueryContext, type BeforeQueryResult, type BeforeSaveContext, type ConnectDoDbOptions, type CountRequest, type CountResponse, DOClientEngine, type DOClientEngineConfig, type DatabaseDOHooks, type DeleteRequest, type DeleteResponse, type DoDb, type DocumentFilter, type DropIndexRequest, type DropIndexResponse, type DropUniqueConstraintRequest, type DropUniqueConstraintResponse, type ErrorResponse, type GroupByField, type HookContext, type HookResult, type IncrementRequest, type IncrementResponse, type IndexEntry, type IndexListResponse, type InitJsBaoDOOptions, type InitJsBaoDOResult, type ModelAccessor, type PaginatedResult, type PatchOptions, type PatchRequest, type PatchResponse, type ProjectionSpec, type QueryOptions, type QueryRequest, type QueryResponse, type RegisterIndexRequest, type RegisterIndexResponse, type RegisterUniqueConstraintRequest, type RegisterUniqueConstraintResponse, type SaveOptions, type SaveRequest, type SaveResponse, type SortSpec, type StringSetMembership, type StringSetUpdateRequest, type StringSetUpdateResponse, type SyncIndexesRequest, type SyncIndexesResponse, type UniqueConstraintEntry, type UniqueConstraintListResponse, type WriteCondition, connectDoDb, getActiveDOEngine, initJsBaoDO, resetJsBaoDO };

package/dist/codegen.cjs

@@ -1189,7 +1189,7 @@ var SchemaExtractor = class {
 // package.json
 var package_default = {
   name: "js-bao",
-  version: "0.3.0-alpha.0",
+  version: "0.3.0-alpha.2",
   description: "A library providing data modeling capabilities which support live updates and queries.",
   types: "dist/index.d.ts",
   type: "module",
@@ -1273,7 +1273,7 @@ var package_default = {
     ulid: "^3.0.0"
   },
   devDependencies: {
-    "@types/better-sqlite3": "^7.6.9",
+    "@types/better-sqlite3": "^7.6.13",
     "@types/node": "^20.17.51",
     "@types/sql.js": "^1.4.9",
     commander: "^11.0.0",
@@ -1287,7 +1287,7 @@ var package_default = {
     yjs: "^13.6.18"
   },
   optionalDependencies: {
-    "better-sqlite3": "^9.6.0"
+    "better-sqlite3": "^12.6.2"
   },
   keywords: [
     "yjs",

package/dist/index.cjs

@@ -6250,12 +6250,16 @@ async function resetJsBao() {
   ormInitializationPromise = null;
   const { BaseModel: BaseModel3 } = await Promise.resolve().then(() => (init_BaseModel(), BaseModel_exports));
   BaseModel3.dbInstance = null;
-  Logger.debug("[resetJsBao] BaseModel database instance cleared.");
+  BaseModel3.connectedDocuments = /* @__PURE__ */ new Map();
+  BaseModel3.documentYMaps = /* @__PURE__ */ new Map();
+  BaseModel3.clearModelDefaultDocumentIds();
+  BaseModel3.clearGlobalDefaultDocumentId();
+  Logger.debug("[resetJsBao] BaseModel database instance and document state cleared.");
   const modelRegistryInstance = ModelRegistry.getInstance();
   modelRegistryInstance.clearSessionState();
   Logger.debug("[resetJsBao] ModelRegistry session state cleared.");
   Logger.info(
-    "[resetJsBao] js-bao initialization promise has been reset. DB engine (if any) destroyed. ModelRegistry session cleared."
+    "[resetJsBao] js-bao state fully reset. DB engine destroyed. Document mappings cleared. ModelRegistry session cleared."
   );
 }
 

package/dist/index.js

@@ -6200,12 +6200,16 @@ async function resetJsBao() {
   ormInitializationPromise = null;
   const { BaseModel: BaseModel3 } = await Promise.resolve().then(() => (init_BaseModel(), BaseModel_exports));
   BaseModel3.dbInstance = null;
-  Logger.debug("[resetJsBao] BaseModel database instance cleared.");
+  BaseModel3.connectedDocuments = /* @__PURE__ */ new Map();
+  BaseModel3.documentYMaps = /* @__PURE__ */ new Map();
+  BaseModel3.clearModelDefaultDocumentIds();
+  BaseModel3.clearGlobalDefaultDocumentId();
+  Logger.debug("[resetJsBao] BaseModel database instance and document state cleared.");
   const modelRegistryInstance = ModelRegistry.getInstance();
   modelRegistryInstance.clearSessionState();
   Logger.debug("[resetJsBao] ModelRegistry session state cleared.");
   Logger.info(
-    "[resetJsBao] js-bao initialization promise has been reset. DB engine (if any) destroyed. ModelRegistry session cleared."
+    "[resetJsBao] js-bao state fully reset. DB engine destroyed. Document mappings cleared. ModelRegistry session cleared."
   );
 }
 

package/dist/node.cjs

@@ -6435,12 +6435,16 @@ async function resetJsBao() {
   ormInitializationPromise = null;
   const { BaseModel: BaseModel3 } = await Promise.resolve().then(() => (init_BaseModel(), BaseModel_exports));
   BaseModel3.dbInstance = null;
-  Logger.debug("[resetJsBao] BaseModel database instance cleared.");
+  BaseModel3.connectedDocuments = /* @__PURE__ */ new Map();
+  BaseModel3.documentYMaps = /* @__PURE__ */ new Map();
+  BaseModel3.clearModelDefaultDocumentIds();
+  BaseModel3.clearGlobalDefaultDocumentId();
+  Logger.debug("[resetJsBao] BaseModel database instance and document state cleared.");
   const modelRegistryInstance = ModelRegistry.getInstance();
   modelRegistryInstance.clearSessionState();
   Logger.debug("[resetJsBao] ModelRegistry session state cleared.");
   Logger.info(
-    "[resetJsBao] js-bao initialization promise has been reset. DB engine (if any) destroyed. ModelRegistry session cleared."
+    "[resetJsBao] js-bao state fully reset. DB engine destroyed. Document mappings cleared. ModelRegistry session cleared."
   );
 }
 

package/dist/node.js

@@ -6382,12 +6382,16 @@ async function resetJsBao() {
   ormInitializationPromise = null;
   const { BaseModel: BaseModel3 } = await Promise.resolve().then(() => (init_BaseModel(), BaseModel_exports));
   BaseModel3.dbInstance = null;
-  Logger.debug("[resetJsBao] BaseModel database instance cleared.");
+  BaseModel3.connectedDocuments = /* @__PURE__ */ new Map();
+  BaseModel3.documentYMaps = /* @__PURE__ */ new Map();
+  BaseModel3.clearModelDefaultDocumentIds();
+  BaseModel3.clearGlobalDefaultDocumentId();
+  Logger.debug("[resetJsBao] BaseModel database instance and document state cleared.");
   const modelRegistryInstance = ModelRegistry.getInstance();
   modelRegistryInstance.clearSessionState();
   Logger.debug("[resetJsBao] ModelRegistry session state cleared.");
   Logger.info(
-    "[resetJsBao] js-bao initialization promise has been reset. DB engine (if any) destroyed. ModelRegistry session cleared."
+    "[resetJsBao] js-bao state fully reset. DB engine destroyed. Document mappings cleared. ModelRegistry session cleared."
   );
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-bao",
-  "version": "0.3.0-alpha.0",
+  "version": "0.3.0-alpha.2",
   "description": "A library providing data modeling capabilities which support live updates and queries.",
   "types": "dist/index.d.ts",
   "type": "module",
@@ -84,7 +84,7 @@
     "ulid": "^3.0.0"
   },
   "devDependencies": {
-    "@types/better-sqlite3": "^7.6.9",
+    "@types/better-sqlite3": "^7.6.13",
     "@types/node": "^20.17.51",
     "@types/sql.js": "^1.4.9",
     "commander": "^11.0.0",
@@ -98,7 +98,7 @@
     "yjs": "^13.6.18"
   },
   "optionalDependencies": {
-    "better-sqlite3": "^9.6.0"
+    "better-sqlite3": "^12.6.2"
   },
   "keywords": [
     "yjs",