@flighthq/font 0.1.0 → 0.2.0

package/dist/fontFormat.d.ts

@@ -1,2 +1,3 @@
-export declare function inferFontFormat(url: string): string | null;
+export declare function detectFontFormat(bytes: ArrayBuffer | Uint8Array): string | null;
+export declare function inferFontFormatFromUrl(url: string): string | null;
 //# sourceMappingURL=fontFormat.d.ts.map

package/dist/fontFormat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fontFormat.d.ts","sourceRoot":"","sources":["../src/fontFormat.ts"],"names":[],"mappings":"AAAA,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAkB1D"}
+{"version":3,"file":"fontFormat.d.ts","sourceRoot":"","sources":["../src/fontFormat.ts"],"names":[],"mappings":"AAAA,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,WAAW,GAAG,UAAU,GAAG,MAAM,GAAG,IAAI,CAuB/E;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAkBjE"}

package/dist/fontFormat.js

@@ -1,4 +1,28 @@
-export function inferFontFormat(url) {
+export function detectFontFormat(bytes) {
+    const b = bytes instanceof Uint8Array ? bytes : new Uint8Array(bytes);
+    if (b.byteLength < 4)
+        return null;
+    // sfnt version 0x00010000 → TrueType outlines
+    if (b[0] === 0x00 && b[1] === 0x01 && b[2] === 0x00 && b[3] === 0x00)
+        return 'truetype';
+    // 'OTTO' → CFF/OpenType outlines
+    if (b[0] === 0x4f && b[1] === 0x54 && b[2] === 0x54 && b[3] === 0x4f)
+        return 'opentype';
+    // 'wOFF' → WOFF
+    if (b[0] === 0x77 && b[1] === 0x4f && b[2] === 0x46 && b[3] === 0x46)
+        return 'woff';
+    // 'wOF2' → WOFF2
+    if (b[0] === 0x77 && b[1] === 0x4f && b[2] === 0x46 && b[3] === 0x32)
+        return 'woff2';
+    // 'ttcf' → TrueType/OpenType Collection
+    if (b[0] === 0x74 && b[1] === 0x74 && b[2] === 0x63 && b[3] === 0x66)
+        return 'collection';
+    // 'true' → legacy Apple TrueType
+    if (b[0] === 0x74 && b[1] === 0x72 && b[2] === 0x75 && b[3] === 0x65)
+        return 'truetype';
+    return null;
+}
+export function inferFontFormatFromUrl(url) {
     const ext = url.split('?')[0].split('.').pop()?.toLowerCase();
     switch (ext) {
         case 'woff':

package/dist/fontFormat.js.map

@@ -1 +1 @@
-{"version":3,"file":"fontFormat.js","sourceRoot":"","sources":["../src/fontFormat.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,eAAe,CAAC,GAAW;IACzC,MAAM,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,WAAW,EAAE,CAAC;IAC9D,QAAQ,GAAG,EAAE,CAAC;QACZ,KAAK,MAAM;YACT,OAAO,MAAM,CAAC;QAChB,KAAK,OAAO;YACV,OAAO,OAAO,CAAC;QACjB,KAAK,KAAK;YACR,OAAO,UAAU,CAAC;QACpB,KAAK,KAAK;YACR,OAAO,UAAU,CAAC;QACpB,KAAK,KAAK;YACR,OAAO,mBAAmB,CAAC;QAC7B,KAAK,KAAK;YACR,OAAO,KAAK,CAAC;QACf;YACE,OAAO,IAAI,CAAC;IAChB,CAAC;AACH,CAAC"}
+{"version":3,"file":"fontFormat.js","sourceRoot":"","sources":["../src/fontFormat.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,gBAAgB,CAAC,KAA+B;IAC9D,MAAM,CAAC,GAAG,KAAK,YAAY,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC;IACtE,IAAI,CAAC,CAAC,UAAU,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC;IAElC,8CAA8C;IAC9C,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI;QAAE,OAAO,UAAU,CAAC;IAExF,iCAAiC;IACjC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI;QAAE,OAAO,UAAU,CAAC;IAExF,gBAAgB;IAChB,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI;QAAE,OAAO,MAAM,CAAC;IAEpF,iBAAiB;IACjB,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI;QAAE,OAAO,OAAO,CAAC;IAErF,wCAAwC;IACxC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI;QAAE,OAAO,YAAY,CAAC;IAE1F,iCAAiC;IACjC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI;QAAE,OAAO,UAAU,CAAC;IAExF,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,GAAW;IAChD,MAAM,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,WAAW,EAAE,CAAC;IAC9D,QAAQ,GAAG,EAAE,CAAC;QACZ,KAAK,MAAM;YACT,OAAO,MAAM,CAAC;QAChB,KAAK,OAAO;YACV,OAAO,OAAO,CAAC;QACjB,KAAK,KAAK;YACR,OAAO,UAAU,CAAC;QACpB,KAAK,KAAK;YACR,OAAO,UAAU,CAAC;QACpB,KAAK,KAAK;YACR,OAAO,mBAAmB,CAAC;QAC7B,KAAK,KAAK;YACR,OAAO,KAAK,CAAC;QACf;YACE,OAAO,IAAI,CAAC;IAChB,CAAC;AACH,CAAC"}

package/dist/fontFrom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fontFrom.d.ts","sourceRoot":"","sources":["../src/fontFrom.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAKrD,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQxF;AAED,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAGlE;AAED,wBAAsB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAKhF;AAED,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAWxF"}
+{"version":3,"file":"fontFrom.d.ts","sourceRoot":"","sources":["../src/fontFrom.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAMrD,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQxF;AAED,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAGlE;AAED,wBAAsB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAKhF;AAED,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAWxF"}

package/dist/fontFrom.js

@@ -1,5 +1,6 @@
 import { createFont } from './font';
-import { inferFontFormat } from './fontFormat';
+import { inferFontFormatFromUrl } from './fontFormat';
+import { getFontShorthand } from './fontShorthand';
 export async function loadFontFromBytes(bytes, family) {
     const face = new FontFace(family, bytes.buffer.slice(bytes.byteOffset, bytes.byteOffset + bytes.byteLength));
     await face.load();
@@ -7,7 +8,7 @@ export async function loadFontFromBytes(bytes, family) {
     return createFont(family);
 }
 export async function loadFontFromName(name) {
-    await document.fonts.load(`1em '${name}'`);
+    await document.fonts.load(getFontShorthand(name));
     return createFont(name);
 }
 export async function loadFontFromUrl(url, family) {
@@ -19,7 +20,7 @@ export async function loadFontFromUrl(url, family) {
 export async function loadFontFromUrls(sources, family) {
     const src = sources
         .map(({ url, format }) => {
-        const fmt = format ?? inferFontFormat(url);
+        const fmt = format ?? inferFontFormatFromUrl(url);
         return fmt !== null ? `url(${url}) format('${fmt}')` : `url(${url})`;
     })
         .join(', ');

package/dist/fontFrom.js.map

@@ -1 +1 @@
-{"version":3,"file":"fontFrom.js","sourceRoot":"","sources":["../src/fontFrom.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,KAAiB,EAAE,MAAc;IACvE,MAAM,IAAI,GAAG,IAAI,QAAQ,CACvB,MAAM,EACL,KAAK,CAAC,MAAsB,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC,CAC3F,CAAC;IACF,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;IAClB,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACzB,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC;AAC5B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,IAAY;IACjD,MAAM,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,IAAI,GAAG,CAAC,CAAC;IAC3C,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,GAAW,EAAE,MAAc;IAC/D,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,MAAM,EAAE,OAAO,GAAG,GAAG,CAAC,CAAC;IACjD,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;IAClB,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACzB,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC;AAC5B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,OAAkB,EAAE,MAAc;IACvE,MAAM,GAAG,GAAG,OAAO;SAChB,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE;QACvB,MAAM,GAAG,GAAG,MAAM,IAAI,eAAe,CAAC,GAAG,CAAC,CAAC;QAC3C,OAAO,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,OAAO,GAAG,aAAa,GAAG,IAAI,CAAC,CAAC,CAAC,OAAO,GAAG,GAAG,CAAC;IACvE,CAAC,CAAC;SACD,IAAI,CAAC,IAAI,CAAC,CAAC;IACd,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACvC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;IAClB,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACzB,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC;AAC5B,CAAC"}
+{"version":3,"file":"fontFrom.js","sourceRoot":"","sources":["../src/fontFrom.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEnD,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,KAAiB,EAAE,MAAc;IACvE,MAAM,IAAI,GAAG,IAAI,QAAQ,CACvB,MAAM,EACL,KAAK,CAAC,MAAsB,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC,CAC3F,CAAC;IACF,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;IAClB,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACzB,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC;AAC5B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,IAAY;IACjD,MAAM,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;IAClD,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,GAAW,EAAE,MAAc;IAC/D,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,MAAM,EAAE,OAAO,GAAG,GAAG,CAAC,CAAC;IACjD,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;IAClB,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACzB,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC;AAC5B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,OAAkB,EAAE,MAAc;IACvE,MAAM,GAAG,GAAG,OAAO;SAChB,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE;QACvB,MAAM,GAAG,GAAG,MAAM,IAAI,sBAAsB,CAAC,GAAG,CAAC,CAAC;QAClD,OAAO,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,OAAO,GAAG,aAAa,GAAG,IAAI,CAAC,CAAC,CAAC,OAAO,GAAG,GAAG,CAAC;IACvE,CAAC,CAAC;SACD,IAAI,CAAC,IAAI,CAAC,CAAC;IACd,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACvC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;IAClB,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACzB,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC;AAC5B,CAAC"}

package/dist/fontResourceFrom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fontResourceFrom.d.ts","sourceRoot":"","sources":["../src/fontResourceFrom.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAI7D,wBAAsB,yBAAyB,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,CAS3G;AAED,wBAAsB,wBAAwB,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CAIvF;AAED,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAMnG;AAED,wBAAsB,wBAAwB,CAAC,GAAG,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAY3G"}
+{"version":3,"file":"fontResourceFrom.d.ts","sourceRoot":"","sources":["../src/fontResourceFrom.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAK7D,wBAAsB,yBAAyB,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,CAS3G;AAED,wBAAsB,wBAAwB,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CAIvF;AAED,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAMnG;AAED,wBAAsB,wBAAwB,CAAC,GAAG,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAY3G"}

package/dist/fontResourceFrom.js

@@ -1,4 +1,5 @@
-import { inferFontFormat } from './fontFormat';
+import { inferFontFormatFromUrl } from './fontFormat';
+import { getFontShorthand } from './fontShorthand';
 export async function loadFontResourceFromBytes(out, bytes) {
     const face = new FontFace(out.family, bytes.buffer.slice(bytes.byteOffset, bytes.byteOffset + bytes.byteLength));
     await face.load();
@@ -7,7 +8,7 @@ export async function loadFontResourceFromBytes(out, bytes) {
     return out;
 }
 export async function loadFontResourceFromName(out) {
-    const faces = await document.fonts.load(`1em '${out.family}'`);
+    const faces = await document.fonts.load(getFontShorthand(out.family));
     if (faces.length > 0)
         out.face = faces[0];
     return out;
@@ -22,7 +23,7 @@ export async function loadFontResourceFromUrl(out, url) {
 export async function loadFontResourceFromUrls(out, sources) {
     const src = sources
         .map(({ url, format }) => {
-        const fmt = format ?? inferFontFormat(url);
+        const fmt = format ?? inferFontFormatFromUrl(url);
         return fmt !== null ? `url(${url}) format('${fmt}')` : `url(${url})`;
     })
         .join(', ');

package/dist/fontResourceFrom.js.map

@@ -1 +1 @@
-{"version":3,"file":"fontResourceFrom.js","sourceRoot":"","sources":["../src/fontResourceFrom.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAAC,GAAiB,EAAE,KAAiB;IAClF,MAAM,IAAI,GAAG,IAAI,QAAQ,CACvB,GAAG,CAAC,MAAM,EACT,KAAK,CAAC,MAAsB,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC,CAC3F,CAAC;IACF,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;IAClB,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACzB,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;IAChB,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAAC,GAAiB;IAC9D,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC;IAC/D,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;QAAE,GAAG,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IAC1C,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,GAAiB,EAAE,GAAW;IAC1E,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,GAAG,GAAG,CAAC,CAAC;IACrD,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;IAClB,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACzB,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;IAChB,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAAC,GAAiB,EAAE,OAAkB;IAClF,MAAM,GAAG,GAAG,OAAO;SAChB,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE;QACvB,MAAM,GAAG,GAAG,MAAM,IAAI,eAAe,CAAC,GAAG,CAAC,CAAC;QAC3C,OAAO,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,OAAO,GAAG,aAAa,GAAG,IAAI,CAAC,CAAC,CAAC,OAAO,GAAG,GAAG,CAAC;IACvE,CAAC,CAAC;SACD,IAAI,CAAC,IAAI,CAAC,CAAC;IACd,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3C,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;IAClB,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACzB,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;IAChB,OAAO,GAAG,CAAC;AACb,CAAC"}
+{"version":3,"file":"fontResourceFrom.js","sourceRoot":"","sources":["../src/fontResourceFrom.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEnD,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAAC,GAAiB,EAAE,KAAiB;IAClF,MAAM,IAAI,GAAG,IAAI,QAAQ,CACvB,GAAG,CAAC,MAAM,EACT,KAAK,CAAC,MAAsB,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC,CAC3F,CAAC;IACF,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;IAClB,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACzB,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;IAChB,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAAC,GAAiB;IAC9D,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IACtE,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;QAAE,GAAG,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IAC1C,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,GAAiB,EAAE,GAAW;IAC1E,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,GAAG,GAAG,CAAC,CAAC;IACrD,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;IAClB,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACzB,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;IAChB,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAAC,GAAiB,EAAE,OAAkB;IAClF,MAAM,GAAG,GAAG,OAAO;SAChB,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE;QACvB,MAAM,GAAG,GAAG,MAAM,IAAI,sBAAsB,CAAC,GAAG,CAAC,CAAC;QAClD,OAAO,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,OAAO,GAAG,aAAa,GAAG,IAAI,CAAC,CAAC,CAAC,OAAO,GAAG,GAAG,CAAC;IACvE,CAAC,CAAC;SACD,IAAI,CAAC,IAAI,CAAC,CAAC;IACd,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3C,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;IAClB,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACzB,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;IAChB,OAAO,GAAG,CAAC;AACb,CAAC"}

package/dist/fontShorthand.d.ts

@@ -0,0 +1,2 @@
+export declare function getFontShorthand(family: string, style?: string): string;
+//# sourceMappingURL=fontShorthand.d.ts.map

package/dist/fontShorthand.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fontShorthand.d.ts","sourceRoot":"","sources":["../src/fontShorthand.ts"],"names":[],"mappings":"AAAA,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAKvE"}

package/dist/fontShorthand.js

@@ -0,0 +1,7 @@
+export function getFontShorthand(family, style) {
+    // Backslash-escape backslashes and single quotes so a family name containing either
+    // cannot break out of the quoted CSS string in the `font` shorthand.
+    const quoted = `'${family.replace(/[\\']/g, '\\$&')}'`;
+    return style !== undefined && style !== '' ? `${style} 1em ${quoted}` : `1em ${quoted}`;
+}
+//# sourceMappingURL=fontShorthand.js.map

package/dist/fontShorthand.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fontShorthand.js","sourceRoot":"","sources":["../src/fontShorthand.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,gBAAgB,CAAC,MAAc,EAAE,KAAc;IAC7D,oFAAoF;IACpF,qEAAqE;IACrE,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC;IACvD,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,QAAQ,MAAM,EAAE,CAAC,CAAC,CAAC,OAAO,MAAM,EAAE,CAAC;AAC1F,CAAC"}

package/dist/fontStatus.d.ts

@@ -0,0 +1,3 @@
+export declare function isFontLoaded(family: string, style?: string): boolean;
+export declare function whenFontsReady(): Promise<void>;
+//# sourceMappingURL=fontStatus.d.ts.map

package/dist/fontStatus.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fontStatus.d.ts","sourceRoot":"","sources":["../src/fontStatus.ts"],"names":[],"mappings":"AAEA,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAEpE;AAED,wBAAsB,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,CAEpD"}

package/dist/fontStatus.js

@@ -0,0 +1,8 @@
+import { getFontShorthand } from './fontShorthand';
+export function isFontLoaded(family, style) {
+    return document.fonts.check(getFontShorthand(family, style));
+}
+export async function whenFontsReady() {
+    await document.fonts.ready;
+}
+//# sourceMappingURL=fontStatus.js.map

package/dist/fontStatus.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fontStatus.js","sourceRoot":"","sources":["../src/fontStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEnD,MAAM,UAAU,YAAY,CAAC,MAAc,EAAE,KAAc;IACzD,OAAO,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;AAC/D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc;IAClC,MAAM,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC;AAC7B,CAAC"}

package/dist/index.d.ts

@@ -3,4 +3,6 @@ export * from './fontFormat';
 export * from './fontFrom';
 export * from './fontResource';
 export * from './fontResourceFrom';
+export * from './fontShorthand';
+export * from './fontStatus';
 //# 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,cAAc,QAAQ,CAAC;AACvB,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC;AACvB,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC"}

package/dist/index.js

@@ -3,4 +3,6 @@ export * from './fontFormat';
 export * from './fontFrom';
 export * from './fontResource';
 export * from './fontResourceFrom';
+export * from './fontShorthand';
+export * from './fontStatus';
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC;AACvB,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC;AACvB,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC"}

package/package.json

@@ -1,6 +1,11 @@
 {
   "name": "@flighthq/font",
-  "version": "0.1.0",
+  "version": "0.2.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/flighthq/flight.git",
+    "directory": "packages/font"
+  },
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -27,8 +32,8 @@
     "clean:dist": "tsx ../../scripts/clean-package-dist.ts"
   },
   "dependencies": {
-    "@flighthq/entity": "0.1.0",
-    "@flighthq/types": "0.1.0"
+    "@flighthq/entity": "0.2.0",
+    "@flighthq/types": "0.2.0"
   },
   "devDependencies": {
     "typescript": "^5.3.0"

package/src/fontFormat.test.ts

@@ -1,43 +1,95 @@
-import { inferFontFormat } from './fontFormat';
+import { detectFontFormat, inferFontFormatFromUrl } from './fontFormat';
 
-describe('inferFontFormat', () => {
+function bytesOf(...values: number[]): Uint8Array {
+  return new Uint8Array(values);
+}
+
+function asciiBytes(text: string): Uint8Array {
+  const b = new Uint8Array(text.length);
+  for (let i = 0; i < text.length; i++) b[i] = text.charCodeAt(i);
+  return b;
+}
+
+describe('detectFontFormat', () => {
+  it('returns "truetype" for the 0x00010000 sfnt signature', () => {
+    expect(detectFontFormat(bytesOf(0x00, 0x01, 0x00, 0x00))).toBe('truetype');
+  });
+
+  it('returns "opentype" for the "OTTO" signature', () => {
+    expect(detectFontFormat(asciiBytes('OTTO'))).toBe('opentype');
+  });
+
+  it('returns "woff" for the "wOFF" signature', () => {
+    expect(detectFontFormat(asciiBytes('wOFF'))).toBe('woff');
+  });
+
+  it('returns "woff2" for the "wOF2" signature', () => {
+    expect(detectFontFormat(asciiBytes('wOF2'))).toBe('woff2');
+  });
+
+  it('returns "collection" for the "ttcf" signature', () => {
+    expect(detectFontFormat(asciiBytes('ttcf'))).toBe('collection');
+  });
+
+  it('returns "truetype" for the legacy "true" signature', () => {
+    expect(detectFontFormat(asciiBytes('true'))).toBe('truetype');
+  });
+
+  it('accepts an ArrayBuffer as well as a Uint8Array', () => {
+    expect(detectFontFormat(asciiBytes('wOFF').buffer as ArrayBuffer)).toBe('woff');
+  });
+
+  it('ignores trailing bytes past the 4-byte signature', () => {
+    expect(detectFontFormat(asciiBytes('OTTO with more data'))).toBe('opentype');
+  });
+
+  it('returns null for an unrecognized signature', () => {
+    expect(detectFontFormat(asciiBytes('%PDF'))).toBeNull();
+  });
+
+  it('returns null when there are fewer than 4 bytes', () => {
+    expect(detectFontFormat(bytesOf(0x00, 0x01, 0x00))).toBeNull();
+  });
+});
+
+describe('inferFontFormatFromUrl', () => {
   it('returns "woff" for .woff files', () => {
-    expect(inferFontFormat('font.woff')).toBe('woff');
+    expect(inferFontFormatFromUrl('font.woff')).toBe('woff');
   });
 
   it('returns "woff2" for .woff2 files', () => {
-    expect(inferFontFormat('font.woff2')).toBe('woff2');
+    expect(inferFontFormatFromUrl('font.woff2')).toBe('woff2');
   });
 
   it('returns "truetype" for .ttf files', () => {
-    expect(inferFontFormat('font.ttf')).toBe('truetype');
+    expect(inferFontFormatFromUrl('font.ttf')).toBe('truetype');
   });
 
   it('returns "opentype" for .otf files', () => {
-    expect(inferFontFormat('font.otf')).toBe('opentype');
+    expect(inferFontFormatFromUrl('font.otf')).toBe('opentype');
   });
 
   it('returns "embedded-opentype" for .eot files', () => {
-    expect(inferFontFormat('font.eot')).toBe('embedded-opentype');
+    expect(inferFontFormatFromUrl('font.eot')).toBe('embedded-opentype');
   });
 
   it('returns "svg" for .svg files', () => {
-    expect(inferFontFormat('font.svg')).toBe('svg');
+    expect(inferFontFormatFromUrl('font.svg')).toBe('svg');
   });
 
   it('returns null for unrecognized extensions', () => {
-    expect(inferFontFormat('font.bin')).toBeNull();
+    expect(inferFontFormatFromUrl('font.bin')).toBeNull();
   });
 
   it('strips query parameters before matching', () => {
-    expect(inferFontFormat('font.woff2?v=123')).toBe('woff2');
+    expect(inferFontFormatFromUrl('font.woff2?v=123')).toBe('woff2');
   });
 
   it('is case-insensitive', () => {
-    expect(inferFontFormat('font.WOFF2')).toBe('woff2');
+    expect(inferFontFormatFromUrl('font.WOFF2')).toBe('woff2');
   });
 
   it('returns null for a URL with no extension', () => {
-    expect(inferFontFormat('font')).toBeNull();
+    expect(inferFontFormatFromUrl('font')).toBeNull();
   });
 });

package/src/fontFrom.test.ts

@@ -1,17 +1,34 @@
 import { loadFontFromBytes, loadFontFromName, loadFontFromUrl, loadFontFromUrls } from './fontFrom';
 
+interface FontFaceConstruction {
+  family: string;
+  source: string | ArrayBuffer;
+  instance: MockFontFace;
+}
+
+let constructions: FontFaceConstruction[];
+let addMock: ReturnType<typeof vi.fn>;
+let loadMock: ReturnType<typeof vi.fn>;
+
 class MockFontFace {
   load = vi.fn().mockResolvedValue(undefined);
+  constructor(family: string, source: string | ArrayBuffer) {
+    const construction = { family, source, instance: this };
+    constructions.push(construction);
+  }
 }
 
 // Re-applied per test (not once) and torn down, so under a shared (isolate:false) worker with
 // unstubGlobals the FontFace stub survives every test and the document.fonts patch never leaks out.
 let originalFonts: PropertyDescriptor | undefined;
 beforeEach(() => {
+  constructions = [];
+  addMock = vi.fn();
+  loadMock = vi.fn().mockResolvedValue([]);
   vi.stubGlobal('FontFace', MockFontFace);
   originalFonts = Object.getOwnPropertyDescriptor(document, 'fonts');
   Object.defineProperty(document, 'fonts', {
-    value: { add: vi.fn(), load: vi.fn().mockResolvedValue([]) },
+    value: { add: addMock, load: loadMock },
     configurable: true,
   });
 });
@@ -29,6 +46,35 @@ describe('loadFontFromBytes', () => {
     const font = await loadFontFromBytes(new Uint8Array(0), 'TestFont');
     expect(font.name).toBe('TestFont');
   });
+
+  it('loads the face and registers it with document.fonts', async () => {
+    await loadFontFromBytes(new Uint8Array(8), 'TestFont');
+    expect(constructions).toHaveLength(1);
+    expect(constructions[0].family).toBe('TestFont');
+    expect(constructions[0].instance.load).toHaveBeenCalledOnce();
+    expect(addMock).toHaveBeenCalledWith(constructions[0].instance);
+  });
+
+  it('slices only the view bytes out of a larger backing buffer', async () => {
+    const backing = new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8]);
+    const view = backing.subarray(2, 6);
+    await loadFontFromBytes(view, 'TestFont');
+    const source = constructions[0].source as ArrayBuffer;
+    expect(new Uint8Array(source)).toEqual(new Uint8Array([3, 4, 5, 6]));
+  });
+
+  it('propagates a load failure and does not register the face', async () => {
+    const failing = new MockFontFace('', new ArrayBuffer(0));
+    failing.load.mockRejectedValue(new Error('bad font'));
+    vi.stubGlobal(
+      'FontFace',
+      vi.fn(function () {
+        return failing;
+      }),
+    );
+    await expect(loadFontFromBytes(new Uint8Array(4), 'TestFont')).rejects.toThrow('bad font');
+    expect(addMock).not.toHaveBeenCalled();
+  });
 });
 
 describe('loadFontFromName', () => {
@@ -36,6 +82,21 @@ describe('loadFontFromName', () => {
     const font = await loadFontFromName('MyFont');
     expect(font.name).toBe('MyFont');
   });
+
+  it('loads the family via the escaped font shorthand', async () => {
+    await loadFontFromName('MyFont');
+    expect(loadMock).toHaveBeenCalledWith("1em 'MyFont'");
+  });
+
+  it('escapes a single quote in the family name so the shorthand stays valid', async () => {
+    await loadFontFromName("Josh's Font");
+    expect(loadMock).toHaveBeenCalledWith("1em 'Josh\\'s Font'");
+  });
+
+  it('propagates a load failure', async () => {
+    loadMock.mockRejectedValue(new Error('no such font'));
+    await expect(loadFontFromName('MyFont')).rejects.toThrow('no such font');
+  });
 });
 
 describe('loadFontFromUrl', () => {
@@ -43,6 +104,13 @@ describe('loadFontFromUrl', () => {
     const font = await loadFontFromUrl('font.woff2', 'MyFont');
     expect(font.name).toBe('MyFont');
   });
+
+  it('builds a url() source and registers the face', async () => {
+    await loadFontFromUrl('font.woff2', 'MyFont');
+    expect(constructions[0].family).toBe('MyFont');
+    expect(constructions[0].source).toBe('url(font.woff2)');
+    expect(addMock).toHaveBeenCalledWith(constructions[0].instance);
+  });
 });
 
 describe('loadFontFromUrls', () => {
@@ -50,4 +118,28 @@ describe('loadFontFromUrls', () => {
     const font = await loadFontFromUrls([{ url: 'font.woff2', format: 'woff2' }], 'MyFont');
     expect(font.name).toBe('MyFont');
   });
+
+  it('composes a comma-joined src with explicit and inferred format() hints', async () => {
+    await loadFontFromUrls([{ url: 'font.woff2', format: 'woff2' }, { url: 'font.ttf' }], 'MyFont');
+    expect(constructions[0].source).toBe("url(font.woff2) format('woff2'), url(font.ttf) format('truetype')");
+    expect(addMock).toHaveBeenCalledWith(constructions[0].instance);
+  });
+
+  it('omits the format() hint when it cannot be inferred and none is given', async () => {
+    await loadFontFromUrls([{ url: 'font.bin' }], 'MyFont');
+    expect(constructions[0].source).toBe('url(font.bin)');
+  });
+
+  it('propagates a load failure and does not register the face', async () => {
+    const failing = new MockFontFace('', '');
+    failing.load.mockRejectedValue(new Error('bad url'));
+    vi.stubGlobal(
+      'FontFace',
+      vi.fn(function () {
+        return failing;
+      }),
+    );
+    await expect(loadFontFromUrls([{ url: 'font.woff2' }], 'MyFont')).rejects.toThrow('bad url');
+    expect(addMock).not.toHaveBeenCalled();
+  });
 });

package/src/fontShorthand.test.ts

@@ -0,0 +1,23 @@
+import { getFontShorthand } from './fontShorthand';
+
+describe('getFontShorthand', () => {
+  it('quotes a plain family name at 1em', () => {
+    expect(getFontShorthand('MyFont')).toBe("1em 'MyFont'");
+  });
+
+  it('backslash-escapes single quotes in the family name', () => {
+    expect(getFontShorthand("Josh's Font")).toBe("1em 'Josh\\'s Font'");
+  });
+
+  it('backslash-escapes backslashes in the family name', () => {
+    expect(getFontShorthand('Back\\slash')).toBe("1em 'Back\\\\slash'");
+  });
+
+  it('prefixes a style when provided', () => {
+    expect(getFontShorthand('MyFont', 'italic')).toBe("italic 1em 'MyFont'");
+  });
+
+  it('omits the style prefix for an empty style string', () => {
+    expect(getFontShorthand('MyFont', '')).toBe("1em 'MyFont'");
+  });
+});

package/src/fontStatus.test.ts

@@ -0,0 +1,49 @@
+import { isFontLoaded, whenFontsReady } from './fontStatus';
+
+let originalFonts: PropertyDescriptor | undefined;
+let checkMock: ReturnType<typeof vi.fn>;
+
+beforeEach(() => {
+  checkMock = vi.fn().mockReturnValue(true);
+  originalFonts = Object.getOwnPropertyDescriptor(document, 'fonts');
+  Object.defineProperty(document, 'fonts', {
+    value: { check: checkMock, ready: Promise.resolve() },
+    configurable: true,
+  });
+});
+
+afterEach(() => {
+  if (originalFonts) {
+    Object.defineProperty(document, 'fonts', originalFonts);
+  } else {
+    delete (document as unknown as { fonts?: unknown }).fonts;
+  }
+});
+
+describe('isFontLoaded', () => {
+  it('queries document.fonts.check with the family shorthand', () => {
+    expect(isFontLoaded('MyFont')).toBe(true);
+    expect(checkMock).toHaveBeenCalledWith("1em 'MyFont'");
+  });
+
+  it('includes the style in the shorthand when provided', () => {
+    isFontLoaded('MyFont', 'italic');
+    expect(checkMock).toHaveBeenCalledWith("italic 1em 'MyFont'");
+  });
+
+  it('escapes single quotes in the family name', () => {
+    isFontLoaded("Josh's Font");
+    expect(checkMock).toHaveBeenCalledWith("1em 'Josh\\'s Font'");
+  });
+
+  it('returns false when the font is not available', () => {
+    checkMock.mockReturnValue(false);
+    expect(isFontLoaded('Absent')).toBe(false);
+  });
+});
+
+describe('whenFontsReady', () => {
+  it('resolves once document.fonts.ready resolves', async () => {
+    await expect(whenFontsReady()).resolves.toBeUndefined();
+  });
+});