js-bao 0.3.0-alpha.4 → 0.3.0-alpha.5

package/dist/cloudflare-do.cjs

@@ -92,20 +92,20 @@ var JsonSchemaDDL = class {
     if (options.includeDocIdColumn) {
       return `
 CREATE TABLE IF NOT EXISTS records (
-  id TEXT NOT NULL,
-  type TEXT NOT NULL,
-  data_json TEXT NOT NULL,
+  _id TEXT NOT NULL,
+  _type TEXT NOT NULL,
+  _data TEXT NOT NULL,
   _meta_doc_id TEXT,
   _meta_permission_hint TEXT,
-  PRIMARY KEY (type, id)
+  PRIMARY KEY (_type, _id)
 )`.trim();
     } else {
       return `
 CREATE TABLE IF NOT EXISTS records (
-  id TEXT NOT NULL,
-  type TEXT NOT NULL,
-  data_json TEXT NOT NULL,
-  PRIMARY KEY (type, id)
+  _id TEXT NOT NULL,
+  _type TEXT NOT NULL,
+  _data TEXT NOT NULL,
+  PRIMARY KEY (_type, _id)
 )`.trim();
     }
   }
@@ -116,21 +116,21 @@ CREATE TABLE IF NOT EXISTS records (
     if (options.includeDocIdColumn) {
       return `
 CREATE TABLE IF NOT EXISTS stringset_index (
-  record_id TEXT NOT NULL,
-  type TEXT NOT NULL,
+  _record_id TEXT NOT NULL,
+  _type TEXT NOT NULL,
   field TEXT NOT NULL,
   value TEXT NOT NULL,
   _meta_doc_id TEXT,
-  UNIQUE(type, field, record_id, value)
+  UNIQUE(_type, field, _record_id, value)
 )`.trim();
     } else {
       return `
 CREATE TABLE IF NOT EXISTS stringset_index (
-  record_id TEXT NOT NULL,
-  type TEXT NOT NULL,
+  _record_id TEXT NOT NULL,
+  _type TEXT NOT NULL,
   field TEXT NOT NULL,
   value TEXT NOT NULL,
-  UNIQUE(type, field, record_id, value)
+  UNIQUE(_type, field, _record_id, value)
 )`.trim();
     }
   }
