@knowvah/dot-engine 2.11.0 → 2.12.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"file":"edge-route-chain.d.ts","sourceRoot":"","sources":["../../../src/layout/dot/edge-route-chain.ts"],"names":[],"mappings":"AAEA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,KAAK,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,KAAK,EAAE,KAAK,EAAO,MAAM,qBAAqB,CAAC;AAGtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAqNpD;;;;;;;;;GASG;AACH,wBAAgB,0BAA0B,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,SAAS,GAAG,KAAK,EAAE,GAAG,IAAI,GAAG,MAAM,CAwB1F;AAuBD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,GAAG,SAAS,GAAG,IAAI,CAO1E;AA8CD;;;;;;;;;;GAUG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,SAAS,GAAG,SAAS,CAoBnD;AAGD;;;;;;;;;;;;GAYG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,GAAG,IAAI,CAqBhG"}
1
+ {"version":3,"file":"edge-route-chain.d.ts","sourceRoot":"","sources":["../../../src/layout/dot/edge-route-chain.ts"],"names":[],"mappings":"AAEA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,KAAK,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,KAAK,EAAE,KAAK,EAAa,MAAM,qBAAqB,CAAC;AAG5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AA4RpD;;;;;;;;;GASG;AACH,wBAAgB,0BAA0B,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,SAAS,GAAG,KAAK,EAAE,GAAG,IAAI,GAAG,MAAM,CAwB1F;AAuBD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,GAAG,SAAS,GAAG,IAAI,CAO1E;AA8CD;;;;;;;;;;GAUG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,SAAS,GAAG,SAAS,CAoBnD;AAGD;;;;;;;;;;;;GAYG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,GAAG,IAAI,CAsBhG"}
@@ -1 +1 @@
1
- {"version":3,"file":"sgd.d.ts","sourceRoot":"","sources":["../../../src/layout/neato/sgd.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sgd.d.ts","sourceRoot":"","sources":["../../../src/layout/neato/sgd.ts"],"names":[],"mappings":"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"}
package/dist/render.js CHANGED
@@ -885,6 +885,7 @@ var OCTAL_WIDTH = 3;
885
885
  var OCTAL_RADIX = 8;
886
886
  var lastLevel = "warning";
887
887
  var pending = { line: null, channel: "warn" };
888
+ var usererrf = null;
888
889
  registerRenderState(() => {
889
890
  flushPending();
890
891
  lastLevel = "warning";
@@ -910,7 +911,9 @@ function flushPending() {
910
911
  writeLine(channel, line);
911
912
  }
912
913
  function writeLine(channel, line) {
913
- if (channel === "warn") console.warn(escapeControl(line));
914
+ if (usererrf !== null) usererrf(`${line}
915
+ `);
916
+ else if (channel === "warn") console.warn(escapeControl(line));
914
917
  else console.error(escapeControl(line));
915
918
  }
916
919
  function assemble(level, msg) {
@@ -918,6 +921,13 @@ function assemble(level, msg) {
918
921
  const prefix = level === "error" ? PREFIX_ERROR : PREFIX_WARNING;
919
922
  return `${prefix}${PREFIX_SEP}${msg}`;
920
923
  }
924
+ function outToUser(errf, level, msg) {
925
+ if (level !== "prev") {
926
+ errf(level === "error" ? PREFIX_ERROR : PREFIX_WARNING);
927
+ errf(PREFIX_SEP);
928
+ }
929
+ errf(msg);
930
+ }
921
931
  function channelOf(level) {
922
932
  const eff = level === "prev" ? lastLevel : level;
923
933
  return eff === "warning" ? "warn" : "error";
@@ -925,6 +935,12 @@ function channelOf(level) {
925
935
  function emit(level, msg, channel, hold) {
926
936
  const target = channel ?? channelOf(level);
927
937
  if (level !== "prev") lastLevel = level;
938
+ if (usererrf !== null) {
939
+ flushPending();
940
+ outToUser(usererrf, level, hold ? msg : `${msg}
941
+ `);
942
+ return;
943
+ }
928
944
  const text = assemble(level, msg);
929
945
  if (pending.line === null) {
930
946
  pending.channel = target;
@@ -30416,10 +30432,46 @@ function routeChainSegmented(g, beginEdge, endEdge, segs) {
30416
30432
  }
30417
30433
  return finishChain(w, endEdge, segs[ei], segFirst, segs) ? w.pts : null;
30418
30434
  }
30419
- function routeMultiRankEdgeFaithful(g, e) {
30435
+ function copyPort2(p) {
30436
+ return { ...p, p: { ...p.p } };
30437
+ }
30438
+ function hackflagBeginView(e, back, firstVnode) {
30439
+ const tailPort = back ? e.info.head_port : e.info.tail_port;
30440
+ return {
30441
+ ...e,
30442
+ tail: back ? e.head : e.tail,
30443
+ head: firstVnode,
30444
+ info: {
30445
+ ...e.info,
30446
+ tail_port: copyPort2(tailPort),
30447
+ head_port: { ...copyPort2(e.info.head_port), defined: false, p: { x: 0, y: 0 } },
30448
+ edge_type: VIRTUAL,
30449
+ to_orig: e
30450
+ }
30451
+ };
30452
+ }
30453
+ function hackflagEndView(e, back) {
30454
+ if (back) return makeFwdEdge(e);
30455
+ return {
30456
+ ...e,
30457
+ info: { ...e.info, tail_port: copyPort2(e.info.tail_port), head_port: copyPort2(e.info.head_port) }
30458
+ };
30459
+ }
30460
+ function chainEnds(e, segs) {
30461
+ const first = segs[0];
30462
+ const last = segs[segs.length - 1];
30463
+ const orig = resolveOrigEdge(e);
30464
+ if (resolveOrigEdge(first) === orig) return [first, last];
30465
+ const back = (orig.head.info.rank ?? 0) < (orig.tail.info.rank ?? 0);
30466
+ return [hackflagBeginView(orig, back, first.head), hackflagEndView(orig, back)];
30467
+ }
30468
+ function spansRanksForward(g, e) {
30420
30469
  const r = e.tail.info.rank;
30421
30470
  const rh = e.head.info.rank;
30422
- if (g.info.rank === void 0 || r === void 0 || rh === void 0 || rh <= r + 1) return null;
30471
+ return g.info.rank !== void 0 && r !== void 0 && rh !== void 0 && rh > r + 1;
30472
+ }
30473
+ function routeMultiRankEdgeFaithful(g, e) {
30474
+ if (!spansRanksForward(g, e)) return null;
30423
30475
  const et = edgeType(g);
30424
30476
  if (et === EDGETYPE_LINE) {
30425
30477
  const line = makeLineEdge(g, e);
@@ -30427,7 +30479,8 @@ function routeMultiRankEdgeFaithful(g, e) {
30427
30479
  }
30428
30480
  const segs = chainSegments(e);
30429
30481
  if (segs.length === 0 || segs[segs.length - 1].head !== e.head) return null;
30430
- return routeChainSegmented(g, segs[0], segs[segs.length - 1], segs) ?? "lost";
30482
+ const [beginEdge, endEdge] = chainEnds(e, segs);
30483
+ return routeChainSegmented(g, beginEdge, endEdge, segs) ?? "lost";
30431
30484
  }
30432
30485
  function entryRunSegments(e) {
30433
30486
  const segs = [e];
@@ -30498,7 +30551,8 @@ function routeBackEdge(e, _tailBox, _headBox, g) {
30498
30551
  const segs = backChainSegments(e);
30499
30552
  if (segs.length < 2 || segs[segs.length - 1].head !== e.tail) return;
30500
30553
  const fwdEdge = makeFwdEdge(e);
30501
- const fwd = routeChainSegmented(g, segs[0], segs[segs.length - 1], segs);
30554
+ const [beginEdge, endEdge] = chainEnds(e, segs);
30555
+ const fwd = routeChainSegmented(g, beginEdge, endEdge, segs);
30502
30556
  if (fwd === null) {
30503
30557
  e.info.lost = true;
30504
30558
  return;
@@ -36610,7 +36664,7 @@ function orthoDispatch(g) {
36610
36664
  function curvedTop(g) {
36611
36665
  resetRW(g);
36612
36666
  if (((g.root.info.has_labels ?? 0) & EDGE_LABEL) !== 0) {
36613
- agerrLineOn("warn", "edge labels with splines=curved not supported in dot - use xlabels\n");
36667
+ agwarningf("edge labels with splines=curved not supported in dot - use xlabels");
36614
36668
  }
36615
36669
  }
36616
36670
  function finalizeSplines(g, et, normalize) {
@@ -39203,17 +39257,11 @@ function buildUnfixed(g, n) {
39203
39257
  }
39204
39258
  function resolveModel(model) {
39205
39259
  if (model === MODEL_CIRCUIT) {
39206
- agerrLineOn(
39207
- "warn",
39208
- "circuit model not yet supported in Gmode=sgd, reverting to shortpath model"
39209
- );
39260
+ agwarningf("circuit model not yet supported in Gmode=sgd, reverting to shortpath model");
39210
39261
  return MODEL_SHORTPATH;
39211
39262
  }
39212
39263
  if (model === MODEL_MDS) {
39213
- agerrLineOn(
39214
- "warn",
39215
- "mds model not yet supported in Gmode=sgd, reverting to shortpath model"
39216
- );
39264
+ agwarningf("mds model not yet supported in Gmode=sgd, reverting to shortpath model");
39217
39265
  return MODEL_SHORTPATH;
39218
39266
  }
39219
39267
  return model;
@@ -52766,7 +52814,7 @@ function fdpSplines(g) {
52766
52814
  );
52767
52815
  }
52768
52816
  if (g.info.n_cluster_edges) {
52769
- agerrLineOn("warn", CLUSTER_EDGE_WARNING);
52817
+ agwarningf(CLUSTER_EDGE_WARNING);
52770
52818
  et = EDGETYPE_LINE;
52771
52819
  } else {
52772
52820
  splineEdges1(g, et);