@graphty/graph-io 0.3.48 → 0.3.49

package/dist/chunks/{importer-DPZDN40-.js → importer-GREKMdIf.js}

@@ -1,14 +1,14 @@
 import { GraphFormatError, INVALID_INDEX } from "@graphty/graph-format";
-import { c as capabilities, L as LOSS, r as resolveExportOptions, a as checkCapabilities, p as pairFolding, e as explicitWeights, D as DictHeuristic, g as reportSinkOptions, f as reportUnusedOptions, b as chooseGraph, h as graphChosen, d as resolveImportOptions, I as IdCoercer, j as declareResolved } from "./export-CZ7VRm4I.js";
-import { o as hasIllegalXmlChar, e as escapeXmlAttribute, q as quoteCsvCell, t as tokenizeXml, b as xmlDeclaredEncoding, c as XmlSyntaxError } from "./escape-DH2Egt-l.js";
-import { d as formatDecimal, a as formatF64, f as formatF32 } from "./format-BMS-1Nxb.js";
-import { W as AMBIGUOUS_GRAPH_NAME_CODE, Y as GRAPH_NOT_FOUND_CODE, i as MULTIPLE_GRAPHS_CODE, N as NO_GRAPH_CODE, E as EMPTY_INPUT_CODE, f as DANGLING_REFERENCE_CODE, a0 as STYLES_NOT_IMPORTED_CODE, V as TOO_LARGE_CODE, s as UNKNOWN_ENCODING_CODE, t as ENCODING_FALLBACK_CODE, y as ELEMENT_ISSUE, z as INPUT_ISSUE, p as plural, a as agree, K as ImportReportBuilder, ah as ImportError, am as elementCount } from "./report-CgdsL9Hb.js";
-import { X as XGMML_ISSUE, B as emitCytoscapeStyle, s as snapshotBlock, D as lossOf, g as XGMML_STYLE_CAPABILITIES, H as cytoscapeVizmapXml, Z as Z_COLUMN, h as XLINK_NAMESPACE, i as CY_NAMESPACE, j as XGMML_NAMESPACE, G as GRAPHICS_COLUMN, E as EDGE_ID_COLUMN, P as POSITION_COLUMN, m as PARENT_COLUMN, n as PARENTS_COLUMN, S as SUBGRAPH_COLUMN, N as NESTED_NETWORK_COLUMN, o as NETWORK_POINTER_COLUMN, p as NETWORKS_COLUMN, q as XGMML_ORIGIN_NAMESPACE, J as readXgmmlStyles, K as cytoscapeBackground, O as emptyCytoscapeStyle, Q as graphicsBypasses, R as resolveCytoscape, T as hiddenToVisible, U as exactFromBlock, V as cytoscapeRules, W as nonEmpty, Y as typedKey } from "./styles-CaABMoO1.js";
-import { w as writeStyleBlock, c as styleBlockLosses, u as StyleNotes, S as STYLE_BLOCK_NAME, a as STYLE_ISSUE, f as dataCell } from "./block-Cu22ewuS.js";
-import { O as ORIGINAL_ID_ATTRIBUTE } from "./constants-D0LqcsLJ.js";
-import { e as decodeEntryName, b as throwIfAborted, f as readBytes, t as textChunks, r as readText } from "./input-Ccg9I22A.js";
-import { r as resolveSettings, m as membersOf, X as XgmmlEmitter, i as isCyTrue, p as parseXgmml, d as dialectOf, b as parseCoordinate } from "./importer-Cyy6UseH.js";
-import { C as CsvRecordReader } from "./records-Cgvxz-Vx.js";
+import { c as capabilities, L as LOSS, r as resolveExportOptions, a as checkCapabilities, e as explicitWeights, D as DictHeuristic, f as reportSinkOptions, d as reportUnusedOptions, g as chooseGraph, h as graphChosen, b as resolveImportOptions, I as IdCoercer, i as declareResolved } from "./export-Cha4dRFz.js";
+import { p as pairFolding, d as formatDecimal, a as formatF64, f as formatF32 } from "./format-BXiAb-1h.js";
+import { o as hasIllegalXmlChar, e as escapeXmlAttribute, g as quoteCsvCell, t as tokenizeXml, b as xmlDeclaredEncoding, c as XmlSyntaxError } from "./escape-CuCIzNMB.js";
+import { W as AMBIGUOUS_GRAPH_NAME_CODE, Y as GRAPH_NOT_FOUND_CODE, i as MULTIPLE_GRAPHS_CODE, N as NO_GRAPH_CODE, E as EMPTY_INPUT_CODE, f as DANGLING_REFERENCE_CODE, a0 as STYLES_NOT_IMPORTED_CODE, V as TOO_LARGE_CODE, s as UNKNOWN_ENCODING_CODE, t as ENCODING_FALLBACK_CODE, y as ELEMENT_ISSUE, z as INPUT_ISSUE, p as plural, a as agree, K as ImportReportBuilder, ah as ImportError, am as elementCount } from "./report-CwMfYa9J.js";
+import { X as XGMML_ISSUE, B as emitCytoscapeStyle, s as snapshotBlock, D as lossOf, g as XGMML_STYLE_CAPABILITIES, H as cytoscapeVizmapXml, Z as Z_COLUMN, h as XLINK_NAMESPACE, i as CY_NAMESPACE, j as XGMML_NAMESPACE, G as GRAPHICS_COLUMN, E as EDGE_ID_COLUMN, P as POSITION_COLUMN, m as PARENT_COLUMN, n as PARENTS_COLUMN, S as SUBGRAPH_COLUMN, N as NESTED_NETWORK_COLUMN, o as NETWORK_POINTER_COLUMN, p as NETWORKS_COLUMN, q as XGMML_ORIGIN_NAMESPACE, J as readXgmmlStyles, K as weightColumnFallback, O as graphStyleOf, Q as emptyCytoscapeStyle, R as sharedColumnFallback, T as dropMismatchedKeys, U as edgeEnds, V as graphicsBypasses, W as resolveCytoscape, Y as hiddenToVisible, _ as hideWhatCytoscapeHides, $ as exactFromBlock, a0 as cytoscapeRules, a1 as nonEmpty, a2 as typedKey } from "./styles-CCs214_3.js";
+import { A as writeStyleBlock, B as styleBlockLosses, h as StyleNotes, S as STYLE_BLOCK_NAME, b as STYLE_ISSUE, E as dataCell } from "./block-iptrlMBb.js";
+import { O as ORIGINAL_ID_ATTRIBUTE } from "./constants-CKkYLPtt.js";
+import { e as decodeEntryName, b as throwIfAborted, f as readBytes, t as textChunks, r as readText } from "./input-CAxt_aV-.js";
+import { r as resolveSettings, m as membersOf, X as XgmmlEmitter, i as isCyTrue, p as parseXgmml, d as dialectOf, b as parseCoordinate } from "./importer-Vn5QvmmJ.js";
+import { C as CsvRecordReader } from "./records-NJiYvekn.js";
 const FORMAT = "cys";
 const EXTENSIONS = Object.freeze([".cys"]);
 const MIME_TYPES = Object.freeze(["application/zip"]);
