@flighthq/font 0.3.0-next.1032.e2b99fc → 0.3.0-next.1162.e90e518

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,0BAA0B,CAAC;AAKtE,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,0BAA0B,CAAC;AAWtE,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,5 +1,10 @@
 import { inferFontFormatFromUrl } from './fontFormat';
 import { getFontShorthand } from './fontShorthand';
+// These loaders fill a caller-owned FontResource. Each assigns `out.face` only after its load
+// resolves, which is the contract on failure: a rejected load leaves the resource on whatever face it
+// already had rather than blanking it, so a caller that swallows the rejection keeps rendering with a
+// working font instead of losing one. Assigning before the await would silently turn a failed reload
+// into a broken resource.
 export async function loadFontResourceFromBytes(out, bytes) {
     const face = new FontFace(out.family, bytes.buffer.slice(bytes.byteOffset, bytes.byteOffset + bytes.byteLength));
     await face.load();

package/dist/fontResourceFrom.js.map

@@ -1 +1 @@
-{"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"}
+{"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,8FAA8F;AAC9F,sGAAsG;AACtG,sGAAsG;AACtG,qGAAqG;AACrG,0BAA0B;AAE1B,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flighthq/font",
-  "version": "0.3.0-next.1032.e2b99fc",
+  "version": "0.3.0-next.1162.e90e518",
   "repository": {
     "type": "git",
     "url": "https://github.com/flighthq/flight.git",
@@ -36,8 +36,8 @@
     "clean:dist": "tsx ../../scripts/clean-package-dist.ts"
   },
   "dependencies": {
-    "@flighthq/entity": "0.3.0-next.1032.e2b99fc",
-    "@flighthq/types": "0.3.0-next.1032.e2b99fc"
+    "@flighthq/entity": "0.3.0-next.1162.e90e518",
+    "@flighthq/types": "0.3.0-next.1162.e90e518"
   },
   "devDependencies": {
     "typescript": "^5.3.0"

package/src/fontResourceFrom.test.ts

@@ -6,86 +6,231 @@ import {
   loadFontResourceFromUrls,
 } from './fontResourceFrom';
 
-let mockFace: { load: ReturnType<typeof vi.fn> };
+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) {
+    constructions.push({ family, source, instance: this });
+  }
+}
+
+// Mirrors the harness in fontFrom.test.ts, including its restore discipline: the document.fonts
+// descriptor is saved and put back per test rather than left overwritten, so under a shared
+// (isolate:false) worker the patch cannot leak into a sibling file.
+let originalFonts: PropertyDescriptor | undefined;
 beforeEach(() => {
-  mockFace = { load: vi.fn().mockResolvedValue(undefined) };
-  vi.stubGlobal(
-    'FontFace',
-    vi.fn(function () {
-      return mockFace;
-    }),
-  );
+  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() },
+    value: { add: addMock, load: loadMock },
     configurable: true,
-    writable: true,
   });
