diff --git a/lib/analyze-action-post.js b/lib/analyze-action-post.js index 7c8823caa..8d5f7d001 100644 --- a/lib/analyze-action-post.js +++ b/lib/analyze-action-post.js @@ -49518,6 +49518,7 @@ var require_minimatch = __commonJS({ re += c; continue; } + if (c === "*" && stateChar === "*") continue; self2.debug("call clearStateChar %j", stateChar); clearStateChar(); stateChar = c; @@ -103582,6 +103583,7 @@ var require_minimatch2 = __commonJS({ re += c; continue; } + if (c === "*" && stateChar === "*") continue; this.debug("call clearStateChar %j", stateChar); clearStateChar(); stateChar = c; @@ -116408,9 +116410,9 @@ var require_isPlainObject = __commonJS({ } }); -// node_modules/@isaacs/balanced-match/dist/commonjs/index.js +// node_modules/glob/node_modules/balanced-match/dist/commonjs/index.js var require_commonjs18 = __commonJS({ - "node_modules/@isaacs/balanced-match/dist/commonjs/index.js"(exports2) { + "node_modules/glob/node_modules/balanced-match/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.range = exports2.balanced = void 0; @@ -116470,9 +116472,9 @@ var require_commonjs18 = __commonJS({ } }); -// node_modules/@isaacs/brace-expansion/dist/commonjs/index.js +// node_modules/glob/node_modules/brace-expansion/dist/commonjs/index.js var require_commonjs19 = __commonJS({ - "node_modules/@isaacs/brace-expansion/dist/commonjs/index.js"(exports2) { + "node_modules/glob/node_modules/brace-expansion/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.EXPANSION_MAX = void 0; @@ -117233,6 +117235,7 @@ var require_ast = __commonJS({ let escaping = false; let re = ""; let uflag = false; + let inStar = false; for (let i = 0; i < glob2.length; i++) { const c = glob2.charAt(i); if (escaping) { @@ -117240,6 +117243,16 @@ var require_ast = __commonJS({ re += (reSpecials.has(c) ? "\\" : "") + c; continue; } + if (c === "*") { + if (inStar) + continue; + inStar = true; + re += noEmpty && /^[*]+$/.test(glob2) ? starNoEmpty : star; + hasMagic = true; + continue; + } else { + inStar = false; + } if (c === "\\") { if (i === glob2.length - 1) { re += "\\\\"; @@ -117258,11 +117271,6 @@ var require_ast = __commonJS({ continue; } } - if (c === "*") { - re += noEmpty && glob2 === "*" ? starNoEmpty : star; - hasMagic = true; - continue; - } if (c === "?") { re += qmark; hasMagic = true; @@ -117422,7 +117430,7 @@ var require_commonjs20 = __commonJS({ if (options.nobrace || !/\{(?:(?!\{).)*\}/.test(pattern)) { return [pattern]; } - return (0, brace_expansion_1.expand)(pattern); + return (0, brace_expansion_1.expand)(pattern, { max: options.braceExpandMax }); }; exports2.braceExpand = braceExpand; exports2.minimatch.braceExpand = exports2.braceExpand; @@ -117466,7 +117474,8 @@ var require_commonjs20 = __commonJS({ this.pattern = pattern; this.platform = options.platform || defaultPlatform; this.isWindows = this.platform === "win32"; - this.windowsPathsNoEscape = !!options.windowsPathsNoEscape || options.allowWindowsEscape === false; + const awe = "allowWindowsEscape"; + this.windowsPathsNoEscape = !!options.windowsPathsNoEscape || options[awe] === false; if (this.windowsPathsNoEscape) { this.pattern = this.pattern.replace(/\\/g, "/"); } @@ -117523,7 +117532,10 @@ var require_commonjs20 = __commonJS({ const isUNC = s[0] === "" && s[1] === "" && (s[2] === "?" || !globMagic.test(s[2])) && !globMagic.test(s[3]); const isDrive = /^[a-z]:/i.test(s[0]); if (isUNC) { - return [...s.slice(0, 4), ...s.slice(4).map((ss) => this.parse(ss))]; + return [ + ...s.slice(0, 4), + ...s.slice(4).map((ss) => this.parse(ss)) + ]; } else if (isDrive) { return [s[0], ...s.slice(1).map((ss) => this.parse(ss))]; } @@ -117804,7 +117816,10 @@ var require_commonjs20 = __commonJS({ const fdi = fileUNC ? 3 : fileDrive ? 0 : void 0; const pdi = patternUNC ? 3 : patternDrive ? 0 : void 0; if (typeof fdi === "number" && typeof pdi === "number") { - const [fd, pd] = [file[fdi], pattern[pdi]]; + const [fd, pd] = [ + file[fdi], + pattern[pdi] + ]; if (fd.toLowerCase() === pd.toLowerCase()) { pattern[pdi] = fd; if (pdi > fdi) { diff --git a/lib/analyze-action.js b/lib/analyze-action.js index 806fd5c46..b5710b2a4 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -49518,6 +49518,7 @@ var require_minimatch = __commonJS({ re += c; continue; } + if (c === "*" && stateChar === "*") continue; self2.debug("call clearStateChar %j", stateChar); clearStateChar(); stateChar = c; diff --git a/lib/autobuild-action.js b/lib/autobuild-action.js index 03b8b56cd..490fd7a3d 100644 --- a/lib/autobuild-action.js +++ b/lib/autobuild-action.js @@ -49518,6 +49518,7 @@ var require_minimatch = __commonJS({ re += c; continue; } + if (c === "*" && stateChar === "*") continue; self2.debug("call clearStateChar %j", stateChar); clearStateChar(); stateChar = c; diff --git a/lib/init-action-post.js b/lib/init-action-post.js index bc1294485..50fcc0603 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -49518,6 +49518,7 @@ var require_minimatch = __commonJS({ re += c; continue; } + if (c === "*" && stateChar === "*") continue; self2.debug("call clearStateChar %j", stateChar); clearStateChar(); stateChar = c; @@ -103582,6 +103583,7 @@ var require_minimatch2 = __commonJS({ re += c; continue; } + if (c === "*" && stateChar === "*") continue; this.debug("call clearStateChar %j", stateChar); clearStateChar(); stateChar = c; @@ -116408,9 +116410,9 @@ var require_isPlainObject = __commonJS({ } }); -// node_modules/@isaacs/balanced-match/dist/commonjs/index.js +// node_modules/glob/node_modules/balanced-match/dist/commonjs/index.js var require_commonjs18 = __commonJS({ - "node_modules/@isaacs/balanced-match/dist/commonjs/index.js"(exports2) { + "node_modules/glob/node_modules/balanced-match/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.range = exports2.balanced = void 0; @@ -116470,9 +116472,9 @@ var require_commonjs18 = __commonJS({ } }); -// node_modules/@isaacs/brace-expansion/dist/commonjs/index.js +// node_modules/glob/node_modules/brace-expansion/dist/commonjs/index.js var require_commonjs19 = __commonJS({ - "node_modules/@isaacs/brace-expansion/dist/commonjs/index.js"(exports2) { + "node_modules/glob/node_modules/brace-expansion/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.EXPANSION_MAX = void 0; @@ -117233,6 +117235,7 @@ var require_ast = __commonJS({ let escaping = false; let re = ""; let uflag = false; + let inStar = false; for (let i = 0; i < glob2.length; i++) { const c = glob2.charAt(i); if (escaping) { @@ -117240,6 +117243,16 @@ var require_ast = __commonJS({ re += (reSpecials.has(c) ? "\\" : "") + c; continue; } + if (c === "*") { + if (inStar) + continue; + inStar = true; + re += noEmpty && /^[*]+$/.test(glob2) ? starNoEmpty : star; + hasMagic = true; + continue; + } else { + inStar = false; + } if (c === "\\") { if (i === glob2.length - 1) { re += "\\\\"; @@ -117258,11 +117271,6 @@ var require_ast = __commonJS({ continue; } } - if (c === "*") { - re += noEmpty && glob2 === "*" ? starNoEmpty : star; - hasMagic = true; - continue; - } if (c === "?") { re += qmark; hasMagic = true; @@ -117422,7 +117430,7 @@ var require_commonjs20 = __commonJS({ if (options.nobrace || !/\{(?:(?!\{).)*\}/.test(pattern)) { return [pattern]; } - return (0, brace_expansion_1.expand)(pattern); + return (0, brace_expansion_1.expand)(pattern, { max: options.braceExpandMax }); }; exports2.braceExpand = braceExpand; exports2.minimatch.braceExpand = exports2.braceExpand; @@ -117466,7 +117474,8 @@ var require_commonjs20 = __commonJS({ this.pattern = pattern; this.platform = options.platform || defaultPlatform; this.isWindows = this.platform === "win32"; - this.windowsPathsNoEscape = !!options.windowsPathsNoEscape || options.allowWindowsEscape === false; + const awe = "allowWindowsEscape"; + this.windowsPathsNoEscape = !!options.windowsPathsNoEscape || options[awe] === false; if (this.windowsPathsNoEscape) { this.pattern = this.pattern.replace(/\\/g, "/"); } @@ -117523,7 +117532,10 @@ var require_commonjs20 = __commonJS({ const isUNC = s[0] === "" && s[1] === "" && (s[2] === "?" || !globMagic.test(s[2])) && !globMagic.test(s[3]); const isDrive = /^[a-z]:/i.test(s[0]); if (isUNC) { - return [...s.slice(0, 4), ...s.slice(4).map((ss) => this.parse(ss))]; + return [ + ...s.slice(0, 4), + ...s.slice(4).map((ss) => this.parse(ss)) + ]; } else if (isDrive) { return [s[0], ...s.slice(1).map((ss) => this.parse(ss))]; } @@ -117804,7 +117816,10 @@ var require_commonjs20 = __commonJS({ const fdi = fileUNC ? 3 : fileDrive ? 0 : void 0; const pdi = patternUNC ? 3 : patternDrive ? 0 : void 0; if (typeof fdi === "number" && typeof pdi === "number") { - const [fd, pd] = [file[fdi], pattern[pdi]]; + const [fd, pd] = [ + file[fdi], + pattern[pdi] + ]; if (fd.toLowerCase() === pd.toLowerCase()) { pattern[pdi] = fd; if (pdi > fdi) { diff --git a/lib/init-action.js b/lib/init-action.js index 403b5cdc6..47202a0ba 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -49669,6 +49669,7 @@ var require_minimatch = __commonJS({ re += c; continue; } + if (c === "*" && stateChar === "*") continue; self2.debug("call clearStateChar %j", stateChar); clearStateChar(); stateChar = c; diff --git a/lib/resolve-environment-action.js b/lib/resolve-environment-action.js index 8aac361a3..4fbb72281 100644 --- a/lib/resolve-environment-action.js +++ b/lib/resolve-environment-action.js @@ -49518,6 +49518,7 @@ var require_minimatch = __commonJS({ re += c; continue; } + if (c === "*" && stateChar === "*") continue; self2.debug("call clearStateChar %j", stateChar); clearStateChar(); stateChar = c; diff --git a/lib/setup-codeql-action.js b/lib/setup-codeql-action.js index 6a521cc92..782051e06 100644 --- a/lib/setup-codeql-action.js +++ b/lib/setup-codeql-action.js @@ -48221,6 +48221,7 @@ var require_minimatch = __commonJS({ re += c; continue; } + if (c === "*" && stateChar === "*") continue; self2.debug("call clearStateChar %j", stateChar); clearStateChar(); stateChar = c; diff --git a/lib/start-proxy-action-post.js b/lib/start-proxy-action-post.js index afed44174..3d85eec2d 100644 --- a/lib/start-proxy-action-post.js +++ b/lib/start-proxy-action-post.js @@ -49518,6 +49518,7 @@ var require_minimatch = __commonJS({ re += c; continue; } + if (c === "*" && stateChar === "*") continue; self2.debug("call clearStateChar %j", stateChar); clearStateChar(); stateChar = c; @@ -102209,6 +102210,7 @@ var require_minimatch2 = __commonJS({ re += c; continue; } + if (c === "*" && stateChar === "*") continue; this.debug("call clearStateChar %j", stateChar); clearStateChar(); stateChar = c; @@ -115035,9 +115037,9 @@ var require_isPlainObject = __commonJS({ } }); -// node_modules/@isaacs/balanced-match/dist/commonjs/index.js +// node_modules/glob/node_modules/balanced-match/dist/commonjs/index.js var require_commonjs18 = __commonJS({ - "node_modules/@isaacs/balanced-match/dist/commonjs/index.js"(exports2) { + "node_modules/glob/node_modules/balanced-match/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.range = exports2.balanced = void 0; @@ -115097,9 +115099,9 @@ var require_commonjs18 = __commonJS({ } }); -// node_modules/@isaacs/brace-expansion/dist/commonjs/index.js +// node_modules/glob/node_modules/brace-expansion/dist/commonjs/index.js var require_commonjs19 = __commonJS({ - "node_modules/@isaacs/brace-expansion/dist/commonjs/index.js"(exports2) { + "node_modules/glob/node_modules/brace-expansion/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.EXPANSION_MAX = void 0; @@ -115860,6 +115862,7 @@ var require_ast = __commonJS({ let escaping = false; let re = ""; let uflag = false; + let inStar = false; for (let i = 0; i < glob2.length; i++) { const c = glob2.charAt(i); if (escaping) { @@ -115867,6 +115870,16 @@ var require_ast = __commonJS({ re += (reSpecials.has(c) ? "\\" : "") + c; continue; } + if (c === "*") { + if (inStar) + continue; + inStar = true; + re += noEmpty && /^[*]+$/.test(glob2) ? starNoEmpty : star; + hasMagic = true; + continue; + } else { + inStar = false; + } if (c === "\\") { if (i === glob2.length - 1) { re += "\\\\"; @@ -115885,11 +115898,6 @@ var require_ast = __commonJS({ continue; } } - if (c === "*") { - re += noEmpty && glob2 === "*" ? starNoEmpty : star; - hasMagic = true; - continue; - } if (c === "?") { re += qmark; hasMagic = true; @@ -116049,7 +116057,7 @@ var require_commonjs20 = __commonJS({ if (options.nobrace || !/\{(?:(?!\{).)*\}/.test(pattern)) { return [pattern]; } - return (0, brace_expansion_1.expand)(pattern); + return (0, brace_expansion_1.expand)(pattern, { max: options.braceExpandMax }); }; exports2.braceExpand = braceExpand; exports2.minimatch.braceExpand = exports2.braceExpand; @@ -116093,7 +116101,8 @@ var require_commonjs20 = __commonJS({ this.pattern = pattern; this.platform = options.platform || defaultPlatform; this.isWindows = this.platform === "win32"; - this.windowsPathsNoEscape = !!options.windowsPathsNoEscape || options.allowWindowsEscape === false; + const awe = "allowWindowsEscape"; + this.windowsPathsNoEscape = !!options.windowsPathsNoEscape || options[awe] === false; if (this.windowsPathsNoEscape) { this.pattern = this.pattern.replace(/\\/g, "/"); } @@ -116150,7 +116159,10 @@ var require_commonjs20 = __commonJS({ const isUNC = s[0] === "" && s[1] === "" && (s[2] === "?" || !globMagic.test(s[2])) && !globMagic.test(s[3]); const isDrive = /^[a-z]:/i.test(s[0]); if (isUNC) { - return [...s.slice(0, 4), ...s.slice(4).map((ss) => this.parse(ss))]; + return [ + ...s.slice(0, 4), + ...s.slice(4).map((ss) => this.parse(ss)) + ]; } else if (isDrive) { return [s[0], ...s.slice(1).map((ss) => this.parse(ss))]; } @@ -116431,7 +116443,10 @@ var require_commonjs20 = __commonJS({ const fdi = fileUNC ? 3 : fileDrive ? 0 : void 0; const pdi = patternUNC ? 3 : patternDrive ? 0 : void 0; if (typeof fdi === "number" && typeof pdi === "number") { - const [fd, pd] = [file[fdi], pattern[pdi]]; + const [fd, pd] = [ + file[fdi], + pattern[pdi] + ]; if (fd.toLowerCase() === pd.toLowerCase()) { pattern[pdi] = fd; if (pdi > fdi) { diff --git a/lib/start-proxy-action.js b/lib/start-proxy-action.js index 1f83e0a9f..75ce37a31 100644 --- a/lib/start-proxy-action.js +++ b/lib/start-proxy-action.js @@ -48221,6 +48221,7 @@ var require_minimatch = __commonJS({ re += c; continue; } + if (c === "*" && stateChar === "*") continue; self2.debug("call clearStateChar %j", stateChar); clearStateChar(); stateChar = c; diff --git a/lib/upload-lib.js b/lib/upload-lib.js index 01383883e..1f5ed3889 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -49518,6 +49518,7 @@ var require_minimatch = __commonJS({ re += c; continue; } + if (c === "*" && stateChar === "*") continue; self2.debug("call clearStateChar %j", stateChar); clearStateChar(); stateChar = c; diff --git a/lib/upload-sarif-action-post.js b/lib/upload-sarif-action-post.js index 67c09a211..1753662dc 100644 --- a/lib/upload-sarif-action-post.js +++ b/lib/upload-sarif-action-post.js @@ -94492,6 +94492,7 @@ var require_minimatch = __commonJS({ re += c; continue; } + if (c === "*" && stateChar === "*") continue; this.debug("call clearStateChar %j", stateChar); clearStateChar(); stateChar = c; @@ -107318,9 +107319,9 @@ var require_isPlainObject = __commonJS({ } }); -// node_modules/@isaacs/balanced-match/dist/commonjs/index.js +// node_modules/glob/node_modules/balanced-match/dist/commonjs/index.js var require_commonjs18 = __commonJS({ - "node_modules/@isaacs/balanced-match/dist/commonjs/index.js"(exports2) { + "node_modules/glob/node_modules/balanced-match/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.range = exports2.balanced = void 0; @@ -107380,9 +107381,9 @@ var require_commonjs18 = __commonJS({ } }); -// node_modules/@isaacs/brace-expansion/dist/commonjs/index.js +// node_modules/glob/node_modules/brace-expansion/dist/commonjs/index.js var require_commonjs19 = __commonJS({ - "node_modules/@isaacs/brace-expansion/dist/commonjs/index.js"(exports2) { + "node_modules/glob/node_modules/brace-expansion/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.EXPANSION_MAX = void 0; @@ -108143,6 +108144,7 @@ var require_ast = __commonJS({ let escaping = false; let re = ""; let uflag = false; + let inStar = false; for (let i = 0; i < glob2.length; i++) { const c = glob2.charAt(i); if (escaping) { @@ -108150,6 +108152,16 @@ var require_ast = __commonJS({ re += (reSpecials.has(c) ? "\\" : "") + c; continue; } + if (c === "*") { + if (inStar) + continue; + inStar = true; + re += noEmpty && /^[*]+$/.test(glob2) ? starNoEmpty : star; + hasMagic = true; + continue; + } else { + inStar = false; + } if (c === "\\") { if (i === glob2.length - 1) { re += "\\\\"; @@ -108168,11 +108180,6 @@ var require_ast = __commonJS({ continue; } } - if (c === "*") { - re += noEmpty && glob2 === "*" ? starNoEmpty : star; - hasMagic = true; - continue; - } if (c === "?") { re += qmark; hasMagic = true; @@ -108332,7 +108339,7 @@ var require_commonjs20 = __commonJS({ if (options.nobrace || !/\{(?:(?!\{).)*\}/.test(pattern)) { return [pattern]; } - return (0, brace_expansion_1.expand)(pattern); + return (0, brace_expansion_1.expand)(pattern, { max: options.braceExpandMax }); }; exports2.braceExpand = braceExpand; exports2.minimatch.braceExpand = exports2.braceExpand; @@ -108376,7 +108383,8 @@ var require_commonjs20 = __commonJS({ this.pattern = pattern; this.platform = options.platform || defaultPlatform; this.isWindows = this.platform === "win32"; - this.windowsPathsNoEscape = !!options.windowsPathsNoEscape || options.allowWindowsEscape === false; + const awe = "allowWindowsEscape"; + this.windowsPathsNoEscape = !!options.windowsPathsNoEscape || options[awe] === false; if (this.windowsPathsNoEscape) { this.pattern = this.pattern.replace(/\\/g, "/"); } @@ -108433,7 +108441,10 @@ var require_commonjs20 = __commonJS({ const isUNC = s[0] === "" && s[1] === "" && (s[2] === "?" || !globMagic.test(s[2])) && !globMagic.test(s[3]); const isDrive = /^[a-z]:/i.test(s[0]); if (isUNC) { - return [...s.slice(0, 4), ...s.slice(4).map((ss) => this.parse(ss))]; + return [ + ...s.slice(0, 4), + ...s.slice(4).map((ss) => this.parse(ss)) + ]; } else if (isDrive) { return [s[0], ...s.slice(1).map((ss) => this.parse(ss))]; } @@ -108714,7 +108725,10 @@ var require_commonjs20 = __commonJS({ const fdi = fileUNC ? 3 : fileDrive ? 0 : void 0; const pdi = patternUNC ? 3 : patternDrive ? 0 : void 0; if (typeof fdi === "number" && typeof pdi === "number") { - const [fd, pd] = [file[fdi], pattern[pdi]]; + const [fd, pd] = [ + file[fdi], + pattern[pdi] + ]; if (fd.toLowerCase() === pd.toLowerCase()) { pattern[pdi] = fd; if (pdi > fdi) { @@ -150931,6 +150945,7 @@ var require_minimatch2 = __commonJS({ re += c; continue; } + if (c === "*" && stateChar === "*") continue; self2.debug("call clearStateChar %j", stateChar); clearStateChar(); stateChar = c; diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index 34114e3ea..651623824 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -48221,6 +48221,7 @@ var require_minimatch = __commonJS({ re += c; continue; } + if (c === "*" && stateChar === "*") continue; self2.debug("call clearStateChar %j", stateChar); clearStateChar(); stateChar = c;