@pixerate/editor 0.266.2 → 0.268.0

package/dist/canvas/index.js

@@ -46,7 +46,7 @@ import {
   resolveCanvasBrushSpec,
   validateCanvasBrush,
   validateCanvasBrushPaint
-} from "../chunk-DXYHQ2VN.js";
+} from "../chunk-BAZMCFVL.js";
 import {
   PATHFINDER_OPERATIONS,
   PlanarMap,
@@ -8080,6 +8080,8 @@ function createCanvasDrawController(options) {
   };
   let activeStroke = null;
   let colorScheme = options.colorScheme === "dark" ? "dark" : "light";
+  let colorLocked = !!options.colorLocked;
+  let brushColour = null;
   const erasedInDrag = /* @__PURE__ */ new Map();
   let dragStartNodes = null;
   function setTool(tool) {
@@ -8091,11 +8093,16 @@ function createCanvasDrawController(options) {
         ...createDefaultStrokeStyle(tool),
         ...options.style
       };
+      brushColour = null;
       options.onStyleChange?.(currentStyle);
     }
     options.onToolChange?.(tool);
   }
   function setStyle(style) {
+    if (style.color !== void 0) brushColour = null;
+    applyStyle(style);
+  }
+  function applyStyle(style) {
     currentStyle = { ...currentStyle, ...style };
     options.onStyleChange?.(currentStyle);
   }
