change type imports

UmbraJS · Apr 30, 2024 · ffc4a34 · ffc4a34
1 parent 7454776
commit ffc4a34
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 16 deletions.
diff --git a/packages/core/engine/defaults.ts b/packages/core/engine/defaults.ts
@@ -1,4 +1,4 @@
-import { UmbraScheme, UmbraSettings } from './types'
+import type { UmbraScheme, UmbraSettings } from './types'
 
 export const defaultSettings: UmbraSettings = {
   power: 0.15,

diff --git a/packages/core/engine/generator.ts b/packages/core/engine/generator.ts
@@ -1,5 +1,6 @@
-import { colord, Colord } from 'colord'
-import { UmbraAdjusted, UmbraScheme, Accent } from './types'
+import { colord } from 'colord'
+import type { Colord } from 'colord'
+import type { UmbraAdjusted, UmbraScheme, Accent } from './types'
 import { pickContrast, colorMix } from './primitives/color'
 import { insertColorIntoRange, nextAccent, getStrings } from './primitives/utils'
 

diff --git a/packages/core/engine/index.ts b/packages/core/engine/index.ts
@@ -2,7 +2,8 @@ import { colord } from 'colord'
 import { defaultSettings, defaultScheme } from './defaults'
 import type { UmbraInput, UmbraScheme, UmbraRange, UmbraSettings } from './types'
 
-import { format, Formater, UmbraOutputs, AttachProps } from './primitives/format'
+import { format } from './primitives/format'
+import type { Formater, UmbraOutputs, AttachProps } from './primitives/format'
 import { inverse, isDark } from './primitives/scheme'
 import { getReadable } from './primitives/color'
 import { umbraGenerate } from './generator'

diff --git a/packages/core/engine/primitives/attach.ts b/packages/core/engine/primitives/attach.ts
@@ -1,4 +1,4 @@
-import { FlattenColor, UmbraOutputs } from './format'
+import type { FlattenColor, UmbraOutputs } from './format'
 
 //Why aliases? 2 reasons:
 //1 - People seem to be better at understanding direct instructions rather than logic.

diff --git a/packages/core/engine/primitives/color.ts b/packages/core/engine/primitives/color.ts
@@ -1,7 +1,8 @@
-import { colord, Colord, extend } from 'colord'
+import { colord, extend } from 'colord'
+import type { Colord } from 'colord'
 import mixPlugin from 'colord/plugins/mix'
 import { APCAcontrast, sRGBtoY } from 'apca-w3'
-import { UmbraAdjusted } from '../types'
+import type { UmbraAdjusted } from '../types'
 import { defaultSettings } from '../defaults'
 
 extend([mixPlugin])

diff --git a/packages/core/engine/primitives/format.ts b/packages/core/engine/primitives/format.ts
@@ -1,7 +1,8 @@
-import { Colord } from 'colord'
+import type { Colord } from 'colord'
 import { umbra } from '../..'
-import { UmbraRange, FormatedRange, UmbraInput } from '../types'
-import { attach, Alias } from './attach'
+import type { UmbraRange, FormatedRange, UmbraInput } from '../types'
+import { attach } from './attach'
+import type { Alias } from './attach'
 
 export type Formater = (color: Colord) => string
 

diff --git a/packages/core/engine/primitives/scheme.ts b/packages/core/engine/primitives/scheme.ts
@@ -1,4 +1,5 @@
-import { colord, Colord } from 'colord'
+import { colord } from 'colord'
+import type { Colord } from 'colord'
 import type { UmbraScheme, UmbraAdjusted } from '../types'
 import { increaseContrastUntil, getReadability, getReadable, mostReadable } from './color'
 

diff --git a/packages/core/engine/primitives/utils.ts b/packages/core/engine/primitives/utils.ts
@@ -1,5 +1,6 @@
-import { colord, Colord } from 'colord'
-import { UmbraScheme, UmbraSettings } from '../types'
+import { colord } from 'colord'
+import type { Colord } from 'colord'
+import type { UmbraScheme, UmbraSettings } from '../types'
 import { getReadability } from './color'
 import { defaultSettings } from '../defaults'
 

diff --git a/packages/core/index.ts b/packages/core/index.ts
@@ -1,7 +1,10 @@
-import { umbra, umbraHydrate, Umbra } from './engine/index'
+import { umbra, umbraHydrate } from './engine/index'
+import type { Umbra } from './engine/index'
 import { umbraGenerate } from './engine/generator'
 import { randomScheme } from './engine/primitives/utils'
-import { format, FlattenColor, Formater, UmbraOutputs, hex, rgb } from './engine/primitives/format'
+import { format, hex, rgb } from './engine/primitives/format'
+import type { FlattenColor, Formater, UmbraOutputs } from './engine/primitives/format'
+
 import { attach } from './engine/primitives/attach'
 import { mostReadable, colorMix } from './engine/primitives/color'
 import type {

diff --git a/packages/playground/src/App.vue b/packages/playground/src/App.vue
@@ -5,7 +5,7 @@ import UmbraRange from './components/UmbraRange.vue'
 import LabelsGroups from './components/ToneLabels.vue'
 import ActionLabels from './components/ActionLabels.vue'
 import PlayGround from './components/PlayGround.vue'
-import { DyePicker } from '@umbrajs/dye'
+import type { DyePicker } from '@umbrajs/dye' //TODO: Fix this - type is wrong
 import '@umbrajs/dye/dist/style.css'
 
 import { blue, blueDark, red, redDark, yellow, yellowDark } from '@radix-ui/colors'