@sixb/sqlite 0.1.4 → 0.1.6

package/dist/index.js

@@ -9181,6 +9181,14 @@ import {
 } from "@sixb/core/internal/ontology-storage-provider";
 var SQLITE_MATERIALIZATION_WORK_TABLE = "ontology_materialization_work";
 var SQLITE_REPLACEMENT_WORK_TABLE = "ontology_replacement_work";
+function linkScopeRequestJson(scopes) {
+  return canonicalJson(scopes.map(({ source, linkId }) => ({
+    scopeSortKey: linkScopeSortKey(source, linkId),
+    sourceTypeId: source.objectTypeId,
+    sourceId: source.primaryId,
+    linkId
+  })));
+}
 
 class SqliteMaterializationStateReader {
   db;
@@ -9389,20 +9397,15 @@ class SqliteMaterializationStateReader {
       return stored ? [stored] : [];
     });
   }
-  linkScopes(scopes) {
+  linkScopeRevisions(scopes) {
     if (scopes.length === 0)
       return [];
-    const requested = scopes.map(({ source, linkId }) => ({
-      scopeSortKey: linkScopeSortKey(source, linkId),
-      sourceTypeId: source.objectTypeId,
-      sourceId: source.primaryId,
-      linkId
-    }));
-    const accumulators = new Map(scopes.map(({ source, linkId }) => {
-      const key = linkScopeSortKey(source, linkId);
-      return [key, startScopeAccumulator(source, linkId)];
-    }));
-    const requestedJson = canonicalJson(requested);
+    return this.readEffectiveLinkScopes(scopes, linkScopeRequestJson(scopes)).revisions;
+  }
+  linkSlotStates(scopes) {
+    if (scopes.length === 0)
+      return [];
+    const requestedJson = linkScopeRequestJson(scopes);
     const sourceRows = this.db.query(`WITH requested AS (
            SELECT DISTINCT
              json_extract(value, '$.sourceTypeId') AS source_type_id,
@@ -9441,6 +9444,22 @@ class SqliteMaterializationStateReader {
       const stored = storedLinkSlotOverride(row);
       return [linkScopeSortKey(stored.ref.source, stored.ref.linkId), stored];
     }));
+    const { revisions, effective } = this.readEffectiveLinkScopes(scopes, requestedJson);
+    return scopes.map(({ source, linkId }, index) => {
+      const key = linkScopeSortKey(source, linkId);
+      return {
+        ...revisions[index],
+        sourceAssertion: sources.get(key) ?? null,
+        override: overrides.get(key) ?? null,
+        effective: effective.get(key) ?? null
+      };
+    });
+  }
+  readEffectiveLinkScopes(scopes, requestedJson) {
+    const accumulators = new Map(scopes.map(({ source, linkId }) => {
+      const key = linkScopeSortKey(source, linkId);
+      return [key, startScopeAccumulator(source, linkId)];
+    }));
     const effective = new Map;
     const rows = this.db.query(`
           WITH requested AS (
@@ -9469,22 +9488,10 @@ class SqliteMaterializationStateReader {
       appendScopeSnapshot(accumulator2, snapshot);
       effective.set(row.scope_sort_key, accumulator2.effectiveCount === 1 ? snapshot : null);
     }
-    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, linkId) {
-    const [scope] = this.linkScopes([{ source, linkId }]);
-    if (!scope) {
-      throw new MaterializationConflictError2("effective-state", "Link scope lookup returned no row.");
-    }
-    return scope;
+    return {
+      revisions: scopes.map(({ source, linkId }) => finishScopeAccumulator(accumulators.get(linkScopeSortKey(source, linkId)))),
+      effective
+    };
   }
   *incidentLinks(objects, pageRows) {
     if (objects.length === 0)
@@ -10520,8 +10527,9 @@ class SqliteOntologyMaterializationStorage {
         this.assertObject(reader, expected);
       for (const expected of input.expected.links)
         this.assertLink(reader, expected);
-      for (const expected of input.expected.linkScopes) {
-        if (reader.linkScope(expected.source, expected.linkId).fingerprint !== expected.fingerprint) {
+      const linkScopeRevisions = reader.linkScopeRevisions(input.expected.linkScopes);
+      for (const [index, expected] of input.expected.linkScopes.entries()) {
+        if (linkScopeRevisions[index]?.fingerprint !== expected.fingerprint) {
           throw new MaterializationConflictError5("effective-state", `Expected link scope changed for ${expected.source.objectTypeId}:${expected.source.primaryId}.${expected.linkId}.`);
         }
       }
@@ -10567,7 +10575,7 @@ class SqliteOntologyMaterializationStorage {
         yield {
           objects: [],
           links: [],
-          linkScopes: reader.linkScopes(scopes.slice(offset, offset + input.pageRows)),
+          linkScopes: reader.linkSlotStates(scopes.slice(offset, offset + input.pageRows)),
           points: []
         };
       }
@@ -14071,4 +14079,4 @@ export {
   SqliteStorage
 };
 
-//# debugId=2D24EFD822513C9E64756E2164756E21
+//# debugId=65891EE349DAB6B764756E2164756E21