@tamagui/theme-builder 1.77.1 → 1.78.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/theme-builder",
-  "version": "1.77.1",
+  "version": "1.78.0",
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
   "main": "dist/cjs",
@@ -27,10 +27,10 @@
     }
   },
   "dependencies": {
-    "@tamagui/create-theme": "1.77.1"
+    "@tamagui/create-theme": "1.78.0"
   },
   "devDependencies": {
-    "@tamagui/build": "1.77.1"
+    "@tamagui/build": "1.78.0"
   },
   "publishConfig": {
     "access": "public"

package/src/types.ts

@@ -1,8 +1,8 @@
 // only used by the studio theme builder generated:
 
 export type BuildThemeSuiteProps = {
-  baseTheme: BuildLightDarkTheme
-  subThemes?: (BuildColorSubTheme | BuildMaskSubTheme)[]
+  baseTheme: BuildTheme
+  subThemes?: (BuildTheme | BuildThemeMask)[]
 }
 
 export type ScaleTypeName =
@@ -17,25 +17,20 @@ export type ScaleTypeName =
   | 'neon-bright'
   | 'neon-c'
 
-export type BuildThemeBasicProperties = {
+export type BuildThemeBase = {
   id: string
+  name: string
+  errors?: string[]
+}
+
+export type BuildTheme = BuildThemeBase & {
+  type: 'theme'
   color: string
   scale: ScaleTypeName
   // saturation?: 'low' | 'x' | 'high'
   contrast?: string
   contrastColor?: string
   contrastScale?: ScaleTypeName
-  errors?: string[]
-}
-
-export type BuildLightDarkTheme = BuildThemeBasicProperties & {
-  type: 'lightdark'
-}
-
-export type BuildColorSubTheme = BuildThemeBasicProperties & {
-  type: 'base'
-  subThemeType: 'color'
-  name: string
 }
 
 export type BuildMask = { id: string } & (
@@ -60,11 +55,7 @@ export type BuildMask = { id: string } & (
     }
 )
 
-export type BuildMaskSubTheme = {
-  id: string
-  type: 'sub'
-  subThemeType: 'mask'
-  name: string
+export type BuildThemeMask = BuildThemeBase & {
+  type: 'mask'
   masks: BuildMask[]
-  errors?: string[]
 }

package/types/types.d.ts

@@ -1,24 +1,20 @@
 export type BuildThemeSuiteProps = {
-    baseTheme: BuildLightDarkTheme;
-    subThemes?: (BuildColorSubTheme | BuildMaskSubTheme)[];
+    baseTheme: BuildTheme;
+    subThemes?: (BuildTheme | BuildThemeMask)[];
 };
 export type ScaleTypeName = 'radix' | 'radix-b' | 'radius-bold' | 'radius-bright' | 'linear' | 'pastel' | 'pastel-desaturating' | 'neon' | 'neon-bright' | 'neon-c';
-export type BuildThemeBasicProperties = {
+export type BuildThemeBase = {
     id: string;
+    name: string;
+    errors?: string[];
+};
+export type BuildTheme = BuildThemeBase & {
+    type: 'theme';
     color: string;
     scale: ScaleTypeName;
     contrast?: string;
     contrastColor?: string;
     contrastScale?: ScaleTypeName;
-    errors?: string[];
-};
-export type BuildLightDarkTheme = BuildThemeBasicProperties & {
-    type: 'lightdark';
-};
-export type BuildColorSubTheme = BuildThemeBasicProperties & {
-    type: 'base';
-    subThemeType: 'color';
-    name: string;
 };
 export type BuildMask = {
     id: string;
@@ -37,12 +33,8 @@ export type BuildMask = {
     type: 'softenBorder';
     strength: number;
 });
-export type BuildMaskSubTheme = {
-    id: string;
-    type: 'sub';
-    subThemeType: 'mask';
-    name: string;
+export type BuildThemeMask = BuildThemeBase & {
+    type: 'mask';
     masks: BuildMask[];
-    errors?: string[];
 };
 //# sourceMappingURL=types.d.ts.map

package/types/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,oBAAoB,GAAG;IACjC,SAAS,EAAE,mBAAmB,CAAA;IAC9B,SAAS,CAAC,EAAE,CAAC,kBAAkB,GAAG,iBAAiB,CAAC,EAAE,CAAA;CACvD,CAAA;AAED,MAAM,MAAM,aAAa,GACrB,OAAO,GACP,SAAS,GACT,aAAa,GACb,eAAe,GACf,QAAQ,GACR,QAAQ,GACR,qBAAqB,GACrB,MAAM,GACN,aAAa,GACb,QAAQ,CAAA;AAEZ,MAAM,MAAM,yBAAyB,GAAG;IACtC,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,aAAa,CAAA;IAEpB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG,yBAAyB,GAAG;IAC5D,IAAI,EAAE,WAAW,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG,yBAAyB,GAAG;IAC3D,IAAI,EAAE,MAAM,CAAA;IACZ,YAAY,EAAE,OAAO,CAAA;IACrB,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,MAAM,MAAM,SAAS,GAAG;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,GAAG,CACrC;IACE,IAAI,EAAE,YAAY,CAAA;IAClB,QAAQ,EAAE,MAAM,CAAA;CACjB,GACD;IACE,IAAI,EAAE,QAAQ,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;CACjB,GACD;IACE,IAAI,EAAE,SAAS,CAAA;CAChB,GACD;IACE,IAAI,EAAE,kBAAkB,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAA;CACjB,GACD;IACE,IAAI,EAAE,cAAc,CAAA;IACpB,QAAQ,EAAE,MAAM,CAAA;CACjB,CACJ,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,KAAK,CAAA;IACX,YAAY,EAAE,MAAM,CAAA;IACpB,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,SAAS,EAAE,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;CAClB,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,oBAAoB,GAAG;IACjC,SAAS,EAAE,UAAU,CAAA;IACrB,SAAS,CAAC,EAAE,CAAC,UAAU,GAAG,cAAc,CAAC,EAAE,CAAA;CAC5C,CAAA;AAED,MAAM,MAAM,aAAa,GACrB,OAAO,GACP,SAAS,GACT,aAAa,GACb,eAAe,GACf,QAAQ,GACR,QAAQ,GACR,qBAAqB,GACrB,MAAM,GACN,aAAa,GACb,QAAQ,CAAA;AAEZ,MAAM,MAAM,cAAc,GAAG;IAC3B,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,UAAU,GAAG,cAAc,GAAG;IACxC,IAAI,EAAE,OAAO,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,aAAa,CAAA;IAEpB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,aAAa,CAAC,EAAE,aAAa,CAAA;CAC9B,CAAA;AAED,MAAM,MAAM,SAAS,GAAG;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,GAAG,CACrC;IACE,IAAI,EAAE,YAAY,CAAA;IAClB,QAAQ,EAAE,MAAM,CAAA;CACjB,GACD;IACE,IAAI,EAAE,QAAQ,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;CACjB,GACD;IACE,IAAI,EAAE,SAAS,CAAA;CAChB,GACD;IACE,IAAI,EAAE,kBAAkB,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAA;CACjB,GACD;IACE,IAAI,EAAE,cAAc,CAAA;IACpB,QAAQ,EAAE,MAAM,CAAA;CACjB,CACJ,CAAA;AAED,MAAM,MAAM,cAAc,GAAG,cAAc,GAAG;IAC5C,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,SAAS,EAAE,CAAA;CACnB,CAAA"}