ntk 8.23.3 → 8.23.4

package/lib/renderingcontext_2d.js

@@ -726,6 +726,15 @@ function finiteRect(x, y, w, h) {
   return Number.isFinite(x) && Number.isFinite(y) && Number.isFinite(w) && Number.isFinite(h);
 }
 
+/** A style no context can paint with, named for the message that says so. */
+function describeStyle(value) {
+  if (value === null) return "null";
+  if (value === undefined) return "undefined";
+  if (typeof value !== "object") return `${typeof value} ${JSON.stringify(value)}`;
+  const name = value.constructor?.name;
+  return name && name !== "Object" ? `a ${name}` : "a plain object";
+}
+
 /**
  * Canvas-like 2d rendering context backed by the XRender extension: most
  * operations (composition, gradients, text composition) happen server-side.
@@ -1320,7 +1329,7 @@ class RenderingContext2d {
       : app.solidPicture(r, g, b, a);
   }
 
-  _stylePicture(value) {
+  _stylePicture(value, property = "fillStyle") {
     if (typeof value === "string" || Array.isArray(value)) {
       // the app's, which it lets go as colours animate (App#styleSolid) —
       // the style stays here, to ask by again. An app that only answers
@@ -1337,7 +1346,16 @@ class RenderingContext2d {
     ) {
       return value;
     }
-    throw new Error("Unknown fill style");
+    throw new Error(
+      `Unknown fill style: ${property} takes a CSS colour string, an ` +
+        "[r, g, b, a] array, a CanvasGradient, a CanvasPattern or a " +
+        `Picture, and was given ${describeStyle(value)}.` +
+        (value == null
+          ? " A null is most often createPattern()'s, which answers null " +
+            "for a source it cannot use — check what it returns before " +
+            "assigning it."
+          : ""),
+    );
   }
 
   set fillStyle(value) {
@@ -1353,7 +1371,7 @@ class RenderingContext2d {
 
   set strokeStyle(value) {
     // the picture first: a value that throws leaves the style as it was
-    const picture = this._stylePicture(value);
+    const picture = this._stylePicture(value, "strokeStyle");
     this._strokeStyle = value;
     this._strokeSource = picture;
   }
@@ -1381,7 +1399,10 @@ class RenderingContext2d {
   get _strokePicture() {
     const p = this._strokeSource;
     if (!p?._evicted) return p;
-    return (this._strokeSource = this._stylePicture(this._strokeStyle));
+    return (this._strokeSource = this._stylePicture(
+      this._strokeStyle,
+      "strokeStyle",
+    ));
   }
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ntk",
-  "version": "8.23.3",
+  "version": "8.23.4",
   "description": "Desktop UI toolkit for X11 with canvas-like 2d and OpenGL rendering",
   "author": "Andrey Sidorov <sidorares@yandex.ru>",
   "license": "MIT",