@draftbit/theme 50.6.2-18a5f8.2 → 50.6.2-531e17.2

package/src/createThemeValuesProxy.ts

@@ -2,14 +2,6 @@ import { ThemeValues, Breakpoints } from "./types";
 import { Platform, TextStyle } from "react-native";
 import { isObject } from "lodash";
 
-interface CreateThemeValuesProxyInput {
-  value: ThemeValues | undefined;
-  breakpoints: Breakpoints;
-  deviceWidth: number;
-  devicePlatform: typeof Platform.OS;
-  currentLightDarkSelection: "light" | "dark";
-}
-
 /**
  * Creates a proxy for theme value objects to select a value whenever
  * multiple values are provided for different platforms, breakpoints, and/or light/dark modes
@@ -17,13 +9,13 @@ interface CreateThemeValuesProxyInput {
  * Ex: {color: {ios: "blue", android: "red"}}
  *      -> theme.color returns "blue" when the platform is ios and "red" when android
  */
-export default function createThemeValuesProxy({
-  value,
-  breakpoints,
-  deviceWidth,
-  devicePlatform,
-  currentLightDarkSelection,
-}: CreateThemeValuesProxyInput): any /* return type 'any' to allow arbitrary object references (object.example.another.there) */ {
+export default function createThemeValuesProxy(
+  value: ThemeValues | undefined,
+  breakpoints: Breakpoints,
+  deviceWidth: number,
+  devicePlatform: typeof Platform.OS,
+  currentLightDarkSelection: "light" | "dark"
+): any /* return type 'any' to allow arbitrary object references (object.example.another.there) */ {
   if (value === undefined || value === null) {
     return undefined;
   }
@@ -50,22 +42,38 @@ export default function createThemeValuesProxy({
           lightDarkKeys
         );
 
-        const input: CreateThemeValuesProxyInput = {
-          value: valueAsThemeValues,
-          breakpoints,
-          deviceWidth,
-          devicePlatform,
-          currentLightDarkSelection,
-        };
-
         if (keysType === "default") {
-          return createThemeValuesProxy(input);
+          return createThemeValuesProxy(
+            valueAsThemeValues,
+            breakpoints,
+            deviceWidth,
+            devicePlatform,
+            currentLightDarkSelection
+          );
         } else if (keysType === "platform") {
-          return getPlatformValue(input);
+          return getPlatformValue(
+            valueAsThemeValues,
+            breakpoints,
+            deviceWidth,
+            devicePlatform,
+            currentLightDarkSelection
+          );
         } else if (keysType === "breakpoint") {
-          return getBreakpointValue(input);
+          return getBreakpointValue(
+            valueAsThemeValues,
+            breakpoints,
+            deviceWidth,
+            devicePlatform,
+            currentLightDarkSelection
+          );
         } else if (keysType === "lightDark") {
-          return getLightDarkValue(input);
+          return getLightDarkValue(
+            valueAsThemeValues,
+            breakpoints,
+            deviceWidth,
+            devicePlatform,
+            currentLightDarkSelection
+          );
         } else {
           return undefined;
         }
@@ -137,24 +145,38 @@ function allFalse(a: boolean, b: boolean, c: boolean, d: boolean) {
   return [a, b, c, d].filter((x) => x).length === 0;
 }
 
-function getPlatformValue(input: CreateThemeValuesProxyInput) {
-  const { value, devicePlatform } = input;
-
+function getPlatformValue(
+  value: ThemeValues | undefined,
+  breakpoints: Breakpoints,
+  deviceWidth: number,
+  devicePlatform: typeof Platform.OS,
+  currentLightDarkSelection: "light" | "dark"
+) {
   const currentPlatformValue = value?.[devicePlatform] ?? value?.default;
   const valueAsThemeValues = isObject(currentPlatformValue)
     ? (currentPlatformValue as ThemeValues)
     : undefined;
 
   if (valueAsThemeValues) {
-    return createThemeValuesProxy({ ...input, value: valueAsThemeValues });
+    return createThemeValuesProxy(
+      valueAsThemeValues,
+      breakpoints,
+      deviceWidth,
+      devicePlatform,
+      currentLightDarkSelection
+    );
   } else {
     return currentPlatformValue;
   }
 }
 
-function getBreakpointValue(input: CreateThemeValuesProxyInput) {
-  const { value, breakpoints, deviceWidth } = input;
-
+function getBreakpointValue(
+  value: ThemeValues | undefined,
+  breakpoints: Breakpoints,
+  deviceWidth: number,
+  devicePlatform: typeof Platform.OS,
+  currentLightDarkSelection: "light" | "dark"
+) {
   const keysToBreakpointValue: [string, number][] = Object.keys(
     value ?? {}
   ).map((key) => [key, breakpoints[key]]);
@@ -172,15 +194,25 @@ function getBreakpointValue(input: CreateThemeValuesProxyInput) {
     : undefined;
 
   if (valueAsThemeValues) {
-    return createThemeValuesProxy({ ...input, value: valueAsThemeValues });
+    return createThemeValuesProxy(
+      valueAsThemeValues,
+      breakpoints,
+      deviceWidth,
+      devicePlatform,
+      currentLightDarkSelection
+    );
   } else {
     return currentBreakpointValue;
   }
 }
 
-function getLightDarkValue(input: CreateThemeValuesProxyInput) {
-  const { value, currentLightDarkSelection } = input;
-
+function getLightDarkValue(
+  value: ThemeValues | undefined,
+  breakpoints: Breakpoints,
+  deviceWidth: number,
+  devicePlatform: typeof Platform.OS,
+  currentLightDarkSelection: "light" | "dark"
+) {
   const currentLightDarkValue =
     value?.[currentLightDarkSelection] ?? value?.default;
   const valueAsThemeValues = isObject(currentLightDarkSelection)
@@ -188,7 +220,13 @@ function getLightDarkValue(input: CreateThemeValuesProxyInput) {
     : undefined;
 
   if (valueAsThemeValues) {
-    return createThemeValuesProxy({ ...input, value: valueAsThemeValues });
+    return createThemeValuesProxy(
+      valueAsThemeValues,
+      breakpoints,
+      deviceWidth,
+      devicePlatform,
+      currentLightDarkSelection
+    );
   } else {
     return currentLightDarkValue;
   }

package/src/validators.js

@@ -1,91 +1,17 @@
-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) {
-    const result = PaletteSchema.safeParse(palettes);
-    if (!result.success) {
-        throw new Error("Invalid palettes object: " + result.error.message);
-    }
+    palettes;
 }
 export function validateBreakpoints(breakpoints) {
-    const result = BreakpointSchema.safeParse(breakpoints);
-    if (!result.success) {
-        throw new Error("Invalid breakpoints object: " + result.error.message);
-    }
+    breakpoints;
 }
 export function validateTheme(theme) {
-    const result = ThemeSchema.safeParse(theme);
-    if (!result.success) {
-        throw new Error("Invalid theme object: " + result.error.message);
-    }
+    theme;
 }
 export function isTextStyleObject(value) {
-    return TextStyleSchema.safeParse(value).success;
+    value;
+    return true;
 }
 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;
+    return value;
 }
 //# sourceMappingURL=validators.js.map

package/src/validators.js.map

@@ -1 +1 @@
-{"version":3,"file":"validators.js","sourceRoot":"","sources":["validators.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validators.js","sourceRoot":"","sources":["validators.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,gBAAgB,CAAC,QAAuB;IACtD,QAAQ,CAAC;AACX,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,WAAwB;IAC1D,WAAW,CAAC;AACd,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,KAAY;IACxC,KAAK,CAAC;AACR,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAAU;IAC1C,KAAK,CAAC;IACN,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,KAAU;IAC5C,OAAO,KAAK,CAAC;AACf,CAAC"}

package/src/validators.ts

@@ -1,116 +1,22 @@
 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) {
-  const result = PaletteSchema.safeParse(palettes);
-  if (!result.success) {
-    throw new Error("Invalid palettes object: " + result.error.message);
-  }
+  palettes;
 }
 
 export function validateBreakpoints(breakpoints: Breakpoints) {
-  const result = BreakpointSchema.safeParse(breakpoints);
-  if (!result.success) {
-    throw new Error("Invalid breakpoints object: " + result.error.message);
-  }
+  breakpoints;
 }
 
 export function validateTheme(theme: Theme) {
-  const result = ThemeSchema.safeParse(theme);
-  if (!result.success) {
-    throw new Error("Invalid theme object: " + result.error.message);
-  }
+  theme;
 }
 
 export function isTextStyleObject(value: any): boolean {
-  return TextStyleSchema.safeParse(value).success;
+  value;
+  return true;
 }
 
 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;
+  return value;
 }