@fasl-work/caos-app-shell 0.7.1 → 0.7.2

package/dist/chart.d.ts

@@ -50,8 +50,8 @@ interface UPlotChartProps {
  * its longest tick label, so no tick is cut; the cursor value is written into a readout row under the plot instead of
  * uPlot's legend, which a sized host clips (known shell defect 3). A chart of two or more series keys every series
  * under the plot, always (its colour, a dashed or a dotted swatch, its label): at rest the readout names none of them
- * (known shell defect 17). The host declares `data-series`, `data-axis-titles`, `data-ticks-cut` and `data-drawn` for
- * the gate.
+ * (known shell defect 17). An axis with fixed decimals ticks only where its labels differ (`tickSteps`). The host
+ * declares `data-series`, `data-axis-titles`, `data-ticks-cut`, `data-ticks-repeat` and `data-drawn` for the gate.
  */
 declare function UPlotChart({ x, y, series, marks, height, onCursor }: UPlotChartProps): react.JSX.Element;
 

package/dist/chart.js

@@ -5,6 +5,18 @@ import uPlot from 'uplot';
 import { jsxs, jsx } from 'react/jsx-runtime';
 
 var ROTATION = ["--color-accent", "--color-magenta", "--color-accent-2", "--color-good", "--color-warn", "--color-bad"];
+var STEPS = [];
+for (let e = -16; e <= 16; e++) for (const m of [1, 2, 2.5, 5]) STEPS.push(Number((m * 10 ** e).toPrecision(3)));
+function tickSteps(fmt) {
+  if (!fmt || fmt.decimals === void 0) return void 0;
+  const res = 10 ** -fmt.decimals / (fmt.percent ? 100 : 1);
+  return STEPS.filter((s) => s >= res * (1 - 1e-9) && Math.abs(s / res - Math.round(s / res)) < 1e-6);
+}
+function repeatedLabels(labels) {
+  let n = 0;
+  for (let i = 1; i < labels.length; i++) if (labels[i] && labels[i] === labels[i - 1]) n++;
+  return n;
+}
 function UPlotChart({ x, y, series, marks, height = 280, onCursor }) {
   const lang = useShellLang();
   const theme = useThemeStore((s) => s.theme);
@@ -21,6 +33,7 @@ function UPlotChart({ x, y, series, marks, height = 280, onCursor }) {
   const width = box.width;
   const h = fill ? box.height : height;
   const uRef = useRef(null);
+  const hostRef = useRef(null);
   const [cursor, setCursor] = useState(null);
   const onCursorRef = useRef(onCursor);
   onCursorRef.current = onCursor;
@@ -45,7 +58,15 @@ function UPlotChart({ x, y, series, marks, height = 280, onCursor }) {
     const fg = resolveToken("--color-fg-subtle", "#888");
     const grid = resolveToken("--color-border", "#ccc");
     const font = `11px ${resolveToken("--font-sans", "sans-serif")}`;
-    const tick = (fmt) => (_u, vals) => vals.map((v) => v === null || v === void 0 ? "" : formatNumber(v, lang, fmt ?? { digits: 4 }));
+    const repeats = { x: 0, y: 0 };
+    const tick = (fmt, axis) => (_u, vals) => {
+      const labels = vals.map((v) => v === null || v === void 0 ? "" : formatNumber(v, lang, fmt ?? { digits: 4 }));
+      repeats[axis] = repeatedLabels(labels);
+      hostRef.current?.setAttribute("data-ticks-repeat", String(repeats.x + repeats.y));
+      return labels;
+    };
+    const xSteps = x.time ? void 0 : tickSteps(x.format);
+    const ySteps = y.log ? void 0 : tickSteps(y.format);
     const opts = {
       width,
       height: h,
@@ -59,7 +80,8 @@ function UPlotChart({ x, y, series, marks, height = 280, onCursor }) {
           font,
           label: xUnit ? `${xLabel} (${xUnit})` : xLabel,
           labelFont: font,
-          values: x.time ? void 0 : tick(x.format)
+          values: x.time ? void 0 : tick(x.format, "x"),
+          ...xSteps ? { incrs: xSteps } : {}
         },
         {
           stroke: fg,
@@ -68,7 +90,8 @@ function UPlotChart({ x, y, series, marks, height = 280, onCursor }) {
           font,
           label: yUnit ? `${yLabel} (${yUnit})` : yLabel,
           labelFont: font,
-          values: tick(y.format),
+          values: tick(y.format, "y"),
+          ...ySteps ? { incrs: ySteps } : {},
           size: (u, values) => {
             if (!values || values.length === 0) return 48;
             u.ctx.font = font;
@@ -133,10 +156,12 @@ function UPlotChart({ x, y, series, marks, height = 280, onCursor }) {
   return /* @__PURE__ */ jsxs(
     "div",
     {
+      ref: hostRef,
       className: fill ? "caos-chart fill" : "caos-chart",
       "data-series": series.length,
       "data-axis-titles": `${xLabel}|${yLabel}`,
       "data-ticks-cut": "0",
+      "data-ticks-repeat": "0",
       "data-drawn": width > 0 && h > 0 ? "1" : "0",
       children: [
         /* @__PURE__ */ jsx("div", { ref: setPlot, className: "caos-chart-plot" }),

package/gate/inpage.mjs

@@ -276,6 +276,10 @@ export function installLib() {
       pageText: pageBody ? (pageBody.innerText || '').trim().length : 0,
       referenceLists: [...document.querySelectorAll('.reference-list')].filter(visible).length,
       uncaptioned: [...document.querySelectorAll('.equation')].filter((e) => visible(e) && !e.querySelector('.equation-caption')).length,
+      // charts whose axis gives a tick the label of the tick before it (UPlotChart declares data-ticks-repeat)
+      repeatedTicks: [...document.querySelectorAll('[data-ticks-repeat]')]
+        .filter((el) => visible(el) && Number(el.getAttribute('data-ticks-repeat')) > 0)
+        .map((el) => ({ label: describe(el.closest('[data-plot]') || el), n: Number(el.getAttribute('data-ticks-repeat')) })),
       sectionsWithoutRefs: [...document.querySelectorAll('[data-no-refs-reason="missing"]')].filter(visible).length,
     };
   };

package/gate/run.mjs

@@ -345,6 +345,9 @@ export async function runGate(o) {
     if (f.offCentre !== null && f.offCentre > 2) fail('ADR-0017.1', where, `the prose page is off-centre by ${f.offCentre.toFixed(1)}px`);
     if (f.referenceLists) fail('ADR-0017.4', where, `${f.referenceLists} bibliography dump(s); references belong at the end of each section`);
     if (f.uncaptioned) fail('ADR-0017.2', where, `${f.uncaptioned} equation(s) without a caption`);
+    for (const r of f.repeatedTicks ?? []) {
+      fail('G6', where, `${r.label}: ${r.n} axis tick label(s) repeat the label before them (give the axis fixed decimals)`);
+    }
     if (f.sectionsWithoutRefs) fail('ADR-0017.4', where, `${f.sectionsWithoutRefs} section(s) end without references or a stated reason`);
     if (s.first && !s.isWorkbench && f.pageText < opt.textFloor) fail('G4', where, `the page body holds ${f.pageText} characters of text (floor ${opt.textFloor}); the route rendered without its content`);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fasl-work/caos-app-shell",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "Shared web-app shell, workbench primitives, content primitives, design system and measured gate for the CAOS / Faena public apps (ADR-0016, ADR-0017, ADR-0071).",
   "license": "MIT",
   "author": "Felipe Santibáñez-Leal",