@sixb/pg 0.1.5 → 0.1.6

package/dist/index.js

@@ -6936,7 +6936,12 @@ class PgMaterializationStateReader {
       return stored ? [stored] : [];
     });
   }
-  async linkScopes(scopes) {
+  async linkScopeRevisions(scopes) {
+    if (scopes.length === 0)
+      return [];
+    return (await this.readEffectiveLinkScopes(scopes)).revisions;
+  }
+  async linkSlotStates(scopes) {
     if (scopes.length === 0)
       return [];
     const requested = scopes.map(({ source, linkId }) => ({
@@ -6945,10 +6950,6 @@ class PgMaterializationStateReader {
       source_id: source.primaryId,
       link_id: linkId
     }));
-    const accumulators = new Map(scopes.map(({ source, linkId }) => {
-      const key = linkScopeSortKey(source, linkId);
-      return [key, startScopeAccumulator(source, linkId)];
-    }));
     const requestedParameter = jsonParameter2(this.sql, requested);
     const [sourceRows, slotOverrideRows] = await Promise.all([
       this.sql`
@@ -6994,6 +6995,29 @@ class PgMaterializationStateReader {
       const stored = storedLinkSlotOverride(row);
       return [linkScopeSortKey(stored.ref.source, stored.ref.linkId), stored];
     }));
+    const { revisions, effective } = await this.readEffectiveLinkScopes(scopes);
+    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
+      };
+    });
+  }
+  async readEffectiveLinkScopes(scopes) {
+    const requested = scopes.map(({ source, linkId }) => ({
+      scope_sort_key: linkScopeSortKey(source, linkId),
+      source_type_id: source.objectTypeId,
+      source_id: source.primaryId,
+      link_id: linkId
+    }));
+    const requestedParameter = jsonParameter2(this.sql, requested);
+    const accumulators = new Map(scopes.map(({ source, linkId }) => {
+      const key = linkScopeSortKey(source, linkId);
+      return [key, startScopeAccumulator(source, linkId)];
+    }));
     const effective = new Map;
     let scopeCursor = null;
     let linkCursor = null;
@@ -7032,22 +7056,10 @@ class PgMaterializationStateReader {
       scopeCursor = last.scope_sort_key;
       linkCursor = last.link_sort_key;
     }
-    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
-      };
-    });
-  }
-  async linkScope(source, linkId) {
-    const [scope] = await 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
+    };
   }
   async* incidentLinks(objects, pageRows) {
     if (objects.length === 0)
@@ -8453,9 +8465,9 @@ class PgOntologyMaterializationStorage {
       for (const expected of input.expected.links) {
         this.assertLink(linkRevisions.get(linkRefKey3(expected.ref)), expected);
       }
-      const linkScopes = await reader.linkScopes(input.expected.linkScopes);
+      const linkScopeRevisions = await reader.linkScopeRevisions(input.expected.linkScopes);
       for (const [index, expected] of input.expected.linkScopes.entries()) {
-        if (linkScopes[index]?.fingerprint !== expected.fingerprint) {
+        if (linkScopeRevisions[index]?.fingerprint !== expected.fingerprint) {
           throw new MaterializationConflictError5("effective-state", `Expected link scope changed for ${expected.source.objectTypeId}:${expected.source.primaryId}.${expected.linkId}.`);
         }
       }
@@ -8502,7 +8514,7 @@ class PgOntologyMaterializationStorage {
         yield {
           objects: [],
           links: [],
-          linkScopes: await reader.linkScopes(scopes.slice(offset, offset + input.pageRows)),
+          linkScopes: await reader.linkSlotStates(scopes.slice(offset, offset + input.pageRows)),
           points: []
         };
       }
@@ -15346,4 +15358,4 @@ export {
   PostgresStorage
 };
 
-//# debugId=0531F72AD7BC178764756E2164756E21
+//# debugId=C3F03A4D1D49552764756E2164756E21