react-cheminfo 0.22.0 → 0.24.0

package/lib/projection/core/projectionGroupings.js

@@ -0,0 +1,132 @@
+/**
+ * How the groupings a page hands in become what a figure draws: the one that
+ * colours the dots, painted from the shared palette, and the one that shapes
+ * them, given one shape per group.
+ *
+ * Both are cut the same way — the page's own order first, then every group in
+ * the order its first row names it — so a group keeps its colour and its shape
+ * however the rows are filtered.
+ */
+import { CHART_SERIES_COLORS, chartSeriesColor, } from "../../chart/core/chartPalette.js";
+import { OVERLAY_SAMPLE_SHAPES } from "../../overlay/core/overlayMarks.js";
+/**
+ * The grouping a set of samples is coloured by, in a shape a legend and a plot
+ * can both read.
+ *
+ * A group named in `order` but held by no row is kept, so a legend does not
+ * reshuffle when a filter empties one; a row naming a group that is not in
+ * `order` is appended in the order it appears.
+ * @param grouping - The grouping, or nothing when the dots are not coloured.
+ * @param count - How many rows there are, which is the score matrix's height.
+ * @returns The resolved groups. No grouping gives no entries at all, and every
+ * row lands at `-1`.
+ */
+export function resolveProjectionGroups(grouping, count) {
+    const { label, entries, rowOf } = partition(grouping, count);
+    const colored = entries.map((entry) => ({ ...entry, color: '' }));
+    paintGroups(colored, grouping?.colors);
+    return { label, entries: colored, groupOf: rowOf };
+}
+/**
+ * The grouping a set of samples is shaped by, one shape per group.
+ *
+ * A grouping of more groups than there are shapes is refused as a whole rather
+ * than drawn with two groups sharing a shape, or with the last ones falling
+ * back to a disc: either would put two groups under one mark, which is the one
+ * thing a key cannot undo.
+ * @param grouping - The grouping, or nothing when the dots are not shaped.
+ * @param count - How many rows there are, which is the score matrix's height.
+ * @returns The resolved shapes, or `null` when there is no grouping or its
+ * groups outnumber the shapes.
+ */
+export function resolveProjectionShapes(grouping, count) {
+    if (grouping === undefined)
+        return null;
+    const { label, entries, rowOf } = partition(grouping, count);
+    if (entries.length > OVERLAY_SAMPLE_SHAPES.length)
+        return null;
+    const shaped = entries.map((entry, index) => ({
+        ...entry,
+        shape: OVERLAY_SAMPLE_SHAPES[index] ?? 'dot',
+    }));
+    return { label, entries: shaped, shapeOf: rowOf };
+}
+/**
+ * The grouping carrying an id.
+ * @param samples - Who the rows are.
+ * @param id - The id asked for.
+ * @returns The grouping, or `undefined` when none carries it.
+ */
+export function projectionGrouping(samples, id) {
+    for (const grouping of samples.groupings ?? NO_GROUPINGS) {
+        if (grouping.id === id)
+            return grouping;
+    }
+    return undefined;
+}
+const NO_GROUP = -1;
+const DEFAULT_GROUP_LABEL = 'Group';
+const NO_GROUPINGS = [];
+function partition(grouping, count) {
+    const rowCount = Number.isFinite(count) ? Math.max(0, Math.floor(count)) : 0;
+    const label = grouping?.label ?? DEFAULT_GROUP_LABEL;
+    const rowOf = new Int32Array(rowCount).fill(NO_GROUP);
+    const entries = [];
+    if (grouping === undefined)
+        return { label, entries, rowOf };
+    const indexOfGroup = new Map();
+    for (const id of grouping.order ?? []) {
+        appendGroup(entries, indexOfGroup, id);
+    }
+    for (let row = 0; row < rowCount; row++) {
+        const id = grouping.groups[row];
+        if (id === undefined)
+            continue;
+        const at = appendGroup(entries, indexOfGroup, id);
+        rowOf[row] = at;
+        const entry = entries[at];
+        if (entry !== undefined)
+            entry.count++;
+    }
+    return { label, entries, rowOf };
+}
+function appendGroup(entries, indexOfGroup, id) {
+    const known = indexOfGroup.get(id);
+    if (known !== undefined)
+        return known;
+    const at = entries.length;
+    indexOfGroup.set(id, at);
+    entries.push({ id, label: id, count: 0 });
+    return at;
+}
+function paintGroups(entries, pinned) {
+    // Every pinned colour is taken out of the palette before any group draws
+    // from it, so pinning the third group's hue onto the first does not leave
+    // two groups wearing it.
+    const taken = new Set();
+    if (pinned !== undefined) {
+        for (const entry of entries) {
+            const color = pinned[entry.id];
+            if (color !== undefined)
+                taken.add(color.toLowerCase());
+        }
+    }
+    let cursor = 0;
+    for (const entry of entries) {
+        const own = pinned?.[entry.id];
+        if (own !== undefined) {
+            entry.color = own;
+            continue;
+        }
+        let color = chartSeriesColor(cursor, 'group');
+        while (cursor < CHART_SERIES_COLORS.length &&
+            taken.has(color.toLowerCase())) {
+            cursor++;
+            color = chartSeriesColor(cursor, 'group');
+        }
+        cursor++;
+        taken.add(color.toLowerCase());
+        entry.color = color;
+    }
+}
+//# sourceMappingURL=projectionGroupings.js.map

package/lib/projection/core/projectionGroupings.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"projectionGroupings.js","sourceRoot":"","sources":["../../../src/projection/core/projectionGroupings.ts"],"names":[],"mappings":"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"}

package/lib/projection/core/projectionOptions.d.ts

@@ -12,10 +12,10 @@ export type ProjectionVariablesView =
 /** The one selected sample, rebuilt from the components shown. */
  | 'sample';
 /**
- * What decides a dot's colour on the map: `'group'`, `'none'`, or nothing else
- * in this release.
+ * The word for "no grouping" wherever an option names one, which is why no
+ * grouping may be called it.
  */
