diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,21 @@ +# Revision history for emanote + +## 1.0.0.0 (2022-12-04) + +- UI + - Index pages are no longer marked as 'experimental' + - Add external link icon to external links (this behaviour is customizable). [\#189](https://github.com/EmaApps/emanote/pull/189) + - `js.mermaid` snippet uses the "module" script tag approach, which is added to end of ``. See [here](https://mermaid-js.github.io/mermaid/#/n00b-gettingStarted?id=_3-calling-the-javascript-api). + - Align dates in timeline queries +- Configuration + - Add `page.bodyHtml` option to inject custom HTML at the end of `` tag. +- Packaging + - Move tests to their own cabal component (thereby, also, unexpose them from library exposed modules) + - Wikilink parser is now a separate library: https://github.com/srid/commonmark-wikilink + - Use `heist-extra` 0.2.0.0 which switches over from `heist-emanote` to using official `heist` package. +- Bug fixes + - #380 & #386: Better handling of `.org` and `.md` ambiguties. Default layer's `index.md` has been removed. + +## 0.8.0.0 (2022-11-03) + +Initial release. diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -4,10 +4,14 @@ [![built with nix](https://img.shields.io/badge/Built_With-Nix-5277C3.svg?logo=nixos&labelColor=73C3D5)](https://builtwithnix.org) [![Matrix](https://img.shields.io/matrix/ema:matrix.org)](https://app.element.io/#/room/#ema:matrix.org "Chat on Matrix") -Spiritual successor to [neuron](https://neuron.zettel.page), based on [Ema](https://ema.srid.ca). +Emanote emanates[^def] a structured view of your plain-text notes. +[^def]: **emanate**: *(of something abstract but perceptible) issue or spread out from (a source)* + Create beautiful websites -- such as personal webpage, blog, wiki, Zettelkasten, notebook, knowledge-base, documentation, etc. from future-proof plain-text notes and arbitrary data -- with live preview that updates in real-time. +Emanote is spiritual successor to [neuron](https://neuron.zettel.page) based on [Ema](https://ema.srid.ca). + ## Installing and using https://emanote.srid.ca/start/install @@ -18,21 +22,25 @@ ## Developing -Emanote is written in Haskell. Thanks to Nix, this repository is pre-configured to provide a delightful development experience with full IDE support in Visual Studio Code. Follow these steps: -- [Install Nix](https://nixos.org/download.html) & [enable Flakes](https://nixos.wiki/wiki/Flakes#Installing_flakes) -- Run `nix develop -c haskell-language-server` to sanity check your environment (Expect it to download and build a bunch of things the first time) -- Open the repository [as single-folder workspace](https://code.visualstudio.com/docs/editor/workspaces#_singlefolder-workspaces) in Visual Studio Code - - Install the [workspace recommended](https://code.visualstudio.com/docs/editor/extension-marketplace#_workspace-recommended-extensions) extensions - - Ctrl+Shift+P to run command "Nix-Env: Select Environment" and select `shell.nix`. The extension will ask you to reload VSCode at the end. -- Press Ctrl+Shift+B in VSCode, or run `bin/run` in terminal, to launch the dev version Emanote on `./docs`, then navigate to http://localhost:9010/ - - Changing the Haskell sources will recompile and reload this instance automatically. +Emanote is a Haskell software.[^licenses] Thanks to Nix, this repository is pre-configured to provide a delightful development experience with full IDE support in Visual Studio Code. -All but the final step need to be done only once. See [architecture.md](docs/architecture.md) for a high-level overview of the codebase. +See https://srid.ca/haskell-template/start for complete instructions, but the tldr is: Install nix, enable Flakes and run `bin/run`. +See [architecture.md](docs/architecture.md) for a high-level overview of the codebase. + ## Discussion To discuss the emanote project, [join Matrix][matrix] or post in [GitHub Discussions][ghdiscuss]. [matrix]: https://matrix.to/#/#ema:matrix.org [ghdiscuss]: https://github.com/srid/emanote/discussions + +## Related projects + +- https://github.com/squidfunk/mkdocs-material + +[^licenses]: Emanote uses software and resources that are licensed differently, viz.: + - [Logo](https://www.svgrepo.com/svg/267765/paper-plane) + - [Stork search](https://github.com/jameslittle230/stork/blob/master/license.txt) + - Various SVG icons are from [Heroicons](https://heroicons.com/) diff --git a/default/_emanote-static/emanote-logo.svg b/default/_emanote-static/emanote-logo.svg --- a/default/_emanote-static/emanote-logo.svg +++ b/default/_emanote-static/emanote-logo.svg @@ -1,64 +1,27 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + viewBox="0 0 512.003 512.003" style="enable-background:new 0 0 512.003 512.003;" xml:space="preserve"> + - - - + + + + + + diff --git a/default/favicon.svg b/default/favicon.svg --- a/default/favicon.svg +++ b/default/favicon.svg @@ -1,64 +1,27 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + viewBox="0 0 512.003 512.003" style="enable-background:new 0 0 512.003 512.003;" xml:space="preserve"> + - - - + + + + + + diff --git a/default/index.md b/default/index.md deleted file mode 100644 --- a/default/index.md +++ /dev/null @@ -1,7 +0,0 @@ -# My Emanote Site - -Welcome to [Emanote](https://emanote.srid.ca/). - -Your notes should be visible in the sidebar (to the left), or in the [index](-/all) page (see sidebar & footer). To get rid of this message, add a file named `index.md` (or `index.org`). - -#emanote/default-layer diff --git a/default/index.yaml b/default/index.yaml --- a/default/index.yaml +++ b/default/index.yaml @@ -81,6 +81,11 @@ headHtml: | + # Put anything that should below the of these routes here: + # You can reference other metadata keys using + # Or use the JS behaviour library below. + bodyHtml: | + # Builtin JS behaviour library. Use them in `page.headHtml` of your .yaml or .md # frontmatter. js: @@ -106,9 +111,9 @@ # Diagrams using mermaid.js mermaid: | - - mathjax: | diff --git a/default/templates/base.tpl b/default/templates/base.tpl --- a/default/templates/base.tpl +++ b/default/templates/base.tpl @@ -23,13 +23,53 @@ - @@ -46,6 +86,9 @@ + + + diff --git a/default/templates/components/pandoc.tpl b/default/templates/components/pandoc.tpl --- a/default/templates/components/pandoc.tpl +++ b/default/templates/components/pandoc.tpl diff --git a/default/templates/filters/query-timeline.tpl b/default/templates/filters/query-timeline.tpl --- a/default/templates/filters/query-timeline.tpl +++ b/default/templates/filters/query-timeline.tpl @@ -7,9 +7,9 @@
  • -
    +
    - + diff --git a/default/templates/special/base.tpl b/default/templates/special/base.tpl --- a/default/templates/special/base.tpl +++ b/default/templates/special/base.tpl @@ -5,9 +5,6 @@

    - - 50 -
    diff --git a/emanote.cabal b/emanote.cabal --- a/emanote.cabal +++ b/emanote.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: emanote -version: 0.8.0.0 +version: 1.0.0.0 license: AGPL-3.0-only copyright: 2022 Sridhar Ratnakumar maintainer: srid@srid.ca @@ -13,6 +13,7 @@ -- A URL where users can report bugs. bug-reports: https://github.com/EmaApps/emanote/issues extra-source-files: + CHANGELOG.md LICENSE README.md @@ -27,10 +28,13 @@ _emanote-static/stork/stork.js _emanote-static/stork/stork.wasm favicon.svg - index.md index.yaml templates/**/*.tpl +flag ghcid + default: False + manual: True + common haskell-common ghc-options: -Wall -Wincomplete-record-updates -Wincomplete-uni-patterns @@ -84,7 +88,6 @@ default-language: Haskell2010 -- TODO: We could use the ghcid flag trick in neuron.cabal to avoid rebuilds. - hs-source-dirs: src build-depends: , aeson , aeson-extra @@ -94,20 +97,21 @@ , blaze-html , bytestring , commonmark - , commonmark-extensions + , commonmark-extensions <0.2.3.3 , commonmark-pandoc , commonmark-simple + , commonmark-wikilink , containers , data-default , dependent-sum , directory - , ema >=0.8.2 + , ema >=0.9 , filepath , filepattern , fsnotify , hedgehog - , heist-emanote >=1.2.1 - , heist-extra + , heist >=1.1.1.0 + , heist-extra >=0.2.0.0 , hspec , hspec-hedgehog , ixset-typed >=0.5.1.0 @@ -149,10 +153,9 @@ , xmlhtml , yaml - hs-source-dirs: src - library import: library-common + hs-source-dirs: src exposed-modules: Emanote Emanote.CLI @@ -160,13 +163,11 @@ Emanote.Model.Calendar Emanote.Model.Graph Emanote.Model.Link.Rel - Emanote.Model.Link.RelSpec Emanote.Model.Link.Resolve Emanote.Model.Meta Emanote.Model.Note Emanote.Model.Note.Filter Emanote.Model.Query - Emanote.Model.QuerySpec Emanote.Model.SData Emanote.Model.StaticFile Emanote.Model.Stork @@ -175,11 +176,11 @@ Emanote.Model.Title Emanote.Model.Type Emanote.Pandoc.BuiltinFilters + Emanote.Pandoc.ExternalLink Emanote.Pandoc.Link Emanote.Pandoc.Markdown.Parser Emanote.Pandoc.Markdown.Syntax.HashTag Emanote.Pandoc.Markdown.Syntax.Highlight - Emanote.Pandoc.Markdown.Syntax.WikiLink Emanote.Pandoc.Renderer Emanote.Pandoc.Renderer.Embed Emanote.Pandoc.Renderer.Query @@ -203,12 +204,38 @@ Emanote.View.TagIndex Emanote.View.TaskIndex Emanote.View.Template - Paths_emanote - Spec + other-modules: Paths_emanote autogen-modules: Paths_emanote +-- To profile: ghc-options: -fexternal-interpreter -prof -fprof-auto -rtsopts executable emanote - import: library-common - main-is: Main.hs - ghc-options: -threaded -rtsopts -with-rtsopts=-N + import: library-common + hs-source-dirs: exe + main-is: Main.hs + ghc-options: -threaded -rtsopts -with-rtsopts=-N + + if flag(ghcid) + hs-source-dirs: src + + else + build-depends: emanote + +test-suite test + import: library-common + type: exitcode-stdio-1.0 + hs-source-dirs: test + main-is: Spec.hs + build-depends: + , hspec + , relude + + if flag(ghcid) + hs-source-dirs: src + + else + build-depends: emanote + other-modules: + Emanote.Model.Link.RelSpec + Emanote.Model.QuerySpec + Emanote.Pandoc.ExternalLinkSpec diff --git a/exe/Main.hs b/exe/Main.hs new file mode 100644 --- /dev/null +++ b/exe/Main.hs @@ -0,0 +1,15 @@ +module Main where + +import Emanote qualified (defaultEmanoteConfig, run) +import Emanote.CLI qualified as CLI +import Emanote.Source.Dynamic (emanoteCompileTailwind) +import Main.Utf8 (withUtf8) +import Optics.Core ((.~)) +import Relude + +main :: IO () +main = + withUtf8 $ do + cli <- CLI.parseCli + let config = Emanote.defaultEmanoteConfig cli & emanoteCompileTailwind .~ True + Emanote.run config diff --git a/src/Emanote/CLI.hs b/src/Emanote/CLI.hs --- a/src/Emanote/CLI.hs +++ b/src/Emanote/CLI.hs @@ -19,7 +19,6 @@ data Cli = Cli { layers :: NonEmpty FilePath, - test :: Bool, allowBrokenLinks :: Bool, cmd :: Cmd } @@ -31,7 +30,6 @@ cliParser :: FilePath -> Parser Cli cliParser cwd = do layers <- pathList (one cwd) - test <- switch (long "test" <> help "Run tests") allowBrokenLinks <- switch (long "allow-broken-links" <> help "Report but do not fail on broken links") cmd <- fmap Cmd_Ema Ema.CLI.cliParser diff --git a/src/Emanote/Model/Graph.hs b/src/Emanote/Model/Graph.hs --- a/src/Emanote/Model/Graph.hs +++ b/src/Emanote/Model/Graph.hs @@ -1,5 +1,6 @@ module Emanote.Model.Graph where +import Commonmark.Extensions.WikiLink qualified as WL import Data.IxSet.Typed ((@+), (@=)) import Data.IxSet.Typed qualified as Ix import Data.Map.Strict qualified as Map @@ -11,7 +12,6 @@ import Emanote.Model.Meta (lookupRouteMeta) import Emanote.Model.Note qualified as MN import Emanote.Model.Type (Model, modelRels, resolveLmlRoute) -import Emanote.Pandoc.Markdown.Syntax.WikiLink qualified as WL import Emanote.Route qualified as R import Emanote.Route.ModelRoute (ModelRoute) import Optics.Operators as Lens ((^.)) diff --git a/src/Emanote/Model/Link/Rel.hs b/src/Emanote/Model/Link/Rel.hs --- a/src/Emanote/Model/Link/Rel.hs +++ b/src/Emanote/Model/Link/Rel.hs @@ -3,6 +3,7 @@ module Emanote.Model.Link.Rel where +import Commonmark.Extensions.WikiLink qualified as WL import Data.Aeson (ToJSON) import Data.IxSet.Typed (Indexable (..), IxSet, ixFun, ixList) import Data.IxSet.Typed qualified as Ix @@ -10,7 +11,6 @@ import Data.Map.Strict qualified as Map import Data.Text qualified as T import Emanote.Model.Note (Note, noteDoc, noteRoute) -import Emanote.Pandoc.Markdown.Syntax.WikiLink qualified as WL import Emanote.Route (LMLRoute, ModelRoute) import Emanote.Route qualified as R import Emanote.Route.SiteRoute.Type qualified as SR @@ -74,7 +74,8 @@ unresolvedRelsTo :: ModelRoute -> [UnresolvedRelTarget] unresolvedRelsTo r = - let wls = either (R.withLmlRoute WL.allowedWikiLinks) WL.allowedWikiLinks $ R.modelRouteCase r + let allowedWikiLinks = WL.allowedWikiLinks . R.unRoute + wls = either (R.withLmlRoute allowedWikiLinks) allowedWikiLinks $ R.modelRouteCase r in (URTWikiLink <$> toList wls) <> [URTResource r] diff --git a/src/Emanote/Model/Link/RelSpec.hs b/src/Emanote/Model/Link/RelSpec.hs deleted file mode 100644 --- a/src/Emanote/Model/Link/RelSpec.hs +++ /dev/null @@ -1,32 +0,0 @@ -module Emanote.Model.Link.RelSpec where - -import Emanote.Model.Link.Rel -import Hedgehog -import Relude -import Test.Hspec -import Test.Hspec.Hedgehog - -spec :: Spec -spec = do - describe "dropDotDot" $ do - it "simple" . hedgehog $ do - dropDotDot "foo/bar/qux" === "foo/bar/qux" - dropDotDot "foo/../qux" === "qux" - dropDotDot "bar/foo/../qux" === "bar/qux" - dropDotDot "bar/foo/.." === "bar" - it "dotInfix" . hedgehog $ do - dropDotDot "bar/foo/../../qux" === "qux" - dropDotDot "bar/foo/../../qux/../foo" === "foo" - it "dotPrefix" . hedgehog $ do - dropDotDot "../../foo" === "foo" - dropDotDot "../foo" === "foo" - dropDotDot "./../foo" === "foo" - dropDotDot "./foo" === "./foo" - it "dotSuffix" . hedgehog $ do - dropDotDot "foo/.." === "" - dropDotDot "foo/bar/.." === "foo" - dropDotDot "foo/bar/../.." === "" - --- https://github.com/hedgehogqa/haskell-hedgehog/issues/121 -once :: PropertyT IO () -> Property -once = withTests 1 . property diff --git a/src/Emanote/Model/Link/Resolve.hs b/src/Emanote/Model/Link/Resolve.hs --- a/src/Emanote/Model/Link/Resolve.hs +++ b/src/Emanote/Model/Link/Resolve.hs @@ -1,11 +1,11 @@ module Emanote.Model.Link.Resolve where +import Commonmark.Extensions.WikiLink qualified as WL import Emanote.Model.Link.Rel qualified as Rel import Emanote.Model.Note qualified as MN import Emanote.Model.StaticFile qualified as SF import Emanote.Model.Type (Model) import Emanote.Model.Type qualified as M -import Emanote.Pandoc.Markdown.Syntax.WikiLink qualified as WL import Emanote.Route qualified as R import Emanote.Route.SiteRoute qualified as SR import Relude diff --git a/src/Emanote/Model/Note.hs b/src/Emanote/Model/Note.hs --- a/src/Emanote/Model/Note.hs +++ b/src/Emanote/Model/Note.hs @@ -5,6 +5,8 @@ module Emanote.Model.Note where +import Commonmark.Extensions.WikiLink (plainify) +import Commonmark.Extensions.WikiLink qualified as WL import Control.Monad.Logger (MonadLogger) import Control.Monad.Writer (MonadWriter (tell), WriterT, runWriterT) import Data.Aeson qualified as Aeson @@ -19,8 +21,6 @@ import Emanote.Model.Title qualified as Tit import Emanote.Pandoc.Markdown.Parser qualified as Markdown import Emanote.Pandoc.Markdown.Syntax.HashTag qualified as HT -import Emanote.Pandoc.Markdown.Syntax.WikiLink (plainify) -import Emanote.Pandoc.Markdown.Syntax.WikiLink qualified as WL import Emanote.Route (FileType (Folder), R) import Emanote.Route qualified as R import Network.URI.Slug (Slug) @@ -87,7 +87,7 @@ routeSelfRefs :: R.LMLRoute -> NonEmpty WL.WikiLink routeSelfRefs = fmap snd - . R.withLmlRoute WL.allowedWikiLinks + . R.withLmlRoute (WL.allowedWikiLinks . R.unRoute) noteAncestors :: Note -> [RAncestor] noteAncestors = diff --git a/src/Emanote/Model/QuerySpec.hs b/src/Emanote/Model/QuerySpec.hs deleted file mode 100644 --- a/src/Emanote/Model/QuerySpec.hs +++ /dev/null @@ -1,19 +0,0 @@ -module Emanote.Model.QuerySpec where - -import Data.TagTree (Tag (Tag)) -import Emanote.Model.Query -import Hedgehog -import Hedgehog.Gen qualified as Gen -import Hedgehog.Range qualified as Range -import Relude -import Test.Hspec -import Test.Hspec.Hedgehog (hedgehog) - -spec :: Spec -spec = do - describe "tags" $ do - it "tags can begin with hash" . hedgehog $ do - s <- forAll $ Gen.text (Range.linear 2 20) Gen.alphaNum - let q = "tag:#" <> s - tag = Tag s - parseQuery q === Just (QueryByTag tag) diff --git a/src/Emanote/Model/StaticFile.hs b/src/Emanote/Model/StaticFile.hs --- a/src/Emanote/Model/StaticFile.hs +++ b/src/Emanote/Model/StaticFile.hs @@ -3,10 +3,10 @@ module Emanote.Model.StaticFile where +import Commonmark.Extensions.WikiLink qualified as WL import Data.Aeson qualified as Aeson import Data.IxSet.Typed (Indexable (..), IxSet, ixFun, ixList) import Data.Time (UTCTime) -import Emanote.Pandoc.Markdown.Syntax.WikiLink qualified as WL import Emanote.Route qualified as R import Optics.TH (makeLenses) import Relude @@ -34,6 +34,7 @@ staticFileSelfRefs = fmap snd . WL.allowedWikiLinks + . R.unRoute . _staticFileRoute makeLenses ''StaticFile diff --git a/src/Emanote/Model/Title.hs b/src/Emanote/Model/Title.hs --- a/src/Emanote/Model/Title.hs +++ b/src/Emanote/Model/Title.hs @@ -15,8 +15,8 @@ ) where +import Commonmark.Extensions.WikiLink (plainify) import Data.Aeson (ToJSON) -import Emanote.Pandoc.Markdown.Syntax.WikiLink (plainify) import Emanote.Route qualified as R import Heist.Extra.Splices.Pandoc qualified as HP import Heist.Interpreted qualified as HI diff --git a/src/Emanote/Model/Type.hs b/src/Emanote/Model/Type.hs --- a/src/Emanote/Model/Type.hs +++ b/src/Emanote/Model/Type.hs @@ -4,6 +4,7 @@ module Emanote.Model.Type where +import Commonmark.Extensions.WikiLink qualified as WL import Data.Aeson qualified as Aeson import Data.Default (Default (def)) import Data.IxSet.Typed ((@=)) @@ -32,7 +33,6 @@ import Emanote.Model.Task qualified as Task import Emanote.Model.Title qualified as Tit import Emanote.Pandoc.Markdown.Syntax.HashTag qualified as HT -import Emanote.Pandoc.Markdown.Syntax.WikiLink qualified as WL import Emanote.Pandoc.Renderer (EmanotePandocRenderers) import Emanote.Route (FileType (AnyExt), LMLRoute, R) import Emanote.Route qualified as R @@ -109,7 +109,8 @@ modelNotes %~ ( Ix.updateIx r note -- Insert folder placeholder automatically for ancestor paths - >>> flip (foldr injectAncestor) (N.noteAncestors note) + >>> injectAncestors (N.noteAncestors note) + >>> dropRedundantAncestor r ) >>> modelRels %~ updateIxMulti r (Rel.noteRels note) @@ -120,6 +121,41 @@ where r = note ^. N.noteRoute +-- | If a placeholder route was added already, but the newly added note is a +-- non-Markdown, removce that markdown placeholder route. +dropRedundantAncestor :: LMLRoute -> IxNote -> IxNote +dropRedundantAncestor recentNoteRoute ns = + case recentNoteRoute of + R.LMLRoute_Md _ -> ns + R.LMLRoute_Org r -> + case N.lookupNotesByRoute (R.LMLRoute_Md $ coerce r) ns of + Nothing -> ns + Just placeholderNote -> Ix.deleteIx (placeholderNote ^. N.noteRoute) ns + +injectAncestors :: [N.RAncestor] -> IxNote -> IxNote +injectAncestors ancs' = + case nonEmpty ancs' of + Nothing -> + injectRoot + Just ancs -> + flip (foldr injectAncestor) ancs + +-- Restore folder placeholder, if $folder.md gets deleted (with $folder/*.md still present) +-- TODO: If $k.md is the only file in its parent, delete unnecessary ancestors +restoreAncestor :: Maybe N.RAncestor -> IxNote -> IxNote +restoreAncestor = + maybe injectRoot injectAncestor + +injectRoot :: IxNote -> IxNote +injectRoot ns = + case resolveLmlRouteIfExists ns idxR of + Just _ -> ns + Nothing -> + let r = R.defaultLmlRoute idxR + in Ix.updateIx r (N.ancestorPlaceholderNote $ coerce idxR) ns + where + idxR = R.indexRoute + injectAncestor :: N.RAncestor -> IxNote -> IxNote injectAncestor (N.unRAncestor -> folderR) ns = case resolveLmlRouteIfExists ns folderR of @@ -133,9 +169,7 @@ model & modelNotes %~ ( Ix.deleteIx k - -- Restore folder placeholder, if $folder.md gets deleted (with $folder/*.md still present) - -- TODO: If $k.md is the only file in its parent, delete unnecessary ancestors - >>> maybe id restoreFolderPlaceholder mFolderR + >>> restoreAncestor (N.RAncestor <$> mFolderR) ) & modelRels %~ deleteIxMulti k @@ -150,8 +184,6 @@ let folderR = R.withLmlRoute coerce k guard $ N.hasChildNotes folderR $ model ^. modelNotes pure folderR - restoreFolderPlaceholder = - injectAncestor . N.RAncestor -- | Like `Ix.updateIx`, but works for multiple items. updateIxMulti :: @@ -260,6 +292,7 @@ resolveLmlRoute model r = fromMaybe (R.defaultLmlRoute r) $ resolveLmlRouteIfExists (model ^. modelNotes) r +-- | Lookup a LML route, returning the less popular LML format if there are ambiguities. resolveLmlRouteIfExists :: forall ext. IxNote -> R ext -> Maybe LMLRoute resolveLmlRouteIfExists notes r = do -- TODO: Refactor using `[minBound..maxBound] :: [LML]` diff --git a/src/Emanote/Pandoc/BuiltinFilters.hs b/src/Emanote/Pandoc/BuiltinFilters.hs --- a/src/Emanote/Pandoc/BuiltinFilters.hs +++ b/src/Emanote/Pandoc/BuiltinFilters.hs @@ -5,6 +5,7 @@ where import Emanote.Model.Note qualified as N +import Emanote.Pandoc.ExternalLink (setExternalLinkIcon) import Emanote.Pandoc.Markdown.Syntax.HashTag qualified as HT import Emanote.Route (encodeRoute) import Emanote.Route.SiteRoute.Type (encodeTagIndexR) @@ -22,6 +23,7 @@ preparePandoc = linkifyInlineTags >>> fixEmojiFontFamily + >>> setExternalLinkIcon -- HashTag.hs generates a Span for inline tags. -- Here, we must link them to the special tag index page. @@ -40,7 +42,7 @@ tagUrl = toText . encodeRoute . encodeTagIndexR . toList . HT.deconstructTag --- Undo font-familly on emoji spans, so the browser uses an emoji font. +-- Undo font-family on emoji spans, so the browser uses an emoji font. -- Ref: https://github.com/jgm/commonmark-hs/blob/3d545d7afa6c91820b4eebf3efeeb80bf1b27128/commonmark-extensions/src/Commonmark/Extensions/Emoji.hs#L30-L33 fixEmojiFontFamily :: W.Walkable B.Inline b => b -> b fixEmojiFontFamily = diff --git a/src/Emanote/Pandoc/ExternalLink.hs b/src/Emanote/Pandoc/ExternalLink.hs new file mode 100644 --- /dev/null +++ b/src/Emanote/Pandoc/ExternalLink.hs @@ -0,0 +1,53 @@ +module Emanote.Pandoc.ExternalLink + ( setExternalLinkIcon, + ) +where + +import Relude +import Text.Pandoc.Definition qualified as B +import Text.Pandoc.Walk qualified as W +import Text.Parsec qualified as P +import Text.Parsec.Char qualified as PC + +-- Add a data-linkicon=external attribute to external links that contain some +-- text in their description, provided that they do not already have a +-- data-linkicon attribute. +setExternalLinkIcon :: W.Walkable B.Inline b => b -> b +setExternalLinkIcon = + W.walk $ \case + B.Link (id', classes, attrs) inlines (url, title) + | hasURIScheme url && containsText inlines -> + let showLinkIconAttr = ("data-linkicon", "external") + newAttrs = insert attrs showLinkIconAttr + in B.Link (id', classes, newAttrs) inlines (url, title) + x -> x + where + -- Inserts an element in a key-value list if the element's key is not + -- already in the list. + insert :: Eq a => [(a, b)] -> (a, b) -> [(a, b)] + insert as a + | fst a `elem` (fst <$> as) = as + | otherwise = a : as + -- Checks whether the given text begins with an RFC 3986 compliant URI + -- scheme. + hasURIScheme :: Text -> Bool + hasURIScheme = + isRight . P.parse schemeP "" + where + schemeP = do + c <- PC.letter + cs <- P.many $ PC.alphaNum P.<|> P.oneOf ".-+" + void $ PC.char ':' + return (c : cs) + -- Checks whether a list of inlines contains a (perhaps nested) "textual + -- element", understood as a Pandoc `Str`, `Code` or `Math`. + containsText :: [B.Inline] -> Bool + containsText = + getAny + . W.query + ( \case + B.Str _ -> Any True + B.Code _ _ -> Any True + B.Math _ _ -> Any True + _ -> Any False + ) diff --git a/src/Emanote/Pandoc/Link.hs b/src/Emanote/Pandoc/Link.hs --- a/src/Emanote/Pandoc/Link.hs +++ b/src/Emanote/Pandoc/Link.hs @@ -1,6 +1,6 @@ module Emanote.Pandoc.Link where -import Emanote.Pandoc.Markdown.Syntax.WikiLink qualified as WL +import Commonmark.Extensions.WikiLink qualified as WL import Relude import Text.Pandoc.Definition qualified as B diff --git a/src/Emanote/Pandoc/Markdown/Parser.hs b/src/Emanote/Pandoc/Markdown/Parser.hs --- a/src/Emanote/Pandoc/Markdown/Parser.hs +++ b/src/Emanote/Pandoc/Markdown/Parser.hs @@ -5,11 +5,11 @@ import Commonmark qualified as CM import Commonmark.Extensions qualified as CE +import Commonmark.Extensions.WikiLink qualified as WL import Commonmark.Simple (parseMarkdownWithFrontMatter) import Data.Aeson qualified as Aeson import Emanote.Pandoc.Markdown.Syntax.HashTag qualified as IT import Emanote.Pandoc.Markdown.Syntax.Highlight qualified as IH -import Emanote.Pandoc.Markdown.Syntax.WikiLink qualified as WL import Relude import Text.Pandoc.Definition (Pandoc) diff --git a/src/Emanote/Pandoc/Markdown/Syntax/WikiLink.hs b/src/Emanote/Pandoc/Markdown/Syntax/WikiLink.hs deleted file mode 100644 --- a/src/Emanote/Pandoc/Markdown/Syntax/WikiLink.hs +++ /dev/null @@ -1,275 +0,0 @@ -{-# LANGUAGE DeriveAnyClass #-} - -module Emanote.Pandoc.Markdown.Syntax.WikiLink - ( WikiLink, - WikiLinkType (..), - wikilinkSpec, - mkWikiLinkFromRoute, - delineateLink, - wikilinkInline, - wikiLinkInlineRendered, - mkWikiLinkFromInline, - allowedWikiLinks, - - -- * Anchors in URLs - Anchor, - anchorSuffix, - - -- * Pandoc helper, which use wikilink somehow - plainify, - ) -where - -import Commonmark qualified as CM -import Commonmark.Pandoc qualified as CP -import Commonmark.TokParsers qualified as CT -import Control.Monad (liftM2) -import Data.Aeson (ToJSON (toJSON)) -import Data.Data (Data) -import Data.List.NonEmpty qualified as NE -import Data.Map.Strict qualified as Map -import Data.Text qualified as T -import Emanote.Route.Ext qualified as Ext -import Emanote.Route.R (R (..)) -import Network.URI.Encode qualified as UE -import Network.URI.Slug (Slug) -import Network.URI.Slug qualified as Slug -import Relude -import Text.Megaparsec qualified as M -import Text.Pandoc.Builder qualified as B -import Text.Pandoc.Walk qualified as W -import Text.Parsec qualified as P -import Text.Read (Read (readsPrec)) -import Text.Show qualified (Show (show)) - --- | Represents the "Foo" in [[Foo]] --- --- As wiki links may contain multiple path components, it can also represent --- [[Foo/Bar]], hence we use nonempty slug list. -newtype WikiLink = WikiLink {unWikiLink :: NonEmpty Slug} - deriving stock (Eq, Ord, Typeable, Data) - -instance ToJSON WikiLink where - toJSON = toJSON . wikilinkUrl - -instance Show WikiLink where - show wl = - toString $ "[[" <> wikilinkUrl wl <> "]]" - --- ----------------- --- Making wiki links --- ----------------- - -mkWikiLinkFromRoute :: R ext -> WikiLink -mkWikiLinkFromRoute (R slugs) = WikiLink slugs - -mkWikiLinkFromUrl :: (Monad m, Alternative m) => Text -> m WikiLink -mkWikiLinkFromUrl s = do - slugs <- maybe empty pure $ nonEmpty $ Slug.decodeSlug <$> T.splitOn "/" s - pure $ WikiLink slugs - -mkWikiLinkFromInline :: B.Inline -> Maybe (WikiLink, [B.Inline]) -mkWikiLinkFromInline inl = do - B.Link (_id, _class, otherAttrs) is (url, tit) <- pure inl - (Left (_, wl), _manchor) <- delineateLink (otherAttrs <> one ("title", tit)) url - pure (wl, is) - --- | An URL anchor without the '#' -newtype Anchor = Anchor Text - deriving newtype (Eq, Show, Ord) - -mkAnchor :: String -> Maybe Anchor -mkAnchor ('#' : name) = pure $ Anchor $ toText name -mkAnchor _ = Nothing - -anchorSuffix :: Maybe Anchor -> Text -anchorSuffix = maybe "" (\(Anchor a) -> "#" <> a) - -dropUrlAnchor :: Text -> (Text, Maybe Anchor) -dropUrlAnchor = second (mkAnchor . toString) . T.breakOn "#" - --- | Given a Pandoc Link node, apparaise what kind of link it is. --- --- * Nothing, if the link is an absolute URL --- * Just (Left wl), if a wiki-link --- * Just (Right fp), if a relative path (not a wiki-link) -delineateLink :: [(Text, Text)] -> Text -> Maybe (Either (WikiLinkType, WikiLink) FilePath, Maybe Anchor) -delineateLink (Map.fromList -> attrs) url = do - -- Must be relative - guard $ not $ "://" `T.isInfixOf` url - wikiLink <|> internalLink - where - wikiLink = do - wlType :: WikiLinkType <- readMaybe . toString <=< Map.lookup htmlAttr $ attrs - -- Ignore anchors until https://github.com/srid/emanote/discussions/105 - let (s, manc) = dropUrlAnchor url - wl <- mkWikiLinkFromUrl s - pure (Left (wlType, wl), manc) - internalLink = do - -- Avoid links like "mailto:", "magnet:", etc. - -- An easy way to parse them is to look for colon character. - -- - -- This does mean that "Foo: Bar.md" cannot be linked to this way, however - -- the user can do it using wiki-links. - guard $ not $ ":" `T.isInfixOf` url - let (s, manc) = dropUrlAnchor url - guard $ not $ T.null s -- Same page anchors - pure (Right $ UE.decode (toString s), manc) - --- --------------------- --- Converting wiki links --- --------------------- - --- | [[Foo/Bar]] -> "Foo/Bar" -wikilinkUrl :: WikiLink -> Text -wikilinkUrl = - T.intercalate "/" . fmap Slug.unSlug . toList . unWikiLink - -wikilinkInline :: WikiLinkType -> WikiLink -> B.Inlines -> B.Inlines -wikilinkInline typ wl = B.linkWith attrs (wikilinkUrl wl) "" - where - attrs = ("", [], [(htmlAttr, show typ)]) - -wikiLinkInlineRendered :: B.Inline -> Maybe Text -wikiLinkInlineRendered x = do - (wl, inl) <- mkWikiLinkFromInline x - pure $ case nonEmpty inl of - Nothing -> show wl - Just _ -> - let inlStr = plainify inl - in if inlStr == wikilinkUrl wl - then show wl - else "[[" <> wikilinkUrl wl <> "|" <> plainify inl <> "]]" - --- | Return the various ways to link to a route (ignoring ext) --- --- Foo/Bar/Qux.md -> [[Qux]], [[Bar/Qux]], [[Foo/Bar/Qux]] --- --- All possible combinations of Wikilink type use is automatically included. -allowedWikiLinks :: HasCallStack => R @Ext.SourceExt ext -> NonEmpty (WikiLinkType, WikiLink) -allowedWikiLinks r = - let wls = fmap WikiLink $ tailsNE $ unRoute r - typs :: NonEmpty WikiLinkType = NE.fromList universe - in liftM2 (,) typs wls - where - tailsNE = - NE.fromList . mapMaybe nonEmpty . tails . toList - -------------------------- --- Parser --------------------------- - --- | A # prefix or suffix allows semantically distinct wikilinks --- --- Typically called branching link or a tag link, when used with #. -data WikiLinkType - = -- | [[Foo]] - WikiLinkNormal - | -- | [[Foo]]# - WikiLinkBranch - | -- | #[[Foo]] - WikiLinkTag - | -- | ![[Foo]] - WikiLinkEmbed - deriving stock (Eq, Show, Ord, Typeable, Data, Enum, Bounded, Generic) - deriving anyclass (ToJSON) - -instance Read WikiLinkType where - readsPrec _ s - | s == show WikiLinkNormal = [(WikiLinkNormal, "")] - | s == show WikiLinkBranch = [(WikiLinkBranch, "")] - | s == show WikiLinkTag = [(WikiLinkTag, "")] - | s == show WikiLinkEmbed = [(WikiLinkEmbed, "")] - | otherwise = [] - --- | The HTML 'data attribute' storing the wiki-link type. -htmlAttr :: Text -htmlAttr = "data-wikilink-type" - -class HasWikiLink il where - wikilink :: WikiLinkType -> WikiLink -> Maybe il -> il - -instance HasWikiLink (CP.Cm b B.Inlines) where - wikilink typ wl il = - CP.Cm $ wikilinkInline typ wl $ maybe mempty CP.unCm il - --- | Like `Commonmark.Extensions.Wikilinks.wikilinkSpec` but Zettelkasten-friendly. --- --- Compared with the official extension, this has two differences: --- --- - Supports flipped inner text, eg: `[[Foo | some inner text]]` --- - Supports neuron folgezettel, i.e.: #[[Foo]] or [[Foo]]# -wikilinkSpec :: - (Monad m, CM.IsInline il, HasWikiLink il) => - CM.SyntaxSpec m il bl -wikilinkSpec = - mempty - { CM.syntaxInlineParsers = - [ P.try $ - P.choice - [ P.try (CT.symbol '#' *> pWikilink WikiLinkTag), - P.try (CT.symbol '!' *> pWikilink WikiLinkEmbed), - P.try (pWikilink WikiLinkBranch <* CT.symbol '#'), - P.try (pWikilink WikiLinkNormal) - ] - ] - } - where - pWikilink typ = do - replicateM_ 2 $ CT.symbol '[' - P.notFollowedBy (CT.symbol '[') - url <- - CM.untokenize <$> many (satisfyNoneOf [isPipe, isAnchor, isClose]) - wl <- mkWikiLinkFromUrl url - -- We ignore the anchor until https://github.com/srid/emanote/discussions/105 - _anchor <- - M.optional $ - CM.untokenize - <$> ( CT.symbol '#' - *> many (satisfyNoneOf [isPipe, isClose]) - ) - title <- - M.optional $ - -- TODO: Should parse as inline so link text can be formatted? - CM.untokenize - <$> ( CT.symbol '|' - *> many (satisfyNoneOf [isClose]) - ) - replicateM_ 2 $ CT.symbol ']' - return $ wikilink typ wl (fmap CM.str title) - satisfyNoneOf toks = - CT.satisfyTok $ \t -> not $ or $ toks <&> \tok -> tok t - isAnchor = - isSymbol '#' - isPipe = - isSymbol '|' - isClose = - isSymbol ']' - isSymbol c = - CT.hasType (CM.Symbol c) - --- | Convert Pandoc AST inlines to raw text. --- --- TODO: extend on top of plainify from heist-extra -plainify :: [B.Inline] -> Text -plainify = W.query $ \case - B.Str x -> x - B.Code _attr x -> x - B.Space -> " " - B.SoftBreak -> " " - B.LineBreak -> " " - -- TODO: if fmt is html, we should strip the html tags - B.RawInline _fmt s -> s - -- Ignore "wrapper" inlines like span. - B.Span _ _ -> "" - -- TODO: How to wrap math stuff here? - B.Math _mathTyp s -> s - -- Wiki-links must be displayed using its show instance (which returns its - -- human-readable representation) - (mkWikiLinkFromInline -> Just (wl, customText)) -> - if null customText - then show wl -- We will display raw wikilink; ideally, though, we want to display the title. - else plainify customText - -- Ignore the rest of AST nodes, as they are recursively defined in terms of - -- `Inline` which `W.query` will traverse again. - _ -> "" diff --git a/src/Emanote/Pandoc/Renderer/Embed.hs b/src/Emanote/Pandoc/Renderer/Embed.hs --- a/src/Emanote/Pandoc/Renderer/Embed.hs +++ b/src/Emanote/Pandoc/Renderer/Embed.hs @@ -1,5 +1,6 @@ module Emanote.Pandoc.Renderer.Embed where +import Commonmark.Extensions.WikiLink qualified as WL import Data.Map.Syntax ((##)) import Data.Text qualified as T import Emanote.Model (Model) @@ -10,7 +11,6 @@ import Emanote.Model.Title qualified as Tit import Emanote.Pandoc.BuiltinFilters (prepareNoteDoc, preparePandoc) import Emanote.Pandoc.Link qualified as Link -import Emanote.Pandoc.Markdown.Syntax.WikiLink qualified as WL import Emanote.Pandoc.Renderer (PandocBlockRenderer, PandocInlineRenderer) import Emanote.Pandoc.Renderer.Url qualified as RenderedUrl import Emanote.Route.ModelRoute qualified as R diff --git a/src/Emanote/Pandoc/Renderer/Url.hs b/src/Emanote/Pandoc/Renderer/Url.hs --- a/src/Emanote/Pandoc/Renderer/Url.hs +++ b/src/Emanote/Pandoc/Renderer/Url.hs @@ -5,6 +5,7 @@ ) where +import Commonmark.Extensions.WikiLink qualified as WL import Data.Text qualified as T import Emanote.Model (Model) import Emanote.Model qualified as M @@ -13,7 +14,6 @@ import Emanote.Model.Note qualified as MN import Emanote.Model.Title qualified as Tit import Emanote.Pandoc.Link qualified as Link -import Emanote.Pandoc.Markdown.Syntax.WikiLink qualified as WL import Emanote.Pandoc.Renderer (PandocInlineRenderer) import Emanote.Route qualified as R import Emanote.Route.SiteRoute qualified as SR diff --git a/src/Main.hs b/src/Main.hs deleted file mode 100644 --- a/src/Main.hs +++ /dev/null @@ -1,28 +0,0 @@ -module Main where - -import Emanote (defaultEmanoteConfig, run) -import Emanote.CLI qualified as CLI -import Emanote.Source.Dynamic (emanoteCompileTailwind) -import Main.Utf8 (withUtf8) -import Optics.Core ((.~)) -import Relude -import Spec qualified -import System.Environment qualified as Env - -main :: IO () -main = - withUtf8 $ do - cli <- CLI.parseCli - -- Why is test part of executable? - -- Simply so that ghcid can reload both library and test at the same. - -- Once Multiple Home Units for GHC is implemented, we can go back to - -- using separate test stanza. - if CLI.test cli - then test - else run (defaultEmanoteConfig cli & emanoteCompileTailwind .~ True) - -test :: IO () -test = do - Env.withArgs - mempty -- Discard emanote's CLI arguments - Spec.main diff --git a/src/Spec.hs b/src/Spec.hs deleted file mode 100644 --- a/src/Spec.hs +++ /dev/null @@ -1,12 +0,0 @@ -module Spec (main) where - -import Emanote.Model.Link.RelSpec qualified as RelSpec -import Emanote.Model.QuerySpec qualified as QuerySpec -import Relude -import Test.Hspec (hspec) - -main :: IO () -main = do - hspec $ do - QuerySpec.spec - RelSpec.spec diff --git a/test/Emanote/Model/Link/RelSpec.hs b/test/Emanote/Model/Link/RelSpec.hs new file mode 100644 --- /dev/null +++ b/test/Emanote/Model/Link/RelSpec.hs @@ -0,0 +1,32 @@ +module Emanote.Model.Link.RelSpec where + +import Emanote.Model.Link.Rel +import Hedgehog +import Relude +import Test.Hspec +import Test.Hspec.Hedgehog + +spec :: Spec +spec = do + describe "dropDotDot" $ do + it "simple" . hedgehog $ do + dropDotDot "foo/bar/qux" === "foo/bar/qux" + dropDotDot "foo/../qux" === "qux" + dropDotDot "bar/foo/../qux" === "bar/qux" + dropDotDot "bar/foo/.." === "bar" + it "dotInfix" . hedgehog $ do + dropDotDot "bar/foo/../../qux" === "qux" + dropDotDot "bar/foo/../../qux/../foo" === "foo" + it "dotPrefix" . hedgehog $ do + dropDotDot "../../foo" === "foo" + dropDotDot "../foo" === "foo" + dropDotDot "./../foo" === "foo" + dropDotDot "./foo" === "./foo" + it "dotSuffix" . hedgehog $ do + dropDotDot "foo/.." === "" + dropDotDot "foo/bar/.." === "foo" + dropDotDot "foo/bar/../.." === "" + +-- https://github.com/hedgehogqa/haskell-hedgehog/issues/121 +once :: PropertyT IO () -> Property +once = withTests 1 . property diff --git a/test/Emanote/Model/QuerySpec.hs b/test/Emanote/Model/QuerySpec.hs new file mode 100644 --- /dev/null +++ b/test/Emanote/Model/QuerySpec.hs @@ -0,0 +1,19 @@ +module Emanote.Model.QuerySpec where + +import Data.TagTree (Tag (Tag)) +import Emanote.Model.Query +import Hedgehog +import Hedgehog.Gen qualified as Gen +import Hedgehog.Range qualified as Range +import Relude +import Test.Hspec +import Test.Hspec.Hedgehog (hedgehog) + +spec :: Spec +spec = do + describe "tags" $ do + it "tags can begin with hash" . hedgehog $ do + s <- forAll $ Gen.text (Range.linear 2 20) Gen.alphaNum + let q = "tag:#" <> s + tag = Tag s + parseQuery q === Just (QueryByTag tag) diff --git a/test/Emanote/Pandoc/ExternalLinkSpec.hs b/test/Emanote/Pandoc/ExternalLinkSpec.hs new file mode 100644 --- /dev/null +++ b/test/Emanote/Pandoc/ExternalLinkSpec.hs @@ -0,0 +1,56 @@ +module Emanote.Pandoc.ExternalLinkSpec where + +import Emanote.Pandoc.ExternalLink (setExternalLinkIcon) +import Emanote.Pandoc.Markdown.Parser (parseMarkdown) +import Hedgehog +import Relude +import Test.Hspec +import Test.Hspec.Hedgehog (hedgehog) +import Text.Pandoc.Definition (Inline (..)) +import Text.Pandoc.Walk qualified as W + +spec :: Spec +spec = do + describe "setExternalLinkIcon" $ do + it "respects user-specified data-linkicon attribute" . hedgehog $ do + getDataLinkIconAttrs "[test](https://www.test.com){data-linkicon=abc}" === Right ["abc"] + getDataLinkIconAttrs "[test](https://www.test.com){data-linkicon=\"\"}" === Right [""] + getDataLinkIconAttrs "[[foo]]{data-linkicon=external}" === Right ["external"] + getDataLinkIconAttrs "[abc](x/y/z){data-linkicon=none}" === Right ["none"] + it "does not add attribute if link is internal" . hedgehog $ do + getDataLinkIconAttrs "[[foo]]" === Right [] + getDataLinkIconAttrs "[abc](x/y/z)" === Right [] + getDataLinkIconAttrs "![[image.jpg]]" === Right [] + getDataLinkIconAttrs "[![](path/to/image.png)](foo/bar/baz)" === Right [] + getDataLinkIconAttrs "[[bar|baz]]" === Right [] + getDataLinkIconAttrs "[`abc`](./test.txt)" === Right [] + getDataLinkIconAttrs "[$$abc$$](/just/test#ing)" === Right [] + getDataLinkIconAttrs "#tag" === Right [] + getDataLinkIconAttrs "[[abc|def]]" === Right [] + it "adds attribute if link is external and its description contains text, code or math" . hedgehog $ do + getDataLinkIconAttrs "[Emanote](https://github.com/EmaApps/emanote)" === Right ["external"] + getDataLinkIconAttrs "[`text`](http://somehost:1234/test)" === Right ["external"] + getDataLinkIconAttrs "[$$E=mc^2$$](ssh://user@host.abc/~/path/)" === Right ["external"] + getDataLinkIconAttrs "[![[picture.png]] ~~**`code`**~~](scheme://host:port/path?query)" === Right ["external"] + getDataLinkIconAttrs "[==$$e^{i \\pi} + 1 = 0$$== ![[image.svg]]](git://host.xz/path/to/repo.git/)" === Right ["external"] + getDataLinkIconAttrs "example@example.com" === Right ["external"] + getDataLinkIconAttrs "https://www.test.gov" === Right ["external"] + getDataLinkIconAttrs "[**![[image.jpg]] *qwerty* ![[image.jpg]]**](doi:10.1000/182)" === Right ["external"] + getDataLinkIconAttrs "[:video_game:](bolo://hostname/)" === Right ["external"] + it "does not add attribute if link description contains no text, code or math" . hedgehog $ do + getDataLinkIconAttrs "[](http://nothing.interesting.here)" === Right [] + getDataLinkIconAttrs "[![[image.png]]](https://www.example.com)" === Right [] + getDataLinkIconAttrs "[==*_**~~![[img.png]]~~**_*==](http://something.info)" === Right [] + +-- | Extract "data-linkicon" attributes present in the given Markdown content. +getDataLinkIconAttrs :: Text -> Either Text [Text] +getDataLinkIconAttrs = + fmap (W.query $ getLinkAttr "data-linkicon") . parseEmanoteMarkdown + where + parseEmanoteMarkdown = fmap (setExternalLinkIcon . snd) . parseMarkdown "" + +getLinkAttr :: Text -> Inline -> [Text] +getLinkAttr name (Link (_, _, attrs) _ (_, _)) = + snd <$> filter ((== name) . fst) attrs +getLinkAttr _ _ = + [] diff --git a/test/Spec.hs b/test/Spec.hs new file mode 100644 --- /dev/null +++ b/test/Spec.hs @@ -0,0 +1,1 @@ +{-# OPTIONS_GHC -F -pgmF hspec-discover #-}