Skip to content

implement matchBase basename matching #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
infinuts wants to merge 1 commit into
base: main
Choose a base branch
from
Open

implement matchBase basename matching #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/__tests__/options.spec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ return function()
end)

describe("options.matchBase", function()
itFIXME("should match the basename of file paths when `options.matchBase` is true", function()
it("should match the basename of file paths when `options.matchBase` is true", function()
jestExpect(match({ "a/b/c/d.md" }, "*.md")).toEqual(
{}
-- ROBLOX deviation: jestExpect doesn't accept message
Expand All @@ -44,9 +44,10 @@ return function()
"x/y/acb",
"acb/",
})
jestExpect(match({ "a/b/c/d.md" }, "*.md", { basename = true })).toEqual({ "a/b/c/d.md" })
end)

itFIXME("should work with negation patterns", function()
it("should work with negation patterns", function()
assert(isMatch("./x/y.js", "*.js", { matchBase = true }))
assert(not isMatch("./x/y.js", "!*.js", { matchBase = true }))
assert(isMatch("./x/y.js", "**/*.js", { matchBase = true }))
Expand Down
34 changes: 26 additions & 8 deletions src/picomatch.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,28 @@ local function isObject(val)
return typeof(val) == "table" and not Array.isArray(val)
end

local function isPathSeparator(char: string, useWindowsPaths: boolean?): boolean
return char == "/" or (useWindowsPaths == true and char == "\\")
end

local function basename(input: string, useWindowsPaths: boolean?): string
local endIndex = #input
while endIndex > 0 and isPathSeparator(input:sub(endIndex, endIndex), useWindowsPaths) do
endIndex -= 1
end

if endIndex == 0 then
return ""
end

local startIndex = endIndex
while startIndex > 0 and not isPathSeparator(input:sub(startIndex, startIndex), useWindowsPaths) do
startIndex -= 1
end

return input:sub(startIndex + 1, endIndex)
end

--[[*
* Creates a matcher function from one or more glob patterns. The
* returned function takes a string to match as its first argument,
Expand Down Expand Up @@ -238,16 +260,12 @@ end
* @api public
]]

-- ROBLOX TODO START: implement when possible
function picomatch.matchBase(input, glob, options, posix_: boolean?): boolean
error("matchBase not implemented")
-- local _posix = posix_ or utils.isWindows(options)
function picomatch.matchBase(input: string, glob: any, options: Object?, posix_: boolean?): boolean
local useWindowsPaths = if posix_ == nil then utils.isWindows(options) else posix_
local regex = if typeof(glob) == "string" then picomatch.makeRe(glob, options) else glob

-- local regex = if instanceof(glob, RegExp) then glob else picomatch.makeRe(glob, options)
-- -- ROBLOX FIXME: return regex:test(path:basename(input))
-- return regex:test(input)
return regex:test(basename(input, useWindowsPaths))
end
-- ROBLOX TODO END

--[[*
* Returns true if **any** of the given glob `patterns` match the specified `string`.
Expand Down