@graphty/graph-io 0.3.49 → 0.3.50

package/dist/graphml.js

@@ -1,6 +1,6 @@
 import { G, a } from "./chunks/constants-CKkYLPtt.js";
-import { g, a as a2 } from "./chunks/importer-CT9mJ1nn.js";
-import { G as G2 } from "./chunks/styles-yed-UMFdNqze.js";
+import { g, a as a2 } from "./chunks/importer-C6NVpCXp.js";
+import { G as G2 } from "./chunks/styles-yed-XeFBQ6VS.js";
 export {
   G as GRAPHML_ISSUE,
   a as GRAPHML_LOSS,

package/dist/json.js

@@ -1,4 +1,4 @@
-import { J, a, b, d, j, c, e, f, s } from "./chunks/exporter-D2CETOMK.js";
+import { J, a, b, d, j, c, e, f, s } from "./chunks/exporter-CQQZFJ2v.js";
 export {
   J as JSON_DIALECTS,
   a as JSON_ISSUE,

package/dist/pajek.js

@@ -1,4 +1,4 @@
-import { P, a, b, c, p, d } from "./chunks/importer-vRq4h3j5.js";
+import { P, a, b, c, p, d } from "./chunks/importer-DgG4v1Ms.js";
 export {
   P as PAJEK_ISSUE,
   a as PAJEK_LOSS,

package/dist/sources-cypher.js

@@ -1,10 +1,10 @@
 import { b as throwIfAborted } from "./chunks/input-CAxt_aV-.js";
 import { P as PRECISION_CODE, ah as ImportError } from "./chunks/report-CwMfYa9J.js";
 import { C as CYPHER_DESCRIPTOR, N as NEO4J_DESCRIPTOR, a as NEPTUNE_DESCRIPTOR, S as SOURCE_ISSUE } from "./chunks/codes-BE2xir2k.js";
-import { w as warnOn, f as failOn, p as SOURCE_DEGREE_ATTR, b as failAlone, o as originOf, u as unwrapCredential, d as defineSource, C as CYPHER_SOURCE_ID, h as NEO4J_SOURCE_ID, i as NEPTUNE_SOURCE_ID } from "./chunks/credentials-DXHx7nwR.js";
-import { sha256Hex } from "./chunks/sigv4-EokFic1V.js";
+import { w as warnOn, f as failOn, q as SOURCE_DEGREE_ATTR, b as failAlone, o as originOf, u as unwrapCredential, d as defineSource, C as CYPHER_SOURCE_ID, h as NEO4J_SOURCE_ID, i as NEPTUNE_SOURCE_ID } from "./chunks/credentials-CmvJXYeH.js";
+import { sha256Hex } from "./chunks/sigv4-BXwVbza3.js";
 import { INVALID_INDEX } from "@graphty/graph-format";
-import { t as transportOptions, i as isLoopback } from "./chunks/context-C3p0RQxR.js";
+import { t as transportOptions, i as isLoopback } from "./chunks/context-DizmppHy.js";
 class GraphNode {
   /**
    * Create one.
@@ -544,15 +544,17 @@ function edgePage(profile, filters, pageSize, after) {
     `ORDER BY key LIMIT ${pageSize}`
   ].filter((l) => l !== null).join(" ");
 }
-function edgesAmong(profile, filters, after) {
-  const where = [nodePredicate("a", filters), nodePredicate("b", filters)].filter((p) => p !== null);
+function edgesAmong(profile, filters) {
+  const ka = idExpression("a", profile, filters);
+  const kb = idExpression("b", profile, filters);
+  const ends = [nodePredicate("a", filters), nodePredicate("b", filters)].filter((p) => p !== null);
+  const rest = ends.length === 0 ? "" : ` AND ${ends.join(" AND ")}`;
+  const pattern = `MATCH (a)-[r${typesPattern(filters)}]->(b)`;
   return [
-    `MATCH (a)-[r${typesPattern(filters)}]->(b)`,
-    where.length === 0 ? null : `WHERE ${where.join(" AND ")}`,
-    `WITH a, r, b, ${idExpression("a", profile, filters)} AS ka, ${idExpression("b", profile, filters)} AS kb`,
-    `WHERE ka <= $last AND kb <= $last${after ? " AND (ka > $after OR kb > $after)" : ""}`,
-    "RETURN a, r, b"
-  ].filter((l) => l !== null).join(" ");
+    `${pattern} WHERE ${ka} IN $keys AND ${kb} <= $last${rest} RETURN a, r, b`,
+    "UNION ALL",
+    `${pattern} WHERE ${kb} IN $keys AND ${ka} <= $last AND NOT ${ka} IN $keys${rest} RETURN a, r, b`
+  ].join(" ");
 }
 function neighborhood(profile, filters, shape, degree) {
   const rel = `[${typesPattern(filters)}*1..${shape.depth}]`;
@@ -1066,7 +1068,8 @@ class Reader {
    * Mode "query": the reader's own query, as written. With a node cap (or a cursor from a capped
    * run) the server returns at most that many rows (`CALL { query } RETURN * LIMIT n`), and a full
    * result hands back a cursor that runs the query again with twice the rows, for the caller to
-   * merge. A server that refuses the wrapper runs the query uncapped.
+   * merge. A server that refuses the wrapper fails the load with `E_SOURCE_PARAM` (`name:
+   * "maxNodes"`, `reason: "uncappable"`): the query is never run past the cap the caller set.
    * @param query - the query
    * @param cursor - where to resume: `{ rows }` from an earlier capped run
    * @returns the one page
@@ -1077,7 +1080,6 @@ class Reader {
     const asked = cursor?.rows ?? ctx.limits.maxNodes;
     const rows = asked === void 0 || asked === null ? null : Number(checkedInteger(asked, "maxNodes", 1, Number.MAX_SAFE_INTEGER, ctx.report));
     let result;
-    let capped = rows !== null;
     try {
       result = await this.transport.run(
         rows === null ? query : `CALL {
@@ -1087,16 +1089,18 @@ RETURN * LIMIT ${String(rows)}`,
         parameters
       );
     } catch (err) {
-      if (!capped || !(err instanceof ImportError) || err.issue?.code !== SOURCE_ISSUE.E_SOURCE_QUERY) {
+      if (rows === null || !(err instanceof ImportError) || err.issue?.code !== SOURCE_ISSUE.E_SOURCE_QUERY) {
         throw err;
       }
-      capped = false;
-      result = await this.transport.run(query, parameters);
+      return failOn(ctx.report, "E_SOURCE_PARAM", "the server cannot cap this query; load it without maxNodes", {
+        name: "maxNodes",
+        reason: "uncappable"
+      });
     }
     const collected = new Collector();
     collected.add(result, false);
     requireGraph(result, collected, ctx.report);
-    const full = capped && rows !== null && result.rows.length >= rows;
+    const full = rows !== null && result.rows.length >= rows;
     return { collected, next: full ? { rows: rows * 2 } : null };
   }
   /**
@@ -1156,13 +1160,12 @@ RETURN * LIMIT ${String(rows)}`,
         (d) => nodePage(profile, this.filters, String(size), after !== null, d),
         after === null ? {} : { after }
       );
-      const last = rows.at(-1)?.[fields.indexOf("key")];
+      const at = fields.indexOf("key");
+      const last = rows.at(-1)?.[at];
       const key = typeof last === "string" || typeof last === "number" ? last : null;
       if (key !== null) {
-        const among = await this.transport.run(edgesAmong(profile, this.filters, after !== null), {
-          last: key,
-          ...after === null ? {} : { after }
-        });
+        const keys = rows.map((row) => row[at]);
+        const among = await this.transport.run(edgesAmong(profile, this.filters), { keys, last: key });
         collected.add(among, false);
       }
       const next = rows.length >= size && key !== null ? { phase: "nodes", after: key } : null;