@shotstack/shotstack-canvas 1.4.1 → 1.4.2

package/dist/entry.node.cjs

@@ -99,7 +99,6 @@ var fontSchema = import_joi.default.object({
   family: import_joi.default.string().default(CANVAS_CONFIG.DEFAULTS.fontFamily),
   size: import_joi.default.number().min(CANVAS_CONFIG.LIMITS.minFontSize).max(CANVAS_CONFIG.LIMITS.maxFontSize).default(CANVAS_CONFIG.DEFAULTS.fontSize),
   weight: import_joi.default.alternatives().try(import_joi.default.string(), import_joi.default.number()).default("400"),
-  style: import_joi.default.string().valid("normal", "italic", "oblique").default("normal"),
   color: import_joi.default.string().pattern(HEX6).default(CANVAS_CONFIG.DEFAULTS.color),
   opacity: import_joi.default.number().min(0).max(1).default(1)
 }).unknown(false);
@@ -419,8 +418,7 @@ var FontRegistry = class _FontRegistry {
     return this.hb;
   }
   key(desc) {
-    const normalizedStyle = desc.style === "oblique" ? "italic" : desc.style ?? "normal";
-    return `${desc.family}__${desc.weight ?? "400"}__${normalizedStyle}`;
+    return `${desc.family}__${desc.weight ?? "400"}`;
   }
   async registerFromBytes(bytes, desc) {
     try {
@@ -469,14 +467,12 @@ var FontRegistry = class _FontRegistry {
     try {
       const bytes = await loader({
         family: desc.family,
-        weight: desc.weight ?? "400",
-        style: desc.style ?? "normal"
+        weight: desc.weight ?? "400"
       });
       if (!bytes) return false;
       await this.registerFromBytes(bytes, {
         family: desc.family,
-        weight: desc.weight ?? "400",
-        style: desc.style ?? "normal"
+        weight: desc.weight ?? "400"
       });
       return true;
     } catch {
@@ -2220,8 +2216,7 @@ async function createTextEngine(opts = {}) {
             const bytes = await loadFileOrHttpToArrayBuffer(cf.src);
             await fonts.registerFromBytes(bytes, {
               family: cf.family,
-              weight: cf.weight ?? "400",
-              style: cf.style ?? "normal"
+              weight: cf.weight ?? "400"
             });
           } catch (err) {
             throw new Error(
@@ -2233,7 +2228,6 @@ async function createTextEngine(opts = {}) {
       const main = asset.font ?? {
         family: "Roboto",
         weight: "400",
-        style: "normal",
         size: 48,
         color: "#000000",
         opacity: 1
@@ -2285,10 +2279,10 @@ async function createTextEngine(opts = {}) {
     async renderFrame(asset, tSeconds, clipDuration) {
       try {
         const main = await ensureFonts(asset);
-        const desc = { family: main.family, weight: `${main.weight}`, style: main.style };
+        const desc = { family: main.family, weight: `${main.weight}` };
         let lines;
         try {
-          const emojiDesc = { family: "NotoEmoji", weight: "400", style: "normal" };
+          const emojiDesc = { family: "NotoEmoji", weight: "400" };
           let emojiAvailable = false;
           try {
             await fonts.getFace(emojiDesc);
@@ -2329,7 +2323,6 @@ async function createTextEngine(opts = {}) {
               family: main.family,
               size: main.size,
               weight: `${main.weight}`,
-              style: main.style,
               color: main.color,
               opacity: main.opacity
             },

package/dist/entry.node.d.cts

@@ -31,7 +31,6 @@ type RichTextValidated = Required<{
         family: string;
         size: number;
         weight: string | number;
-        style: "normal" | "italic" | "oblique";
         color: string;
         opacity: number;
     };
@@ -124,7 +123,6 @@ type Glyph = {
     fontDesc?: {
         family: string;
         weight?: string | number;
-        style?: string;
     };
 };
 type ShapedLine = {
@@ -232,12 +230,10 @@ declare function createTextEngine(opts?: {
     registerFontFromFile(path: string, desc: {
         family: string;
         weight?: string | number;
-        style?: string;
     }): Promise<void>;
     registerFontFromUrl(url: string, desc: {
         family: string;
         weight?: string | number;
-        style?: string;
     }): Promise<void>;
     renderFrame(asset: RichTextValidated, tSeconds: number, clipDuration?: number): Promise<DrawOp[]>;
     createRenderer(p: {

package/dist/entry.node.d.ts

@@ -31,7 +31,6 @@ type RichTextValidated = Required<{
         family: string;
         size: number;
         weight: string | number;
-        style: "normal" | "italic" | "oblique";
         color: string;
         opacity: number;
     };
@@ -124,7 +123,6 @@ type Glyph = {
     fontDesc?: {
         family: string;
         weight?: string | number;
-        style?: string;
     };
 };
 type ShapedLine = {
@@ -232,12 +230,10 @@ declare function createTextEngine(opts?: {
     registerFontFromFile(path: string, desc: {
         family: string;
         weight?: string | number;
-        style?: string;
     }): Promise<void>;
     registerFontFromUrl(url: string, desc: {
         family: string;
         weight?: string | number;
-        style?: string;
     }): Promise<void>;
     renderFrame(asset: RichTextValidated, tSeconds: number, clipDuration?: number): Promise<DrawOp[]>;
     createRenderer(p: {

package/dist/entry.node.js

@@ -61,7 +61,6 @@ var fontSchema = Joi.object({
   family: Joi.string().default(CANVAS_CONFIG.DEFAULTS.fontFamily),
   size: Joi.number().min(CANVAS_CONFIG.LIMITS.minFontSize).max(CANVAS_CONFIG.LIMITS.maxFontSize).default(CANVAS_CONFIG.DEFAULTS.fontSize),
   weight: Joi.alternatives().try(Joi.string(), Joi.number()).default("400"),
-  style: Joi.string().valid("normal", "italic", "oblique").default("normal"),
   color: Joi.string().pattern(HEX6).default(CANVAS_CONFIG.DEFAULTS.color),
   opacity: Joi.number().min(0).max(1).default(1)
 }).unknown(false);
@@ -380,8 +379,7 @@ var FontRegistry = class _FontRegistry {
     return this.hb;
   }
   key(desc) {
-    const normalizedStyle = desc.style === "oblique" ? "italic" : desc.style ?? "normal";
-    return `${desc.family}__${desc.weight ?? "400"}__${normalizedStyle}`;
+    return `${desc.family}__${desc.weight ?? "400"}`;
   }
   async registerFromBytes(bytes, desc) {
     try {
@@ -430,14 +428,12 @@ var FontRegistry = class _FontRegistry {
     try {
       const bytes = await loader({
         family: desc.family,
-        weight: desc.weight ?? "400",
-        style: desc.style ?? "normal"
+        weight: desc.weight ?? "400"
       });
       if (!bytes) return false;
       await this.registerFromBytes(bytes, {
         family: desc.family,
-        weight: desc.weight ?? "400",
-        style: desc.style ?? "normal"
+        weight: desc.weight ?? "400"
       });
       return true;
     } catch {
@@ -2181,8 +2177,7 @@ async function createTextEngine(opts = {}) {
             const bytes = await loadFileOrHttpToArrayBuffer(cf.src);
             await fonts.registerFromBytes(bytes, {
               family: cf.family,
-              weight: cf.weight ?? "400",
-              style: cf.style ?? "normal"
+              weight: cf.weight ?? "400"
             });
           } catch (err) {
             throw new Error(
@@ -2194,7 +2189,6 @@ async function createTextEngine(opts = {}) {
       const main = asset.font ?? {
         family: "Roboto",
         weight: "400",
-        style: "normal",
         size: 48,
         color: "#000000",
         opacity: 1
@@ -2246,10 +2240,10 @@ async function createTextEngine(opts = {}) {
     async renderFrame(asset, tSeconds, clipDuration) {
       try {
         const main = await ensureFonts(asset);
-        const desc = { family: main.family, weight: `${main.weight}`, style: main.style };
+        const desc = { family: main.family, weight: `${main.weight}` };
         let lines;
         try {
-          const emojiDesc = { family: "NotoEmoji", weight: "400", style: "normal" };
+          const emojiDesc = { family: "NotoEmoji", weight: "400" };
           let emojiAvailable = false;
           try {
             await fonts.getFace(emojiDesc);
@@ -2290,7 +2284,6 @@ async function createTextEngine(opts = {}) {
               family: main.family,
               size: main.size,
               weight: `${main.weight}`,
-              style: main.style,
               color: main.color,
               opacity: main.opacity
             },

package/dist/entry.web.d.ts

@@ -31,7 +31,6 @@ type RichTextValidated = Required<{
         family: string;
         size: number;
         weight: string | number;
-        style: "normal" | "italic" | "oblique";
         color: string;
         opacity: number;
     };
@@ -124,7 +123,6 @@ type Glyph = {
     fontDesc?: {
         family: string;
         weight?: string | number;
-        style?: string;
     };
 };
 type ShapedLine = {
@@ -215,12 +213,10 @@ declare function createTextEngine(opts?: {
     registerFontFromUrl(url: string, desc: {
         family: string;
         weight?: string | number;
-        style?: string;
     }): Promise<void>;
     registerFontFromFile(source: string | Blob, desc: {
         family: string;
         weight?: string | number;
-        style?: string;
     }): Promise<void>;
     renderFrame(asset: RichTextValidated, tSeconds: number, clipDuration?: number): Promise<DrawOp[]>;
     createRenderer(canvas: HTMLCanvasElement | OffscreenCanvas): {

package/dist/entry.web.js

@@ -65,7 +65,6 @@ var fontSchema = Joi.object({
   family: Joi.string().default(CANVAS_CONFIG.DEFAULTS.fontFamily),
   size: Joi.number().min(CANVAS_CONFIG.LIMITS.minFontSize).max(CANVAS_CONFIG.LIMITS.maxFontSize).default(CANVAS_CONFIG.DEFAULTS.fontSize),
   weight: Joi.alternatives().try(Joi.string(), Joi.number()).default("400"),
-  style: Joi.string().valid("normal", "italic", "oblique").default("normal"),
   color: Joi.string().pattern(HEX6).default(CANVAS_CONFIG.DEFAULTS.color),
   opacity: Joi.number().min(0).max(1).default(1)
 }).unknown(false);
@@ -383,8 +382,7 @@ var _FontRegistry = class _FontRegistry {
     return this.hb;
   }
   key(desc) {
-    const normalizedStyle = desc.style === "oblique" ? "italic" : desc.style ?? "normal";
-    return `${desc.family}__${desc.weight ?? "400"}__${normalizedStyle}`;
+    return `${desc.family}__${desc.weight ?? "400"}`;
   }
   async registerFromBytes(bytes, desc) {
     try {
@@ -433,14 +431,12 @@ var _FontRegistry = class _FontRegistry {
     try {
       const bytes = await loader({
         family: desc.family,
-        weight: desc.weight ?? "400",
-        style: desc.style ?? "normal"
+        weight: desc.weight ?? "400"
       });
       if (!bytes) return false;
       await this.registerFromBytes(bytes, {
         family: desc.family,
-        weight: desc.weight ?? "400",
-        style: desc.style ?? "normal"
+        weight: desc.weight ?? "400"
       });
       return true;
     } catch {
@@ -1843,8 +1839,7 @@ async function createTextEngine(opts = {}) {
     FontRegistry.setFallbackLoader(async (desc) => {
       const family = (desc.family ?? "Roboto").toLowerCase();
       const weight = `${desc.weight ?? "400"}`;
-      const style = desc.style ?? "normal";
-      if (family === "roboto" && weight === "400" && style === "normal") {
+      if (family === "roboto" && weight === "400") {
         return fetchToArrayBuffer(DEFAULT_ROBOTO_URL);
       }
       return void 0;
@@ -1863,8 +1858,7 @@ async function createTextEngine(opts = {}) {
             const bytes = await fetchToArrayBuffer(cf.src);
             await fonts.registerFromBytes(bytes, {
               family: cf.family,
-              weight: cf.weight ?? "400",
-              style: cf.style ?? "normal"
+              weight: cf.weight ?? "400"
             });
           } catch (err) {
             throw new Error(
@@ -1876,27 +1870,25 @@ async function createTextEngine(opts = {}) {
       const main = asset.font ?? {
         family: "Roboto",
         weight: "400",
-        style: "normal",
         size: 48,
         color: "#000000",
         opacity: 1
       };
-      const desc = { family: main.family, weight: `${main.weight}`, style: main.style };
+      const desc = { family: main.family, weight: `${main.weight}` };
       const ensureFace = async () => {
         try {
           await fonts.getFace(desc);
         } catch {
-          const wantsDefaultRoboto = (main.family || "Roboto").toLowerCase() === "roboto" && `${main.weight}` === "400" && main.style === "normal";
+          const wantsDefaultRoboto = (main.family || "Roboto").toLowerCase() === "roboto" && `${main.weight}` === "400";
           if (wantsDefaultRoboto) {
             const bytes = await fetchToArrayBuffer(DEFAULT_ROBOTO_URL);
             await fonts.registerFromBytes(bytes, {
               family: "Roboto",
-              weight: "400",
-              style: "normal"
+              weight: "400"
             });
           } else {
             throw new Error(
-              `Font not registered for ${desc.family}__${desc.weight}__${desc.style}`
+              `Font not registered for ${desc.family}__${desc.weight}`
             );
           }
         }
@@ -1967,10 +1959,10 @@ async function createTextEngine(opts = {}) {
     async renderFrame(asset, tSeconds, clipDuration) {
       try {
         const main = await ensureFonts(asset);
-        const desc = { family: main.family, weight: `${main.weight}`, style: main.style };
+        const desc = { family: main.family, weight: `${main.weight}` };
         let lines;
         try {
-          const emojiDesc = { family: "NotoEmoji", weight: "400", style: "normal" };
+          const emojiDesc = { family: "NotoEmoji", weight: "400" };
           let emojiAvailable = false;
           try {
             await fonts.getFace(emojiDesc);
@@ -2011,7 +2003,6 @@ async function createTextEngine(opts = {}) {
               family: main.family,
               size: main.size,
               weight: `${main.weight}`,
-              style: main.style,
               color: main.color,
               opacity: main.opacity
             },

package/package.json

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