From 33389a95ad7bb6cfa8ce3dcd674227fbb23ff0f3 Mon Sep 17 00:00:00 2001
From: Danila Poyarkov <dev@dannote.net>
Date: Mon, 9 Mar 2026 08:56:47 +0300
Subject: [PATCH] Remove re-export shims and import types directly from core
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Delete src/types.ts (pure re-export of Color, Rect, etc.) — 9 files
now import directly from @open-pencil/core. Remove dead AI_PROVIDERS
re-export from use-chat.ts and dead font function re-exports from
engine/fonts.ts.
---
 src/components/ColorInput.vue             | 3 +--
 src/components/ColorPicker.vue            | 3 +--
 src/components/FillPicker.vue             | 3 +--
 src/components/HsvColorArea.vue           | 3 +--
 src/components/chat/ProviderSelect.vue    | 3 ++-
 src/components/properties/PageSection.vue | 2 +-
 src/composables/use-canvas-input.ts       | 3 +--
 src/composables/use-chat.ts               | 3 +--
 src/composables/use-collab.ts             | 3 +--
 src/constants.ts                          | 3 +--
 src/engine/fonts.ts                       | 8 --------
 src/stores/editor.ts                      | 3 ++-
 src/types.ts                              | 1 -
 13 files changed, 13 insertions(+), 28 deletions(-)
 delete mode 100644 src/types.ts

diff --git a/src/components/ColorInput.vue b/src/components/ColorInput.vue
index e6d19873e..f143e0a19 100644
--- a/src/components/ColorInput.vue
+++ b/src/components/ColorInput.vue
@@ -1,9 +1,8 @@
 <script setup lang="ts">
 import ColorPicker from './ColorPicker.vue'
+import type { Color } from '@open-pencil/core'
 import { colorToHexRaw, parseColor } from '@open-pencil/core'
 
