@flighthq/scene2d-formats 0.3.0 → 0.3.1-next.320.fe56fc2

package/src/riveShapePath.test.ts

@@ -1,5 +1,6 @@
+import { collectImportDiagnostics } from '@flighthq/importdiagnostics/contract';
 import type { RiveArtboardGraph, RiveCoreObject } from '@flighthq/types/contract';
-import { PathCommand, RiveFieldType } from '@flighthq/types/contract';
+import { ImportDiagnosticSeverity, PathCommand, RiveFieldType } from '@flighthq/types/contract';
 
 import { createRivePath } from './riveShapePath';
 
@@ -18,12 +19,51 @@ const STRAIGHT_VERTEX = 5;
 const CUBIC_DETACHED_VERTEX = 6;
 const CUBIC_MIRRORED_VERTEX = 35;
 const CUBIC_ASYMMETRIC_VERTEX = 34;
+const PARAMETRIC_PATH = 15;
 
 describe('createRivePath', () => {
   it('returns null for a component that is not a path', () => {
     expect(createRivePath(object(SHAPE, {}), artboardOf([object(SHAPE, {})]), 0)).toBeNull();
   });
 
+  it('reports a path kind it does not build, which an empty result cannot be told apart from', () => {
+    // A caller sees the same empty result whether the kind was unsupported or a points path legitimately
+    // stated no vertices. Only one of those lost something.
+    const diagnostics = collectImportDiagnostics((sink) => {
+      expect(createRivePath(object(SHAPE, {}), artboardOf([object(SHAPE, {})]), 0, sink)).toBeNull();
+    });
+
+    expect(diagnostics).toHaveLength(1);
+    expect(diagnostics[0].kind).toBe('rive.path-kind-unsupported');
+    expect(diagnostics[0].severity).toBe(ImportDiagnosticSeverity.Drop);
+    expect(diagnostics[0].detail).toEqual({ typeKey: SHAPE });
+  });
+
+  it('reports an unrecognised parametric kind, which is drawn as a rectangle rather than dropped', () => {
+    // Reaching this needs a parametric type none of the four handled cases covers. `ParametricPath`
+    // itself is the only one in today's table; the case that matters in the field is a NEWER Rive shape
+    // kind this importer has not learned, which lands here identically.
+    let path: ReturnType<typeof createRivePath> = null;
+    const diagnostics = collectImportDiagnostics((sink) => {
+      const source = object(PARAMETRIC_PATH, { 20: 10, 21: 10 });
+      path = createRivePath(source, artboardOf([source]), 0, sink);
+    });
+
+    expect(diagnostics).toHaveLength(1);
+    expect(diagnostics[0].kind).toBe('rive.parametric-path-substituted');
+    expect(diagnostics[0].severity).toBe(ImportDiagnosticSeverity.Recover);
+    expect(diagnostics[0].detail).toEqual({ substitutedAs: 'rectangle', typeKey: PARAMETRIC_PATH });
+    // The substitution itself, not merely the report: the geometry really is a closed four-sided box.
+    expect(path).not.toBeNull();
+    expect(path!.commands).toEqual([
+      PathCommand.MOVE_TO,
+      PathCommand.LINE_TO,
+      PathCommand.LINE_TO,
+      PathCommand.LINE_TO,
+      PathCommand.CLOSE,
+    ]);
+  });
+
   it('builds an open polyline from straight vertices', () => {
     const path = pointsPath(false, [
       object(STRAIGHT_VERTEX, { 24: 0, 25: 0 }),

package/src/svgDocumentConformance.test.ts

@@ -386,6 +386,40 @@ describe('SVG conformance matrix', () => {
     expect(text.data.textFormatRanges[0].format.color).toBe(0x0000ffff);
   });
 
+  it('keeps fill-none text transparent while a painted tspan remains visible', () => {
+    const root = createScene2DFromSvgDocument('<svg><text fill="none">A<tspan fill="red">B</tspan></text></svg>');
+    const text = getNodeChildAt(root, 0) as RichText;
+
+    expect(text.data.text).toBe('AB');
+    expect(text.data.textFormat.color).toBe(0x00000000);
+    expect(text.data.textFormatRanges[0].format.color).toBe(0xff0000ff);
+  });
+
+  it('omits hidden tspan content while permitting a visible descendant override', () => {
+    const root = createScene2DFromSvgDocument(
+      '<svg><text>A<tspan visibility="hidden">B<tspan visibility="visible">C</tspan></tspan>' +
+        '<tspan display="none">D<tspan display="inline">E</tspan></tspan>F</text></svg>',
+    );
+    const text = getNodeChildAt(root, 0) as RichText;
+
+    expect(text.data.text).toBe('ACF');
+  });
+
+  it('composes nested tspan opacity without applying the text opacity twice', () => {
+    const root = createScene2DFromSvgDocument(
+      '<svg><text opacity=".8">A<tspan opacity=".5">B<tspan opacity=".5">C</tspan></tspan></text></svg>',
+    );
+    const text = getNodeChildAt(root, 0) as RichText;
+
+    expect(text.data.text).toBe('ABC');
+    expect(text.alpha).toBeCloseTo(0.8);
+    expect(text.data.textFormat.color).toBe(0x000000ff);
+    expect(text.data.textFormatRanges).toEqual([
+      expect.objectContaining({ end: 2, format: expect.objectContaining({ color: 0x00000080 }), start: 1 }),
+      expect.objectContaining({ end: 3, format: expect.objectContaining({ color: 0x00000040 }), start: 2 }),
+    ]);
+  });
+
   it('suppresses display none while allowing visibility descendants to override', () => {
     const root = createScene2DFromSvgDocument(`
       <svg>