@dxos/index-core 0.8.4-main.d05539e30a → 0.8.4-main.d9fc60f731

package/dist/lib/neutral/index.mjs

@@ -195,32 +195,37 @@ var FtsIndex = class {
   }));
 };
 
-// src/indexes/object-meta-index.ts
+// src/indexes/entity-meta-index.ts
 import * as SqlClient5 from "@effect/sql/SqlClient";
 import * as Effect3 from "effect/Effect";
 import * as Schema2 from "effect/Schema";
 import { ATTR_DELETED, ATTR_PARENT, ATTR_RELATION_SOURCE, ATTR_RELATION_TARGET, ATTR_TYPE } from "@dxos/echo/internal";
-import { DXN } from "@dxos/keys";
+import { DXN, EID, EntityId, SpaceId as SpaceId2, URI } from "@dxos/keys";
 var _escapeLikePrefix = (prefix) => {
   const escaped = prefix.replaceAll("\\", "\\\\").replaceAll("%", "\\%").replaceAll("_", "\\_");
   return `${escaped}:%`;
 };
-var ObjectMeta = Schema2.Struct({
+var EntityMeta = Schema2.Struct({
   recordId: Schema2.Number,
-  objectId: Schema2.String,
+  objectId: EntityId,
+  /** Empty string for non-queue objects. */
   queueId: Schema2.String,
   /** Queue subspace namespace (e.g. 'data', 'trace'). Empty string for non-queue objects. */
   queueNamespace: Schema2.String,
-  spaceId: Schema2.String,
+  spaceId: SpaceId2,
   documentId: Schema2.String,
   entityKind: Schema2.String,
-  /** The versioned DXN of the type of the object. */
-  typeDXN: Schema2.String,
+  /**
+  * Type identifier URI for the object — typename DXN for non-stored schemas,
+  * schema-as-object EID for stored (dynamic) schemas. Mirrors the value
+  * written into the object's `system.type`.
+  */
+  typeDXN: URI.Schema,
   deleted: Schema2.Boolean,
-  source: Schema2.NullOr(Schema2.String),
-  target: Schema2.NullOr(Schema2.String),
+  source: Schema2.NullOr(EID.Schema),
+  target: Schema2.NullOr(EID.Schema),
   /** Parent object id (nullable). */
-  parent: Schema2.NullOr(Schema2.String),
+  parent: Schema2.NullOr(EID.Schema),
   /** Monotonically increasing sequence number assigned on insert/update for tracking indexing order. */
   version: Schema2.Number,
   /** Unix ms timestamp when the object was first indexed. */
@@ -245,8 +250,8 @@ var buildSourceCondition = (sql, spaceIds, includeAllQueues, queueIds) => {
   }
   return sql.or(conditions);
 };
-var ObjectMetaIndex = class {
-  migrate = Effect3.fn("ObjectMetaIndex.runMigrations")(function* () {
+var EntityMetaIndex = class {
+  migrate = Effect3.fn("EntityMetaIndex.runMigrations")(function* () {
     const sql = yield* SqlClient5.SqlClient;
     yield* sql`CREATE TABLE IF NOT EXISTS objectMeta (
       recordId INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -276,16 +281,18 @@ var ObjectMetaIndex = class {
     yield* sql`CREATE INDEX IF NOT EXISTS idx_object_index_updatedAt ON objectMeta(updatedAt)`;
     yield* sql`CREATE INDEX IF NOT EXISTS idx_object_index_createdAt ON objectMeta(createdAt)`;
   });
-  query = Effect3.fn("ObjectMetaIndex.query")((query) => Effect3.gen(function* () {
+  query = Effect3.fn("EntityMetaIndex.query")((query) => Effect3.gen(function* () {
     const sql = yield* SqlClient5.SqlClient;
-    const parsedType = DXN.tryParse(query.typeDXN)?.asTypeDXN();
-    const rows = parsedType && parsedType.version === void 0 ? yield* sql`SELECT * FROM objectMeta WHERE spaceId = ${query.spaceId} AND (typeDXN = ${query.typeDXN} OR typeDXN LIKE ${_escapeLikePrefix(query.typeDXN)} ESCAPE '\\')` : yield* sql`SELECT * FROM objectMeta WHERE spaceId = ${query.spaceId} AND typeDXN = ${query.typeDXN}`;
+    const parsedDxn = DXN.isDXN(query.typeDXN) ? query.typeDXN : void 0;
+    const hasNoVersion = parsedDxn !== void 0 && DXN.getVersion(parsedDxn) === void 0;
+    const legacyTypeDXN = parsedDxn ? `dxn:type:${parsedDxn.slice(4)}` : void 0;
+    const rows = hasNoVersion ? yield* sql`SELECT * FROM objectMeta WHERE spaceId = ${query.spaceId} AND (typeDXN = ${query.typeDXN} OR typeDXN LIKE ${_escapeLikePrefix(query.typeDXN)} ESCAPE '\\' ${legacyTypeDXN ? sql`OR typeDXN = ${legacyTypeDXN}` : sql``})` : yield* sql`SELECT * FROM objectMeta WHERE spaceId = ${query.spaceId} AND (typeDXN = ${query.typeDXN} ${legacyTypeDXN ? sql`OR typeDXN = ${legacyTypeDXN}` : sql``})`;
     return rows.map((row) => ({
       ...row,
       deleted: !!row.deleted
     }));
   }));
-  queryAll = Effect3.fn("ObjectMetaIndex.queryAll")((query) => Effect3.gen(function* () {
+  queryAll = Effect3.fn("EntityMetaIndex.queryAll")((query) => Effect3.gen(function* () {
     if (query.spaceIds.length === 0 && (!query.queueIds || query.queueIds.length === 0)) {
       return [];
     }
@@ -297,7 +304,7 @@ var ObjectMetaIndex = class {
       deleted: !!row.deleted
     }));
   }));
-  queryTypes = Effect3.fn("ObjectMetaIndex.queryTypes")(({ spaceIds, typeDxns, inverted = false, includeAllQueues = false, queueIds = null }) => Effect3.gen(function* () {
+  queryTypes = Effect3.fn("EntityMetaIndex.queryTypes")(({ spaceIds, typeDxns, inverted = false, includeAllQueues = false, queueIds = null }) => Effect3.gen(function* () {
     if (spaceIds.length === 0 && (!queueIds || queueIds.length === 0)) {
       return [];
     }
@@ -316,11 +323,17 @@ var ObjectMetaIndex = class {
     const sql = yield* SqlClient5.SqlClient;
     const sourceCondition = buildSourceCondition(sql, spaceIds, includeAllQueues, queueIds);
     const typeWhere = sql.or(typeDxns.map((typeDXN) => {
-      const parsedType = DXN.tryParse(typeDXN)?.asTypeDXN();
-      return parsedType && parsedType.version === void 0 ? sql.or([
+      const parsedDxn = DXN.isDXN(typeDXN) ? typeDXN : void 0;
+      const hasNoVersion = parsedDxn !== void 0 && DXN.getVersion(parsedDxn) === void 0;
+      const legacyTypeDXN = parsedDxn ? `dxn:type:${parsedDxn.slice(4)}` : void 0;
+      const exactMatch = legacyTypeDXN ? sql.or([
         sql`typeDXN = ${typeDXN}`,
-        sql`typeDXN LIKE ${_escapeLikePrefix(typeDXN)} ESCAPE '\\'`
+        sql`typeDXN = ${legacyTypeDXN}`
       ]) : sql`typeDXN = ${typeDXN}`;
+      return hasNoVersion ? sql.or([
+        exactMatch,
+        sql`typeDXN LIKE ${_escapeLikePrefix(typeDXN)} ESCAPE '\\'`
+      ]) : exactMatch;
     }));
     const rows = inverted ? yield* sql`SELECT * FROM objectMeta WHERE ${sourceCondition} AND NOT ${typeWhere}` : yield* sql`SELECT * FROM objectMeta WHERE ${sourceCondition} AND ${typeWhere}`;
     return rows.map((row) => ({
@@ -328,7 +341,7 @@ var ObjectMetaIndex = class {
       deleted: !!row.deleted
     }));
   }));
-  queryRelations = Effect3.fn("ObjectMetaIndex.queryRelations")(({ endpoint, anchorDxns }) => Effect3.gen(function* () {
+  queryRelations = Effect3.fn("EntityMetaIndex.queryRelations")(({ endpoint, anchorDxns }) => Effect3.gen(function* () {
     if (anchorDxns.length === 0) {
       return [];
     }
@@ -341,7 +354,7 @@ var ObjectMetaIndex = class {
     }));
   }));
   // TODO(dmaretskyi): Update recordId on objects so that we don't need to look it up separately.
-  update = Effect3.fn("ObjectMetaIndex.update")((objects) => Effect3.gen(function* () {
+  update = Effect3.fn("EntityMetaIndex.update")((objects) => Effect3.gen(function* () {
     const sql = yield* SqlClient5.SqlClient;
     yield* Effect3.forEach(objects, (object) => Effect3.gen(function* () {
       const { spaceId, queueId, queueNamespace, documentId, data } = object;
@@ -359,7 +372,8 @@ var ObjectMetaIndex = class {
       const [{ v }] = result;
       const version = (v ?? 0) + 1;
       const entityKind = castData[ATTR_RELATION_SOURCE] ? "relation" : "object";
-      const typeDXN = castData[ATTR_TYPE] ? String(castData[ATTR_TYPE]) : "type";
+      const rawTypeDXN = castData[ATTR_TYPE] ? String(castData[ATTR_TYPE]) : "type";
+      const typeDXN = DXN.tryMake(rawTypeDXN) ?? rawTypeDXN;
       const deleted = castData[ATTR_DELETED] ? 1 : 0;
       const source = entityKind === "relation" ? castData[ATTR_RELATION_SOURCE] ?? null : null;
       const target = entityKind === "relation" ? castData[ATTR_RELATION_TARGET] ?? null : null;
@@ -398,10 +412,10 @@ var ObjectMetaIndex = class {
     });
   }));
   /**
-  * Look up `recordIds` for objects that are already stored in the ObjectMetaIndex.
+  * Look up `recordIds` for objects that are already stored in the EntityMetaIndex.
   * Mutates the objects in place.
   */
-  lookupRecordIds = Effect3.fn("ObjectMetaIndex.lookupRecordIds")((objects) => Effect3.gen(function* () {
+  lookupRecordIds = Effect3.fn("EntityMetaIndex.lookupRecordIds")((objects) => Effect3.gen(function* () {
     const sql = yield* SqlClient5.SqlClient;
     for (const object of objects) {
       const { spaceId, queueId, documentId, data } = object;
@@ -415,7 +429,7 @@ var ObjectMetaIndex = class {
         result = [];
       }
       if (result.length === 0) {
-        return yield* Effect3.die(new Error(`Object not found in ObjectMetaIndex: ${spaceId}/${documentId ?? queueId}/${objectId}`));
+        return yield* Effect3.die(new Error(`Object not found in EntityMetaIndex: ${spaceId}/${documentId ?? queueId}/${objectId}`));
       }
       object.recordId = result[0].recordId;
     }
@@ -423,7 +437,7 @@ var ObjectMetaIndex = class {
   /**
   * Look up object metadata by recordIds.
   */
-  lookupByRecordIds = Effect3.fn("ObjectMetaIndex.lookupByRecordIds")((recordIds) => Effect3.gen(function* () {
+  lookupByRecordIds = Effect3.fn("EntityMetaIndex.lookupByRecordIds")((recordIds) => Effect3.gen(function* () {
     if (recordIds.length === 0) {
       return [];
     }
@@ -437,7 +451,7 @@ var ObjectMetaIndex = class {
   /**
   * Look up object metadata by objectId, spaceId, and queueId.
   */
-  lookupByObjectId = Effect3.fn("ObjectMetaIndex.lookupByObjectId")((query) => Effect3.gen(function* () {
+  lookupByObjectId = Effect3.fn("EntityMetaIndex.lookupByObjectId")((query) => Effect3.gen(function* () {
     const sql = yield* SqlClient5.SqlClient;
     const rows = yield* sql`SELECT * FROM objectMeta WHERE spaceId = ${query.spaceId} AND queueId = ${query.queueId} AND objectId = ${query.objectId} LIMIT 1`;
     if (rows.length === 0) {
@@ -451,7 +465,7 @@ var ObjectMetaIndex = class {
   /**
   * Query objects by timestamp range.
   */
-  queryByTimeRange = Effect3.fn("ObjectMetaIndex.queryByTimeRange")((query) => Effect3.gen(function* () {
+  queryByTimeRange = Effect3.fn("EntityMetaIndex.queryByTimeRange")((query) => Effect3.gen(function* () {
     if (query.spaceIds.length === 0 && (!query.queueIds || query.queueIds.length === 0)) {
       return [];
     }
@@ -481,14 +495,17 @@ var ObjectMetaIndex = class {
   * Matches both:
   * - Objects whose `parent` field references one of the given parent ids (standard parent/child hierarchy).
   * - Queue items whose `queueId` equals one of the parent ids (e.g. items inside a Feed, since a feed's queue
-  *   DXN uses the feed's object id as its queue id — see `Feed.getQueueDxn`).
+  *   DXN uses the feed's object id as its queue id — see `Feed.getQueueUri`).
   */
-  queryChildren = Effect3.fn("ObjectMetaIndex.queryChildren")((query) => Effect3.gen(function* () {
+  queryChildren = Effect3.fn("EntityMetaIndex.queryChildren")((query) => Effect3.gen(function* () {
     if (query.parentIds.length === 0) {
       return [];
     }
     const sql = yield* SqlClient5.SqlClient;
-    const parentDxns = query.parentIds.map((id) => DXN.fromLocalObjectId(id).toString());
+    const parentDzns = query.parentIds.map((id) => EID.make({
+      entityId: id
+    }));
+    const parentDxns = parentDzns;
     const rows = yield* sql`SELECT * FROM objectMeta WHERE ${sql.in("spaceId", query.spaceId)} AND (${sql.in("parent", parentDxns)} OR ${sql.in("queueId", query.parentIds)})`;
     return rows.map((row) => ({
       ...row,
@@ -502,6 +519,7 @@ import * as SqlClient7 from "@effect/sql/SqlClient";
 import * as Effect4 from "effect/Effect";
 import * as Schema4 from "effect/Schema";
 import { EncodedReference, isEncodedReference } from "@dxos/echo-protocol";
+import { EID as EID2 } from "@dxos/keys";
 
 // src/utils.ts
 import * as Schema3 from "effect/Schema";
@@ -538,14 +556,15 @@ var extractReferences = (data) => {
   const refs = [];
   const visit = (path, value) => {
     if (isEncodedReference(value)) {
-      const dxn = EncodedReference.toDXN(value);
-      const echoId = dxn.asEchoDXN()?.echoId;
-      if (!echoId) {
+      const uri = EncodedReference.toURI(value);
+      const parsedEchoUri = EID2.tryParse(uri);
+      const echoUri = parsedEchoUri ? EID2.getEntityId(parsedEchoUri) : void 0;
+      if (!echoUri || !parsedEchoUri) {
         return;
       }
       refs.push({
         path,
-        targetDXN: dxn.toString()
+        targetDXN: parsedEchoUri
       });
     } else if (typeof value === "object" && value !== null && !Array.isArray(value)) {
       for (const [key, v] of Object.entries(value)) {
@@ -568,7 +587,7 @@ var extractReferences = (data) => {
 };
 var ReverseRef = Schema4.Struct({
   recordId: Schema4.Number,
-  targetDXN: Schema4.String,
+  targetDXN: EID2.Schema,
   /**
   * Escaped property path within an object.
   *
@@ -652,7 +671,7 @@ var IndexEngine = class {
   #reverseRefIndex;
   constructor(params) {
     this.#tracker = params?.tracker ?? new IndexTracker();
-    this.#objectMetaIndex = params?.objectMetaIndex ?? new ObjectMetaIndex();
+    this.#objectMetaIndex = params?.objectMetaIndex ?? new EntityMetaIndex();
     this.#ftsIndex = params?.ftsIndex ?? new FtsIndex();
     this.#reverseRefIndex = params?.reverseRefIndex ?? new ReverseRefIndex();
   }
@@ -735,7 +754,7 @@ var IndexEngine = class {
   * Update a dependent index that requires recordId enrichment.
   * This method:
   * 1. Gets changed objects from the source.
-  * 2. Ensures those objects exist in ObjectMetaIndex.
+  * 2. Ensures those objects exist in EntityMetaIndex.
   * 3. Looks up recordIds for those objects.
   * 4. Enriches objects with recordIds.
   * 5. Updates the dependent index.
@@ -780,11 +799,11 @@ var IndexEngine = class {
   }
 };
 export {
+  EntityMetaIndex,
   EscapedPropPath,
   FtsIndex,
   IndexEngine,
   IndexTracker,
-  ObjectMetaIndex,
   ReverseRefIndex
 };
 //# sourceMappingURL=index.mjs.map