@graphty/graph-io 0.3.40 → 0.3.42

package/dist/gml.js

@@ -1,8 +1,8 @@
-import { ak as SYNTAX_CODE, b as plural, a as checkCapabilities, L as LOSS, p as pairFolding, $ as agree, c as capabilities, r as resolveExportOptions, ac as DictHeuristic, aG as formatInteger, bv as formatGmlReal, aE as sanitizeIds, bD as countMixedEdges, e as explicitWeights, bU as DICT_SAMPLE_ROWS, R as ROLE_TAKEN_CODE$1, aj as WIDENED_CODE$1, P as PRECISION_CODE$1, n as DUPLICATE_NODE_CODE$1, s as MISSING_ENDPOINT_CODE$1, t as MISSING_ID_CODE$1, l as MULTIPLE_GRAPHS_CODE, N as NO_GRAPH_CODE$1, al as resolveImportOptions, a8 as ImportReportBuilder, an as reportUnusedOptions, bB as readText, am as throwIfAborted, ao as reportSinkOptions, ap as graphChosen, ar as IdCoercer, aq as DirectionResolver, a0 as uniqueColumnName, C as COLUMN_RENAMED_CODE, as as weightFromValue, bV as reportWeightPrecision, aK as parseWeightText, a1 as declareResolved, 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, I as ID_MERGED_CODE, ae as AMBIGUOUS_GRAPH_NAME_CODE, af as GRAPH_NOT_FOUND_CODE, w as UNKNOWN_ENCODING_CODE, x as ENCODING_FALLBACK_CODE, y as INVALID_ENCODING_CODE, z as INVALID_UTF8_CODE, F as ELEMENT_ISSUE, G as INPUT_ISSUE } from "./chunks/export-B-aVCwyG.js";
+import { ak as SYNTAX_CODE, b as plural, a as checkCapabilities, L as LOSS, p as pairFolding, $ as agree, c as capabilities, r as resolveExportOptions, ac as DictHeuristic, aG as formatInteger, bv as formatGmlReal, aE as sanitizeIds, bD as countMixedEdges, e as explicitWeights, bU as DICT_SAMPLE_ROWS, R as ROLE_TAKEN_CODE$1, aj as WIDENED_CODE$1, P as PRECISION_CODE$1, n as DUPLICATE_NODE_CODE$1, s as MISSING_ENDPOINT_CODE$1, t as MISSING_ID_CODE$1, l as MULTIPLE_GRAPHS_CODE, N as NO_GRAPH_CODE$1, al as resolveImportOptions, a8 as ImportReportBuilder, an as reportUnusedOptions, bB as readText, am as throwIfAborted, ao as reportSinkOptions, ap as graphChosen, ar as IdCoercer, aq as DirectionResolver, a0 as uniqueColumnName, C as COLUMN_RENAMED_CODE, as as weightFromValue, bV as reportWeightPrecision, aK as parseWeightText, a1 as declareResolved, 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, I as ID_MERGED_CODE, ae as AMBIGUOUS_GRAPH_NAME_CODE, af as GRAPH_NOT_FOUND_CODE, w as UNKNOWN_ENCODING_CODE, x as ENCODING_FALLBACK_CODE, y as INVALID_ENCODING_CODE, z as INVALID_UTF8_CODE, F as ELEMENT_ISSUE, G as INPUT_ISSUE } from "./chunks/export-rKLeGQMo.js";
 import { GraphFormatError, INVALID_INDEX } from "@graphty/graph-format";
-import { k as decodeGmlString, m as quoteGmlString } from "./chunks/escape-BJRLd3vJ.js";
+import { k as decodeGmlString, m as quoteGmlString } from "./chunks/escape-B62ZGM_a.js";
 import { j as joinText, e as encodeChunks } from "./chunks/writer-DxjgHwSe.js";
-import { i as importChosenGraph } from "./chunks/choose-CS3fvGT1.js";
+import { i as importChosenGraph } from "./chunks/choose-DvpbdRuz.js";
 const TOKEN_WORD = 0;
 const TOKEN_INT = 1;
 const TOKEN_REAL = 2;
