@graphty/graph-io 0.3.38 → 0.3.40

package/dist/chunks/{importer-CNMQnHDd.js → importer-D_srHyj6.js}

@@ -1,8 +1,8 @@
 import { GraphFormatError, INVALID_INDEX } from "@graphty/graph-format";
 import { c as childrenCsr } from "./children-CL3Cy0ez.js";
-import { s as stringify, f as aspectBlock, d as directionNotes, p as planNodeIds, b as planEdgeIds, O as ORIGINAL_ID_ATTRIBUTE, h as nextNodeId, i as noteList, g as declaredType, z as zAsOption } from "./importer-BuzbaFFY.js";
-import { c as capabilities, L as LOSS, r as resolveExportOptions, p as pairFolding, a as checkCapabilities, e as explicitWeights, b as plural, ad as TOO_LARGE_CODE, S as SINK_OPTION_CODE, O as OPTION_IGNORED_CODE, D as DIRECTION_FORCED_CODE, d as DIRECTION_REFUSED_CODE, R as ROLE_TAKEN_CODE, C as COLUMN_RENAMED_CODE, N as NO_GRAPH_CODE, ae as AMBIGUOUS_GRAPH_NAME_CODE, af as GRAPH_NOT_FOUND_CODE, l as MULTIPLE_GRAPHS_CODE, I as ID_MERGED_CODE, P as PRECISION_CODE, J as ID_TEXT_TYPE_CODE, a2 as JSON_NONSTANDARD_NUMBER_CODE, ag as SINGLE_OBJECT_ASPECT_CODE, W as MULTI_ASPECT_FRAGMENT_CODE, g as UNKNOWN_ELEMENT_CODE, m as DUPLICATE_EDGE_ID_CODE, n as DUPLICATE_NODE_CODE, s as MISSING_ENDPOINT_CODE, t as MISSING_ID_CODE, ah as STYLES_NOT_IMPORTED_CODE, ai as PARENT_CYCLE_CODE, q as UNKNOWN_PARENT_CODE, o as DUPLICATE_ATTRIBUTE_CODE, i as DANGLING_REFERENCE_CODE, U as UNKNOWN_ATTR_TYPE_CODE, aj as WIDENED_CODE, a3 as BAD_VALUE_CODE, j as COUNT_MISMATCH_CODE, Y as ASPECT_ORDER_CODE, V as BAD_ASPECT_BLOCK_CODE, _ as STATUS_WARNING_CODE, Z as STATUS_FAILED_CODE, w as UNKNOWN_ENCODING_CODE, x as ENCODING_FALLBACK_CODE, y as INVALID_ENCODING_CODE, z as INVALID_UTF8_CODE, ak as SYNTAX_CODE, E as EMPTY_INPUT_CODE, F as ELEMENT_ISSUE, G as INPUT_ISSUE, al as resolveImportOptions, a8 as ImportReportBuilder, a4 as textChunks, am as throwIfAborted, an as reportUnusedOptions, ao as reportSinkOptions, a7 as chooseGraph, ap as graphChosen, aq as DirectionResolver, ar as IdCoercer, $ as agree, a1 as declareResolved, a0 as uniqueColumnName, as as weightFromValue } from "./export-CTUlibzr.js";
-import { i as isRecord, P as POSITION_COLUMN, h as headText, s as scanAspects, r as reportTooDeep, a as reportSharedBlock, C as CxStructure, J as JsonScanError, E as ExactInteger, c as cxId, p as plainJson, f as flipY, z as zDecl, b as positionDecl, d as declareFresh, e as inexactLiteral, k as keptPrecision } from "./json-elements-AkglPS3m.js";
+import { s as stringify, f as aspectBlock, d as directionNotes, p as planNodeIds, b as planEdgeIds, O as ORIGINAL_ID_ATTRIBUTE, h as nextNodeId, i as noteList, g as declaredType, z as zAsOption } from "./importer-BJlGAOht.js";
+import { c as capabilities, L as LOSS, r as resolveExportOptions, p as pairFolding, a as checkCapabilities, e as explicitWeights, b as plural, ad as TOO_LARGE_CODE, S as SINK_OPTION_CODE, O as OPTION_IGNORED_CODE, D as DIRECTION_FORCED_CODE, d as DIRECTION_REFUSED_CODE, R as ROLE_TAKEN_CODE, C as COLUMN_RENAMED_CODE, N as NO_GRAPH_CODE, ae as AMBIGUOUS_GRAPH_NAME_CODE, af as GRAPH_NOT_FOUND_CODE, l as MULTIPLE_GRAPHS_CODE, I as ID_MERGED_CODE, P as PRECISION_CODE, J as ID_TEXT_TYPE_CODE, a2 as JSON_NONSTANDARD_NUMBER_CODE, ag as SINGLE_OBJECT_ASPECT_CODE, W as MULTI_ASPECT_FRAGMENT_CODE, g as UNKNOWN_ELEMENT_CODE, m as DUPLICATE_EDGE_ID_CODE, n as DUPLICATE_NODE_CODE, s as MISSING_ENDPOINT_CODE, t as MISSING_ID_CODE, ah as STYLES_NOT_IMPORTED_CODE, ai as PARENT_CYCLE_CODE, q as UNKNOWN_PARENT_CODE, o as DUPLICATE_ATTRIBUTE_CODE, i as DANGLING_REFERENCE_CODE, U as UNKNOWN_ATTR_TYPE_CODE, aj as WIDENED_CODE, a3 as BAD_VALUE_CODE, j as COUNT_MISMATCH_CODE, Y as ASPECT_ORDER_CODE, V as BAD_ASPECT_BLOCK_CODE, _ as STATUS_WARNING_CODE, Z as STATUS_FAILED_CODE, w as UNKNOWN_ENCODING_CODE, x as ENCODING_FALLBACK_CODE, y as INVALID_ENCODING_CODE, z as INVALID_UTF8_CODE, ak as SYNTAX_CODE, E as EMPTY_INPUT_CODE, F as ELEMENT_ISSUE, G as INPUT_ISSUE, al as resolveImportOptions, a8 as ImportReportBuilder, a4 as textChunks, am as throwIfAborted, an as reportUnusedOptions, ao as reportSinkOptions, a7 as chooseGraph, ap as graphChosen, aq as DirectionResolver, ar as IdCoercer, $ as agree, a1 as declareResolved, a0 as uniqueColumnName, as as weightFromValue } from "./export-B-aVCwyG.js";
+import { i as isRecord, P as POSITION_COLUMN, h as headText, s as scanAspects, r as reportTooDeep, a as reportSharedBlock, C as CxStructure, J as JsonScanError, E as ExactInteger, c as cxId, p as plainJson, f as flipY, z as zDecl, b as positionDecl, d as declareFresh, e as inexactLiteral, k as keptPrecision } from "./json-elements-DpO6AXIc.js";
 import { j as joinText, e as encodeChunks } from "./writer-DxjgHwSe.js";
 const CX_FORMAT$1 = "cx";
 const CX_LOSS = Object.freeze({
@@ -1401,10 +1401,11 @@ function checkNumberVerification(value, count, report, line) {
   const raw = isRecord(value) ? value.longNumber : void 0;
   const digits = raw instanceof ExactInteger ? raw.digits : String(raw);
   if (count > 1 || !NUMBER_VERIFICATION_VALUES.has(digits)) {
+    const held = raw === void 0 ? null : digits;
     report.warning(
       "validation-error",
       CX_ISSUE.NUMBER_VERIFICATION,
-      count > 1 ? "a second numberVerification element; ignored" : `numberVerification holds ${shown(raw === void 0 ? null : digits)}, not 281474976710655`,
+      count > 1 ? "a second numberVerification element; ignored" : `numberVerification holds ${shown(held)}, not 281474976710655`,
       { line, element: "numberVerification" }
     );
   }
@@ -1557,10 +1558,11 @@ async function readDocument(input, report, options) {
             break;
           }
           countMember(event.block, null);
+          const what = keys.length > 1 ? `an object with ${keys.length} keys (${keys.join(", ")})` : shown(value);
           report.error(
             "parse-error",
             BAD_ASPECT_BLOCK_CODE,
-            `a member of the document is ${keys.length > 1 ? `an object with ${keys.length} keys (${keys.join(", ")})` : shown(value)}, not a one-key aspect fragment; skipped`,
+            `a member of the document is ${what}, not a one-key aspect fragment; skipped`,
             { line: event.line, element: keys[0] ?? null }
           );
           break;
@@ -1809,6 +1811,9 @@ function layoutViews(doc) {
 function memberCount(members, total) {
   return members === null ? total : members.size;
 }
+function visualText(raw) {
+  return typeof raw === "string" ? raw : JSON.stringify(raw);
+}
 class CxReader {
   /**
    * Create the reader.
@@ -3148,55 +3153,85 @@ class CxReader {
    * applied.
    */
   readVisualProperties() {
-    const entries = aspect(this.doc, "cyVisualProperties");
     const tableStyles = TABLE_STYLE_ASPECTS.reduce((n, name) => n + (this.doc.kept.get(name)?.length ?? 0), 0);
     const views = new Set(this.plan.views.slice(0, 1));
-    const columns = { node: /* @__PURE__ */ new Map(), edge: /* @__PURE__ */ new Map() };
-    const network = /* @__PURE__ */ new Map();
-    let defaults = 0;
-    let mappings = 0;
-    let dependencies = 0;
-    for (const { value } of entries) {
-      if (!isRecord(value)) {
-        continue;
-      }
-      const view = value.view === void 0 || value.view === null ? null : refId(value.view);
-      if (view !== null && views.size > 0 && !views.has(view)) {
-        continue;
+    const visual = {
+      columns: { node: /* @__PURE__ */ new Map(), edge: /* @__PURE__ */ new Map() },
+      network: /* @__PURE__ */ new Map(),
+      defaults: 0,
+      mappings: 0,
+      dependencies: 0
+    };
+    for (const { value } of aspect(this.doc, "cyVisualProperties")) {
+      if (isRecord(value)) {
+        this.collectVisualEntry(value, views, visual);
       }
-      const properties = isRecord(value.properties) ? value.properties : {};
-      mappings += isRecord(value.mappings) ? Object.keys(value.mappings).length : 0;
-      dependencies += isRecord(value.dependencies) ? Object.keys(value.dependencies).length : 0;
-      switch (value.properties_of) {
-        case "nodes":
-        case "edges": {
-          const domain = value.properties_of === "nodes" ? "node" : "edge";
-          const target = refId(value.applies_to);
-          const rows = domain === "node" ? this.nodeRows : this.edgeRows;
-          const row = target === null ? void 0 : rows.get(target);
-          if (row === void 0) {
-            if (target === null || !(domain === "node" ? this.rootNodes : this.rootEdges).has(target)) {
-              this.dangle(`${domain} visual property entry`);
-            }
-            continue;
-          }
-          for (const [property, raw] of Object.entries(properties)) {
-            const list = columns[domain].get(property) ?? [];
-            list.push([row, typeof raw === "string" ? raw : JSON.stringify(raw)]);
-            columns[domain].set(property, list);
-          }
-          break;
+    }
+    this.writeBypassColumns(visual.columns);
+    this.writeBypassNetwork(visual.network);
+    this.reportStyleRules(visual, tableStyles);
+  }
+  /**
+   * File one cyVisualProperties element of this graph's view into the collection: per-element and
+   * network values by property, defaults, mappings and dependencies counted.
+   * @param value - the element
+   * @param views - the views read (empty: every view)
+   * @param visual - the collection to add to
+   */
+  collectVisualEntry(value, views, visual) {
+    const view = value.view === void 0 || value.view === null ? null : refId(value.view);
+    if (view !== null && views.size > 0 && !views.has(view)) {
+      return;
+    }
+    const properties = isRecord(value.properties) ? value.properties : {};
+    visual.mappings += isRecord(value.mappings) ? Object.keys(value.mappings).length : 0;
+    visual.dependencies += isRecord(value.dependencies) ? Object.keys(value.dependencies).length : 0;
+    switch (value.properties_of) {
+      case "nodes":
+        this.collectElementProperties("node", value.applies_to, properties, visual.columns);
+        break;
+      case "edges":
+        this.collectElementProperties("edge", value.applies_to, properties, visual.columns);
+        break;
+      case "network":
+        for (const [property, raw] of Object.entries(properties)) {
+          visual.network.set(property, visualText(raw));
         }
-        case "network":
-          for (const [property, raw] of Object.entries(properties)) {
-            network.set(property, typeof raw === "string" ? raw : JSON.stringify(raw));
-          }
-          break;
-        default:
-          defaults += Object.keys(properties).length;
-          break;
+        break;
+      default:
+        visual.defaults += Object.keys(properties).length;
+        break;
+    }
+  }
+  /**
+   * File the visual values of one node or edge under its row; an element not in this graph is
+   * skipped, and reported dangling when it is in no graph of the file.
+   * @param domain - node or edge
+   * @param appliesTo - the element's applies_to
+   * @param properties - its visual properties
+   * @param columns - the per-property cells to add to
+   */
+  collectElementProperties(domain, appliesTo, properties, columns) {
+    const target = refId(appliesTo);
+    const rows = domain === "node" ? this.nodeRows : this.edgeRows;
+    const row = target === null ? void 0 : rows.get(target);
+    if (row === void 0) {
+      if (target === null || !(domain === "node" ? this.rootNodes : this.rootEdges).has(target)) {
+        this.dangle(`${domain} visual property entry`);
       }
+      return;
+    }
+    for (const [property, raw] of Object.entries(properties)) {
+      const list = columns[domain].get(property) ?? [];
+      list.push([row, visualText(raw)]);
+      columns[domain].set(property, list);
     }
+  }
+  /**
+   * Write the collected per-element visual values as string columns in the cx.bypass namespace.
+   * @param columns - the per-property cells of each domain
+   */
+  writeBypassColumns(columns) {
     for (const domain of ["node", "edge"]) {
       for (const [property, cells] of columns[domain]) {
         const handle = declareFresh(
@@ -3219,6 +3254,12 @@ class CxReader {
         }
       }
     }
+  }
+  /**
+   * Write the network visual values as graph values in the cx.bypass namespace.
+   * @param network - the value of each property
+   */
+  writeBypassNetwork(network) {
     for (const [property, text] of network) {
       try {
         this.sink.setGraphValue(property, text, {
@@ -3229,20 +3270,29 @@ class CxReader {
         this.report.recordError(err, { element: property });
       }
     }
-    if (defaults + mappings + dependencies + tableStyles > 0) {
-      const parts = [
-        `cyVisualProperties: ${defaults} default${plural(defaults)}, ${mappings} mapping${plural(mappings)}, ${dependencies} dependenc(ies)`
-      ];
-      if (tableStyles > 0) {
-        parts.push(`${tableStyles} table style element${plural(tableStyles)}`);
-      }
-      this.report.warning(
-        "unsupported",
-        STYLES_NOT_IMPORTED_CODE,
-        `the file's style rules are not applied (${parts.join("; ")}); they are kept in meta.extra.cx`,
-        { element: "cyVisualProperties" }
-      );
+  }
+  /**
+   * Warn that the style rules (defaults, mappings, dependencies, table styles) are kept, not applied.
+   * @param visual - the counted rules
+   * @param tableStyles - the number of table style elements
+   */
+  reportStyleRules(visual, tableStyles) {
+    const { defaults, mappings, dependencies } = visual;
+    if (defaults + mappings + dependencies + tableStyles === 0) {
+      return;
     }
+    const parts = [
+      `cyVisualProperties: ${defaults} default${plural(defaults)}, ${mappings} mapping${plural(mappings)}, ${dependencies} dependenc(ies)`
+    ];
+    if (tableStyles > 0) {
+      parts.push(`${tableStyles} table style element${plural(tableStyles)}`);
+    }
+    this.report.warning(
+      "unsupported",
+      STYLES_NOT_IMPORTED_CODE,
+      `the file's style rules are not applied (${parts.join("; ")}); they are kept in meta.extra.cx`,
+      { element: "cyVisualProperties" }
+    );
   }
   /**
    * Read the provenance aspects: citations and supports as extension tables cx:citations and
@@ -3578,4 +3628,4 @@ export {
   cxExporter as c,
   cxImporter as d
 };
-//# sourceMappingURL=importer-CNMQnHDd.js.map
+//# sourceMappingURL=importer-D_srHyj6.js.map