refactor(canvas): normalize guide domain naming

packages/core/src/canvas/guides/geometry.ts

@@ -18,14 +18,6 @@ export interface GuideScreenSegment {
   y2: number
 }
 
-export interface GuideHit {
-  ownerId: string
-  guideId: string
-  axis: CanvasGuide['axis']
-  position: number
-  distance: number
-}
-
 export function getGuideScreenSegment(
   graph: SceneGraph,
   owner: SceneNode,
@@ -70,42 +62,3 @@ export function distanceToGuideSegment(x: number, y: number, segment: GuideScree
       : Math.max(0, Math.min(1, ((x - segment.x1) * dx + (y - segment.y1) * dy) / lengthSquared))
   return Math.hypot(x - (segment.x1 + t * dx), y - (segment.y1 + t * dy))
 }
-
-export function hitTestGuides(
-  graph: SceneGraph,
-  pageId: string,
-  viewport: GuideViewport,
-  x: number,
-  y: number,
-  tolerance = 5
-): GuideHit | null {
-  const page = graph.getNode(pageId)
-  if (!page) return null
-  let closest: GuideHit | null = null
-
-  const visit = (owner: SceneNode) => {
-    for (const guide of owner.guides) {
-      const distance = distanceToGuideSegment(
-        x,
-        y,
-        getGuideScreenSegment(graph, owner, guide, viewport)
-      )
-      if (distance <= tolerance && (!closest || distance < closest.distance)) {
-        closest = {
-          ownerId: owner.id,
-          guideId: guide.id,
-          axis: guide.axis,
-          position: guide.position,
-          distance
-        }
-      }
-    }
-    for (const childId of owner.childIds) {
-      const child = graph.getNode(childId)
-      if (child) visit(child)
-    }
-  }
-
-  visit(page)
-  return closest
-}

packages/core/src/canvas/guides/hit-test.ts

@@ -0,0 +1,51 @@
+import type { SceneGraph, SceneNode } from '@open-pencil/scene-graph'
+import type { CanvasGuide } from '@open-pencil/scene-graph/guides'
+
+import { distanceToGuideSegment, getGuideScreenSegment, type GuideViewport } from './geometry'
+
+export interface GuideHit {
+  ownerId: string
+  guideId: string
+  axis: CanvasGuide['axis']
+  position: number
+  distance: number
+}
+
+export function hitTestGuides(
+  graph: SceneGraph,
+  pageId: string,
+  viewport: GuideViewport,
+  x: number,
+  y: number,
+  tolerance = 5
+): GuideHit | null {
+  const page = graph.getNode(pageId)
+  if (!page) return null
+  let closest: GuideHit | null = null
+
+  const visit = (owner: SceneNode) => {
+    for (const guide of owner.guides) {
+      const distance = distanceToGuideSegment(
+        x,
+        y,
+        getGuideScreenSegment(graph, owner, guide, viewport)
+      )
+      if (distance <= tolerance && (!closest || distance < closest.distance)) {
+        closest = {
+          ownerId: owner.id,
+          guideId: guide.id,
+          axis: guide.axis,
+          position: guide.position,
+          distance
+        }
+      }
+    }
+    for (const childId of owner.childIds) {
+      const child = graph.getNode(childId)
+      if (child) visit(child)
+    }
+  }
+
+  visit(page)
+  return closest
+}

packages/core/src/canvas/index.ts

@@ -7,10 +7,9 @@ export {
 export {
   distanceToGuideSegment,
   getGuideScreenSegment,
-  hitTestGuides,
-  type GuideHit,
   type GuideScreenSegment,
   type GuideViewport
 } from './guides/geometry'
+export { hitTestGuides, type GuideHit } from './guides/hit-test'
 export type { GuideOverlayState, GuidePreview, GuideSelection } from './guides/types'
 export { SkiaRenderer, type RenderOverlays, type RulerTheme } from './renderer'

packages/core/src/canvas/renderer/overlay-pass.ts

@@ -2,7 +2,7 @@ import type { Canvas } from 'canvaskit-wasm'
 
 import type { SceneGraph } from '@open-pencil/scene-graph'
 
-import { drawGuides } from '#core/canvas/guides/render'
+import { drawGuides } from '#core/canvas/guides/draw'
 import type { RenderOverlays, SkiaRenderer } from '#core/canvas/renderer'
 
 function measurementVisible(overlays: RenderOverlays): boolean {

tests/engine/render/canvas/guides/draw.test.ts

@@ -5,9 +5,9 @@ import type { Canvas } from 'canvaskit-wasm'
 import { SceneGraph } from '@open-pencil/scene-graph'
 import type { SceneNode } from '@open-pencil/scene-graph'
 
-import { drawGuides } from '#core/canvas/guides/render'
+import { drawGuides } from '#core/canvas/guides/draw'
 
-import { createMockCanvas, createMockRenderer, mockCalls } from './effects/helpers'
+import { createMockCanvas, createMockRenderer, mockCalls } from '../effects/helpers'
 
 function graphWithGuides(guides: SceneNode['guides']): SceneGraph {
   const page = {

tests/engine/render/canvas/guides/geometry.test.ts

@@ -3,11 +3,8 @@ import { describe, expect, test } from 'bun:test'
 import { SceneGraph } from '@open-pencil/scene-graph'
 import type { SceneNode } from '@open-pencil/scene-graph'
 
-import {
+import { distanceToGuideSegment, getGuideScreenSegment } from '#core/canvas/guides/geometry'
-  distanceToGuideSegment,
+import { hitTestGuides } from '#core/canvas/guides/hit-test'
-  getGuideScreenSegment,
-  hitTestGuides
-} from '#core/canvas/guides/geometry'
 
 function pageWithGuide(): { graph: SceneGraph; page: SceneNode } {
   const page = {