-  vi.spyOn(document.fonts, 'add').mockImplementation(() => document.fonts);
-  vi.spyOn(document.fonts, 'load').mockResolvedValue([mockFace as unknown as FontFace]);
 });
 
 afterEach(() => {
+  if (originalFonts) {
+    Object.defineProperty(document, 'fonts', originalFonts);
+  } else {
+    delete (document as unknown as { fonts?: unknown }).fonts;
+  }
   vi.unstubAllGlobals();
   vi.restoreAllMocks();
 });
 
 describe('loadFontResourceFromBytes', () => {
-  it('loads the face and attaches it to the resource', async () => {
+  it('constructs the face under the resource family, loads it, and registers it', async () => {
     const resource = createFontResource('TestFont');
     const result = await loadFontResourceFromBytes(resource, new Uint8Array(8));
     expect(result).toBe(resource);
-    expect(resource.face).toBe(mockFace);
-    expect(mockFace.load).toHaveBeenCalledOnce();
-    expect(document.fonts.add).toHaveBeenCalledWith(mockFace);
+    expect(constructions).toHaveLength(1);
+    expect(constructions[0].family).toBe('TestFont');
+    expect(constructions[0].instance.load).toHaveBeenCalledOnce();
+    expect(addMock).toHaveBeenCalledWith(constructions[0].instance);
+    expect(resource.face).toBe(constructions[0].instance);
+  });
+
+  it('slices only the view bytes out of a larger backing buffer', async () => {
+    // Same slice arithmetic as loadFontFromBytes. Tested on both because they are separate
+    // implementations: without this, a regression in one of the two would go unnoticed.
+    const backing = new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8]);
+    await loadFontResourceFromBytes(createFontResource('TestFont'), backing.subarray(2, 6));
+    expect(new Uint8Array(constructions[0].source as ArrayBuffer)).toEqual(new Uint8Array([3, 4, 5, 6]));
+  });
+
+  it('propagates a load failure and does not register the face', async () => {
+    const resource = createFontResource('TestFont');
+    const failing = new MockFontFace('TestFont', new ArrayBuffer(0));
+    failing.load.mockRejectedValue(new Error('bad font'));
+    vi.stubGlobal(
+      'FontFace',
+      vi.fn(function () {
+        return failing;
+      }),
+    );
+    await expect(loadFontResourceFromBytes(resource, new Uint8Array(4))).rejects.toThrow('bad font');
+    expect(addMock).not.toHaveBeenCalled();
+    expect(resource.face).toBeNull();
+  });
+
+  it('leaves a previously loaded face attached when a reload fails', async () => {
+    // The contract this pins: `face` is assigned only after the load resolves, so a failed reload
+    // rejects and leaves the resource on the font it already had rather than blanking it. A caller
+    // that ignores the rejection keeps rendering with a working font instead of losing one.
+    const resource = createFontResource('TestFont');
+    await loadFontResourceFromBytes(resource, new Uint8Array(4));
+    const loaded = resource.face;
+    expect(loaded).not.toBeNull();
+
+    const failing = new MockFontFace('TestFont', new ArrayBuffer(0));
+    failing.load.mockRejectedValue(new Error('boom'));
+    vi.stubGlobal(
+      'FontFace',
+      vi.fn(function () {
+        return failing;
+      }),
+    );
+    await expect(loadFontResourceFromBytes(resource, new Uint8Array(4))).rejects.toThrow('boom');
+    expect(resource.face).toBe(loaded);
+    expect(addMock).toHaveBeenCalledTimes(1);
   });
 });
 
 describe('loadFontResourceFromName', () => {
-  it('resolves a face already registered with the document', async () => {
+  it('queries the family via the escaped font shorthand', async () => {
+    await loadFontResourceFromName(createFontResource('MyFont'));
+    expect(loadMock).toHaveBeenCalledWith("1em 'MyFont'");
+  });
+
+  it('escapes a single quote in the family name so the shorthand stays valid', async () => {
+    await loadFontResourceFromName(createFontResource("Josh's Font"));
+    expect(loadMock).toHaveBeenCalledWith("1em 'Josh\\'s Font'");
+  });
+
+  it('attaches the first face when the document returns several', async () => {
+    const first = { family: 'first' } as unknown as FontFace;
+    const second = { family: 'second' } as unknown as FontFace;
+    loadMock.mockResolvedValue([first, second]);
     const resource = createFontResource('TestFont');
     const result = await loadFontResourceFromName(resource);
     expect(result).toBe(resource);
-    expect(resource.face).toBe(mockFace);
+    expect(resource.face).toBe(first);
   });
 
   it('leaves face null when no registered faces are found', async () => {
-    vi.spyOn(document.fonts, 'load').mockResolvedValue([]);
     const resource = createFontResource('UnknownFont');
     await loadFontResourceFromName(resource);
     expect(resource.face).toBeNull();
   });
+
+  it('registers nothing — a name lookup finds an existing face rather than adding one', async () => {
+    loadMock.mockResolvedValue([{ family: 'x' } as unknown as FontFace]);
+    await loadFontResourceFromName(createFontResource('TestFont'));
+    expect(addMock).not.toHaveBeenCalled();
+    expect(constructions).toHaveLength(0);
+  });
+
+  it('propagates a lookup failure', async () => {
+    loadMock.mockRejectedValue(new Error('no such font'));
+    await expect(loadFontResourceFromName(createFontResource('MyFont'))).rejects.toThrow('no such font');
+  });
 });
 
 describe('loadFontResourceFromUrl', () => {
-  it('loads the face from a URL and attaches it to the resource', async () => {
-    const resource = createFontResource('TestFont');
+  it('builds a url() source under the resource family and registers the face', async () => {
+    const resource = createFontResource('MyFont');
     const result = await loadFontResourceFromUrl(resource, 'https://example.com/font.woff2');
     expect(result).toBe(resource);
-    expect(resource.face).toBe(mockFace);
-    expect(document.fonts.add).toHaveBeenCalledWith(mockFace);
+    expect(constructions[0].family).toBe('MyFont');
+    expect(constructions[0].source).toBe('url(https://example.com/font.woff2)');
+    expect(addMock).toHaveBeenCalledWith(constructions[0].instance);
+    expect(resource.face).toBe(constructions[0].instance);
+  });
+
+  it('adds no format() hint — a single url carries none, unlike the multi-source form', async () => {
+    await loadFontResourceFromUrl(createFontResource('MyFont'), 'font.woff2');
+    expect(constructions[0].source).toBe('url(font.woff2)');
+  });
+
+  it('propagates a load failure and does not register the face', async () => {
+    const resource = createFontResource('MyFont');
+    const failing = new MockFontFace('MyFont', '');
+    failing.load.mockRejectedValue(new Error('bad url'));
+    vi.stubGlobal(
+      'FontFace',
+      vi.fn(function () {
+        return failing;
+      }),
+    );
+    await expect(loadFontResourceFromUrl(resource, 'font.woff2')).rejects.toThrow('bad url');
+    expect(addMock).not.toHaveBeenCalled();
+    expect(resource.face).toBeNull();
   });
 });
 
 describe('loadFontResourceFromUrls', () => {
-  it('builds a multi-source src string and loads the face', async () => {
-    const resource = createFontResource('TestFont');
+  it('composes a comma-joined src with explicit and inferred format() hints', async () => {
+    // The block this replaces was titled "builds a multi-source src string" and asserted nothing
+    // about the string — only that a face was attached. The composed src is the whole point of this
+    // function, and it was the one thing not checked.
+    const resource = createFontResource('MyFont');
     const result = await loadFontResourceFromUrls(resource, [
       { url: 'font.woff2', format: 'woff2' },
       { url: 'font.ttf' },
     ]);
     expect(result).toBe(resource);
-    expect(resource.face).toBe(mockFace);
-    expect(document.fonts.add).toHaveBeenCalledWith(mockFace);
+    expect(constructions[0].family).toBe('MyFont');
+    expect(constructions[0].source).toBe("url(font.woff2) format('woff2'), url(font.ttf) format('truetype')");
+    expect(addMock).toHaveBeenCalledWith(constructions[0].instance);
   });
 
-  it('infers format from file extension when no format is provided', async () => {
-    const MockFontFace = vi.fn(function () {
-      return mockFace;
-    });
-    vi.stubGlobal('FontFace', MockFontFace);
-    const resource = createFontResource('TestFont');
-    await loadFontResourceFromUrls(resource, [{ url: 'font.otf' }]);
-    expect(MockFontFace).toHaveBeenCalledWith('TestFont', expect.stringContaining("format('opentype')"));
+  it('infers the format from the file extension when none is given', async () => {
+    await loadFontResourceFromUrls(createFontResource('MyFont'), [{ url: 'font.otf' }]);
+    expect(constructions[0].source).toBe("url(font.otf) format('opentype')");
+  });
+
+  it('omits the format() hint when it cannot be inferred and none is given', async () => {
+    await loadFontResourceFromUrls(createFontResource('MyFont'), [{ url: 'font.bin' }]);
+    expect(constructions[0].source).toBe('url(font.bin)');
+  });
+
+  it('mixes inferred, explicit, and absent hints across one src list', async () => {
+    await loadFontResourceFromUrls(createFontResource('MyFont'), [
+      { url: 'a.woff2', format: 'woff2' },
+      { url: 'b.ttf' },
+      { url: 'c.bin' },
+    ]);
+    expect(constructions[0].source).toBe("url(a.woff2) format('woff2'), url(b.ttf) format('truetype'), url(c.bin)");
+  });
+
+  it('builds an empty src for an empty source list rather than throwing', async () => {
+    await loadFontResourceFromUrls(createFontResource('MyFont'), []);
+    expect(constructions[0].source).toBe('');
+  });
+
+  it('propagates a load failure and does not register the face', async () => {
+    const resource = createFontResource('MyFont');
+    const failing = new MockFontFace('MyFont', '');
+    failing.load.mockRejectedValue(new Error('bad url'));
+    vi.stubGlobal(
+      'FontFace',
+      vi.fn(function () {
+        return failing;
+      }),
+    );
+    await expect(loadFontResourceFromUrls(resource, [{ url: 'font.woff2' }])).rejects.toThrow('bad url');
+    expect(addMock).not.toHaveBeenCalled();
+    expect(resource.face).toBeNull();
   });
 });