@jbrowse/bandage-core 11.18.0 → 12.0.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.
@@ -12,13 +12,13 @@ import {
12
12
  } from "./chunk-HEYIAMTC.js";
13
13
  import {
14
14
  version
15
- } from "./chunk-4BTGSRIK.js";
15
+ } from "./chunk-JJUDVWF3.js";
16
16
  import {
17
17
  axisScaleOf
18
18
  } from "./chunk-ZZUSCQVT.js";
19
19
  import {
20
20
  figureScene
21
- } from "./chunk-47R7GMU3.js";
21
+ } from "./chunk-BMSDUQJX.js";
22
22
  import {
23
23
  fadedKey
24
24
  } from "./chunk-PL6X2IJC.js";
@@ -38,7 +38,7 @@ import {
38
38
  import {
39
39
  facetCells,
40
40
  facetSettingOf
41
- } from "./chunk-BLUEFYIR.js";
41
+ } from "./chunk-M4ZNDBLE.js";
42
42
 
43
43
  // src/figureScene.ts
44
44
  function figureScene(graph, layout, o) {
@@ -70,7 +70,7 @@ function figureScene(graph, layout, o) {
70
70
  place: facetCells(
71
71
  panels.map((p) => p.walks[0].name),
72
72
  facet.field,
73
- facet.domain
73
+ facet.sort
74
74
  )
75
75
  } : void 0;
76
76
  const labels = walkLabelsOf(
@@ -1,5 +1,5 @@
1
1
  // src/version.ts
2
- var version = "11.18.0";
2
+ var version = "12.0.0";
3
3
 
4
4
  export {
5
5
  version
@@ -72,17 +72,17 @@ function facetSettingOf(facet) {
72
72
  const field = raw.field === "walk" || raw.field === "sample" ? raw.field : "";
73
73
  return {
74
74
  field,
75
- domain: [...raw.domain ?? []],
75
+ sort: [...raw.sort ?? raw.domain ?? []],
76
76
  ...raw.columns === void 0 ? {} : { columns: raw.columns }
77
77
  };
78
78
  }
79
- function domainFirst(names, domain) {
80
- const rank = new Map(domain.map((name, i) => [name, i]));
81
- const listed = (name) => rank.get(name) ?? domain.length;
79
+ function sortedFirst(names, sort) {
80
+ const rank = new Map(sort.map((name, i) => [name, i]));
81
+ const listed = (name) => rank.get(name) ?? sort.length;
82
82
  return names.map((name, i) => ({ name, i })).sort((a, b) => listed(a.name) - listed(b.name) || a.i - b.i).map(({ name }) => name);
83
83
  }
84
- function facetCells(names, by, domain = []) {
85
- const wrapOrder = domainFirst(names, domain);
84
+ function facetCells(names, by, sort = []) {
85
+ const wrapOrder = sortedFirst(names, sort);
86
86
  const wrap = {
87
87
  columns: void 0,
88
88
  count: names.length,
@@ -95,9 +95,9 @@ function facetCells(names, by, domain = []) {
95
95
  const fields = panSNFields(name);
96
96
  return fields && Number.isInteger(fields.haplotype) && fields.haplotype >= 0 ? { sample: fields.sample, column: Math.max(0, fields.haplotype - 1) } : void 0;
97
97
  });
98
- const rows = domainFirst(
98
+ const rows = sortedFirst(
99
99
  [...new Set(places.flatMap((p) => p ? [p.sample] : []))],
100
- domain
100
+ sort
101
101
  );
102
102
  const columns = Math.max(1, ...places.map((p) => p ? p.column + 1 : 1));
103
103
  const cells = places.map(
@@ -30,13 +30,13 @@ import {
30
30
  } from "./chunk-HEYIAMTC.js";
31
31
  import {
32
32
  version
33
- } from "./chunk-4BTGSRIK.js";
33
+ } from "./chunk-JJUDVWF3.js";
34
34
  import {
35
35
  axisScaleOf
36
36
  } from "./chunk-ZZUSCQVT.js";
37
37
  import {
38
38
  figureScene
39
- } from "./chunk-47R7GMU3.js";
39
+ } from "./chunk-BMSDUQJX.js";
40
40
  import {
41
41
  fadedKey
42
42
  } from "./chunk-PL6X2IJC.js";
@@ -83,7 +83,7 @@ import {
83
83
  FACET_PAD_PX,
84
84
  FACET_TITLE_PX,
85
85
  facetGrid
86
- } from "./chunk-BLUEFYIR.js";
86
+ } from "./chunk-M4ZNDBLE.js";
87
87
 
88
88
  // src/figure.ts
89
89
  var FONT = 'font-family="Helvetica, Arial, sans-serif" font-size="11"';
@@ -346,7 +346,8 @@ function figureSvg(graph, layout, o = {}) {
346
346
  if (rows) {
347
347
  const entries = walkRowsKey(rows, {
348
348
  ramp: rampInterval,
349
- genes: o.rowGenes?.size ? o.rowGeneGaps : void 0
349
+ genes: o.rowGenes?.size ? o.rowGeneGaps : void 0,
350
+ annotation: o.rowAnnotation
350
351
  });
351
352
  entries.forEach((entry, i) => {
352
353
  keys.push((x, y) => {
@@ -408,7 +409,8 @@ function figureSvg(graph, layout, o = {}) {
408
409
  const key = walkRowsKeyTree(
409
410
  walkRowsKey(strip.rows, {
410
411
  ramp: rampInterval,
411
- genes: stripGeneGaps(frame, strip.rowGenes, strip.rowGeneGaps)
412
+ genes: stripGeneGaps(frame, strip.rowGenes, strip.rowGeneGaps),
413
+ annotation: o.rowAnnotation
412
414
  }),
413
415
  6,
414
416
  height + frame.height,
@@ -9,7 +9,7 @@ import "../chunks/chunk-EQDQ7P4Y.js";
9
9
  import {
10
10
  laidOutGraph,
11
11
  walkLayers
12
- } from "../chunks/chunk-X35OZAJ5.js";
12
+ } from "../chunks/chunk-ACPEJDT5.js";
13
13
  import {
14
14
  LAYOUT_ENGINE_VALUES,
15
15
  isLayoutEngineKind
@@ -36,7 +36,7 @@ import "../chunks/chunk-ZKSC7QVE.js";
36
36
  import "../chunks/chunk-HNWJ4B7S.js";
37
37
  import {
38
38
  figureSvg
39
- } from "../chunks/chunk-RUO5PAPY.js";
39
+ } from "../chunks/chunk-QI75JFX4.js";
40
40
  import "../chunks/chunk-V4YML3GR.js";
41
41
  import "../chunks/chunk-D4HCHKMA.js";
42
42
  import "../chunks/chunk-4DMSPNYV.js";
@@ -50,9 +50,9 @@ import "../chunks/chunk-U6TXPLFJ.js";
50
50
  import "../chunks/chunk-QWLCHMNS.js";
51
51
  import "../chunks/chunk-WTWO2IPM.js";
52
52
  import "../chunks/chunk-HEYIAMTC.js";
53
- import "../chunks/chunk-4BTGSRIK.js";
53
+ import "../chunks/chunk-JJUDVWF3.js";
54
54
  import "../chunks/chunk-ZZUSCQVT.js";
55
- import "../chunks/chunk-47R7GMU3.js";
55
+ import "../chunks/chunk-BMSDUQJX.js";
56
56
  import "../chunks/chunk-LOCJN3BZ.js";
57
57
  import "../chunks/chunk-PL6X2IJC.js";
58
58
  import "../chunks/chunk-BDMISSNR.js";
@@ -102,7 +102,7 @@ import "../chunks/chunk-RJWPJCIB.js";
102
102
  import "../chunks/chunk-HOAIOEI7.js";
103
103
  import "../chunks/chunk-DAEEMZ74.js";
104
104
  import "../chunks/chunk-H2H4Y3TV.js";
105
- import "../chunks/chunk-BLUEFYIR.js";
105
+ import "../chunks/chunk-M4ZNDBLE.js";
106
106
  import "../chunks/chunk-2JL2JVZ2.js";
107
107
 
108
108
  // src/cli/figure.ts
package/dist/facetGrid.js CHANGED
@@ -6,7 +6,7 @@ import {
6
6
  facetCells,
7
7
  facetGrid,
8
8
  facetSettingOf
9
- } from "./chunks/chunk-BLUEFYIR.js";
9
+ } from "./chunks/chunk-M4ZNDBLE.js";
10
10
  import "./chunks/chunk-2JL2JVZ2.js";
11
11
  export {
12
12
  FACET_FIELDS,
package/dist/figure.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import {
2
2
  figureSvg
3
- } from "./chunks/chunk-RUO5PAPY.js";
3
+ } from "./chunks/chunk-QI75JFX4.js";
4
4
  import "./chunks/chunk-V4YML3GR.js";
5
5
  import "./chunks/chunk-D4HCHKMA.js";
6
6
  import "./chunks/chunk-4DMSPNYV.js";
@@ -11,9 +11,9 @@ import "./chunks/chunk-U6TXPLFJ.js";
11
11
  import "./chunks/chunk-QWLCHMNS.js";
12
12
  import "./chunks/chunk-WTWO2IPM.js";
13
13
  import "./chunks/chunk-HEYIAMTC.js";
14
- import "./chunks/chunk-4BTGSRIK.js";
14
+ import "./chunks/chunk-JJUDVWF3.js";
15
15
  import "./chunks/chunk-ZZUSCQVT.js";
16
- import "./chunks/chunk-47R7GMU3.js";
16
+ import "./chunks/chunk-BMSDUQJX.js";
17
17
  import "./chunks/chunk-LOCJN3BZ.js";
18
18
  import "./chunks/chunk-PL6X2IJC.js";
19
19
  import "./chunks/chunk-BDMISSNR.js";
@@ -60,7 +60,7 @@ import "./chunks/chunk-RJWPJCIB.js";
60
60
  import "./chunks/chunk-HOAIOEI7.js";
61
61
  import "./chunks/chunk-DAEEMZ74.js";
62
62
  import "./chunks/chunk-H2H4Y3TV.js";
63
- import "./chunks/chunk-BLUEFYIR.js";
63
+ import "./chunks/chunk-M4ZNDBLE.js";
64
64
  import "./chunks/chunk-2JL2JVZ2.js";
65
65
  export {
66
66
  figureSvg
@@ -3,7 +3,7 @@ import {
3
3
  gfaFigureData,
4
4
  laidOutGraph,
5
5
  walkLayers
6
- } from "./chunks/chunk-X35OZAJ5.js";
6
+ } from "./chunks/chunk-ACPEJDT5.js";
7
7
  import "./chunks/chunk-CO6RGQAD.js";
8
8
  import "./chunks/chunk-54CX2MCH.js";
9
9
  import "./chunks/chunk-3JDGPLCL.js";
@@ -18,9 +18,9 @@ import "./chunks/chunk-FNDNSDKW.js";
18
18
  import "./chunks/chunk-ZKSC7QVE.js";
19
19
  import "./chunks/chunk-HNWJ4B7S.js";
20
20
  import "./chunks/chunk-HEYIAMTC.js";
21
- import "./chunks/chunk-4BTGSRIK.js";
21
+ import "./chunks/chunk-JJUDVWF3.js";
22
22
  import "./chunks/chunk-ZZUSCQVT.js";
23
- import "./chunks/chunk-47R7GMU3.js";
23
+ import "./chunks/chunk-BMSDUQJX.js";
24
24
  import "./chunks/chunk-LOCJN3BZ.js";
25
25
  import "./chunks/chunk-PL6X2IJC.js";
26
26
  import "./chunks/chunk-BDMISSNR.js";
@@ -66,7 +66,7 @@ import "./chunks/chunk-BSOZW3FC.js";
66
66
  import "./chunks/chunk-RJWPJCIB.js";
67
67
  import "./chunks/chunk-HOAIOEI7.js";
68
68
  import "./chunks/chunk-DAEEMZ74.js";
69
- import "./chunks/chunk-BLUEFYIR.js";
69
+ import "./chunks/chunk-M4ZNDBLE.js";
70
70
  import "./chunks/chunk-2JL2JVZ2.js";
71
71
  export {
72
72
  figureData,
@@ -1,6 +1,6 @@
1
1
  import {
2
2
  figureScene
3
- } from "./chunks/chunk-47R7GMU3.js";
3
+ } from "./chunks/chunk-BMSDUQJX.js";
4
4
  import "./chunks/chunk-LOCJN3BZ.js";
5
5
  import "./chunks/chunk-PL6X2IJC.js";
6
6
  import "./chunks/chunk-BDMISSNR.js";
@@ -46,7 +46,7 @@ import "./chunks/chunk-BSOZW3FC.js";
46
46
  import "./chunks/chunk-RJWPJCIB.js";
47
47
  import "./chunks/chunk-HOAIOEI7.js";
48
48
  import "./chunks/chunk-DAEEMZ74.js";
49
- import "./chunks/chunk-BLUEFYIR.js";
49
+ import "./chunks/chunk-M4ZNDBLE.js";
50
50
  import "./chunks/chunk-2JL2JVZ2.js";
51
51
  export {
52
52
  figureScene
package/dist/index.js CHANGED
@@ -97,7 +97,7 @@ import {
97
97
  import {
98
98
  figureData,
99
99
  gfaFigureData
100
- } from "./chunks/chunk-X35OZAJ5.js";
100
+ } from "./chunks/chunk-ACPEJDT5.js";
101
101
  import {
102
102
  LAYOUT_ENGINES,
103
103
  layoutEngine
@@ -134,7 +134,7 @@ import {
134
134
  import "./chunks/chunk-HNWJ4B7S.js";
135
135
  import {
136
136
  figureSvg
137
- } from "./chunks/chunk-RUO5PAPY.js";
137
+ } from "./chunks/chunk-QI75JFX4.js";
138
138
  import {
139
139
  svgCanvas
140
140
  } from "./chunks/chunk-V4YML3GR.js";
@@ -205,7 +205,7 @@ import {
205
205
  } from "./chunks/chunk-HEYIAMTC.js";
206
206
  import {
207
207
  version
208
- } from "./chunks/chunk-4BTGSRIK.js";
208
+ } from "./chunks/chunk-JJUDVWF3.js";
209
209
  import {
210
210
  axisScaleOf,
211
211
  contains,
@@ -214,7 +214,7 @@ import {
214
214
  viewportOf,
215
215
  zoomAbout
216
216
  } from "./chunks/chunk-ZZUSCQVT.js";
217
- import "./chunks/chunk-47R7GMU3.js";
217
+ import "./chunks/chunk-BMSDUQJX.js";
218
218
  import {
219
219
  layoutGeometryInputs
220
220
  } from "./chunks/chunk-LOCJN3BZ.js";
@@ -386,7 +386,7 @@ import {
386
386
  facetCells,
387
387
  facetGrid,
388
388
  facetSettingOf
389
- } from "./chunks/chunk-BLUEFYIR.js";
389
+ } from "./chunks/chunk-M4ZNDBLE.js";
390
390
  import {
391
391
  panSNContig,
392
392
  panSNHaplotype,
@@ -29,7 +29,7 @@ export type FacetBy = 'walk' | 'sample';
29
29
  export interface FacetSetting {
30
30
  field: '' | FacetBy;
31
31
  /** The walks, or under `sample` the samples, whose panels come first, in order. */
32
- domain: string[];
32
+ sort: string[];
33
33
  /** How many panels go across; unset takes whichever count draws each largest. */
34
34
  columns?: number;
35
35
  }
@@ -45,12 +45,14 @@ export declare const FACET_FIELDS: {
45
45
  /** What a session or a spec may write for the facet: the field bare, or the setting's members. */
46
46
  export type FacetInput = string | {
47
47
  field?: string;
48
+ sort?: readonly string[];
49
+ /** @deprecated `sort` through 11.x */
48
50
  domain?: readonly string[];
49
51
  columns?: number;
50
52
  };
51
53
  /** A facet written bare is its field, and a field the pane cannot split on is none. */
52
54
  export declare function facetSettingOf(facet: FacetInput | undefined): FacetSetting;
53
- export declare function facetCells(names: string[], by: FacetBy, domain?: readonly string[]): {
55
+ export declare function facetCells(names: string[], by: FacetBy, sort?: readonly string[]): {
54
56
  columns: undefined;
55
57
  count: number;
56
58
  cells: number[];
@@ -36,6 +36,7 @@ export interface FigureOptions {
36
36
  walkRowPitch?: RowPitch;
37
37
  rowGenes?: Map<string, RowGene[]>;
38
38
  rowGeneGaps?: GeneGaps;
39
+ rowAnnotation?: string;
39
40
  walkStrip?: {
40
41
  rows: WalkRows;
41
42
  rowGenes?: Map<string, RowGene[]>;
@@ -1 +1 @@
1
- export declare const version = "11.18.0";
1
+ export declare const version = "12.0.0";
package/dist/version.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import {
2
2
  version
3
- } from "./chunks/chunk-4BTGSRIK.js";
3
+ } from "./chunks/chunk-JJUDVWF3.js";
4
4
  export {
5
5
  version
6
6
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jbrowse/bandage-core",
3
- "version": "11.18.0",
3
+ "version": "12.0.0",
4
4
  "description": "Pangenome graph layout and drawing with no host: GFA in, the Bandage force-directed engine and reference-anchored layouts, a Canvas2D renderer, hit testing and labels out",
5
5
  "license": "GPL-3.0-or-later",
6
6
  "repository": {