@flighthq/textlayout 0.5.1-next.1350.8ce488b → 0.5.1-next.1404.457d1da

package/README.md

@@ -13,5 +13,5 @@ Import the supported application-facing API from `@flighthq/textlayout`. The `@f
 This package is part of the locked-version Flight SDK graph. Applications may instead install and import `@flighthq/sdk` when package-level tree shaking is sufficient.
 
 - [Flight project](https://github.com/flighthq/flight)
-- [Source for @flighthq/textlayout@0.5.1-next.1350.8ce488b](https://github.com/flighthq/flight/tree/8ce488bfe444eded2fb281e7b9696e5ce7fabdc0/packages/textlayout)
-- [License](https://github.com/flighthq/flight/blob/8ce488bfe444eded2fb281e7b9696e5ce7fabdc0/LICENSE.md)
+- [Source for @flighthq/textlayout@0.5.1-next.1404.457d1da](https://github.com/flighthq/flight/tree/457d1da918a60be5853b84eb6c25530a66662cef/packages/textlayout)
+- [License](https://github.com/flighthq/flight/blob/457d1da918a60be5853b84eb6c25530a66662cef/LICENSE.md)

package/dist/textLayoutMeasure.d.ts

@@ -1,4 +1,4 @@
-import type { TextMeasureFunction } from '@flighthq/types/contract';
-export declare function getTextLayoutMeasureProvider(): TextMeasureFunction | null;
+import type { HostTextShaperCapability, TextMeasureFunction } from '@flighthq/types/contract';
+export declare function getTextLayoutMeasureProvider(hostTextShaper?: Readonly<HostTextShaperCapability>): TextMeasureFunction | null;
 export declare function setTextLayoutMeasureProvider(measure: TextMeasureFunction | null): void;
 //# sourceMappingURL=textLayoutMeasure.d.ts.map

package/dist/textLayoutMeasure.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"textLayoutMeasure.d.ts","sourceRoot":"","sources":["../src/textLayoutMeasure.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AASpE,wBAAgB,4BAA4B,IAAI,mBAAmB,GAAG,IAAI,CAIzE;AAKD,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI,GAAG,IAAI,CAEtF"}
+{"version":3,"file":"textLayoutMeasure.d.ts","sourceRoot":"","sources":["../src/textLayoutMeasure.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAO9F,wBAAgB,4BAA4B,CAC1C,cAAc,CAAC,EAAE,QAAQ,CAAC,wBAAwB,CAAC,GAClD,mBAAmB,GAAG,IAAI,CAI5B;AAMD,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI,GAAG,IAAI,CAEtF"}

package/dist/textLayoutMeasure.js

@@ -1,21 +1,20 @@
-import { getTextShaperBackend, measureText } from '@flighthq/textshaper/contract';
-// Resolves the text-measurement provider text-layout uses to turn characters into advances. Shaping
-// is now owned by the @flighthq/textshaper seam: when a shaper backend is registered (the canvas
-// backend from @flighthq/textshaper-canvas, or a future HarfBuzz one), this returns measureText,
-// which is itself a TextMeasureFunction. An explicitly set provider (setTextLayoutMeasureProvider) still
-// takes precedence — it is the direct-injection escape hatch for tests and bespoke hosts. Null when
-// neither exists, exactly as before, so ensureRichTextLayout leaves the layout stale until shaping is
-// available.
-export function getTextLayoutMeasureProvider() {
+import { measureText } from '@flighthq/textshaper/contract';
+// Resolves the text-measurement provider text-layout uses to turn characters into advances. When a
+// HostTextShaperCapability is supplied, it returns a bound measure function that delegates to
+// measureText. An explicitly set provider (setTextLayoutMeasureProvider) still takes precedence — it
+// is the direct-injection escape hatch for tests and bespoke hosts. Null when neither exists,
+// exactly as before, so ensureRichTextLayout leaves the layout stale until shaping is available.
+export function getTextLayoutMeasureProvider(hostTextShaper) {
     if (_measureProvider !== null)
         return _measureProvider;
-    if (getTextShaperBackend() !== null)
-        return measureText;
+    if (hostTextShaper !== undefined)
+        return (text, format) => measureText(hostTextShaper, text, format);
     return null;
 }
 // Installs an explicit measure provider, bypassing the shaper seam. Pass null to clear it and fall
-// back to the registered shaper backend. Prefer setTextShaperBackend for normal setup; this remains
-// for direct injection (tests, a host wiring its own measure without a full HostTextShaperProvider).
+// back to the host text shaper. Prefer passing a HostTextShaperCapability to
+// getTextLayoutMeasureProvider for normal setup; this remains for direct injection (tests, a host
+// wiring its own measure without a full HostTextShaperCapability).
 export function setTextLayoutMeasureProvider(measure) {
     _measureProvider = measure;
 }

package/dist/textLayoutMeasure.js.map

@@ -1 +1 @@
-{"version":3,"file":"textLayoutMeasure.js","sourceRoot":"","sources":["../src/textLayoutMeasure.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAGlF,oGAAoG;AACpG,iGAAiG;AACjG,iGAAiG;AACjG,yGAAyG;AACzG,oGAAoG;AACpG,sGAAsG;AACtG,aAAa;AACb,MAAM,UAAU,4BAA4B;IAC1C,IAAI,gBAAgB,KAAK,IAAI;QAAE,OAAO,gBAAgB,CAAC;IACvD,IAAI,oBAAoB,EAAE,KAAK,IAAI;QAAE,OAAO,WAAW,CAAC;IACxD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,mGAAmG;AACnG,oGAAoG;AACpG,qGAAqG;AACrG,MAAM,UAAU,4BAA4B,CAAC,OAAmC;IAC9E,gBAAgB,GAAG,OAAO,CAAC;AAC7B,CAAC;AAED,IAAI,gBAAgB,GAA+B,IAAI,CAAC"}
+{"version":3,"file":"textLayoutMeasure.js","sourceRoot":"","sources":["../src/textLayoutMeasure.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAG5D,mGAAmG;AACnG,8FAA8F;AAC9F,qGAAqG;AACrG,8FAA8F;AAC9F,iGAAiG;AACjG,MAAM,UAAU,4BAA4B,CAC1C,cAAmD;IAEnD,IAAI,gBAAgB,KAAK,IAAI;QAAE,OAAO,gBAAgB,CAAC;IACvD,IAAI,cAAc,KAAK,SAAS;QAAE,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,WAAW,CAAC,cAAc,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IACrG,OAAO,IAAI,CAAC;AACd,CAAC;AAED,mGAAmG;AACnG,6EAA6E;AAC7E,kGAAkG;AAClG,mEAAmE;AACnE,MAAM,UAAU,4BAA4B,CAAC,OAAmC;IAC9E,gBAAgB,GAAG,OAAO,CAAC;AAC7B,CAAC;AAED,IAAI,gBAAgB,GAA+B,IAAI,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flighthq/textlayout",
-  "version": "0.5.1-next.1350.8ce488b",
+  "version": "0.5.1-next.1404.457d1da",
   "author": "Joshua Granick and other contributors",
   "license": "MIT",
   "repository": {
@@ -38,9 +38,9 @@
     "clean:dist": "tsx ../../scripts/clean-package-dist.ts"
   },
   "dependencies": {
-    "@flighthq/entity": "0.5.1-next.1350.8ce488b",
-    "@flighthq/textshaper": "0.5.1-next.1350.8ce488b",
-    "@flighthq/types": "0.5.1-next.1350.8ce488b"
+    "@flighthq/entity": "0.5.1-next.1404.457d1da",
+    "@flighthq/textshaper": "0.5.1-next.1404.457d1da",
+    "@flighthq/types": "0.5.1-next.1404.457d1da"
   },
   "devDependencies": {
     "typescript": "^5.3.0"

package/src/textLayoutMeasure.test.ts

@@ -1,27 +1,28 @@
-import { measureText, setTextShaperBackend } from '@flighthq/textshaper/contract';
+import type { HostTextShaperCapability } from '@flighthq/types/contract';
 
 import { getTextLayoutMeasureProvider, setTextLayoutMeasureProvider } from './textLayoutMeasure';
 
 afterEach(() => {
   setTextLayoutMeasureProvider(null);
-  setTextShaperBackend(null);
 });
 
 describe('getTextLayoutMeasureProvider', () => {
-  it('returns null before a provider or shaper backend is set', () => {
+  it('returns null before a provider or host text shaper is supplied', () => {
     expect(getTextLayoutMeasureProvider()).toBeNull();
   });
 
-  it('falls back to the textshaper seam when a backend is registered', () => {
-    setTextShaperBackend({ measureText: (text) => text.length });
-    expect(getTextLayoutMeasureProvider()).toBe(measureText);
+  it('returns a bound measure function when a host text shaper is provided', () => {
+    const backend: HostTextShaperCapability = { measureText: (text) => text.length };
+    const measure = getTextLayoutMeasureProvider(backend);
+    expect(measure).not.toBeNull();
+    expect(measure!('abc', {})).toBe(3);
   });
 
-  it('prefers an explicitly set provider over the shaper backend', () => {
-    const measure = (text: string) => text.length;
-    setTextShaperBackend({ measureText: () => 99 });
-    setTextLayoutMeasureProvider(measure);
-    expect(getTextLayoutMeasureProvider()).toBe(measure);
+  it('prefers an explicitly set provider over the host text shaper', () => {
+    const explicit = (text: string) => text.length * 10;
+    const backend: HostTextShaperCapability = { measureText: () => 99 };
+    setTextLayoutMeasureProvider(explicit);
+    expect(getTextLayoutMeasureProvider(backend)).toBe(explicit);
   });
 });