@shotstack/shotstack-canvas 1.5.8 → 1.5.9

package/dist/entry.node.cjs

@@ -397,6 +397,37 @@ async function initHB(wasmBaseURL) {
 
 // src/core/font-registry.ts
 var fontkit = __toESM(require("fontkit"), 1);
+function normalizeWeight(weight) {
+  if (weight === void 0 || weight === null) return "400";
+  if (typeof weight === "number") return String(weight);
+  const lowerWeight = String(weight).toLowerCase().trim();
+  const weightMap = {
+    thin: "100",
+    hairline: "100",
+    extralight: "200",
+    ultralight: "200",
+    light: "300",
+    normal: "400",
+    regular: "400",
+    medium: "500",
+    semibold: "600",
+    demibold: "600",
+    bold: "700",
+    extrabold: "800",
+    ultrabold: "800",
+    black: "900",
+    heavy: "900"
+  };
+  if (weightMap[lowerWeight]) {
+    return weightMap[lowerWeight];
+  }
+  const numWeight = parseInt(String(weight), 10);
+  if (!isNaN(numWeight) && numWeight >= 100 && numWeight <= 900) {
+    return String(numWeight);
+  }
+  console.warn(`Invalid font weight "${weight}", defaulting to 400`);
+  return "400";
+}
 var FontRegistry = class _FontRegistry {
   hb;
   faces = /* @__PURE__ */ new Map();
@@ -454,7 +485,8 @@ var FontRegistry = class _FontRegistry {
     return this.hb;
   }
   key(desc) {
-    return `${desc.family}__${desc.weight ?? "400"}`;
+    const normalizedWeight = normalizeWeight(desc.weight);
+    return `${desc.family}__${normalizedWeight}`;
   }
   async registerFromBytes(bytes, desc) {
     try {
@@ -466,8 +498,8 @@ var FontRegistry = class _FontRegistry {
       const font = this.hb.createFont(face);
       const upem = face.upem || 1e3;
       font.setScale(upem, upem);
-      const weight = desc.weight ?? "400";
-      const weightNum = typeof weight === "string" ? parseInt(weight, 10) : weight;
+      const normalizedWeight = normalizeWeight(desc.weight);
+      const weightNum = parseInt(normalizedWeight, 10);
       if (weightNum !== 400 && typeof font.setVariations === "function") {
         try {
           font.setVariations(`wght=${weightNum}`);
@@ -501,14 +533,15 @@ var FontRegistry = class _FontRegistry {
     const loader = _FontRegistry.fallbackLoader;
     if (!loader) return false;
     try {
+      const normalizedWeight = normalizeWeight(desc.weight);
       const bytes = await loader({
         family: desc.family,
-        weight: desc.weight ?? "400"
+        weight: normalizedWeight
       });
       if (!bytes) return false;
       await this.registerFromBytes(bytes, {
         family: desc.family,
-        weight: desc.weight ?? "400"
+        weight: normalizedWeight
       });
       return true;
     } catch {

package/dist/entry.node.js

@@ -358,6 +358,37 @@ async function initHB(wasmBaseURL) {
 
 // src/core/font-registry.ts
 import * as fontkit from "fontkit";
+function normalizeWeight(weight) {
+  if (weight === void 0 || weight === null) return "400";
+  if (typeof weight === "number") return String(weight);
+  const lowerWeight = String(weight).toLowerCase().trim();
+  const weightMap = {
+    thin: "100",
+    hairline: "100",
+    extralight: "200",
+    ultralight: "200",
+    light: "300",
+    normal: "400",
+    regular: "400",
+    medium: "500",
+    semibold: "600",
+    demibold: "600",
+    bold: "700",
+    extrabold: "800",
+    ultrabold: "800",
+    black: "900",
+    heavy: "900"
+  };
+  if (weightMap[lowerWeight]) {
+    return weightMap[lowerWeight];
+  }
+  const numWeight = parseInt(String(weight), 10);
+  if (!isNaN(numWeight) && numWeight >= 100 && numWeight <= 900) {
+    return String(numWeight);
+  }
+  console.warn(`Invalid font weight "${weight}", defaulting to 400`);
+  return "400";
+}
 var FontRegistry = class _FontRegistry {
   hb;
   faces = /* @__PURE__ */ new Map();
@@ -415,7 +446,8 @@ var FontRegistry = class _FontRegistry {
     return this.hb;
   }
   key(desc) {
-    return `${desc.family}__${desc.weight ?? "400"}`;
+    const normalizedWeight = normalizeWeight(desc.weight);
+    return `${desc.family}__${normalizedWeight}`;
   }
   async registerFromBytes(bytes, desc) {
     try {
@@ -427,8 +459,8 @@ var FontRegistry = class _FontRegistry {
       const font = this.hb.createFont(face);
       const upem = face.upem || 1e3;
       font.setScale(upem, upem);
-      const weight = desc.weight ?? "400";
-      const weightNum = typeof weight === "string" ? parseInt(weight, 10) : weight;
+      const normalizedWeight = normalizeWeight(desc.weight);
+      const weightNum = parseInt(normalizedWeight, 10);
       if (weightNum !== 400 && typeof font.setVariations === "function") {
         try {
           font.setVariations(`wght=${weightNum}`);
@@ -462,14 +494,15 @@ var FontRegistry = class _FontRegistry {
     const loader = _FontRegistry.fallbackLoader;
     if (!loader) return false;
     try {
+      const normalizedWeight = normalizeWeight(desc.weight);
       const bytes = await loader({
         family: desc.family,
-        weight: desc.weight ?? "400"
+        weight: normalizedWeight
       });
       if (!bytes) return false;
       await this.registerFromBytes(bytes, {
         family: desc.family,
-        weight: desc.weight ?? "400"
+        weight: normalizedWeight
       });
       return true;
     } catch {

package/dist/entry.web.js

@@ -362,6 +362,37 @@ async function initHB(wasmBaseURL) {
 
 // src/core/font-registry.ts
 import * as fontkit from "fontkit";
+function normalizeWeight(weight) {
+  if (weight === void 0 || weight === null) return "400";
+  if (typeof weight === "number") return String(weight);
+  const lowerWeight = String(weight).toLowerCase().trim();
+  const weightMap = {
+    thin: "100",
+    hairline: "100",
+    extralight: "200",
+    ultralight: "200",
+    light: "300",
+    normal: "400",
+    regular: "400",
+    medium: "500",
+    semibold: "600",
+    demibold: "600",
+    bold: "700",
+    extrabold: "800",
+    ultrabold: "800",
+    black: "900",
+    heavy: "900"
+  };
+  if (weightMap[lowerWeight]) {
+    return weightMap[lowerWeight];
+  }
+  const numWeight = parseInt(String(weight), 10);
+  if (!isNaN(numWeight) && numWeight >= 100 && numWeight <= 900) {
+    return String(numWeight);
+  }
+  console.warn(`Invalid font weight "${weight}", defaulting to 400`);
+  return "400";
+}
 var _FontRegistry = class _FontRegistry {
   constructor(wasmBaseURL) {
     __publicField(this, "hb");
@@ -418,7 +449,8 @@ var _FontRegistry = class _FontRegistry {
     return this.hb;
   }
   key(desc) {
-    return `${desc.family}__${desc.weight ?? "400"}`;
+    const normalizedWeight = normalizeWeight(desc.weight);
+    return `${desc.family}__${normalizedWeight}`;
   }
   async registerFromBytes(bytes, desc) {
     try {
@@ -430,8 +462,8 @@ var _FontRegistry = class _FontRegistry {
       const font = this.hb.createFont(face);
       const upem = face.upem || 1e3;
       font.setScale(upem, upem);
-      const weight = desc.weight ?? "400";
-      const weightNum = typeof weight === "string" ? parseInt(weight, 10) : weight;
+      const normalizedWeight = normalizeWeight(desc.weight);
+      const weightNum = parseInt(normalizedWeight, 10);
       if (weightNum !== 400 && typeof font.setVariations === "function") {
         try {
           font.setVariations(`wght=${weightNum}`);
@@ -465,14 +497,15 @@ var _FontRegistry = class _FontRegistry {
     const loader = _FontRegistry.fallbackLoader;
     if (!loader) return false;
     try {
+      const normalizedWeight = normalizeWeight(desc.weight);
       const bytes = await loader({
         family: desc.family,
-        weight: desc.weight ?? "400"
+        weight: normalizedWeight
       });
       if (!bytes) return false;
       await this.registerFromBytes(bytes, {
         family: desc.family,
-        weight: desc.weight ?? "400"
+        weight: normalizedWeight
       });
       return true;
     } catch {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shotstack/shotstack-canvas",
-  "version": "1.5.8",
+  "version": "1.5.9",
   "description": "Text layout & animation engine (HarfBuzz) for Node & Web - fully self-contained.",
   "type": "module",
   "main": "./dist/entry.node.cjs",