@pixerate/editor 0.258.0 → 0.260.0

package/dist/{brushstrokeRender-MQ6PSDM5.cjs → brushstrokeRender-N6UPZSQS.cjs}

@@ -1,9 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
-var _chunkIPUTIUGQcjs = require('./chunk-IPUTIUGQ.cjs');
-
-
-var _chunkA2IS7EHEcjs = require('./chunk-A2IS7EHE.cjs');
+var _chunkUVZ7RQOEcjs = require('./chunk-UVZ7RQOE.cjs');
 
 
 
@@ -14,13 +11,16 @@ var _chunkA2IS7EHEcjs = require('./chunk-A2IS7EHE.cjs');
 
 
 
-var _chunkRSIKDWOPcjs = require('./chunk-RSIKDWOP.cjs');
+var _chunkTZOX7KWVcjs = require('./chunk-TZOX7KWV.cjs');
 require('./chunk-JSDND7DF.cjs');
 
 
 
 
 var _chunkNM3G4VQTcjs = require('./chunk-NM3G4VQT.cjs');
+
+
+var _chunkA2IS7EHEcjs = require('./chunk-A2IS7EHE.cjs');
 require('./chunk-U67EN7GG.cjs');
 require('./chunk-WOFXZ3XU.cjs');
 
@@ -38,27 +38,37 @@ require('./chunk-2VX55NFM.cjs');
 require('./chunk-474IQG74.cjs');
 require('./chunk-XFM3OCHU.cjs');
 
+
+var _chunkMLLTWAXHcjs = require('./chunk-MLLTWAXH.cjs');
+require('./chunk-SXQHWXEL.cjs');
+require('./chunk-5UEFBM2M.cjs');
+require('./chunk-IPJ3TEYR.cjs');
+
 // src/canvas/brushstrokeRender.ts
-var PRESETS = _chunkRSIKDWOPcjs.listPresets.call(void 0, _chunkRSIKDWOPcjs.CANVAS_PROFILE).map((spec) => _chunkRSIKDWOPcjs.BUILTIN_BRUSHES.find((b) => b.id === spec.id));
+var PRESETS = _chunkTZOX7KWVcjs.listPresets.call(void 0, _chunkTZOX7KWVcjs.CANVAS_PROFILE).map((spec) => _chunkTZOX7KWVcjs.BUILTIN_BRUSHES.find((b) => b.id === spec.id));
 var presetIds = () => PRESETS.map((b) => b.id).join(", ");