@@ -328,14 +328,7 @@ function parseRecord(tokens, open) {
     const key = tokens.textOf(p);
     const v = p + 1;
     if (tokens.kind[v] === TOKEN_STRING) {
-      const text = tokens.stringOf(v);
-      if (text === LIST_START_MARKER) {
-        frame.record[key] = [];
-        frame.listKeys ??= /* @__PURE__ */ new Set();
-        frame.listKeys.add(key);
-        continue;
-      }
-      storeValue(frame, key, text === EMPTY_LIST_TEXT || text === EMPTY_TUPLE_TEXT ? [] : text);
+      storeString(frame, key, tokens.stringOf(v));
     } else if (tokens.kind[v] === TOKEN_OPEN) {
       stack.push({
         record: /* @__PURE__ */ Object.create(null),
@@ -350,6 +343,15 @@ function parseRecord(tokens, open) {
   }
   return root;
 }
+function storeString(frame, key, text) {
+  if (text === LIST_START_MARKER) {
+    frame.record[key] = [];
+    frame.listKeys ??= /* @__PURE__ */ new Set();
+    frame.listKeys.add(key);
+    return;
+  }
+  storeValue(frame, key, text === EMPTY_LIST_TEXT || text === EMPTY_TUPLE_TEXT ? [] : text);
+}
 function storeValue(frame, key, value) {
   const { record } = frame;
   if (frame.listKeys?.has(key)) {
@@ -544,34 +546,30 @@ function uniqueKey(base, used) {
 function note(code, message, column = null, count = null) {
   return Object.freeze({ code, message, column, count });
 }
+function countOnce(seen, flag, stats, counter) {
+  if (!seen[flag]) {
+    seen[flag] = true;
+    stats[counter]++;
+  }
+}
 function inspectJson(value, stats, inArray, seen) {
   if (value === null) {
-    if (!seen.nulls) {
-      seen.nulls = true;
-      stats.nulls++;
-    }
+    countOnce(seen, "nulls", stats, "nulls");
     return;
   }
   switch (typeof value) {
     case "number":
-      if (!seen.numbers) {
-        seen.numbers = true;
-        stats.numbers++;
-      }
+      countOnce(seen, "numbers", stats, "numbers");
       return;
     case "boolean":
-      if (!seen.booleans) {
-        seen.booleans = true;
-        stats.booleans++;
-      }
+      countOnce(seen, "booleans", stats, "booleans");
       return;
     case "string":
       return;
   }
   if (Array.isArray(value)) {
-    if (inArray && !seen.nested) {
-      seen.nested = true;
-      stats.nestedArrays++;
+    if (inArray) {
+      countOnce(seen, "nested", stats, "nestedArrays");
     }
     for (const item of value) {
       inspectJson(item, stats, true, seen);
@@ -586,6 +584,14 @@ function inspectJson(value, stats, inArray, seen) {
     inspectJson(record[key], stats, false, seen);
   }
 }
+function rowCount(count) {
+  return `${count} row${plural(count)}`;
+}
+function pushCounted(notes, count, code, text, column) {
+  if (count > 0) {
+    notes.push(note(code, text, column, count));
+  }
+}
 function jsonNotes(columns, label, plan, notes) {
   for (const { column } of columns) {
     const stats = jsonStatsOf(column);
@@ -594,71 +600,40 @@ function jsonNotes(columns, label, plan, notes) {
     }
     const { name } = column.meta;
     const where = `${label} column "${name}"`;
-    if (stats.numbers > 0) {
-      notes.push(
-        note(
-          RECORD_NUMBER_TYPE_CODE,
-          `${where} holds numbers in ${stats.numbers} row${plural(stats.numbers)}; GML records cannot keep the int / real distinction`,
-          name,
-          stats.numbers
-        )
-      );
-    }
-    if (stats.booleans > 0) {
-      notes.push(
-        note(
-          RECORD_BOOLEAN_CODE,
-          `${where} holds booleans in ${stats.booleans} row${plural(stats.booleans)}; written as 1 / 0`,
-          name,
-          stats.booleans
-        )
-      );
-    }
-    if (stats.nulls > 0) {
-      notes.push(
-        note(
-          RECORD_NULL_CODE,
-          `${where} holds nulls in ${stats.nulls} row${plural(stats.nulls)}; GML has no null, the key is omitted`,
-          name,
-          stats.nulls
-        )
-      );
-    }
-    if (stats.arrays > 0) {
-      notes.push(
-        note(
-          JSON_ARRAY_CODE,
-          `${where} holds arrays as values in ${stats.arrays} row${plural(stats.arrays)}; written as repeated keys, they re-import as a list`,
-          name,
-          stats.arrays
-        )
-      );
-    }
-    if (stats.nestedArrays > 0) {
-      notes.push(
-        note(
-          NESTED_ARRAY_CODE,
-          `${where} holds arrays nested in arrays in ${stats.nestedArrays} row${plural(stats.nestedArrays)}; GML cannot write them and the save fails`,
-          name,
-          stats.nestedArrays
-        )
-      );
-    }
-    if (stats.invalidKeys > 0) {
-      notes.push(
-        plan.mangle ? note(
-          KEY_MANGLED_CODE,
-          `${where}: ${stats.invalidKeys} record key${plural(stats.invalidKeys)} ${agree(stats.invalidKeys, "is", "are")} not GML keys and are rewritten`,
-          name,
-          stats.invalidKeys
-        ) : note(
-          INVALID_KEY_CODE,
-          `${where}: ${stats.invalidKeys} record key${plural(stats.invalidKeys)} ${agree(stats.invalidKeys, "is", "are")} not GML keys; the save fails unless sanitizeKeys is "mangle"`,
-          name,
-          stats.invalidKeys
-        )
-      );
-    }
+    const counted = (count, code, text) => {
+      pushCounted(notes, count, code, text, name);
+    };
+    counted(
+      stats.numbers,
+      RECORD_NUMBER_TYPE_CODE,
+      `${where} holds numbers in ${rowCount(stats.numbers)}; GML records cannot keep the int / real distinction`
+    );
+    counted(
+      stats.booleans,
+      RECORD_BOOLEAN_CODE,
+      `${where} holds booleans in ${rowCount(stats.booleans)}; written as 1 / 0`
+    );
+    counted(
+      stats.nulls,
+      RECORD_NULL_CODE,
+      `${where} holds nulls in ${rowCount(stats.nulls)}; GML has no null, the key is omitted`
+    );
+    counted(
+      stats.arrays,
+      JSON_ARRAY_CODE,
+      `${where} holds arrays as values in ${rowCount(stats.arrays)}; written as repeated keys, they re-import as a list`
+    );
+    counted(
+      stats.nestedArrays,
+      NESTED_ARRAY_CODE,
+      `${where} holds arrays nested in arrays in ${rowCount(stats.nestedArrays)}; GML cannot write them and the save fails`
+    );
+    const keys = `${stats.invalidKeys} record key${plural(stats.invalidKeys)} ${agree(stats.invalidKeys, "is", "are")} not GML keys`;
+    counted(
+      stats.invalidKeys,
+      plan.mangle ? KEY_MANGLED_CODE : INVALID_KEY_CODE,
+      plan.mangle ? `${where}: ${keys} and are rewritten` : `${where}: ${keys}; the save fails unless sanitizeKeys is "mangle"`
+    );
   }
 }
 function jsonStatsOf(column) {
@@ -1530,29 +1505,46 @@ class GmlImport {
       if (key === "graph" && !record && scalarGraph < 0) {
         scalarGraph = v;
       }
-      if (key === "graph" && record) {
-        if (this.graphCount++ === this.which) {
-          this.graphOpen = v;
-          this.scanGraph(v);
-        }
-      } else if (key === "Creator" && !record && this.creatorToken < 0) {
-        this.creatorToken = v;
-      } else if (key === "Version" && !record && this.versionToken < 0) {
-        this.versionToken = v;
-      } else {
-        this.observe(this.topSchema, "graph", key, v, TOP_SEQ);
-      }
+      this.scanTopPair(key, record, v);
     }
     if (this.graphOpen < 0) {
-      if (scalarGraph >= 0) {
-        this.report.fail(
-          NO_GRAPH_CODE,
-          `the graph key at line ${t.line[scalarGraph]} holds ${describeValue(t, scalarGraph)}, not a [ ... ] block; the input contains no graph block`,
-          { line: t.line[scalarGraph] }
-        );
+      this.failNoGraph(t, scalarGraph);
+    }
+  }
+  /**
+   * Handle one top-level pair other than a scalar `graph`.
+   * @param key - the key
+   * @param record - whether the value is a `[ ... ]` block
+   * @param v - the value token
+   */
+  scanTopPair(key, record, v) {
+    if (key === "graph" && record) {
+      if (this.graphCount++ === this.which) {
+        this.graphOpen = v;
+        this.scanGraph(v);
       }
-      this.report.fail(NO_GRAPH_CODE, "the input contains no graph [ ... ] block", { line: null });
+    } else if (key === "Creator" && !record && this.creatorToken < 0) {
+      this.creatorToken = v;
+    } else if (key === "Version" && !record && this.versionToken < 0) {
+      this.versionToken = v;
+    } else {
+      this.observe(this.topSchema, "graph", key, v, TOP_SEQ);
+    }
+  }
+  /**
+   * Fail because the input holds no graph block.
+   * @param t - the tokens
+   * @param scalarGraph - the token of a scalar `graph` key, or -1
+   */
+  failNoGraph(t, scalarGraph) {
+    if (scalarGraph >= 0) {
+      this.report.fail(
+        NO_GRAPH_CODE,
+        `the graph key at line ${t.line[scalarGraph]} holds ${describeValue(t, scalarGraph)}, not a [ ... ] block; the input contains no graph block`,
+        { line: t.line[scalarGraph] }
+      );
     }
+    this.report.fail(NO_GRAPH_CODE, "the input contains no graph [ ... ] block", { line: null });
   }
   /**
    * Walk the graph block for the schema.
@@ -1602,30 +1594,41 @@ class GmlImport {
     const close = t.match[open];
     const seq = this.seq++;
     const schema = domain === "node" ? this.nodeSchema : this.edgeSchema;
-    const { weightFrom, restoreMangledIds } = this.options;
     for (let p = open + 1; p < close; p = t.nextPair(p)) {
       const key = t.textOf(p);
       const v = p + 1;
-      if (domain === "node") {
-        if (key === "id") {
-          continue;
-        }
-        if (key === ORIGINAL_ID_KEY && restoreMangledIds) {
-          this.hasOriginalId = true;
-          continue;
-        }
-      } else {
-        if (key === "source" || key === "target" || key === "directed") {
-          continue;
-        }
-        if (key === weightFrom) {
-          this.weightKinds |= kindBit(t, v);
-          continue;
-        }
+      if (this.skipsKey(domain, key, v)) {
+        continue;
       }
       this.observe(schema, domain, key, v, seq);
     }
   }
+  /**
+   * Whether a key of a node or edge block is structural (id, endpoints, weight, original id), not
+   * a column; notes the original id and the weight's kinds on the way.
+   * @param domain - node or edge
+   * @param key - the key
+   * @param v - the value token
+   * @returns true when the key is not a column
+   */
+  skipsKey(domain, key, v) {
+    const { weightFrom, restoreMangledIds } = this.options;
+    if (domain === "node") {
+      if (key === ORIGINAL_ID_KEY && restoreMangledIds) {
+        this.hasOriginalId = true;
+        return true;
+      }
+      return key === "id";
+    }
+    if (key === "source" || key === "target" || key === "directed") {
+      return true;
+    }
+    if (key === weightFrom) {
+      this.weightKinds |= kindBit(this.requireTokens(), v);
+      return true;
+    }
+    return false;
+  }
   /**
    * Record one value of one key in a table's schema.
    * @param schema - the table's schema
@@ -1807,19 +1810,12 @@ class GmlImport {
     }
   }
   /**
-   * The plan of one schema entry.
+   * Warn about a key that mixes numbers and strings, or holds integers beyond 2^53.
    * @param domain - the table
    * @param entry - the schema entry
-   * @param top - whether the key is a top-level one (graph table)
-   * @returns the plan
+   * @param asText - whether the integers are kept as text
    */
-  planOf(domain, entry, top = false) {
-    const asText = entry.unsafe && this.options.long === "string" && kindOf(entry) === "int";
-    const kind = asText ? "string" : kindOf(entry);
-    let scalar = dtypeOfKind(kind, entry);
-    if (scalar === "string" && !entry.list && entry.dict !== null && entry.kinds === KIND_STRING && entry.dict.decide() === "dict") {
-      scalar = "dict";
-    }
+  warnKinds(domain, entry, asText) {
     if ((entry.kinds & KIND_STRING) !== 0 && (entry.kinds & (KIND_INT | KIND_REAL)) !== 0 && (entry.kinds & KIND_RECORD) === 0) {
       this.report.warnOnce(
         "coercion",
@@ -1838,6 +1834,42 @@ class GmlImport {
         `${PRECISION_CODE}:${domain}:${entry.key}`
       );
     }
+  }
+  /**
+   * The plan of a node `graphics` record: the plan plus its position and rest columns.
+   * @param plan - the record's plan
+   * @param entry - the schema entry
+   * @returns the plan with its position (and rest) plans
+   */
+  graphicsPlan(plan, entry) {
+    const taken = (candidate) => this.nodeSchema.has(candidate) || this.sink.nodeColumn(candidate) !== INVALID_INDEX;
+    const position = {
+      ...plan,
+      name: uniqueColumnName("position", "graphics", taken),
+      dtype: "f64",
+      itemDtype: null,
+      kind: "real",
+      list: false,
+      role: "position"
+    };
+    const rest = entry.rest ? { ...plan, dtype: "json", itemDtype: null, kind: "record", list: false } : null;
+    return { ...plan, position, rest };
+  }
+  /**
+   * The plan of one schema entry.
+   * @param domain - the table
+   * @param entry - the schema entry
+   * @param top - whether the key is a top-level one (graph table)
+   * @returns the plan
+   */
+  planOf(domain, entry, top = false) {
+    const asText = entry.unsafe && this.options.long === "string" && kindOf(entry) === "int";
+    const kind = asText ? "string" : kindOf(entry);
+    let scalar = dtypeOfKind(kind, entry);
+    if (scalar === "string" && !entry.list && entry.dict !== null && entry.kinds === KIND_STRING && entry.dict.decide() === "dict") {
+      scalar = "dict";
+    }
+    this.warnKinds(domain, entry, asText);
     const name = domain === "graph" ? this.uniqueGraphName(entry.key) : entry.key;
     let itemDtype = null;
     if (entry.list) {
@@ -1860,18 +1892,7 @@ class GmlImport {
       seq: Number.NEGATIVE_INFINITY
     };
     if (domain === "node" && entry.key === "graphics" && this.positions && (entry.kinds & KIND_RECORD) !== 0) {
-      const taken = (candidate) => this.nodeSchema.has(candidate) || this.sink.nodeColumn(candidate) !== INVALID_INDEX;
-      const position = {
-        ...plan,
-        name: uniqueColumnName("position", "graphics", taken),
-        dtype: "f64",
-        itemDtype: null,
-        kind: "real",
-        list: false,
-        role: "position"
-      };
-      const rest = entry.rest ? { ...plan, dtype: "json", itemDtype: null, kind: "record", list: false } : null;
-      return { ...plan, position, rest };
+      return this.graphicsPlan(plan, entry);
     }
     return plan;
   }