@graphty/graph-io 0.3.40 → 0.3.42

package/dist/cx.js

@@ -1,4 +1,4 @@
-import { C, a, b, c, d } from "./chunks/importer-D_srHyj6.js";
+import { C, a, b, c, d } from "./chunks/importer-C98dpSH4.js";
 export {
   C as CX_CAPABILITIES,
   a as CX_ISSUE,

package/dist/cx2.js

@@ -1,5 +1,5 @@
-import { C, a, c } from "./chunks/exporter-6ocL_9x_.js";
-import { C as C2, c as c2 } from "./chunks/importer-BJlGAOht.js";
+import { C, a, c } from "./chunks/exporter-8hLNemFk.js";
+import { C as C2, c as c2 } from "./chunks/importer-D794XUTe.js";
 export {
   C as CX2_CAPABILITIES,
   C2 as CX2_ISSUE,

package/dist/cys.js

@@ -1,4 +1,4 @@
-import { C, a, b, c, d } from "./chunks/importer-CPqnIY8m.js";
+import { C, a, b, c, d } from "./chunks/importer-WrGRZb0N.js";
 export {
   C as CYS_CAPABILITIES,
   a as CYS_ISSUE,

package/dist/dot.js

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

package/dist/gexf.js

@@ -1,6 +1,6 @@
-import { bF as TIME_TEXT_ROLE, bG as TIME_TEXT_SUFFIX, al as resolveImportOptions, a8 as ImportReportBuilder, ao as reportSinkOptions, an as reportUnusedOptions, a4 as textChunks, E as EMPTY_INPUT_CODE, X as XML_SYNTAX_CODE, am as throwIfAborted, ar as IdCoercer, aq as DirectionResolver, f as STRAY_TEXT_CODE, N as NO_GRAPH_CODE, h as UNKNOWN_XML_ATTRIBUTE_CODE, l as MULTIPLE_GRAPHS_CODE, j as COUNT_MISMATCH_CODE, k as COUNT_HINT_CODE, o as DUPLICATE_ATTRIBUTE_CODE, aJ as isWeightField, bH as declareAttribute, a1 as declareResolved, t as MISSING_ID_CODE, n as DUPLICATE_NODE_CODE, q as UNKNOWN_PARENT_CODE, ai as PARENT_CYCLE_CODE, s as MISSING_ENDPOINT_CODE, m as DUPLICATE_EDGE_ID_CODE, aK as parseWeightText, bI as overflowsToInfinity, P as PRECISION_CODE, bJ as parseDeclaredTemporal, br as declareCompanion, bK as parseDeclaredValue, bL as losesPrecision, bM as parseTimeText, a3 as BAD_VALUE_CODE, bN as splitListText, g as UNKNOWN_ELEMENT_CODE, I as ID_MERGED_CODE, bO as timeTextCompanion, bP as parseDecimalText, c as capabilities, L as LOSS, aE as sanitizeIds, p as pairFolding, e as explicitWeights, r as resolveExportOptions, a as checkCapabilities, bQ as formatTimeValue, aa as formatF32, ab as formatF64, bR as mapDeclaredType, bS as joinListText, bT as formatTemporal, aG as formatInteger, b as plural, $ as agree, bx as isCanonicalIntegerText, M as MIXED_DIRECTION_CODE, D as DIRECTION_FORCED_CODE, d as DIRECTION_REFUSED_CODE, S as SINK_OPTION_CODE, O as OPTION_IGNORED_CODE, R as ROLE_TAKEN_CODE, C as COLUMN_RENAMED_CODE, aZ as BAD_OPTIONS_CODE, B as BAD_DEFAULT_CODE, U as UNKNOWN_ATTR_TYPE_CODE, v as ENCODING_CONFLICT_CODE, w as UNKNOWN_ENCODING_CODE, x as ENCODING_FALLBACK_CODE, y as INVALID_ENCODING_CODE, z as INVALID_UTF8_CODE, A as COLUMN_TYPE_CODE, F as ELEMENT_ISSUE, G as INPUT_ISSUE } from "./chunks/export-B-aVCwyG.js";
+import { bF as TIME_TEXT_ROLE, bG as TIME_TEXT_SUFFIX, al as resolveImportOptions, a8 as ImportReportBuilder, ao as reportSinkOptions, an as reportUnusedOptions, a4 as textChunks, E as EMPTY_INPUT_CODE, X as XML_SYNTAX_CODE, am as throwIfAborted, ar as IdCoercer, aq as DirectionResolver, f as STRAY_TEXT_CODE, N as NO_GRAPH_CODE, h as UNKNOWN_XML_ATTRIBUTE_CODE, l as MULTIPLE_GRAPHS_CODE, j as COUNT_MISMATCH_CODE, k as COUNT_HINT_CODE, o as DUPLICATE_ATTRIBUTE_CODE, aJ as isWeightField, bH as declareAttribute, a1 as declareResolved, t as MISSING_ID_CODE, n as DUPLICATE_NODE_CODE, q as UNKNOWN_PARENT_CODE, ai as PARENT_CYCLE_CODE, s as MISSING_ENDPOINT_CODE, m as DUPLICATE_EDGE_ID_CODE, aK as parseWeightText, bI as overflowsToInfinity, P as PRECISION_CODE, bJ as parseDeclaredTemporal, br as declareCompanion, bK as parseDeclaredValue, bL as losesPrecision, bM as parseTimeText, a3 as BAD_VALUE_CODE, bN as splitListText, g as UNKNOWN_ELEMENT_CODE, I as ID_MERGED_CODE, bO as timeTextCompanion, bP as parseDecimalText, c as capabilities, L as LOSS, aE as sanitizeIds, p as pairFolding, e as explicitWeights, r as resolveExportOptions, a as checkCapabilities, aa as formatF32, ab as formatF64, bQ as formatTimeValue, bR as mapDeclaredType, bS as joinListText, bT as formatTemporal, aG as formatInteger, b as plural, $ as agree, bx as isCanonicalIntegerText, M as MIXED_DIRECTION_CODE, D as DIRECTION_FORCED_CODE, d as DIRECTION_REFUSED_CODE, S as SINK_OPTION_CODE, O as OPTION_IGNORED_CODE, R as ROLE_TAKEN_CODE, C as COLUMN_RENAMED_CODE, aZ as BAD_OPTIONS_CODE, B as BAD_DEFAULT_CODE, U as UNKNOWN_ATTR_TYPE_CODE, v as ENCODING_CONFLICT_CODE, w as UNKNOWN_ENCODING_CODE, x as ENCODING_FALLBACK_CODE, y as INVALID_ENCODING_CODE, z as INVALID_UTF8_CODE, A as COLUMN_TYPE_CODE, F as ELEMENT_ISSUE, G as INPUT_ISSUE } from "./chunks/export-rKLeGQMo.js";
 import { GraphFormatError, INVALID_INDEX, MAX_COUNT } from "@graphty/graph-format";
-import { t as tokenizeXml, f as xmlDeclaredEncoding, g as XmlEmptyInputError, X as XmlSyntaxError, s as sniffXmlText, l as localName, j as isWhitespace, x as xmlIllegalTextNotes, a as escapeXmlText, e as escapeXmlAttribute } from "./chunks/escape-BJRLd3vJ.js";
+import { t as tokenizeXml, f as xmlDeclaredEncoding, g as XmlEmptyInputError, X as XmlSyntaxError, s as sniffXmlText, l as localName, j as isWhitespace, x as xmlIllegalTextNotes, a as escapeXmlText, e as escapeXmlAttribute } from "./chunks/escape-B62ZGM_a.js";
 import { j as joinText, e as encodeChunks } from "./chunks/writer-DxjgHwSe.js";
 const GEXF_FORMAT = "gexf";
 const GEXF_NAMESPACES = {
@@ -1121,20 +1121,15 @@ class GexfReader {
     }
   }
   /**
-   * Declare one `<attribute id title type>` with its `<default>` and `<options>` (design
-   * sections 5.1, 5.5, 5.6). The edge attribute titled `weightFrom` is the weight and gets no
-   * column; its declaration is recorded in meta.weightOrigin.
-   * @param pending - the attribute as read
+   * Whether an attribute was already declared (warning that the first declaration is kept), and
+   * a warning when values that use it came before its declaration.
+   * @param domain - node or edge
+   * @param id - the attribute id
+   * @param where - the report location
+   * @returns true when the declaration is a duplicate and must be skipped
    */
-  declareOne(pending) {
-    const { report, sink, options } = this;
-    const { domain, dynamic, attrs } = pending;
-    const id = attrs.get("id");
-    const where = { line: pending.line, element: id ?? null };
-    if (id === void 0) {
-      report.error("validation-error", ATTRIBUTE_ID_CODE, "<attribute> without an id", where);
-      return;
-    }
+  isDuplicateAttribute(domain, id, where) {
+    const { report } = this;
     const tracked = domain === "node" ? this.nodeAttrs : this.edgeAttrs;
     if (tracked.has(id) || domain === "edge" && this.weightAttr !== null && this.weightAttr.id === id) {
       report.warning(
@@ -1143,7 +1138,7 @@ class GexfReader {
         `${domain} attribute "${id}" is declared twice; the first declaration is kept`,
         where
       );
-      return;
+      return true;
     }
     if (this.unknownAttributes.has(`${domain}:${id}`)) {
       report.warning(
@@ -1153,6 +1148,62 @@ class GexfReader {
         where
       );
     }
+    return false;
+  }
+  /**
+   * Whether an edge attribute becomes THE weight: the first attribute of the weight's title does
+   * (declared here), a later one only warns and stays a plain column.
+   * @param attribute - the attribute's domain, id, display name, title and type
+   * @param attribute.domain - node or edge
+   * @param attribute.id - the attribute id
+   * @param attribute.name - the column name
+   * @param attribute.title - the declared title, or null
+   * @param attribute.type - the declared type, or null
+   * @param where - the report location
+   * @returns true when the attribute was declared as the weight
+   */
+  claimsWeight(attribute, where) {
+    const { report, sink, options } = this;
+    const { domain, id, name, title, type } = attribute;
+    if (domain !== "edge" || !isWeightField(name, options.weightFrom)) {
+      return false;
+    }
+    if (this.weightAttr !== null) {
+      report.warning(
+        "validation-error",
+        DUPLICATE_ATTRIBUTE_CODE,
+        `edge attribute "${id}" is also titled ${name}; attribute "${this.weightAttr.id}" is the weight, "${id}" is kept as a column`,
+        where
+      );
+      return false;
+    }
+    const declared = declareAttribute({ format: GEXF_FORMAT, id, title, type, long: options.long });
+    for (const issue of declared.issues) {
+      report.warning(issue.category, issue.code, issue.message, where);
+    }
+    this.weightAttr = { id, spec: declared.spec, table: INVALID_INDEX };
+    sink.setMeta({ weightOrigin: { format: GEXF_FORMAT, id, title, type, namespace: null } });
+    return true;
+  }
+  /**
+   * Declare one `<attribute id title type>` with its `<default>` and `<options>` (design
+   * sections 5.1, 5.5, 5.6). The edge attribute titled `weightFrom` is the weight and gets no
+   * column; its declaration is recorded in meta.weightOrigin.
+   * @param pending - the attribute as read
+   */
+  declareOne(pending) {
+    const { report, sink, options } = this;
+    const { domain, dynamic, attrs } = pending;
+    const id = attrs.get("id");
+    const where = { line: pending.line, element: id ?? null };
+    if (id === void 0) {
+      report.error("validation-error", ATTRIBUTE_ID_CODE, "<attribute> without an id", where);
+      return;
+    }
+    const tracked = domain === "node" ? this.nodeAttrs : this.edgeAttrs;
+    if (this.isDuplicateAttribute(domain, id, where)) {
+      return;
+    }
     const title = attrs.get("title") ?? null;
     const type = attrs.get("type") ?? null;
     if (type === null) {
@@ -1164,20 +1215,7 @@ class GexfReader {
       );
     }
     const name = title !== null && title.length > 0 ? title : id;
-    if (domain === "edge" && this.weightAttr !== null && isWeightField(name, options.weightFrom)) {
-      report.warning(
-        "validation-error",
-        DUPLICATE_ATTRIBUTE_CODE,
-        `edge attribute "${id}" is also titled ${name}; attribute "${this.weightAttr.id}" is the weight, "${id}" is kept as a column`,
-        where
-      );
-    } else if (domain === "edge" && isWeightField(name, options.weightFrom)) {
-      const declared2 = declareAttribute({ format: GEXF_FORMAT, id, title, type, long: options.long });
-      for (const issue of declared2.issues) {
-        report.warning(issue.category, issue.code, issue.message, where);
-      }
-      this.weightAttr = { id, spec: declared2.spec, table: INVALID_INDEX };
-      sink.setMeta({ weightOrigin: { format: GEXF_FORMAT, id, title, type, namespace: null } });
+    if (this.claimsWeight({ domain, id, name, title, type }, where)) {
       return;
     }
     const declaredNames = domain === "node" ? this.declaredNodeNames : this.declaredEdgeNames;
@@ -1513,6 +1551,14 @@ class GexfReader {
         report.recordError(err, ref.where);
       }
     }
+    this.resolveParentsLists(lists);
+  }
+  /**
+   * Resolve the `<parents>` lists read so far into the parents column.
+   * @param lists - the queued `<parents>` lists
+   */
+  resolveParentsLists(lists) {
+    const { sink, report } = this;
     for (const ref of lists) {
       const indices = [];
       for (const id of ref.ids) {
@@ -1556,7 +1602,7 @@ class GexfReader {
    * @param line - the line
    */
   beginEdge(attrs, line) {
-    const { report, sink, options } = this;
+    const { report, sink } = this;
     this.checkAbort();
     this.ctx.push(
       13
@@ -1611,18 +1657,7 @@ class GexfReader {
     try {
       const source = this.coerceId(sourceText, where);
       const target = this.coerceId(targetText, where);
-      if (!options.addMissingNodes) {
-        if (sink.indexOf(source) === INVALID_INDEX) {
-          throw new GraphFormatError("E_UNKNOWN_NODE", `edge references undeclared node "${sourceText}"`, {
-            id: source
-          });
-        }
-        if (sink.indexOf(target) === INVALID_INDEX) {
-          throw new GraphFormatError("E_UNKNOWN_NODE", `edge references undeclared node "${targetText}"`, {
-            id: target
-          });
-        }
-      }
+      this.requireDeclaredEndpoints(source, target, sourceText, targetText);
       const weight = this.xmlWeight(attrs, where);
       const before = sink.edgeCount;
       index = this.resolver.addEdge(source, target, kind, weight, where);
@@ -1640,6 +1675,40 @@ class GexfReader {
     frame.mirror = this.resolver.lastMirror;
     frame.xmlWeight = attrs.get("weight") ?? null;
     this.edge = frame;
+    this.writeEdgeColumns(attrs, index, idText, where);
+  }
+  /**
+   * Throw when addMissingNodes is off and an endpoint names an undeclared node.
+   * @param source - the coerced source id
+   * @param target - the coerced target id
+   * @param sourceText - the source as written
+   * @param targetText - the target as written
+   */
+  requireDeclaredEndpoints(source, target, sourceText, targetText) {
+    const { sink, options } = this;
+    if (options.addMissingNodes) {
+      return;
+    }
+    if (sink.indexOf(source) === INVALID_INDEX) {
+      throw new GraphFormatError("E_UNKNOWN_NODE", `edge references undeclared node "${sourceText}"`, {
+        id: source
+      });
+    }
+    if (sink.indexOf(target) === INVALID_INDEX) {
+      throw new GraphFormatError("E_UNKNOWN_NODE", `edge references undeclared node "${targetText}"`, {
+        id: target
+      });
+    }
+  }
+  /**
+   * Write the id, label, kind and lifetime columns of an added edge; a failure is reported.
+   * @param attrs - the edge's attributes
+   * @param index - the edge's index
+   * @param idText - the edge's id, or undefined
+   * @param where - the edge's location
+   */
+  writeEdgeColumns(attrs, index, idText, where) {
+    const { report, sink } = this;
     try {
       if (idText !== void 0) {
         this.edgeIdColumn.set(sink, report, index, idText, where);
@@ -2293,35 +2362,18 @@ class GexfReader {
         case "color":
           columns.color.set(sink, report, index, parseColor(attrs), where);
           break;
-        case "position": {
-          const x = vizNumber(attrs, "x");
-          const y = vizNumber(attrs, "y");
-          const z = attrs.has("z") ? vizNumber(attrs, "z") : 0;
-          this.positionColumn ??= new LazyColumn("node", {
-            ...NODE_DECLS.position,
-            extra: { ...NODE_DECLS.position.extra, sourceDims: attrs.has("z") ? 3 : 2 }
-          });
-          this.positionColumn.set(sink, report, index, [x, y, z], where);
+        case "position":
+          this.writePosition(attrs, index, where);
           break;
-        }
         case "size":
           this.sizeColumn.set(sink, report, index, vizNumber(attrs, "value"), where);
           break;
         case "thickness":
           this.thicknessColumn.set(sink, report, index, vizNumber(attrs, "value"), where);
           break;
-        case "shape": {
-          const value = attrs.get("value");
-          if (value === void 0) {
-            throw new GraphFormatError("E_COLUMN_TYPE", "<viz:shape> without a value", { element: name });
-          }
-          columns.shape.set(sink, report, index, value, where);
-          const uri = attrs.get("uri");
-          if (domain === "node" && uri !== void 0) {
-            this.shapeUriColumn.set(sink, report, index, uri, where);
-          }
+        case "shape":
+          this.writeShape(name, attrs, domain, index, where);
           break;
-        }
         default:
           break;
       }
@@ -2332,6 +2384,43 @@ class GexfReader {
       report.warning("validation-error", VIZ_VALUE_CODE, `<${name}> skipped: ${err.message}`, where);
     }
   }
+  /**
+   * Write a `<viz:position>`.
+   * @param attrs - its attributes
+   * @param index - the node's index
+   * @param where - the node's location
+   */
+  writePosition(attrs, index, where) {
+    const x = vizNumber(attrs, "x");
+    const y = vizNumber(attrs, "y");
+    const z = attrs.has("z") ? vizNumber(attrs, "z") : 0;
+    this.positionColumn ??= new LazyColumn("node", {
+      ...NODE_DECLS.position,
+      extra: { ...NODE_DECLS.position.extra, sourceDims: attrs.has("z") ? 3 : 2 }
+    });
+    this.positionColumn.set(this.sink, this.report, index, [x, y, z], where);
+  }
+  /**
+   * Write a `<viz:shape>` and, on a node, its `uri`.
+   * @param name - the element name as written
+   * @param attrs - its attributes
+   * @param domain - node or edge
+   * @param index - the element's index
+   * @param where - the element's location
+   */
+  writeShape(name, attrs, domain, index, where) {
+    const { sink, report } = this;
+    const columns = domain === "node" ? this.nodeColumns : this.edgeColumns;
+    const value = attrs.get("value");
+    if (value === void 0) {
+      throw new GraphFormatError("E_COLUMN_TYPE", "<viz:shape> without a value", { element: name });
+    }
+    columns.shape.set(sink, report, index, value, where);
+    const uri = attrs.get("uri");
+    if (domain === "node" && uri !== void 0) {
+      this.shapeUriColumn.set(sink, report, index, uri, where);
+    }
+  }
   // ---------------------------------------------------------------- helpers
   /**
    * Report an element the schema does not define at this place and skip its subtree.
@@ -3376,6 +3465,18 @@ function lifetimeAttrs(roles, row, plan) {
   }
   return out;
 }
+function spellBounds(s, e, open, plan) {
+  let attrs = "";
+  if (Number.isFinite(s)) {
+    const name = (open & OPEN_START) === 0 ? "start" : "startopen";
+    attrs += ` ${name}="${escapeXmlAttribute(formatTimeValue(s, plan.timeFormat))}"`;
+  }
+  if (Number.isFinite(e)) {
+    const name = (open & OPEN_END) === 0 ? "end" : "endopen";
+    attrs += ` ${name}="${escapeXmlAttribute(formatTimeValue(e, plan.timeFormat))}"`;
+  }
+  return attrs;
+}
 function spellsElement(roles, row, plan, indent) {
   const pairs = [];
   if (roles.spells?.isSet(row)) {
@@ -3396,16 +3497,7 @@ function spellsElement(roles, row, plan, indent) {
   let out = `${indent}<spells>
 `;
   for (const [s, e, open] of pairs) {
-    let attrs = "";
-    if (Number.isFinite(s)) {
-      const name = (open & OPEN_START) === 0 ? "start" : "startopen";
-      attrs += ` ${name}="${escapeXmlAttribute(formatTimeValue(s, plan.timeFormat))}"`;
-    }
-    if (Number.isFinite(e)) {
-      const name = (open & OPEN_END) === 0 ? "end" : "endopen";
-      attrs += ` ${name}="${escapeXmlAttribute(formatTimeValue(e, plan.timeFormat))}"`;
-    }
-    out += `${indent}  <spell${attrs}/>
+    out += `${indent}  <spell${spellBounds(s, e, open, plan)}/>
 `;
   }
   return `${out}${indent}</spells>
@@ -3739,18 +3831,8 @@ function metaElement(meta) {
 ${body}  </meta>
 `;
 }
-function graphStart(snapshot, plan) {
-  const { meta } = snapshot;
-  let attrs = ` defaultedgetype="${defaultEdgeType(snapshot)}"`;
-  let mode = meta.mode ?? "static";
-  if (plan.temporal && mode === "static") {
-    mode = "dynamic";
-  }
-  if (plan.version === "1.2" && mode === "slice") {
-    mode = "dynamic";
-  }
-  attrs += ` mode="${mode}"`;
-  let { idType } = meta;
+function graphIdTypeAttr(snapshot) {
+  let { idType } = snapshot.meta;
   if (idType === null) {
     const { kind } = snapshot.ids;
     if (kind === "string") {
@@ -3759,17 +3841,9 @@ function graphStart(snapshot, plan) {
       idType = "integer";
     }
   }
-  if (idType === "integer" || idType === "string") {
-    attrs += ` idtype="${idType}"`;
-  }
-  if (plan.timeFormat !== null) {
-    attrs += ` timeformat="${plan.timeFormat}"`;
-  } else if (plan.temporal) {
-    attrs += ' timeformat="double"';
-  }
-  if (plan.version === "1.3" && plan.timeRepresentation !== null) {
-    attrs += ` timerepresentation="${plan.timeRepresentation}"`;
-  }
+  return idType === "integer" || idType === "string" ? ` idtype="${idType}"` : "";
+}
+function graphHeaderAttrs(snapshot, plan) {
   const timestamp = graphExtraText(snapshot, "timestamp");
   const header = {
     start: graphExtraText(snapshot, "start"),
@@ -3781,11 +3855,35 @@ function graphStart(snapshot, plan) {
     header.end ??= timestamp;
     header.timestamp = null;
   }
+  let attrs = "";
   for (const [key, value] of Object.entries(header)) {
     if (value !== null) {
       attrs += ` ${key}="${escapeXmlAttribute(value)}"`;
     }
   }
+  return attrs;
+}
+function graphStart(snapshot, plan) {
+  const { meta } = snapshot;
+  let attrs = ` defaultedgetype="${defaultEdgeType(snapshot)}"`;
+  let mode = meta.mode ?? "static";
+  if (plan.temporal && mode === "static") {
+    mode = "dynamic";
+  }
+  if (plan.version === "1.2" && mode === "slice") {
+    mode = "dynamic";
+  }
+  attrs += ` mode="${mode}"`;
+  attrs += graphIdTypeAttr(snapshot);
+  if (plan.timeFormat !== null) {
+    attrs += ` timeformat="${plan.timeFormat}"`;
+  } else if (plan.temporal) {
+    attrs += ' timeformat="double"';
+  }
+  if (plan.version === "1.3" && plan.timeRepresentation !== null) {
+    attrs += ` timerepresentation="${plan.timeRepresentation}"`;
+  }
+  attrs += graphHeaderAttrs(snapshot, plan);
   return `  <graph${attrs}>
 `;
 }