diff --git a/lib/analyze-action-post.js b/lib/analyze-action-post.js index a9b163bc1..bcc8753eb 100644 --- a/lib/analyze-action-post.js +++ b/lib/analyze-action-post.js @@ -25195,8 +25195,8 @@ var require_lt = __commonJS({ "node_modules/semver/functions/lt.js"(exports2, module2) { "use strict"; var compare = require_compare(); - var lt = (a, b, loose) => compare(a, b, loose) < 0; - module2.exports = lt; + var lt2 = (a, b, loose) => compare(a, b, loose) < 0; + module2.exports = lt2; } }); @@ -25248,7 +25248,7 @@ var require_cmp = __commonJS({ var neq = require_neq(); var gt = require_gt(); var gte5 = require_gte(); - var lt = require_lt(); + var lt2 = require_lt(); var lte = require_lte(); var cmp = (a, op, b, loose) => { switch (op) { @@ -25279,7 +25279,7 @@ var require_cmp = __commonJS({ case ">=": return gte5(a, b, loose); case "<": - return lt(a, b, loose); + return lt2(a, b, loose); case "<=": return lte(a, b, loose); default: @@ -26033,7 +26033,7 @@ var require_outside = __commonJS({ var Range2 = require_range(); var satisfies2 = require_satisfies(); var gt = require_gt(); - var lt = require_lt(); + var lt2 = require_lt(); var lte = require_lte(); var gte5 = require_gte(); var outside = (version, range, hilo, options) => { @@ -26044,12 +26044,12 @@ var require_outside = __commonJS({ case ">": gtfn = gt; ltefn = lte; - ltfn = lt; + ltfn = lt2; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt; + gtfn = lt2; ltefn = gte5; ltfn = gt; comp = "<"; @@ -26229,12 +26229,12 @@ var require_subset = __commonJS({ } } const eqSet = /* @__PURE__ */ new Set(); - let gt, lt; + let gt, lt2; for (const c of sub) { if (c.operator === ">" || c.operator === ">=") { gt = higherGT(gt, c, options); } else if (c.operator === "<" || c.operator === "<=") { - lt = lowerLT(lt, c, options); + lt2 = lowerLT(lt2, c, options); } else { eqSet.add(c.semver); } @@ -26243,11 +26243,11 @@ var require_subset = __commonJS({ return null; } let gtltComp; - if (gt && lt) { - gtltComp = compare(gt.semver, lt.semver, options); + if (gt && lt2) { + gtltComp = compare(gt.semver, lt2.semver, options); if (gtltComp > 0) { return null; - } else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) { + } else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) { return null; } } @@ -26255,7 +26255,7 @@ var require_subset = __commonJS({ if (gt && !satisfies2(eq, String(gt), options)) { return null; } - if (lt && !satisfies2(eq, String(lt), options)) { + if (lt2 && !satisfies2(eq, String(lt2), options)) { return null; } for (const c of dom) { @@ -26267,9 +26267,9 @@ var require_subset = __commonJS({ } let higher, lower; let hasDomLT, hasDomGT; - let needDomLTPre = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.semver : false; + let needDomLTPre = lt2 && !options.includePrerelease && lt2.semver.prerelease.length ? lt2.semver : false; let needDomGTPre = gt && !options.includePrerelease && gt.semver.prerelease.length ? gt.semver : false; - if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) { + if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt2.operator === "<" && needDomLTPre.prerelease[0] === 0) { needDomLTPre = false; } for (const c of dom) { @@ -26290,29 +26290,29 @@ var require_subset = __commonJS({ return false; } } - if (lt) { + if (lt2) { if (needDomLTPre) { if (c.semver.prerelease && c.semver.prerelease.length && c.semver.major === needDomLTPre.major && c.semver.minor === needDomLTPre.minor && c.semver.patch === needDomLTPre.patch) { needDomLTPre = false; } } if (c.operator === "<" || c.operator === "<=") { - lower = lowerLT(lt, c, options); - if (lower === c && lower !== lt) { + lower = lowerLT(lt2, c, options); + if (lower === c && lower !== lt2) { return false; } - } else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) { + } else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) { return false; } } - if (!c.operator && (lt || gt) && gtltComp !== 0) { + if (!c.operator && (lt2 || gt) && gtltComp !== 0) { return false; } } - if (gt && hasDomLT && !lt && gtltComp !== 0) { + if (gt && hasDomLT && !lt2 && gtltComp !== 0) { return false; } - if (lt && hasDomGT && !gt && gtltComp !== 0) { + if (lt2 && hasDomGT && !gt && gtltComp !== 0) { return false; } if (needDomGTPre || needDomLTPre) { @@ -26362,7 +26362,7 @@ var require_semver2 = __commonJS({ var sort = require_sort(); var rsort = require_rsort(); var gt = require_gt(); - var lt = require_lt(); + var lt2 = require_lt(); var eq = require_eq(); var neq = require_neq(); var gte5 = require_gte(); @@ -26400,7 +26400,7 @@ var require_semver2 = __commonJS({ sort, rsort, gt, - lt, + lt: lt2, eq, neq, gte: gte5, @@ -30295,8 +30295,8 @@ var require_semver3 = __commonJS({ function gt(a, b, loose) { return compare(a, b, loose) > 0; } - exports2.lt = lt; - function lt(a, b, loose) { + exports2.lt = lt2; + function lt2(a, b, loose) { return compare(a, b, loose) < 0; } exports2.eq = eq; @@ -30341,7 +30341,7 @@ var require_semver3 = __commonJS({ case ">=": return gte5(a, b, loose); case "<": - return lt(a, b, loose); + return lt2(a, b, loose); case "<=": return lte(a, b, loose); default: @@ -30878,12 +30878,12 @@ var require_semver3 = __commonJS({ case ">": gtfn = gt; ltefn = lte; - ltfn = lt; + ltfn = lt2; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt; + gtfn = lt2; ltefn = gte5; ltfn = gt; comp = "<"; diff --git a/lib/analyze-action.js b/lib/analyze-action.js index c2788900b..6951aaef0 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -31044,8 +31044,8 @@ var require_lt = __commonJS({ "node_modules/semver/functions/lt.js"(exports2, module2) { "use strict"; var compare2 = require_compare(); - var lt = (a, b, loose) => compare2(a, b, loose) < 0; - module2.exports = lt; + var lt2 = (a, b, loose) => compare2(a, b, loose) < 0; + module2.exports = lt2; } }); @@ -31097,7 +31097,7 @@ var require_cmp = __commonJS({ var neq = require_neq(); var gt = require_gt(); var gte5 = require_gte(); - var lt = require_lt(); + var lt2 = require_lt(); var lte = require_lte(); var cmp = (a, op, b, loose) => { switch (op) { @@ -31128,7 +31128,7 @@ var require_cmp = __commonJS({ case ">=": return gte5(a, b, loose); case "<": - return lt(a, b, loose); + return lt2(a, b, loose); case "<=": return lte(a, b, loose); default: @@ -31882,7 +31882,7 @@ var require_outside = __commonJS({ var Range2 = require_range(); var satisfies2 = require_satisfies(); var gt = require_gt(); - var lt = require_lt(); + var lt2 = require_lt(); var lte = require_lte(); var gte5 = require_gte(); var outside = (version, range, hilo, options) => { @@ -31893,12 +31893,12 @@ var require_outside = __commonJS({ case ">": gtfn = gt; ltefn = lte; - ltfn = lt; + ltfn = lt2; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt; + gtfn = lt2; ltefn = gte5; ltfn = gt; comp = "<"; @@ -32078,12 +32078,12 @@ var require_subset = __commonJS({ } } const eqSet = /* @__PURE__ */ new Set(); - let gt, lt; + let gt, lt2; for (const c of sub) { if (c.operator === ">" || c.operator === ">=") { gt = higherGT(gt, c, options); } else if (c.operator === "<" || c.operator === "<=") { - lt = lowerLT(lt, c, options); + lt2 = lowerLT(lt2, c, options); } else { eqSet.add(c.semver); } @@ -32092,11 +32092,11 @@ var require_subset = __commonJS({ return null; } let gtltComp; - if (gt && lt) { - gtltComp = compare2(gt.semver, lt.semver, options); + if (gt && lt2) { + gtltComp = compare2(gt.semver, lt2.semver, options); if (gtltComp > 0) { return null; - } else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) { + } else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) { return null; } } @@ -32104,7 +32104,7 @@ var require_subset = __commonJS({ if (gt && !satisfies2(eq, String(gt), options)) { return null; } - if (lt && !satisfies2(eq, String(lt), options)) { + if (lt2 && !satisfies2(eq, String(lt2), options)) { return null; } for (const c of dom) { @@ -32116,9 +32116,9 @@ var require_subset = __commonJS({ } let higher, lower; let hasDomLT, hasDomGT; - let needDomLTPre = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.semver : false; + let needDomLTPre = lt2 && !options.includePrerelease && lt2.semver.prerelease.length ? lt2.semver : false; let needDomGTPre = gt && !options.includePrerelease && gt.semver.prerelease.length ? gt.semver : false; - if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) { + if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt2.operator === "<" && needDomLTPre.prerelease[0] === 0) { needDomLTPre = false; } for (const c of dom) { @@ -32139,29 +32139,29 @@ var require_subset = __commonJS({ return false; } } - if (lt) { + if (lt2) { if (needDomLTPre) { if (c.semver.prerelease && c.semver.prerelease.length && c.semver.major === needDomLTPre.major && c.semver.minor === needDomLTPre.minor && c.semver.patch === needDomLTPre.patch) { needDomLTPre = false; } } if (c.operator === "<" || c.operator === "<=") { - lower = lowerLT(lt, c, options); - if (lower === c && lower !== lt) { + lower = lowerLT(lt2, c, options); + if (lower === c && lower !== lt2) { return false; } - } else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) { + } else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) { return false; } } - if (!c.operator && (lt || gt) && gtltComp !== 0) { + if (!c.operator && (lt2 || gt) && gtltComp !== 0) { return false; } } - if (gt && hasDomLT && !lt && gtltComp !== 0) { + if (gt && hasDomLT && !lt2 && gtltComp !== 0) { return false; } - if (lt && hasDomGT && !gt && gtltComp !== 0) { + if (lt2 && hasDomGT && !gt && gtltComp !== 0) { return false; } if (needDomGTPre || needDomLTPre) { @@ -32211,7 +32211,7 @@ var require_semver2 = __commonJS({ var sort = require_sort(); var rsort = require_rsort(); var gt = require_gt(); - var lt = require_lt(); + var lt2 = require_lt(); var eq = require_eq(); var neq = require_neq(); var gte5 = require_gte(); @@ -32249,7 +32249,7 @@ var require_semver2 = __commonJS({ sort, rsort, gt, - lt, + lt: lt2, eq, neq, gte: gte5, @@ -36144,8 +36144,8 @@ var require_semver3 = __commonJS({ function gt(a, b, loose) { return compare2(a, b, loose) > 0; } - exports2.lt = lt; - function lt(a, b, loose) { + exports2.lt = lt2; + function lt2(a, b, loose) { return compare2(a, b, loose) < 0; } exports2.eq = eq; @@ -36190,7 +36190,7 @@ var require_semver3 = __commonJS({ case ">=": return gte5(a, b, loose); case "<": - return lt(a, b, loose); + return lt2(a, b, loose); case "<=": return lte(a, b, loose); default: @@ -36727,12 +36727,12 @@ var require_semver3 = __commonJS({ case ">": gtfn = gt; ltefn = lte; - ltfn = lt; + ltfn = lt2; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt; + gtfn = lt2; ltefn = gte5; ltfn = gt; comp = "<"; diff --git a/lib/autobuild-action.js b/lib/autobuild-action.js index 4cde47d65..3f5c70551 100644 --- a/lib/autobuild-action.js +++ b/lib/autobuild-action.js @@ -25195,8 +25195,8 @@ var require_lt = __commonJS({ "node_modules/semver/functions/lt.js"(exports2, module2) { "use strict"; var compare = require_compare(); - var lt = (a, b, loose) => compare(a, b, loose) < 0; - module2.exports = lt; + var lt2 = (a, b, loose) => compare(a, b, loose) < 0; + module2.exports = lt2; } }); @@ -25248,7 +25248,7 @@ var require_cmp = __commonJS({ var neq = require_neq(); var gt = require_gt(); var gte5 = require_gte(); - var lt = require_lt(); + var lt2 = require_lt(); var lte = require_lte(); var cmp = (a, op, b, loose) => { switch (op) { @@ -25279,7 +25279,7 @@ var require_cmp = __commonJS({ case ">=": return gte5(a, b, loose); case "<": - return lt(a, b, loose); + return lt2(a, b, loose); case "<=": return lte(a, b, loose); default: @@ -26033,7 +26033,7 @@ var require_outside = __commonJS({ var Range2 = require_range(); var satisfies2 = require_satisfies(); var gt = require_gt(); - var lt = require_lt(); + var lt2 = require_lt(); var lte = require_lte(); var gte5 = require_gte(); var outside = (version, range, hilo, options) => { @@ -26044,12 +26044,12 @@ var require_outside = __commonJS({ case ">": gtfn = gt; ltefn = lte; - ltfn = lt; + ltfn = lt2; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt; + gtfn = lt2; ltefn = gte5; ltfn = gt; comp = "<"; @@ -26229,12 +26229,12 @@ var require_subset = __commonJS({ } } const eqSet = /* @__PURE__ */ new Set(); - let gt, lt; + let gt, lt2; for (const c of sub) { if (c.operator === ">" || c.operator === ">=") { gt = higherGT(gt, c, options); } else if (c.operator === "<" || c.operator === "<=") { - lt = lowerLT(lt, c, options); + lt2 = lowerLT(lt2, c, options); } else { eqSet.add(c.semver); } @@ -26243,11 +26243,11 @@ var require_subset = __commonJS({ return null; } let gtltComp; - if (gt && lt) { - gtltComp = compare(gt.semver, lt.semver, options); + if (gt && lt2) { + gtltComp = compare(gt.semver, lt2.semver, options); if (gtltComp > 0) { return null; - } else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) { + } else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) { return null; } } @@ -26255,7 +26255,7 @@ var require_subset = __commonJS({ if (gt && !satisfies2(eq, String(gt), options)) { return null; } - if (lt && !satisfies2(eq, String(lt), options)) { + if (lt2 && !satisfies2(eq, String(lt2), options)) { return null; } for (const c of dom) { @@ -26267,9 +26267,9 @@ var require_subset = __commonJS({ } let higher, lower; let hasDomLT, hasDomGT; - let needDomLTPre = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.semver : false; + let needDomLTPre = lt2 && !options.includePrerelease && lt2.semver.prerelease.length ? lt2.semver : false; let needDomGTPre = gt && !options.includePrerelease && gt.semver.prerelease.length ? gt.semver : false; - if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) { + if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt2.operator === "<" && needDomLTPre.prerelease[0] === 0) { needDomLTPre = false; } for (const c of dom) { @@ -26290,29 +26290,29 @@ var require_subset = __commonJS({ return false; } } - if (lt) { + if (lt2) { if (needDomLTPre) { if (c.semver.prerelease && c.semver.prerelease.length && c.semver.major === needDomLTPre.major && c.semver.minor === needDomLTPre.minor && c.semver.patch === needDomLTPre.patch) { needDomLTPre = false; } } if (c.operator === "<" || c.operator === "<=") { - lower = lowerLT(lt, c, options); - if (lower === c && lower !== lt) { + lower = lowerLT(lt2, c, options); + if (lower === c && lower !== lt2) { return false; } - } else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) { + } else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) { return false; } } - if (!c.operator && (lt || gt) && gtltComp !== 0) { + if (!c.operator && (lt2 || gt) && gtltComp !== 0) { return false; } } - if (gt && hasDomLT && !lt && gtltComp !== 0) { + if (gt && hasDomLT && !lt2 && gtltComp !== 0) { return false; } - if (lt && hasDomGT && !gt && gtltComp !== 0) { + if (lt2 && hasDomGT && !gt && gtltComp !== 0) { return false; } if (needDomGTPre || needDomLTPre) { @@ -26362,7 +26362,7 @@ var require_semver2 = __commonJS({ var sort = require_sort(); var rsort = require_rsort(); var gt = require_gt(); - var lt = require_lt(); + var lt2 = require_lt(); var eq = require_eq(); var neq = require_neq(); var gte5 = require_gte(); @@ -26400,7 +26400,7 @@ var require_semver2 = __commonJS({ sort, rsort, gt, - lt, + lt: lt2, eq, neq, gte: gte5, @@ -30295,8 +30295,8 @@ var require_semver3 = __commonJS({ function gt(a, b, loose) { return compare(a, b, loose) > 0; } - exports2.lt = lt; - function lt(a, b, loose) { + exports2.lt = lt2; + function lt2(a, b, loose) { return compare(a, b, loose) < 0; } exports2.eq = eq; @@ -30341,7 +30341,7 @@ var require_semver3 = __commonJS({ case ">=": return gte5(a, b, loose); case "<": - return lt(a, b, loose); + return lt2(a, b, loose); case "<=": return lte(a, b, loose); default: @@ -30878,12 +30878,12 @@ var require_semver3 = __commonJS({ case ">": gtfn = gt; ltefn = lte; - ltfn = lt; + ltfn = lt2; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt; + gtfn = lt2; ltefn = gte5; ltfn = gt; comp = "<"; diff --git a/lib/init-action-post.js b/lib/init-action-post.js index e138420a3..def7116e4 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -31044,8 +31044,8 @@ var require_lt = __commonJS({ "node_modules/semver/functions/lt.js"(exports2, module2) { "use strict"; var compare2 = require_compare(); - var lt = (a, b, loose) => compare2(a, b, loose) < 0; - module2.exports = lt; + var lt2 = (a, b, loose) => compare2(a, b, loose) < 0; + module2.exports = lt2; } }); @@ -31097,7 +31097,7 @@ var require_cmp = __commonJS({ var neq = require_neq(); var gt = require_gt(); var gte5 = require_gte(); - var lt = require_lt(); + var lt2 = require_lt(); var lte = require_lte(); var cmp = (a, op, b, loose) => { switch (op) { @@ -31128,7 +31128,7 @@ var require_cmp = __commonJS({ case ">=": return gte5(a, b, loose); case "<": - return lt(a, b, loose); + return lt2(a, b, loose); case "<=": return lte(a, b, loose); default: @@ -31882,7 +31882,7 @@ var require_outside = __commonJS({ var Range2 = require_range(); var satisfies2 = require_satisfies(); var gt = require_gt(); - var lt = require_lt(); + var lt2 = require_lt(); var lte = require_lte(); var gte5 = require_gte(); var outside = (version, range, hilo, options) => { @@ -31893,12 +31893,12 @@ var require_outside = __commonJS({ case ">": gtfn = gt; ltefn = lte; - ltfn = lt; + ltfn = lt2; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt; + gtfn = lt2; ltefn = gte5; ltfn = gt; comp = "<"; @@ -32078,12 +32078,12 @@ var require_subset = __commonJS({ } } const eqSet = /* @__PURE__ */ new Set(); - let gt, lt; + let gt, lt2; for (const c of sub) { if (c.operator === ">" || c.operator === ">=") { gt = higherGT(gt, c, options); } else if (c.operator === "<" || c.operator === "<=") { - lt = lowerLT(lt, c, options); + lt2 = lowerLT(lt2, c, options); } else { eqSet.add(c.semver); } @@ -32092,11 +32092,11 @@ var require_subset = __commonJS({ return null; } let gtltComp; - if (gt && lt) { - gtltComp = compare2(gt.semver, lt.semver, options); + if (gt && lt2) { + gtltComp = compare2(gt.semver, lt2.semver, options); if (gtltComp > 0) { return null; - } else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) { + } else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) { return null; } } @@ -32104,7 +32104,7 @@ var require_subset = __commonJS({ if (gt && !satisfies2(eq, String(gt), options)) { return null; } - if (lt && !satisfies2(eq, String(lt), options)) { + if (lt2 && !satisfies2(eq, String(lt2), options)) { return null; } for (const c of dom) { @@ -32116,9 +32116,9 @@ var require_subset = __commonJS({ } let higher, lower; let hasDomLT, hasDomGT; - let needDomLTPre = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.semver : false; + let needDomLTPre = lt2 && !options.includePrerelease && lt2.semver.prerelease.length ? lt2.semver : false; let needDomGTPre = gt && !options.includePrerelease && gt.semver.prerelease.length ? gt.semver : false; - if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) { + if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt2.operator === "<" && needDomLTPre.prerelease[0] === 0) { needDomLTPre = false; } for (const c of dom) { @@ -32139,29 +32139,29 @@ var require_subset = __commonJS({ return false; } } - if (lt) { + if (lt2) { if (needDomLTPre) { if (c.semver.prerelease && c.semver.prerelease.length && c.semver.major === needDomLTPre.major && c.semver.minor === needDomLTPre.minor && c.semver.patch === needDomLTPre.patch) { needDomLTPre = false; } } if (c.operator === "<" || c.operator === "<=") { - lower = lowerLT(lt, c, options); - if (lower === c && lower !== lt) { + lower = lowerLT(lt2, c, options); + if (lower === c && lower !== lt2) { return false; } - } else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) { + } else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) { return false; } } - if (!c.operator && (lt || gt) && gtltComp !== 0) { + if (!c.operator && (lt2 || gt) && gtltComp !== 0) { return false; } } - if (gt && hasDomLT && !lt && gtltComp !== 0) { + if (gt && hasDomLT && !lt2 && gtltComp !== 0) { return false; } - if (lt && hasDomGT && !gt && gtltComp !== 0) { + if (lt2 && hasDomGT && !gt && gtltComp !== 0) { return false; } if (needDomGTPre || needDomLTPre) { @@ -32211,7 +32211,7 @@ var require_semver2 = __commonJS({ var sort = require_sort(); var rsort = require_rsort(); var gt = require_gt(); - var lt = require_lt(); + var lt2 = require_lt(); var eq = require_eq(); var neq = require_neq(); var gte5 = require_gte(); @@ -32249,7 +32249,7 @@ var require_semver2 = __commonJS({ sort, rsort, gt, - lt, + lt: lt2, eq, neq, gte: gte5, @@ -36144,8 +36144,8 @@ var require_semver3 = __commonJS({ function gt(a, b, loose) { return compare2(a, b, loose) > 0; } - exports2.lt = lt; - function lt(a, b, loose) { + exports2.lt = lt2; + function lt2(a, b, loose) { return compare2(a, b, loose) < 0; } exports2.eq = eq; @@ -36190,7 +36190,7 @@ var require_semver3 = __commonJS({ case ">=": return gte5(a, b, loose); case "<": - return lt(a, b, loose); + return lt2(a, b, loose); case "<=": return lte(a, b, loose); default: @@ -36727,12 +36727,12 @@ var require_semver3 = __commonJS({ case ">": gtfn = gt; ltefn = lte; - ltfn = lt; + ltfn = lt2; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt; + gtfn = lt2; ltefn = gte5; ltfn = gt; comp = "<"; diff --git a/lib/init-action.js b/lib/init-action.js index 2f509ad0e..42e063aad 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -20486,8 +20486,8 @@ var require_lt = __commonJS({ "node_modules/semver/functions/lt.js"(exports2, module2) { "use strict"; var compare = require_compare(); - var lt2 = (a, b, loose) => compare(a, b, loose) < 0; - module2.exports = lt2; + var lt3 = (a, b, loose) => compare(a, b, loose) < 0; + module2.exports = lt3; } }); @@ -20539,7 +20539,7 @@ var require_cmp = __commonJS({ var neq = require_neq(); var gt = require_gt(); var gte5 = require_gte(); - var lt2 = require_lt(); + var lt3 = require_lt(); var lte = require_lte(); var cmp = (a, op, b, loose) => { switch (op) { @@ -20570,7 +20570,7 @@ var require_cmp = __commonJS({ case ">=": return gte5(a, b, loose); case "<": - return lt2(a, b, loose); + return lt3(a, b, loose); case "<=": return lte(a, b, loose); default: @@ -21324,7 +21324,7 @@ var require_outside = __commonJS({ var Range2 = require_range(); var satisfies2 = require_satisfies(); var gt = require_gt(); - var lt2 = require_lt(); + var lt3 = require_lt(); var lte = require_lte(); var gte5 = require_gte(); var outside = (version, range, hilo, options) => { @@ -21335,12 +21335,12 @@ var require_outside = __commonJS({ case ">": gtfn = gt; ltefn = lte; - ltfn = lt2; + ltfn = lt3; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt2; + gtfn = lt3; ltefn = gte5; ltfn = gt; comp = "<"; @@ -21520,12 +21520,12 @@ var require_subset = __commonJS({ } } const eqSet = /* @__PURE__ */ new Set(); - let gt, lt2; + let gt, lt3; for (const c of sub) { if (c.operator === ">" || c.operator === ">=") { gt = higherGT(gt, c, options); } else if (c.operator === "<" || c.operator === "<=") { - lt2 = lowerLT(lt2, c, options); + lt3 = lowerLT(lt3, c, options); } else { eqSet.add(c.semver); } @@ -21534,11 +21534,11 @@ var require_subset = __commonJS({ return null; } let gtltComp; - if (gt && lt2) { - gtltComp = compare(gt.semver, lt2.semver, options); + if (gt && lt3) { + gtltComp = compare(gt.semver, lt3.semver, options); if (gtltComp > 0) { return null; - } else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) { + } else if (gtltComp === 0 && (gt.operator !== ">=" || lt3.operator !== "<=")) { return null; } } @@ -21546,7 +21546,7 @@ var require_subset = __commonJS({ if (gt && !satisfies2(eq, String(gt), options)) { return null; } - if (lt2 && !satisfies2(eq, String(lt2), options)) { + if (lt3 && !satisfies2(eq, String(lt3), options)) { return null; } for (const c of dom) { @@ -21558,9 +21558,9 @@ var require_subset = __commonJS({ } let higher, lower; let hasDomLT, hasDomGT; - let needDomLTPre = lt2 && !options.includePrerelease && lt2.semver.prerelease.length ? lt2.semver : false; + let needDomLTPre = lt3 && !options.includePrerelease && lt3.semver.prerelease.length ? lt3.semver : false; let needDomGTPre = gt && !options.includePrerelease && gt.semver.prerelease.length ? gt.semver : false; - if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt2.operator === "<" && needDomLTPre.prerelease[0] === 0) { + if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt3.operator === "<" && needDomLTPre.prerelease[0] === 0) { needDomLTPre = false; } for (const c of dom) { @@ -21581,29 +21581,29 @@ var require_subset = __commonJS({ return false; } } - if (lt2) { + if (lt3) { if (needDomLTPre) { if (c.semver.prerelease && c.semver.prerelease.length && c.semver.major === needDomLTPre.major && c.semver.minor === needDomLTPre.minor && c.semver.patch === needDomLTPre.patch) { needDomLTPre = false; } } if (c.operator === "<" || c.operator === "<=") { - lower = lowerLT(lt2, c, options); - if (lower === c && lower !== lt2) { + lower = lowerLT(lt3, c, options); + if (lower === c && lower !== lt3) { return false; } - } else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) { + } else if (lt3.operator === "<=" && !satisfies2(lt3.semver, String(c), options)) { return false; } } - if (!c.operator && (lt2 || gt) && gtltComp !== 0) { + if (!c.operator && (lt3 || gt) && gtltComp !== 0) { return false; } } - if (gt && hasDomLT && !lt2 && gtltComp !== 0) { + if (gt && hasDomLT && !lt3 && gtltComp !== 0) { return false; } - if (lt2 && hasDomGT && !gt && gtltComp !== 0) { + if (lt3 && hasDomGT && !gt && gtltComp !== 0) { return false; } if (needDomGTPre || needDomLTPre) { @@ -21653,7 +21653,7 @@ var require_semver2 = __commonJS({ var sort = require_sort(); var rsort = require_rsort(); var gt = require_gt(); - var lt2 = require_lt(); + var lt3 = require_lt(); var eq = require_eq(); var neq = require_neq(); var gte5 = require_gte(); @@ -21691,7 +21691,7 @@ var require_semver2 = __commonJS({ sort, rsort, gt, - lt: lt2, + lt: lt3, eq, neq, gte: gte5, @@ -36144,8 +36144,8 @@ var require_semver3 = __commonJS({ function gt(a, b, loose) { return compare(a, b, loose) > 0; } - exports2.lt = lt2; - function lt2(a, b, loose) { + exports2.lt = lt3; + function lt3(a, b, loose) { return compare(a, b, loose) < 0; } exports2.eq = eq; @@ -36190,7 +36190,7 @@ var require_semver3 = __commonJS({ case ">=": return gte5(a, b, loose); case "<": - return lt2(a, b, loose); + return lt3(a, b, loose); case "<=": return lte(a, b, loose); default: @@ -36727,12 +36727,12 @@ var require_semver3 = __commonJS({ case ">": gtfn = gt; ltefn = lte; - ltfn = lt2; + ltfn = lt3; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt2; + gtfn = lt3; ltefn = gte5; ltfn = gt; comp = "<"; diff --git a/lib/resolve-environment-action.js b/lib/resolve-environment-action.js index 67cb394e7..2a9c4102b 100644 --- a/lib/resolve-environment-action.js +++ b/lib/resolve-environment-action.js @@ -25195,8 +25195,8 @@ var require_lt = __commonJS({ "node_modules/semver/functions/lt.js"(exports2, module2) { "use strict"; var compare = require_compare(); - var lt = (a, b, loose) => compare(a, b, loose) < 0; - module2.exports = lt; + var lt2 = (a, b, loose) => compare(a, b, loose) < 0; + module2.exports = lt2; } }); @@ -25248,7 +25248,7 @@ var require_cmp = __commonJS({ var neq = require_neq(); var gt = require_gt(); var gte5 = require_gte(); - var lt = require_lt(); + var lt2 = require_lt(); var lte = require_lte(); var cmp = (a, op, b, loose) => { switch (op) { @@ -25279,7 +25279,7 @@ var require_cmp = __commonJS({ case ">=": return gte5(a, b, loose); case "<": - return lt(a, b, loose); + return lt2(a, b, loose); case "<=": return lte(a, b, loose); default: @@ -26033,7 +26033,7 @@ var require_outside = __commonJS({ var Range2 = require_range(); var satisfies2 = require_satisfies(); var gt = require_gt(); - var lt = require_lt(); + var lt2 = require_lt(); var lte = require_lte(); var gte5 = require_gte(); var outside = (version, range, hilo, options) => { @@ -26044,12 +26044,12 @@ var require_outside = __commonJS({ case ">": gtfn = gt; ltefn = lte; - ltfn = lt; + ltfn = lt2; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt; + gtfn = lt2; ltefn = gte5; ltfn = gt; comp = "<"; @@ -26229,12 +26229,12 @@ var require_subset = __commonJS({ } } const eqSet = /* @__PURE__ */ new Set(); - let gt, lt; + let gt, lt2; for (const c of sub) { if (c.operator === ">" || c.operator === ">=") { gt = higherGT(gt, c, options); } else if (c.operator === "<" || c.operator === "<=") { - lt = lowerLT(lt, c, options); + lt2 = lowerLT(lt2, c, options); } else { eqSet.add(c.semver); } @@ -26243,11 +26243,11 @@ var require_subset = __commonJS({ return null; } let gtltComp; - if (gt && lt) { - gtltComp = compare(gt.semver, lt.semver, options); + if (gt && lt2) { + gtltComp = compare(gt.semver, lt2.semver, options); if (gtltComp > 0) { return null; - } else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) { + } else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) { return null; } } @@ -26255,7 +26255,7 @@ var require_subset = __commonJS({ if (gt && !satisfies2(eq, String(gt), options)) { return null; } - if (lt && !satisfies2(eq, String(lt), options)) { + if (lt2 && !satisfies2(eq, String(lt2), options)) { return null; } for (const c of dom) { @@ -26267,9 +26267,9 @@ var require_subset = __commonJS({ } let higher, lower; let hasDomLT, hasDomGT; - let needDomLTPre = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.semver : false; + let needDomLTPre = lt2 && !options.includePrerelease && lt2.semver.prerelease.length ? lt2.semver : false; let needDomGTPre = gt && !options.includePrerelease && gt.semver.prerelease.length ? gt.semver : false; - if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) { + if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt2.operator === "<" && needDomLTPre.prerelease[0] === 0) { needDomLTPre = false; } for (const c of dom) { @@ -26290,29 +26290,29 @@ var require_subset = __commonJS({ return false; } } - if (lt) { + if (lt2) { if (needDomLTPre) { if (c.semver.prerelease && c.semver.prerelease.length && c.semver.major === needDomLTPre.major && c.semver.minor === needDomLTPre.minor && c.semver.patch === needDomLTPre.patch) { needDomLTPre = false; } } if (c.operator === "<" || c.operator === "<=") { - lower = lowerLT(lt, c, options); - if (lower === c && lower !== lt) { + lower = lowerLT(lt2, c, options); + if (lower === c && lower !== lt2) { return false; } - } else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) { + } else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) { return false; } } - if (!c.operator && (lt || gt) && gtltComp !== 0) { + if (!c.operator && (lt2 || gt) && gtltComp !== 0) { return false; } } - if (gt && hasDomLT && !lt && gtltComp !== 0) { + if (gt && hasDomLT && !lt2 && gtltComp !== 0) { return false; } - if (lt && hasDomGT && !gt && gtltComp !== 0) { + if (lt2 && hasDomGT && !gt && gtltComp !== 0) { return false; } if (needDomGTPre || needDomLTPre) { @@ -26362,7 +26362,7 @@ var require_semver2 = __commonJS({ var sort = require_sort(); var rsort = require_rsort(); var gt = require_gt(); - var lt = require_lt(); + var lt2 = require_lt(); var eq = require_eq(); var neq = require_neq(); var gte5 = require_gte(); @@ -26400,7 +26400,7 @@ var require_semver2 = __commonJS({ sort, rsort, gt, - lt, + lt: lt2, eq, neq, gte: gte5, @@ -30295,8 +30295,8 @@ var require_semver3 = __commonJS({ function gt(a, b, loose) { return compare(a, b, loose) > 0; } - exports2.lt = lt; - function lt(a, b, loose) { + exports2.lt = lt2; + function lt2(a, b, loose) { return compare(a, b, loose) < 0; } exports2.eq = eq; @@ -30341,7 +30341,7 @@ var require_semver3 = __commonJS({ case ">=": return gte5(a, b, loose); case "<": - return lt(a, b, loose); + return lt2(a, b, loose); case "<=": return lte(a, b, loose); default: @@ -30878,12 +30878,12 @@ var require_semver3 = __commonJS({ case ">": gtfn = gt; ltefn = lte; - ltfn = lt; + ltfn = lt2; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt; + gtfn = lt2; ltefn = gte5; ltfn = gt; comp = "<"; diff --git a/lib/start-proxy-action-post.js b/lib/start-proxy-action-post.js index a52eadfc5..d9a7163ae 100644 --- a/lib/start-proxy-action-post.js +++ b/lib/start-proxy-action-post.js @@ -25195,8 +25195,8 @@ var require_lt = __commonJS({ "node_modules/semver/functions/lt.js"(exports2, module2) { "use strict"; var compare = require_compare(); - var lt = (a, b, loose) => compare(a, b, loose) < 0; - module2.exports = lt; + var lt2 = (a, b, loose) => compare(a, b, loose) < 0; + module2.exports = lt2; } }); @@ -25248,7 +25248,7 @@ var require_cmp = __commonJS({ var neq = require_neq(); var gt = require_gt(); var gte5 = require_gte(); - var lt = require_lt(); + var lt2 = require_lt(); var lte = require_lte(); var cmp = (a, op, b, loose) => { switch (op) { @@ -25279,7 +25279,7 @@ var require_cmp = __commonJS({ case ">=": return gte5(a, b, loose); case "<": - return lt(a, b, loose); + return lt2(a, b, loose); case "<=": return lte(a, b, loose); default: @@ -26033,7 +26033,7 @@ var require_outside = __commonJS({ var Range2 = require_range(); var satisfies2 = require_satisfies(); var gt = require_gt(); - var lt = require_lt(); + var lt2 = require_lt(); var lte = require_lte(); var gte5 = require_gte(); var outside = (version, range, hilo, options) => { @@ -26044,12 +26044,12 @@ var require_outside = __commonJS({ case ">": gtfn = gt; ltefn = lte; - ltfn = lt; + ltfn = lt2; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt; + gtfn = lt2; ltefn = gte5; ltfn = gt; comp = "<"; @@ -26229,12 +26229,12 @@ var require_subset = __commonJS({ } } const eqSet = /* @__PURE__ */ new Set(); - let gt, lt; + let gt, lt2; for (const c of sub) { if (c.operator === ">" || c.operator === ">=") { gt = higherGT(gt, c, options); } else if (c.operator === "<" || c.operator === "<=") { - lt = lowerLT(lt, c, options); + lt2 = lowerLT(lt2, c, options); } else { eqSet.add(c.semver); } @@ -26243,11 +26243,11 @@ var require_subset = __commonJS({ return null; } let gtltComp; - if (gt && lt) { - gtltComp = compare(gt.semver, lt.semver, options); + if (gt && lt2) { + gtltComp = compare(gt.semver, lt2.semver, options); if (gtltComp > 0) { return null; - } else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) { + } else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) { return null; } } @@ -26255,7 +26255,7 @@ var require_subset = __commonJS({ if (gt && !satisfies2(eq, String(gt), options)) { return null; } - if (lt && !satisfies2(eq, String(lt), options)) { + if (lt2 && !satisfies2(eq, String(lt2), options)) { return null; } for (const c of dom) { @@ -26267,9 +26267,9 @@ var require_subset = __commonJS({ } let higher, lower; let hasDomLT, hasDomGT; - let needDomLTPre = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.semver : false; + let needDomLTPre = lt2 && !options.includePrerelease && lt2.semver.prerelease.length ? lt2.semver : false; let needDomGTPre = gt && !options.includePrerelease && gt.semver.prerelease.length ? gt.semver : false; - if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) { + if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt2.operator === "<" && needDomLTPre.prerelease[0] === 0) { needDomLTPre = false; } for (const c of dom) { @@ -26290,29 +26290,29 @@ var require_subset = __commonJS({ return false; } } - if (lt) { + if (lt2) { if (needDomLTPre) { if (c.semver.prerelease && c.semver.prerelease.length && c.semver.major === needDomLTPre.major && c.semver.minor === needDomLTPre.minor && c.semver.patch === needDomLTPre.patch) { needDomLTPre = false; } } if (c.operator === "<" || c.operator === "<=") { - lower = lowerLT(lt, c, options); - if (lower === c && lower !== lt) { + lower = lowerLT(lt2, c, options); + if (lower === c && lower !== lt2) { return false; } - } else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) { + } else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) { return false; } } - if (!c.operator && (lt || gt) && gtltComp !== 0) { + if (!c.operator && (lt2 || gt) && gtltComp !== 0) { return false; } } - if (gt && hasDomLT && !lt && gtltComp !== 0) { + if (gt && hasDomLT && !lt2 && gtltComp !== 0) { return false; } - if (lt && hasDomGT && !gt && gtltComp !== 0) { + if (lt2 && hasDomGT && !gt && gtltComp !== 0) { return false; } if (needDomGTPre || needDomLTPre) { @@ -26362,7 +26362,7 @@ var require_semver2 = __commonJS({ var sort = require_sort(); var rsort = require_rsort(); var gt = require_gt(); - var lt = require_lt(); + var lt2 = require_lt(); var eq = require_eq(); var neq = require_neq(); var gte5 = require_gte(); @@ -26400,7 +26400,7 @@ var require_semver2 = __commonJS({ sort, rsort, gt, - lt, + lt: lt2, eq, neq, gte: gte5, @@ -30295,8 +30295,8 @@ var require_semver3 = __commonJS({ function gt(a, b, loose) { return compare(a, b, loose) > 0; } - exports2.lt = lt; - function lt(a, b, loose) { + exports2.lt = lt2; + function lt2(a, b, loose) { return compare(a, b, loose) < 0; } exports2.eq = eq; @@ -30341,7 +30341,7 @@ var require_semver3 = __commonJS({ case ">=": return gte5(a, b, loose); case "<": - return lt(a, b, loose); + return lt2(a, b, loose); case "<=": return lte(a, b, loose); default: @@ -30878,12 +30878,12 @@ var require_semver3 = __commonJS({ case ">": gtfn = gt; ltefn = lte; - ltfn = lt; + ltfn = lt2; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt; + gtfn = lt2; ltefn = gte5; ltfn = gt; comp = "<"; diff --git a/lib/upload-lib.js b/lib/upload-lib.js index a6342ff21..63d887a2b 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -32341,8 +32341,8 @@ var require_lt = __commonJS({ "node_modules/semver/functions/lt.js"(exports2, module2) { "use strict"; var compare2 = require_compare(); - var lt = (a, b, loose) => compare2(a, b, loose) < 0; - module2.exports = lt; + var lt2 = (a, b, loose) => compare2(a, b, loose) < 0; + module2.exports = lt2; } }); @@ -32394,7 +32394,7 @@ var require_cmp = __commonJS({ var neq = require_neq(); var gt = require_gt(); var gte5 = require_gte(); - var lt = require_lt(); + var lt2 = require_lt(); var lte = require_lte(); var cmp = (a, op, b, loose) => { switch (op) { @@ -32425,7 +32425,7 @@ var require_cmp = __commonJS({ case ">=": return gte5(a, b, loose); case "<": - return lt(a, b, loose); + return lt2(a, b, loose); case "<=": return lte(a, b, loose); default: @@ -33179,7 +33179,7 @@ var require_outside = __commonJS({ var Range2 = require_range(); var satisfies2 = require_satisfies(); var gt = require_gt(); - var lt = require_lt(); + var lt2 = require_lt(); var lte = require_lte(); var gte5 = require_gte(); var outside = (version, range, hilo, options) => { @@ -33190,12 +33190,12 @@ var require_outside = __commonJS({ case ">": gtfn = gt; ltefn = lte; - ltfn = lt; + ltfn = lt2; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt; + gtfn = lt2; ltefn = gte5; ltfn = gt; comp = "<"; @@ -33375,12 +33375,12 @@ var require_subset = __commonJS({ } } const eqSet = /* @__PURE__ */ new Set(); - let gt, lt; + let gt, lt2; for (const c of sub) { if (c.operator === ">" || c.operator === ">=") { gt = higherGT(gt, c, options); } else if (c.operator === "<" || c.operator === "<=") { - lt = lowerLT(lt, c, options); + lt2 = lowerLT(lt2, c, options); } else { eqSet.add(c.semver); } @@ -33389,11 +33389,11 @@ var require_subset = __commonJS({ return null; } let gtltComp; - if (gt && lt) { - gtltComp = compare2(gt.semver, lt.semver, options); + if (gt && lt2) { + gtltComp = compare2(gt.semver, lt2.semver, options); if (gtltComp > 0) { return null; - } else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) { + } else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) { return null; } } @@ -33401,7 +33401,7 @@ var require_subset = __commonJS({ if (gt && !satisfies2(eq, String(gt), options)) { return null; } - if (lt && !satisfies2(eq, String(lt), options)) { + if (lt2 && !satisfies2(eq, String(lt2), options)) { return null; } for (const c of dom) { @@ -33413,9 +33413,9 @@ var require_subset = __commonJS({ } let higher, lower; let hasDomLT, hasDomGT; - let needDomLTPre = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.semver : false; + let needDomLTPre = lt2 && !options.includePrerelease && lt2.semver.prerelease.length ? lt2.semver : false; let needDomGTPre = gt && !options.includePrerelease && gt.semver.prerelease.length ? gt.semver : false; - if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) { + if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt2.operator === "<" && needDomLTPre.prerelease[0] === 0) { needDomLTPre = false; } for (const c of dom) { @@ -33436,29 +33436,29 @@ var require_subset = __commonJS({ return false; } } - if (lt) { + if (lt2) { if (needDomLTPre) { if (c.semver.prerelease && c.semver.prerelease.length && c.semver.major === needDomLTPre.major && c.semver.minor === needDomLTPre.minor && c.semver.patch === needDomLTPre.patch) { needDomLTPre = false; } } if (c.operator === "<" || c.operator === "<=") { - lower = lowerLT(lt, c, options); - if (lower === c && lower !== lt) { + lower = lowerLT(lt2, c, options); + if (lower === c && lower !== lt2) { return false; } - } else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) { + } else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) { return false; } } - if (!c.operator && (lt || gt) && gtltComp !== 0) { + if (!c.operator && (lt2 || gt) && gtltComp !== 0) { return false; } } - if (gt && hasDomLT && !lt && gtltComp !== 0) { + if (gt && hasDomLT && !lt2 && gtltComp !== 0) { return false; } - if (lt && hasDomGT && !gt && gtltComp !== 0) { + if (lt2 && hasDomGT && !gt && gtltComp !== 0) { return false; } if (needDomGTPre || needDomLTPre) { @@ -33508,7 +33508,7 @@ var require_semver2 = __commonJS({ var sort = require_sort(); var rsort = require_rsort(); var gt = require_gt(); - var lt = require_lt(); + var lt2 = require_lt(); var eq = require_eq(); var neq = require_neq(); var gte5 = require_gte(); @@ -33546,7 +33546,7 @@ var require_semver2 = __commonJS({ sort, rsort, gt, - lt, + lt: lt2, eq, neq, gte: gte5, @@ -37441,8 +37441,8 @@ var require_semver3 = __commonJS({ function gt(a, b, loose) { return compare2(a, b, loose) > 0; } - exports2.lt = lt; - function lt(a, b, loose) { + exports2.lt = lt2; + function lt2(a, b, loose) { return compare2(a, b, loose) < 0; } exports2.eq = eq; @@ -37487,7 +37487,7 @@ var require_semver3 = __commonJS({ case ">=": return gte5(a, b, loose); case "<": - return lt(a, b, loose); + return lt2(a, b, loose); case "<=": return lte(a, b, loose); default: @@ -38024,12 +38024,12 @@ var require_semver3 = __commonJS({ case ">": gtfn = gt; ltefn = lte; - ltfn = lt; + ltfn = lt2; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt; + gtfn = lt2; ltefn = gte5; ltfn = gt; comp = "<"; diff --git a/lib/upload-sarif-action-post.js b/lib/upload-sarif-action-post.js index 233b73d47..a0dc0ed19 100644 --- a/lib/upload-sarif-action-post.js +++ b/lib/upload-sarif-action-post.js @@ -25195,8 +25195,8 @@ var require_lt = __commonJS({ "node_modules/semver/functions/lt.js"(exports2, module2) { "use strict"; var compare = require_compare(); - var lt = (a, b, loose) => compare(a, b, loose) < 0; - module2.exports = lt; + var lt2 = (a, b, loose) => compare(a, b, loose) < 0; + module2.exports = lt2; } }); @@ -25248,7 +25248,7 @@ var require_cmp = __commonJS({ var neq = require_neq(); var gt = require_gt(); var gte5 = require_gte(); - var lt = require_lt(); + var lt2 = require_lt(); var lte = require_lte(); var cmp = (a, op, b, loose) => { switch (op) { @@ -25279,7 +25279,7 @@ var require_cmp = __commonJS({ case ">=": return gte5(a, b, loose); case "<": - return lt(a, b, loose); + return lt2(a, b, loose); case "<=": return lte(a, b, loose); default: @@ -26033,7 +26033,7 @@ var require_outside = __commonJS({ var Range2 = require_range(); var satisfies2 = require_satisfies(); var gt = require_gt(); - var lt = require_lt(); + var lt2 = require_lt(); var lte = require_lte(); var gte5 = require_gte(); var outside = (version, range, hilo, options) => { @@ -26044,12 +26044,12 @@ var require_outside = __commonJS({ case ">": gtfn = gt; ltefn = lte; - ltfn = lt; + ltfn = lt2; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt; + gtfn = lt2; ltefn = gte5; ltfn = gt; comp = "<"; @@ -26229,12 +26229,12 @@ var require_subset = __commonJS({ } } const eqSet = /* @__PURE__ */ new Set(); - let gt, lt; + let gt, lt2; for (const c of sub) { if (c.operator === ">" || c.operator === ">=") { gt = higherGT(gt, c, options); } else if (c.operator === "<" || c.operator === "<=") { - lt = lowerLT(lt, c, options); + lt2 = lowerLT(lt2, c, options); } else { eqSet.add(c.semver); } @@ -26243,11 +26243,11 @@ var require_subset = __commonJS({ return null; } let gtltComp; - if (gt && lt) { - gtltComp = compare(gt.semver, lt.semver, options); + if (gt && lt2) { + gtltComp = compare(gt.semver, lt2.semver, options); if (gtltComp > 0) { return null; - } else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) { + } else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) { return null; } } @@ -26255,7 +26255,7 @@ var require_subset = __commonJS({ if (gt && !satisfies2(eq, String(gt), options)) { return null; } - if (lt && !satisfies2(eq, String(lt), options)) { + if (lt2 && !satisfies2(eq, String(lt2), options)) { return null; } for (const c of dom) { @@ -26267,9 +26267,9 @@ var require_subset = __commonJS({ } let higher, lower; let hasDomLT, hasDomGT; - let needDomLTPre = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.semver : false; + let needDomLTPre = lt2 && !options.includePrerelease && lt2.semver.prerelease.length ? lt2.semver : false; let needDomGTPre = gt && !options.includePrerelease && gt.semver.prerelease.length ? gt.semver : false; - if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) { + if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt2.operator === "<" && needDomLTPre.prerelease[0] === 0) { needDomLTPre = false; } for (const c of dom) { @@ -26290,29 +26290,29 @@ var require_subset = __commonJS({ return false; } } - if (lt) { + if (lt2) { if (needDomLTPre) { if (c.semver.prerelease && c.semver.prerelease.length && c.semver.major === needDomLTPre.major && c.semver.minor === needDomLTPre.minor && c.semver.patch === needDomLTPre.patch) { needDomLTPre = false; } } if (c.operator === "<" || c.operator === "<=") { - lower = lowerLT(lt, c, options); - if (lower === c && lower !== lt) { + lower = lowerLT(lt2, c, options); + if (lower === c && lower !== lt2) { return false; } - } else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) { + } else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) { return false; } } - if (!c.operator && (lt || gt) && gtltComp !== 0) { + if (!c.operator && (lt2 || gt) && gtltComp !== 0) { return false; } } - if (gt && hasDomLT && !lt && gtltComp !== 0) { + if (gt && hasDomLT && !lt2 && gtltComp !== 0) { return false; } - if (lt && hasDomGT && !gt && gtltComp !== 0) { + if (lt2 && hasDomGT && !gt && gtltComp !== 0) { return false; } if (needDomGTPre || needDomLTPre) { @@ -26362,7 +26362,7 @@ var require_semver2 = __commonJS({ var sort = require_sort(); var rsort = require_rsort(); var gt = require_gt(); - var lt = require_lt(); + var lt2 = require_lt(); var eq = require_eq(); var neq = require_neq(); var gte5 = require_gte(); @@ -26400,7 +26400,7 @@ var require_semver2 = __commonJS({ sort, rsort, gt, - lt, + lt: lt2, eq, neq, gte: gte5, @@ -108119,8 +108119,8 @@ var require_semver3 = __commonJS({ function gt(a, b, loose) { return compare(a, b, loose) > 0; } - exports2.lt = lt; - function lt(a, b, loose) { + exports2.lt = lt2; + function lt2(a, b, loose) { return compare(a, b, loose) < 0; } exports2.eq = eq; @@ -108165,7 +108165,7 @@ var require_semver3 = __commonJS({ case ">=": return gte5(a, b, loose); case "<": - return lt(a, b, loose); + return lt2(a, b, loose); case "<=": return lte(a, b, loose); default: @@ -108702,12 +108702,12 @@ var require_semver3 = __commonJS({ case ">": gtfn = gt; ltefn = lte; - ltfn = lt; + ltfn = lt2; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt; + gtfn = lt2; ltefn = gte5; ltfn = gt; comp = "<"; diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index 7ad72583b..30ed1a1bd 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -31044,8 +31044,8 @@ var require_lt = __commonJS({ "node_modules/semver/functions/lt.js"(exports2, module2) { "use strict"; var compare2 = require_compare(); - var lt = (a, b, loose) => compare2(a, b, loose) < 0; - module2.exports = lt; + var lt2 = (a, b, loose) => compare2(a, b, loose) < 0; + module2.exports = lt2; } }); @@ -31097,7 +31097,7 @@ var require_cmp = __commonJS({ var neq = require_neq(); var gt = require_gt(); var gte5 = require_gte(); - var lt = require_lt(); + var lt2 = require_lt(); var lte = require_lte(); var cmp = (a, op, b, loose) => { switch (op) { @@ -31128,7 +31128,7 @@ var require_cmp = __commonJS({ case ">=": return gte5(a, b, loose); case "<": - return lt(a, b, loose); + return lt2(a, b, loose); case "<=": return lte(a, b, loose); default: @@ -31882,7 +31882,7 @@ var require_outside = __commonJS({ var Range2 = require_range(); var satisfies2 = require_satisfies(); var gt = require_gt(); - var lt = require_lt(); + var lt2 = require_lt(); var lte = require_lte(); var gte5 = require_gte(); var outside = (version, range, hilo, options) => { @@ -31893,12 +31893,12 @@ var require_outside = __commonJS({ case ">": gtfn = gt; ltefn = lte; - ltfn = lt; + ltfn = lt2; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt; + gtfn = lt2; ltefn = gte5; ltfn = gt; comp = "<"; @@ -32078,12 +32078,12 @@ var require_subset = __commonJS({ } } const eqSet = /* @__PURE__ */ new Set(); - let gt, lt; + let gt, lt2; for (const c of sub) { if (c.operator === ">" || c.operator === ">=") { gt = higherGT(gt, c, options); } else if (c.operator === "<" || c.operator === "<=") { - lt = lowerLT(lt, c, options); + lt2 = lowerLT(lt2, c, options); } else { eqSet.add(c.semver); } @@ -32092,11 +32092,11 @@ var require_subset = __commonJS({ return null; } let gtltComp; - if (gt && lt) { - gtltComp = compare2(gt.semver, lt.semver, options); + if (gt && lt2) { + gtltComp = compare2(gt.semver, lt2.semver, options); if (gtltComp > 0) { return null; - } else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) { + } else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) { return null; } } @@ -32104,7 +32104,7 @@ var require_subset = __commonJS({ if (gt && !satisfies2(eq, String(gt), options)) { return null; } - if (lt && !satisfies2(eq, String(lt), options)) { + if (lt2 && !satisfies2(eq, String(lt2), options)) { return null; } for (const c of dom) { @@ -32116,9 +32116,9 @@ var require_subset = __commonJS({ } let higher, lower; let hasDomLT, hasDomGT; - let needDomLTPre = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.semver : false; + let needDomLTPre = lt2 && !options.includePrerelease && lt2.semver.prerelease.length ? lt2.semver : false; let needDomGTPre = gt && !options.includePrerelease && gt.semver.prerelease.length ? gt.semver : false; - if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) { + if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt2.operator === "<" && needDomLTPre.prerelease[0] === 0) { needDomLTPre = false; } for (const c of dom) { @@ -32139,29 +32139,29 @@ var require_subset = __commonJS({ return false; } } - if (lt) { + if (lt2) { if (needDomLTPre) { if (c.semver.prerelease && c.semver.prerelease.length && c.semver.major === needDomLTPre.major && c.semver.minor === needDomLTPre.minor && c.semver.patch === needDomLTPre.patch) { needDomLTPre = false; } } if (c.operator === "<" || c.operator === "<=") { - lower = lowerLT(lt, c, options); - if (lower === c && lower !== lt) { + lower = lowerLT(lt2, c, options); + if (lower === c && lower !== lt2) { return false; } - } else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) { + } else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) { return false; } } - if (!c.operator && (lt || gt) && gtltComp !== 0) { + if (!c.operator && (lt2 || gt) && gtltComp !== 0) { return false; } } - if (gt && hasDomLT && !lt && gtltComp !== 0) { + if (gt && hasDomLT && !lt2 && gtltComp !== 0) { return false; } - if (lt && hasDomGT && !gt && gtltComp !== 0) { + if (lt2 && hasDomGT && !gt && gtltComp !== 0) { return false; } if (needDomGTPre || needDomLTPre) { @@ -32211,7 +32211,7 @@ var require_semver2 = __commonJS({ var sort = require_sort(); var rsort = require_rsort(); var gt = require_gt(); - var lt = require_lt(); + var lt2 = require_lt(); var eq = require_eq(); var neq = require_neq(); var gte5 = require_gte(); @@ -32249,7 +32249,7 @@ var require_semver2 = __commonJS({ sort, rsort, gt, - lt, + lt: lt2, eq, neq, gte: gte5, @@ -36144,8 +36144,8 @@ var require_semver3 = __commonJS({ function gt(a, b, loose) { return compare2(a, b, loose) > 0; } - exports2.lt = lt; - function lt(a, b, loose) { + exports2.lt = lt2; + function lt2(a, b, loose) { return compare2(a, b, loose) < 0; } exports2.eq = eq; @@ -36190,7 +36190,7 @@ var require_semver3 = __commonJS({ case ">=": return gte5(a, b, loose); case "<": - return lt(a, b, loose); + return lt2(a, b, loose); case "<=": return lte(a, b, loose); default: @@ -36727,12 +36727,12 @@ var require_semver3 = __commonJS({ case ">": gtfn = gt; ltefn = lte; - ltfn = lt; + ltfn = lt2; comp = ">"; ecomp = ">="; break; case "<": - gtfn = lt; + gtfn = lt2; ltefn = gte5; ltfn = gt; comp = "<"; diff --git a/src/setup-codeql.test.ts b/src/setup-codeql.test.ts index 6e4a1dc07..f2f199b7d 100644 --- a/src/setup-codeql.test.ts +++ b/src/setup-codeql.test.ts @@ -1,5 +1,6 @@ import * as path from "path"; +import * as toolcache from "@actions/tool-cache"; import test from "ava"; import * as sinon from "sinon"; @@ -263,3 +264,15 @@ test('tryGetTagNameFromUrl extracts the right tag name for a repo name containin "codeql-bundle-v2.19.0", ); }); + +test("getLatestToolcacheVersion returns undefined if there are no CodeQL CLIs in the toolcache", (t) => { + sinon.stub(toolcache, "findAllVersions").returns([]); + t.is(setupCodeql.getLatestToolcacheVersion(getRunnerLogger(true)), undefined); +}); + +test("getLatestToolcacheVersion returns latest version in the toolcache", (t) => { + const testVersions = ["2.3.1", "3.2.1", "1.2.3"]; + sinon.stub(toolcache, "findAllVersions").returns(testVersions); + + t.is(setupCodeql.getLatestToolcacheVersion(getRunnerLogger(true)), "3.2.1"); +}); diff --git a/src/setup-codeql.ts b/src/setup-codeql.ts index 127bb1b93..4f5db88f3 100644 --- a/src/setup-codeql.ts +++ b/src/setup-codeql.ts @@ -816,6 +816,34 @@ async function getNightlyToolsUrl(logger: Logger) { } } +/** + * Gets the latest version of the CodeQL CLI that is available in the toolcache, or `undefined` + * if no CodeQL CLI is available in the toolcache. + * + * @param logger The logger to use. + * @returns The latest version of the CodeQL CLI that is available in the toolcache, or `undefined` if there is none. + */ +export function getLatestToolcacheVersion(logger: Logger): string | undefined { + const allVersions = toolcache + .findAllVersions("CodeQL") + .sort((a, b) => (semver.lt(a, b) ? 1 : -1)); + logger.debug( + `Found the following versions of the CodeQL tools in the toolcache: ${JSON.stringify( + allVersions, + )}.`, + ); + + if (allVersions.length > 0) { + const latestToolcacheVersion = allVersions[0]; + logger.info( + `CLI version ${latestToolcacheVersion} is the latest version in the toolcache.`, + ); + return latestToolcacheVersion; + } + + return undefined; +} + function isReservedToolsValue(tools: string): boolean { return ( CODEQL_BUNDLE_VERSION_ALIAS.includes(tools) ||