@graphty/graph-io 0.3.8 → 0.3.10

package/dist/dot.js

@@ -1,4 +1,4 @@
-import { D, a, d, b } from "./chunks/importer-BtHFICnf.js";
+import { D, a, d, b } from "./chunks/importer-C3HcYWAn.js";
 export {
   D as DOT_ISSUE,
   a as DOT_LOSS,

package/dist/gexf.js

@@ -1,6 +1,6 @@
-import { aM as TIME_TEXT_ROLE, aN as TIME_TEXT_SUFFIX, aF as resolveImportOptions, I as ImportReportBuilder, aC as reportSinkOptions, aD as reportUnusedOptions, t as textChunks, aa as XML_SYNTAX_CODE, a as throwIfAborted, v as IdCoercer, l as DirectionResolver, _ as STRAY_TEXT_CODE, K as NO_GRAPH_CODE, d as COUNT_HINT_CODE, aw as isWeightField, aO as declareAttribute, ai as declareResolved, y as MISSING_ID_CODE, k as DUPLICATE_NODE_CODE, a6 as UNKNOWN_PARENT_CODE, M as MISSING_ENDPOINT_CODE, i as DUPLICATE_EDGE_ID_CODE, aA as parseWeightText, aP as parseDeclaredTemporal, ah as declareCompanion, aQ as parseDeclaredValue, aR as losesPrecision, T as PRECISION_CODE, aS as parseTimeText, aT as splitListText, a4 as UNKNOWN_ELEMENT_CODE, o as ID_MERGED_CODE, aU as timeTextCompanion, aV as parseDecimalText, ac as capabilities, L as LOSS, ax as joinText, ak as encodeChunks, aG as sanitizeIds, az as pairFolding, al as explicitWeights, aE as resolveExportOptions, ad as checkCapabilities, aW as formatTimeValue, an as formatF32, ao as formatF64, aX as mapDeclaredType, aY as joinListText, aZ as formatTemporal, aq as formatInteger, at as isCanonicalIntegerText, z as MIXED_DIRECTION_CODE, g as DIRECTION_FORCED_CODE, h as DIRECTION_REFUSED_CODE, Y as SINK_OPTION_CODE, P as OPTION_IGNORED_CODE, X as ROLE_TAKEN_CODE, C as COLUMN_RENAMED_CODE, b as BAD_OPTIONS_CODE, B as BAD_DEFAULT_CODE, a3 as UNKNOWN_ATTR_TYPE_CODE, a5 as UNKNOWN_ENCODING_CODE, n as ENCODING_FALLBACK_CODE, s as INVALID_ENCODING_CODE, u as INVALID_UTF8_CODE } from "./chunks/writer-BdMak4_J.js";
+import { aM as TIME_TEXT_ROLE, aN as TIME_TEXT_SUFFIX, aF as resolveImportOptions, I as ImportReportBuilder, aC as reportSinkOptions, aD as reportUnusedOptions, t as textChunks, aa as XML_SYNTAX_CODE, a as throwIfAborted, v as IdCoercer, l as DirectionResolver, _ as STRAY_TEXT_CODE, K as NO_GRAPH_CODE, d as COUNT_HINT_CODE, aw as isWeightField, aO as declareAttribute, ai as declareResolved, y as MISSING_ID_CODE, k as DUPLICATE_NODE_CODE, a6 as UNKNOWN_PARENT_CODE, M as MISSING_ENDPOINT_CODE, i as DUPLICATE_EDGE_ID_CODE, aA as parseWeightText, aP as parseDeclaredTemporal, ah as declareCompanion, aQ as parseDeclaredValue, aR as losesPrecision, T as PRECISION_CODE, aS as parseTimeText, aT as splitListText, a4 as UNKNOWN_ELEMENT_CODE, o as ID_MERGED_CODE, aU as timeTextCompanion, aV as parseDecimalText, ac as capabilities, L as LOSS, ax as joinText, ak as encodeChunks, aG as sanitizeIds, az as pairFolding, al as explicitWeights, aE as resolveExportOptions, ad as checkCapabilities, aW as formatTimeValue, an as formatF32, ao as formatF64, aX as mapDeclaredType, aY as joinListText, aZ as formatTemporal, aq as formatInteger, at as isCanonicalIntegerText, z as MIXED_DIRECTION_CODE, g as DIRECTION_FORCED_CODE, h as DIRECTION_REFUSED_CODE, Y as SINK_OPTION_CODE, P as OPTION_IGNORED_CODE, X as ROLE_TAKEN_CODE, C as COLUMN_RENAMED_CODE, b as BAD_OPTIONS_CODE, B as BAD_DEFAULT_CODE, a3 as UNKNOWN_ATTR_TYPE_CODE, a5 as UNKNOWN_ENCODING_CODE, n as ENCODING_FALLBACK_CODE, s as INVALID_ENCODING_CODE, u as INVALID_UTF8_CODE } from "./chunks/writer-BtWpUaiH.js";
 import { GraphFormatError, INVALID_INDEX, MAX_COUNT } from "@graphty/graph-format";
-import { t as tokenizeXml, d as xmlDeclaredEncoding, X as XmlSyntaxError, l as localName, e as isWhitespace, x as xmlIllegalTextNotes, f as escapeXmlText, g as escapeXmlAttribute } from "./chunks/escape-BjmIaFFo.js";
+import { t as tokenizeXml, d as xmlDeclaredEncoding, X as XmlSyntaxError, l as localName, e as isWhitespace, x as xmlIllegalTextNotes, f as escapeXmlText, g as escapeXmlAttribute } from "./chunks/escape-D1f9-cwf.js";
 const GEXF_FORMAT = "gexf";
 const GEXF_NAMESPACES = {
   "1.2": { gexf: "http://www.gexf.net/1.2draft", viz: "http://www.gexf.net/1.2draft/viz" },
@@ -20,6 +20,7 @@ const NODE_COLUMNS = Object.freeze({
   end: "end",
   timestamp: "timestamp",
   spells: "spells",
+  spellsOpen: "spells.open",
   timestamps: "timestamps",
   open: "open",
   position: "position",
@@ -36,6 +37,7 @@ const EDGE_COLUMNS = Object.freeze({
   end: "end",
   timestamp: "timestamp",
   spells: "spells",
+  spellsOpen: "spells.open",
   timestamps: "timestamps",
   open: "open",
   color: "color",
@@ -94,6 +96,14 @@ const NODE_DECLS = {
     origin: XML_ORIGIN
   },
   open: { name: NODE_COLUMNS.open, dtype: "u8", role: "open", nullable: true, origin: XML_ORIGIN },
+  spellsOpen: {
+    name: NODE_COLUMNS.spellsOpen,
+    dtype: "list",
+    itemDtype: "u8",
+    role: "spellsOpen",
+    nullable: true,
+    origin: XML_ORIGIN
+  },
   position: {
     name: NODE_COLUMNS.position,
     dtype: "f32",
@@ -141,6 +151,14 @@ const EDGE_DECLS = {
     origin: XML_ORIGIN
   },
   open: { name: EDGE_COLUMNS.open, dtype: "u8", role: "open", nullable: true, origin: XML_ORIGIN },
+  spellsOpen: {
+    name: EDGE_COLUMNS.spellsOpen,
+    dtype: "list",
+    itemDtype: "u8",
+    role: "spellsOpen",
+    nullable: true,
+    origin: XML_ORIGIN
+  },
   color: {
     name: EDGE_COLUMNS.color,
     dtype: "f32",
@@ -268,6 +286,9 @@ const SPELL_OPEN_CODE = "W_GEXF_SPELL_OPEN_DROPPED";
 const VIZ_VALUE_CODE = "W_GEXF_VIZ_VALUE";
 const OPEN_BOUND_CONFLICT_CODE = "W_GEXF_OPEN_BOUND_CONFLICT";
 const EDGE_TYPES = /* @__PURE__ */ new Set(["directed", "undirected", "mutual"]);
+function edgeTypeKeyword(text) {
+  return text.trim().toLowerCase();
+}
 const ABORT_CHECK_INTERVAL = 64;
 const NODE_ATTRIBUTES = /* @__PURE__ */ new Set([
   "id",
@@ -433,6 +454,7 @@ class GexfReader {
     this.attributeText = null;
     this.attributeTextValue = "";
     this.spellPairs = null;
+    this.spellOpen = [];
     this.spellsWhere = null;
     this.parentIds = null;
     this.nodesSeen = false;
@@ -450,6 +472,7 @@ class GexfReader {
       end: new TemporalColumn("node", NODE_DECLS.end),
       timestamp: new TemporalColumn("node", NODE_DECLS.timestamp),
       spells: new LazyColumn("node", NODE_DECLS.spells),
+      spellsOpen: new LazyColumn("node", NODE_DECLS.spellsOpen),
       timestamps: new LazyColumn("node", NODE_DECLS.timestamps),
       open: new LazyColumn("node", NODE_DECLS.open),
       color: new LazyColumn("node", NODE_DECLS.color),
@@ -461,6 +484,7 @@ class GexfReader {
       end: new TemporalColumn("edge", EDGE_DECLS.end),
       timestamp: new TemporalColumn("edge", EDGE_DECLS.timestamp),
       spells: new LazyColumn("edge", EDGE_DECLS.spells),
+      spellsOpen: new LazyColumn("edge", EDGE_DECLS.spellsOpen),
       timestamps: new LazyColumn("edge", EDGE_DECLS.timestamps),
       open: new LazyColumn("edge", EDGE_DECLS.open),
       color: new LazyColumn("edge", EDGE_DECLS.color),
@@ -716,8 +740,8 @@ class GexfReader {
     const edgeType2 = attrs.get("defaultedgetype");
     if (edgeType2 === void 0) {
       this.defaultKind = this.options.defaultDirected ? "directed" : "undirected";
-    } else if (EDGE_TYPES.has(edgeType2)) {
-      this.defaultKind = edgeType2;
+    } else if (EDGE_TYPES.has(edgeTypeKeyword(edgeType2))) {
+      this.defaultKind = edgeTypeKeyword(edgeType2);
     } else {
       this.defaultKind = this.options.defaultDirected ? "directed" : "undirected";
       this.warnHeader("defaultedgetype", edgeType2, where);
@@ -758,7 +782,7 @@ class GexfReader {
       }
     }
     const extra = {};
-    for (const key of ["start", "end", "timestamp"]) {
+    for (const key of ["defaultedgetype", "start", "end", "timestamp"]) {
       const value = attrs.get(key);
       if (value !== void 0) {
         extra[key] = value;
@@ -1186,6 +1210,7 @@ class GexfReader {
         return;
       case "spells":
         this.spellPairs = [];
+        this.spellOpen = [];
         this.spellsWhere = frame.where;
         this.ctx.push(
           11
@@ -1347,13 +1372,14 @@ class GexfReader {
       return;
     }
     let kind = this.defaultKind;
-    const type = attrs.get("type");
-    if (type !== void 0) {
+    const typeText = attrs.get("type");
+    if (typeText !== void 0) {
+      const type = edgeTypeKeyword(typeText);
       if (!EDGE_TYPES.has(type)) {
         report.error(
           "validation-error",
           EDGE_TYPE_CODE,
-          `edge type "${type}" is not directed, undirected or mutual`,
+          `edge type "${typeText}" is not directed, undirected or mutual`,
           where
         );
         report.counts.skippedEdges++;
@@ -1468,6 +1494,7 @@ class GexfReader {
         return;
       case "spells":
         this.spellPairs = [];
+        this.spellOpen = [];
         this.spellsWhere = edge.where;
         this.ctx.push(
           11
@@ -1875,35 +1902,33 @@ class GexfReader {
     const where = this.spellsWhere ?? { line };
     try {
       const bounds = this.readBounds(attrs, where);
-      if (bounds.open !== 0) {
-        this.report.warnOnce(
-          "unsupported",
-          SPELL_OPEN_CODE,
-          "startopen / endopen on a <spell> cannot be kept; the spell is stored closed",
-          where
-        );
-      }
       this.spellPairs?.push([bounds.start.value, bounds.end.value]);
+      this.spellOpen.push(bounds.open);
     } catch (err) {
       this.report.recordError(err, where);
     }
   }
-  /** Close `<spells>`: write the pairs into the open element's spells column. */
+  /**
+   * Close `<spells>`: write the pairs into the open element's spells column, and their open bits
+   * into the spells.open column when any spell has an open bound.
+   */
   finishSpells() {
     const pairs = this.spellPairs;
+    const open = this.spellOpen;
     const where = this.spellsWhere ?? void 0;
     this.spellPairs = null;
+    this.spellOpen = [];
     this.spellsWhere = null;
     if (pairs === null) {
       return;
     }
     try {
-      if (this.edge !== null) {
-        this.edgeColumns.spells.set(this.sink, this.report, this.edge.index, pairs, where);
-      } else {
-        const frame = this.nodeStack[this.nodeStack.length - 1];
-        if (frame.index !== INVALID_INDEX) {
-          this.nodeColumns.spells.set(this.sink, this.report, frame.index, pairs, where);
+      const columns = this.edge === null ? this.nodeColumns : this.edgeColumns;
+      const { index } = this.edge ?? this.nodeStack[this.nodeStack.length - 1];
+      if (index !== INVALID_INDEX) {
+        columns.spells.set(this.sink, this.report, index, pairs, where);
+        if (open.some((bits) => bits !== 0)) {
+          columns.spellsOpen.set(this.sink, this.report, index, open, where);
         }
       }
     } catch (err) {
@@ -2364,6 +2389,8 @@ function roleShapeOk(role, column, domain) {
       return domain === "edge" && isNumericScalar(column);
     case "spells":
       return isNumericList(column, 2);
+    case "spellsOpen":
+      return column.dtype === "list" && column.meta.itemDtype === "u8";
     case "timestamps":
       return isNumericList(column, 1);
     case "position":
@@ -2387,6 +2414,7 @@ const MAPPED_ROLES = /* @__PURE__ */ new Set([
   "end",
   "timestamp",
   "spells",
+  "spellsOpen",
   "timestamps",
   "open",
   "position",
@@ -2405,6 +2433,7 @@ const ROLE_NAMES = Object.freeze({
   end: NODE_COLUMNS.end,
   timestamp: NODE_COLUMNS.timestamp,
   spells: NODE_COLUMNS.spells,
+  spellsOpen: NODE_COLUMNS.spellsOpen,
   timestamps: NODE_COLUMNS.timestamps,
   open: NODE_COLUMNS.open,
   position: NODE_COLUMNS.position,
@@ -2425,6 +2454,7 @@ function collectRoles(table, domain, note) {
     end: null,
     timestamp: null,
     spells: null,
+    spellsOpen: null,
     timestamps: null,
     open: null,
     position: null,
@@ -2953,14 +2983,15 @@ function lifetimeAttrs(roles, row, plan) {
 function spellsElement(roles, row, plan, indent) {
   const pairs = [];
   if (roles.spells !== null && roles.spells.isSet(row)) {
-    for (const pair of listItems(roles.spells, row)) {
+    const open = plan.version === "1.2" && roles.spellsOpen !== null && roles.spellsOpen.isSet(row) ? listItems(roles.spellsOpen, row) : [];
+    listItems(roles.spells, row).forEach((pair, i) => {
       const [s, e] = Array.from(pair);
-      pairs.push([s, e]);
-    }
+      pairs.push([s, e, open[i] ?? 0]);
+    });
   }
   if (plan.version === "1.2" && roles.timestamps !== null && roles.timestamps.isSet(row)) {
     for (const t of listItems(roles.timestamps, row)) {
-      pairs.push([t, t]);
+      pairs.push([t, t, 0]);
     }
   }
   if (pairs.length === 0) {
@@ -2968,13 +2999,15 @@ function spellsElement(roles, row, plan, indent) {
   }
   let out = `${indent}<spells>
 `;
-  for (const [s, e] of pairs) {
+  for (const [s, e, open] of pairs) {
     let attrs = "";
     if (Number.isFinite(s)) {
-      attrs += ` start="${escapeXmlAttribute(formatTimeValue(s, plan.timeFormat))}"`;
+      const name = (open & OPEN_START) === 0 ? "start" : "startopen";
+      attrs += ` ${name}="${escapeXmlAttribute(formatTimeValue(s, plan.timeFormat))}"`;
     }
     if (Number.isFinite(e)) {
-      attrs += ` end="${escapeXmlAttribute(formatTimeValue(e, plan.timeFormat))}"`;
+      const name = (open & OPEN_END) === 0 ? "end" : "endopen";
+      attrs += ` ${name}="${escapeXmlAttribute(formatTimeValue(e, plan.timeFormat))}"`;
     }
     out += `${indent}  <spell${attrs}/>
 `;
@@ -3240,7 +3273,7 @@ ${body}      </node>
   const edgeList = snapshot.edgeList();
   const folding = pairFolding(snapshot, { foldMutual: true });
   const weights = explicitWeights(snapshot);
-  const defaultType = snapshot.directed ? "directed" : "undirected";
+  const defaultType = defaultEdgeType(snapshot);
   let written = 0;
   for (let e = 0; e < snapshot.edgeCount; e++) {
     if (edgeType(snapshot, e, folding) !== null) {
@@ -3312,7 +3345,7 @@ ${body}  </meta>
 }
 function graphStart(snapshot, plan) {
   const { meta } = snapshot;
-  let attrs = ` defaultedgetype="${snapshot.directed ? "directed" : "undirected"}"`;
+  let attrs = ` defaultedgetype="${defaultEdgeType(snapshot)}"`;
   let mode = meta.mode ?? "static";
   if (plan.temporal && mode === "static") {
     mode = "dynamic";
@@ -3360,6 +3393,12 @@ function graphStart(snapshot, plan) {
   return `  <graph${attrs}>
 `;
 }
+function defaultEdgeType(snapshot) {
+  if (!snapshot.directed) {
+    return "undirected";
+  }
+  return graphExtraText(snapshot, "defaultedgetype")?.trim().toLowerCase() === "mutual" ? "mutual" : "directed";
+}
 function graphExtraText(snapshot, key) {
   const gexfExtra = snapshot.meta.extra.gexf;
   if (typeof gexfExtra !== "object" || gexfExtra === null) {
@@ -3467,7 +3506,7 @@ const GEXF_ISSUE = Object.freeze({
   VIZ_SKIPPED: VIZ_SKIPPED_CODE,
   /** A 1.2 dynamic viz element whose bounds were dropped. */
   VIZ_DYNAMIC_DROPPED: VIZ_DYNAMIC_CODE,
-  /** A 1.2 startopen / endopen spell stored closed. */
+  /** Deprecated and no longer recorded: open spells are kept in the spells.open column. */
   SPELL_OPEN_DROPPED: SPELL_OPEN_CODE,
   /** A viz value that could not be read. */
   VIZ_VALUE: VIZ_VALUE_CODE,