@@ -139,11 +139,11 @@ CREATE TABLE IF NOT EXISTS stringset_index (
    */
   static createBaseIndexes(options) {
     const indexes = [
-      // Index on type for filtering by model
-      "CREATE INDEX IF NOT EXISTS idx_records_type ON records(type)",
+      // Index on _type for filtering by model
+      "CREATE INDEX IF NOT EXISTS idx_records_type ON records(_type)",
       // StringSet indexes for efficient lookups
-      "CREATE INDEX IF NOT EXISTS idx_ss_type_field_value ON stringset_index(type, field, value)",
-      "CREATE INDEX IF NOT EXISTS idx_ss_type_field_record ON stringset_index(type, field, record_id)"
+      "CREATE INDEX IF NOT EXISTS idx_ss_type_field_value ON stringset_index(_type, field, value)",
+      "CREATE INDEX IF NOT EXISTS idx_ss_type_field_record ON stringset_index(_type, field, _record_id)"
     ];
     if (options.includeDocIdColumn) {
       indexes.push(
@@ -161,7 +161,7 @@ CREATE TABLE IF NOT EXISTS stringset_index (
     assertValidIdentifier(modelName, "createFieldIndex modelName");
     assertValidIdentifier(fieldName, "createFieldIndex fieldName");
     const indexName = `idx_records_${modelName.toLowerCase()}_${fieldName.toLowerCase()}`;
-    return `CREATE INDEX IF NOT EXISTS ${indexName} ON records(json_extract(data_json, '$.${fieldName}')) WHERE type = '${modelName}'`;
+    return `CREATE INDEX IF NOT EXISTS ${indexName} ON records(json_extract(_data, '$.${fieldName}')) WHERE _type = '${modelName}'`;
   }
   /**
    * Generate DROP INDEX statement for a model field
@@ -234,11 +234,11 @@ CREATE TABLE IF NOT EXISTS _model_fields (
   static buildInsertSQL(options) {
     if (options.includeDocIdColumn) {
       return `
-INSERT OR REPLACE INTO records (id, type, data_json, _meta_doc_id, _meta_permission_hint)
+INSERT OR REPLACE INTO records (_id, _type, _data, _meta_doc_id, _meta_permission_hint)
 VALUES (?, ?, ?, ?, ?)`.trim();
     } else {
       return `
-INSERT OR REPLACE INTO records (id, type, data_json)
+INSERT OR REPLACE INTO records (_id, _type, _data)
 VALUES (?, ?, ?)`.trim();
     }
   }
@@ -247,16 +247,16 @@ VALUES (?, ?, ?)`.trim();
    */
   static buildDeleteSQL(options) {
     if (options.includeDocIdColumn) {
-      return "DELETE FROM records WHERE type = ? AND id = ?";
+      return "DELETE FROM records WHERE _type = ? AND _id = ?";
     } else {
-      return "DELETE FROM records WHERE type = ? AND id = ?";
+      return "DELETE FROM records WHERE _type = ? AND _id = ?";
     }
   }
   /**
    * Generate DELETE statement for stringset values
    */
   static buildDeleteStringSetSQL() {
-    return "DELETE FROM stringset_index WHERE type = ? AND record_id = ?";
+    return "DELETE FROM stringset_index WHERE _type = ? AND _record_id = ?";
   }
   /**
    * Generate INSERT statement for stringset values
@@ -264,11 +264,11 @@ VALUES (?, ?, ?)`.trim();
   static buildInsertStringSetSQL(options) {
     if (options.includeDocIdColumn) {
       return `
-INSERT OR IGNORE INTO stringset_index (record_id, type, field, value, _meta_doc_id)
+INSERT OR IGNORE INTO stringset_index (_record_id, _type, field, value, _meta_doc_id)
 VALUES (?, ?, ?, ?, ?)`.trim();
     } else {
       return `
-INSERT OR IGNORE INTO stringset_index (record_id, type, field, value)
+INSERT OR IGNORE INTO stringset_index (_record_id, _type, field, value)
 VALUES (?, ?, ?, ?)`.trim();
     }
   }
@@ -320,8 +320,7 @@ var JsonSchemaEngine = class extends DatabaseEngine {
    */
   async insert(modelName, data) {
     await this.initializeSchema();
-    const { id, _meta_doc_id, _meta_permission_hint, ...rest } = data;
-    const { type: _type, ...fieldsForJson } = rest;
+    const { id, _meta_doc_id, _meta_permission_hint, ...fieldsForJson } = data;
     const dataJson = JSON.stringify(fieldsForJson);
     const sql = JsonSchemaDDL.buildInsertSQL(this.schemaOptions);
     if (this.schemaOptions.includeDocIdColumn) {
@@ -356,11 +355,11 @@ var JsonSchemaEngine = class extends DatabaseEngine {
       );
     }
     await this.execSql(
-      "DELETE FROM records WHERE type = ? AND _meta_doc_id = ?",
+      "DELETE FROM records WHERE _type = ? AND _meta_doc_id = ?",
       [modelName, docId]
     );
     await this.execSql(
-      "DELETE FROM stringset_index WHERE type = ? AND _meta_doc_id = ?",
+      "DELETE FROM stringset_index WHERE _type = ? AND _meta_doc_id = ?",
       [modelName, docId]
     );
   }
@@ -390,7 +389,7 @@ var JsonSchemaEngine = class extends DatabaseEngine {
   async removeStringSetValues(modelName, fieldName, recordId, values) {
     if (values.length === 0) return;
     const placeholders = values.map(() => "?").join(", ");
-    const sql = `DELETE FROM stringset_index WHERE type = ? AND field = ? AND record_id = ? AND value IN (${placeholders})`;
+    const sql = `DELETE FROM stringset_index WHERE _type = ? AND field = ? AND _record_id = ? AND value IN (${placeholders})`;
     await this.execSql(sql, [modelName, fieldName, recordId, ...values]);
   }
   /**
@@ -441,22 +440,22 @@ var JsonSchemaEngine = class extends DatabaseEngine {
   }
   /**
    * Parse a record row from the database.
-   * Extracts fields from data_json and merges with direct columns.
+   * Extracts fields from _data and merges with direct columns.
    */
   parseRecordRow(row) {
     if (!row) return row;
-    const { id, type, data_json, _meta_doc_id, _meta_permission_hint, ...rest } = row;
+    const { _id, _type, _data, _meta_doc_id, _meta_permission_hint, ...rest } = row;
     let parsedData = {};
-    if (data_json) {
+    if (_data) {
       try {
-        parsedData = JSON.parse(data_json);
+        parsedData = JSON.parse(_data);
       } catch (e) {
-        console.warn("Failed to parse data_json:", e);
+        console.warn("Failed to parse _data:", e);
       }
     }
     const result = {
-      id,
-      type,
+      id: _id,
+      type: _type,
       ...parsedData,
       ...rest
       // Include any projected fields
@@ -508,6 +507,55 @@ var DurableObjectEngine = class extends JsonSchemaEngine {
         PRIMARY KEY (model_name, field_name)
       )
     `);
+    const recordsCols = this.execSqlSync("PRAGMA table_info(records)");
+    const hasOldSchema = recordsCols.some((c) => c.name === "id");
+    if (hasOldSchema) {
+      this.execSqlSync("ALTER TABLE records RENAME COLUMN id TO _id");
+      this.execSqlSync("ALTER TABLE records RENAME COLUMN type TO _type");
+      this.execSqlSync("ALTER TABLE records RENAME COLUMN data_json TO _data");
+      this.execSqlSync("ALTER TABLE stringset_index RENAME COLUMN record_id TO _record_id");
+      this.execSqlSync("ALTER TABLE stringset_index RENAME COLUMN type TO _type");
+      this.execSqlSync("DROP INDEX IF EXISTS idx_records_type");
+      this.execSqlSync("CREATE INDEX IF NOT EXISTS idx_records_type ON records(_type)");
+      this.execSqlSync("DROP INDEX IF EXISTS idx_ss_type_field_value");
+      this.execSqlSync("CREATE INDEX IF NOT EXISTS idx_ss_type_field_value ON stringset_index(_type, field, value)");
+      this.execSqlSync("DROP INDEX IF EXISTS idx_ss_type_field_record");
+      this.execSqlSync("CREATE INDEX IF NOT EXISTS idx_ss_type_field_record ON stringset_index(_type, field, _record_id)");
+      try {
+        const indexes = this.execSqlSync(
+          "SELECT model_name, field_name FROM _indexes"
+        );
+        for (const row of indexes) {
+          const mn = row.model_name;
+          const fn = row.field_name;
+          const idxName = `idx_records_${mn.toLowerCase()}_${fn.toLowerCase()}`;
+          this.execSqlSync(`DROP INDEX IF EXISTS ${idxName}`);
+          this.execSqlSync(
+            `CREATE INDEX IF NOT EXISTS ${idxName} ON records(json_extract(_data, '$.${fn}')) WHERE _type = '${mn}'`
+          );
+        }
+      } catch (e) {
+        console.debug("Could not recreate field indexes during migration:", e);
+      }
+      try {
+        const constraints = this.execSqlSync(
+          "SELECT model_name, constraint_name, fields_json FROM _unique_constraints"
+        );
+        for (const row of constraints) {
+          const mn = row.model_name;
+          const cn = row.constraint_name;
+          const fields = JSON.parse(row.fields_json);
+          const idxName = `idx_uc_${mn.toLowerCase()}_${cn.toLowerCase()}`;
+          this.execSqlSync(`DROP INDEX IF EXISTS ${idxName}`);
+          const fieldExprs = fields.map((f) => `json_extract(_data, '$.${f}')`).join(", ");
+          this.execSqlSync(
+            `CREATE INDEX IF NOT EXISTS ${idxName} ON records(${fieldExprs}) WHERE _type = '${mn}'`
+          );
+        }
+      } catch (e) {
+        console.debug("Could not recreate unique constraint indexes during migration:", e);
+      }
+    }
   }
   /**
    * Load indexes from the _indexes table and re-ensure they exist.
@@ -595,10 +643,10 @@ var DurableObjectEngine = class extends JsonSchemaEngine {
        VALUES (?, ?, ?)`,
       [modelName, constraintName, JSON.stringify(fields)]
     );
-    const fieldExprs = fields.map((f) => `json_extract(data_json, '$.${f}')`).join(", ");
+    const fieldExprs = fields.map((f) => `json_extract(_data, '$.${f}')`).join(", ");
     const indexName = `idx_uc_${modelName.toLowerCase()}_${constraintName.toLowerCase()}`;
     this.execSqlSync(
-      `CREATE INDEX IF NOT EXISTS ${indexName} ON records(${fieldExprs}) WHERE type = '${modelName}'`
+      `CREATE INDEX IF NOT EXISTS ${indexName} ON records(${fieldExprs}) WHERE _type = '${modelName}'`
     );
   }
   /**
@@ -638,11 +686,11 @@ var DurableObjectEngine = class extends JsonSchemaEngine {
       const value = data[idx.field_name];
       if (value === null || value === void 0) continue;
       const conflicts = this.execSqlSync(
-        `SELECT id FROM records WHERE type = ? AND json_extract(data_json, '$.${idx.field_name}') = ? AND id != ? LIMIT 1`,
+        `SELECT _id FROM records WHERE _type = ? AND json_extract(_data, '$.${idx.field_name}') = ? AND _id != ? LIMIT 1`,
         [modelName, value, id]
       );
       if (conflicts.length > 0) {
-        return `Unique constraint violated on field '${idx.field_name}' for model '${modelName}'. Value '${String(value).substring(0, 50)}' already exists on record '${conflicts[0].id}'.`;
+        return `Unique constraint violated on field '${idx.field_name}' for model '${modelName}'. Value '${String(value).substring(0, 50)}' already exists on record '${conflicts[0]._id}'.`;
       }
     }
     const composites = this.listUniqueConstraints(modelName);
@@ -652,13 +700,13 @@ var DurableObjectEngine = class extends JsonSchemaEngine {
       }
       const values = constraint.fields.map((f) => data[f]);
       if (values.some((v) => v === null || v === void 0)) continue;
-      const conditions = constraint.fields.map((f) => `json_extract(data_json, '$.${f}') = ?`).join(" AND ");
+      const conditions = constraint.fields.map((f) => `json_extract(_data, '$.${f}') = ?`).join(" AND ");
       const conflicts = this.execSqlSync(
-        `SELECT id FROM records WHERE type = ? AND ${conditions} AND id != ? LIMIT 1`,
+        `SELECT _id FROM records WHERE _type = ? AND ${conditions} AND _id != ? LIMIT 1`,
         [modelName, ...values, id]
       );
       if (conflicts.length > 0) {
-        return `Unique constraint '${constraint.constraint_name}' violated for model '${modelName}' on fields [${constraint.fields.join(", ")}]. Values already exist on record '${conflicts[0].id}'.`;
+        return `Unique constraint '${constraint.constraint_name}' violated for model '${modelName}' on fields [${constraint.fields.join(", ")}]. Values already exist on record '${conflicts[0]._id}'.`;
       }
     }
     return null;
@@ -668,7 +716,7 @@ var DurableObjectEngine = class extends JsonSchemaEngine {
    */
   recordExists(modelName, id) {
     const rows = this.execSqlSync(
-      "SELECT 1 FROM records WHERE type = ? AND id = ? LIMIT 1",
+      "SELECT 1 FROM records WHERE _type = ? AND _id = ? LIMIT 1",
       [modelName, id]
     );
     return rows.length > 0;
@@ -726,25 +774,24 @@ var DurableObjectEngine = class extends JsonSchemaEngine {
    */
   async insertWithStringSets(modelName, data, stringSets) {
     this.storage.transactionSync(() => {
-      const { id, ...rest } = data;
-      const { type: _type, ...fieldsForJson } = rest;
+      const { id, ...fieldsForJson } = data;
       const jsonFields = { ...fieldsForJson, ...stringSets };
       const dataJson = JSON.stringify(jsonFields);
       this.sql.exec(
-        "INSERT OR REPLACE INTO records (id, type, data_json) VALUES (?, ?, ?)",
+        "INSERT OR REPLACE INTO records (_id, _type, _data) VALUES (?, ?, ?)",
         id,
         modelName,
         dataJson
       );
       this.sql.exec(
-        "DELETE FROM stringset_index WHERE type = ? AND record_id = ?",
+        "DELETE FROM stringset_index WHERE _type = ? AND _record_id = ?",
         modelName,
         id
       );
       for (const [fieldName, values] of Object.entries(stringSets)) {
         for (const value of values) {
           this.sql.exec(
-            "INSERT OR IGNORE INTO stringset_index (record_id, type, field, value) VALUES (?, ?, ?, ?)",
+            "INSERT OR IGNORE INTO stringset_index (_record_id, _type, field, value) VALUES (?, ?, ?, ?)",
             id,
             modelName,
             fieldName,
@@ -772,7 +819,7 @@ var DurableObjectEngine = class extends JsonSchemaEngine {
     for (const [field, values] of Object.entries(sets)) {
       for (const value of values) {
         this.sql.exec(
-          "INSERT OR IGNORE INTO stringset_index (record_id, type, field, value) VALUES (?, ?, ?, ?)",
+          "INSERT OR IGNORE INTO stringset_index (_record_id, _type, field, value) VALUES (?, ?, ?, ?)",
           id,
           modelName,
           field,
@@ -800,7 +847,7 @@ var DurableObjectEngine = class extends JsonSchemaEngine {
     for (const [field, values] of Object.entries(sets)) {
       for (const value of values) {
         this.sql.exec(
-          "DELETE FROM stringset_index WHERE record_id = ? AND type = ? AND field = ? AND value = ?",
+          "DELETE FROM stringset_index WHERE _record_id = ? AND _type = ? AND field = ? AND value = ?",
           id,
           modelName,
           field,
@@ -816,20 +863,20 @@ var DurableObjectEngine = class extends JsonSchemaEngine {
    */
   _syncStringSetsToJson(modelName, id, fields) {
     const rows = this.execSqlSync(
-      "SELECT data_json FROM records WHERE id = ? AND type = ?",
+      "SELECT _data FROM records WHERE _id = ? AND _type = ?",
       [id, modelName]
     );
     if (rows.length === 0) return;
-    const data = JSON.parse(rows[0].data_json);
+    const data = JSON.parse(rows[0]._data);
     for (const field of fields) {
       const ssRows = this.execSqlSync(
-        "SELECT value FROM stringset_index WHERE record_id = ? AND type = ? AND field = ? ORDER BY value",
+        "SELECT value FROM stringset_index WHERE _record_id = ? AND _type = ? AND field = ? ORDER BY value",
         [id, modelName, field]
       );
       data[field] = ssRows.map((r) => r.value);
     }
     this.sql.exec(
-      "UPDATE records SET data_json = ? WHERE id = ? AND type = ?",
+      "UPDATE records SET _data = ? WHERE _id = ? AND _type = ?",
       JSON.stringify(data),
       id,
       modelName
@@ -855,14 +902,14 @@ var DurableObjectEngine = class extends JsonSchemaEngine {
    */
   patchRecordRaw(modelName, id, fields, stringSets) {
     const rows = this.execSqlSync(
-      "SELECT data_json FROM records WHERE id = ? AND type = ?",
+      "SELECT _data FROM records WHERE _id = ? AND _type = ?",
       [id, modelName]
     );
     if (rows.length === 0) {
       return false;
     }
-    const existing = JSON.parse(rows[0].data_json);
-    const { id: _id, type: _type, ...patchFields } = fields;
+    const existing = JSON.parse(rows[0]._data);
+    const { id: _stripId, ...patchFields } = fields;
     const merged = { ...existing, ...patchFields };
     if (stringSets) {
       for (const [field, values] of Object.entries(stringSets)) {
@@ -870,7 +917,7 @@ var DurableObjectEngine = class extends JsonSchemaEngine {
       }
     }
     this.sql.exec(
-      "UPDATE records SET data_json = ? WHERE id = ? AND type = ?",
+      "UPDATE records SET _data = ? WHERE _id = ? AND _type = ?",
       JSON.stringify(merged),
       id,
       modelName
@@ -878,14 +925,14 @@ var DurableObjectEngine = class extends JsonSchemaEngine {
     if (stringSets) {
       for (const [fieldName, values] of Object.entries(stringSets)) {
         this.sql.exec(
-          "DELETE FROM stringset_index WHERE record_id = ? AND type = ? AND field = ?",
+          "DELETE FROM stringset_index WHERE _record_id = ? AND _type = ? AND field = ?",
           id,
           modelName,
           fieldName
         );
         for (const value of values) {
           this.sql.exec(
-            "INSERT OR IGNORE INTO stringset_index (record_id, type, field, value) VALUES (?, ?, ?, ?)",
+            "INSERT OR IGNORE INTO stringset_index (_record_id, _type, field, value) VALUES (?, ?, ?, ?)",
             id,
             modelName,
             fieldName,
@@ -916,11 +963,11 @@ var DurableObjectEngine = class extends JsonSchemaEngine {
    */
   incrementFieldsRaw(modelName, id, fields) {
     const rows = this.execSqlSync(
-      "SELECT data_json FROM records WHERE id = ? AND type = ?",
+      "SELECT _data FROM records WHERE _id = ? AND _type = ?",
       [id, modelName]
     );
     if (rows.length === 0) return null;
-    const data = JSON.parse(rows[0].data_json);
+    const data = JSON.parse(rows[0]._data);
     const newValues = {};
     for (const [field, delta] of Object.entries(fields)) {
       const current = typeof data[field] === "number" ? data[field] : 0;
@@ -928,7 +975,7 @@ var DurableObjectEngine = class extends JsonSchemaEngine {
       newValues[field] = data[field];
     }
     this.sql.exec(
-      "UPDATE records SET data_json = ? WHERE id = ? AND type = ?",
+      "UPDATE records SET _data = ? WHERE _id = ? AND _type = ?",
       JSON.stringify(data),
       id,
       modelName
@@ -940,9 +987,9 @@ var DurableObjectEngine = class extends JsonSchemaEngine {
    */
   async deleteWithStringSets(modelName, id) {
     this.storage.transactionSync(() => {
-      this.sql.exec("DELETE FROM records WHERE type = ? AND id = ?", modelName, id);
+      this.sql.exec("DELETE FROM records WHERE _type = ? AND _id = ?", modelName, id);
       this.sql.exec(
-        "DELETE FROM stringset_index WHERE type = ? AND record_id = ?",
+        "DELETE FROM stringset_index WHERE _type = ? AND _record_id = ?",
         modelName,
         id
       );
@@ -954,7 +1001,7 @@ var DurableObjectEngine = class extends JsonSchemaEngine {
    */
   trackModelFields(modelName, data) {
     for (const [key, value] of Object.entries(data)) {
-      if (key === "id" || key === "type" || value === null || value === void 0) {
+      if (key === "id" || value === null || value === void 0) {
         continue;
       }
       let inferredType;
@@ -1277,18 +1324,20 @@ var JsonQueryTranslator = class {
   }
   /**
    * Get SQL expression for a field.
-   * System fields (id, type) are direct columns; others use json_extract.
+   * System fields (id, type) map to internal columns (_id, _type);
+   * others use json_extract(_data, ...).
    * When no schema is provided, any field is accepted (schemaless mode).
    */
   getFieldSql(fieldName) {
     if (!this.fieldSqlCache.has(fieldName)) {
       if (SYSTEM_FIELDS.has(fieldName)) {
-        this.fieldSqlCache.set(fieldName, quoteIdentifier(fieldName));
+        const internalName = `_${fieldName}`;
+        this.fieldSqlCache.set(fieldName, quoteIdentifier(internalName));
       } else {
         assertValidIdentifier(fieldName, "query field");
         this.fieldSqlCache.set(
           fieldName,
-          `json_extract(data_json, '$.${fieldName}')`
+          `json_extract(_data, '$.${fieldName}')`
         );
       }
     }
@@ -1315,7 +1364,7 @@ var JsonQueryTranslator = class {
     const selectClause = this.buildSelectClause(options?.projection);
     let sql = `SELECT ${selectClause} FROM records`;
     const params = [];
-    const conditions = [`${quoteIdentifier("type")} = ?`];
+    const conditions = [`${quoteIdentifier("_type")} = ?`];
     params.push(this.modelName);
     if (whereClause.sql) {
       conditions.push(whereClause.sql);
@@ -1351,7 +1400,7 @@ var JsonQueryTranslator = class {
    */
   translateCount(filter, options) {
     const whereClause = this.translateFilter(filter);
-    const conditions = [`${quoteIdentifier("type")} = ?`];
+    const conditions = [`${quoteIdentifier("_type")} = ?`];
     const params = [this.modelName];
     if (whereClause.sql) {
       conditions.push(whereClause.sql);
@@ -1536,7 +1585,7 @@ var JsonQueryTranslator = class {
           }
         }
         if (fieldType === "stringset") {
-          const likeSql = `EXISTS (SELECT 1 FROM stringset_index WHERE stringset_index.type = ? AND stringset_index.field = ? AND stringset_index.record_id = records.id AND stringset_index.value LIKE ? ESCAPE '\\' COLLATE NOCASE)`;
+          const likeSql = `EXISTS (SELECT 1 FROM stringset_index WHERE stringset_index._type = ? AND stringset_index.field = ? AND stringset_index._record_id = records._id AND stringset_index.value LIKE ? ESCAPE '\\' COLLATE NOCASE)`;
           conditions.push(likeSql);
           params.push(this.modelName, fieldName, pattern);
         } else {
@@ -1682,10 +1731,10 @@ var JsonQueryTranslator = class {
           return value ? { sql: `${fieldSql} IS NOT NULL`, params: [] } : { sql: `${fieldSql} IS NULL`, params: [] };
         } else {
           return value ? {
-            sql: `json_type(data_json, '$.${fieldName}') IS NOT NULL`,
+            sql: `json_type(_data, '$.${fieldName}') IS NOT NULL`,
             params: []
           } : {
-            sql: `json_type(data_json, '$.${fieldName}') IS NULL`,
+            sql: `json_type(_data, '$.${fieldName}') IS NULL`,
             params: []
           };
         }
@@ -1707,7 +1756,7 @@ var JsonQueryTranslator = class {
           );
         }
         return {
-          sql: `EXISTS (SELECT 1 FROM stringset_index WHERE stringset_index.type = ? AND stringset_index.field = ? AND stringset_index.record_id = records.id AND stringset_index.value = ?)`,
+          sql: `EXISTS (SELECT 1 FROM stringset_index WHERE stringset_index._type = ? AND stringset_index.field = ? AND stringset_index._record_id = records._id AND stringset_index.value = ?)`,
           params: [this.modelName, fieldName, value]
         };
       default:
@@ -1725,7 +1774,7 @@ var JsonQueryTranslator = class {
    */
   buildSelectClause(projection) {
     if (!projection || Object.keys(projection).length === 0) {
-      return "id, type, data_json";
+      return "_id, _type, _data";
     }
     const includeFields = [];
     const excludeFields = [];
@@ -1751,18 +1800,18 @@ var JsonQueryTranslator = class {
       if (!includeFields.includes("id")) {
         includeFields.unshift("id");
       }
-      const selectParts = ["id", "type"];
+      const selectParts = ["_id", "_type"];
       for (const field of includeFields) {
         if (field === "id" || field === "type") continue;
         selectParts.push(
-          `json_extract(data_json, '$.${field}') AS ${quoteIdentifier(field)}`
+          `json_extract(_data, '$.${field}') AS ${quoteIdentifier(field)}`
         );
       }
       return selectParts.join(", ");
     } else if (hasExcludes) {
-      return "id, type, data_json";
+      return "_id, _type, _data";
     }
-    return "id, type, data_json";
+    return "_id, _type, _data";
   }
   /**
    * Build LIMIT clause
@@ -2104,11 +2153,9 @@ function createDatabaseDO(config = {}) {
     /** @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`;
+        if (key === "id") continue;
+        if (key.startsWith("_")) {
+          return `Field '${key}' is reserved (fields starting with '_' are internal)`;
         }
       }
       return null;
@@ -2216,11 +2263,11 @@ function createDatabaseDO(config = {}) {
         }
       }
       const existing = this._engine.execSqlSync(
-        "SELECT data_json FROM records WHERE id = ? AND type = ?",
+        "SELECT _data FROM records WHERE _id = ? AND _type = ?",
         [id, modelName]
       );
       if (existing.length > 0) {
-        const existingData = JSON.parse(existing[0].data_json);
+        const existingData = JSON.parse(existing[0]._data);
         const mergedData = { ...existingData, ...data };
         const violation = this._engine.checkUniqueConstraints(
           modelName,
@@ -2252,7 +2299,7 @@ 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 = ?",
+          "SELECT _id, _type, _data FROM records WHERE _id = ? AND _type = ?",
           [id, modelName]
         );
         if (rows.length > 0) {
@@ -2326,7 +2373,7 @@ 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 = ?",
+              "SELECT _id, _type, _data FROM records WHERE _id = ? AND _type = ?",
               [op.id, op.modelName]
             );
             if (rows.length > 0) {
@@ -2412,30 +2459,30 @@ function createDatabaseDO(config = {}) {
               }
             }
             if (op.stringSets && Object.keys(op.stringSets).length > 0) {
-              const { id: _id, type: _type, ...fieldsForJson } = op.data;
+              const { id: _id, ...fieldsForJson } = op.data;
               const jsonFields = { ...fieldsForJson, ...op.stringSets };
               const dataJson = JSON.stringify(jsonFields);
               this._engine.execSqlSync(
-                "INSERT OR REPLACE INTO records (id, type, data_json) VALUES (?, ?, ?)",
+                "INSERT OR REPLACE INTO records (_id, _type, _data) VALUES (?, ?, ?)",
                 [op.id, op.modelName, dataJson]
               );
               this._engine.execSqlSync(
-                "DELETE FROM stringset_index WHERE type = ? AND record_id = ?",
+                "DELETE FROM stringset_index WHERE _type = ? AND _record_id = ?",
                 [op.modelName, op.id]
               );
               for (const [fieldName, values] of Object.entries(op.stringSets)) {
                 for (const value of values) {
                   this._engine.execSqlSync(
-                    "INSERT OR IGNORE INTO stringset_index (record_id, type, field, value) VALUES (?, ?, ?, ?)",
+                    "INSERT OR IGNORE INTO stringset_index (_record_id, _type, field, value) VALUES (?, ?, ?, ?)",
                     [op.id, op.modelName, fieldName, value]
                   );
                 }
               }
             } else {
-              const { id: _id, type: _type, ...fieldsForJson } = op.data;
+              const { id: _id, ...fieldsForJson } = op.data;
               const dataJson = JSON.stringify(fieldsForJson);
               this._engine.execSqlSync(
-                "INSERT OR REPLACE INTO records (id, type, data_json) VALUES (?, ?, ?)",
+                "INSERT OR REPLACE INTO records (_id, _type, _data) VALUES (?, ?, ?)",
                 [op.id, op.modelName, dataJson]
               );
             }
@@ -2452,11 +2499,11 @@ function createDatabaseDO(config = {}) {
             }
             if (op.data) {
               const existing = this._engine.execSqlSync(
-                "SELECT data_json FROM records WHERE id = ? AND type = ?",
+                "SELECT _data FROM records WHERE _id = ? AND _type = ?",
                 [op.id, op.modelName]
               );
               if (existing.length > 0) {
-                const existingData = JSON.parse(existing[0].data_json);
+                const existingData = JSON.parse(existing[0]._data);
                 const mergedData = { ...existingData, ...op.data };
                 const violation = this._engine.checkUniqueConstraints(
                   op.modelName,
@@ -2491,11 +2538,11 @@ function createDatabaseDO(config = {}) {
             }
           } else if (op.op === "delete") {
             this._engine.execSqlSync(
-              "DELETE FROM records WHERE id = ? AND type = ?",
+              "DELETE FROM records WHERE _id = ? AND _type = ?",
               [op.id, op.modelName]
             );
             this._engine.execSqlSync(
-              "DELETE FROM stringset_index WHERE record_id = ? AND type = ?",
+              "DELETE FROM stringset_index WHERE _record_id = ? AND _type = ?",
               [op.id, op.modelName]
             );
             results.push({ success: true, id: op.id });
@@ -2707,7 +2754,7 @@ function createDatabaseDO(config = {}) {
       for (const field of regularGroupBy) {
         assertValidIdentifier(field, "aggregation groupBy field");
         const ssCheck = this._engine.execSqlSync(
-          "SELECT 1 FROM stringset_index WHERE type = ? AND field = ? LIMIT 1",
+          "SELECT 1 FROM stringset_index WHERE _type = ? AND field = ? LIMIT 1",
           [modelName, field]
         );
         if (ssCheck.length > 0) {
@@ -2783,9 +2830,9 @@ function createDatabaseDO(config = {}) {
         }
       }
       let sql = `SELECT ${selectParts.join(", ")} FROM stringset_index`;
-      sql += ` INNER JOIN records ON stringset_index.record_id = records.id AND records.type = stringset_index.type`;
+      sql += ` INNER JOIN records ON stringset_index._record_id = records._id AND records._type = stringset_index._type`;
       const conditions = [
-        "stringset_index.type = ?",
+        "stringset_index._type = ?",
         "stringset_index.field = ?"
       ];
       const params = [modelName, facetField];
@@ -2822,9 +2869,9 @@ function createDatabaseDO(config = {}) {
         const m = stringSetMemberships[i];
         const alias = `ss_${m.field}_${i}`;
         selectParts.push(
-          `CASE WHEN ${alias}.record_id IS NOT NULL THEN 'true' ELSE 'false' END AS "${alias}"`
+          `CASE WHEN ${alias}._record_id IS NOT NULL THEN 'true' ELSE 'false' END AS "${alias}"`
         );
-        groupByParts.push(`CASE WHEN ${alias}.record_id IS NOT NULL THEN 'true' ELSE 'false' END`);
+        groupByParts.push(`CASE WHEN ${alias}._record_id IS NOT NULL THEN 'true' ELSE 'false' END`);
         aliasMap.push({ alias, field: m.field, contains: m.contains });
       }
       for (const op of aggOptions.operations) {
@@ -2850,13 +2897,13 @@ function createDatabaseDO(config = {}) {
       const joinParams = [];
       for (const entry of aliasMap) {
         sql += ` LEFT JOIN stringset_index AS ${entry.alias}`;
-        sql += ` ON ${entry.alias}.record_id = records.id`;
-        sql += ` AND ${entry.alias}.type = records.type`;
+        sql += ` ON ${entry.alias}._record_id = records._id`;
+        sql += ` AND ${entry.alias}._type = records._type`;
         sql += ` AND ${entry.alias}.field = ?`;
         sql += ` AND ${entry.alias}.value = ?`;
         joinParams.push(entry.field, entry.contains);
       }
-      const conditions = ["records.type = ?"];
+      const conditions = ["records._type = ?"];
       const params = [...joinParams, modelName];
       if (filter && Object.keys(filter).length > 0) {
         const whereClause = translator.translateFilter(filter);
@@ -3114,7 +3161,7 @@ function createDatabaseDO(config = {}) {
           );
         }
         const check = this._engine.execSqlSync(
-          `SELECT 1 FROM records WHERE type = ? AND json_type(data_json, '$.${field}') IS NOT NULL AND json_type(data_json, '$.${field}') != 'array' LIMIT 1`,
+          `SELECT 1 FROM records WHERE _type = ? AND json_type(_data, '$.${field}') IS NOT NULL AND json_type(_data, '$.${field}') != 'array' LIMIT 1`,
           [modelName]
         );
         if (check.length > 0) {
@@ -3138,7 +3185,7 @@ function createDatabaseDO(config = {}) {
         includeDocId: false
       });
       const whereClause = translator.translateFilter(condition);
-      let sql = "SELECT 1 FROM records WHERE id = ? AND type = ?";
+      let sql = "SELECT 1 FROM records WHERE _id = ? AND _type = ?";
       const params = [id, modelName];
       if (whereClause.sql) {
         sql += ` AND ${whereClause.sql}`;
@@ -3165,7 +3212,7 @@ function createDatabaseDO(config = {}) {
     /** @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"
+        "SELECT DISTINCT _type FROM records ORDER BY _type"
       );
       const fromFields = this._engine.execSqlSync(
         "SELECT DISTINCT model_name FROM _model_fields ORDER BY model_name"
@@ -3174,7 +3221,7 @@ function createDatabaseDO(config = {}) {
         "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 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() });
@@ -3186,16 +3233,16 @@ function createDatabaseDO(config = {}) {
     }
     /** @internal */
     _parseRow(row) {
-      const { id, type, data_json, ...rest } = row;
+      const { _id, _type, _data, ...rest } = row;
       let parsed = {};
-      if (data_json) {
+      if (_data) {
         try {
-          parsed = JSON.parse(data_json);
+          parsed = JSON.parse(_data);
         } catch (e) {
-          console.warn("Failed to parse data_json:", e);
+          console.warn("Failed to parse _data:", e);
         }
       }
-      return { id, type, ...parsed, ...rest };
+      return { id: _id, type: _type, ...parsed, ...rest };
     }
     // ─── Include (Related Data Loading) ──────────────────────────────
     /** @internal — Validate an IncludeSpec, returning an error message or null */
@@ -3425,12 +3472,12 @@ function createDatabaseDO(config = {}) {
     _resolveHasManyWithLimit(spec, parentValues) {
       const foreignKey = spec.foreignKey;
       assertValidIdentifier(foreignKey, "include foreignKey");
-      let sortClause = `"id" ASC`;
+      let sortClause = `"_id" ASC`;
       if (spec.sort) {
         const parts = [];
         for (const [field, dir] of Object.entries(spec.sort)) {
           assertValidIdentifier(field, "include sort field");
-          const fieldSql = field === "id" || field === "type" ? `"${field}"` : `json_extract(data_json, '$.${field}')`;
+          const fieldSql = field === "id" ? `"_id"` : field === "type" ? `"_type"` : `json_extract(_data, '$.${field}')`;
           parts.push(`${fieldSql} ${dir === -1 ? "DESC" : "ASC"}`);
         }
         sortClause = parts.join(", ");
@@ -3454,15 +3501,15 @@ function createDatabaseDO(config = {}) {
         const chunk = parentValues.slice(i, i + chunkSize);
         const inPlaceholders = chunk.map(() => "?").join(", ");
         const sql = `
-          SELECT "id", "type", data_json FROM (
-            SELECT "id", "type", data_json,
+          SELECT "_id", "_type", _data FROM (
+            SELECT "_id", "_type", _data,
               ROW_NUMBER() OVER (
-                PARTITION BY json_extract(data_json, '$.${foreignKey}')
+                PARTITION BY json_extract(_data, '$.${foreignKey}')
                 ORDER BY ${sortClause}
               ) as _rn
             FROM records
-            WHERE "type" = ?
-              AND json_extract(data_json, '$.${foreignKey}') IN (${inPlaceholders})
+            WHERE "_type" = ?
+              AND json_extract(_data, '$.${foreignKey}') IN (${inPlaceholders})
               ${filterClause}
           ) WHERE _rn <= ?
         `;