@@ -1781,9 +1781,11 @@ function readSessionStyles(snapshot, context) {
   const out = { node: { values: {} }, edge: { values: {} } };
   for (const target of ["node", "edge"]) {
     context.signal?.throwIfAborted();
-    out[target] = sessionTargetStyles(snapshot, target, style, { notes, budget: context.budget });
+    if (target === "edge") {
+      weightColumnFallback(style.edge, kept?.weightFrom ?? null, snapshot.edges);
+    }
+    out[target] = sessionTargetStyles(snapshot, target, style, { notes, budget: context.budget }, out.node.values);
   }
-  const background = cytoscapeBackground(style, notes);
   return {
     canonical: true,
     dialect: "cytoscape",
@@ -1791,7 +1793,8 @@ function readSessionStyles(snapshot, context) {
     units: "px",
     node: out.node,
     edge: out.edge,
-    graph: background === null ? {} : { background },
+    // the view's own background (a bypass) over the style's
+    graph: graphStyleOf(snapshot, notes, style),
     notes: notes.list()
   };
 }
@@ -1805,10 +1808,12 @@ function sessionStyle(kept, notes) {
   }
   return cytoscapeStyleFromVizmap(kept.vizmap, kept.visualStyle, notes);
 }
-function sessionTargetStyles(snapshot, target, style, work) {
+function sessionTargetStyles(snapshot, target, style, work, nodes) {
   const { notes } = work;
   const table = target === "node" ? snapshot.nodes : snapshot.edges;
   const n = target === "node" ? snapshot.nodeCount : snapshot.edgeCount;
+  sharedColumnFallback(style[target], (column) => table.has(column));
+  dropMismatchedKeys(style[target], (column) => table.get(column)?.meta.origin?.type ?? null, notes, target);
   for (const m of style[target].mappings.values()) {
     if (!table.has(m.column)) {
       notes.add(STYLE_ISSUE.MAPPING_COLUMN_MISSING, target, m.column, { sample: m.kind });
@@ -1817,10 +1822,12 @@ function sessionTargetStyles(snapshot, target, style, work) {
   const elements = {
     count: n,
     value: (column, i) => table.has(column) ? dataCell(table, column, i) : null,
-    bypasses: graphicsBypasses(table, target, n, notes)
+    bypasses: graphicsBypasses(table, target, n, notes),
+    ...target === "edge" ? { ends: edgeEnds(snapshot, nodes) } : {}
   };
   const values = resolveCytoscape(target, style, elements, work);
   hiddenToVisible(table, HIDDEN_COLUMN, n, values);
+  hideWhatCytoscapeHides(snapshot, target, nodes, values);
   exactFromBlock(snapshot, target, values);
   const { rules, columns } = cytoscapeRules(target, style, elements, work);
   return { values: nonEmpty(values), rules, columns };
@@ -3049,7 +3056,8 @@ async function keepStyleSource(prepared, index, visualStyle) {
     vizmap,
     problem,
     visualStyle,
-    network: { index, name: prepared.choices[index].name }
+    network: { index, name: prepared.choices[index].name },
+    weightFrom: prepared.inner.weightFrom
   };
   prepared.report.keepForStyles(source);
 }
@@ -3173,4 +3181,4 @@ export {
   readZipEntry as e,
   readZipDirectory as r
 };
-//# sourceMappingURL=importer-DPZDN40-.js.map
+//# sourceMappingURL=importer-GREKMdIf.js.map