@flighthq/shape 0.3.0-next.1530.70058bd → 0.3.0-next.1560.03a2b36

package/dist/contract.d.ts

@@ -6,4 +6,5 @@ export * from './shapeStroke';
 export * from './shapeStrokeOutline';
 export * from './shapeHitTestBuiltins';
 export * from './shapeHitTestRegistry';
+export * from './scale9ShapeCommands';
 //# sourceMappingURL=contract.d.ts.map

package/dist/contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../src/contract.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC"}
+{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../src/contract.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC"}

package/dist/contract.js

@@ -6,4 +6,5 @@ export * from './shapeStroke';
 export * from './shapeStrokeOutline';
 export * from './shapeHitTestBuiltins';
 export * from './shapeHitTestRegistry';
+export * from './scale9ShapeCommands';
 //# sourceMappingURL=contract.js.map

package/dist/contract.js.map

@@ -1 +1 @@
-{"version":3,"file":"contract.js","sourceRoot":"","sources":["../src/contract.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC"}
+{"version":3,"file":"contract.js","sourceRoot":"","sources":["../src/contract.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC"}

package/dist/index.d.ts

@@ -1,2 +1,3 @@
 export { PathCommand, appendShapeArc, appendShapeArcTo, appendShapeBeginTextureFill, appendShapeBeginFill, appendShapeBeginGradientFill, appendShapeCircle, appendShapeCubicCurveTo, appendShapeCurveTo, appendShapeDrawTriangles, appendShapeEllipse, appendShapeEndFill, appendShapeGeometryCommand, appendShapeLineTextureStyle, appendShapeLineGradientStyle, appendShapeLineStyle, appendShapeLineTo, appendShapeMoveTo, appendShapePath, appendShapePolygon, appendShapePolyline, appendShapeRectangle, appendShapeRoundRectangle, appendShapeRoundRectangleVarying, clearShapeCommands, computeShapeLocalBoundsRectangle, copyShapeCommands, createScale9Shape, createShape, enableShapeHitTesting, getPathCommandOperandCount, getShapeBounds, getShapeCommandCount, getShapeFillRegions, getShapeStrokeRegions, getShapeStrokeOutlineRegions, hasNonSolidShapeFill, hasNonSolidShapeStroke, hasShapeFill, hitTestShapeCommandPoint, isShapeEmpty, registerShapeHitTestCommand, } from './contract';
+export * from './scale9ShapeCommands';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,cAAc,EACd,gBAAgB,EAChB,2BAA2B,EAC3B,oBAAoB,EACpB,4BAA4B,EAC5B,iBAAiB,EACjB,uBAAuB,EACvB,kBAAkB,EAClB,wBAAwB,EACxB,kBAAkB,EAClB,kBAAkB,EAClB,0BAA0B,EAC1B,2BAA2B,EAC3B,4BAA4B,EAC5B,oBAAoB,EACpB,iBAAiB,EACjB,iBAAiB,EACjB,eAAe,EACf,kBAAkB,EAClB,mBAAmB,EACnB,oBAAoB,EACpB,yBAAyB,EACzB,gCAAgC,EAChC,kBAAkB,EAClB,gCAAgC,EAChC,iBAAiB,EACjB,iBAAiB,EACjB,WAAW,EACX,qBAAqB,EACrB,0BAA0B,EAC1B,cAAc,EACd,oBAAoB,EACpB,mBAAmB,EACnB,qBAAqB,EACrB,4BAA4B,EAC5B,oBAAoB,EACpB,sBAAsB,EACtB,YAAY,EACZ,wBAAwB,EACxB,YAAY,EACZ,2BAA2B,GAC5B,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,cAAc,EACd,gBAAgB,EAChB,2BAA2B,EAC3B,oBAAoB,EACpB,4BAA4B,EAC5B,iBAAiB,EACjB,uBAAuB,EACvB,kBAAkB,EAClB,wBAAwB,EACxB,kBAAkB,EAClB,kBAAkB,EAClB,0BAA0B,EAC1B,2BAA2B,EAC3B,4BAA4B,EAC5B,oBAAoB,EACpB,iBAAiB,EACjB,iBAAiB,EACjB,eAAe,EACf,kBAAkB,EAClB,mBAAmB,EACnB,oBAAoB,EACpB,yBAAyB,EACzB,gCAAgC,EAChC,kBAAkB,EAClB,gCAAgC,EAChC,iBAAiB,EACjB,iBAAiB,EACjB,WAAW,EACX,qBAAqB,EACrB,0BAA0B,EAC1B,cAAc,EACd,oBAAoB,EACpB,mBAAmB,EACnB,qBAAqB,EACrB,4BAA4B,EAC5B,oBAAoB,EACpB,sBAAsB,EACtB,YAAY,EACZ,wBAAwB,EACxB,YAAY,EACZ,2BAA2B,GAC5B,MAAM,YAAY,CAAC;AACpB,cAAc,uBAAuB,CAAC"}

package/dist/index.js

@@ -1,2 +1,3 @@
 export { PathCommand, appendShapeArc, appendShapeArcTo, appendShapeBeginTextureFill, appendShapeBeginFill, appendShapeBeginGradientFill, appendShapeCircle, appendShapeCubicCurveTo, appendShapeCurveTo, appendShapeDrawTriangles, appendShapeEllipse, appendShapeEndFill, appendShapeGeometryCommand, appendShapeLineTextureStyle, appendShapeLineGradientStyle, appendShapeLineStyle, appendShapeLineTo, appendShapeMoveTo, appendShapePath, appendShapePolygon, appendShapePolyline, appendShapeRectangle, appendShapeRoundRectangle, appendShapeRoundRectangleVarying, clearShapeCommands, computeShapeLocalBoundsRectangle, copyShapeCommands, createScale9Shape, createShape, enableShapeHitTesting, getPathCommandOperandCount, getShapeBounds, getShapeCommandCount, getShapeFillRegions, getShapeStrokeRegions, getShapeStrokeOutlineRegions, hasNonSolidShapeFill, hasNonSolidShapeStroke, hasShapeFill, hitTestShapeCommandPoint, isShapeEmpty, registerShapeHitTestCommand, } from './contract';
+export * from './scale9ShapeCommands';
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,cAAc,EACd,gBAAgB,EAChB,2BAA2B,EAC3B,oBAAoB,EACpB,4BAA4B,EAC5B,iBAAiB,EACjB,uBAAuB,EACvB,kBAAkB,EAClB,wBAAwB,EACxB,kBAAkB,EAClB,kBAAkB,EAClB,0BAA0B,EAC1B,2BAA2B,EAC3B,4BAA4B,EAC5B,oBAAoB,EACpB,iBAAiB,EACjB,iBAAiB,EACjB,eAAe,EACf,kBAAkB,EAClB,mBAAmB,EACnB,oBAAoB,EACpB,yBAAyB,EACzB,gCAAgC,EAChC,kBAAkB,EAClB,gCAAgC,EAChC,iBAAiB,EACjB,iBAAiB,EACjB,WAAW,EACX,qBAAqB,EACrB,0BAA0B,EAC1B,cAAc,EACd,oBAAoB,EACpB,mBAAmB,EACnB,qBAAqB,EACrB,4BAA4B,EAC5B,oBAAoB,EACpB,sBAAsB,EACtB,YAAY,EACZ,wBAAwB,EACxB,YAAY,EACZ,2BAA2B,GAC5B,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,cAAc,EACd,gBAAgB,EAChB,2BAA2B,EAC3B,oBAAoB,EACpB,4BAA4B,EAC5B,iBAAiB,EACjB,uBAAuB,EACvB,kBAAkB,EAClB,wBAAwB,EACxB,kBAAkB,EAClB,kBAAkB,EAClB,0BAA0B,EAC1B,2BAA2B,EAC3B,4BAA4B,EAC5B,oBAAoB,EACpB,iBAAiB,EACjB,iBAAiB,EACjB,eAAe,EACf,kBAAkB,EAClB,mBAAmB,EACnB,oBAAoB,EACpB,yBAAyB,EACzB,gCAAgC,EAChC,kBAAkB,EAClB,gCAAgC,EAChC,iBAAiB,EACjB,iBAAiB,EACjB,WAAW,EACX,qBAAqB,EACrB,0BAA0B,EAC1B,cAAc,EACd,oBAAoB,EACpB,mBAAmB,EACnB,qBAAqB,EACrB,4BAA4B,EAC5B,oBAAoB,EACpB,sBAAsB,EACtB,YAAY,EACZ,wBAAwB,EACxB,YAAY,EACZ,2BAA2B,GAC5B,MAAM,YAAY,CAAC;AACpB,cAAc,uBAAuB,CAAC"}

package/dist/scale9ShapeCommands.d.ts

@@ -0,0 +1,3 @@
+import type { Scale9Mapper, ShapeCommandToken } from '@flighthq/types/contract';
+export declare function mapScale9ShapeCommands(out: ShapeCommandToken[], source: readonly ShapeCommandToken[], mapper: Scale9Mapper): void;
+//# sourceMappingURL=scale9ShapeCommands.d.ts.map

package/dist/scale9ShapeCommands.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"scale9ShapeCommands.d.ts","sourceRoot":"","sources":["../src/scale9ShapeCommands.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAQhF,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,iBAAiB,EAAE,EACxB,MAAM,EAAE,SAAS,iBAAiB,EAAE,EACpC,MAAM,EAAE,YAAY,GACnB,IAAI,CAsEN"}

package/dist/scale9ShapeCommands.js

@@ -0,0 +1,119 @@
+// Rewrites a shape's command stream through a nine-slice mapper, so the corners of a scaled shape keep
+// their size while the edges and centre stretch. This is pure command geometry — no renderer, no
+// context — which is why it lives beside the commands rather than in the backend that happens to
+// rasterize the result: every backend that supports nine-slice needs the same rewrite.
+//
+// `out` may be `source`, in which case the rewrite is in place.
+export function mapScale9ShapeCommands(out, source, mapper) {
+    if (out !== source) {
+        out.length = source.length;
+        for (let k = 0; k < source.length; k++)
+            out[k] = source[k];
+    }
+    let i = 0;
+    while (i < out.length) {
+        const key = out[i];
+        const argCount = out[i + 1];
+        switch (key) {
+            case 'moveTo':
+            case 'lineTo':
+                out[i + 2] = mapper.mapX(out[i + 2]);
+                out[i + 3] = mapper.mapY(out[i + 3]);
+                break;
+            case 'curveTo':
+                out[i + 2] = mapper.mapX(out[i + 2]);
+                out[i + 3] = mapper.mapY(out[i + 3]);
+                out[i + 4] = mapper.mapX(out[i + 4]);
+                out[i + 5] = mapper.mapY(out[i + 5]);
+                break;
+            case 'cubicCurveTo':
+                out[i + 2] = mapper.mapX(out[i + 2]);
+                out[i + 3] = mapper.mapY(out[i + 3]);
+                out[i + 4] = mapper.mapX(out[i + 4]);
+                out[i + 5] = mapper.mapY(out[i + 5]);
+                out[i + 6] = mapper.mapX(out[i + 6]);
+                out[i + 7] = mapper.mapY(out[i + 7]);
+                break;
+            case 'drawRectangle':
+            case 'drawEllipse': {
+                const x = out[i + 2];
+                const y = out[i + 3];
+                const w = out[i + 4];
+                const h = out[i + 5];
+                const mx = mapper.mapX(x);
+                const my = mapper.mapY(y);
+                out[i + 2] = mx;
+                out[i + 3] = my;
+                out[i + 4] = mapper.mapX(x + w) - mx;
+                out[i + 5] = mapper.mapY(y + h) - my;
+                break;
+            }
+            case 'drawRoundRectangle': {
+                const x = out[i + 2];
+                const y = out[i + 3];
+                const w = out[i + 4];
+                const h = out[i + 5];
+                const mx = mapper.mapX(x);
+                const my = mapper.mapY(y);
+                out[i + 2] = mx;
+                out[i + 3] = my;
+                out[i + 4] = mapper.mapX(x + w) - mx;
+                out[i + 5] = mapper.mapY(y + h) - my;
+                break;
+            }
+            case 'drawCircle':
+                out[i + 2] = mapper.mapX(out[i + 2]);
+                out[i + 3] = mapper.mapY(out[i + 3]);
+                break;
+            case 'drawPath':
+                remapPathData(_remappedPathData, out[i + 3], out[i + 2], mapper);
+                out[i + 3] = _remappedPathData;
+                break;
+        }
+        i += argCount + 2;
+    }
+}
+function remapPathData(out, source, cmds, mapper) {
+    if (out !== source) {
+        out.length = source.length;
+        for (let k = 0; k < source.length; k++)
+            out[k] = source[k];
+    }
+    let di = 0;
+    for (const pc of cmds) {
+        switch (pc) {
+            case 1: // MOVE_TO [x, y]
+            case 2: // LINE_TO [x, y]
+                out[di] = mapper.mapX(out[di]);
+                out[di + 1] = mapper.mapY(out[di + 1]);
+                di += 2;
+                break;
+            case 3: // CURVE_TO [cx, cy, ax, ay]
+                out[di] = mapper.mapX(out[di]);
+                out[di + 1] = mapper.mapY(out[di + 1]);
+                out[di + 2] = mapper.mapX(out[di + 2]);
+                out[di + 3] = mapper.mapY(out[di + 3]);
+                di += 4;
+                break;
+            case 4: // WIDE_MOVE_TO [?, ?, x, y]
+            case 5: // WIDE_LINE_TO [?, ?, x, y]
+                out[di + 2] = mapper.mapX(out[di + 2]);
+                out[di + 3] = mapper.mapY(out[di + 3]);
+                di += 4;
+                break;
+            case 6: // CUBIC_CURVE_TO [cx1, cy1, cx2, cy2, ax, ay]
+                out[di] = mapper.mapX(out[di]);
+                out[di + 1] = mapper.mapY(out[di + 1]);
+                out[di + 2] = mapper.mapX(out[di + 2]);
+                out[di + 3] = mapper.mapY(out[di + 3]);
+                out[di + 4] = mapper.mapX(out[di + 4]);
+                out[di + 5] = mapper.mapY(out[di + 5]);
+                di += 6;
+                break;
+            default:
+                break;
+        }
+    }
+}
+const _remappedPathData = [];
+//# sourceMappingURL=scale9ShapeCommands.js.map

package/dist/scale9ShapeCommands.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"scale9ShapeCommands.js","sourceRoot":"","sources":["../src/scale9ShapeCommands.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flighthq/shape",
-  "version": "0.3.0-next.1530.70058bd",
+  "version": "0.3.0-next.1560.03a2b36",
   "repository": {
     "type": "git",
     "url": "https://github.com/flighthq/flight.git",
@@ -36,11 +36,11 @@
     "clean:dist": "tsx ../../scripts/clean-package-dist.ts"
   },
   "dependencies": {
-    "@flighthq/scene2d": "0.3.0-next.1530.70058bd",
-    "@flighthq/geometry": "0.3.0-next.1530.70058bd",
-    "@flighthq/node": "0.3.0-next.1530.70058bd",
-    "@flighthq/path": "0.3.0-next.1530.70058bd",
-    "@flighthq/types": "0.3.0-next.1530.70058bd"
+    "@flighthq/scene2d": "0.3.0-next.1560.03a2b36",
+    "@flighthq/geometry": "0.3.0-next.1560.03a2b36",
+    "@flighthq/node": "0.3.0-next.1560.03a2b36",
+    "@flighthq/path": "0.3.0-next.1560.03a2b36",
+    "@flighthq/types": "0.3.0-next.1560.03a2b36"
   },
   "devDependencies": {
     "typescript": "^5.3.0"

package/src/scale9ShapeCommands.test.ts

@@ -0,0 +1,64 @@
+import type { ShapeCommandToken } from '@flighthq/types/contract';
+
+import { createScale9Shape } from './scale9Shape';
+import { mapScale9ShapeCommands } from './scale9ShapeCommands';
+import { appendShapeBeginFill, appendShapeRectangle } from './shapeCommands';
+
+const grid = { x: 10, y: 10, width: 80, height: 80 };
+
+describe('mapScale9ShapeCommands', () => {
+  const out: ShapeCommandToken[] = [];
+
+  it('passes style commands through unchanged', () => {
+    const mapper = { mapX: (x: number) => x, mapY: (y: number) => y };
+    mapScale9ShapeCommands(out, ['beginFill', 2, 0xff0000, 1], mapper);
+    expect(out).toEqual(['beginFill', 2, 0xff0000, 1]);
+  });
+
+  it('remaps moveTo coordinates', () => {
+    const mapper = { mapX: (x: number) => x * 2, mapY: (y: number) => y * 3 };
+    mapScale9ShapeCommands(out, ['moveTo', 2, 10, 20], mapper);
+    expect(out).toEqual(['moveTo', 2, 20, 60]);
+  });
+
+  it('remaps lineTo coordinates', () => {
+    const mapper = { mapX: (x: number) => x + 5, mapY: (y: number) => y + 10 };
+    mapScale9ShapeCommands(out, ['lineTo', 2, 100, 50], mapper);
+    expect(out).toEqual(['lineTo', 2, 105, 60]);
+  });
+
+  it('remaps drawRectangle corners and recomputes size', () => {
+    const mapper = { mapX: (x: number) => x * 2, mapY: (y: number) => y * 2 };
+    mapScale9ShapeCommands(out, ['drawRectangle', 4, 10, 20, 50, 30], mapper);
+    // x=10→20, y=20→40, x+w=60→120 (w=100), y+h=50→100 (h=60)
+    expect(out).toEqual(['drawRectangle', 4, 20, 40, 100, 60]);
+  });
+
+  it('remaps drawRoundRectangle corners but leaves ellipse radii unchanged', () => {
+    const mapper = { mapX: (x: number) => x * 2, mapY: (y: number) => y * 2 };
+    mapScale9ShapeCommands(out, ['drawRoundRectangle', 6, 10, 20, 50, 30, 8, 8], mapper);
+    expect(out).toEqual(['drawRoundRectangle', 6, 20, 40, 100, 60, 8, 8]);
+  });
+
+  it('remaps drawCircle center but leaves radius unchanged', () => {
+    const mapper = { mapX: (x: number) => x + 5, mapY: (y: number) => y + 10 };
+    mapScale9ShapeCommands(out, ['drawCircle', 3, 50, 50, 25], mapper);
+    expect(out).toEqual(['drawCircle', 3, 55, 60, 25]);
+  });
+
+  it('remaps drawEllipse corners and recomputes size', () => {
+    const mapper = { mapX: (x: number) => x * 2, mapY: (y: number) => y * 2 };
+    mapScale9ShapeCommands(out, ['drawEllipse', 4, 0, 0, 100, 50], mapper);
+    expect(out).toEqual(['drawEllipse', 4, 0, 0, 200, 100]);
+  });
+
+  it('returns a buffer with the same element count as the input', () => {
+    const shape = createScale9Shape(grid);
+    appendShapeBeginFill(shape, 0xff0000);
+    appendShapeRectangle(shape, 0, 0, 100, 100);
+    // A mapper is any pair of coordinate functions; building one from a grid is a renderer's job, and
+    // the rewrite under test does not care where the mapping came from.
+    mapScale9ShapeCommands(out, shape.data.commands, { mapX: (x) => x * 2, mapY: (y) => y * 2 });
+    expect(out).toHaveLength(shape.data.commands.length);
+  });
+});