@@ -8312,8 +8319,10 @@ function createCanvasDrawController(options) {
     /**
      * 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.
+     * (resolved for the colour scheme) the stroke colour unless `keepColour` or the colour is
+     * locked (`setColorLocked`). A light / dark default resolves again when the scheme changes,
+     * until another colour is set. Throws for a brush the canvas can't paint. Resolves with the
+     * brush chosen.
      */
     async selectBrush(id, choice = {}) {
       if (id === null) {
@@ -8325,13 +8334,43 @@ function createCanvasDrawController(options) {
         await validateCanvasBrush(id);
         throw new Error(`Brush '${id}' is not one the canvas can paint; listBrushes lists them.`);
       }
-      const hex = !choice.keepColour && preset.defaultColor !== void 0 ? brushColourHex(preset.defaultColor, colorScheme) : null;
-      setStyle({ brush: id, brushSize: preset.size, brushSpec: preset.spec, ...hex ? { color: hex } : {} });
+      const hex = !choice.keepColour && !colorLocked && preset.defaultColor !== void 0 ? brushColourHex(preset.defaultColor, colorScheme) : null;
+      if (hex) brushColour = preset.defaultColor ?? null;
+      applyStyle({ brush: id, brushSize: preset.size, brushSpec: preset.spec, ...hex ? { color: hex } : {} });
       return preset;
     },
-    /** The host's colour scheme, for brushes' light / dark default colours. */
+    get colorScheme() {
+      return colorScheme;
+    },
+    /**
+     * The host's colour scheme, for brushes' light / dark default colours: a stroke colour that
+     * came from one (`selectBrush`) resolves to the new side. Strokes already drawn keep theirs.
+     */
     setColorScheme(scheme) {
-      colorScheme = scheme === "dark" ? "dark" : "light";
+      const next = scheme === "dark" ? "dark" : "light";
+      if (next === colorScheme) return;
+      colorScheme = next;
+      const hex = brushColour ? brushColourHex(brushColour, next) : null;
+      if (hex && hex !== currentStyle.color) applyStyle({ color: hex });
+    },
+    get colorLocked() {
+      return colorLocked;
+    },
+    /** Locks the stroke colour ("Keep my colour"): choosing a brush with a default colour keeps it. */
+    setColorLocked(locked) {
+      if (colorLocked === !!locked) return;
+      colorLocked = !!locked;
+      options.onColorLockChange?.(colorLocked);
+    },
+    /** What the brush picker is set to: the brush, colour, scheme and lock (a snapshot). */
+    brushSettings() {
+      return {
+        brush: typeof currentStyle.brush === "string" ? currentStyle.brush : null,
+        color: typeof currentStyle.color === "string" ? currentStyle.color : null,
+        colorScheme,
+        colorLocked,
+        colorFollowsScheme: brushColour !== null && typeof brushColour === "object"
+      };
     },
     /** The saved brush to embed for a brush id (undefined for presets and tip settings); for a brush picker. */
     brushSpec: (brush) => resolveCanvasBrushSpec(brush, options.brushLibrary)

package/dist/{chunk-TOID45I2.cjs → chunk-2WOGXEDX.cjs}

@@ -74,7 +74,7 @@ function profileAlongPolyline(points, values, count = 32) {
 var round3 = (v) => Math.round(v * 1e3) / 1e3;
 var loading = null;
 function loadCanvasBrushstrokeRenderer() {
-  loading ??= Promise.resolve().then(() => _interopRequireWildcard(require("./brushstrokeRender-FSUWXUZY.cjs"))).catch((error) => {
+  loading ??= Promise.resolve().then(() => _interopRequireWildcard(require("./brushstrokeRender-WR2N5HHY.cjs"))).catch((error) => {
     loading = null;
     throw error;
   });

package/dist/{chunk-XORJ7UZO.cjs → chunk-3VHH6V67.cjs}

@@ -5,7 +5,8 @@
 
 
 
-var _chunkOTN6VB5Scjs = require('./chunk-OTN6VB5S.cjs');
+
+var _chunkRDFHWAHLcjs = require('./chunk-RDFHWAHL.cjs');
 
 
 var _chunkU67EN7GGcjs = require('./chunk-U67EN7GG.cjs');
@@ -33,7 +34,7 @@ var HEX = /^#[0-9a-fA-F]{6}$/;
 function stampOutline(kind) {
   const n = GRID;
   const f = new Float32Array((n + 1) * (n + 1));
-  for (let j = 0; j <= n; j++) for (let i = 0; i <= n; i++) f[j * (n + 1) + i] = _chunkOTN6VB5Scjs.stampCoverage.call(void 0, kind, i / n * 2 - 1, j / n * 2 - 1, SHAPE_SEED) - 0.5;
+  for (let j = 0; j <= n; j++) for (let i = 0; i <= n; i++) f[j * (n + 1) + i] = _chunkRDFHWAHLcjs.stampCoverage.call(void 0, kind, i / n * 2 - 1, j / n * 2 - 1, SHAPE_SEED) - 0.5;
   const at = (i, j) => f[j * (n + 1) + i];
   const points = /* @__PURE__ */ new Map();
   const point = (key, i0, j0, i1, j1) => {
@@ -170,7 +171,7 @@ function stampPixels(kind, size, colour) {
   for (let y = 0; y < size; y++) {
     for (let x = 0; x < size; x++) {
       let c = 0;
-      for (let sy = 0; sy < ss; sy++) for (let sx = 0; sx < ss; sx++) c += _chunkOTN6VB5Scjs.stampCoverage.call(void 0, kind, (x + (sx + 0.5) / ss) / size * 2 - 1, (y + (sy + 0.5) / ss) / size * 2 - 1, SHAPE_SEED);
+      for (let sy = 0; sy < ss; sy++) for (let sx = 0; sx < ss; sx++) c += _chunkRDFHWAHLcjs.stampCoverage.call(void 0, kind, (x + (sx + 0.5) / ss) / size * 2 - 1, (y + (sy + 0.5) / ss) / size * 2 - 1, SHAPE_SEED);
       const a = Math.round(c / (ss * ss) * 255);
       if (!a) continue;
       const i = (y * size + x) * 4;
@@ -192,25 +193,25 @@ function editorStickers() {
     return { id: k, name: m.name, category: m.category, tags: m.tags, description: m.description, width: BOX, height: BOX, thumbnail: thumbs.get(k), formats: ["svg", "png"], licence: { ...LICENCE }, tintable: true };
   };
   const kind = (id) => {
-    if (!_chunkOTN6VB5Scjs.STAMP_KINDS.includes(id)) throw new (0, _chunkU67EN7GGcjs.StickerError)("unknown_sticker", `The editor has no sticker "${id}"; its stickers are ${_chunkOTN6VB5Scjs.STAMP_KINDS.join(", ")}.`);
+    if (!_chunkRDFHWAHLcjs.STAMP_KINDS.includes(id)) throw new (0, _chunkU67EN7GGcjs.StickerError)("unknown_sticker", `The editor has no sticker "${id}"; its stickers are ${_chunkRDFHWAHLcjs.STAMP_KINDS.join(", ")}.`);
     return id;
   };
   return {
-    id: _chunkOTN6VB5Scjs.EDITOR_STICKERS_ID,
+    id: _chunkRDFHWAHLcjs.EDITOR_STICKERS_ID,
     name: "Editor stickers",
     version: "1",
     capabilities: { supportsSearch: true, supportsSvg: true, supportsRaster: true, maxSize: 1024 },
-    list: (options) => _chunkOTN6VB5Scjs.stickerPage.call(void 0, _chunkOTN6VB5Scjs.STAMP_KINDS.map(summary), options),
-    search: (query, options) => _chunkOTN6VB5Scjs.stickerPage.call(void 0, _chunkOTN6VB5Scjs.STAMP_KINDS.map(summary), options, query),
+    list: (options) => _chunkRDFHWAHLcjs.stickerPage.call(void 0, _chunkRDFHWAHLcjs.STAMP_KINDS.map(summary), options),
+    search: (query, options) => _chunkRDFHWAHLcjs.stickerPage.call(void 0, _chunkRDFHWAHLcjs.STAMP_KINDS.map(summary), options, query),
     describe(id) {
-      if (!_chunkOTN6VB5Scjs.STAMP_KINDS.includes(id)) return void 0;
+      if (!_chunkRDFHWAHLcjs.STAMP_KINDS.includes(id)) return void 0;
       const k = id;
       return { ...summary(k), silhouette: outline(k), colours: [META[k].colour] };
     },
-    categories: () => [...new Set(_chunkOTN6VB5Scjs.STAMP_KINDS.map((k) => META[k].category))].map((c) => ({ id: c, name: c[0].toUpperCase() + c.slice(1), count: _chunkOTN6VB5Scjs.STAMP_KINDS.filter((k) => META[k].category === c).length })),
+    categories: () => [...new Set(_chunkRDFHWAHLcjs.STAMP_KINDS.map((k) => META[k].category))].map((c) => ({ id: c, name: c[0].toUpperCase() + c.slice(1), count: _chunkRDFHWAHLcjs.STAMP_KINDS.filter((k) => META[k].category === c).length })),
     load(id, options = {}) {
       const k = kind(id);
-      _chunkOTN6VB5Scjs.checkStickerVariant.call(void 0, { id: k }, options.variant);
+      _chunkRDFHWAHLcjs.checkStickerVariant.call(void 0, { id: k }, options.variant);
       const colour = _nullishCoalesce(options.colour, () => ( META[k].colour));
       if (!HEX.test(colour)) throw new (0, _chunkU67EN7GGcjs.StickerError)("invalid_argument", `colour ${JSON.stringify(colour)} must be #rrggbb.`);
       if (options.format === "png") {
@@ -258,7 +259,7 @@ var StickerBrowser = (_class = class {
     this.set({ loading: true, error: null, items: [], total: 0, hasMore: false, provider: p.name });
     try {
       const categories = await _asyncNullishCoalesce(await _optionalChain([p, 'access', _2 => _2.categories, 'optionalCall', _3 => _3()]), async () => ( []));
-      const collections = await _asyncNullishCoalesce(await _optionalChain([p, 'access', _4 => _4.listCollections, 'optionalCall', _5 => _5()]), async () => ( []));
+      const collections = await _asyncNullishCoalesce(await _chunkRDFHWAHLcjs.providerCollections.call(void 0, p), async () => ( []));
       if (run !== this.run) return;
       this.set({ categories, collections, ...this.s.collection && !collections.some((c) => c.id === this.s.collection) ? { collection: "" } : {} });
       await this.page(run, p, true);
@@ -298,7 +299,7 @@ var StickerBrowser = (_class = class {
     const res = q && p.capabilities.supportsSearch ? await p.search(q, options) : await p.list(options);
     if (run !== this.run) return;
     this.next = res.next;
-    const items = res.items.map((s) => ({ ...s, ref: _chunkOTN6VB5Scjs.stickerRefOf.call(void 0, p, s.id) }));
+    const items = res.items.map((s) => ({ ...s, ref: _chunkRDFHWAHLcjs.stickerRefOf.call(void 0, p, s.id) }));
     this.set({ items: first ? items : [...this.s.items, ...items], total: res.total, hasMore: Boolean(res.next), loading: false });
   }
 }, _class);

package/dist/{chunk-3C33YTNN.js → chunk-3XDSNIGF.js}

@@ -1,22 +1,30 @@
 import {
   describeStickerRef
-} from "./chunk-6JL2D5SG.js";
+} from "./chunk-VE6UKYQ2.js";
 import {
   BRUSH_HOST_PROFILES,
   BRUSH_JSON_SCHEMA,
   BRUSH_KINDS,
   BRUSH_MEDIA,
+  BRUSH_SOURCE_CHANNELS,
   BRUSH_TOOLS,
   BrushLibraryError,
+  MAX_BRUSH_SOURCE_INPUT_PIXELS,
+  MAX_BRUSH_SOURCE_SIZE,
   PAINT_PROFILE,
+  brushSourceIdOf,
+  brushSourceIds,
+  brushSourceRef,
   checkBrush,
   closest,
   degrade,
+  isBrushSourceRef,
   normalizeBrushSpec,
   resolveCategory,
   resolveEngine,
+  summarizeBrushSource,
   withKeptIssues
-} from "./chunk-CIJBSUM5.js";
+} from "./chunk-KZI3YWKW.js";
 
 // src/brushes/patch.ts
 var isObject = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
@@ -101,11 +109,18 @@ function createBrushLibraryTools(library, options = {}) {
   };
   const checkFor = async (brush, p) => {
     const check2 = checkBrush(brush, p);
-    const provider = options.stickers?.();
-    if (!provider || brush.tip.shape !== "stamp") return check2;
     const issues = [...check2.issues];
+    const refs = [...(brush.tip.stamps ?? []).map((r) => ["tip.stamps", r]), ...brush.tip.grain ? [["tip.grain.source", brush.tip.grain.source]] : []];
+    for (const [facet, ref] of refs) {
+      const id = brushSourceIdOf(ref);
+      if (id === null || await library.getSource(id)) continue;
+      const ids = (await library.listSources()).map((x) => x.id);
+      issues.push({ facet, severity: "error", reason: `There is no image source "${id}" in the brush library. ${closest(id, ids)}`.trim(), fix: "Add it with add_brush_source, or use a ref list_brush_sources lists." });
+    }
+    const provider = options.stickers?.();
+    if (!provider || brush.tip.shape !== "stamp") return { ok: !issues.some((i) => i.severity === "error"), issues };
     for (const ref of brush.tip.stamps ?? []) {
-      if (ref.startsWith("editor:")) continue;
+      if (ref.startsWith("editor:") || isBrushSourceRef(ref)) continue;
       try {
         await describeStickerRef(provider, ref);
       } catch (e) {
@@ -207,7 +222,34 @@ function createBrushLibraryTools(library, options = {}) {
     annotations: { title: "Export brushes", ...READ },
     handler: async ({ ids }) => ({ file: await library.exportFile(ids) })
   };
-  const tools = [list, describe, check, exportTool];
+  const listSources = {
+    name: "list_brush_sources",
+    title: "List brush image sources",
+    description: "Lists the image sources in the brush library: the images image tips and image grain are made from. Returns each source's id, ref (source:<id>, for tip.stamps of a stamp tip or tip.grain.source in create_brush / update_brush), name, width and height in px, licence and origin when it has them, and usedBy (the saved brushes that name it), plus total. Built-in grain patterns need no source. Changes nothing.",
+    inputSchema: {
+      type: "object",
+      properties: {
+        text: { type: "string", maxLength: 200, description: "Words in the id, name or origin (each word must match the start of one)." },
+        offset: { type: "integer", minimum: 0, description: "Skip this many (default 0)." },
+        limit: { type: "integer", minimum: 1, maximum: 200, description: "At most this many (default 100)." }
+      },
+      additionalProperties: false
+    },
+    annotations: { title: "List brush image sources", ...READ },
+    handler: async ({ text, offset, limit }) => {
+      const brushes = (await library.list({ source: "user" })).map((e) => e.brush);
+      const wordsOf = (v) => v.toLowerCase().split(/[^\p{L}\p{N}]+/u).filter(Boolean);
+      const want = typeof text === "string" ? wordsOf(text) : [];
+      const found = (await library.listSources()).filter((x) => {
+        const have = wordsOf([x.id, x.name, x.origin ?? ""].join(" "));
+        return want.every((w) => have.some((h) => h.startsWith(w)));
+      });
+      const start = offset ?? 0;
+      const page = found.slice(start, start + (limit ?? 100));
+      return { total: found.length, sources: page.map((x) => ({ ...summarizeBrushSource(x), usedBy: brushes.filter((b) => brushSourceIds(b).includes(x.id)).map((b) => b.id) })) };
+    }
+  };
+  const tools = [list, describe, check, exportTool, listSources];
   if (options.renderPreview) {
     const render = options.renderPreview;
     tools.push({
@@ -288,6 +330,31 @@ function createBrushLibraryTools(library, options = {}) {
         return { id, brush: saved.brush, changed: changedPaths(e.brush, saved.brush), problems: saved.problems, warnings: warnings(saved.check), ...saved.check.kept.length ? { kept: saved.check.kept } : {} };
       }
     },
+    {
+      name: "add_brush_source",
+      title: "Add a brush image source",
+      description: `Adds an image to the brush library as a source for image tips and image grain (as Procreate's shape and grain sources). The image is a PNG data: URL; the marks are read from its transparency, its dark parts (a scan of marks on paper) or its light parts (white on black), as channel says, and kept as a grey mask at most ${MAX_BRUSH_SOURCE_SIZE} px on a side. Returns id, ref (source:<id>), the stored source's width and height, problems (the channel auto picked, scaling) and replaced. Then make the brush: create_brush or update_brush with tip { shape: "stamp", stamps: [ref] } for an image tip, or tip.grain { source: ref } for grain. A taken id is refused unless overwrite.`,
+      inputSchema: {
+        type: "object",
+        properties: {
+          name: { type: "string", minLength: 1, maxLength: 80, description: 'Display name, e.g. "Charcoal scan".' },
+          image: { type: "string", pattern: "^data:image/png;base64,", maxLength: 4e7, description: `The image: a PNG data: URL, at most ${MAX_BRUSH_SOURCE_INPUT_PIXELS} pixels; larger than ${MAX_BRUSH_SOURCE_SIZE} px it is scaled down.` },
+          id: { type: "string", pattern: String(FACETS2.id.pattern), description: "The source id (default: from the name, made unique): lowercase letters, digits and dashes." },
+          channel: { type: "string", enum: [...BRUSH_SOURCE_CHANNELS], description: "Where the marks are: auto (default: the transparency when the image has any, else the dark parts), alpha, darkness (dark marks on light paper) or lightness (light marks on black)." },
+          invert: { type: "boolean", description: "Swap painted and empty parts (default false)." },
+          licence: { type: "string", maxLength: 2e3, description: "The licence or terms the image came with, kept with the source." },
+          origin: { type: "string", maxLength: 200, description: "Where it came from: a file name, a pack or a URL." },
+          overwrite: { type: "boolean", description: "Replace the image of a source with the same id (default false); brushes using it change with it." }
+        },
+        required: ["name", "image"],
+        additionalProperties: false
+      },
+      annotations: { title: "Add a brush image source", ...WRITE },
+      handler: async ({ overwrite, ...input }) => {
+        const r = await library.addSource(input, { overwrite: !!overwrite });
+        return { id: r.source.id, ref: brushSourceRef(r.source.id), width: r.source.width, height: r.source.height, problems: r.problems, replaced: r.replaced };
+      }
+    },
     {
       name: "duplicate_brush",
       title: "Duplicate a brush",