@sixb/sqlite 0.1.1 → 0.1.2

package/src/ontology-storage/materialization-state.ts

@@ -18,6 +18,7 @@ import {
 import {
   appendScopeSnapshot,
   finishScopeAccumulator,
+  linkSlotOverrideValue,
   startScopeAccumulator,
 } from "@sixb/core/internal/ontology-storage-provider"
 import type {
@@ -27,6 +28,7 @@ import type {
   SourceReplacementLinkState,
   SourceReplacementObjectState,
   StoredLinkOverride,
+  StoredLinkSlotOverride,
   StoredObjectOverride,
   StoredSourceAssertion,
   StoredSourceLinkAssertion,
@@ -38,8 +40,8 @@ import {
   linkRefFromColumns,
   objectRefFromColumns,
   parseJson,
-  type SqliteOntologyOverrideRow,
   type SqliteOntologySourceAssertionRow,
+  type SqliteStoredOverrideRow,
 } from "./shared"
 
 export const SQLITE_MATERIALIZATION_WORK_TABLE = "ontology_materialization_work"
@@ -81,12 +83,12 @@ interface LinkScopeRow extends EffectiveLinkRow {
   readonly scope_sort_key: string
 }
 
-interface ObjectOverrideRow extends SqliteOntologyOverrideRow {
+interface ObjectOverrideRow extends SqliteStoredOverrideRow {
   readonly object_type_id: string
   readonly primary_id: string
 }
 
-interface LinkOverrideRow extends SqliteOntologyOverrideRow {
+interface LinkOverrideRow extends SqliteStoredOverrideRow {
   readonly source_type_id: string
   readonly source_primary_id: string
   readonly link_id: string
@@ -94,6 +96,17 @@ interface LinkOverrideRow extends SqliteOntologyOverrideRow {
   readonly target_primary_id: string
 }
 
+interface LinkSlotOverrideRow {
+  readonly source_type_id: string
+  readonly source_primary_id: string
+  readonly link_id: string
+  readonly target_type_id: string
+  readonly target_primary_id: string
+  readonly value: string
+  readonly last_commit_id: string
+  readonly updated_at: string
+}
+
 interface ReplacementSources {
   readonly owned: ReadonlySet<string>
   readonly byMaterialization: ReadonlyMap<string, ReadonlyMap<string, StoredSourceAssertion>>
@@ -122,6 +135,18 @@ interface ReplacementIdentityInput {
   readonly pageRows: number
 }
 
+interface ReplacementWorkRow {
+  readonly entity_kind: "object" | "link"
+  readonly identity_key: string
+  readonly sort_key: string
+  readonly diff_required: number
+}
+
+interface ReplacementCursor {
+  readonly sortKey: string
+  readonly identityKey: string
+}
+
 export class SqliteMaterializationStateReader {
   constructor(
     private readonly db: Database,
@@ -175,9 +200,8 @@ export class SqliteMaterializationStateReader {
       .query(
         `WITH requested AS (${requestedObjects})
          SELECT overrides.* FROM requested
-         CROSS JOIN ontology_overrides AS overrides
+         CROSS JOIN ontology_object_overrides AS overrides
            ON overrides.project_id = ?
-          AND overrides.entity_kind = 'object'
           AND overrides.object_type_id = requested.object_type_id
           AND overrides.primary_id = requested.primary_id`
       )
@@ -305,9 +329,9 @@ export class SqliteMaterializationStateReader {
       .query(
         `WITH requested AS (${sourceRequest})
          SELECT overrides.* FROM requested
-         CROSS JOIN ontology_overrides AS overrides
+         CROSS JOIN ontology_link_overrides AS overrides
            ON overrides.project_id = ?
-          AND overrides.entity_kind = 'link'
+          AND overrides.identity_kind = 'edge'
           AND overrides.source_type_id = requested.source_type_id
           AND overrides.source_primary_id = requested.source_primary_id
           AND overrides.link_id = requested.link_id
@@ -315,6 +339,18 @@ export class SqliteMaterializationStateReader {
           AND overrides.target_primary_id = requested.target_primary_id`
       )
       .all(requested, this.projectId) as LinkOverrideRow[]
+    const slotOverrideRows = this.db
+      .query(
+        `WITH requested AS (${sourceRequest})
+         SELECT overrides.* FROM requested
+         CROSS JOIN ontology_link_overrides AS overrides
+           ON overrides.project_id = ?
+          AND overrides.identity_kind = 'slot'
+          AND overrides.source_type_id = requested.source_type_id
+          AND overrides.source_primary_id = requested.source_primary_id
+          AND overrides.link_id = requested.link_id`
+      )
+      .all(requested, this.projectId) as LinkSlotOverrideRow[]
     const effective = new Map(
       effectiveRows.map((row) => [linkRefKey(linkRefFromColumns(row)), row] as const)
     )
@@ -324,6 +360,12 @@ export class SqliteMaterializationStateReader {
         (row) => [linkRefKey(linkRefFromOverrideColumns(row)), storedLinkOverride(row)] as const
       )
     )
+    const slotOverrides = new Map(
+      slotOverrideRows.map((row) => {
+        const stored = storedLinkSlotOverride(row)
+        return [linkScopeSortKey(stored.ref.source, stored.ref.linkId), stored] as const
+      })
+    )
     return refs.map((ref) => {
       const key = linkRefKey(ref)
       const effectiveRow = effective.get(key)
@@ -331,6 +373,7 @@ export class SqliteMaterializationStateReader {
         ref: structuredClone(ref),
         source: sourceLink(sources.get(projectionEntityKey({ kind: "link", ref }))),
         override: overrides.get(key) ?? null,
+        slotOverride: slotOverrides.get(linkScopeSortKey(ref.source, ref.linkId)) ?? null,
         effective: effectiveRow ? effectiveLinkSnapshot(effectiveRow) : null,
       }
     })
@@ -395,9 +438,59 @@ export class SqliteMaterializationStateReader {
     const accumulators = new Map(
       scopes.map(({ source, linkId }) => {
         const key = linkScopeSortKey(source, linkId)
-        return [key, startScopeAccumulator(source, linkId, key)] as const
+        return [key, startScopeAccumulator(source, linkId)] as const
       })
     )
+    const requestedJson = canonicalJson(requested)
+    const sourceRows = this.db
+      .query(
+        `WITH requested AS (
+           SELECT DISTINCT
+             json_extract(value, '$.sourceTypeId') AS source_type_id,
+             json_extract(value, '$.sourceId') AS source_primary_id,
+             json_extract(value, '$.linkId') AS link_id
+           FROM json_each(?)
+         )
+         SELECT rows.* FROM requested
+         CROSS JOIN ontology_source_rows AS rows
+           ON rows.project_id = ?
+          AND rows.entity_kind = 'link'
+          AND rows.source_type_id = requested.source_type_id
+          AND rows.source_primary_id = requested.source_primary_id
+          AND rows.link_id = requested.link_id
+         JOIN ontology_sources AS sources
+           ON sources.project_id = rows.project_id
+          AND sources.source_id = rows.source_id
+          AND sources.materialization_id = rows.materialization_id
+         WHERE sources.status = 'active'`
+      )
+      .all(requestedJson, this.projectId) as SqliteOntologySourceAssertionRow[]
+    const slotOverrideRows = this.db
+      .query(
+        `WITH requested AS (
+           SELECT DISTINCT
+             json_extract(value, '$.sourceTypeId') AS source_type_id,
+             json_extract(value, '$.sourceId') AS source_primary_id,
+             json_extract(value, '$.linkId') AS link_id
+           FROM json_each(?)
+         )
+         SELECT overrides.* FROM requested
+         CROSS JOIN ontology_link_overrides AS overrides
+           ON overrides.project_id = ?
+          AND overrides.identity_kind = 'slot'
+          AND overrides.source_type_id = requested.source_type_id
+          AND overrides.source_primary_id = requested.source_primary_id
+          AND overrides.link_id = requested.link_id`
+      )
+      .all(requestedJson, this.projectId) as LinkSlotOverrideRow[]
+    const sources = activeScopeSourceMap(sourceRows)
+    const overrides = new Map(
+      slotOverrideRows.map((row) => {
+        const stored = storedLinkSlotOverride(row)
+        return [linkScopeSortKey(stored.ref.source, stored.ref.linkId), stored] as const
+      })
+    )
+    const effective = new Map<string, EffectiveLinkSnapshot | null>()
     const rows = this.db
       .query(
         `
@@ -419,7 +512,7 @@ export class SqliteMaterializationStateReader {
           ORDER BY requested.scope_sort_key, ${linkSortExpression("links")}
         `
       )
-      .iterate(canonicalJson(requested), this.projectId) as Iterable<LinkScopeRow>
+      .iterate(requestedJson, this.projectId) as Iterable<LinkScopeRow>
     for (const row of rows) {
       const accumulator = accumulators.get(row.scope_sort_key)
       if (!accumulator) {
@@ -428,11 +521,19 @@ export class SqliteMaterializationStateReader {
           `Unexpected link scope '${row.scope_sort_key}' returned by storage.`
         )
       }
-      appendScopeSnapshot(accumulator, effectiveLinkSnapshot(row))
+      const snapshot = effectiveLinkSnapshot(row)
+      appendScopeSnapshot(accumulator, snapshot)
+      effective.set(row.scope_sort_key, accumulator.effectiveCount === 1 ? snapshot : null)
     }
-    return scopes.map(({ source, linkId }) =>
-      finishScopeAccumulator(accumulators.get(linkScopeSortKey(source, linkId))!)
-    )
+    return scopes.map(({ source, linkId }) => {
+      const key = linkScopeSortKey(source, linkId)
+      return {
+        ...finishScopeAccumulator(accumulators.get(key)!),
+        sourceAssertion: sources.get(key) ?? null,
+        override: overrides.get(key) ?? null,
+        effective: effective.get(key) ?? null,
+      }
+    })
   }
 
   linkScope(source: OntologyObjectRef, linkId: string): MaterializationLinkScopeState {
@@ -464,8 +565,8 @@ export class SqliteMaterializationStateReader {
               FROM links WHERE project_id = ?
               UNION
               SELECT source_type_id, source_primary_id, link_id, target_type_id, target_primary_id
-              FROM ontology_overrides
-              WHERE project_id = ? AND entity_kind = 'link'
+              FROM ontology_link_overrides
+              WHERE project_id = ?
               UNION
               SELECT rows.source_type_id, rows.source_primary_id, rows.link_id,
                 rows.target_type_id, rows.target_primary_id
@@ -509,29 +610,15 @@ export class SqliteMaterializationStateReader {
   }
 
   *replacementIdentities(input: ReplacementIdentityInput): Iterable<ReplacementIdentity[]> {
-    let cursor: string | null = null
+    this.prepareReplacementIdentities(input)
+    let cursor: ReplacementCursor | null = null
     while (true) {
-      if (input.kind === "object") {
-        const rows = this.replacementObjectRows(input, cursor)
-        if (rows.length === 0) break
-        yield rows.map((row) => ({
-          kind: "object",
-          ref: { objectTypeId: row.object_type_id, primaryId: row.primary_id },
-          sortKey: row.sort_key,
-          diffRequired: true,
-        }))
-        cursor = rows[rows.length - 1]?.sort_key ?? null
-        continue
-      }
-      const rows = this.replacementLinkRows(input, cursor)
+      const rows = this.replacementRows(input, cursor)
       if (rows.length === 0) break
-      yield rows.map((row) => ({
-        kind: "link",
-        ref: linkRefFromColumns(row),
-        sortKey: row.sort_key,
-        diffRequired: row.diff_required === 1,
-      }))
-      cursor = rows[rows.length - 1]?.sort_key ?? null
+      yield rows.map(replacementIdentity)
+      if (rows.length < input.pageRows) break
+      const last = rows[rows.length - 1]!
+      cursor = { sortKey: last.sort_key, identityKey: last.identity_key }
     }
   }
 
@@ -581,6 +668,7 @@ export class SqliteMaterializationStateReader {
           ? sourceLink(candidate?.get(key))
           : state.source,
         override: state.override,
+        slotOverride: state.slotOverride,
         effective: state.effective,
         diffRequired: identities[index]!.diffRequired,
       }
@@ -623,16 +711,6 @@ export class SqliteMaterializationStateReader {
     return row ? row.last_commit_id : undefined
   }
 
-  overrideLastCommit(kind: "object" | "link", entityKey: string): string | null {
-    const row = this.db
-      .query(
-        `SELECT last_commit_id FROM ontology_overrides
-         WHERE project_id = ? AND entity_kind = ? AND entity_key = ?`
-      )
-      .get(this.projectId, kind, entityKey) as { readonly last_commit_id: string } | null
-    return row?.last_commit_id ?? null
-  }
-
   private replacementSources(
     sourceId: string,
     materializationIds: readonly string[],
@@ -682,62 +760,48 @@ export class SqliteMaterializationStateReader {
     return { owned, byMaterialization }
   }
 
-  private replacementObjectRows(
-    input: ReplacementIdentityInput,
-    cursor: string | null
-  ): (EffectiveObjectRow & { readonly sort_key: string })[] {
-    return this.db
+  private prepareReplacementIdentities(input: ReplacementIdentityInput): void {
+    if (input.kind === "object") {
+      this.prepareReplacementObjects(input)
+      return
+    }
+    this.prepareReplacementLinks(input)
+  }
+
+  private prepareReplacementObjects(input: ReplacementIdentityInput): void {
+    this.db
       .query(
         `
-          SELECT DISTINCT object_type_id, primary_id, entity_sort_key AS sort_key
+          INSERT INTO ${SQLITE_REPLACEMENT_WORK_TABLE} (
+            session_id, entity_kind, identity_key, sort_key, diff_required
+          )
+          SELECT ?, 'object', json_array(object_type_id, primary_id),
+            MIN(entity_sort_key), 1
           FROM ontology_source_rows
           WHERE project_id = ? AND source_id = ? AND entity_kind = 'object'
             AND materialization_id IN (?, COALESCE(?, ''))
-            AND (? IS NULL OR entity_sort_key > ?)
-          ORDER BY sort_key
-          LIMIT ?
+          GROUP BY object_type_id, primary_id
         `
       )
-      .all(
+      .run(
+        input.sessionId,
         this.projectId,
         input.sourceId,
         input.candidateMaterializationId,
-        input.previousMaterializationId,
-        cursor,
-        cursor,
-        input.pageRows
-      ) as (EffectiveObjectRow & { readonly sort_key: string })[]
+        input.previousMaterializationId
+      )
   }
 
-  private replacementLinkRows(
-    input: ReplacementIdentityInput,
-    cursor: string | null
-  ): (EffectiveLinkRow & { readonly sort_key: string; readonly diff_required: number })[] {
-    return this.db
+  private prepareReplacementLinks(input: ReplacementIdentityInput): void {
+    this.db
       .query(
         `
           WITH incident_objects AS (
-            SELECT
+            SELECT DISTINCT
               json_extract(payload, '$.ref.objectTypeId') AS object_type_id,
               json_extract(payload, '$.ref.primaryId') AS primary_id
             FROM ${SQLITE_MATERIALIZATION_WORK_TABLE}
             WHERE session_id = ? AND kind = 'incident-object'
-          ), authority_links AS (
-            SELECT source_type_id, source_id, link_id, target_type_id, target_id
-            FROM links WHERE project_id = ?
-            UNION
-            SELECT source_type_id, source_primary_id, link_id, target_type_id, target_primary_id
-            FROM ontology_overrides
-            WHERE project_id = ? AND entity_kind = 'link'
-            UNION
-            SELECT rows.source_type_id, rows.source_primary_id, rows.link_id,
-              rows.target_type_id, rows.target_primary_id
-            FROM ontology_source_rows AS rows
-            JOIN ontology_sources AS sources
-              ON sources.project_id = rows.project_id
-             AND sources.source_id = rows.source_id
-             AND sources.materialization_id = rows.materialization_id
-            WHERE rows.project_id = ? AND rows.entity_kind = 'link' AND sources.status = 'active'
           ), replacement_links AS (
             SELECT source_type_id, source_primary_id AS source_id, link_id,
               target_type_id, target_primary_id AS target_id
@@ -745,14 +809,67 @@ export class SqliteMaterializationStateReader {
             WHERE project_id = ? AND source_id = ? AND entity_kind = 'link'
               AND materialization_id IN (?, COALESCE(?, ''))
           ), incident_links AS (
-            SELECT links.* FROM authority_links AS links
-            WHERE EXISTS (
-              SELECT 1 FROM incident_objects
-              WHERE (incident_objects.object_type_id = links.source_type_id
-                  AND incident_objects.primary_id = links.source_id)
-                 OR (incident_objects.object_type_id = links.target_type_id
-                  AND incident_objects.primary_id = links.target_id)
-            )
+            SELECT links.source_type_id, links.source_id, links.link_id,
+              links.target_type_id, links.target_id
+            FROM links
+            JOIN incident_objects
+              ON incident_objects.object_type_id = links.source_type_id
+             AND incident_objects.primary_id = links.source_id
+            WHERE links.project_id = ?
+            UNION
+            SELECT links.source_type_id, links.source_id, links.link_id,
+              links.target_type_id, links.target_id
+            FROM links
+            JOIN incident_objects
+              ON incident_objects.object_type_id = links.target_type_id
+             AND incident_objects.primary_id = links.target_id
+            WHERE links.project_id = ?
+            UNION
+            SELECT overrides.source_type_id,
+              overrides.source_primary_id AS source_id,
+              overrides.link_id, overrides.target_type_id,
+              overrides.target_primary_id AS target_id
+            FROM ontology_link_overrides AS overrides
+            JOIN incident_objects
+              ON incident_objects.object_type_id = overrides.source_type_id
+             AND incident_objects.primary_id = overrides.source_primary_id
+            WHERE overrides.project_id = ?
+            UNION
+            SELECT overrides.source_type_id,
+              overrides.source_primary_id AS source_id,
+              overrides.link_id, overrides.target_type_id,
+              overrides.target_primary_id AS target_id
+            FROM ontology_link_overrides AS overrides
+            JOIN incident_objects
+              ON incident_objects.object_type_id = overrides.target_type_id
+             AND incident_objects.primary_id = overrides.target_primary_id
+            WHERE overrides.project_id = ?
+            UNION
+            SELECT rows.source_type_id, rows.source_primary_id AS source_id,
+              rows.link_id, rows.target_type_id, rows.target_primary_id AS target_id
+            FROM ontology_source_rows AS rows
+            JOIN ontology_sources AS sources
+              ON sources.project_id = rows.project_id
+             AND sources.source_id = rows.source_id
+             AND sources.materialization_id = rows.materialization_id
+            JOIN incident_objects
+              ON incident_objects.object_type_id = rows.source_type_id
+             AND incident_objects.primary_id = rows.source_primary_id
+            WHERE rows.project_id = ? AND rows.entity_kind = 'link'
+              AND sources.status = 'active'
+            UNION
+            SELECT rows.source_type_id, rows.source_primary_id AS source_id,
+              rows.link_id, rows.target_type_id, rows.target_primary_id AS target_id
+            FROM ontology_source_rows AS rows
+            JOIN ontology_sources AS sources
+              ON sources.project_id = rows.project_id
+             AND sources.source_id = rows.source_id
+             AND sources.materialization_id = rows.materialization_id
+            JOIN incident_objects
+              ON incident_objects.object_type_id = rows.target_type_id
+             AND incident_objects.primary_id = rows.target_primary_id
+            WHERE rows.project_id = ? AND rows.entity_kind = 'link'
+              AND sources.status = 'active'
           ), diff_links AS (
             SELECT * FROM replacement_links
             UNION SELECT * FROM incident_links
@@ -766,6 +883,16 @@ export class SqliteMaterializationStateReader {
             FROM links
             JOIN affected_scopes USING (source_type_id, source_id, link_id)
             WHERE links.project_id = ?
+            UNION ALL
+            SELECT overrides.source_type_id, overrides.source_primary_id AS source_id,
+              overrides.link_id, overrides.target_type_id,
+              overrides.target_primary_id AS target_id, 0 AS diff_required
+            FROM ontology_link_overrides AS overrides
+            JOIN affected_scopes
+              ON affected_scopes.source_type_id = overrides.source_type_id
+             AND affected_scopes.source_id = overrides.source_primary_id
+             AND affected_scopes.link_id = overrides.link_id
+            WHERE overrides.project_id = ? AND overrides.identity_kind = 'slot'
           ), selected AS (
             SELECT source_type_id, source_id, link_id, target_type_id, target_id,
               ${linkSortExpression("all_links")} AS sort_key,
@@ -773,26 +900,78 @@ export class SqliteMaterializationStateReader {
             FROM all_links
             GROUP BY source_type_id, source_id, link_id, target_type_id, target_id
           )
-          SELECT * FROM selected
-          WHERE (? IS NULL OR sort_key > ?)
-          ORDER BY sort_key
-          LIMIT ?
+          INSERT INTO ${SQLITE_REPLACEMENT_WORK_TABLE} (
+            session_id, entity_kind, identity_key, sort_key, diff_required
+          )
+          SELECT ?, 'link',
+            json_array(source_type_id, source_id, link_id, target_type_id, target_id),
+            sort_key, diff_required
+          FROM selected
         `
       )
-      .all(
+      .run(
         input.sessionId,
         this.projectId,
-        this.projectId,
-        this.projectId,
-        this.projectId,
         input.sourceId,
         input.candidateMaterializationId,
         input.previousMaterializationId,
         this.projectId,
-        cursor,
-        cursor,
+        this.projectId,
+        this.projectId,
+        this.projectId,
+        this.projectId,
+        this.projectId,
+        this.projectId,
+        this.projectId,
+        input.sessionId
+      )
+  }
+
+  private replacementRows(
+    input: ReplacementIdentityInput,
+    cursor: ReplacementCursor | null
+  ): ReplacementWorkRow[] {
+    return this.db
+      .query(
+        `
+          SELECT entity_kind, identity_key, sort_key, diff_required
+          FROM ${SQLITE_REPLACEMENT_WORK_TABLE}
+          WHERE session_id = ? AND entity_kind = ?
+            AND (? IS NULL OR (sort_key, identity_key) > (?, ?))
+          ORDER BY sort_key, identity_key
+          LIMIT ?
+        `
+      )
+      .all(
+        input.sessionId,
+        input.kind,
+        cursor?.sortKey ?? null,
+        cursor?.sortKey ?? null,
+        cursor?.identityKey ?? null,
         input.pageRows
-      ) as (EffectiveLinkRow & { readonly sort_key: string; readonly diff_required: number })[]
+      ) as ReplacementWorkRow[]
+  }
+}
+
+function replacementIdentity(row: ReplacementWorkRow): ReplacementIdentity {
+  const parts = parseJson<string[]>(row.identity_key)
+  if (row.entity_kind === "object") {
+    return {
+      kind: "object",
+      ref: { objectTypeId: parts[0]!, primaryId: parts[1]! },
+      sortKey: row.sort_key,
+      diffRequired: true,
+    }
+  }
+  return {
+    kind: "link",
+    ref: {
+      source: { objectTypeId: parts[0]!, primaryId: parts[1]! },
+      linkId: parts[2]!,
+      target: { objectTypeId: parts[3]!, primaryId: parts[4]! },
+    },
+    sortKey: row.sort_key,
+    diffRequired: row.diff_required === 1,
   }
 }
 
@@ -814,6 +993,26 @@ function activeSourceMap(
   return result
 }
 
+function activeScopeSourceMap(
+  rows: readonly SqliteOntologySourceAssertionRow[]
+): ReadonlyMap<string, StoredSourceLinkAssertion> {
+  const result = new Map<string, StoredSourceLinkAssertion>()
+  for (const row of rows) {
+    const source = sourceLink(storedSource(row))
+    if (!source) continue
+    const ref = source.assertion.ref
+    const key = linkScopeSortKey(ref.source, ref.linkId)
+    if (result.has(key)) {
+      throw new MaterializationConflictError(
+        "source-materialization",
+        `Multiple active sources assert cardinality-one link slot ${key}.`
+      )
+    }
+    result.set(key, source)
+  }
+  return result
+}
+
 function sourceObject(
   source: StoredSourceAssertion | undefined
 ): StoredSourceObjectAssertion | null {
@@ -844,6 +1043,19 @@ function storedLinkOverride(row: LinkOverrideRow): StoredLinkOverride {
   }
 }
 
+function storedLinkSlotOverride(row: LinkSlotOverrideRow): StoredLinkSlotOverride {
+  const ref = {
+    source: { objectTypeId: row.source_type_id, primaryId: row.source_primary_id },
+    linkId: row.link_id,
+  }
+  return {
+    ref,
+    value: linkSlotOverrideValue(parseJson<unknown>(row.value), linkScopeLabel(ref)),
+    lastCommitId: row.last_commit_id,
+    updatedAt: row.updated_at,
+  }
+}
+
 function linkRefFromOverrideColumns(row: LinkOverrideRow): OntologyLinkRef {
   return {
     source: { objectTypeId: row.source_type_id, primaryId: row.source_primary_id },
@@ -852,6 +1064,13 @@ function linkRefFromOverrideColumns(row: LinkOverrideRow): OntologyLinkRef {
   }
 }
 
+function linkScopeLabel(scope: {
+  readonly source: OntologyObjectRef
+  readonly linkId: string
+}): string {
+  return JSON.stringify([scope.source.objectTypeId, scope.source.primaryId, scope.linkId])
+}
+
 function storedSource(row: SqliteOntologySourceAssertionRow): StoredSourceAssertion {
   return {
     source: { projectionId: row.source_id },
@@ -924,17 +1143,7 @@ function storedPoint(row: TelemetryRow): StoredTelemetryPoint {
   }
 }
 
-export function objectSortExpression(alias?: string): string {
-  const prefix = alias ? `${alias}.` : ""
-  return `LOWER(HEX(CAST(json_array(${prefix}object_type_id, ${prefix}primary_id) AS BLOB)))`
-}
-
 export function linkSortExpression(alias?: string): string {
   const prefix = alias ? `${alias}.` : ""
   return `LOWER(HEX(CAST(json_array(${prefix}source_type_id, ${prefix}source_id, ${prefix}link_id, ${prefix}target_type_id, ${prefix}target_id) AS BLOB)))`
 }
-
-export function pointSortExpression(alias?: string): string {
-  const prefix = alias ? `${alias}.` : ""
-  return `LOWER(HEX(CAST(json_array(${prefix}object_type_id, ${prefix}object_id, ${prefix}property_id, ${prefix}at) AS BLOB)))`
-}