diff --git a/dist/index.mjs b/dist/index.mjs index 2598436..7897461 100644 --- a/dist/index.mjs +++ b/dist/index.mjs @@ -22815,9 +22815,9 @@ var require_github = __commonJS({ } }); -// node_modules/.pnpm/braces@3.0.2/node_modules/braces/lib/utils.js +// node_modules/.pnpm/braces@3.0.3/node_modules/braces/lib/utils.js var require_utils5 = __commonJS({ - "node_modules/.pnpm/braces@3.0.2/node_modules/braces/lib/utils.js"(exports) { + "node_modules/.pnpm/braces@3.0.3/node_modules/braces/lib/utils.js"(exports) { "use strict"; exports.isInteger = (num) => { if (typeof num === "number") { @@ -22835,7 +22835,7 @@ var require_utils5 = __commonJS({ return (Number(max) - Number(min)) / Number(step) >= limit; }; exports.escapeNode = (block, n = 0, type2) => { - let node = block.nodes[n]; + const node = block.nodes[n]; if (!node) return; if (type2 && node.type === type2 || node.type === "open" || node.type === "close") { if (node.escaped !== true) { @@ -22880,8 +22880,14 @@ var require_utils5 = __commonJS({ const result = []; const flat2 = (arr) => { for (let i = 0; i < arr.length; i++) { - let ele = arr[i]; - Array.isArray(ele) ? flat2(ele, result) : ele !== void 0 && result.push(ele); + const ele = arr[i]; + if (Array.isArray(ele)) { + flat2(ele); + continue; + } + if (ele !== void 0) { + result.push(ele); + } } return result; }; @@ -22891,15 +22897,15 @@ var require_utils5 = __commonJS({ } }); -// node_modules/.pnpm/braces@3.0.2/node_modules/braces/lib/stringify.js +// node_modules/.pnpm/braces@3.0.3/node_modules/braces/lib/stringify.js var require_stringify = __commonJS({ - "node_modules/.pnpm/braces@3.0.2/node_modules/braces/lib/stringify.js"(exports, module) { + "node_modules/.pnpm/braces@3.0.3/node_modules/braces/lib/stringify.js"(exports, module) { "use strict"; var utils = require_utils5(); module.exports = (ast, options = {}) => { - let stringify2 = (node, parent = {}) => { - let invalidBlock = options.escapeInvalid && utils.isInvalidBrace(parent); - let invalidNode = node.invalid === true && options.escapeInvalid === true; + const stringify2 = (node, parent = {}) => { + const invalidBlock = options.escapeInvalid && utils.isInvalidBrace(parent); + const invalidNode = node.invalid === true && options.escapeInvalid === true; let output = ""; if (node.value) { if ((invalidBlock || invalidNode) && utils.isOpenOrClose(node)) { @@ -22911,7 +22917,7 @@ var require_stringify = __commonJS({ return node.value; } if (node.nodes) { - for (let child of node.nodes) { + for (const child of node.nodes) { output += stringify2(child); } } @@ -23149,9 +23155,9 @@ var require_to_regex_range = __commonJS({ } }); -// node_modules/.pnpm/fill-range@7.0.1/node_modules/fill-range/index.js +// node_modules/.pnpm/fill-range@7.1.1/node_modules/fill-range/index.js var require_fill_range = __commonJS({ - "node_modules/.pnpm/fill-range@7.0.1/node_modules/fill-range/index.js"(exports, module) { + "node_modules/.pnpm/fill-range@7.1.1/node_modules/fill-range/index.js"(exports, module) { "use strict"; var util = __require("util"); var toRegexRange = require_to_regex_range(); @@ -23197,7 +23203,7 @@ var require_fill_range = __commonJS({ while (input.length < maxLength) input = "0" + input; return negative ? "-" + input : input; }; - var toSequence = (parts, options) => { + var toSequence = (parts, options, maxLen) => { parts.negatives.sort((a, b) => a < b ? -1 : a > b ? 1 : 0); parts.positives.sort((a, b) => a < b ? -1 : a > b ? 1 : 0); let prefix = options.capture ? "" : "?:"; @@ -23205,10 +23211,10 @@ var require_fill_range = __commonJS({ let negatives = ""; let result; if (parts.positives.length) { - positives = parts.positives.join("|"); + positives = parts.positives.map((v) => toMaxLen(String(v), maxLen)).join("|"); } if (parts.negatives.length) { - negatives = `-(${prefix}${parts.negatives.join("|")})`; + negatives = `-(${prefix}${parts.negatives.map((v) => toMaxLen(String(v), maxLen)).join("|")})`; } if (positives && negatives) { result = `${positives}|${negatives}`; @@ -23285,7 +23291,7 @@ var require_fill_range = __commonJS({ index++; } if (options.toRegex === true) { - return step > 1 ? toSequence(parts, options) : toRegex(range, null, { wrap: false, ...options }); + return step > 1 ? toSequence(parts, options, maxLen) : toRegex(range, null, { wrap: false, ...options }); } return range; }; @@ -23343,23 +23349,24 @@ var require_fill_range = __commonJS({ } }); -// node_modules/.pnpm/braces@3.0.2/node_modules/braces/lib/compile.js +// node_modules/.pnpm/braces@3.0.3/node_modules/braces/lib/compile.js var require_compile = __commonJS({ - "node_modules/.pnpm/braces@3.0.2/node_modules/braces/lib/compile.js"(exports, module) { + "node_modules/.pnpm/braces@3.0.3/node_modules/braces/lib/compile.js"(exports, module) { "use strict"; var fill = require_fill_range(); var utils = require_utils5(); var compile = (ast, options = {}) => { - let walk = (node, parent = {}) => { - let invalidBlock = utils.isInvalidBrace(parent); - let invalidNode = node.invalid === true && options.escapeInvalid === true; - let invalid = invalidBlock === true || invalidNode === true; - let prefix = options.escapeInvalid === true ? "\\" : ""; + const walk = (node, parent = {}) => { + const invalidBlock = utils.isInvalidBrace(parent); + const invalidNode = node.invalid === true && options.escapeInvalid === true; + const invalid = invalidBlock === true || invalidNode === true; + const prefix = options.escapeInvalid === true ? "\\" : ""; let output = ""; if (node.isOpen === true) { return prefix + node.value; } if (node.isClose === true) { + console.log("node.isClose", prefix, node.value); return prefix + node.value; } if (node.type === "open") { @@ -23375,14 +23382,14 @@ var require_compile = __commonJS({ return node.value; } if (node.nodes && node.ranges > 0) { - let args = utils.reduce(node.nodes); - let range = fill(...args, { ...options, wrap: false, toRegex: true }); + const args = utils.reduce(node.nodes); + const range = fill(...args, { ...options, wrap: false, toRegex: true, strictZeros: true }); if (range.length !== 0) { return args.length > 1 && range.length > 1 ? `(${range})` : range; } } if (node.nodes) { - for (let child of node.nodes) { + for (const child of node.nodes) { output += walk(child, node); } } @@ -23394,24 +23401,24 @@ var require_compile = __commonJS({ } }); -// node_modules/.pnpm/braces@3.0.2/node_modules/braces/lib/expand.js +// node_modules/.pnpm/braces@3.0.3/node_modules/braces/lib/expand.js var require_expand = __commonJS({ - "node_modules/.pnpm/braces@3.0.2/node_modules/braces/lib/expand.js"(exports, module) { + "node_modules/.pnpm/braces@3.0.3/node_modules/braces/lib/expand.js"(exports, module) { "use strict"; var fill = require_fill_range(); var stringify2 = require_stringify(); var utils = require_utils5(); var append = (queue = "", stash = "", enclose = false) => { - let result = []; + const result = []; queue = [].concat(queue); stash = [].concat(stash); if (!stash.length) return queue; if (!queue.length) { return enclose ? utils.flatten(stash).map((ele) => `{${ele}}`) : stash; } - for (let item of queue) { + for (const item of queue) { if (Array.isArray(item)) { - for (let value of item) { + for (const value of item) { result.push(append(value, stash, enclose)); } } else { @@ -23424,8 +23431,8 @@ var require_expand = __commonJS({ return utils.flatten(result); }; var expand = (ast, options = {}) => { - let rangeLimit = options.rangeLimit === void 0 ? 1e3 : options.rangeLimit; - let walk = (node, parent = {}) => { + const rangeLimit = options.rangeLimit === void 0 ? 1e3 : options.rangeLimit; + const walk = (node, parent = {}) => { node.queue = []; let p = parent; let q = parent.queue; @@ -23442,7 +23449,7 @@ var require_expand = __commonJS({ return; } if (node.nodes && node.ranges > 0) { - let args = utils.reduce(node.nodes); + const args = utils.reduce(node.nodes); if (utils.exceedsLimit(...args, options.step, rangeLimit)) { throw new RangeError("expanded array length exceeds range limit. Use options.rangeLimit to increase or disable the limit."); } @@ -23454,7 +23461,7 @@ var require_expand = __commonJS({ node.nodes = []; return; } - let enclose = utils.encloseBrace(node); + const enclose = utils.encloseBrace(node); let queue = node.queue; let block = node; while (block.type !== "brace" && block.type !== "root" && block.parent) { @@ -23462,7 +23469,7 @@ var require_expand = __commonJS({ queue = block.queue; } for (let i = 0; i < node.nodes.length; i++) { - let child = node.nodes[i]; + const child = node.nodes[i]; if (child.type === "comma" && node.type === "brace") { if (i === 1) queue.push(""); queue.push(""); @@ -23488,12 +23495,12 @@ var require_expand = __commonJS({ } }); -// node_modules/.pnpm/braces@3.0.2/node_modules/braces/lib/constants.js +// node_modules/.pnpm/braces@3.0.3/node_modules/braces/lib/constants.js var require_constants5 = __commonJS({ - "node_modules/.pnpm/braces@3.0.2/node_modules/braces/lib/constants.js"(exports, module) { + "node_modules/.pnpm/braces@3.0.3/node_modules/braces/lib/constants.js"(exports, module) { "use strict"; module.exports = { - MAX_LENGTH: 1024 * 64, + MAX_LENGTH: 1e4, // Digits CHAR_0: "0", /* 0 */ @@ -23589,9 +23596,9 @@ var require_constants5 = __commonJS({ } }); -// node_modules/.pnpm/braces@3.0.2/node_modules/braces/lib/parse.js +// node_modules/.pnpm/braces@3.0.3/node_modules/braces/lib/parse.js var require_parse2 = __commonJS({ - "node_modules/.pnpm/braces@3.0.2/node_modules/braces/lib/parse.js"(exports, module) { + "node_modules/.pnpm/braces@3.0.3/node_modules/braces/lib/parse.js"(exports, module) { "use strict"; var stringify2 = require_stringify(); var { @@ -23627,21 +23634,20 @@ var require_parse2 = __commonJS({ if (typeof input !== "string") { throw new TypeError("Expected a string"); } - let opts = options || {}; - let max = typeof opts.maxLength === "number" ? Math.min(MAX_LENGTH, opts.maxLength) : MAX_LENGTH; + const opts = options || {}; + const max = typeof opts.maxLength === "number" ? Math.min(MAX_LENGTH, opts.maxLength) : MAX_LENGTH; if (input.length > max) { throw new SyntaxError(`Input length (${input.length}), exceeds max characters (${max})`); } - let ast = { type: "root", input, nodes: [] }; - let stack = [ast]; + const ast = { type: "root", input, nodes: [] }; + const stack = [ast]; let block = ast; let prev = ast; let brackets = 0; - let length = input.length; + const length = input.length; let index = 0; let depth = 0; let value; - let memo = {}; const advance = () => input[index++]; const push = (node) => { if (node.type === "text" && prev.type === "dot") { @@ -23674,7 +23680,6 @@ var require_parse2 = __commonJS({ } if (value === CHAR_LEFT_SQUARE_BRACKET2) { brackets++; - let closed = true; let next; while (index < length && (next = advance())) { value += next; @@ -23713,7 +23718,7 @@ var require_parse2 = __commonJS({ continue; } if (value === CHAR_DOUBLE_QUOTE2 || value === CHAR_SINGLE_QUOTE2 || value === CHAR_BACKTICK) { - let open = value; + const open = value; let next; if (options.keepQuotes !== true) { value = ""; @@ -23734,8 +23739,8 @@ var require_parse2 = __commonJS({ } if (value === CHAR_LEFT_CURLY_BRACE) { depth++; - let dollar = prev.value && prev.value.slice(-1) === "$" || block.dollar === true; - let brace = { + const dollar = prev.value && prev.value.slice(-1) === "$" || block.dollar === true; + const brace = { type: "brace", open: true, close: false, @@ -23755,7 +23760,7 @@ var require_parse2 = __commonJS({ push({ type: "text", value }); continue; } - let type2 = "close"; + const type2 = "close"; block = stack.pop(); block.close = true; push({ type: type2, value }); @@ -23766,7 +23771,7 @@ var require_parse2 = __commonJS({ if (value === CHAR_COMMA2 && depth > 0) { if (block.ranges > 0) { block.ranges = 0; - let open = block.nodes.shift(); + const open = block.nodes.shift(); block.nodes = [open, { type: "text", value: stringify2(block) }]; } push({ type: "comma", value }); @@ -23774,7 +23779,7 @@ var require_parse2 = __commonJS({ continue; } if (value === CHAR_DOT && depth > 0 && block.commas === 0) { - let siblings = block.nodes; + const siblings = block.nodes; if (depth === 0 || siblings.length === 0) { push({ type: "text", value }); continue; @@ -23795,7 +23800,7 @@ var require_parse2 = __commonJS({ } if (prev.type === "range") { siblings.pop(); - let before = siblings[siblings.length - 1]; + const before = siblings[siblings.length - 1]; before.value += prev.value + value; prev = before; block.ranges--; @@ -23817,8 +23822,8 @@ var require_parse2 = __commonJS({ node.invalid = true; } }); - let parent = stack[stack.length - 1]; - let index2 = parent.nodes.indexOf(block); + const parent = stack[stack.length - 1]; + const index2 = parent.nodes.indexOf(block); parent.nodes.splice(index2, 1, ...block.nodes); } } while (stack.length > 0); @@ -23829,9 +23834,9 @@ var require_parse2 = __commonJS({ } }); -// node_modules/.pnpm/braces@3.0.2/node_modules/braces/index.js +// node_modules/.pnpm/braces@3.0.3/node_modules/braces/index.js var require_braces = __commonJS({ - "node_modules/.pnpm/braces@3.0.2/node_modules/braces/index.js"(exports, module) { + "node_modules/.pnpm/braces@3.0.3/node_modules/braces/index.js"(exports, module) { "use strict"; var stringify2 = require_stringify(); var compile = require_compile(); @@ -23840,8 +23845,8 @@ var require_braces = __commonJS({ var braces = (input, options = {}) => { let output = []; if (Array.isArray(input)) { - for (let pattern of input) { - let result = braces.create(pattern, options); + for (const pattern of input) { + const result = braces.create(pattern, options); if (Array.isArray(result)) { output.push(...result); } else { @@ -25402,15 +25407,19 @@ var require_picomatch2 = __commonJS({ } }); -// node_modules/.pnpm/micromatch@4.0.5/node_modules/micromatch/index.js +// node_modules/.pnpm/micromatch@4.0.8/node_modules/micromatch/index.js var require_micromatch = __commonJS({ - "node_modules/.pnpm/micromatch@4.0.5/node_modules/micromatch/index.js"(exports, module) { + "node_modules/.pnpm/micromatch@4.0.8/node_modules/micromatch/index.js"(exports, module) { "use strict"; var util = __require("util"); var braces = require_braces(); var picomatch = require_picomatch2(); var utils = require_utils6(); - var isEmptyString = (val) => val === "" || val === "./"; + var isEmptyString = (v) => v === "" || v === "./"; + var hasBraces = (v) => { + const index = v.indexOf("{"); + return index > -1 && v.indexOf("}", index) > -1; + }; var micromatch2 = (list, patterns, options) => { patterns = [].concat(patterns); list = [].concat(list); @@ -25545,7 +25554,7 @@ var require_micromatch = __commonJS({ }; micromatch2.braces = (pattern, options) => { if (typeof pattern !== "string") throw new TypeError("Expected a string"); - if (options && options.nobrace === true || !/\{.*\}/.test(pattern)) { + if (options && options.nobrace === true || !hasBraces(pattern)) { return [pattern]; } return braces(pattern, options); @@ -25554,6 +25563,7 @@ var require_micromatch = __commonJS({ if (typeof pattern !== "string") throw new TypeError("Expected a string"); return micromatch2.braces(pattern, { ...options, expand: true }); }; + micromatch2.hasBraces = hasBraces; module.exports = micromatch2; } });