refactor(hickey,lowy): dedup parseNoteRoute via Route.mkLMLRouteFromMdOrOrgFilePath

Catalog.hs and Tools.hs each defined identical
`mkLMLRouteFromKnownFilePath Md fp <|> mkLMLRouteFromKnownFilePath Org fp`
helpers. The coupling invariant ('both modules agree on what counts as a
recognised note path') was structural — adding a third LML format would
require two updates with nothing forcing them to agree.

Hoist into Route.ModelRoute alongside mkLMLRouteFromKnownFilePath, which
encapsulates the same volatility axis (LML-format recognition).

Author: srid

emanote/src/Emanote/MCP/Catalog.hs

@@ -27,8 +27,6 @@ import Emanote.Model (Model)
 import Emanote.Model qualified as M
 import Emanote.Model.Note qualified as Note
 import Emanote.Route qualified as R
-import Emanote.Route.Ext (LML (Md, Org))
-import Emanote.Route.ModelRoute (mkLMLRouteFromKnownFilePath)
 import Emanote.View.Export.Content qualified as ExportContent
 import Emanote.View.Export.JSON qualified as ExportJSON
 import Optics.Operators ((^.))
@@ -121,7 +119,7 @@ readResource model = \case
   MetadataJson ->
     pure $ Right $ ResourceBody (decodeUtf8 (ExportJSON.renderJSONExport model))
   Note path ->
-    case parseNoteRoute path >>= (`Note.lookupNotesByRoute` (model ^. M.modelNotes)) of
+    case R.mkLMLRouteFromMdOrOrgFilePath path >>= (`Note.lookupNotesByRoute` (model ^. M.modelNotes)) of
       Nothing -> pure $ Left NotFound
       Just note -> do
         mContent <- ExportContent.readNoteContent note
@@ -130,7 +128,3 @@ readResource model = \case
           Just content ->
             let header = ExportContent.generateNoteHeader model note
              in Right $ ResourceBody (header <> content)
-
-parseNoteRoute :: FilePath -> Maybe R.LMLRoute
-parseNoteRoute fp =
-  mkLMLRouteFromKnownFilePath Md fp <|> mkLMLRouteFromKnownFilePath Org fp

emanote/src/Emanote/MCP/Tools.hs

@@ -40,8 +40,6 @@ import Emanote.Model.Note qualified as N
 import Emanote.Model.StaticFile qualified as SF
 import Emanote.Model.Title qualified as Tit
 import Emanote.Route qualified as R
-import Emanote.Route.Ext (LML (Md, Org))
-import Emanote.Route.ModelRoute (mkLMLRouteFromKnownFilePath)
 import MCP.Server (
   CallToolResult,
   InputSchema (..),
@@ -146,7 +144,7 @@ Returns 'Left' if @path@ isn't a recognised LML source path
 -}
 getBacklinks :: FilePath -> Model -> Either Text [NoteMatch]
 getBacklinks fp model =
-  case parseNoteRoute fp of
+  case R.mkLMLRouteFromMdOrOrgFilePath fp of
     Nothing -> Left $ "Not a recognised note path: " <> toText fp
     Just r ->
       Right $ noteMatchOf model . fst <$> G.modelLookupBacklinks r model
@@ -213,7 +211,7 @@ resolveWikilink wlText mFromPath model = do
   wl <- maybeToRight ("Not a valid wikilink: " <> wlText) (parseWikiLinkText wlText)
   fromR <- case mFromPath of
     Nothing -> Right (M.modelIndexRoute model)
-    Just p -> maybeToRight ("Not a recognised note path: " <> toText p) (parseNoteRoute p)
+    Just p -> maybeToRight ("Not a recognised note path: " <> toText p) (R.mkLMLRouteFromMdOrOrgFilePath p)
   Right $ case Resolve.resolveWikiLinkMustExist model fromR wl of
     Rel.RRTFound (Left (_, note)) ->
       ResolvedNote (noteMatchOf model (note ^. N.noteRoute))
@@ -257,10 +255,6 @@ resolveWikilinkTool readModel =
 -- Helpers
 -- ---------------------------------------------------------------------------
 
-parseNoteRoute :: FilePath -> Maybe R.LMLRoute
-parseNoteRoute fp =
-  mkLMLRouteFromKnownFilePath Md fp <|> mkLMLRouteFromKnownFilePath Org fp
-
 -- | Parse a slash-separated wikilink target (e.g. "foo/bar") into a 'WL.WikiLink'.
 parseWikiLinkText :: Text -> Maybe WL.WikiLink
 parseWikiLinkText s

emanote/src/Emanote/Route/ModelRoute.hs

@@ -20,6 +20,7 @@ module Emanote.Route.ModelRoute (
   lmlToHtmlRoute,
   mkLMLRouteFromFilePath,
   mkLMLRouteFromKnownFilePath,
+  mkLMLRouteFromMdOrOrgFilePath,
   lmlSourcePath,
   isMdRoute,
   -- Static file routes
@@ -160,6 +161,11 @@ mkLMLRouteFromKnownFilePath lmlType fp =
     Md -> fmap LMLRoute_Md (R.mkLmlRouteFromFilePath fp)
     Org -> fmap LMLRoute_Org (R.mkLmlRouteFromFilePath fp)
 
+-- | Parse a source path as an LML route, trying @.md@ then @.org@.
+mkLMLRouteFromMdOrOrgFilePath :: FilePath -> Maybe LMLRoute
+mkLMLRouteFromMdOrOrgFilePath fp =
+  mkLMLRouteFromKnownFilePath Md fp <|> mkLMLRouteFromKnownFilePath Org fp
+
 -- | Source-relative path of an LML note (e.g. @guide/mcp.md@).
 lmlSourcePath :: LMLRoute -> FilePath
 lmlSourcePath = withLmlRoute R.encodeRoute