@ankhorage/surface 0.2.3 → 1.0.0

package/src/theme/createTheme.ts

@@ -1,7 +1,7 @@
 import { generatePalette } from './colorEngine';
-import type { AnkhTheme, FontWeight, ThemeConfig, ThemeTokens } from './types';
+import type { FontWeight, SurfaceTheme, ThemeConfig, ThemeTokens } from './types';
 
-export const DEFAULT_TOKENS: Omit<ThemeTokens, 'colors' | 'scales' | 'semantics'> = {
+export const DEFAULT_TOKENS: Omit<ThemeTokens, 'colors' | 'swatches' | 'semantics'> = {
   spacing: {
     none: 0,
     xs: 4,
@@ -71,12 +71,10 @@ export const DEFAULT_CONFIG: ThemeConfig = {
   light: {
     primaryColor: '#3B82F6',
     harmony: 'monochromatic',
-    colorTone: 'neutral',
   },
   dark: {
     primaryColor: '#3B82F6',
     harmony: 'monochromatic',
-    colorTone: 'neutral',
   },
 };
 
@@ -95,13 +93,13 @@ export function createTheme(
   config: ThemeConfig = DEFAULT_CONFIG,
   mode: 'light' | 'dark' = 'light',
   activeFontId?: string | null,
-): AnkhTheme {
-  const { colors, scales, semantics } = generatePalette(config, mode);
+): SurfaceTheme {
+  const { colors, swatches, semantics } = generatePalette(config, mode);
 
   const theme = {
     ...DEFAULT_TOKENS,
-    colors: colors as AnkhTheme['colors'],
-    scales,
+    colors: colors as SurfaceTheme['colors'],
+    swatches,
     semantics,
     config,
   };

package/src/theme/types.ts

@@ -1,21 +1,18 @@
+import type { GeneratedThemeSwatches } from '@ankhorage/color-theory';
 import type { ThemeConfig as ContractsThemeConfig } from '@ankhorage/contracts';
 
-export type { ColorHarmony, ColorTone, ThemeConfig, ThemeModeConfig } from '@ankhorage/contracts';
-
-export interface ColorScale {
-  [key: number]: string;
-  50: string;
-  100: string;
-  200: string;
-  300: string;
-  400: string;
-  500: string;
-  600: string;
-  700: string;
-  800: string;
-  900: string;
-  950: string;
-}
+export type {
+  ColorHarmony,
+  ColorSwatch,
+  ColorSwatchStep,
+  GeneratedColorRole,
+  GeneratedThemeModeColors,
+  GeneratedThemeSwatches,
+  HexColor,
+  SemanticColorReferenceMap,
+  SemanticColorToken,
+} from '@ankhorage/color-theory';
+export type { ThemeConfig, ThemeModeConfig } from '@ankhorage/contracts';
 
 export interface NeutralSemantics {
   bg: string;
@@ -111,7 +108,7 @@ export interface ThemeTokens {
     warning: string;
     [key: string]: string;
   };
-  scales: Record<string, ColorScale>;
+  swatches: GeneratedThemeSwatches;
   semantics: ThemeSemantics;
   spacing: {
     none: 0;
@@ -181,6 +178,6 @@ export interface ThemeTokens {
   };
 }
 
-export interface AnkhTheme extends ThemeTokens {
+export interface SurfaceTheme extends ThemeTokens {
   config: ContractsThemeConfig;
 }

package/src/utils/deepMerge.test.ts

@@ -85,12 +85,10 @@ describe('deepMerge', () => {
       light: {
         primaryColor: 'blue',
         harmony: 'monochromatic',
-        colorTone: 'neutral',
       },
       dark: {
         primaryColor: 'blue',
         harmony: 'monochromatic',
-        colorTone: 'neutral',
       },
     };
     const source: UnknownObject = {
@@ -105,12 +103,10 @@ describe('deepMerge', () => {
       light: {
         primaryColor: 'red',
         harmony: 'monochromatic',
-        colorTone: 'neutral',
       },
       dark: {
         primaryColor: 'blue',
         harmony: 'monochromatic',
-        colorTone: 'neutral',
       },
     });
   });