@weasel-js/font 1.9.3 → 1.9.4

package/dist/{chunk-OYLAXZOV.js → chunk-ERSHQYJL.js}

@@ -97,6 +97,19 @@ function parseBmFont(raw) {
   if (!Array.isArray(r.chars)) throw new Error("parseBmFont: chars must be an array");
   const info = r.info;
   const common = r.common;
+  const positive = [
+    ["info.size", info.size],
+    ["common.scaleW", common.scaleW],
+    ["common.scaleH", common.scaleH]
+  ];
+  for (const [name, value] of positive) {
+    if (typeof value !== "number" || !(value > 0) || !Number.isFinite(value)) {
+      throw new Error(`parseBmFont: ${name} must be a positive number`);
+    }
+  }
+  if (typeof common.base !== "number" || !Number.isFinite(common.base)) {
+    throw new Error("parseBmFont: common.base must be a number");
+  }
   const chars = r.chars;
   const kernings = Array.isArray(r.kernings) ? r.kernings : [];
   const charMap = /* @__PURE__ */ new Map();
@@ -601,9 +614,7 @@ function _resetDynamicFontsForTests() {
 // src/outline/OutlineFace.ts
 var OUTLINE_PRECISION = 5;
 
-// src/outline/sfnt.ts
-var SFNT_HEADER_BYTES = 12;
-var TABLE_RECORD_BYTES = 16;
+// src/outline/tag.ts
 function tagAt(view, offset) {
   return String.fromCharCode(
     view.getUint8(offset),
@@ -612,10 +623,11 @@ function tagAt(view, offset) {
     view.getUint8(offset + 3)
   );
 }
-function isFontCollection(bytes) {
-  if (bytes.byteLength < 4) return false;
-  return tagAt(new DataView(bytes), 0) === "ttcf";
-}
+
+// src/outline/dataFork.ts
+var RESOURCE_HEADER_BYTES = 16;
+var TYPE_ENTRY_BYTES = 8;
+var REFERENCE_BYTES = 12;
 var FONT_SIGNATURES = /* @__PURE__ */ new Set([
   "\0
\0\0",
   "true",
@@ -625,7 +637,6 @@ var FONT_SIGNATURES = /* @__PURE__ */ new Set([
   "wOFF",
   "wOF2"
 ]);
-var RESOURCE_HEADER_BYTES = 16;
 function isDataForkFont(bytes) {
   if (bytes.byteLength < RESOURCE_HEADER_BYTES) return false;
   const view = new DataView(bytes);
@@ -636,6 +647,46 @@ function isDataForkFont(bytes) {
   const mapLength = view.getUint32(12);
   return dataOffset >= RESOURCE_HEADER_BYTES && dataOffset + dataLength === mapOffset && mapOffset + mapLength <= bytes.byteLength;
 }
+var truncated = () => new Error("Datafork TrueType (.dfont) is truncated: a resource runs past the end of its segment.");
+function sfntResources(bytes) {
+  const view = new DataView(bytes);
+  const dataOffset = view.getUint32(0);
+  const mapOffset = view.getUint32(4);
+  const dataLength = view.getUint32(8);
+  const mapEnd = mapOffset + view.getUint32(12);
+  const inMap = (at, count) => at >= mapOffset && at + count <= mapEnd;
+  if (!inMap(mapOffset + 24, 2)) return [];
+  const typeList = mapOffset + view.getUint16(mapOffset + 24);
+  if (!inMap(typeList, 2)) return [];
+  const typeCount = view.getUint16(typeList) + 1 & 65535;
+  const out = [];
+  for (let t = 0; t < typeCount; t++) {
+    const entry = typeList + 2 + t * TYPE_ENTRY_BYTES;
+    if (!inMap(entry, TYPE_ENTRY_BYTES)) throw truncated();
+    if (tagAt(view, entry) !== "sfnt") continue;
+    const count = view.getUint16(entry + 4) + 1;
+    const references = typeList + view.getUint16(entry + 6);
+    for (let i = 0; i < count; i++) {
+      const ref = references + i * REFERENCE_BYTES;
+      if (!inMap(ref, REFERENCE_BYTES)) throw truncated();
+      const offset = view.getUint32(ref + 4) & 16777215;
+      if (offset + 4 > dataLength) throw truncated();
+      const start = dataOffset + offset + 4;
+      const length = view.getUint32(start - 4);
+      if (offset + 4 + length > dataLength) throw truncated();
+      out.push(bytes.slice(start, start + length));
+    }
+  }
+  return out;
+}
+
+// src/outline/sfnt.ts
+var SFNT_HEADER_BYTES = 12;
+var TABLE_RECORD_BYTES = 16;
+function isFontCollection(bytes) {
+  if (bytes.byteLength < 4) return false;
+  return tagAt(new DataView(bytes), 0) === "ttcf";
+}
 function readTableDirectory(view, dirOffset) {
   const numTables = view.getUint16(dirOffset + 4);
   const records = [];
@@ -674,7 +725,12 @@ function extractFont(source, view, dirOffset) {
   const records = readTableDirectory(view, dirOffset);
   const padded = (n) => n + 3 & -4;
   let total = SFNT_HEADER_BYTES + records.length * TABLE_RECORD_BYTES;
-  for (const r of records) total += padded(r.length);
+  for (const r of records) {
+    if (r.offset + r.length > source.byteLength) {
+      throw new Error(`font collection is truncated: table "${r.tag}" runs past the end of the file`);
+    }
+    total += padded(r.length);
+  }
   const out = new ArrayBuffer(total);
   const dst = new DataView(out);
   const dstBytes = new Uint8Array(out);
@@ -700,9 +756,13 @@ function extractFont(source, view, dirOffset) {
 }
 function sfntFromCollection(bytes, postScriptName) {
   if (isDataForkFont(bytes)) {
-    throw new Error(
-      "Datafork TrueType (.dfont) is not supported \u2014 the outline tier reads sfnt tables and a .dfont holds them inside a Macintosh resource map."
-    );
+    const fonts = sfntResources(bytes);
+    if (fonts.length === 0) throw new Error("Datafork TrueType (.dfont) holds no sfnt resource.");
+    const named = postScriptName ? fonts.find((font) => {
+      const view2 = new DataView(font);
+      return postScriptNameAt(view2, readTableDirectory(view2, 0)) === postScriptName;
+    }) : void 0;
+    return { bytes: named ?? fonts[0], matched: named !== void 0 || !postScriptName };
   }
   if (!isFontCollection(bytes)) return { bytes, matched: true };
   const view = new DataView(bytes);
@@ -1301,6 +1361,7 @@ function missResolveResult(family, weight, style, suppressWarn = false) {
       source: "outline"
     };
   }
+  if (fontPending(family, weight, style)) return pendingMiss(family, weight, style);
   const policy2 = getFontFallbackPolicy();
   if (policy2 === "canvas") {
     autoEnrollCanvasFont(family);
@@ -1606,5 +1667,5 @@ function _resetDomFacesForTests() {
 }
 
 export { DEFAULT_BAKE_BUDGET, FIXTURE_FONT, PAGE_SIZE, SDF_RADIUS, __setGlyphRasterizerForTests, _getPagesForTests, _resetDomFacesForTests, _resetDynamicFontsForTests, _resetFallbackForTests, _resetFontOutlinesForTests, _resetFontRegistryForTests, createOpenTypeParser, cssFamilyName, cssFontFamily, cssFontFamilyLoading, dynamicPageTextureId, ensureFontTexture, faceMetricsFor, faceMetricsFromTables, faceMetricsOf, fontOutlineRegistry, fontPending, fontRegistry, getDefaultFontFamily, getFont, getFontFallbackPolicy, glyphGeneration, glyphOutline, hasFontOutlines, isCanvasFont, listCanvasFonts, listFontOutlines, listFontWeights, listFonts, loadFontOutlines, markAllFontsNotUploaded, outlineMetrics, outlineStatus, parseBmFont, registerCanvasFont, registerFont, registerFontOutlines, resetBakeBudget, resolveFontVariant, resolveGlyphFallback, setDefaultFontFamily, setFontFallbackPolicy, subscribeGlyphReady, syncDynamicPageTexture, textureCacheKey, unregisterCanvasFont, unregisterFontOutlines, verticalMetricsFromTables, warmFonts };
-//# sourceMappingURL=chunk-OYLAXZOV.js.map
-//# sourceMappingURL=chunk-OYLAXZOV.js.map
+//# sourceMappingURL=chunk-ERSHQYJL.js.map
+//# sourceMappingURL=chunk-ERSHQYJL.js.map