fix: colors schemas typing

morfeojs · Nov 22, 2022 · 08142ba · 08142ba
1 parent 979bff1
commit 08142ba
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 15 deletions.
diff --git a/packages/core/src/parsers/colors/colors.ts b/packages/core/src/parsers/colors/colors.ts
@@ -23,11 +23,6 @@ export function parseColor({
         scale: 'colors',
       });
     }
-    return baseParser({
-      value,
-      property,
-      scale: 'colors',
-    });
   }
 
   return baseParser({

diff --git a/packages/core/tests/parsers/colors.test.ts b/packages/core/tests/parsers/colors.test.ts
@@ -1,3 +1,4 @@
+import { Theme } from "@morfeo/spec"
 import { parsers, theme } from '../../src';
 
 const THEME = {
@@ -8,12 +9,12 @@ const THEME = {
     foreground: '#000',
   },
   colorSchemas: {
-    dark: {
+    default: {
       background: 'secondary',
       foreground: 'primary',
     },
   },
-} as const;
+} as any as Theme;
 
 describe('colors', () => {
   beforeAll(() => {
@@ -31,25 +32,29 @@ describe('colors', () => {
   test('should resolve color based on colorSchema', () => {
     const result = parsers.resolve({
       bg: 'background',
+      // @ts-expect-error
       color: 'foreground',
-      colorSchema: 'dark',
+      colorSchema: 'default',
     });
     expect(result).toEqual({ backgroundColor: '#000', color: '#e3e3e3' });
   });
 
   test("should return the original value if colorSchema doesn't exist", () => {
     const result = parsers.resolve({
       bg: 'background',
+      // @ts-expect-error
       color: 'foreground',
+      // @ts-expect-error
       colorSchema: 'unexistingSchema',
     });
     expect(result).toEqual({ backgroundColor: '#e3e3e3', color: '#000' });
   });
 
   test("should return the original value if the input value doesn't exist on color schema", () => {
     const result = parsers.resolve({
+      // @ts-expect-error
       bg: 'unexistingValue',
-      colorSchema: 'dark',
+      colorSchema: 'default',
     });
     expect(result).toEqual({ backgroundColor: 'unexistingValue' });
   });

diff --git a/packages/preset-default/src/base/colorSchemas.ts b/packages/preset-default/src/base/colorSchemas.ts
@@ -0,0 +1,5 @@
+import { ColorSchemas } from '@morfeo/spec';
+
+export const colorSchemas: ColorSchemas = {
+  default: {},
+};
diff --git a/packages/preset-default/src/base/index.ts b/packages/preset-default/src/base/index.ts
@@ -16,6 +16,7 @@ import { spacings } from './spacings';
 import { transitions } from './transitions';
 import { zIndices } from './zIndices';
 import { darkColors, lightColors } from './colors';
+import { colorSchemas } from './colorSchemas';
 import { components, darkComponents } from './components';
 
 const fonts = {
@@ -42,10 +43,8 @@ export const baseTheme: Omit<Theme, 'colors'> = {
   borderWidths,
   borderStyles,
   mediaQueries: {},
+  colorSchemas,
   letterSpacings,
-  colorSchemas: {
-    default: {},
-  },
 };
 
 export const darkTheme = {

diff --git a/packages/spec/src/allProperties.ts b/packages/spec/src/allProperties.ts
@@ -15,6 +15,7 @@ import {
   transitionsMap,
   borderWidthsMap,
   borderStylesMap,
+  colorSchemasMap,
   letterSpacingsMap,
 } from './properties';
 import { createPropertiesMap } from './createPropertiesMap';
@@ -63,6 +64,7 @@ export const transitionsProperties = createPropertiesMap(
   transitionsMap,
   'transitions',
 );
+export const colorSchemasProperties = createPropertiesMap(colorSchemasMap, 'colorSchemas');
 
 export const allProperties = {
   ...fontProperties,
@@ -81,5 +83,6 @@ export const allProperties = {
   ...transitionsProperties,
   ...borderWidthsProperties,
   ...borderStylesProperties,
+  ...colorSchemasProperties,
   ...letterSpacingProperties,
 };
diff --git a/packages/spec/src/properties/colorSchemas.ts b/packages/spec/src/properties/colorSchemas.ts
@@ -0,0 +1,4 @@
+export const colorSchemasMap = [
+  'schema',
+  'colorSchema',
+] as const;
diff --git a/packages/spec/src/properties/colors.ts b/packages/spec/src/properties/colors.ts
@@ -4,7 +4,6 @@ export const colorsMap = [
   'color',
   'stroke',
   'caretColor',
-  'colorSchema',
   'borderColor',
   'outlineColor',
   'borderTopColor',

diff --git a/packages/spec/src/properties/index.ts b/packages/spec/src/properties/index.ts
@@ -10,3 +10,4 @@ export * from './gradients';
 export * from './opacities';
 export * from './components';
 export * from './transitions';
+export * from './colorSchemas';
diff --git a/packages/spec/src/types/colorSchemas.ts b/packages/spec/src/types/colorSchemas.ts
@@ -2,7 +2,7 @@ import { Color } from './colors';
 
 export interface ColorSchemas {
   default: {
-    [key in Color]: Color;
+    [key in Color]?: Color;
   };
 }
 

diff --git a/packages/spec/src/types/theme.ts b/packages/spec/src/types/theme.ts
@@ -39,8 +39,8 @@ export type BaseTheme = {
   borderWidths: BorderWidths;
   mediaQueries: MediaQueries;
   borderStyles: BorderStyles;
-  letterSpacings: LetterSpacings;
   colorSchemas: ColorSchemas;
+  letterSpacings: LetterSpacings;
 };
 
 export interface Theme extends BaseTheme {