-import type { Color } from '@/types'
-
 const { color, editable = false } = defineProps<{
   color: Color
   editable?: boolean
diff --git a/src/components/ColorPicker.vue b/src/components/ColorPicker.vue
index 6d2f6fbb4..14e359e19 100644
--- a/src/components/ColorPicker.vue
+++ b/src/components/ColorPicker.vue
@@ -1,12 +1,11 @@
 <script setup lang="ts">
+import type { Color } from '@open-pencil/core'
 import { colorToCSS } from '@open-pencil/core'
 import { computed } from 'vue'
 import { PopoverRoot, PopoverTrigger, PopoverPortal, PopoverContent } from 'reka-ui'
 
 import HsvColorArea from './HsvColorArea.vue'
 
-import type { Color } from '@/types'
-
 const { color } = defineProps<{
   color: Color
 }>()
diff --git a/src/components/FillPicker.vue b/src/components/FillPicker.vue
index 48051e219..945c1486f 100644
--- a/src/components/FillPicker.vue
+++ b/src/components/FillPicker.vue
@@ -20,8 +20,7 @@ import HsvColorArea from './HsvColorArea.vue'
 import ScrubInput from './ScrubInput.vue'
 import { colorToCSS, colorToHexRaw, parseColor } from '@open-pencil/core'
 
-import type { Color } from '@/types'
-import type { Fill, GradientStop, GradientTransform } from '@open-pencil/core'
+import type { Color, Fill, GradientStop, GradientTransform } from '@open-pencil/core'
 
 type FillCategory = 'SOLID' | 'GRADIENT' | 'IMAGE'
 type GradientSubtype =
diff --git a/src/components/HsvColorArea.vue b/src/components/HsvColorArea.vue
index 3b82865f1..fbdeb8ed7 100644
--- a/src/components/HsvColorArea.vue
+++ b/src/components/HsvColorArea.vue
@@ -14,10 +14,9 @@ import {
   type Color as RekaColor
 } from 'reka-ui'
 
+import type { Color } from '@open-pencil/core'
 import { colorToHex8, rgba255ToColor } from '@open-pencil/core'
 
-import type { Color } from '@/types'
-
 const { color } = defineProps<{
   color: Color
 }>()
diff --git a/src/components/chat/ProviderSelect.vue b/src/components/chat/ProviderSelect.vue
index 57b45fd50..138d0666e 100644
--- a/src/components/chat/ProviderSelect.vue
+++ b/src/components/chat/ProviderSelect.vue
@@ -10,7 +10,8 @@ import {
 } from 'reka-ui'
 
 import { selectContent, selectItem, selectTrigger } from '@/components/ui/select'
-import { AI_PROVIDERS, useAIChat } from '@/composables/use-chat'
+import { AI_PROVIDERS } from '@open-pencil/core'
+import { useAIChat } from '@/composables/use-chat'
 
 const { providerID, providerDef } = useAIChat()
 
diff --git a/src/components/properties/PageSection.vue b/src/components/properties/PageSection.vue
index b78b08d8f..a496b1802 100644
--- a/src/components/properties/PageSection.vue
+++ b/src/components/properties/PageSection.vue
@@ -2,7 +2,7 @@
 import ColorInput from '@/components/ColorInput.vue'
 import { useEditorStore } from '@/stores/editor'
 
-import type { Color } from '@/types'
+import type { Color } from '@open-pencil/core'
 
 const store = useEditorStore()
 
diff --git a/src/composables/use-canvas-input.ts b/src/composables/use-canvas-input.ts
index 62b5b0e53..138ef6733 100644
--- a/src/composables/use-canvas-input.ts
+++ b/src/composables/use-canvas-input.ts
@@ -14,8 +14,7 @@ import {
 import { computeSelectionBounds, computeSnap } from '@open-pencil/core'
 
 import type { EditorStore, Tool } from '@/stores/editor'
-import type { Rect } from '@/types'
-import type { NodeType, SceneNode } from '@open-pencil/core'
+import type { NodeType, Rect, SceneNode } from '@open-pencil/core'
 
 type HandlePosition = 'nw' | 'n' | 'ne' | 'e' | 'se' | 's' | 'sw' | 'w'
 
diff --git a/src/composables/use-chat.ts b/src/composables/use-chat.ts
index 4dcfb7244..d20e9c5b4 100644
--- a/src/composables/use-chat.ts
+++ b/src/composables/use-chat.ts
@@ -15,8 +15,7 @@ import { AI_PROVIDERS, DEFAULT_AI_MODEL, DEFAULT_AI_PROVIDER } from '@open-penci
 import type { AIProviderID } from '@open-pencil/core'
 import type { LanguageModel, UIMessage } from 'ai'
 
-export { AI_PROVIDERS } from '@open-pencil/core'
-export type { AIProviderDef, AIProviderID, ModelOption } from '@open-pencil/core'
+
 
 const STORAGE_PREFIX = 'open-pencil:'
 const LEGACY_KEY_STORAGE = `${STORAGE_PREFIX}openrouter-api-key`
diff --git a/src/composables/use-collab.ts b/src/composables/use-collab.ts
index 1d721f51b..a7b43dbeb 100644
--- a/src/composables/use-collab.ts
+++ b/src/composables/use-collab.ts
@@ -14,8 +14,7 @@ import {
 } from '@/constants'
 
 import type { EditorStore } from '@/stores/editor'
-import type { Color } from '@/types'
-import type { SceneNode } from '@open-pencil/core'
+import type { Color, SceneNode } from '@open-pencil/core'
 import type { Room } from 'trystero'
 
 export interface RemotePeer {
diff --git a/src/constants.ts b/src/constants.ts
index a088aa572..407146ded 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -58,8 +58,7 @@ export {
   RULER_MAJOR_TOLERANCE
 } from '@open-pencil/core'
 
-import type { Color } from '@/types'
-import type { Fill, Stroke } from '@open-pencil/core'
+import type { Color, Fill, Stroke } from '@open-pencil/core'
 
 export const TRYSTERO_APP_ID = 'openpencil'
 export const ROOM_ID_LENGTH = 8
diff --git a/src/engine/fonts.ts b/src/engine/fonts.ts
index 2898d31ea..328d92cea 100644
--- a/src/engine/fonts.ts
+++ b/src/engine/fonts.ts
@@ -1,11 +1,3 @@
-export {
-  initFontService,
-  getFontProvider,
-  ensureNodeFont,
-  ensureCJKFallback,
-  getCJKFallbackFamily
-} from '@open-pencil/core'
-
 import {
   IS_TAURI,
   loadFont as loadFontCore,
diff --git a/src/stores/editor.ts b/src/stores/editor.ts
index 6caa0adf4..be368345e 100644
--- a/src/stores/editor.ts
+++ b/src/stores/editor.ts
@@ -34,12 +34,13 @@ import {
 } from '@open-pencil/core'
 import { readFigFile } from '@open-pencil/core'
 
-import type { Color, Rect } from '@/types'
 import type {
+  Color,
   ExportFormat,
   Fill,
   LayoutMode,
   NodeType,
+  Rect,
   SceneNode,
   SnapGuide,
   VectorNetwork,
diff --git a/src/types.ts b/src/types.ts
deleted file mode 100644
index 7ed93f197..000000000
--- a/src/types.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type { GUID, Color, Vector, Matrix, Rect } from '@open-pencil/core'