@json-to-office/shared 1.4.0 → 1.6.0

package/dist/index.js

@@ -1,8 +1,10 @@
 import {
   FONT_URL_ALLOWLIST,
   detectFontFormat,
-  isAllowedFontUrl
-} from "./chunk-FDSJYZ5W.js";
+  isAllowedFontUrl,
+  rewriteFontFamilyName,
+  standardSubfamilyNames
+} from "./chunk-MCUIFSUN.js";
 import {
   ComponentValidationError,
   DuplicateComponentError,
@@ -13,7 +15,7 @@ import {
   isValidationSuccess,
   resolveComponentVersion,
   validateCustomComponentProps
-} from "./chunk-GPNPMKVZ.js";
+} from "./chunk-A4CY2MAM.js";
 import {
   DEFAULT_ERROR_CONFIG,
   ERROR_EMOJIS,
@@ -33,7 +35,19 @@ import {
   isUnionSchema,
   transformValueError,
   transformValueErrors
-} from "./chunk-ZKD5BAMU.js";
+} from "./chunk-LLBCT7WL.js";
+import {
+  FeatureRequirementCollector,
+  RENDERER_DEPENDENCY_MISSING,
+  RendererRegistry,
+  UnsupportedRendererFeatureError,
+  assertNever,
+  assertRendererSupports,
+  diagnoseUnsupportedFeatures,
+  partitionDiagnostics,
+  rendererError,
+  rendererWarning
+} from "./chunk-QLZNOXT5.js";
 import {
   convertToJsonSchema,
   createComponentSchema,
@@ -51,18 +65,6 @@ import {
   SAFE_FONTS,
   isSafeFont
 } from "./chunk-6KUQYVPT.js";
-import {
-  FeatureRequirementCollector,
-  RENDERER_DEPENDENCY_MISSING,
-  RendererRegistry,
-  UnsupportedRendererFeatureError,
-  assertNever,
-  assertRendererSupports,
-  diagnoseUnsupportedFeatures,
-  partitionDiagnostics,
-  rendererError,
-  rendererWarning
-} from "./chunk-QLZNOXT5.js";
 import {
   compareSemver,
   isValidSemver,
@@ -244,172 +246,6 @@ function synthesizeFamilyName(family, weight, italic) {
   };
 }
 
-// src/fonts/sources/ttf-name.ts
-var TARGET_NAME_IDS = /* @__PURE__ */ new Set([
-  1,
-  // Font Family
-  4,
-  // Full Font Name
-  6,
-  // PostScript Name
-  16
-  // Typographic/Preferred Family
-]);
-var MAGIC_HEAD_CHECKSUM = 2981146554;
-function sfntChecksum(buf) {
-  let sum = 0;
-  const end = buf.length;
-  const aligned = end - end % 4;
-  for (let i = 0; i < aligned; i += 4) {
-    sum = sum + buf.readUInt32BE(i) >>> 0;
-  }
-  if (aligned < end) {
-    let chunk = 0;
-    const remaining = end - aligned;
-    if (remaining >= 1) chunk |= buf[aligned] << 24;
-    if (remaining >= 2) chunk |= buf[aligned + 1] << 16;
-    if (remaining >= 3) chunk |= buf[aligned + 2] << 8;
-    sum = sum + chunk >>> 0;
-  }
-  return sum >>> 0;
-}
-function encodeString(record, value) {
-  if (record.platformID === 1) {
-    return Buffer.from(value, "ascii");
-  }
-  const out = Buffer.alloc(value.length * 2);
-  for (let i = 0; i < value.length; i += 1) {
-    out.writeUInt16BE(value.charCodeAt(i), i * 2);
-  }
-  return out;
-}
-function buildNameTable(records) {
-  const count = records.length;
-  const headerSize = 6 + count * 12;
-  let heapSize = 0;
-  for (const r of records) heapSize += r.bytes.length;
-  const raw = Buffer.alloc(headerSize + heapSize);
-  raw.writeUInt16BE(0, 0);
-  raw.writeUInt16BE(count, 2);
-  raw.writeUInt16BE(headerSize, 4);
-  let heapCursor = 0;
-  for (let i = 0; i < count; i += 1) {
-    const r = records[i];
-    const ro = 6 + i * 12;
-    raw.writeUInt16BE(r.platformID, ro);
-    raw.writeUInt16BE(r.encodingID, ro + 2);
-    raw.writeUInt16BE(r.languageID, ro + 4);
-    raw.writeUInt16BE(r.nameID, ro + 6);
-    raw.writeUInt16BE(r.bytes.length, ro + 8);
-    raw.writeUInt16BE(heapCursor, ro + 10);
-    r.bytes.copy(raw, headerSize + heapCursor);
-    heapCursor += r.bytes.length;
-  }
-  return raw;
-}
-function rewriteFontFamilyName(input, newFamily) {
-  if (input.length < 12) return input;
-  const version = input.readUInt32BE(0);
-  const isSfnt = version === 65536 || version === 1330926671 || version === 1953658213 || version === 1954115633;
-  if (!isSfnt) return input;
-  const numTables = input.readUInt16BE(4);
-  if (numTables === 0 || input.length < 12 + numTables * 16) return input;
-  const tables = [];
-  for (let i = 0; i < numTables; i += 1) {
-    const eo = 12 + i * 16;
-    const tag = input.toString("ascii", eo, eo + 4);
-    const checksum = input.readUInt32BE(eo + 4);
-    const offset = input.readUInt32BE(eo + 8);
-    const length = input.readUInt32BE(eo + 12);
-    if (offset + length > input.length) return input;
-    tables.push({
-      tag,
-      checksum,
-      offset: 0,
-      originalOffset: offset,
-      data: input.slice(offset, offset + length)
-    });
-  }
-  const nameIdx = tables.findIndex((t) => t.tag === "name");
-  if (nameIdx === -1) return input;
-  const nameBuf = tables[nameIdx].data;
-  if (nameBuf.length < 6) return input;
-  const recordCount = nameBuf.readUInt16BE(2);
-  const stringOffset = nameBuf.readUInt16BE(4);
-  if (nameBuf.length < 6 + recordCount * 12) return input;
-  const records = [];
-  for (let i = 0; i < recordCount; i += 1) {
-    const ro = 6 + i * 12;
-    const platformID = nameBuf.readUInt16BE(ro);
-    const encodingID = nameBuf.readUInt16BE(ro + 2);
-    const languageID = nameBuf.readUInt16BE(ro + 4);
-    const nameID = nameBuf.readUInt16BE(ro + 6);
-    const length = nameBuf.readUInt16BE(ro + 8);
-    const offset = nameBuf.readUInt16BE(ro + 10);
-    const bytes = nameBuf.slice(
-      stringOffset + offset,
-      stringOffset + offset + length
-    );
-    records.push({ platformID, encodingID, languageID, nameID, bytes });
-  }
-  const psForbidden = /[[\](){}<>/%]/g;
-  const isAscii = /^[\x00-\x7f]*$/.test(newFamily);
-  const survivors = [];
-  for (const r of records) {
-    if (!TARGET_NAME_IDS.has(r.nameID)) {
-      survivors.push(r);
-      continue;
-    }
-    if (r.platformID === 1 && !isAscii) {
-      continue;
-    }
-    const value = r.nameID === 6 ? newFamily.replace(/\s+/g, "").replace(psForbidden, "").replace(/[^\x21-\x7e]/g, "") : newFamily;
-    r.bytes = encodeString(r, value);
-    survivors.push(r);
-  }
-  records.length = 0;
-  records.push(...survivors);
-  const rebuiltName = buildNameTable(records);
-  tables[nameIdx] = {
-    ...tables[nameIdx],
-    data: rebuiltName,
-    checksum: sfntChecksum(rebuiltName)
-  };
-  tables.sort((a, b) => a.originalOffset - b.originalOffset);
-  let cursor = 12 + tables.length * 16;
-  for (const t of tables) {
-    cursor = cursor + 3 & ~3;
-    t.offset = cursor;
-    cursor += t.data.length;
-  }
-  const totalSize = cursor + 3 & ~3;
-  const out = Buffer.alloc(totalSize);
-  input.copy(out, 0, 0, 12);
-  out.writeUInt16BE(tables.length, 4);
-  const dirTables = [...tables].sort(
-    (a, b) => a.tag < b.tag ? -1 : a.tag > b.tag ? 1 : 0
-  );
-  for (let i = 0; i < dirTables.length; i += 1) {
-    const t = dirTables[i];
-    const eo = 12 + i * 16;
-    out.write(t.tag, eo, 4, "ascii");
-    out.writeUInt32BE(t.checksum, eo + 4);
-    out.writeUInt32BE(t.offset, eo + 8);
-    out.writeUInt32BE(t.data.length, eo + 12);
-  }
-  for (const t of tables) {
-    t.data.copy(out, t.offset);
-  }
-  const headTable = tables.find((t) => t.tag === "head");
-  if (headTable && headTable.data.length >= 12) {
-    out.writeUInt32BE(0, headTable.offset + 8);
-    const fontSum = sfntChecksum(out);
-    const adjustment = MAGIC_HEAD_CHECKSUM - fontSum >>> 0;
-    out.writeUInt32BE(adjustment, headTable.offset + 8);
-  }
-  return out;
-}
-
 // src/fonts/sources/data-loader.ts
 var MAX_DATA_FONT_BYTES = 5 * 1024 * 1024;
 function loadDataFontSource(input) {
@@ -764,17 +600,6 @@ function readNames(ttf, wanted) {
   }
   return out;
 }
-var STANDARD_SUBFAMILY = {
-  100: "Thin",
-  200: "ExtraLight",
-  300: "Light",
-  400: "Regular",
-  500: "Medium",
-  600: "SemiBold",
-  700: "Bold",
-  800: "ExtraBold",
-  900: "Black"
-};
 function validateFontMetadata(ttf, weight, italic, familyLabel) {
   const diags = [];
   const usWeight = readUsWeightClass(ttf);
@@ -784,10 +609,10 @@ function validateFontMetadata(ttf, weight, italic, familyLabel) {
       message: `Font "${familyLabel}" weight ${weight}: OS/2.usWeightClass reports ${usWeight}. Likely a defective redistribution \u2014 consider adding an upstream override.`
     });
   }
