@weasel-js/svg 1.5.1 → 1.5.2

package/dist/index.d.ts

@@ -1,4 +1,5 @@
-import { Path, FillStyle, StrokeAlign, StyledRun, TextStyle, TextVerticalAlign, Stroke, MarkerEntry, TilePatternSpec, IngestCtx } from '@weasel-js/core';
+import { Mat3 } from '@weasel-js/geom';
+import { Path, FillStyle, ScreenLength, StrokeAlign, StyledRun, TextStyle, TextVerticalAlign, Stroke, MarkerEntry, TilePatternSpec, IngestCtx } from '@weasel-js/core';
 
 /**
  * Public types for `@weasel-js/svg`. The package exposes a flat,
@@ -47,10 +48,15 @@ interface NamespacedElement {
     children?: Record<string, NamespacedElement[]>;
 }
 /**
- * 2x3 affine matrix in column-major form (SVG's `matrix(a b c d e f)`
- * order). Maps `[x', y'] = [a*x + c*y + e, b*x + d*y + f]`.
+ * 2x3 affine matrix in SVG's `matrix(a b c d e f)` order, mapping
+ * `[x', y'] = [a*x + c*y + e, b*x + d*y + f]`.
+ *
+ * The same order the kernel's affine tier uses, so this is that type under
+ * the name the SVG spec gives it — not a parallel one. An `SvgGroupNode`'s
+ * transform and a geom `Mat3` are interchangeable without a conversion.
  */
-type Matrix = readonly [number, number, number, number, number, number];
+type Matrix = Mat3;
+
 /** Identity matrix — useful as a default in tests / constructors. */
 declare const IDENTITY_MATRIX: Matrix;
 /**
@@ -73,11 +79,9 @@ type SvgPaint = {
 interface SvgStroke {
     paint: SvgPaint;
     /** World units, or `{ px }` for a width that holds its rendered thickness
-     *  however the document is scaled — SVG's `vector-effect="non-scaling-stroke"`,
-     *  and the same unit system as the kit's `Stroke.width`. */
-    width: number | {
-        px: number;
-    };
+     *  however the document is scaled — SVG's `vector-effect="non-scaling-stroke"`.
+     *  Literally the kit's own unit, not a second spelling of it. */
+    width: ScreenLength;
     opacity?: number;
     /** `stroke-linecap`. Default per SVG spec is `'butt'`. */
     cap?: 'butt' | 'round' | 'square';

package/dist/index.js

@@ -1,21 +1,9 @@
 import { pathFromD, PATH_M, PATH_L, PATH_Z, boundsOfPath, resolveScreenLength, SCRIPT_METRICS, dwarn, getMarker, registerMarker, createInsertOp, PathBuilder, parseColor, rgbaToHex, resolveTextStyle, layoutRuns, resolveRuns, resolveAlign, PATH_C, PATH_Q, solid, fillToBoundsFrame, getPaintKind } from '@weasel-js/core';
-import { invert } from '@weasel-js/geom';
+import { identity, multiply, invert } from '@weasel-js/geom';
 import { tileGeometry } from '@weasel-js/core/patterns-builtin';
 
 // src/parse.ts
-
-// src/types.ts
-var IDENTITY_MATRIX = [1, 0, 0, 1, 0, 0];
-function multiply(a, b) {
-  return [
-    a[0] * b[0] + a[2] * b[1],
-    a[1] * b[0] + a[3] * b[1],
-    a[0] * b[2] + a[2] * b[3],
-    a[1] * b[2] + a[3] * b[3],
-    a[0] * b[4] + a[2] * b[5] + a[4],
-    a[1] * b[4] + a[3] * b[5] + a[5]
-  ];
-}
+var IDENTITY_MATRIX = identity();
 function applyMatrix(m, x, y) {
   return { x: m[0] * x + m[2] * y + m[4], y: m[1] * x + m[3] * y + m[5] };
 }
@@ -77,10 +65,9 @@ function parseTransform(attr, onWarn) {
   return result;
 }
 function rebaseTransform(ctm, local) {
-  const inv = invert([...ctm]);
+  const inv = invert(ctm);
   if (!inv) return null;
-  const [a, b, c, d, e, f] = inv;
-  return multiply(multiply(ctm, local), [a, b, c, d, e, f]);
+  return multiply(multiply(ctm, local), inv);
 }
 function decomposeRotation(m, cx, cy, eps = 1e-4) {
   const [a, b, c, d, e, f] = m;