fix: type fix (#26)

* fix: type fix * fix: type fix * chore: remove empty line * chore: export adjustment
zyyv · Jul 10, 2024 · 7a66689 · 7a66689
1 parent 5a14c73
commit 7a66689
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 40 deletions.
diff --git a/packages/magic-color/src/core/basic.ts b/packages/magic-color/src/core/basic.ts
@@ -1,9 +1,11 @@
 import type { ColorType, Colors, HexColor, HsbColor, HslColor, LabColor, Opacity, RgbColor } from '@magic-color/core'
 import { hexToHsb, hexToHsl, hexToLab, hexToRgb, hsbToHex, hsbToHsl, hsbToLab, hsbToRgb, hslToHex, hslToHsb, hslToLab, hslToRgb, labToHex, labToHsb, labToHsl, labToRgb, rgbToHex, rgbToHsb, rgbToHsl, rgbToLab } from '@magic-color/core'
-import { getColorName } from '../theme'
-
+import { getColorName, theme } from '../theme'
+import { hash } from '../hash'
+import { calcAPCA, calcWCAG, getReadableTextColor, isWarmColor, reverseAPCA } from '../contrast'
+import { random } from '../utils'
+import { SupportTypes, alphaToString, resolveArgs, valid } from './utils'
 import type { ColorObject } from './types'
-import { SupportTypes, alphaToString, resolveArgs } from './utils'
 
 export class Magicolor<T extends ColorType> implements ColorObject<T> {
   type: T
@@ -303,9 +305,33 @@ export class Magicolor<T extends ColorType> implements ColorObject<T> {
   }
 }
 
-export function mc<T extends ColorType>(value: Colors[T] | Record<string, number>, type?: T, alpha?: Opacity): Magicolor<T>
-export function mc<T extends ColorType = 'rgb'>(v1: number, v2: number, v3: number, type?: T, alpha?: Opacity): Magicolor<T>
-export function mc<T extends ColorType>(...args: any): Magicolor<T> {
+export interface MagicolorInstance {
+  <T extends ColorType>(value: Colors[T] | Record<string, number>, type?: T, alpha?: Opacity): Magicolor<T>
+  <T extends ColorType = 'rgb'>(v1: number, v2: number, v3: number, type?: T, alpha?: Opacity): Magicolor<T>
+  valid: typeof valid
+  random: typeof random
+  hash: typeof hash
+  theme: typeof theme
+  getColorName: typeof getColorName
+  wcag: typeof calcWCAG
+  apca: typeof calcAPCA
+  apcaReverse: typeof reverseAPCA
+  readable: typeof getReadableTextColor
+  warm: typeof isWarmColor
+}
+
+export const mc: MagicolorInstance = <T extends ColorType>(...args: any[]): Magicolor<T> => {
   // @ts-expect-error allow the type to be inferred
   return new Magicolor(...args) as Magicolor<T>
 }
+
+mc.valid = valid
+mc.random = random
+mc.hash = hash
+mc.theme = theme
+mc.getColorName = getColorName
+mc.wcag = calcWCAG
+mc.apca = calcAPCA
+mc.apcaReverse = reverseAPCA
+mc.readable = getReadableTextColor
+mc.warm = isWarmColor
diff --git a/packages/magic-color/src/core/index.ts b/packages/magic-color/src/core/index.ts
@@ -1,34 +1,2 @@
-import { hash } from '../hash'
-import { calcAPCA, calcWCAG, getReadableTextColor, isWarmColor, reverseAPCA } from '../contrast'
-import { getColorName, theme } from '../theme'
-import { random } from '../utils'
-import { mc } from './basic'
-import { guessType } from './utils'
-
-export { Magicolor } from './basic'
+export { Magicolor, mc } from './basic'
 export * from './types'
-
-// @ts-expect-error - anyway
-mc.valid = (color: string) => guessType(color) !== undefined
-// @ts-expect-error - anyway
-mc.random = random
-// @ts-expect-error - anyway
-mc.hash = hash
-// @ts-expect-error - anyway
-mc.theme = theme
-// @ts-expect-error - anyway
-mc.getColorName = getColorName
-// @ts-expect-error - anyway
-mc.wcag = calcWCAG
-// @ts-expect-error - anyway
-mc.apca = calcAPCA
-// @ts-expect-error - anyway
-mc.apcaReverse = reverseAPCA
-// @ts-expect-error - anyway
-mc.readable = getReadableTextColor
-// @ts-expect-error - anyway
-mc.warm = isWarmColor
-
-export {
-  mc,
-}
diff --git a/packages/magic-color/src/core/utils.ts b/packages/magic-color/src/core/utils.ts
@@ -155,3 +155,7 @@ export function resolveArgs<T extends ColorType = 'rgb'>(...args: any[]): [Color
     return [_values, _type, _alpha]
   }
 }
+
+export function valid(color: string) {
+  return guessType(color) !== undefined
+}
diff --git a/packages/magic-color/src/index.ts b/packages/magic-color/src/index.ts
@@ -1,7 +1,7 @@
 export * from '@magic-color/core'
 
 export * from './core'
-export * from './theme/types'
+export * from './theme'
 export * from './utils'
 export * from './hash'
 export * from './contrast'
diff --git a/packages/magic-color/src/theme/index.ts b/packages/magic-color/src/theme/index.ts
@@ -127,3 +127,5 @@ export function theme(color: string, options: ThemeOptions = {}): ThemeMetas {
 
   return Object.fromEntries(shades) as unknown as ThemeMetas
 }
+
+export * from './types'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -127,3 +127,5 @@ export function theme(color: string, options: ThemeOptions = {}): ThemeMetas {

		return Object.fromEntries(shades) as unknown as ThemeMetas
		}

		export * from './types'