-export type ProjectionColorBy = 'group' | 'none';
+export declare const NO_GROUPING = "none";
 /** What the figure is currently showing. Every field is a control in the floating bar. */
 export interface ProjectionOptions {
     /**
@@ -40,10 +40,20 @@ export interface ProjectionOptions {
      */
     cloudGesture: CloudGesture;
     /**
-     * What decides a dot's colour.
-     * @default 'group'
+     * Which grouping colours the dots, by its id, or `'none'`. An id no grouping
+     * carries — the empty string, or one saved on other data — takes the first
+     * grouping.
+     * @default ''
      */
-    colorBy: ProjectionColorBy;
+    colorBy: string;
+    /**
+     * Which grouping gives the dots their shapes, by its id, or `'none'`. An id
+     * no grouping carries takes the second grouping — the first when the colour
+     * has taken the second — and a grouping of more groups than there are
+     * shapes is not drawn.
+     * @default ''
+     */
+    shapeBy: string;
     /**
      * How large the group outlines are, or `null` for none.
      * @default { kind: 'coverage', probability: 0.95 }

package/lib/projection/core/projectionOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"projectionOptions.d.ts","sourceRoot":"","sources":["../../../src/projection/core/projectionOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AAC3E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC;AACnF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAEzE,2CAA2C;AAC3C,MAAM,MAAM,uBAAuB;AACjC,uFAAuF;AACrF,QAAQ;AACV,4EAA4E;GAC1E,SAAS;AACX,qFAAqF;GACnF,UAAU;AACZ,kEAAkE;GAChE,QAAQ,CAAC;AAEb;;;GAGG;AACH,MAAM,MAAM,iBAAiB,GAAG,OAAO,GAAG,MAAM,CAAC;AAEjD,0FAA0F;AAC1F,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,YAAY,EAAE,YAAY,CAAC;IAC3B;;;OAGG;IACH,OAAO,EAAE,iBAAiB,CAAC;IAC3B;;;OAGG;IACH,OAAO,EAAE,WAAW,GAAG,IAAI,CAAC;IAC5B;;;OAGG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,cAAc,EAAE,OAAO,CAAC;IACxB;;;OAGG;IACH,eAAe,EAAE,OAAO,CAAC;IACzB;;;OAGG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;;OAGG;IACH,aAAa,EAAE,uBAAuB,CAAC;IACvC;;;OAGG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB;;;;;OAKG;IACH,WAAW,EAAE,OAAO,CAAC;IACrB;;;;OAIG;IACH,WAAW,EAAE,OAAO,CAAC;IACrB;;;;OAIG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;;;OAKG;IACH,aAAa,EAAE,UAAU,GAAG,WAAW,CAAC;IACxC;;;OAGG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,UAAU,EAAE,oBAAoB,CAAC;CAClC;AAED,yEAAyE;AACzE,MAAM,MAAM,kBAAkB,GAAG,MAAM,iBAAiB,CAAC;AAEzD,2DAA2D;AAC3D,eAAO,MAAM,0BAA0B,EAAE,iBAoBxC,CAAC"}
+{"version":3,"file":"projectionOptions.d.ts","sourceRoot":"","sources":["../../../src/projection/core/projectionOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AAC3E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC;AACnF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAEzE,2CAA2C;AAC3C,MAAM,MAAM,uBAAuB;AACjC,uFAAuF;AACrF,QAAQ;AACV,4EAA4E;GAC1E,SAAS;AACX,qFAAqF;GACnF,UAAU;AACZ,kEAAkE;GAChE,QAAQ,CAAC;AAEb;;;GAGG;AACH,eAAO,MAAM,WAAW,SAAS,CAAC;AAElC,0FAA0F;AAC1F,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,YAAY,EAAE,YAAY,CAAC;IAC3B;;;;;OAKG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,OAAO,EAAE,WAAW,GAAG,IAAI,CAAC;IAC5B;;;OAGG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,cAAc,EAAE,OAAO,CAAC;IACxB;;;OAGG;IACH,eAAe,EAAE,OAAO,CAAC;IACzB;;;OAGG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;;OAGG;IACH,aAAa,EAAE,uBAAuB,CAAC;IACvC;;;OAGG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB;;;;;OAKG;IACH,WAAW,EAAE,OAAO,CAAC;IACrB;;;;OAIG;IACH,WAAW,EAAE,OAAO,CAAC;IACrB;;;;OAIG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;;;OAKG;IACH,aAAa,EAAE,UAAU,GAAG,WAAW,CAAC;IACxC;;;OAGG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,UAAU,EAAE,oBAAoB,CAAC;CAClC;AAED,yEAAyE;AACzE,MAAM,MAAM,kBAAkB,GAAG,MAAM,iBAAiB,CAAC;AAEzD,2DAA2D;AAC3D,eAAO,MAAM,0BAA0B,EAAE,iBAqBxC,CAAC"}

package/lib/projection/core/projectionOptions.js

@@ -1,10 +1,16 @@
+/**
+ * The word for "no grouping" wherever an option names one, which is why no
+ * grouping may be called it.
+ */
+export const NO_GROUPING = 'none';
 /** What the figure shows when a site overrides nothing. */
 export const DEFAULT_PROJECTION_OPTIONS = {
     xAxis: 0,
     yAxis: 1,
     zAxis: 2,
     cloudGesture: 'turn',
-    colorBy: 'group',
+    colorBy: '',
+    shapeBy: '',
     ellipse: { kind: 'coverage', probability: 0.95 },
     pointRadius: 3.5,
     showGroupMeans: false,

package/lib/projection/core/projectionOptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"projectionOptions.js","sourceRoot":"","sources":["../../../src/projection/core/projectionOptions.ts"],"names":[],"mappings":"AAkIA,2DAA2D;AAC3D,MAAM,CAAC,MAAM,0BAA0B,GAAsB;IAC3D,KAAK,EAAE,CAAC;IACR,KAAK,EAAE,CAAC;IACR,KAAK,EAAE,CAAC;IACR,YAAY,EAAE,MAAM;IACpB,OAAO,EAAE,OAAO;IAChB,OAAO,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,IAAI,EAAE;IAChD,WAAW,EAAE,GAAG;IAChB,cAAc,EAAE,KAAK;IACrB,eAAe,EAAE,KAAK;IACtB,OAAO,EAAE,KAAK;IACd,SAAS,EAAE,CAAC;IACZ,aAAa,EAAE,QAAQ;IACvB,cAAc,EAAE,CAAC;IACjB,WAAW,EAAE,IAAI;IACjB,WAAW,EAAE,IAAI;IACjB,MAAM,EAAE,CAAC;IACT,aAAa,EAAE,UAAU;IACzB,WAAW,EAAE,IAAI;IACjB,UAAU,EAAE,SAAS;CACtB,CAAC"}
+{"version":3,"file":"projectionOptions.js","sourceRoot":"","sources":["../../../src/projection/core/projectionOptions.ts"],"names":[],"mappings":"AAeA;;;GAGG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC;AAyHlC,2DAA2D;AAC3D,MAAM,CAAC,MAAM,0BAA0B,GAAsB;IAC3D,KAAK,EAAE,CAAC;IACR,KAAK,EAAE,CAAC;IACR,KAAK,EAAE,CAAC;IACR,YAAY,EAAE,MAAM;IACpB,OAAO,EAAE,EAAE;IACX,OAAO,EAAE,EAAE;IACX,OAAO,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,IAAI,EAAE;IAChD,WAAW,EAAE,GAAG;IAChB,cAAc,EAAE,KAAK;IACrB,eAAe,EAAE,KAAK;IACtB,OAAO,EAAE,KAAK;IACd,SAAS,EAAE,CAAC;IACZ,aAAa,EAAE,QAAQ;IACvB,cAAc,EAAE,CAAC;IACjB,WAAW,EAAE,IAAI;IACjB,WAAW,EAAE,IAAI;IACjB,MAAM,EAAE,CAAC;IACT,aAAa,EAAE,UAAU;IACzB,WAAW,EAAE,IAAI;IACjB,UAAU,EAAE,SAAS;CACtB,CAAC"}

package/lib/projection/core/projectionPanelWords.d.ts

@@ -38,6 +38,12 @@ export interface ProjectionPanelWords {
 export interface ProjectionReasonWords {
     /** Why the colour cannot be set: the samples carry no groups. */
     noGroups: string;
+    /** Why the shape cannot be set: the samples carry no groups. */
+    noGroupsToShape: string;
+    /** Why a grouping is greyed in the shape picker: the colour already draws it. */
+    shapeIsColour: string;
+    /** Why a grouping is greyed in the shape picker: it has more groups than shapes. */
+    tooManyShapes: string;
     /** Why the map's outlines cannot be set while nothing is coloured. */
     uncolouredOutlines: string;
     /** Why the cloud's shells cannot be set while nothing is coloured. */

package/lib/projection/core/projectionPanelWords.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"projectionPanelWords.d.ts","sourceRoot":"","sources":["../../../src/projection/core/projectionPanelWords.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC;AACnF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAEzE,OAAO,KAAK,EACV,kBAAkB,EAClB,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAEhC,yDAAyD;AACzD,MAAM,WAAW,oBAAoB;IACnC;;;;;;;OAOG;IACH,IAAI,EAAE,MAAM,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;IACzC;;;;;OAKG;IACH,OAAO,EAAE;QACP,2EAA2E;QAC3E,IAAI,EAAE,MAAM,CAAC;QACb,0CAA0C;QAC1C,OAAO,EAAE,MAAM,CAAC;QAChB,yDAAyD;QACzD,SAAS,EAAE,MAAM,CAAC;QAClB,gFAAgF;QAChF,QAAQ,EAAE,MAAM,CAAC;QACjB,sEAAsE;QACtE,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;CACH;AAED;;;GAGG;AACH,MAAM,WAAW,qBAAqB;IACpC,iEAAiE;IACjE,QAAQ,EAAE,MAAM,CAAC;IACjB,sEAAsE;IACtE,kBAAkB,EAAE,MAAM,CAAC;IAC3B,sEAAsE;IACtE,gBAAgB,EAAE,MAAM,CAAC;IACzB,4DAA4D;IAC5D,cAAc,EAAE,MAAM,CAAC;IACvB,mEAAmE;IACnE,gBAAgB,EAAE,MAAM,CAAC;IACzB,mDAAmD;IACnD,SAAS,EAAE,MAAM,CAAC;IAClB,sDAAsD;IACtD,QAAQ,EAAE,MAAM,CAAC;IACjB,gDAAgD;IAChD,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,oEAAoE;AACpE,MAAM,WAAW,qBAAqB;IACpC;;;;OAIG;IACH,UAAU,EAAE,MAAM,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;IACjD,mFAAmF;IACnF,aAAa,EAAE,MAAM,CAAC,iBAAiB,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC,CAAC;IAClE;;;OAGG;IACH,YAAY,EAAE,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;CAC5C;AAED,gFAAgF;AAChF,MAAM,WAAW,sBAAsB;IACrC,mDAAmD;IACnD,UAAU,EAAE,MAAM,CAAC;IACnB,mDAAmD;IACnD,QAAQ,EAAE,MAAM,CAAC;IACjB,kDAAkD;IAClD,QAAQ,EAAE,MAAM,CAAC;IACjB,4EAA4E;IAC5E,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAED,uEAAuE;AACvE,eAAO,MAAM,sBAAsB,EAAE,oBA6BpC,CAAC;AAEF,wEAAwE;AACxE,eAAO,MAAM,uBAAuB,EAAE,qBAYrC,CAAC;AAEF,gEAAgE;AAChE,eAAO,MAAM,uBAAuB,EAAE,qBAIrC,CAAC;AAEF,4EAA4E;AAC5E,eAAO,MAAM,wBAAwB,EAAE,sBAKtC,CAAC"}
+{"version":3,"file":"projectionPanelWords.d.ts","sourceRoot":"","sources":["../../../src/projection/core/projectionPanelWords.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC;AACnF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAEzE,OAAO,KAAK,EACV,kBAAkB,EAClB,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAEhC,yDAAyD;AACzD,MAAM,WAAW,oBAAoB;IACnC;;;;;;;OAOG;IACH,IAAI,EAAE,MAAM,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;IACzC;;;;;OAKG;IACH,OAAO,EAAE;QACP,2EAA2E;QAC3E,IAAI,EAAE,MAAM,CAAC;QACb,0CAA0C;QAC1C,OAAO,EAAE,MAAM,CAAC;QAChB,yDAAyD;QACzD,SAAS,EAAE,MAAM,CAAC;QAClB,gFAAgF;QAChF,QAAQ,EAAE,MAAM,CAAC;QACjB,sEAAsE;QACtE,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;CACH;AAED;;;GAGG;AACH,MAAM,WAAW,qBAAqB;IACpC,iEAAiE;IACjE,QAAQ,EAAE,MAAM,CAAC;IACjB,gEAAgE;IAChE,eAAe,EAAE,MAAM,CAAC;IACxB,iFAAiF;IACjF,aAAa,EAAE,MAAM,CAAC;IACtB,oFAAoF;IACpF,aAAa,EAAE,MAAM,CAAC;IACtB,sEAAsE;IACtE,kBAAkB,EAAE,MAAM,CAAC;IAC3B,sEAAsE;IACtE,gBAAgB,EAAE,MAAM,CAAC;IACzB,4DAA4D;IAC5D,cAAc,EAAE,MAAM,CAAC;IACvB,mEAAmE;IACnE,gBAAgB,EAAE,MAAM,CAAC;IACzB,mDAAmD;IACnD,SAAS,EAAE,MAAM,CAAC;IAClB,sDAAsD;IACtD,QAAQ,EAAE,MAAM,CAAC;IACjB,gDAAgD;IAChD,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,oEAAoE;AACpE,MAAM,WAAW,qBAAqB;IACpC;;;;OAIG;IACH,UAAU,EAAE,MAAM,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;IACjD,mFAAmF;IACnF,aAAa,EAAE,MAAM,CAAC,iBAAiB,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC,CAAC;IAClE;;;OAGG;IACH,YAAY,EAAE,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;CAC5C;AAED,gFAAgF;AAChF,MAAM,WAAW,sBAAsB;IACrC,mDAAmD;IACnD,UAAU,EAAE,MAAM,CAAC;IACnB,mDAAmD;IACnD,QAAQ,EAAE,MAAM,CAAC;IACjB,kDAAkD;IAClD,QAAQ,EAAE,MAAM,CAAC;IACjB,4EAA4E;IAC5E,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAED,uEAAuE;AACvE,eAAO,MAAM,sBAAsB,EAAE,oBA8BpC,CAAC;AAEF,wEAAwE;AACxE,eAAO,MAAM,uBAAuB,EAAE,qBAerC,CAAC;AAEF,gEAAgE;AAChE,eAAO,MAAM,uBAAuB,EAAE,qBAIrC,CAAC;AAEF,4EAA4E;AAC5E,eAAO,MAAM,wBAAwB,EAAE,sBAKtC,CAAC"}

package/lib/projection/core/projectionPanelWords.js

@@ -6,6 +6,7 @@ export const PROJECTION_PANEL_WORDS = {
         zAxis: 'Into',
         cloudGesture: 'Drag does',
         colorBy: 'Colour by',
+        shapeBy: 'Shape by',
         ellipse: 'Outlines',
         pointRadius: 'Dot size',
         showGroupMeans: 'Averages',
@@ -32,6 +33,9 @@ export const PROJECTION_PANEL_WORDS = {
 /** The reasons a greyed control gives when a site overrides nothing. */
 export const PROJECTION_REASON_WORDS = {
     noGroups: 'These samples carry no groups to colour by.',
+    noGroupsToShape: 'These samples carry no groups to shape by.',
+    shapeIsColour: 'The colour already stands for these groups.',
+    tooManyShapes: 'More groups than there are shapes to tell apart.',
     uncolouredOutlines: 'Outlines follow the groups, so colour the map by them first.',
     uncolouredShells: 'Shells follow the groups, so colour the cloud by them first.',
     axisTakenOnMap: 'Already drawn on the other axis.',

package/lib/projection/core/projectionPanelWords.js.map

@@ -1 +1 @@
-{"version":3,"file":"projectionPanelWords.js","sourceRoot":"","sources":["../../../src/projection/core/projectionPanelWords.ts"],"names":[],"mappings":"AA2FA,uEAAuE;AACvE,MAAM,CAAC,MAAM,sBAAsB,GAAyB;IAC1D,IAAI,EAAE;QACJ,KAAK,EAAE,QAAQ;QACf,KAAK,EAAE,IAAI;QACX,KAAK,EAAE,MAAM;QACb,YAAY,EAAE,WAAW;QACzB,OAAO,EAAE,WAAW;QACpB,OAAO,EAAE,UAAU;QACnB,WAAW,EAAE,UAAU;QACvB,cAAc,EAAE,UAAU;QAC1B,eAAe,EAAE,UAAU;QAC3B,OAAO,EAAE,WAAW;QACpB,SAAS,EAAE,YAAY;QACvB,aAAa,EAAE,MAAM;QACrB,cAAc,EAAE,QAAQ;QACxB,WAAW,EAAE,WAAW;QACxB,WAAW,EAAE,SAAS;QACtB,MAAM,EAAE,SAAS;QACjB,aAAa,EAAE,WAAW;QAC1B,WAAW,EAAE,QAAQ;QACrB,UAAU,EAAE,WAAW;KACxB;IACD,OAAO,EAAE;QACP,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,SAAS;QAClB,SAAS,EAAE,WAAW;QACtB,QAAQ,EAAE,UAAU;QACpB,KAAK,EAAE,OAAO;KACf;CACF,CAAC;AAEF,wEAAwE;AACxE,MAAM,CAAC,MAAM,uBAAuB,GAA0B;IAC5D,QAAQ,EAAE,6CAA6C;IACvD,kBAAkB,EAChB,8DAA8D;IAChE,gBAAgB,EACd,8DAA8D;IAChE,cAAc,EAAE,kCAAkC;IAClD,gBAAgB,EAAE,gCAAgC;IAClD,SAAS,EACP,2EAA2E;IAC7E,QAAQ,EAAE,6DAA6D;IACvE,QAAQ,EAAE,6CAA6C;CACxD,CAAC;AAEF,gEAAgE;AAChE,MAAM,CAAC,MAAM,uBAAuB,GAA0B;IAC5D,UAAU,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE;IAChE,aAAa,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,iBAAiB,EAAE;IACvE,YAAY,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE;CACjD,CAAC;AAEF,4EAA4E;AAC5E,MAAM,CAAC,MAAM,wBAAwB,GAA2B;IAC9D,UAAU,EAAE,aAAa;IACzB,QAAQ,EAAE,WAAW;IACrB,QAAQ,EAAE,oBAAoB;IAC9B,kBAAkB,EAAE,4BAA4B;CACjD,CAAC"}
+{"version":3,"file":"projectionPanelWords.js","sourceRoot":"","sources":["../../../src/projection/core/projectionPanelWords.ts"],"names":[],"mappings":"AAiGA,uEAAuE;AACvE,MAAM,CAAC,MAAM,sBAAsB,GAAyB;IAC1D,IAAI,EAAE;QACJ,KAAK,EAAE,QAAQ;QACf,KAAK,EAAE,IAAI;QACX,KAAK,EAAE,MAAM;QACb,YAAY,EAAE,WAAW;QACzB,OAAO,EAAE,WAAW;QACpB,OAAO,EAAE,UAAU;QACnB,OAAO,EAAE,UAAU;QACnB,WAAW,EAAE,UAAU;QACvB,cAAc,EAAE,UAAU;QAC1B,eAAe,EAAE,UAAU;QAC3B,OAAO,EAAE,WAAW;QACpB,SAAS,EAAE,YAAY;QACvB,aAAa,EAAE,MAAM;QACrB,cAAc,EAAE,QAAQ;QACxB,WAAW,EAAE,WAAW;QACxB,WAAW,EAAE,SAAS;QACtB,MAAM,EAAE,SAAS;QACjB,aAAa,EAAE,WAAW;QAC1B,WAAW,EAAE,QAAQ;QACrB,UAAU,EAAE,WAAW;KACxB;IACD,OAAO,EAAE;QACP,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,SAAS;QAClB,SAAS,EAAE,WAAW;QACtB,QAAQ,EAAE,UAAU;QACpB,KAAK,EAAE,OAAO;KACf;CACF,CAAC;AAEF,wEAAwE;AACxE,MAAM,CAAC,MAAM,uBAAuB,GAA0B;IAC5D,QAAQ,EAAE,6CAA6C;IACvD,eAAe,EAAE,4CAA4C;IAC7D,aAAa,EAAE,6CAA6C;IAC5D,aAAa,EAAE,kDAAkD;IACjE,kBAAkB,EAChB,8DAA8D;IAChE,gBAAgB,EACd,8DAA8D;IAChE,cAAc,EAAE,kCAAkC;IAClD,gBAAgB,EAAE,gCAAgC;IAClD,SAAS,EACP,2EAA2E;IAC7E,QAAQ,EAAE,6DAA6D;IACvE,QAAQ,EAAE,6CAA6C;CACxD,CAAC;AAEF,gEAAgE;AAChE,MAAM,CAAC,MAAM,uBAAuB,GAA0B;IAC5D,UAAU,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE;IAChE,aAAa,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,iBAAiB,EAAE;IACvE,YAAY,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE;CACjD,CAAC;AAEF,4EAA4E;AAC5E,MAAM,CAAC,MAAM,wBAAwB,GAA2B;IAC9D,UAAU,EAAE,aAAa;IACzB,QAAQ,EAAE,WAAW;IACrB,QAAQ,EAAE,oBAAoB;IAC9B,kBAAkB,EAAE,4BAA4B;CACjD,CAAC"}

package/lib/projection/core/projectionSamples.d.ts

@@ -1,3 +1,4 @@
+import type { OverlaySampleShape } from '../../overlay/core/overlayMarks.ts';
 /** One line of the card that appears when the pointer rests on a sample. */
 export interface ProjectionField {
     /** What the value is. */
@@ -5,45 +6,70 @@ export interface ProjectionField {
     /** The value, already written out. */
     value: string;
 }
-/** Who the rows are: what they are called, what they belong to, what is known. */
-export interface ProjectionSamples {
+/**
+ * One way of sorting the rows into groups — a species, a batch, the cluster a
+ * run put each sample in.
+ */
+export interface ProjectionGrouping {
     /**
-     * A stable name per row, in the score matrix's row order. It is the currency
-     * of the selection callbacks, so a caller never has to keep a second index.
+     * What the options name it by, e.g. `species`. It is kept apart from the
+     * label so that a saved choice still finds the grouping once its label is
+     * reworded, and it may not be `none`, which is the word for no grouping.
      */
-    ids: readonly string[];
+    id: string;
+    /** What the set of groups is called, for the key and the hover card: `Species`. */
+    label: string;
     /**
-     * What each row belongs to — a species, a batch, a cluster. A row with no
+     * Which group each row is in, in the score matrix's row order. A row with no
      * group is drawn in the muted ink and left out of every outline.
-     * @default undefined — every row is one crowd
      */
-    groups?: ReadonlyArray<string | undefined>;
+    groups: ReadonlyArray<string | undefined>;
     /**
-     * The order the groups are listed and coloured in.
+     * The order the groups are listed, coloured and shaped in.
      * @default the order the groups first appear in `groups`
      */
-    groupOrder?: readonly string[];
-    /**
-     * What the set of groups is called, for the legend's heading and the hover
-     * card — `Species`, `Cluster`, `Batch`.
-     * @default 'Group'
-     */
-    groupLabel?: string;
+    order?: readonly string[];
     /**
      * A colour per group. Anything not named here takes the next unused colour
      * of the shared palette, so two groups never share one.
      * @default undefined — every group is coloured from the palette
      */
-    groupColors?: Readonly<Record<string, string>>;
+    colors?: Readonly<Record<string, string>>;
+}
+/** Who the rows are: what they are called, what they belong to, what is known. */
+export interface ProjectionSamples {
+    /**
+     * A stable key per row, in the score matrix's row order. It is the currency
+     * of the selection callbacks, so a caller never has to keep a second index.
+     */
+    ids: readonly string[];
+    /**
+     * What each row is written as: the title of its hover card and the name
+     * beside its dot. A page whose keys are not names a reader should read — a
+     * database id, a spectrum's uuid — writes its names here and keeps `ids`
+     * stable, and two samples may then share a name without either becoming
+     * impossible to select.
+     * @default the ids
+     */
+    labels?: readonly string[];
+    /**
+     * The ways the rows are grouped. The first colours the dots until the reader
+     * picks another, and the next one gives them their shapes, so two groupings
+     * of the same samples — the clusters a run found and the classes the reader
+     * gave — are compared on one picture. Every one of them is written on the
+     * hover card.
+     * @default undefined — every row is one crowd
+     */
+    groupings?: readonly ProjectionGrouping[];
     /**
      * Everything else worth showing about one row. A callback rather than an
      * array, so a table of ten thousand rows builds one record when a reader
      * points at one row, and none otherwise.
-     * @default undefined — the card shows the id, the group and the two axes
+     * @default undefined — the card shows the id, the groups and the two axes
      */
     fields?: (index: number) => readonly ProjectionField[];
 }
-/** The groups as the viewer draws them, resolved once per change. */
+/** The grouping that colours the dots, as the viewer draws it. */
 export interface ResolvedProjectionGroups {
     /** What the set of groups is called. */
     label: string;
@@ -61,17 +87,22 @@ export interface ResolvedProjectionGroups {
     /** Which group each row is in, as an index into `entries`, or `-1`. */
     groupOf: Int32Array;
 }
-/**
- * The groups a set of samples has, in a shape a legend and a plot can both
- * read.
- *
- * A group named in `groupOrder` but held by no row is kept, so a legend does
- * not reshuffle when a filter empties one; a row naming a group that is not in
- * `groupOrder` is appended in the order it appears.
- * @param samples - Who the rows are.
- * @param count - How many rows there are, which is the score matrix's height.
- * @returns The resolved groups. A set of samples with no `groups` gives no
- * entries at all, and every row lands at `-1`.
- */
-export declare function resolveProjectionGroups(samples: ProjectionSamples, count: number): ResolvedProjectionGroups;
+/** The grouping that shapes the dots, as the viewer draws it. */
+export interface ResolvedProjectionShapes {
+    /** What the set of groups is called. */
+    label: string;
+    /** The groups, in the order they are listed and given their shapes. */
+    entries: ReadonlyArray<{
+        /** The group's own name, which is also its id. */
+        id: string;
+        /** What it is called. */
+        label: string;
+        /** Its shape. */
+        shape: OverlaySampleShape;
+        /** How many rows are in it. */
+        count: number;
+    }>;
+    /** Which group each row is in, as an index into `entries`, or `-1`. */
+    shapeOf: Int32Array;
+}
 //# sourceMappingURL=projectionSamples.d.ts.map

package/lib/projection/core/projectionSamples.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"projectionSamples.d.ts","sourceRoot":"","sources":["../../../src/projection/core/projectionSamples.ts"],"names":[],"mappings":"AAKA,4EAA4E;AAC5E,MAAM,WAAW,eAAe;IAC9B,yBAAyB;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,sCAAsC;IACtC,KAAK,EAAE,MAAM,CAAC;CACf;AAED,kFAAkF;AAClF,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,GAAG,EAAE,SAAS,MAAM,EAAE,CAAC;IACvB;;;;OAIG;IACH,MAAM,CAAC,EAAE,aAAa,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC3C;;;OAGG;IACH,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC/B;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;OAIG;IACH,WAAW,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC/C;;;;;OAKG;IACH,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,SAAS,eAAe,EAAE,CAAC;CACxD;AAED,qEAAqE;AACrE,MAAM,WAAW,wBAAwB;IACvC,wCAAwC;IACxC,KAAK,EAAE,MAAM,CAAC;IACd,6DAA6D;IAC7D,OAAO,EAAE,aAAa,CAAC;QACrB,kDAAkD;QAClD,EAAE,EAAE,MAAM,CAAC;QACX,sFAAsF;QACtF,KAAK,EAAE,MAAM,CAAC;QACd,kBAAkB;QAClB,KAAK,EAAE,MAAM,CAAC;QACd,+BAA+B;QAC/B,KAAK,EAAE,MAAM,CAAC;KACf,CAAC,CAAC;IACH,uEAAuE;IACvE,OAAO,EAAE,UAAU,CAAC;CACrB;AAYD;;;;;;;;;;;GAWG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,iBAAiB,EAC1B,KAAK,EAAE,MAAM,GACZ,wBAAwB,CAwB1B"}
+{"version":3,"file":"projectionSamples.d.ts","sourceRoot":"","sources":["../../../src/projection/core/projectionSamples.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAE7E,4EAA4E;AAC5E,MAAM,WAAW,eAAe;IAC9B,yBAAyB;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,sCAAsC;IACtC,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;;OAIG;IACH,EAAE,EAAE,MAAM,CAAC;IACX,mFAAmF;IACnF,KAAK,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,MAAM,EAAE,aAAa,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC1C;;;OAGG;IACH,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1B;;;;OAIG;IACH,MAAM,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CAC3C;AAED,kFAAkF;AAClF,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,GAAG,EAAE,SAAS,MAAM,EAAE,CAAC;IACvB;;;;;;;OAOG;IACH,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC3B;;;;;;;OAOG;IACH,SAAS,CAAC,EAAE,SAAS,kBAAkB,EAAE,CAAC;IAC1C;;;;;OAKG;IACH,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,SAAS,eAAe,EAAE,CAAC;CACxD;AAED,kEAAkE;AAClE,MAAM,WAAW,wBAAwB;IACvC,wCAAwC;IACxC,KAAK,EAAE,MAAM,CAAC;IACd,6DAA6D;IAC7D,OAAO,EAAE,aAAa,CAAC;QACrB,kDAAkD;QAClD,EAAE,EAAE,MAAM,CAAC;QACX,sFAAsF;QACtF,KAAK,EAAE,MAAM,CAAC;QACd,kBAAkB;QAClB,KAAK,EAAE,MAAM,CAAC;QACd,+BAA+B;QAC/B,KAAK,EAAE,MAAM,CAAC;KACf,CAAC,CAAC;IACH,uEAAuE;IACvE,OAAO,EAAE,UAAU,CAAC;CACrB;AAED,iEAAiE;AACjE,MAAM,WAAW,wBAAwB;IACvC,wCAAwC;IACxC,KAAK,EAAE,MAAM,CAAC;IACd,uEAAuE;IACvE,OAAO,EAAE,aAAa,CAAC;QACrB,kDAAkD;QAClD,EAAE,EAAE,MAAM,CAAC;QACX,yBAAyB;QACzB,KAAK,EAAE,MAAM,CAAC;QACd,iBAAiB;QACjB,KAAK,EAAE,kBAAkB,CAAC;QAC1B,+BAA+B;QAC/B,KAAK,EAAE,MAAM,CAAC;KACf,CAAC,CAAC;IACH,uEAAuE;IACvE,OAAO,EAAE,UAAU,CAAC;CACrB"}

package/lib/projection/core/projectionSamples.js

@@ -1,81 +1,2 @@
-import { CHART_SERIES_COLORS, chartSeriesColor, } from "../../chart/core/chartPalette.js";
-const NO_GROUP = -1;
-const DEFAULT_GROUP_LABEL = 'Group';
-/**
- * The groups a set of samples has, in a shape a legend and a plot can both
- * read.
- *
- * A group named in `groupOrder` but held by no row is kept, so a legend does
- * not reshuffle when a filter empties one; a row naming a group that is not in
- * `groupOrder` is appended in the order it appears.
- * @param samples - Who the rows are.
- * @param count - How many rows there are, which is the score matrix's height.
- * @returns The resolved groups. A set of samples with no `groups` gives no
- * entries at all, and every row lands at `-1`.
- */
-export function resolveProjectionGroups(samples, count) {
-    const rowCount = Number.isFinite(count) ? Math.max(0, Math.floor(count)) : 0;
-    const label = samples.groupLabel ?? DEFAULT_GROUP_LABEL;
-    const groupOf = new Int32Array(rowCount).fill(NO_GROUP);
-    const { groups, groupColors, groupOrder } = samples;
-    if (groups === undefined)
-        return { label, entries: [], groupOf };
-    const entries = [];
-    const indexOfGroup = new Map();
-    if (groupOrder !== undefined) {
-        for (const id of groupOrder)
-            appendGroup(entries, indexOfGroup, id);
-    }
-    for (let row = 0; row < rowCount; row++) {
-        const id = groups[row];
-        if (id === undefined)
-            continue;
-        const at = appendGroup(entries, indexOfGroup, id);
-        groupOf[row] = at;
-        const entry = entries[at];
-        if (entry !== undefined)
-            entry.count++;
-    }
-    paintGroups(entries, groupColors);
-    return { label, entries, groupOf };
-}
-function appendGroup(entries, indexOfGroup, id) {
-    const known = indexOfGroup.get(id);
-    if (known !== undefined)
-        return known;
-    const at = entries.length;
-    indexOfGroup.set(id, at);
-    entries.push({ id, label: id, color: '', count: 0 });
-    return at;
-}
-function paintGroups(entries, pinned) {
-    // Every pinned colour is taken out of the palette before any group draws
-    // from it, so pinning the third group's hue onto the first does not leave
-    // two groups wearing it.
-    const taken = new Set();
-    if (pinned !== undefined) {
-        for (const entry of entries) {
-            const color = pinned[entry.id];
-            if (color !== undefined)
-                taken.add(color.toLowerCase());
-        }
-    }
-    let cursor = 0;
-    for (const entry of entries) {
-        const own = pinned?.[entry.id];
-        if (own !== undefined) {
-            entry.color = own;
-            continue;
-        }
-        let color = chartSeriesColor(cursor, 'group');
-        while (cursor < CHART_SERIES_COLORS.length &&
-            taken.has(color.toLowerCase())) {
-            cursor++;
-            color = chartSeriesColor(cursor, 'group');
-        }
-        cursor++;
-        taken.add(color.toLowerCase());
-        entry.color = color;
-    }
-}
+export {};
 //# sourceMappingURL=projectionSamples.js.map

package/lib/projection/core/projectionSamples.js.map

@@ -1 +1 @@
-{"version":3,"file":"projectionSamples.js","sourceRoot":"","sources":["../../../src/projection/core/projectionSamples.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"projectionSamples.js","sourceRoot":"","sources":["../../../src/projection/core/projectionSamples.ts"],"names":[],"mappings":""}

package/lib/projection/core/projectionStrings.d.ts

@@ -90,6 +90,8 @@ export interface ProjectionBarWords {
     };
     /** What "the colour stands for nothing" reads. */
     uncoloured: string;
+    /** What "the shape stands for nothing" reads. */
+    unshaped: string;
     /** What "no outlines at all" reads where there is no room for a sentence. */
     noOutlines: string;
     /** What the settings gathered into one chip are called together. */

package/lib/projection/core/projectionStrings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"projectionStrings.d.ts","sourceRoot":"","sources":["../../../src/projection/core/projectionStrings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,uBAAuB,EACxB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,4EAA4E;AAC5E,MAAM,WAAW,qBAAqB;IACpC,gDAAgD;IAChD,IAAI,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,cAAc;IAC7B,gFAAgF;IAChF,KAAK,EAAE,MAAM,CAAC;IACd,6CAA6C;IAC7C,IAAI,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,OAAO,CAAC,EAAE,qBAAqB,CAAC;CACjC;AAED;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,EAAE,MAAM,CAAC,kBAAkB,EAAE,cAAc,CAqFtE,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,aAAa,EAAE,MAAM,CAM9D,CAAC;AAEF,mDAAmD;AACnD,MAAM,WAAW,kBAAkB;IACjC;;;;;OAKG;IACH,GAAG,EAAE;QACH,8CAA8C;QAC9C,OAAO,EAAE,MAAM,CAAC;QAChB,0DAA0D;QAC1D,OAAO,EAAE,MAAM,CAAC;QAChB,mDAAmD;QACnD,YAAY,EAAE,MAAM,CAAC;QACrB,8DAA8D;QAC9D,SAAS,EAAE,MAAM,CAAC;QAClB,8DAA8D;QAC9D,aAAa,EAAE,MAAM,CAAC;QACtB,sEAAsE;QACtE,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;IACF;;;;;;;OAOG;IACH,QAAQ,EAAE;QACR,mEAAmE;QACnE,eAAe,EAAE,MAAM,CAAC;QACxB,gEAAgE;QAChE,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,kDAAkD;IAClD,UAAU,EAAE,MAAM,CAAC;IACnB,6EAA6E;IAC7E,UAAU,EAAE,MAAM,CAAC;IACnB,oEAAoE;IACpE,QAAQ,EAAE,MAAM,CAAC;IACjB;;;;;;OAMG;IACH,IAAI,EAAE,MAAM,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAAC;CAC/C;AAED,uEAAuE;AACvE,eAAO,MAAM,oBAAoB,EAAE,kBAsBlC,CAAC"}
+{"version":3,"file":"projectionStrings.d.ts","sourceRoot":"","sources":["../../../src/projection/core/projectionStrings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,uBAAuB,EACxB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,4EAA4E;AAC5E,MAAM,WAAW,qBAAqB;IACpC,gDAAgD;IAChD,IAAI,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,cAAc;IAC7B,gFAAgF;IAChF,KAAK,EAAE,MAAM,CAAC;IACd,6CAA6C;IAC7C,IAAI,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,OAAO,CAAC,EAAE,qBAAqB,CAAC;CACjC;AAED;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,EAAE,MAAM,CAAC,kBAAkB,EAAE,cAAc,CA6FtE,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,aAAa,EAAE,MAAM,CAM9D,CAAC;AAEF,mDAAmD;AACnD,MAAM,WAAW,kBAAkB;IACjC;;;;;OAKG;IACH,GAAG,EAAE;QACH,8CAA8C;QAC9C,OAAO,EAAE,MAAM,CAAC;QAChB,0DAA0D;QAC1D,OAAO,EAAE,MAAM,CAAC;QAChB,mDAAmD;QACnD,YAAY,EAAE,MAAM,CAAC;QACrB,8DAA8D;QAC9D,SAAS,EAAE,MAAM,CAAC;QAClB,8DAA8D;QAC9D,aAAa,EAAE,MAAM,CAAC;QACtB,sEAAsE;QACtE,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;IACF;;;;;;;OAOG;IACH,QAAQ,EAAE;QACR,mEAAmE;QACnE,eAAe,EAAE,MAAM,CAAC;QACxB,gEAAgE;QAChE,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,kDAAkD;IAClD,UAAU,EAAE,MAAM,CAAC;IACnB,iDAAiD;IACjD,QAAQ,EAAE,MAAM,CAAC;IACjB,6EAA6E;IAC7E,UAAU,EAAE,MAAM,CAAC;IACnB,oEAAoE;IACpE,QAAQ,EAAE,MAAM,CAAC;IACjB;;;;;;OAMG;IACH,IAAI,EAAE,MAAM,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAAC;CAC/C;AAED,uEAAuE;AACvE,eAAO,MAAM,oBAAoB,EAAE,kBAuBlC,CAAC"}

package/lib/projection/core/projectionStrings.js

@@ -26,6 +26,14 @@ export const PROJECTION_HELP = {
         title: 'Colour by',
         body: 'What a dot’s colour stands for. Colouring by nothing is useful when the groups are what you are trying to find rather than what you already know.',
     },
+    shapeBy: {
+        title: 'Shape by',
+        body: 'What a dot’s shape stands for. With colour for one grouping and shape for another, you see at a glance where two ways of sorting the same samples disagree — the clusters a run found against the classes you gave. Past five groups the shapes stop being told apart, so a grouping that large is not offered.',
+        example: {
+            code: 'Colour = cluster · Shape = class',
+            note: 'A square among circles of the same colour is a sample the clustering put with another class.',
+        },
+    },
     ellipse: {
         title: 'Group outlines',
         body: 'Each outline is drawn to cover about that share of its group’s samples, assuming the group is roughly bell-shaped. It is a summary of where a group sits, not a boundary.',
@@ -51,7 +59,7 @@ export const PROJECTION_HELP = {
         body: 'Writes every sample’s own name beside its dot. It is what turns a dot sitting on its own into something you can go and look up. In a crowd there is only room for some of the names, so the ones that do not fit are left out rather than written over each other.',
         example: {
             code: '0326_3a',
-            note: 'The name is whatever you handed in as the sample’s id, so it is the one you can find again in your own files.',
+            note: 'The name is the one the sample was loaded with, so it is the one you can find again in your own files.',
         },
     },
     pairCount: {
@@ -120,6 +128,7 @@ export const PROJECTION_BAR_WORDS = {
         showIds: 'Show sample ID',
     },
     uncoloured: 'Nothing',
+    unshaped: 'Nothing',
     noOutlines: 'None',
     settings: 'How this is drawn',
     view: {

package/lib/projection/core/projectionStrings.js.map

@@ -1 +1 @@
-{"version":3,"file":"projectionStrings.js","sourceRoot":"","sources":["../../../src/projection/core/projectionStrings.ts"],"names":[],"mappings":"AA4CA;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,eAAe,GAA+C;IACzE,KAAK,EAAE;QACL,KAAK,EAAE,QAAQ;QACf,IAAI,EAAE,iFAAiF;KACxF;IACD,KAAK,EAAE;QACL,KAAK,EAAE,IAAI;QACX,IAAI,EAAE,iDAAiD;KACxD;IACD,KAAK,EAAE;QACL,KAAK,EAAE,MAAM;QACb,IAAI,EAAE,iIAAiI;KACxI;IACD,YAAY,EAAE;QACZ,KAAK,EAAE,WAAW;QAClB,IAAI,EAAE,oJAAoJ;KAC3J;IACD,OAAO,EAAE;QACP,KAAK,EAAE,WAAW;QAClB,IAAI,EAAE,mJAAmJ;KAC1J;IACD,OAAO,EAAE;QACP,KAAK,EAAE,gBAAgB;QACvB,IAAI,EAAE,2KAA2K;QACjL,OAAO,EAAE;YACP,IAAI,EAAE,gBAAgB;YACtB,IAAI,EAAE,oIAAoI;SAC3I;KACF;IACD,WAAW,EAAE;QACX,KAAK,EAAE,UAAU;QACjB,IAAI,EAAE,8EAA8E;KACrF;IACD,cAAc,EAAE;QACd,KAAK,EAAE,gBAAgB;QACvB,IAAI,EAAE,4HAA4H;KACnI;IACD,eAAe,EAAE;QACf,KAAK,EAAE,gBAAgB;QACvB,IAAI,EAAE,4WAA4W;KACnX;IACD,OAAO,EAAE;QACP,KAAK,EAAE,cAAc;QACrB,IAAI,EAAE,oQAAoQ;QAC1Q,OAAO,EAAE;YACP,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,+GAA+G;SACtH;KACF;IACD,SAAS,EAAE;QACT,KAAK,EAAE,YAAY;QACnB,IAAI,EAAE,yJAAyJ;KAChK;IACD,aAAa,EAAE;QACb,KAAK,EAAE,MAAM;QACb,IAAI,EAAE,yLAAyL;KAChM;IACD,cAAc,EAAE;QACd,KAAK,EAAE,QAAQ;QACf,IAAI,EAAE,wFAAwF;KAC/F;IACD,WAAW,EAAE;QACX,KAAK,EAAE,mBAAmB;QAC1B,IAAI,EAAE,mMAAmM;KAC1M;IACD,WAAW,EAAE;QACX,KAAK,EAAE,gBAAgB;QACvB,IAAI,EAAE,6HAA6H;KACpI;IACD,MAAM,EAAE;QACN,KAAK,EAAE,SAAS;QAChB,IAAI,EAAE,yIAAyI;KAChJ;IACD,aAAa,EAAE;QACb,KAAK,EAAE,WAAW;QAClB,IAAI,EAAE,yJAAyJ;KAChK;IACD,WAAW,EAAE;QACX,KAAK,EAAE,QAAQ;QACf,IAAI,EAAE,4HAA4H;KACnI;IACD,UAAU,EAAE;QACV,KAAK,EAAE,WAAW;QAClB,IAAI,EAAE,mIAAmI;KAC1I;CACF,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAkC;IACjE,GAAG,EAAE,KAAK;IACV,KAAK,EAAE,IAAI;IACX,KAAK,EAAE,OAAO;IACd,SAAS,EAAE,SAAS;IACpB,MAAM,EAAE,UAAU;CACnB,CAAC;AAsDF,uEAAuE;AACvE,MAAM,CAAC,MAAM,oBAAoB,GAAuB;IACtD,GAAG,EAAE;QACH,OAAO,EAAE,QAAQ;QACjB,OAAO,EAAE,UAAU;QACnB,YAAY,EAAE,MAAM;QACpB,SAAS,EAAE,YAAY;QACvB,aAAa,EAAE,MAAM;QACrB,WAAW,EAAE,QAAQ;KACtB;IACD,QAAQ,EAAE;QACR,eAAe,EAAE,eAAe;QAChC,OAAO,EAAE,gBAAgB;KAC1B;IACD,UAAU,EAAE,SAAS;IACrB,UAAU,EAAE,MAAM;IAClB,QAAQ,EAAE,mBAAmB;IAC7B,IAAI,EAAE;QACJ,MAAM,EAAE,oBAAoB;QAC5B,OAAO,EAAE,SAAS;QAClB,QAAQ,EAAE,uBAAuB;QACjC,MAAM,EAAE,iBAAiB;KAC1B;CACF,CAAC"}
+{"version":3,"file":"projectionStrings.js","sourceRoot":"","sources":["../../../src/projection/core/projectionStrings.ts"],"names":[],"mappings":"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"}

package/lib/projection/core/resolveProjectionOptions.d.ts

@@ -1,5 +1,6 @@
 import type { ProjectionOptions } from './projectionOptions.ts';
 import type { ProjectionResult } from './projectionResult.ts';
+import type { ProjectionGrouping } from './projectionSamples.ts';
 /**
  * The options the viewer will use, with a caller's overrides merged in and
  * every one of them made safe against the result that actually came back.
@@ -7,11 +8,15 @@ import type { ProjectionResult } from './projectionResult.ts';
  * A saved option outlives the data it was made on: reload with fewer samples
  * and axis eight no longer exists. Rather than let a plot ask for a column
  * that is not there, the two axes are pulled back inside what was computed and
- * kept apart, the counts are held inside what exists, and a view whose data is
- * missing falls back to `weights`.
+ * kept apart, the counts are held inside what exists, a view whose data is
+ * missing falls back to `weights`, and the colour and the shape name groupings
+ * the samples actually carry.
  * @param overrides - What the caller asked for.
  * @param result - The reduced space the options will be applied to.
+ * @param groupings - The groupings the samples carry.
+ * @default undefined — the colour and the shape are left as they were asked
+ * for, since nothing says which groupings exist
  * @returns Every option, complete and safe.
  */
-export declare function resolveProjectionOptions(overrides: Partial<ProjectionOptions> | undefined, result: ProjectionResult): ProjectionOptions;
+export declare function resolveProjectionOptions(overrides: Partial<ProjectionOptions> | undefined, result: ProjectionResult, groupings?: readonly ProjectionGrouping[]): ProjectionOptions;
 //# sourceMappingURL=resolveProjectionOptions.d.ts.map

package/lib/projection/core/resolveProjectionOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolveProjectionOptions.d.ts","sourceRoot":"","sources":["../../../src/projection/core/resolveProjectionOptions.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAEV,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAG9D;;;;;;;;;;;;GAYG;AACH,wBAAgB,wBAAwB,CACtC,SAAS,EAAE,OAAO,CAAC,iBAAiB,CAAC,GAAG,SAAS,EACjD,MAAM,EAAE,gBAAgB,GACvB,iBAAiB,CA+CnB"}
+{"version":3,"file":"resolveProjectionOptions.d.ts","sourceRoot":"","sources":["../../../src/projection/core/resolveProjectionOptions.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAEV,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAKhC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAGjE;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,wBAAwB,CACtC,SAAS,EAAE,OAAO,CAAC,iBAAiB,CAAC,GAAG,SAAS,EACjD,MAAM,EAAE,gBAAgB,EACxB,SAAS,CAAC,EAAE,SAAS,kBAAkB,EAAE,GACxC,iBAAiB,CAiDnB"}