-var refusal = (brush) => _chunkRSIKDWOPcjs.checkBrush.call(void 0, brush, _chunkRSIKDWOPcjs.CANVAS_PROFILE).issues.filter((i) => i.severity === "error").map((i) => `${i.reason} ${i.fix}`).join(" ");
+var refusal = (brush) => _chunkTZOX7KWVcjs.checkBrush.call(void 0, brush, _chunkTZOX7KWVcjs.CANVAS_PROFILE).issues.filter((i) => i.severity === "error").map((i) => `${i.reason} ${i.fix}`).join(" ");
 function readCanvasBrushSpec(spec) {
   let brush;
   try {
-    brush = _chunkRSIKDWOPcjs.normalizeBrushSpec.call(void 0, spec);
+    brush = _chunkTZOX7KWVcjs.normalizeBrushSpec.call(void 0, spec);
   } catch (e) {
     throw new Error(`Not a brush: ${e.message}`);
   }
-  if (!_chunkRSIKDWOPcjs.checkBrush.call(void 0, brush, _chunkRSIKDWOPcjs.CANVAS_PROFILE).ok) throw new Error(`Brush '${brush.id}' (${brush.name}) can't brush a canvas stroke: ${refusal(brush)}`);
+  if (!_chunkTZOX7KWVcjs.checkBrush.call(void 0, brush, _chunkTZOX7KWVcjs.CANVAS_PROFILE).ok) throw new Error(`Brush '${brush.id}' (${brush.name}) can't brush a canvas stroke: ${refusal(brush)}`);
   return brush;
 }
 function listCanvasBrushes(user = []) {
-  const out = PRESETS.map((b) => ({ id: b.id, name: b.name, category: b.category, size: b.tip.size, builtin: true }));
+  const colourOf = (spec) => {
+    const d = _optionalChain([spec, 'access', _2 => _2.colour, 'optionalAccess', _3 => _3.default]);
+    return typeof d === "string" || _chunkMLLTWAXHcjs.isDualColor.call(void 0, d) ? { defaultColor: d } : {};
+  };
+  const out = PRESETS.map((b) => ({ id: b.id, name: b.name, category: b.category, size: b.tip.size, builtin: true, ...colourOf(_chunkTZOX7KWVcjs.BRUSH_PRESETS.find((p) => p.id === b.id)) }));
   for (const raw of user) {
     try {
       const brush = readCanvasBrushSpec(raw);
       if (out.some((b) => b.id === brush.id)) continue;
-      out.push({ id: brush.id, name: brush.name, category: _chunkRSIKDWOPcjs.resolveCategory.call(void 0, brush), size: _chunkRSIKDWOPcjs.resolveBrush.call(void 0, brush).tip.size, builtin: false, spec: brush });
+      out.push({ id: brush.id, name: brush.name, category: _chunkTZOX7KWVcjs.resolveCategory.call(void 0, brush), size: _chunkTZOX7KWVcjs.resolveBrush.call(void 0, brush).tip.size, builtin: false, spec: brush, ...colourOf(brush) });
     } catch (e2) {
     }
   }
@@ -69,15 +79,15 @@ function resolveCanvasBrush(brush, width, spec) {
   const sized = (b) => given === void 0 ? b : { ...b, tip: { ...b.tip, size: given } };
   if (typeof brush === "string") {
     if (spec !== void 0 && spec !== null) {
-      const saved = _chunkRSIKDWOPcjs.resolveBrush.call(void 0, readCanvasBrushSpec(spec));
+      const saved = _chunkTZOX7KWVcjs.resolveBrush.call(void 0, readCanvasBrushSpec(spec));
       if (!_chunkPXDIAYB6cjs.isBrushstrokeBrush.call(void 0, saved)) throw new Error(`Brush '${saved.id}' (${saved.name}) can't brush a canvas stroke: it is not a dry dab brush.`);
       return sized(saved);
     }
     const preset = PRESETS.find((b) => b.id === brush);
     if (preset) return sized(preset);
-    const other = _chunkRSIKDWOPcjs.BRUSH_PRESETS.find((b) => b.id === brush);
+    const other = _chunkTZOX7KWVcjs.BRUSH_PRESETS.find((b) => b.id === brush);
     if (other) throw new Error(`Brush '${brush}' (${other.name}) can't brush a canvas stroke: ${refusal(other)} Use one of: ${presetIds()}, or a saved brush the canvas can paint.`);
-    throw new Error(`Unknown brush '${brush}'. ${_chunkRSIKDWOPcjs.closest.call(void 0, brush, PRESETS.map((b) => b.id))}Use one of the dry presets (${presetIds()}), a saved brush from the brush library, or tip settings ({ hardness, spacing, flow, \u2026 }).`);
+    throw new Error(`Unknown brush '${brush}'. ${_chunkTZOX7KWVcjs.closest.call(void 0, brush, PRESETS.map((b) => b.id))}Use one of the dry presets (${presetIds()}), a saved brush from the brush library, or tip settings ({ hardness, spacing, flow, \u2026 }).`);
   }
   if (!brush || typeof brush !== "object" || Array.isArray(brush)) {
     throw new Error("A brush is a preset or saved brush id (see listCanvasBrushes / canvas.listBrushes) or an object of tip settings.");
@@ -101,7 +111,7 @@ function shapePaint(shape) {
 }
 function strokeColor(shape) {
   const gradient = _chunkNM3G4VQTcjs.resolveCanvasGradient.call(void 0, _nullishCoalesce(shape.strokeGradient, () => ( shape.stroke)));
-  const css = gradient ? _nullishCoalesce(_optionalChain([gradient, 'access', _2 => _2.stops, 'access', _3 => _3[0], 'optionalAccess', _4 => _4.color]), () => ( "#000")) : typeof shape.stroke === "string" && shape.stroke !== "none" ? shape.stroke : "#000";
+  const css = gradient ? _nullishCoalesce(_optionalChain([gradient, 'access', _4 => _4.stops, 'access', _5 => _5[0], 'optionalAccess', _6 => _6.color]), () => ( "#000")) : typeof shape.stroke === "string" && shape.stroke !== "none" ? shape.stroke : "#000";
   const parsed = _nullishCoalesce(_chunkA2IS7EHEcjs.parseCssColor.call(void 0, css), () => ( { hex: "#000000", alpha: 1 }));
   const n = parseInt(parsed.hex.slice(1), 16);
   return [n >> 16 & 255, n >> 8 & 255, n & 255, Math.round(parsed.alpha * 255)];
@@ -113,14 +123,14 @@ function renderShapeBrushstrokeNow(shape, scale, place = {}) {
   const textured = typeof seed === "number" && Number.isFinite(seed);
   const size = _nullishCoalesce(shape.brush.size, () => ( (textured ? void 0 : _nullishCoalesce(shape.strokeWidth, () => ( 3)))));
   const brush = resolveCanvasBrush(shape.brush.brush, size, shape.brush.spec);
-  const points = _chunkIPUTIUGQcjs.pathDataToPolyline.call(void 0, shape.d);
+  const points = _chunkUVZ7RQOEcjs.pathDataToPolyline.call(void 0, shape.d);
   if (!points.length) return null;
   const { pressure, tiltX, tiltY } = shape.brush;
   const input = {
     points: points.map(([x, y]) => ({ x, y })),
-    ..._optionalChain([pressure, 'optionalAccess', _5 => _5.length]) ? { pressure } : {},
-    ..._optionalChain([tiltX, 'optionalAccess', _6 => _6.length]) ? { tiltX } : {},
-    ..._optionalChain([tiltY, 'optionalAccess', _7 => _7.length]) ? { tiltY } : {}
+    ..._optionalChain([pressure, 'optionalAccess', _7 => _7.length]) ? { pressure } : {},
+    ..._optionalChain([tiltX, 'optionalAccess', _8 => _8.length]) ? { tiltX } : {},
+    ..._optionalChain([tiltY, 'optionalAccess', _9 => _9.length]) ? { tiltY } : {}
   };
   const paint = shapePaint(shape);
   const character = textured ? {
@@ -128,7 +138,7 @@ function renderShapeBrushstrokeNow(shape, scale, place = {}) {
       seed,
       ...shape.brush.paper !== void 0 ? { paper: shape.brush.paper } : {},
       // Whole canvas units: the grain stays put, and tiny drags do not re-render.
-      origin: { x: Math.round(_nullishCoalesce(_optionalChain([place, 'access', _8 => _8.origin, 'optionalAccess', _9 => _9.x]), () => ( 0))), y: Math.round(_nullishCoalesce(_optionalChain([place, 'access', _10 => _10.origin, 'optionalAccess', _11 => _11.y]), () => ( 0))) },
+      origin: { x: Math.round(_nullishCoalesce(_optionalChain([place, 'access', _10 => _10.origin, 'optionalAccess', _11 => _11.x]), () => ( 0))), y: Math.round(_nullishCoalesce(_optionalChain([place, 'access', _12 => _12.origin, 'optionalAccess', _13 => _13.y]), () => ( 0))) },
       unit: place.unit && place.unit > 0 ? Math.round(place.unit * 1e3) / 1e3 : 1
     }
   } : {};
@@ -163,7 +173,7 @@ function brushSwatchNow(brush, options, spec) {
     { kind: "path", d, stroke: _nullishCoalesce(options.color, () => ( "#1f2937")), strokeWidth: size, brush: { brush, ...spec ? { spec } : {}, seed: 7, size, pressure: [0.35, 1, 0.5] } },
     options.scale && options.scale > 0 ? options.scale : 2
   );
-  return _nullishCoalesce(_optionalChain([image, 'optionalAccess', _12 => _12.href]), () => ( ""));
+  return _nullishCoalesce(_optionalChain([image, 'optionalAccess', _14 => _14.href]), () => ( ""));
 }
 
 

package/dist/canvas/brushTypes.d.cts

@@ -145,6 +145,11 @@ export interface CanvasBrushPreset {
     builtin?: boolean;
     /** A saved brush's facets: set `brushSpec` to it with `brush` when picking it. */
     spec?: CanvasBrushSpec;
+    /** The brush's solid default colour, or its light / dark pair: what picking it makes the stroke colour (`selectBrush`). */
+    defaultColor?: string | {
+        light: string;
+        dark: string;
+    };
     /** The preset's own tip diameter in canvas units: a new brushed stroke's default size. */
     size: number;
 }

package/dist/canvas/brushTypes.d.ts

@@ -145,6 +145,11 @@ export interface CanvasBrushPreset {
     builtin?: boolean;
     /** A saved brush's facets: set `brushSpec` to it with `brush` when picking it. */
     spec?: CanvasBrushSpec;
+    /** The brush's solid default colour, or its light / dark pair: what picking it makes the stroke colour (`selectBrush`). */
+    defaultColor?: string | {
+        light: string;
+        dark: string;
+    };
     /** The preset's own tip diameter in canvas units: a new brushed stroke's default size. */
     size: number;
 }

package/dist/canvas/drawController.d.cts

@@ -7,6 +7,7 @@ import type { CanvasNode, Point } from './types.cjs';
 import { type FreehandDrawOptions, type FreehandPenSample, type FreehandStroke, type FreehandStrokeStyle, type FreehandTool } from './freehand.cjs';
 import { type CanvasBrush } from './brushstroke.cjs';
 import type { BrushLibrary } from '../brushes/library.cjs';
+import type { CanvasBrushPreset } from './brushTypes.cjs';
 /** A stroke drawn by code or an agent (`drawStroke`). */
 export interface DrawStrokeInput {
     /** Points in canvas (flow) coordinates, at least one. */
@@ -42,6 +43,8 @@ export interface CanvasDrawControllerOptions<TNode extends CanvasNode = CanvasNo
      * profile decides which). Share one with the paint editor so a brush saved there draws here.
      */
     brushLibrary?: Pick<BrushLibrary, 'list' | 'get' | 'isBuiltin'>;
+    /** The host's colour scheme (default light): a brush's light / dark default colour resolves to its side. */
+    colorScheme?: 'light' | 'dark';
     getNodes: () => TNode[];
     setNodes: (nodes: TNode[]) => void;
     history?: ArrangeHistoryTarget;
@@ -75,7 +78,18 @@ export declare function createCanvasDrawController<TNode extends CanvasNode = Ca
         height: number;
     } | undefined;
     /** The presets and saved brushes (of `brushLibrary`) a stroke can be brushed with (loads the paint engine). */
-    listBrushes: () => Promise<import("./brushTypes.cjs").CanvasBrushPreset[]>;
+    listBrushes: () => Promise<CanvasBrushPreset[]>;
+    /**
+     * A brush picker's choice: brushes the pen and highlighter with `id` (`null`: a plain vector
+     * stroke) at the brush's own size, embedding a saved brush, and makes its default colour
+     * (resolved for the colour scheme) the stroke colour unless `keepColour`. Throws for a brush
+     * the canvas can't paint. Resolves with the brush chosen.
+     */
+    selectBrush(id: string | null, choice?: {
+        keepColour?: boolean;
+    }): Promise<CanvasBrushPreset | null>;
+    /** The host's colour scheme, for brushes' light / dark default colours. */
+    setColorScheme(scheme: "light" | "dark"): void;
     /** The saved brush to embed for a brush id (undefined for presets and tip settings); for a brush picker. */
     brushSpec: (brush: CanvasBrush) => Promise<import("./brushTypes.cjs").CanvasBrushSpec | undefined>;
 };

package/dist/canvas/drawController.d.ts

@@ -7,6 +7,7 @@ import type { CanvasNode, Point } from './types.js';
 import { type FreehandDrawOptions, type FreehandPenSample, type FreehandStroke, type FreehandStrokeStyle, type FreehandTool } from './freehand.js';
 import { type CanvasBrush } from './brushstroke.js';
 import type { BrushLibrary } from '../brushes/library.js';
+import type { CanvasBrushPreset } from './brushTypes.js';
 /** A stroke drawn by code or an agent (`drawStroke`). */
 export interface DrawStrokeInput {
     /** Points in canvas (flow) coordinates, at least one. */
@@ -42,6 +43,8 @@ export interface CanvasDrawControllerOptions<TNode extends CanvasNode = CanvasNo
      * profile decides which). Share one with the paint editor so a brush saved there draws here.
      */
     brushLibrary?: Pick<BrushLibrary, 'list' | 'get' | 'isBuiltin'>;
+    /** The host's colour scheme (default light): a brush's light / dark default colour resolves to its side. */
+    colorScheme?: 'light' | 'dark';
     getNodes: () => TNode[];
     setNodes: (nodes: TNode[]) => void;
     history?: ArrangeHistoryTarget;
@@ -75,7 +78,18 @@ export declare function createCanvasDrawController<TNode extends CanvasNode = Ca
         height: number;
     } | undefined;
     /** The presets and saved brushes (of `brushLibrary`) a stroke can be brushed with (loads the paint engine). */
-    listBrushes: () => Promise<import("./brushTypes.js").CanvasBrushPreset[]>;
+    listBrushes: () => Promise<CanvasBrushPreset[]>;
+    /**
+     * A brush picker's choice: brushes the pen and highlighter with `id` (`null`: a plain vector
+     * stroke) at the brush's own size, embedding a saved brush, and makes its default colour
+     * (resolved for the colour scheme) the stroke colour unless `keepColour`. Throws for a brush
+     * the canvas can't paint. Resolves with the brush chosen.
+     */
+    selectBrush(id: string | null, choice?: {
+        keepColour?: boolean;
+    }): Promise<CanvasBrushPreset | null>;
+    /** The host's colour scheme, for brushes' light / dark default colours. */
+    setColorScheme(scheme: "light" | "dark"): void;
     /** The saved brush to embed for a brush id (undefined for presets and tip settings); for a brush picker. */
     brushSpec: (brush: CanvasBrush) => Promise<import("./brushTypes.js").CanvasBrushSpec | undefined>;
 };