Skip to content

fix: avoid bracket class literal shortcut #176

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
pupuking723 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: avoid bracket class literal shortcut #176

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
10 changes: 6 additions & 4 deletions lib/picomatch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ const parse = require('./parse');
const utils = require('./utils');
const constants = require('./constants');
const isObject = val => val && typeof val === 'object' && !Array.isArray(val);
const hasBracketTokens = state => Array.isArray(state.tokens) && state.tokens.some(token => token.type === 'bracket');

/**
* Creates a matcher function from one or more glob patterns. The
Expand Down Expand Up @@ -63,7 +64,7 @@ const picomatch = (glob, options, returnState = false) => {
}

const matcher = (input, returnObject = false) => {
const { isMatch, match, output } = picomatch.test(input, regex, options, { glob, posix });
const { isMatch, match, output } = picomatch.test(input, regex, options, { glob, posix, state });
const result = { glob, state, regex, posix, input, output, match, isMatch };

if (typeof opts.onResult === 'function') {
Expand Down Expand Up @@ -113,7 +114,7 @@ const picomatch = (glob, options, returnState = false) => {
* @api public
*/

picomatch.test = (input, regex, options, { glob, posix } = {}) => {
picomatch.test = (input, regex, options, { glob, posix, state } = {}) => {
if (typeof input !== 'string') {
throw new TypeError('Expected input to be a string');
}
Expand All @@ -124,12 +125,13 @@ picomatch.test = (input, regex, options, { glob, posix } = {}) => {

const opts = options || {};
const format = opts.format || (posix ? utils.toPosixSlashes : null);
let match = input === glob;
const literalMatch = opts.literalBrackets === true || !hasBracketTokens(state);
let match = literalMatch && input === glob;
let output = (match && format) ? format(input) : input;

if (match === false) {
output = format ? format(input) : input;
match = output === glob;
match = literalMatch && output === glob;
}

if (match === false || opts.capture === true) {
Expand Down
13 changes: 13 additions & 0 deletions test/brackets.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,19 @@ const assert = require('assert');
const { isMatch } = require('..');

describe('brackets', () => {
describe('character classes', () => {
it('should not let exact string matching bypass character classes', () => {
assert(!isMatch('[1-5]', '[1-5]'));
assert(!isMatch('[1-5]', '[1-5]', { literalBrackets: false }));
assert(isMatch('3', '[1-5]'));
});

it('should still match literal brackets when requested', () => {
assert(isMatch('[1-5]', '\\[1-5\\]'));
assert(isMatch('[1-5]', '[1-5]', { literalBrackets: true }));
});
});

describe('trailing stars', () => {
it('should support stars following brackets', () => {
assert(isMatch('a', '[a]*'));
Expand Down