@draftbit/theme 50.5.3 → 50.5.4-629c6c.2

package/src/createThemeValuesProxy.ts

@@ -1,6 +1,6 @@
 import { ThemeValues, Breakpoints } from "./types";
-import { Platform } from "react-native";
-import { isObject } from "lodash";
+import { Platform, TextStyle } from "react-native";
+import { asThemeValuesObject } from "./validators";
 
 /**
  * Creates a proxy for theme value objects to select a value whenever
@@ -23,16 +23,18 @@ export default function createThemeValuesProxy(
     get: (
       target: ThemeValues,
       key: string
-    ): string | number | ThemeValues | undefined => {
+    ): string | number | ThemeValues | TextStyle | undefined => {
       const currentValue = target[key];
-      if (!isObject(currentValue)) {
-        return currentValue;
-      } else {
+
+      const valueAsThemeValues = asThemeValuesObject(currentValue);
+
+      if (valueAsThemeValues) {
         const platformKeys = ["ios", "android", "web", "macos", "windows"];
         const breakpointKeys = Object.keys(breakpoints);
         const lightDarkKeys = ["light", "dark"];
+
         const keysType = getKeysType(
-          currentValue,
+          valueAsThemeValues,
           platformKeys,
           breakpointKeys,
           lightDarkKeys
@@ -40,7 +42,7 @@ export default function createThemeValuesProxy(
 
         if (keysType === "default") {
           return createThemeValuesProxy(
-            currentValue,
+            valueAsThemeValues,
             breakpoints,
             deviceWidth,
             devicePlatform,
@@ -48,7 +50,7 @@ export default function createThemeValuesProxy(
           );
         } else if (keysType === "platform") {
           return getPlatformValue(
-            currentValue,
+            valueAsThemeValues,
             breakpoints,
             deviceWidth,
             devicePlatform,
@@ -56,7 +58,7 @@ export default function createThemeValuesProxy(
           );
         } else if (keysType === "breakpoint") {
           return getBreakpointValue(
-            currentValue,
+            valueAsThemeValues,
             breakpoints,
             deviceWidth,
             devicePlatform,
@@ -64,7 +66,7 @@ export default function createThemeValuesProxy(
           );
         } else if (keysType === "lightDark") {
           return getLightDarkValue(
-            currentValue,
+            valueAsThemeValues,
             breakpoints,
             deviceWidth,
             devicePlatform,
@@ -73,6 +75,8 @@ export default function createThemeValuesProxy(
         } else {
           return undefined;
         }
+      } else {
+        return currentValue;
       }
     },
     set: () => {
@@ -147,16 +151,18 @@ function getPlatformValue(
   currentLightDarkSelection: "light" | "dark"
 ) {
   const currentPlatformValue = value[devicePlatform] ?? value.default;
-  if (!isObject(currentPlatformValue)) {
-    return currentPlatformValue;
-  } else {
+  const valueAsThemeValues = asThemeValuesObject(currentPlatformValue);
+
+  if (valueAsThemeValues) {
     return createThemeValuesProxy(
-      currentPlatformValue,
+      valueAsThemeValues,
       breakpoints,
       deviceWidth,
       devicePlatform,
       currentLightDarkSelection
     );
+  } else {
+    return currentPlatformValue;
   }
 }
 
@@ -178,16 +184,18 @@ function getBreakpointValue(
     }
   }
   const currentBreakpointValue = value[currentBreakpointKey] ?? value.default;
-  if (!isObject(currentBreakpointValue)) {
-    return currentBreakpointValue;
-  } else {
+  const valueAsThemeValues = asThemeValuesObject(currentBreakpointValue);
+
+  if (valueAsThemeValues) {
     return createThemeValuesProxy(
-      currentBreakpointValue,
+      valueAsThemeValues,
       breakpoints,
       deviceWidth,
       devicePlatform,
       currentLightDarkSelection
     );
+  } else {
+    return currentBreakpointValue;
   }
 }
 
@@ -200,16 +208,17 @@ function getLightDarkValue(
 ) {
   const currentLightDarkValue =
     value[currentLightDarkSelection] ?? value.default;
+  const valueAsThemeValues = asThemeValuesObject(currentLightDarkValue);
 
-  if (!isObject(currentLightDarkValue)) {
-    return currentLightDarkValue;
-  } else {
+  if (valueAsThemeValues) {
     return createThemeValuesProxy(
-      currentLightDarkValue,
+      valueAsThemeValues,
       breakpoints,
       deviceWidth,
       devicePlatform,
       currentLightDarkSelection
     );
+  } else {
+    return currentLightDarkValue;
   }
 }

package/src/types.ts

@@ -1,5 +1,7 @@
+import { TextStyle } from "react-native";
+
 export type ThemeValues = {
-  [key: string]: string | number | ThemeValues;
+  [key: string]: string | number | TextStyle | ThemeValues;
 };
 
 export type Theme = {
@@ -11,7 +13,21 @@ export type Theme = {
     foreground?: ThemeValues;
     border?: ThemeValues;
   };
-  typography: { [key: string]: any }; //TODO: Update theme to support typography. Left as 'any' for legacy support until updated and migrated
+  typography: {
+    body1?: ThemeValues | TextStyle;
+    body2?: ThemeValues | TextStyle;
+    button?: ThemeValues | TextStyle;
+    caption?: ThemeValues | TextStyle;
+    headline1?: ThemeValues | TextStyle;
+    headline2?: ThemeValues | TextStyle;
+    headline3?: ThemeValues | TextStyle;
+    headline4?: ThemeValues | TextStyle;
+    headline5?: ThemeValues | TextStyle;
+    headline6?: ThemeValues | TextStyle;
+    overline?: ThemeValues | TextStyle;
+    subtitle1?: ThemeValues | TextStyle;
+    subtitle2?: ThemeValues | TextStyle;
+  };
 };
 
 export type ValidatedTheme = Theme & {
@@ -26,6 +42,21 @@ export type ReadTheme = Theme & {
     foreground?: any;
     border?: any;
   };
+  typography: {
+    body1?: any;
+    body2?: any;
+    button?: any;
+    caption?: any;
+    headline1?: any;
+    headline2?: any;
+    headline3?: any;
+    headline4?: any;
+    headline5?: any;
+    headline6?: any;
+    overline?: any;
+    subtitle1?: any;
+    subtitle2?: any;
+  };
 };
 
 export type ColorPaletteValues = {

package/src/validators.js

@@ -1,52 +1,91 @@
+import { z } from "zod";
+const PaletteSchema = z.record(z.string(), z.record(z.string(), z.string()));
+const BreakpointSchema = z.record(z.string(), z.number());
+const TextStyleSchema = z.union([
+    z.object({
+        fontSize: z.number(),
+    }),
+    z.object({
+        fontFamily: z.string(),
+    }),
+    z.object({
+        fontWeight: z.enum([
+            "normal",
+            "bold",
+            "100",
+            "200",
+            "300",
+            "400",
+            "500",
+            "600",
+            "700",
+            "800",
+            "900",
+        ]),
+    }),
+    z.object({
+        fontStyle: z.enum(["normal", "italic"]),
+    }),
+    z.object({
+        letterSpacing: z.number(),
+    }),
+    z.object({
+        lineHeight: z.number(),
+    }),
+]);
+const ThemeValuesSchema = z.record(z.string(), z.lazy(() => z.union([z.string(), z.number(), TextStyleSchema, ThemeValuesSchema])));
+const TextStyleOrThemeValuesSchema = z.union([TextStyleSchema, ThemeValuesSchema]);
+const ThemeSchema = z.object({
+    name: z.string(),
+    colors: z.object({
+        branding: ThemeValuesSchema.optional(),
+        text: ThemeValuesSchema.optional(),
+        background: ThemeValuesSchema.optional(),
+        foreground: ThemeValuesSchema.optional(),
+        border: ThemeValuesSchema.optional(),
+    }),
+    typography: z.object({
+        body1: TextStyleOrThemeValuesSchema.optional(),
+        body2: TextStyleOrThemeValuesSchema.optional(),
+        button: TextStyleOrThemeValuesSchema.optional(),
+        caption: TextStyleOrThemeValuesSchema.optional(),
+        headline1: TextStyleOrThemeValuesSchema.optional(),
+        headline2: TextStyleOrThemeValuesSchema.optional(),
+        headline3: TextStyleOrThemeValuesSchema.optional(),
+        headline4: TextStyleOrThemeValuesSchema.optional(),
+        headline5: TextStyleOrThemeValuesSchema.optional(),
+        headline6: TextStyleOrThemeValuesSchema.optional(),
+        overline: TextStyleOrThemeValuesSchema.optional(),
+        subtitle1: TextStyleOrThemeValuesSchema.optional(),
+        subtitle2: TextStyleOrThemeValuesSchema.optional(),
+    }),
+});
 export function validatePalettes(palettes) {
-    for (const key of Object.keys(palettes)) {
-        if (typeof key !== "string") {
-            throw new Error(`Invalid palettes object, ${key} is not a string`);
-        }
-        for (const [innerKey, value] of Object.entries(palettes[key])) {
-            if (typeof innerKey !== "string") {
-                throw new Error(`Invalid palette color key, ${innerKey} is not a string`);
-            }
-            if (typeof value !== "string") {
-                throw new Error(`Invalid palette color value, ${value} is not a string`);
-            }
-        }
+    const result = PaletteSchema.safeParse(palettes);
+    if (!result.success) {
+        throw new Error("Invalid palettes object: " + result.error.message);
     }
 }
 export function validateBreakpoints(breakpoints) {
-    for (const [key, value] of Object.entries(breakpoints)) {
-        if (typeof key !== "string") {
-            throw new Error(`Invalid breakpoint key, ${key} is not a string`);
-        }
-        if (typeof value !== "number") {
-            throw new Error(`Invalid breakpoint value, ${value} is not a number`);
-        }
+    const result = BreakpointSchema.safeParse(breakpoints);
+    if (!result.success) {
+        throw new Error("Invalid breakpoints object: " + result.error.message);
     }
 }
 export function validateTheme(theme) {
-    function validateThemeValues(themeValue) {
-        if (themeValue === undefined || themeValue === null) {
-            return;
-        }
-        for (const [key, value] of Object.entries(themeValue)) {
-            if (typeof key !== "string") {
-                throw new Error(`Invalid theme key, ${key} is not a string`);
-            }
-            if (value === undefined || value === null) {
-                continue;
-            }
-            else if (typeof value === "object") {
-                validateThemeValues(value);
-            }
-            else if (typeof value !== "string" && typeof value !== "number") {
-                throw new Error(`Invalid theme value, ${value} is not a string, number, or object`);
-            }
-        }
+    const result = ThemeSchema.safeParse(theme);
+    if (!result.success) {
+        throw new Error("Invalid theme object: " + result.error.message);
     }
-    validateThemeValues(theme.colors.branding);
-    validateThemeValues(theme.colors.text);
-    validateThemeValues(theme.colors.foreground);
-    validateThemeValues(theme.colors.background);
-    validateThemeValues(theme.colors.border);
+}
+export function isTextStyleObject(value) {
+    return TextStyleSchema.safeParse(value).success;
+}
+export function asThemeValuesObject(value) {
+    // Text style matches the shape of ThemeValues, but we don't want to treat it as a ThemeValues
+    if (isTextStyleObject(value)) {
+        return null;
+    }
+    return ThemeValuesSchema.safeParse(value).success ? value : null;
 }
 //# sourceMappingURL=validators.js.map

package/src/validators.js.map

@@ -1 +1 @@
-{"version":3,"file":"validators.js","sourceRoot":"","sources":["validators.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,gBAAgB,CAAC,QAAuB;IACtD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;QACvC,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YAC3B,MAAM,IAAI,KAAK,CAAC,4BAA4B,GAAG,kBAAkB,CAAC,CAAC;SACpE;QACD,KAAK,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE;YAC7D,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;gBAChC,MAAM,IAAI,KAAK,CACb,8BAA8B,QAAQ,kBAAkB,CACzD,CAAC;aACH;YACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;gBAC7B,MAAM,IAAI,KAAK,CACb,gCAAgC,KAAK,kBAAkB,CACxD,CAAC;aACH;SACF;KACF;AACH,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,WAAwB;IAC1D,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;QACtD,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YAC3B,MAAM,IAAI,KAAK,CAAC,2BAA2B,GAAG,kBAAkB,CAAC,CAAC;SACnE;QACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,MAAM,IAAI,KAAK,CAAC,6BAA6B,KAAK,kBAAkB,CAAC,CAAC;SACvE;KACF;AACH,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,KAAY;IACxC,SAAS,mBAAmB,CAAC,UAAwB;QACnD,IAAI,UAAU,KAAK,SAAS,IAAI,UAAU,KAAK,IAAI,EAAE;YACnD,OAAO;SACR;QACD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YACrD,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;gBAC3B,MAAM,IAAI,KAAK,CAAC,sBAAsB,GAAG,kBAAkB,CAAC,CAAC;aAC9D;YACD,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE;gBACzC,SAAS;aACV;iBAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;gBACpC,mBAAmB,CAAC,KAAK,CAAC,CAAC;aAC5B;iBAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;gBACjE,MAAM,IAAI,KAAK,CACb,wBAAwB,KAAK,qCAAqC,CACnE,CAAC;aACH;SACF;IACH,CAAC;IACD,mBAAmB,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC3C,mBAAmB,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACvC,mBAAmB,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAC7C,mBAAmB,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAC7C,mBAAmB,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AAC3C,CAAC"}
+{"version":3,"file":"validators.js","sourceRoot":"","sources":["validators.ts"],"names":[],"mappings":"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"}

package/src/validators.ts

@@ -1,59 +1,116 @@
 import { ColorPalettes, Breakpoints, Theme, ThemeValues } from "./types";
+import { TextStyle } from "react-native";
+import { z } from "zod";
+
+const PaletteSchema: z.ZodType<ColorPalettes> = z.record(
+  z.string(),
+  z.record(z.string(), z.string())
+);
+
+const BreakpointSchema: z.ZodType<Breakpoints> = z.record(
+  z.string(),
+  z.number()
+);
+
+const TextStyleSchema: z.ZodType<TextStyle> = z.union([
+  z.object({
+    fontSize: z.number(),
+  }),
+  z.object({
+    fontFamily: z.string(),
+  }),
+  z.object({
+    fontWeight: z.enum([
+      "normal",
+      "bold",
+      "100",
+      "200",
+      "300",
+      "400",
+      "500",
+      "600",
+      "700",
+      "800",
+      "900",
+    ]),
+  }),
+  z.object({
+    fontStyle: z.enum(["normal", "italic"]),
+  }),
+  z.object({
+    letterSpacing: z.number(),
+  }),
+  z.object({
+    lineHeight: z.number(),
+  }),
+]);
+
+const ThemeValuesSchema: z.ZodType<ThemeValues> = z.record(
+  z.string(),
+  z.lazy(() =>
+    z.union([z.string(), z.number(), TextStyleSchema, ThemeValuesSchema])
+  )
+);
+
+const TextStyleOrThemeValuesSchema: z.ZodType<ThemeValues | TextStyle> =
+  z.union([TextStyleSchema, ThemeValuesSchema]);
+
+const ThemeSchema: z.ZodType<Theme> = z.object({
+  name: z.string(),
+  colors: z.object({
+    branding: ThemeValuesSchema.optional(),
+    text: ThemeValuesSchema.optional(),
+    background: ThemeValuesSchema.optional(),
+    foreground: ThemeValuesSchema.optional(),
+    border: ThemeValuesSchema.optional(),
+  }),
+  typography: z.object({
+    body1: TextStyleOrThemeValuesSchema.optional(),
+    body2: TextStyleOrThemeValuesSchema.optional(),
+    button: TextStyleOrThemeValuesSchema.optional(),
+    caption: TextStyleOrThemeValuesSchema.optional(),
+    headline1: TextStyleOrThemeValuesSchema.optional(),
+    headline2: TextStyleOrThemeValuesSchema.optional(),
+    headline3: TextStyleOrThemeValuesSchema.optional(),
+    headline4: TextStyleOrThemeValuesSchema.optional(),
+    headline5: TextStyleOrThemeValuesSchema.optional(),
+    headline6: TextStyleOrThemeValuesSchema.optional(),
+    overline: TextStyleOrThemeValuesSchema.optional(),
+    subtitle1: TextStyleOrThemeValuesSchema.optional(),
+    subtitle2: TextStyleOrThemeValuesSchema.optional(),
+  }),
+});
 
 export function validatePalettes(palettes: ColorPalettes) {
-  for (const key of Object.keys(palettes)) {
-    if (typeof key !== "string") {
-      throw new Error(`Invalid palettes object, ${key} is not a string`);
-    }
-    for (const [innerKey, value] of Object.entries(palettes[key])) {
-      if (typeof innerKey !== "string") {
-        throw new Error(
-          `Invalid palette color key, ${innerKey} is not a string`
-        );
-      }
-      if (typeof value !== "string") {
-        throw new Error(
-          `Invalid palette color value, ${value} is not a string`
-        );
-      }
-    }
+  const result = PaletteSchema.safeParse(palettes);
+  if (!result.success) {
+    throw new Error("Invalid palettes object: " + result.error.message);
   }
 }
 
 export function validateBreakpoints(breakpoints: Breakpoints) {
-  for (const [key, value] of Object.entries(breakpoints)) {
-    if (typeof key !== "string") {
-      throw new Error(`Invalid breakpoint key, ${key} is not a string`);
-    }
-    if (typeof value !== "number") {
-      throw new Error(`Invalid breakpoint value, ${value} is not a number`);
-    }
+  const result = BreakpointSchema.safeParse(breakpoints);
+  if (!result.success) {
+    throw new Error("Invalid breakpoints object: " + result.error.message);
   }
 }
 
 export function validateTheme(theme: Theme) {
-  function validateThemeValues(themeValue?: ThemeValues) {
-    if (themeValue === undefined || themeValue === null) {
-      return;
-    }
-    for (const [key, value] of Object.entries(themeValue)) {
-      if (typeof key !== "string") {
-        throw new Error(`Invalid theme key, ${key} is not a string`);
-      }
-      if (value === undefined || value === null) {
-        continue;
-      } else if (typeof value === "object") {
-        validateThemeValues(value);
-      } else if (typeof value !== "string" && typeof value !== "number") {
-        throw new Error(
-          `Invalid theme value, ${value} is not a string, number, or object`
-        );
-      }
-    }
+  const result = ThemeSchema.safeParse(theme);
+  if (!result.success) {
+    throw new Error("Invalid theme object: " + result.error.message);
   }
-  validateThemeValues(theme.colors.branding);
-  validateThemeValues(theme.colors.text);
-  validateThemeValues(theme.colors.foreground);
-  validateThemeValues(theme.colors.background);
-  validateThemeValues(theme.colors.border);
+}
+
+export function isTextStyleObject(value: any): boolean {
+  return TextStyleSchema.safeParse(value).success;
+}
+
+export function asThemeValuesObject(value: any): ThemeValues | null {
+  // Text style matches the shape of ThemeValues, but we don't want to treat it as a ThemeValues
+  if (isTextStyleObject(value)) {
+    return null;
+  }
+
+  return ThemeValuesSchema.safeParse(value).success ? value : null;
 }