js-bao 0.12.0-alpha.0 → 0.12.0-alpha.1

package/README.md

@@ -1559,6 +1559,18 @@ See the `examples/` directory for complete working examples:
 Changes to the on-disk behaviour of `js-bao/cloudflare/do` (`DurableObjectEngine`)
 that a store's owner can observe. Newest first.
 
+- **`idx_records_type` is retired** (#3876). The primary key `(_type, _id)`
+  already leads with `_type`, so a new store no longer builds the index and an
+  existing one loses it on its next open, removed by definition under any name
+  (an ingest-suffixed copy included); a record insert writes one row fewer.
+  Dropping a field index or a unique constraint keeps the physical index while
+  another registration still maps to the same definition, under the name it
+  already has; a later index whose canonical name that kept index holds is
+  created as `<canonical name>_2` (or the next free suffix). Duplicate copies of a
+  definition the engine owns (base, retired or registered) collapse to one on
+  open; an index created outside the engine is never dropped. Index definitions
+  now compare with quoted literals verbatim, so `WHERE _type = 'a b'` and
+  `WHERE _type = 'ab'` are different indexes. Client stores are unchanged.
 - **`_indexes.created_at` reports the first registration** (#3875). Re-registering
   a field index whose `field_type` and `is_unique` are unchanged no longer
   rewrites its `_indexes` row: it writes no row, and `created_at` keeps the time

package/dist/cloudflare-do.cjs

@@ -2658,6 +2658,7 @@ __export(cloudflare_do_exports, {
   checkAutoStampsReservedFields: () => checkAutoStampsReservedFields,
   checkReservedFieldName: () => checkReservedFieldName,
   clearMetaSyncCache: () => clearMetaSyncCache,
+  collapseDuplicateIndexes: () => collapseDuplicateIndexes,
   compareRecordIds: () => compareRecordIds,
   completeOverlayEntries: () => completeOverlayEntries,
   createDatabaseDO: () => createDatabaseDO,
@@ -2677,6 +2678,7 @@ __export(cloudflare_do_exports, {
   format2StringSetMembers: () => format2StringSetMembers,
   groupOverlayEntries: () => groupOverlayEntries,
   handleRequest: () => handleRequest,
+  indexDefinitionKey: () => indexDefinitionKey,
   inferFieldType: () => inferFieldType,
   isAnchorId: () => isAnchorId,
   isFormat2StringSetYMap: () => isFormat2StringSetYMap,
@@ -2841,6 +2843,11 @@ var DatabaseEngine = class {
 // src/schema/JsonSchemaDDL.ts
 init_sql();
 init_sql();
+var RECORDS_TYPE_INDEX_SPEC = {
+  table: "records",
+  expressions: "_type",
+  canonicalName: "idx_records_type"
+};
 var JsonSchemaDDL = class {
   /**
    * Generate CREATE TABLE statement for the records table
@@ -2924,14 +2931,16 @@ CREATE TABLE IF NOT EXISTS stringset_index (
    * A document whose tables were swapped by a bulk-load ingest carries these
    * under session-suffixed names; creating them by name on the next cold open
    * would build a second copy of each over the whole table.
+   *
+   * `records(_type)` is a base index only in yjs mode (#3876). The server's
+   * primary key `(_type, _id)` already leads with `_type`, so on a
+   * `DurableObjectEngine` the index served no plan the primary key's autoindex
+   * could not and cost a row on every insert; the yjs-mode list stays in step
+   * with the yjs-mode DDL, which clients keep.
    */
   static baseIndexSpecs(options) {
     const specs = [
-      {
-        table: "records",
-        expressions: "_type",
-        canonicalName: "idx_records_type"
-      },
+      ...options.includeDocIdColumn ? [{ ...RECORDS_TYPE_INDEX_SPEC }] : [],
       {
         table: "stringset_index",
         expressions: "_type, field, value",
@@ -2960,22 +2969,28 @@ CREATE TABLE IF NOT EXISTS stringset_index (
     return specs;
   }
   /**
-   * The base indexes this build RETIRED, as specs (#3688).
+   * The base indexes RETIRED, as specs, each removed BY DEFINITION for the
+   * same reason the others are created that way: a document a bulk-load
+   * ingest swapped carries it under a session-suffixed name, which a
+   * `DROP INDEX IF EXISTS <canonical name>` would walk straight past.
    *
-   * `(_type, field, _record_id)` is a left prefix of the member table's UNIQUE
-   * autoindex, so it never served a plan the autoindex could not; what it did
-   * do was cost a second index write per member insert. It is removed BY
-   * DEFINITION for the same reason the others are created that way: a document
-   * a bulk-load ingest swapped carries it under a session-suffixed name, which
-   * a `DROP INDEX IF EXISTS idx_ss_type_field_record` would walk straight past.
+   * - `idx_ss_type_field_record` (#3688): `(_type, field, _record_id)` is a
+   *   left prefix of the member table's UNIQUE autoindex, so it never served a
+   *   plan the autoindex could not; what it did do was cost a second index
+   *   write per member insert.
+   * - `idx_records_type` (#3876), on the server only: the primary key
+   *   `(_type, _id)` leads with `_type`, so every `WHERE _type = ?` plans onto
+   *   its autoindex (covering, for a count), and the index cost a row on every
+   *   insert. Clients' yjs-mode DDL keeps it.
    */
-  static retiredBaseIndexSpecs(_options) {
+  static retiredBaseIndexSpecs(options) {
     return [
       {
         table: "stringset_index",
         expressions: "_type, field, _record_id",
         canonicalName: "idx_ss_type_field_record"
-      }
+      },
+      ...options.includeDocIdColumn ? [] : [{ ...RECORDS_TYPE_INDEX_SPEC }]
     ];
   }
   /**
@@ -3421,55 +3436,134 @@ var JsonSchemaEngine = class extends DatabaseEngine {
 init_sql();
 
 // src/utils/physicalIndex.ts
+init_sql();
 var INDEX_SQL = /^\s*CREATE\s+(UNIQUE\s+)?INDEX\s+(?:IF\s+NOT\s+EXISTS\s+)?"?([A-Za-z0-9_$]+)"?\s+ON\s+"?([A-Za-z0-9_$]+)"?\s*\(([\s\S]*)\)\s*(?:WHERE\s+([\s\S]+))?$/i;
+var TIGHT = /* @__PURE__ */ new Set(["(", ")", ",", "=", "|"]);
+function normalizeSqlText(text) {
+  let out = "";
+  let pendingSpace = false;
+  let i = 0;
+  const emit = (chunk) => {
+    const spaced = pendingSpace && out.length > 0 && !TIGHT.has(out[out.length - 1]) && !TIGHT.has(chunk[0]);
+    if (spaced) out += " ";
+    pendingSpace = false;
+    out += chunk;
+  };
+  while (i < text.length) {
+    const ch = text[i];
+    if (ch === "'" || ch === '"') {
+      let j = i + 1;
+      for (; ; ) {
+        if (j >= text.length) break;
+        if (text[j] === ch) {
+          if (text[j + 1] === ch) {
+            j += 2;
+            continue;
+          }
+          break;
+        }
+        j++;
+      }
+      emit(text.slice(i, j + 1));
+      i = j + 1;
+      continue;
+    }
+    if (/\s/.test(ch)) {
+      pendingSpace = true;
+      i++;
+      continue;
+    }
+    emit(ch);
+    i++;
+  }
+  return out;
+}
 function shapeOf(options) {
-  const strip = (text) => text.replace(/\s+/g, "");
   return [
     options.unique ? "UNIQUE" : "INDEX",
-    strip(options.expressions),
-    options.where ? strip(options.where) : ""
-  ].join("\0");
+    normalizeSqlText(options.expressions),
+    options.where ? normalizeSqlText(options.where) : ""
+  ].join(" ");
 }
-function shapeOfSpec(spec) {
+function indexDefinitionKey(spec) {
   return shapeOf({
     unique: Boolean(spec.unique),
     expressions: spec.expressions,
     where: spec.where ?? null
   });
 }
-function resolvePhysicalIndex(exec, spec) {
-  const wanted = shapeOfSpec(spec);
+function namedIndexesOf(exec, table) {
   const rows = exec(
     `SELECT name, sql FROM sqlite_master
-      WHERE type = 'index' AND tbl_name = ? AND sql IS NOT NULL`,
-    [spec.table]
+      WHERE type = 'index' AND tbl_name = ? AND sql IS NOT NULL
+      ORDER BY name`,
+    [table]
   );
+  const named = [];
   for (const row of rows) {
     const match = INDEX_SQL.exec(String(row.sql));
     if (!match) continue;
-    const shape = shapeOf({
-      unique: Boolean(match[1]),
-      expressions: match[4] ?? "",
-      where: match[5] ?? null
+    named.push({
+      name: String(row.name),
+      key: shapeOf({
+        unique: Boolean(match[1]),
+        expressions: match[4] ?? "",
+        where: match[5] ?? null
+      })
     });
-    if (shape === wanted) return String(row.name);
   }
-  return null;
+  return named;
+}
+function resolvePhysicalIndex(exec, spec) {
+  const wanted = indexDefinitionKey(spec);
+  const found = namedIndexesOf(exec, spec.table).find(
+    (index) => index.key === wanted
+  );
+  return found ? found.name : null;
+}
+function unusedIndexName(exec, canonicalName) {
+  const taken = (name) => exec("SELECT 1 FROM sqlite_master WHERE name = ? COLLATE NOCASE", [name]).length > 0;
+  if (!taken(canonicalName)) return canonicalName;
+  for (let n = 2; ; n++) {
+    const candidate = `${canonicalName}_${n}`;
+    if (!taken(candidate)) return candidate;
+  }
 }
 function ensurePhysicalIndex(exec, spec) {
   if (resolvePhysicalIndex(exec, spec) !== null) return "exists";
   exec(
-    `CREATE ${spec.unique ? "UNIQUE " : ""}INDEX IF NOT EXISTS ${spec.canonicalName} ON ${spec.table} (${spec.expressions})` + (spec.where ? ` WHERE ${spec.where}` : "")
+    `CREATE ${spec.unique ? "UNIQUE " : ""}INDEX IF NOT EXISTS ${unusedIndexName(exec, spec.canonicalName)} ON ${spec.table} (${spec.expressions})` + (spec.where ? ` WHERE ${spec.where}` : "")
   );
   return "created";
 }
 function removePhysicalIndex(exec, spec) {
-  const name = resolvePhysicalIndex(exec, spec);
-  if (name === null) return;
-  exec(`DROP INDEX IF EXISTS ${name}`);
+  const wanted = indexDefinitionKey(spec);
+  for (const index of namedIndexesOf(exec, spec.table)) {
+    if (index.key !== wanted) continue;
+    exec(`DROP INDEX IF EXISTS ${quoteIdentifier(index.name)}`);
+  }
+}
+function collapseDuplicateIndexes(exec, table, ownedKeys) {
+  const kept = /* @__PURE__ */ new Set();
+  const dropped = [];
+  for (const index of namedIndexesOf(exec, table)) {
+    if (!ownedKeys.has(index.key)) continue;
+    if (!kept.has(index.key)) {
+      kept.add(index.key);
+      continue;
+    }
+    exec(`DROP INDEX IF EXISTS ${quoteIdentifier(index.name)}`);
+    dropped.push(index.name);
+  }
+  return dropped;
 }
 
 // src/engines/cloudflare/DurableObjectEngine.ts
+function ownedDefinitionKeys(specs, table) {
+  return new Set(
+    specs.filter((spec) => spec.table === table).map(indexDefinitionKey)
+  );
+}
 var DurableObjectEngine = class extends JsonSchemaEngine {
   sql;
   storage;
@@ -3522,8 +3616,85 @@ var DurableObjectEngine = class extends JsonSchemaEngine {
     for (const spec of JsonSchemaDDL.retiredBaseIndexSpecs(this.schemaOptions)) {
       removePhysicalIndex(this.indexExec, spec);
     }
+    const owned = [
+      ...JsonSchemaDDL.baseIndexSpecs(this.schemaOptions),
+      ...JsonSchemaDDL.retiredBaseIndexSpecs(this.schemaOptions),
+      ...this.registeredIndexSpecs()
+    ];
+    for (const table of ["records", "stringset_index"]) {
+      const dropped = collapseDuplicateIndexes(
+        this.indexExec,
+        table,
+        ownedDefinitionKeys(owned, table)
+      );
+      if (dropped.length > 0) {
+        console.info("Durable Object engine collapsed duplicate indexes", {
+          table,
+          dropped
+        });
+      }
+    }
     this.initialized = true;
   }
+  /**
+   * The index each registration row maps to (#3876): `fieldIndexSpec` per
+   * `_indexes` row, `uniqueConstraintIndexSpec` per `_unique_constraints` row.
+   * A row whose `fields_json` does not parse, or whose names are not valid
+   * identifiers, maps to nothing.
+   */
+  registeredIndexSpecs() {
+    const specs = [];
+    try {
+      for (const row of this.execSqlSync(
+        "SELECT model_name, field_name FROM _indexes"
+      )) {
+        try {
+          specs.push(
+            JsonSchemaDDL.fieldIndexSpec(
+              String(row.model_name),
+              String(row.field_name)
+            )
+          );
+        } catch (e) {
+          console.debug("Skipping an unusable index registration:", e);
+        }
+      }
+    } catch (e) {
+      console.debug("Could not read index registrations:", e);
+    }
+    try {
+      for (const row of this.execSqlSync(
+        "SELECT model_name, constraint_name, fields_json FROM _unique_constraints"
+      )) {
+        try {
+          specs.push(
+            JsonSchemaDDL.uniqueConstraintIndexSpec(
+              String(row.model_name),
+              String(row.constraint_name),
+              JSON.parse(String(row.fields_json))
+            )
+          );
+        } catch (e) {
+          console.debug("Skipping an unusable unique-constraint registration:", e);
+        }
+      }
+    } catch (e) {
+      console.debug("Could not read unique-constraint registrations:", e);
+    }
+    return specs;
+  }
+  /**
+   * Whether a remaining registration still maps to `spec`'s definition
+   * (#3876). A field index and a unique constraint over the same field — or
+   * two constraints over the same fields — share one physical index since
+   * #3434, so a drop removes it only when no other declaration needs it. The
+   * count is derived from the registration tables at drop time, not stored.
+   */
+  definitionStillDeclared(spec) {
+    return ownedDefinitionKeys(this.registeredIndexSpecs(), spec.table).has(
+      indexDefinitionKey(spec)
+    );
+  }
   /**
    * Whether this open renamed the pre-underscore column names.
    *
@@ -3679,10 +3850,9 @@ var DurableObjectEngine = class extends JsonSchemaEngine {
       "DELETE FROM _indexes WHERE model_name = ? AND field_name = ?",
       [modelName, fieldName]
     );
-    removePhysicalIndex(
-      this.indexExec,
-      JsonSchemaDDL.fieldIndexSpec(modelName, fieldName)
-    );
+    const spec = JsonSchemaDDL.fieldIndexSpec(modelName, fieldName);
+    if (this.definitionStillDeclared(spec)) return;
+    removePhysicalIndex(this.indexExec, spec);
   }
   /**
    * List all registered indexes, optionally filtered by model.
@@ -3747,10 +3917,13 @@ var DurableObjectEngine = class extends JsonSchemaEngine {
     } catch {
       return;
     }
-    removePhysicalIndex(
-      this.indexExec,
-      JsonSchemaDDL.uniqueConstraintIndexSpec(modelName, constraintName, fields)
+    const spec = JsonSchemaDDL.uniqueConstraintIndexSpec(
+      modelName,
+      constraintName,
+      fields
     );
+    if (this.definitionStillDeclared(spec)) return;
+    removePhysicalIndex(this.indexExec, spec);
   }
   /**
    * List composite unique constraints, optionally filtered by model.

package/dist/cloudflare-do.d.cts

@@ -2096,12 +2096,16 @@ declare abstract class DatabaseEngine {
  *
  * ## What counts as the same definition
  *
- * The expression list and the `WHERE` clause, with whitespace removed and
- * CASE PRESERVED, plus whether the index is UNIQUE. Case matters: a partial
+ * The expression list and the `WHERE` clause, with whitespace normalised
+ * OUTSIDE quoted literals and every literal compared verbatim, CASE PRESERVED
+ * throughout, plus whether the index is UNIQUE. Case matters: a partial
  * index's predicate carries a model name (`WHERE _type = 'Note'`), and `Note`
- * and `note` are different models. The table name is not part of the
- * comparison because the lookup is already scoped to one table — and because
- * SQLite requotes it on a rename.
+ * and `note` are different models. Literals matter for the same reason, and
+ * more since #3876 made the comparison drive DROPS: `WHERE _type = 'a b'` and
+ * `WHERE _type = 'ab'` are two different partial indexes, and a comparison
+ * that stripped the space inside the quotes would drop one for the other. The
+ * table name is not part of the comparison because the lookup is already
+ * scoped to one table — and because SQLite requotes it on a rename.
  */
 /** The SQL executor this module needs: a query and its bindings, rows back. */
 type PhysicalIndexExec = (query: string, params?: unknown[]) => Array<Record<string, any>>;
@@ -2116,27 +2120,55 @@ interface PhysicalIndexSpec {
     /** The name to create it under when nothing equivalent exists. */
     canonicalName: string;
 }
+/**
+ * The key two index definitions share exactly when they are the same index
+ * (#3876): UNIQUE-ness, expression list and predicate, whitespace normalised
+ * outside literals, literals and case preserved. What `resolvePhysicalIndex`,
+ * `ensurePhysicalIndex`, `removePhysicalIndex`, the engine's reference-counted
+ * drops and `collapseDuplicateIndexes` all compare.
+ */
+declare function indexDefinitionKey(spec: PhysicalIndexSpec): string;
 /**
  * The NAME of an index on `spec.table` with `spec`'s definition, or null.
- *
- * Autoindexes (those `sqlite_master` records with a null `sql`) are skipped:
- * they belong to a constraint, not to a caller, and cannot be created or
- * dropped by name anyway.
+ * The first by name when there are several.
  */
 declare function resolvePhysicalIndex(exec: PhysicalIndexExec, spec: PhysicalIndexSpec): string | null;
 /**
  * Create `spec` under its canonical name unless an equivalent index already
  * exists under some name. Answers which of the two happened.
+ *
+ * When the canonical name is held by something else, the index is created
+ * under the first free `<canonicalName>_<n>`: the holder is a different
+ * definition (an equal one would have resolved above), and every reader
+ * resolves indexes by definition, never by name.
  */
 declare function ensurePhysicalIndex(exec: PhysicalIndexExec, spec: PhysicalIndexSpec): "created" | "exists";
 /**
- * Drop the index matching `spec`, by the name it actually has.
+ * Drop EVERY index matching `spec`, by the names they actually have.
  *
  * A no-op when there is none — the callers are all idempotent "make sure this
  * is gone" paths, and a swapped table's index under a foreign name is exactly
- * the one a `DROP INDEX IF EXISTS <canonicalName>` would miss.
+ * the one a `DROP INDEX IF EXISTS <canonicalName>` would miss. All of them,
+ * not the first (#3876): a store carrying the canonical copy and an
+ * ingest-suffixed one converges in one pass. The names come from
+ * `sqlite_master`, where a quoted keyword such as `"select"` is stored bare,
+ * so they are quoted back.
  */
 declare function removePhysicalIndex(exec: PhysicalIndexExec, spec: PhysicalIndexSpec): void;
+/**
+ * Drop the extra copies of every definition in `ownedKeys` on `table`
+ * (#3876), keeping the first of each by name. Answers the names it dropped.
+ *
+ * Databases built before #3434 could carry a field index and a unique
+ * constraint's index over one definition, and every insert and `_data` update
+ * paid for both. Only OWNED definitions are touched — ones the caller would
+ * itself create — so an index a consumer made by hand is never dropped, even
+ * when it duplicates another. `ownedKeys` are the keys of definitions on
+ * `table` itself: the key leaves the table out, so a set built across tables
+ * would claim `stringset_index(_type)` for a spec over `records(_type)`.
+ * `DROP INDEX` writes no row.
+ */
+declare function collapseDuplicateIndexes(exec: PhysicalIndexExec, table: string, ownedKeys: ReadonlySet<string>): string[];
 
 /**
  * JSON Schema DDL Generator
@@ -2181,19 +2213,30 @@ declare class JsonSchemaDDL {
      * A document whose tables were swapped by a bulk-load ingest carries these
      * under session-suffixed names; creating them by name on the next cold open
      * would build a second copy of each over the whole table.
+     *
+     * `records(_type)` is a base index only in yjs mode (#3876). The server's
+     * primary key `(_type, _id)` already leads with `_type`, so on a
+     * `DurableObjectEngine` the index served no plan the primary key's autoindex
+     * could not and cost a row on every insert; the yjs-mode list stays in step
+     * with the yjs-mode DDL, which clients keep.
      */
     static baseIndexSpecs(options: JsonSchemaOptions): PhysicalIndexSpec[];
     /**
-     * The base indexes this build RETIRED, as specs (#3688).
+     * The base indexes RETIRED, as specs, each removed BY DEFINITION for the
+     * same reason the others are created that way: a document a bulk-load
+     * ingest swapped carries it under a session-suffixed name, which a
+     * `DROP INDEX IF EXISTS <canonical name>` would walk straight past.
      *
-     * `(_type, field, _record_id)` is a left prefix of the member table's UNIQUE
-     * autoindex, so it never served a plan the autoindex could not; what it did
-     * do was cost a second index write per member insert. It is removed BY
-     * DEFINITION for the same reason the others are created that way: a document
-     * a bulk-load ingest swapped carries it under a session-suffixed name, which
-     * a `DROP INDEX IF EXISTS idx_ss_type_field_record` would walk straight past.
+     * - `idx_ss_type_field_record` (#3688): `(_type, field, _record_id)` is a
+     *   left prefix of the member table's UNIQUE autoindex, so it never served a
+     *   plan the autoindex could not; what it did do was cost a second index
+     *   write per member insert.
+     * - `idx_records_type` (#3876), on the server only: the primary key
+     *   `(_type, _id)` leads with `_type`, so every `WHERE _type = ?` plans onto
+     *   its autoindex (covering, for a count), and the index cost a row on every
+     *   insert. Clients' yjs-mode DDL keeps it.
      */
-    static retiredBaseIndexSpecs(_options: JsonSchemaOptions): PhysicalIndexSpec[];
+    static retiredBaseIndexSpecs(options: JsonSchemaOptions): PhysicalIndexSpec[];
     /**
      * Drop the retired base indexes BY NAME, for the name-based engines (#3688).
      *
@@ -2644,6 +2687,21 @@ declare class DurableObjectEngine extends JsonSchemaEngine {
      * really is identified by its name.
      */
     initializeSchema(): Promise<void>;
+    /**
+     * The index each registration row maps to (#3876): `fieldIndexSpec` per
+     * `_indexes` row, `uniqueConstraintIndexSpec` per `_unique_constraints` row.
+     * A row whose `fields_json` does not parse, or whose names are not valid
+     * identifiers, maps to nothing.
+     */
+    private registeredIndexSpecs;
+    /**
+     * Whether a remaining registration still maps to `spec`'s definition
+     * (#3876). A field index and a unique constraint over the same field — or
+     * two constraints over the same fields — share one physical index since
+     * #3434, so a drop removes it only when no other declaration needs it. The
+     * count is derived from the registration tables at drop time, not stored.
+     */
+    private definitionStillDeclared;
     /**
      * Whether this open renamed the pre-underscore column names.
      *
@@ -7059,4 +7117,4 @@ declare class SnapshotPartitioner {
     private take;
 }
 
-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, CURSOR_SORT_ALIAS_PREFIX, type CountRequest, type CountResponse, DEFAULT_OVERLAY_TABLES, DEFAULT_SNAPSHOT_PARTITION, type DatabaseDOConfig, type DatabaseDOHooks, type DeleteRequest, type DeleteResponse, type DiscoveredConstraint, type DiscoveredField, type DiscoveredModel, type DiscoveredRelationship, type DiscoveredSchema, type DropIndexRequest, type DropIndexResponse, type DropUniqueConstraintRequest, type DropUniqueConstraintResponse, DurableObjectEngine, type DurableObjectEngineOptions, type DurableObjectId, type DurableObjectNamespace, type DurableObjectState, type DurableObjectStorage, type DurableObjectStub, type EncodedSnapshotChunk, type Env, type ErrorResponse, FORMAT2_MANIFEST_VERSION, FORMAT2_MIN_MANIFEST_VERSION, FilterTooManyBindsError, Format2CompositeFieldError, type GroupByField, type HookContext, type HookResult, INGEST_CHUNK_LIMITS, InListTooLargeError, type IncrementRequest, type IncrementResponse, type IndexEntry, type IndexListResponse, type IngestChunkDescriptorLike, IngestChunkError, type IngestChunkErrorCode, type IngestChunkLine, JsonQueryTranslator, type JsonQueryTranslatorOptions, JsonSchemaDDL, type JsonSchemaOptions, type ModelMetaDeclaration, OVERLAY_KEY_SEPARATOR, OVERLAY_MARKER_DELETED, OVERLAY_MARKER_REPLACE, type OverlayMutation, type OverlayRecordEntry, type OverlaySql, type OverlayTables, PROJECTED_JSON_ALIAS_PREFIX, type ParsedOverlayKey, type PatchRequest, type PatchResponse, type PhysicalIndexExec, type PhysicalIndexSpec, QUERY_IN_LIST_MAX_VALUES, QUERY_STATEMENT_MAX_BOUND_PARAMS, type QueryRequest, type QueryResponse, type RegisterIndexRequest, type RegisterIndexResponse, type RegisterUniqueConstraintRequest, type RegisterUniqueConstraintResponse, SNAPSHOT_ENCODE_SEGMENT_BYTES, type SaveRequest, type SaveResponse, type SchemaConstraintInfo, type SchemaFieldInfo, type SchemaModelInfo, type SchemaResponse, type SnapshotChunkAddress, type SnapshotChunkEntry, SnapshotChunkIntegrityError, type SnapshotEncodeTimings, type SnapshotIngestInfo, type SnapshotIngestRange, type SnapshotManifest, SnapshotManifestInvalidError, SnapshotManifestUnsupportedError, type SnapshotOverlayEntry, type SnapshotPartitionConfig, type SnapshotPartitionDescriptor, SnapshotPartitioner, type SnapshotRow, SnapshotRowFormatError, type SqlStorage, type SqlStorageCursor, type StringSetMembership, type StringSetUpdateRequest, type StringSetUpdateResponse, type SyncIndexesRequest, type SyncIndexesResponse, type UniqueConstraintEntry, type UniqueConstraintListResponse, UniqueStringsetError, type UniqueStringsetViolation, applyOverlayMutation, assertNoFormat2CompositeFields, buildSafeAlias, checkAutoStampsReservedFields, checkReservedFieldName, clearMetaSyncCache, compareRecordIds, completeOverlayEntries, createDatabaseDO, cursorMintingRecord, cursorSortAlias, decodeOverlaySegment, deterministicIdentifierHash, discoverDeclaredModel, discoverModelNames, discoverSchema, encodeOverlayMutation, encodeOverlaySegment, encodeSnapshotChunk, ensurePhysicalIndex, findUniqueStringsetInToml, foldTouchedOverlayKeys, format2StringSetMembers, groupOverlayEntries, handleRequest, inferFieldType, isAnchorId, isFormat2StringSetYMap, lineBytes, loadSchemaFromTomlString, materializeOverlayRecord, omitStringsetConstraints, overlayFieldKey, overlayMarkerKey, overlayMemberKey, parseOverlayKey, parseRecordRow, parseSnapshotChunkPath, projectOverlayEntry, projectedJsonAlias, readIngestChunk, readOverlayRecord, readSnapshotChunk, registerFunctionDefault, removePhysicalIndex, resolveChunkOrdinal, resolvePhysicalIndex, schemaToToml, snapshotChunkLines, snapshotChunkSegments, snapshotDeclaredSchema, snapshotRowAsOverlayEntry, snapshotStringSetFields, stripCursorSortValues, syncInferredMeta, syncModelMeta, syncModelMetaFromDeclaration, uniqueStringsetMessage, uniqueStringsetViolations, validateSnapshotManifest };
+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, CURSOR_SORT_ALIAS_PREFIX, type CountRequest, type CountResponse, DEFAULT_OVERLAY_TABLES, DEFAULT_SNAPSHOT_PARTITION, type DatabaseDOConfig, type DatabaseDOHooks, type DeleteRequest, type DeleteResponse, type DiscoveredConstraint, type DiscoveredField, type DiscoveredModel, type DiscoveredRelationship, type DiscoveredSchema, type DropIndexRequest, type DropIndexResponse, type DropUniqueConstraintRequest, type DropUniqueConstraintResponse, DurableObjectEngine, type DurableObjectEngineOptions, type DurableObjectId, type DurableObjectNamespace, type DurableObjectState, type DurableObjectStorage, type DurableObjectStub, type EncodedSnapshotChunk, type Env, type ErrorResponse, FORMAT2_MANIFEST_VERSION, FORMAT2_MIN_MANIFEST_VERSION, FilterTooManyBindsError, Format2CompositeFieldError, type GroupByField, type HookContext, type HookResult, INGEST_CHUNK_LIMITS, InListTooLargeError, type IncrementRequest, type IncrementResponse, type IndexEntry, type IndexListResponse, type IngestChunkDescriptorLike, IngestChunkError, type IngestChunkErrorCode, type IngestChunkLine, JsonQueryTranslator, type JsonQueryTranslatorOptions, JsonSchemaDDL, type JsonSchemaOptions, type ModelMetaDeclaration, OVERLAY_KEY_SEPARATOR, OVERLAY_MARKER_DELETED, OVERLAY_MARKER_REPLACE, type OverlayMutation, type OverlayRecordEntry, type OverlaySql, type OverlayTables, PROJECTED_JSON_ALIAS_PREFIX, type ParsedOverlayKey, type PatchRequest, type PatchResponse, type PhysicalIndexExec, type PhysicalIndexSpec, QUERY_IN_LIST_MAX_VALUES, QUERY_STATEMENT_MAX_BOUND_PARAMS, type QueryRequest, type QueryResponse, type RegisterIndexRequest, type RegisterIndexResponse, type RegisterUniqueConstraintRequest, type RegisterUniqueConstraintResponse, SNAPSHOT_ENCODE_SEGMENT_BYTES, type SaveRequest, type SaveResponse, type SchemaConstraintInfo, type SchemaFieldInfo, type SchemaModelInfo, type SchemaResponse, type SnapshotChunkAddress, type SnapshotChunkEntry, SnapshotChunkIntegrityError, type SnapshotEncodeTimings, type SnapshotIngestInfo, type SnapshotIngestRange, type SnapshotManifest, SnapshotManifestInvalidError, SnapshotManifestUnsupportedError, type SnapshotOverlayEntry, type SnapshotPartitionConfig, type SnapshotPartitionDescriptor, SnapshotPartitioner, type SnapshotRow, SnapshotRowFormatError, type SqlStorage, type SqlStorageCursor, type StringSetMembership, type StringSetUpdateRequest, type StringSetUpdateResponse, type SyncIndexesRequest, type SyncIndexesResponse, type UniqueConstraintEntry, type UniqueConstraintListResponse, UniqueStringsetError, type UniqueStringsetViolation, applyOverlayMutation, assertNoFormat2CompositeFields, buildSafeAlias, checkAutoStampsReservedFields, checkReservedFieldName, clearMetaSyncCache, collapseDuplicateIndexes, compareRecordIds, completeOverlayEntries, createDatabaseDO, cursorMintingRecord, cursorSortAlias, decodeOverlaySegment, deterministicIdentifierHash, discoverDeclaredModel, discoverModelNames, discoverSchema, encodeOverlayMutation, encodeOverlaySegment, encodeSnapshotChunk, ensurePhysicalIndex, findUniqueStringsetInToml, foldTouchedOverlayKeys, format2StringSetMembers, groupOverlayEntries, handleRequest, indexDefinitionKey, inferFieldType, isAnchorId, isFormat2StringSetYMap, lineBytes, loadSchemaFromTomlString, materializeOverlayRecord, omitStringsetConstraints, overlayFieldKey, overlayMarkerKey, overlayMemberKey, parseOverlayKey, parseRecordRow, parseSnapshotChunkPath, projectOverlayEntry, projectedJsonAlias, readIngestChunk, readOverlayRecord, readSnapshotChunk, registerFunctionDefault, removePhysicalIndex, resolveChunkOrdinal, resolvePhysicalIndex, schemaToToml, snapshotChunkLines, snapshotChunkSegments, snapshotDeclaredSchema, snapshotRowAsOverlayEntry, snapshotStringSetFields, stripCursorSortValues, syncInferredMeta, syncModelMeta, syncModelMetaFromDeclaration, uniqueStringsetMessage, uniqueStringsetViolations, validateSnapshotManifest };

package/dist/cloudflare-do.d.ts

@@ -2096,12 +2096,16 @@ declare abstract class DatabaseEngine {
  *
  * ## What counts as the same definition
  *
- * The expression list and the `WHERE` clause, with whitespace removed and
- * CASE PRESERVED, plus whether the index is UNIQUE. Case matters: a partial
+ * The expression list and the `WHERE` clause, with whitespace normalised
+ * OUTSIDE quoted literals and every literal compared verbatim, CASE PRESERVED
+ * throughout, plus whether the index is UNIQUE. Case matters: a partial
  * index's predicate carries a model name (`WHERE _type = 'Note'`), and `Note`
- * and `note` are different models. The table name is not part of the
- * comparison because the lookup is already scoped to one table — and because
- * SQLite requotes it on a rename.
+ * and `note` are different models. Literals matter for the same reason, and
+ * more since #3876 made the comparison drive DROPS: `WHERE _type = 'a b'` and
+ * `WHERE _type = 'ab'` are two different partial indexes, and a comparison
+ * that stripped the space inside the quotes would drop one for the other. The
+ * table name is not part of the comparison because the lookup is already
+ * scoped to one table — and because SQLite requotes it on a rename.
  */
 /** The SQL executor this module needs: a query and its bindings, rows back. */
 type PhysicalIndexExec = (query: string, params?: unknown[]) => Array<Record<string, any>>;
@@ -2116,27 +2120,55 @@ interface PhysicalIndexSpec {
     /** The name to create it under when nothing equivalent exists. */
     canonicalName: string;
 }
+/**
+ * The key two index definitions share exactly when they are the same index
+ * (#3876): UNIQUE-ness, expression list and predicate, whitespace normalised
+ * outside literals, literals and case preserved. What `resolvePhysicalIndex`,
+ * `ensurePhysicalIndex`, `removePhysicalIndex`, the engine's reference-counted
+ * drops and `collapseDuplicateIndexes` all compare.
+ */
+declare function indexDefinitionKey(spec: PhysicalIndexSpec): string;
 /**
  * The NAME of an index on `spec.table` with `spec`'s definition, or null.
- *
- * Autoindexes (those `sqlite_master` records with a null `sql`) are skipped:
- * they belong to a constraint, not to a caller, and cannot be created or
- * dropped by name anyway.
+ * The first by name when there are several.
  */
 declare function resolvePhysicalIndex(exec: PhysicalIndexExec, spec: PhysicalIndexSpec): string | null;
 /**
  * Create `spec` under its canonical name unless an equivalent index already
  * exists under some name. Answers which of the two happened.
+ *
+ * When the canonical name is held by something else, the index is created
+ * under the first free `<canonicalName>_<n>`: the holder is a different
+ * definition (an equal one would have resolved above), and every reader
+ * resolves indexes by definition, never by name.
  */
 declare function ensurePhysicalIndex(exec: PhysicalIndexExec, spec: PhysicalIndexSpec): "created" | "exists";
 /**
- * Drop the index matching `spec`, by the name it actually has.
+ * Drop EVERY index matching `spec`, by the names they actually have.
  *
  * A no-op when there is none — the callers are all idempotent "make sure this
  * is gone" paths, and a swapped table's index under a foreign name is exactly
- * the one a `DROP INDEX IF EXISTS <canonicalName>` would miss.
+ * the one a `DROP INDEX IF EXISTS <canonicalName>` would miss. All of them,
+ * not the first (#3876): a store carrying the canonical copy and an
+ * ingest-suffixed one converges in one pass. The names come from
+ * `sqlite_master`, where a quoted keyword such as `"select"` is stored bare,
+ * so they are quoted back.
  */
 declare function removePhysicalIndex(exec: PhysicalIndexExec, spec: PhysicalIndexSpec): void;
+/**
+ * Drop the extra copies of every definition in `ownedKeys` on `table`
+ * (#3876), keeping the first of each by name. Answers the names it dropped.
+ *
+ * Databases built before #3434 could carry a field index and a unique
+ * constraint's index over one definition, and every insert and `_data` update
+ * paid for both. Only OWNED definitions are touched — ones the caller would
+ * itself create — so an index a consumer made by hand is never dropped, even
+ * when it duplicates another. `ownedKeys` are the keys of definitions on
+ * `table` itself: the key leaves the table out, so a set built across tables
+ * would claim `stringset_index(_type)` for a spec over `records(_type)`.
+ * `DROP INDEX` writes no row.
+ */
+declare function collapseDuplicateIndexes(exec: PhysicalIndexExec, table: string, ownedKeys: ReadonlySet<string>): string[];
 
 /**
  * JSON Schema DDL Generator
@@ -2181,19 +2213,30 @@ declare class JsonSchemaDDL {
      * A document whose tables were swapped by a bulk-load ingest carries these
      * under session-suffixed names; creating them by name on the next cold open
      * would build a second copy of each over the whole table.
+     *
+     * `records(_type)` is a base index only in yjs mode (#3876). The server's
+     * primary key `(_type, _id)` already leads with `_type`, so on a
+     * `DurableObjectEngine` the index served no plan the primary key's autoindex
+     * could not and cost a row on every insert; the yjs-mode list stays in step
+     * with the yjs-mode DDL, which clients keep.
      */
     static baseIndexSpecs(options: JsonSchemaOptions): PhysicalIndexSpec[];
     /**
-     * The base indexes this build RETIRED, as specs (#3688).
+     * The base indexes RETIRED, as specs, each removed BY DEFINITION for the
+     * same reason the others are created that way: a document a bulk-load
+     * ingest swapped carries it under a session-suffixed name, which a
+     * `DROP INDEX IF EXISTS <canonical name>` would walk straight past.
      *
-     * `(_type, field, _record_id)` is a left prefix of the member table's UNIQUE
-     * autoindex, so it never served a plan the autoindex could not; what it did
-     * do was cost a second index write per member insert. It is removed BY
-     * DEFINITION for the same reason the others are created that way: a document
-     * a bulk-load ingest swapped carries it under a session-suffixed name, which
-     * a `DROP INDEX IF EXISTS idx_ss_type_field_record` would walk straight past.
+     * - `idx_ss_type_field_record` (#3688): `(_type, field, _record_id)` is a
+     *   left prefix of the member table's UNIQUE autoindex, so it never served a
+     *   plan the autoindex could not; what it did do was cost a second index
+     *   write per member insert.
+     * - `idx_records_type` (#3876), on the server only: the primary key
+     *   `(_type, _id)` leads with `_type`, so every `WHERE _type = ?` plans onto
+     *   its autoindex (covering, for a count), and the index cost a row on every
+     *   insert. Clients' yjs-mode DDL keeps it.
      */
-    static retiredBaseIndexSpecs(_options: JsonSchemaOptions): PhysicalIndexSpec[];
+    static retiredBaseIndexSpecs(options: JsonSchemaOptions): PhysicalIndexSpec[];
     /**
      * Drop the retired base indexes BY NAME, for the name-based engines (#3688).
      *
@@ -2644,6 +2687,21 @@ declare class DurableObjectEngine extends JsonSchemaEngine {
      * really is identified by its name.
      */
     initializeSchema(): Promise<void>;
+    /**
+     * The index each registration row maps to (#3876): `fieldIndexSpec` per
+     * `_indexes` row, `uniqueConstraintIndexSpec` per `_unique_constraints` row.
+     * A row whose `fields_json` does not parse, or whose names are not valid
+     * identifiers, maps to nothing.
+     */
+    private registeredIndexSpecs;
+    /**
+     * Whether a remaining registration still maps to `spec`'s definition
+     * (#3876). A field index and a unique constraint over the same field — or
+     * two constraints over the same fields — share one physical index since
+     * #3434, so a drop removes it only when no other declaration needs it. The
+     * count is derived from the registration tables at drop time, not stored.
+     */
+    private definitionStillDeclared;
     /**
      * Whether this open renamed the pre-underscore column names.
      *
@@ -7059,4 +7117,4 @@ declare class SnapshotPartitioner {
     private take;
 }
 
-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, CURSOR_SORT_ALIAS_PREFIX, type CountRequest, type CountResponse, DEFAULT_OVERLAY_TABLES, DEFAULT_SNAPSHOT_PARTITION, type DatabaseDOConfig, type DatabaseDOHooks, type DeleteRequest, type DeleteResponse, type DiscoveredConstraint, type DiscoveredField, type DiscoveredModel, type DiscoveredRelationship, type DiscoveredSchema, type DropIndexRequest, type DropIndexResponse, type DropUniqueConstraintRequest, type DropUniqueConstraintResponse, DurableObjectEngine, type DurableObjectEngineOptions, type DurableObjectId, type DurableObjectNamespace, type DurableObjectState, type DurableObjectStorage, type DurableObjectStub, type EncodedSnapshotChunk, type Env, type ErrorResponse, FORMAT2_MANIFEST_VERSION, FORMAT2_MIN_MANIFEST_VERSION, FilterTooManyBindsError, Format2CompositeFieldError, type GroupByField, type HookContext, type HookResult, INGEST_CHUNK_LIMITS, InListTooLargeError, type IncrementRequest, type IncrementResponse, type IndexEntry, type IndexListResponse, type IngestChunkDescriptorLike, IngestChunkError, type IngestChunkErrorCode, type IngestChunkLine, JsonQueryTranslator, type JsonQueryTranslatorOptions, JsonSchemaDDL, type JsonSchemaOptions, type ModelMetaDeclaration, OVERLAY_KEY_SEPARATOR, OVERLAY_MARKER_DELETED, OVERLAY_MARKER_REPLACE, type OverlayMutation, type OverlayRecordEntry, type OverlaySql, type OverlayTables, PROJECTED_JSON_ALIAS_PREFIX, type ParsedOverlayKey, type PatchRequest, type PatchResponse, type PhysicalIndexExec, type PhysicalIndexSpec, QUERY_IN_LIST_MAX_VALUES, QUERY_STATEMENT_MAX_BOUND_PARAMS, type QueryRequest, type QueryResponse, type RegisterIndexRequest, type RegisterIndexResponse, type RegisterUniqueConstraintRequest, type RegisterUniqueConstraintResponse, SNAPSHOT_ENCODE_SEGMENT_BYTES, type SaveRequest, type SaveResponse, type SchemaConstraintInfo, type SchemaFieldInfo, type SchemaModelInfo, type SchemaResponse, type SnapshotChunkAddress, type SnapshotChunkEntry, SnapshotChunkIntegrityError, type SnapshotEncodeTimings, type SnapshotIngestInfo, type SnapshotIngestRange, type SnapshotManifest, SnapshotManifestInvalidError, SnapshotManifestUnsupportedError, type SnapshotOverlayEntry, type SnapshotPartitionConfig, type SnapshotPartitionDescriptor, SnapshotPartitioner, type SnapshotRow, SnapshotRowFormatError, type SqlStorage, type SqlStorageCursor, type StringSetMembership, type StringSetUpdateRequest, type StringSetUpdateResponse, type SyncIndexesRequest, type SyncIndexesResponse, type UniqueConstraintEntry, type UniqueConstraintListResponse, UniqueStringsetError, type UniqueStringsetViolation, applyOverlayMutation, assertNoFormat2CompositeFields, buildSafeAlias, checkAutoStampsReservedFields, checkReservedFieldName, clearMetaSyncCache, compareRecordIds, completeOverlayEntries, createDatabaseDO, cursorMintingRecord, cursorSortAlias, decodeOverlaySegment, deterministicIdentifierHash, discoverDeclaredModel, discoverModelNames, discoverSchema, encodeOverlayMutation, encodeOverlaySegment, encodeSnapshotChunk, ensurePhysicalIndex, findUniqueStringsetInToml, foldTouchedOverlayKeys, format2StringSetMembers, groupOverlayEntries, handleRequest, inferFieldType, isAnchorId, isFormat2StringSetYMap, lineBytes, loadSchemaFromTomlString, materializeOverlayRecord, omitStringsetConstraints, overlayFieldKey, overlayMarkerKey, overlayMemberKey, parseOverlayKey, parseRecordRow, parseSnapshotChunkPath, projectOverlayEntry, projectedJsonAlias, readIngestChunk, readOverlayRecord, readSnapshotChunk, registerFunctionDefault, removePhysicalIndex, resolveChunkOrdinal, resolvePhysicalIndex, schemaToToml, snapshotChunkLines, snapshotChunkSegments, snapshotDeclaredSchema, snapshotRowAsOverlayEntry, snapshotStringSetFields, stripCursorSortValues, syncInferredMeta, syncModelMeta, syncModelMetaFromDeclaration, uniqueStringsetMessage, uniqueStringsetViolations, validateSnapshotManifest };
+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, CURSOR_SORT_ALIAS_PREFIX, type CountRequest, type CountResponse, DEFAULT_OVERLAY_TABLES, DEFAULT_SNAPSHOT_PARTITION, type DatabaseDOConfig, type DatabaseDOHooks, type DeleteRequest, type DeleteResponse, type DiscoveredConstraint, type DiscoveredField, type DiscoveredModel, type DiscoveredRelationship, type DiscoveredSchema, type DropIndexRequest, type DropIndexResponse, type DropUniqueConstraintRequest, type DropUniqueConstraintResponse, DurableObjectEngine, type DurableObjectEngineOptions, type DurableObjectId, type DurableObjectNamespace, type DurableObjectState, type DurableObjectStorage, type DurableObjectStub, type EncodedSnapshotChunk, type Env, type ErrorResponse, FORMAT2_MANIFEST_VERSION, FORMAT2_MIN_MANIFEST_VERSION, FilterTooManyBindsError, Format2CompositeFieldError, type GroupByField, type HookContext, type HookResult, INGEST_CHUNK_LIMITS, InListTooLargeError, type IncrementRequest, type IncrementResponse, type IndexEntry, type IndexListResponse, type IngestChunkDescriptorLike, IngestChunkError, type IngestChunkErrorCode, type IngestChunkLine, JsonQueryTranslator, type JsonQueryTranslatorOptions, JsonSchemaDDL, type JsonSchemaOptions, type ModelMetaDeclaration, OVERLAY_KEY_SEPARATOR, OVERLAY_MARKER_DELETED, OVERLAY_MARKER_REPLACE, type OverlayMutation, type OverlayRecordEntry, type OverlaySql, type OverlayTables, PROJECTED_JSON_ALIAS_PREFIX, type ParsedOverlayKey, type PatchRequest, type PatchResponse, type PhysicalIndexExec, type PhysicalIndexSpec, QUERY_IN_LIST_MAX_VALUES, QUERY_STATEMENT_MAX_BOUND_PARAMS, type QueryRequest, type QueryResponse, type RegisterIndexRequest, type RegisterIndexResponse, type RegisterUniqueConstraintRequest, type RegisterUniqueConstraintResponse, SNAPSHOT_ENCODE_SEGMENT_BYTES, type SaveRequest, type SaveResponse, type SchemaConstraintInfo, type SchemaFieldInfo, type SchemaModelInfo, type SchemaResponse, type SnapshotChunkAddress, type SnapshotChunkEntry, SnapshotChunkIntegrityError, type SnapshotEncodeTimings, type SnapshotIngestInfo, type SnapshotIngestRange, type SnapshotManifest, SnapshotManifestInvalidError, SnapshotManifestUnsupportedError, type SnapshotOverlayEntry, type SnapshotPartitionConfig, type SnapshotPartitionDescriptor, SnapshotPartitioner, type SnapshotRow, SnapshotRowFormatError, type SqlStorage, type SqlStorageCursor, type StringSetMembership, type StringSetUpdateRequest, type StringSetUpdateResponse, type SyncIndexesRequest, type SyncIndexesResponse, type UniqueConstraintEntry, type UniqueConstraintListResponse, UniqueStringsetError, type UniqueStringsetViolation, applyOverlayMutation, assertNoFormat2CompositeFields, buildSafeAlias, checkAutoStampsReservedFields, checkReservedFieldName, clearMetaSyncCache, collapseDuplicateIndexes, compareRecordIds, completeOverlayEntries, createDatabaseDO, cursorMintingRecord, cursorSortAlias, decodeOverlaySegment, deterministicIdentifierHash, discoverDeclaredModel, discoverModelNames, discoverSchema, encodeOverlayMutation, encodeOverlaySegment, encodeSnapshotChunk, ensurePhysicalIndex, findUniqueStringsetInToml, foldTouchedOverlayKeys, format2StringSetMembers, groupOverlayEntries, handleRequest, indexDefinitionKey, inferFieldType, isAnchorId, isFormat2StringSetYMap, lineBytes, loadSchemaFromTomlString, materializeOverlayRecord, omitStringsetConstraints, overlayFieldKey, overlayMarkerKey, overlayMemberKey, parseOverlayKey, parseRecordRow, parseSnapshotChunkPath, projectOverlayEntry, projectedJsonAlias, readIngestChunk, readOverlayRecord, readSnapshotChunk, registerFunctionDefault, removePhysicalIndex, resolveChunkOrdinal, resolvePhysicalIndex, schemaToToml, snapshotChunkLines, snapshotChunkSegments, snapshotDeclaredSchema, snapshotRowAsOverlayEntry, snapshotStringSetFields, stripCursorSortValues, syncInferredMeta, syncModelMeta, syncModelMetaFromDeclaration, uniqueStringsetMessage, uniqueStringsetViolations, validateSnapshotManifest };

package/dist/cloudflare-do.js

@@ -2718,6 +2718,11 @@ var DatabaseEngine = class {
 // src/schema/JsonSchemaDDL.ts
 init_sql();
 init_sql();
+var RECORDS_TYPE_INDEX_SPEC = {
+  table: "records",
+  expressions: "_type",
+  canonicalName: "idx_records_type"
+};
 var JsonSchemaDDL = class {
   /**
    * Generate CREATE TABLE statement for the records table
@@ -2801,14 +2806,16 @@ CREATE TABLE IF NOT EXISTS stringset_index (
    * A document whose tables were swapped by a bulk-load ingest carries these
    * under session-suffixed names; creating them by name on the next cold open
    * would build a second copy of each over the whole table.
+   *
+   * `records(_type)` is a base index only in yjs mode (#3876). The server's
+   * primary key `(_type, _id)` already leads with `_type`, so on a
+   * `DurableObjectEngine` the index served no plan the primary key's autoindex
+   * could not and cost a row on every insert; the yjs-mode list stays in step
+   * with the yjs-mode DDL, which clients keep.
    */
   static baseIndexSpecs(options) {
     const specs = [
-      {
-        table: "records",
-        expressions: "_type",
-        canonicalName: "idx_records_type"
-      },
+      ...options.includeDocIdColumn ? [{ ...RECORDS_TYPE_INDEX_SPEC }] : [],
       {
         table: "stringset_index",
         expressions: "_type, field, value",
@@ -2837,22 +2844,28 @@ CREATE TABLE IF NOT EXISTS stringset_index (
     return specs;
   }
   /**
-   * The base indexes this build RETIRED, as specs (#3688).
+   * The base indexes RETIRED, as specs, each removed BY DEFINITION for the
+   * same reason the others are created that way: a document a bulk-load
+   * ingest swapped carries it under a session-suffixed name, which a
+   * `DROP INDEX IF EXISTS <canonical name>` would walk straight past.
    *
-   * `(_type, field, _record_id)` is a left prefix of the member table's UNIQUE
-   * autoindex, so it never served a plan the autoindex could not; what it did
-   * do was cost a second index write per member insert. It is removed BY
-   * DEFINITION for the same reason the others are created that way: a document
-   * a bulk-load ingest swapped carries it under a session-suffixed name, which
-   * a `DROP INDEX IF EXISTS idx_ss_type_field_record` would walk straight past.
+   * - `idx_ss_type_field_record` (#3688): `(_type, field, _record_id)` is a
+   *   left prefix of the member table's UNIQUE autoindex, so it never served a
+   *   plan the autoindex could not; what it did do was cost a second index
+   *   write per member insert.
+   * - `idx_records_type` (#3876), on the server only: the primary key
+   *   `(_type, _id)` leads with `_type`, so every `WHERE _type = ?` plans onto
+   *   its autoindex (covering, for a count), and the index cost a row on every
+   *   insert. Clients' yjs-mode DDL keeps it.
    */
-  static retiredBaseIndexSpecs(_options) {
+  static retiredBaseIndexSpecs(options) {
     return [
       {
         table: "stringset_index",
         expressions: "_type, field, _record_id",
         canonicalName: "idx_ss_type_field_record"
-      }
+      },
+      ...options.includeDocIdColumn ? [] : [{ ...RECORDS_TYPE_INDEX_SPEC }]
     ];
   }
   /**
@@ -3298,55 +3311,134 @@ var JsonSchemaEngine = class extends DatabaseEngine {
 init_sql();
 
 // src/utils/physicalIndex.ts
+init_sql();
 var INDEX_SQL = /^\s*CREATE\s+(UNIQUE\s+)?INDEX\s+(?:IF\s+NOT\s+EXISTS\s+)?"?([A-Za-z0-9_$]+)"?\s+ON\s+"?([A-Za-z0-9_$]+)"?\s*\(([\s\S]*)\)\s*(?:WHERE\s+([\s\S]+))?$/i;
+var TIGHT = /* @__PURE__ */ new Set(["(", ")", ",", "=", "|"]);
+function normalizeSqlText(text) {
+  let out = "";
+  let pendingSpace = false;
+  let i = 0;
+  const emit = (chunk) => {
+    const spaced = pendingSpace && out.length > 0 && !TIGHT.has(out[out.length - 1]) && !TIGHT.has(chunk[0]);
+    if (spaced) out += " ";
+    pendingSpace = false;
+    out += chunk;
+  };
+  while (i < text.length) {
+    const ch = text[i];
+    if (ch === "'" || ch === '"') {
+      let j = i + 1;
+      for (; ; ) {
+        if (j >= text.length) break;
+        if (text[j] === ch) {
+          if (text[j + 1] === ch) {
+            j += 2;
+            continue;
+          }
+          break;
+        }
+        j++;
+      }
+      emit(text.slice(i, j + 1));
+      i = j + 1;
+      continue;
+    }
+    if (/\s/.test(ch)) {
+      pendingSpace = true;
+      i++;
+      continue;
+    }
+    emit(ch);
+    i++;
+  }
+  return out;
+}
 function shapeOf(options) {
-  const strip = (text) => text.replace(/\s+/g, "");
   return [
     options.unique ? "UNIQUE" : "INDEX",
-    strip(options.expressions),
-    options.where ? strip(options.where) : ""
-  ].join("\0");
+    normalizeSqlText(options.expressions),
+    options.where ? normalizeSqlText(options.where) : ""
+  ].join(" ");
 }
-function shapeOfSpec(spec) {
+function indexDefinitionKey(spec) {
   return shapeOf({
     unique: Boolean(spec.unique),
     expressions: spec.expressions,
     where: spec.where ?? null
   });
 }
-function resolvePhysicalIndex(exec, spec) {
-  const wanted = shapeOfSpec(spec);
+function namedIndexesOf(exec, table) {
   const rows = exec(
     `SELECT name, sql FROM sqlite_master
-      WHERE type = 'index' AND tbl_name = ? AND sql IS NOT NULL`,
-    [spec.table]
+      WHERE type = 'index' AND tbl_name = ? AND sql IS NOT NULL
+      ORDER BY name`,
+    [table]
   );
+  const named = [];
   for (const row of rows) {
     const match = INDEX_SQL.exec(String(row.sql));
     if (!match) continue;
-    const shape = shapeOf({
-      unique: Boolean(match[1]),
-      expressions: match[4] ?? "",
-      where: match[5] ?? null
+    named.push({
+      name: String(row.name),
+      key: shapeOf({
+        unique: Boolean(match[1]),
+        expressions: match[4] ?? "",
+        where: match[5] ?? null
+      })
     });
-    if (shape === wanted) return String(row.name);
   }
-  return null;
+  return named;
+}
+function resolvePhysicalIndex(exec, spec) {
+  const wanted = indexDefinitionKey(spec);
+  const found = namedIndexesOf(exec, spec.table).find(
+    (index) => index.key === wanted
+  );
+  return found ? found.name : null;
+}
+function unusedIndexName(exec, canonicalName) {
+  const taken = (name) => exec("SELECT 1 FROM sqlite_master WHERE name = ? COLLATE NOCASE", [name]).length > 0;
+  if (!taken(canonicalName)) return canonicalName;
+  for (let n = 2; ; n++) {
+    const candidate = `${canonicalName}_${n}`;
+    if (!taken(candidate)) return candidate;
+  }
 }
 function ensurePhysicalIndex(exec, spec) {
   if (resolvePhysicalIndex(exec, spec) !== null) return "exists";
   exec(
-    `CREATE ${spec.unique ? "UNIQUE " : ""}INDEX IF NOT EXISTS ${spec.canonicalName} ON ${spec.table} (${spec.expressions})` + (spec.where ? ` WHERE ${spec.where}` : "")
+    `CREATE ${spec.unique ? "UNIQUE " : ""}INDEX IF NOT EXISTS ${unusedIndexName(exec, spec.canonicalName)} ON ${spec.table} (${spec.expressions})` + (spec.where ? ` WHERE ${spec.where}` : "")
   );
   return "created";
 }
 function removePhysicalIndex(exec, spec) {
-  const name = resolvePhysicalIndex(exec, spec);
-  if (name === null) return;
-  exec(`DROP INDEX IF EXISTS ${name}`);
+  const wanted = indexDefinitionKey(spec);
+  for (const index of namedIndexesOf(exec, spec.table)) {
+    if (index.key !== wanted) continue;
+    exec(`DROP INDEX IF EXISTS ${quoteIdentifier(index.name)}`);
+  }
+}
+function collapseDuplicateIndexes(exec, table, ownedKeys) {
+  const kept = /* @__PURE__ */ new Set();
+  const dropped = [];
+  for (const index of namedIndexesOf(exec, table)) {
+    if (!ownedKeys.has(index.key)) continue;
+    if (!kept.has(index.key)) {
+      kept.add(index.key);
+      continue;
+    }
+    exec(`DROP INDEX IF EXISTS ${quoteIdentifier(index.name)}`);
+    dropped.push(index.name);
+  }
+  return dropped;
 }
 
 // src/engines/cloudflare/DurableObjectEngine.ts
+function ownedDefinitionKeys(specs, table) {
+  return new Set(
+    specs.filter((spec) => spec.table === table).map(indexDefinitionKey)
+  );
+}
 var DurableObjectEngine = class extends JsonSchemaEngine {
   sql;
   storage;
@@ -3399,8 +3491,85 @@ var DurableObjectEngine = class extends JsonSchemaEngine {
     for (const spec of JsonSchemaDDL.retiredBaseIndexSpecs(this.schemaOptions)) {
       removePhysicalIndex(this.indexExec, spec);
     }
+    const owned = [
+      ...JsonSchemaDDL.baseIndexSpecs(this.schemaOptions),
+      ...JsonSchemaDDL.retiredBaseIndexSpecs(this.schemaOptions),
+      ...this.registeredIndexSpecs()
+    ];
+    for (const table of ["records", "stringset_index"]) {
+      const dropped = collapseDuplicateIndexes(
+        this.indexExec,
+        table,
+        ownedDefinitionKeys(owned, table)
+      );
+      if (dropped.length > 0) {
+        console.info("Durable Object engine collapsed duplicate indexes", {
+          table,
+          dropped
+        });
+      }
+    }
     this.initialized = true;
   }
+  /**
+   * The index each registration row maps to (#3876): `fieldIndexSpec` per
+   * `_indexes` row, `uniqueConstraintIndexSpec` per `_unique_constraints` row.
+   * A row whose `fields_json` does not parse, or whose names are not valid
+   * identifiers, maps to nothing.
+   */
+  registeredIndexSpecs() {
+    const specs = [];
+    try {
+      for (const row of this.execSqlSync(
+        "SELECT model_name, field_name FROM _indexes"
+      )) {
+        try {
+          specs.push(
+            JsonSchemaDDL.fieldIndexSpec(
+              String(row.model_name),
+              String(row.field_name)
+            )
+          );
+        } catch (e) {
+          console.debug("Skipping an unusable index registration:", e);
+        }
+      }
+    } catch (e) {
+      console.debug("Could not read index registrations:", e);
+    }
+    try {
+      for (const row of this.execSqlSync(
+        "SELECT model_name, constraint_name, fields_json FROM _unique_constraints"
+      )) {
+        try {
+          specs.push(
+            JsonSchemaDDL.uniqueConstraintIndexSpec(
+              String(row.model_name),
+              String(row.constraint_name),
+              JSON.parse(String(row.fields_json))
+            )
+          );
+        } catch (e) {
+          console.debug("Skipping an unusable unique-constraint registration:", e);
+        }
+      }
+    } catch (e) {
+      console.debug("Could not read unique-constraint registrations:", e);
+    }
+    return specs;
+  }
+  /**
+   * Whether a remaining registration still maps to `spec`'s definition
+   * (#3876). A field index and a unique constraint over the same field — or
+   * two constraints over the same fields — share one physical index since
+   * #3434, so a drop removes it only when no other declaration needs it. The
+   * count is derived from the registration tables at drop time, not stored.
+   */
+  definitionStillDeclared(spec) {
+    return ownedDefinitionKeys(this.registeredIndexSpecs(), spec.table).has(
+      indexDefinitionKey(spec)
+    );
+  }
   /**
    * Whether this open renamed the pre-underscore column names.
    *
@@ -3556,10 +3725,9 @@ var DurableObjectEngine = class extends JsonSchemaEngine {
       "DELETE FROM _indexes WHERE model_name = ? AND field_name = ?",
       [modelName, fieldName]
     );
-    removePhysicalIndex(
-      this.indexExec,
-      JsonSchemaDDL.fieldIndexSpec(modelName, fieldName)
-    );
+    const spec = JsonSchemaDDL.fieldIndexSpec(modelName, fieldName);
+    if (this.definitionStillDeclared(spec)) return;
+    removePhysicalIndex(this.indexExec, spec);
   }
   /**
    * List all registered indexes, optionally filtered by model.
@@ -3624,10 +3792,13 @@ var DurableObjectEngine = class extends JsonSchemaEngine {
     } catch {
       return;
     }
-    removePhysicalIndex(
-      this.indexExec,
-      JsonSchemaDDL.uniqueConstraintIndexSpec(modelName, constraintName, fields)
+    const spec = JsonSchemaDDL.uniqueConstraintIndexSpec(
+      modelName,
+      constraintName,
+      fields
     );
+    if (this.definitionStillDeclared(spec)) return;
+    removePhysicalIndex(this.indexExec, spec);
   }
   /**
    * List composite unique constraints, optionally filtered by model.
@@ -7969,6 +8140,7 @@ export {
   checkAutoStampsReservedFields,
   checkReservedFieldName,
   clearMetaSyncCache,
+  collapseDuplicateIndexes,
   compareRecordIds,
   completeOverlayEntries,
   createDatabaseDO,
@@ -7988,6 +8160,7 @@ export {
   format2StringSetMembers,
   groupOverlayEntries,
   handleRequest,
+  indexDefinitionKey,
   inferFieldType,
   isAnchorId,
   isFormat2StringSetYMap,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-bao",
-  "version": "0.12.0-alpha.0",
+  "version": "0.12.0-alpha.1",
   "description": "A library providing data modeling capabilities which support live updates and queries.",
   "types": "dist/index.d.ts",
   "type": "module",