dillonkearns/elm-pages-v3-beta
1
1
Fork 0
mirror of https://github.com/dillonkearns/elm-pages-v3-beta.git synced 2024-11-28 06:05:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Don't allow arbitrary glob patterns, only literals, in zeroOrMore.

Browse Source
This commit is contained in:
Dillon Kearns 2021-03-30 17:50:45 -07:00
parent 65e2ca52ac
commit 9bbe0874ce
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Glob.elm
View File

@ -114,14 +114,11 @@ oneOf ( defaultMatch, otherMatchers ) =
)
optional : List (GlobMatcher a) -> GlobMatcher (Maybe String)
optional matchers =
zeroOrMore : List String -> GlobMatcher (Maybe String)
zeroOrMore matchers =
GlobMatcher
("*("
++ (matchers
|> List.map (\(GlobMatcher pattern _) -> pattern)
|> String.join "|"
)
++ (matchers |> String.join "|")
++ ")"
)
(Dynamic

17
tests/GlobTests.elm
View File

@ -46,7 +46,7 @@ all =
}
, test "optional group - no match" <|
\() ->
oneOrMoreGlob
zeroOrMoreGlob
|> expect
-- test/a/x.js
-- https://github.com/micromatch/micromatch/blob/fe4858b0c63b174fd3ae22674db39119b8fa4392/test/api.capture.js#L42
@ -56,7 +56,7 @@ all =
}
, test "optional group - single match" <|
\() ->
oneOrMoreGlob
zeroOrMoreGlob
|> expect
-- test/ab/x.js
-- https://github.com/micromatch/micromatch/blob/fe4858b0c63b174fd3ae22674db39119b8fa4392/test/api.capture.js#L44
@ -66,7 +66,7 @@ all =
}
, test "optional group - multiple matches" <|
\() ->
oneOrMoreGlob
zeroOrMoreGlob
|> expect
-- test/aba/x.js
-- https://github.com/micromatch/micromatch/blob/fe4858b0c63b174fd3ae22674db39119b8fa4392/test/api.capture.js#L45
@ -77,16 +77,11 @@ all =
]
oneOrMoreGlob : Glob.Glob (Maybe String)
oneOrMoreGlob =
zeroOrMoreGlob : Glob.Glob (Maybe String)
zeroOrMoreGlob =
Glob.init identity
|> Glob.drop (Glob.literal "test/a")
|> Glob.keep
(Glob.optional
[ Glob.literal "a"
, Glob.literal "b"
]
)
|> Glob.keep (Glob.zeroOrMore [ "a", "b" ])
|> Glob.drop (Glob.literal "/x.js")