@webstudio-is/fonts 0.87.1 → 0.88.0

package/lib/cjs/font-data.js

@@ -38,9 +38,8 @@ const parseSubfamily = (subfamily) => {
   }
   let weight = "400";
   for (weight in import_font_weights.fontWeights) {
-    const { name } = import_font_weights.fontWeights[weight];
-    const { alt } = import_font_weights.fontWeights[weight];
-    if (subfamilyLow.includes(name) || subfamilyLow.includes(alt)) {
+    const { names } = import_font_weights.fontWeights[weight];
+    if (names.some((name) => subfamilyLow.includes(name))) {
       break;
     }
   }

package/lib/cjs/font-weights.js

@@ -24,47 +24,38 @@ module.exports = __toCommonJS(font_weights_exports);
 const fontWeights = {
   "100": {
     label: "Thin",
-    name: "thin",
-    alt: "hairline"
+    names: ["thin", "hairline"]
   },
   "200": {
     label: "Extra Light",
-    name: "extra light",
-    alt: "ultra light"
+    names: ["extra light", "extralight", "ultra light", "ultralight"]
   },
   "300": {
     label: "Light",
-    name: "light",
-    alt: "light"
+    names: ["light"]
   },
   "400": {
     label: "Normal",
-    name: "normal",
-    alt: "normal"
+    names: ["normal", "regular"]
   },
   "500": {
     label: "Medium",
-    name: "medium",
-    alt: "medium"
+    names: ["medium"]
   },
   "600": {
     label: "Semi Bold",
-    name: "semi bold",
-    alt: "demi bold"
+    names: ["semi bold", "semibold", "demi bold", "demibold"]
   },
   "700": {
     label: "Bold",
-    name: "bold",
-    alt: "bold"
+    names: ["bold", "bold"]
   },
   "800": {
     label: "Extra Bold",
-    name: "extra bold",
-    alt: "ultra bold"
+    names: ["extra bold", "extrabold", "ultra bold", "ultrabold"]
   },
   "900": {
     label: "Black",
-    name: "black",
-    alt: "heavy"
+    names: ["black", "heavy"]
   }
 };

package/lib/font-data.js

@@ -12,9 +12,8 @@ const parseSubfamily = (subfamily) => {
   }
   let weight = "400";
   for (weight in fontWeights) {
-    const { name } = fontWeights[weight];
-    const { alt } = fontWeights[weight];
-    if (subfamilyLow.includes(name) || subfamilyLow.includes(alt)) {
+    const { names } = fontWeights[weight];
+    if (names.some((name) => subfamilyLow.includes(name))) {
       break;
     }
   }

package/lib/font-weights.js

@@ -1,48 +1,39 @@
 const fontWeights = {
   "100": {
     label: "Thin",
-    name: "thin",
-    alt: "hairline"
+    names: ["thin", "hairline"]
   },
   "200": {
     label: "Extra Light",
-    name: "extra light",
-    alt: "ultra light"
+    names: ["extra light", "extralight", "ultra light", "ultralight"]
   },
   "300": {
     label: "Light",
-    name: "light",
-    alt: "light"
+    names: ["light"]
   },
   "400": {
     label: "Normal",
-    name: "normal",
-    alt: "normal"
+    names: ["normal", "regular"]
   },
   "500": {
     label: "Medium",
-    name: "medium",
-    alt: "medium"
+    names: ["medium"]
   },
   "600": {
     label: "Semi Bold",
-    name: "semi bold",
-    alt: "demi bold"
+    names: ["semi bold", "semibold", "demi bold", "demibold"]
   },
   "700": {
     label: "Bold",
-    name: "bold",
-    alt: "bold"
+    names: ["bold", "bold"]
   },
   "800": {
     label: "Extra Bold",
-    name: "extra bold",
-    alt: "ultra bold"
+    names: ["extra bold", "extrabold", "ultra bold", "ultrabold"]
   },
   "900": {
     label: "Black",
-    name: "black",
-    alt: "heavy"
+    names: ["black", "heavy"]
   }
 };
 export {

package/lib/types/font-weights.d.ts

@@ -1,49 +1,39 @@
 export declare const fontWeights: {
     readonly "100": {
         readonly label: "Thin";
-        readonly name: "thin";
-        readonly alt: "hairline";
+        readonly names: readonly ["thin", "hairline"];
     };
     readonly "200": {
         readonly label: "Extra Light";
-        readonly name: "extra light";
-        readonly alt: "ultra light";
+        readonly names: readonly ["extra light", "extralight", "ultra light", "ultralight"];
     };
     readonly "300": {
         readonly label: "Light";
-        readonly name: "light";
-        readonly alt: "light";
+        readonly names: readonly ["light"];
     };
     readonly "400": {
         readonly label: "Normal";
-        readonly name: "normal";
-        readonly alt: "normal";
+        readonly names: readonly ["normal", "regular"];
     };
     readonly "500": {
         readonly label: "Medium";
-        readonly name: "medium";
-        readonly alt: "medium";
+        readonly names: readonly ["medium"];
     };
     readonly "600": {
         readonly label: "Semi Bold";
-        readonly name: "semi bold";
-        readonly alt: "demi bold";
+        readonly names: readonly ["semi bold", "semibold", "demi bold", "demibold"];
     };
     readonly "700": {
         readonly label: "Bold";
-        readonly name: "bold";
-        readonly alt: "bold";
+        readonly names: readonly ["bold", "bold"];
     };
     readonly "800": {
         readonly label: "Extra Bold";
-        readonly name: "extra bold";
-        readonly alt: "ultra bold";
+        readonly names: readonly ["extra bold", "extrabold", "ultra bold", "ultrabold"];
     };
     readonly "900": {
         readonly label: "Black";
-        readonly name: "black";
-        readonly alt: "heavy";
+        readonly names: readonly ["black", "heavy"];
     };
 };
 export type FontWeight = keyof typeof fontWeights;
-export type FontWeightKeyword = (typeof fontWeights)[FontWeight]["name"] | (typeof fontWeights)[FontWeight]["alt"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webstudio-is/fonts",
-  "version": "0.87.1",
+  "version": "0.88.0",
   "description": "Fonts utils",
   "author": "Webstudio <github@webstudio.is>",
   "homepage": "https://webstudio.is",
@@ -14,7 +14,7 @@
     "jest": "^29.6.2",
     "typescript": "5.1.6",
     "zod": "^3.21.4",
-    "@webstudio-is/design-system": "^0.87.1",
+    "@webstudio-is/design-system": "^0.88.0",
     "@webstudio-is/jest-config": "^1.0.7",
     "@webstudio-is/scripts": "^0.0.0",
     "@webstudio-is/tsconfig": "^1.0.7"

package/src/font-data.ts

@@ -25,9 +25,8 @@ export const parseSubfamily = (subfamily: string) => {
   }
   let weight: FontWeight = "400";
   for (weight in fontWeights) {
-    const { name } = fontWeights[weight];
-    const { alt } = fontWeights[weight];
-    if (subfamilyLow.includes(name) || subfamilyLow.includes(alt)) {
+    const { names } = fontWeights[weight];
+    if (names.some((name) => subfamilyLow.includes(name))) {
       break;
     }
   }

package/src/font-weights.ts

@@ -1,52 +1,40 @@
 export const fontWeights = {
   "100": {
     label: "Thin",
-    name: "thin",
-    alt: "hairline",
+    names: ["thin", "hairline"],
   },
   "200": {
     label: "Extra Light",
-    name: "extra light",
-    alt: "ultra light",
+    names: ["extra light", "extralight", "ultra light", "ultralight"],
   },
   "300": {
     label: "Light",
-    name: "light",
-    alt: "light",
+    names: ["light"],
   },
   "400": {
     label: "Normal",
-    name: "normal",
-    alt: "normal",
+    names: ["normal", "regular"],
   },
   "500": {
     label: "Medium",
-    name: "medium",
-    alt: "medium",
+    names: ["medium"],
   },
   "600": {
     label: "Semi Bold",
-    name: "semi bold",
-    alt: "demi bold",
+    names: ["semi bold", "semibold", "demi bold", "demibold"],
   },
   "700": {
     label: "Bold",
-    name: "bold",
-    alt: "bold",
+    names: ["bold", "bold"],
   },
   "800": {
     label: "Extra Bold",
-    name: "extra bold",
-    alt: "ultra bold",
+    names: ["extra bold", "extrabold", "ultra bold", "ultrabold"],
   },
   "900": {
     label: "Black",
-    name: "black",
-    alt: "heavy",
+    names: ["black", "heavy"],
   },
 } as const;
 
 export type FontWeight = keyof typeof fontWeights;
-export type FontWeightKeyword =
-  | (typeof fontWeights)[FontWeight]["name"]
-  | (typeof fontWeights)[FontWeight]["alt"];