-  const subfamily = STANDARD_SUBFAMILY[weight];
-  if (!subfamily) return diags;
-  const expected17 = italic ? `${subfamily} Italic` : subfamily;
-  const expected2 = weight >= 600 ? italic ? "Bold Italic" : "Bold" : italic ? "Italic" : "Regular";
+  const std = standardSubfamilyNames(weight, italic);
+  if (!std) return diags;
+  const expected17 = std.typographic;
+  const expected2 = std.legacy;
   const names = readNames(ttf, /* @__PURE__ */ new Set([2, 17]));
   for (const n of names) {
     if (n.nameID === 17 && n.value !== expected17) {
@@ -1236,7 +1061,7 @@ var POPULAR_GOOGLE_FONTS = [
 
 // src/fonts/catalog/upstream-overrides.ts
 var INTER_VARIABLE_URL = "https://cdn.jsdelivr.net/gh/rsms/inter@v4.1/docs/font-files/InterVariable.ttf";
-var INTER_VARIABLE_ITALIC_URL = "https://cdn.jsdelivr.net/gh/rsms/inter@v4.1/docs/font-files/InterVariable-Italic.ttf";
+var INTER_VARIABLE_ITALIC_URL = "https://cdn.jsdelivr.net/gh/rsms/inter@v4.1/docs/font-files/InterVariable-Italic.woff2";
 function interVariants() {
   const weights = [100, 200, 300, 400, 500, 600, 700, 800, 900];
   const upright = weights.map((weight) => ({
@@ -1459,7 +1284,7 @@ function deepMerge(target, source) {
   if (isObject(target) && isObject(source)) {
     Object.keys(source).forEach((key) => {
       if (isObject(source[key])) {
-        if (!(key in target)) {
+        if (!(key in target) || !isObject(target[key])) {
           output[key] = source[key];
         } else {
           output[key] = deepMerge(target[key], source[key]);