Use semver.compare instead of semver.lt

This commit is contained in:
Michael B. Gale
2025-10-06 12:58:00 +01:00
parent 43ce7ef399
commit 1cc5eb6636
11 changed files with 674 additions and 674 deletions
+69 -69
View File
@@ -25121,8 +25121,8 @@ var require_compare = __commonJS({
"node_modules/semver/functions/compare.js"(exports2, module2) {
"use strict";
var SemVer = require_semver();
var compare = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose));
module2.exports = compare;
var compare2 = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose));
module2.exports = compare2;
}
});
@@ -25130,8 +25130,8 @@ var require_compare = __commonJS({
var require_rcompare = __commonJS({
"node_modules/semver/functions/rcompare.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var rcompare = (a, b, loose) => compare(b, a, loose);
var compare2 = require_compare();
var rcompare = (a, b, loose) => compare2(b, a, loose);
module2.exports = rcompare;
}
});
@@ -25140,8 +25140,8 @@ var require_rcompare = __commonJS({
var require_compare_loose = __commonJS({
"node_modules/semver/functions/compare-loose.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var compareLoose = (a, b) => compare(a, b, true);
var compare2 = require_compare();
var compareLoose = (a, b) => compare2(a, b, true);
module2.exports = compareLoose;
}
});
@@ -25184,8 +25184,8 @@ var require_rsort = __commonJS({
var require_gt = __commonJS({
"node_modules/semver/functions/gt.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var gt = (a, b, loose) => compare(a, b, loose) > 0;
var compare2 = require_compare();
var gt = (a, b, loose) => compare2(a, b, loose) > 0;
module2.exports = gt;
}
});
@@ -25194,9 +25194,9 @@ var require_gt = __commonJS({
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 compare2 = require_compare();
var lt = (a, b, loose) => compare2(a, b, loose) < 0;
module2.exports = lt;
}
});
@@ -25204,8 +25204,8 @@ var require_lt = __commonJS({
var require_eq = __commonJS({
"node_modules/semver/functions/eq.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var eq = (a, b, loose) => compare(a, b, loose) === 0;
var compare2 = require_compare();
var eq = (a, b, loose) => compare2(a, b, loose) === 0;
module2.exports = eq;
}
});
@@ -25214,8 +25214,8 @@ var require_eq = __commonJS({
var require_neq = __commonJS({
"node_modules/semver/functions/neq.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var neq = (a, b, loose) => compare(a, b, loose) !== 0;
var compare2 = require_compare();
var neq = (a, b, loose) => compare2(a, b, loose) !== 0;
module2.exports = neq;
}
});
@@ -25224,8 +25224,8 @@ var require_neq = __commonJS({
var require_gte = __commonJS({
"node_modules/semver/functions/gte.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var gte5 = (a, b, loose) => compare(a, b, loose) >= 0;
var compare2 = require_compare();
var gte5 = (a, b, loose) => compare2(a, b, loose) >= 0;
module2.exports = gte5;
}
});
@@ -25234,8 +25234,8 @@ var require_gte = __commonJS({
var require_lte = __commonJS({
"node_modules/semver/functions/lte.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var lte = (a, b, loose) => compare(a, b, loose) <= 0;
var compare2 = require_compare();
var lte = (a, b, loose) => compare2(a, b, loose) <= 0;
module2.exports = lte;
}
});
@@ -25248,7 +25248,7 @@ var require_cmp = __commonJS({
var neq = require_neq();
var gt = require_gt();
var gte5 = require_gte();
var lt2 = require_lt();
var lt = 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 lt2(a, b, loose);
return lt(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 lt2 = require_lt();
var lt = 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 = lt2;
ltfn = lt;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt2;
gtfn = lt;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -26131,12 +26131,12 @@ var require_simplify = __commonJS({
"node_modules/semver/ranges/simplify.js"(exports2, module2) {
"use strict";
var satisfies2 = require_satisfies();
var compare = require_compare();
var compare2 = require_compare();
module2.exports = (versions, range, options) => {
const set2 = [];
let first = null;
let prev = null;
const v = versions.sort((a, b) => compare(a, b, options));
const v = versions.sort((a, b) => compare2(a, b, options));
for (const version of v) {
const included = satisfies2(version, range, options);
if (included) {
@@ -26184,7 +26184,7 @@ var require_subset = __commonJS({
var Comparator = require_comparator();
var { ANY } = Comparator;
var satisfies2 = require_satisfies();
var compare = require_compare();
var compare2 = require_compare();
var subset = (sub, dom, options = {}) => {
if (sub === dom) {
return true;
@@ -26229,12 +26229,12 @@ var require_subset = __commonJS({
}
}
const eqSet = /* @__PURE__ */ new Set();
let gt, lt2;
let gt, lt;
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);
lt = lowerLT(lt, c, options);
} else {
eqSet.add(c.semver);
}
@@ -26243,11 +26243,11 @@ var require_subset = __commonJS({
return null;
}
let gtltComp;
if (gt && lt2) {
gtltComp = compare(gt.semver, lt2.semver, options);
if (gt && lt) {
gtltComp = compare2(gt.semver, lt.semver, options);
if (gtltComp > 0) {
return null;
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) {
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) {
return null;
}
}
@@ -26255,7 +26255,7 @@ var require_subset = __commonJS({
if (gt && !satisfies2(eq, String(gt), options)) {
return null;
}
if (lt2 && !satisfies2(eq, String(lt2), options)) {
if (lt && !satisfies2(eq, String(lt), options)) {
return null;
}
for (const c of dom) {
@@ -26267,9 +26267,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 = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.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 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) {
needDomLTPre = false;
}
for (const c of dom) {
@@ -26290,29 +26290,29 @@ var require_subset = __commonJS({
return false;
}
}
if (lt2) {
if (lt) {
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(lt, c, options);
if (lower === c && lower !== lt) {
return false;
}
} else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) {
} else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) {
return false;
}
}
if (!c.operator && (lt2 || gt) && gtltComp !== 0) {
if (!c.operator && (lt || gt) && gtltComp !== 0) {
return false;
}
}
if (gt && hasDomLT && !lt2 && gtltComp !== 0) {
if (gt && hasDomLT && !lt && gtltComp !== 0) {
return false;
}
if (lt2 && hasDomGT && !gt && gtltComp !== 0) {
if (lt && hasDomGT && !gt && gtltComp !== 0) {
return false;
}
if (needDomGTPre || needDomLTPre) {
@@ -26324,14 +26324,14 @@ var require_subset = __commonJS({
if (!a) {
return b;
}
const comp = compare(a.semver, b.semver, options);
const comp = compare2(a.semver, b.semver, options);
return comp > 0 ? a : comp < 0 ? b : b.operator === ">" && a.operator === ">=" ? b : a;
};
var lowerLT = (a, b, options) => {
if (!a) {
return b;
}
const comp = compare(a.semver, b.semver, options);
const comp = compare2(a.semver, b.semver, options);
return comp < 0 ? a : comp > 0 ? b : b.operator === "<" && a.operator === "<=" ? b : a;
};
module2.exports = subset;
@@ -26355,14 +26355,14 @@ var require_semver2 = __commonJS({
var minor = require_minor();
var patch = require_patch();
var prerelease = require_prerelease();
var compare = require_compare();
var compare2 = require_compare();
var rcompare = require_rcompare();
var compareLoose = require_compare_loose();
var compareBuild = require_compare_build();
var sort = require_sort();
var rsort = require_rsort();
var gt = require_gt();
var lt2 = require_lt();
var lt = require_lt();
var eq = require_eq();
var neq = require_neq();
var gte5 = require_gte();
@@ -26393,14 +26393,14 @@ var require_semver2 = __commonJS({
minor,
patch,
prerelease,
compare,
compare: compare2,
rcompare,
compareLoose,
compareBuild,
sort,
rsort,
gt,
lt: lt2,
lt,
eq,
neq,
gte: gte5,
@@ -30261,13 +30261,13 @@ var require_semver3 = __commonJS({
function patch(a, loose) {
return new SemVer(a, loose).patch;
}
exports2.compare = compare;
function compare(a, b, loose) {
exports2.compare = compare2;
function compare2(a, b, loose) {
return new SemVer(a, loose).compare(new SemVer(b, loose));
}
exports2.compareLoose = compareLoose;
function compareLoose(a, b) {
return compare(a, b, true);
return compare2(a, b, true);
}
exports2.compareBuild = compareBuild;
function compareBuild(a, b, loose) {
@@ -30277,7 +30277,7 @@ var require_semver3 = __commonJS({
}
exports2.rcompare = rcompare;
function rcompare(a, b, loose) {
return compare(b, a, loose);
return compare2(b, a, loose);
}
exports2.sort = sort;
function sort(list, loose) {
@@ -30293,27 +30293,27 @@ var require_semver3 = __commonJS({
}
exports2.gt = gt;
function gt(a, b, loose) {
return compare(a, b, loose) > 0;
return compare2(a, b, loose) > 0;
}
exports2.lt = lt2;
function lt2(a, b, loose) {
return compare(a, b, loose) < 0;
exports2.lt = lt;
function lt(a, b, loose) {
return compare2(a, b, loose) < 0;
}
exports2.eq = eq;
function eq(a, b, loose) {
return compare(a, b, loose) === 0;
return compare2(a, b, loose) === 0;
}
exports2.neq = neq;
function neq(a, b, loose) {
return compare(a, b, loose) !== 0;
return compare2(a, b, loose) !== 0;
}
exports2.gte = gte5;
function gte5(a, b, loose) {
return compare(a, b, loose) >= 0;
return compare2(a, b, loose) >= 0;
}
exports2.lte = lte;
function lte(a, b, loose) {
return compare(a, b, loose) <= 0;
return compare2(a, b, loose) <= 0;
}
exports2.cmp = cmp;
function cmp(a, op, b, loose) {
@@ -30341,7 +30341,7 @@ var require_semver3 = __commonJS({
case ">=":
return gte5(a, b, loose);
case "<":
return lt2(a, b, loose);
return lt(a, b, loose);
case "<=":
return lte(a, b, loose);
default:
@@ -30878,12 +30878,12 @@ var require_semver3 = __commonJS({
case ">":
gtfn = gt;
ltefn = lte;
ltfn = lt2;
ltfn = lt;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt2;
gtfn = lt;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -95823,8 +95823,8 @@ var require_commonjs16 = __commonJS({
if (rootPath === this.root.name) {
return this.root;
}
for (const [compare, root] of Object.entries(this.roots)) {
if (this.sameRoot(rootPath, compare)) {
for (const [compare2, root] of Object.entries(this.roots)) {
if (this.sameRoot(rootPath, compare2)) {
return this.roots[rootPath] = root;
}
}
@@ -95833,9 +95833,9 @@ var require_commonjs16 = __commonJS({
/**
* @internal
*/
sameRoot(rootPath, compare = this.root.name) {
sameRoot(rootPath, compare2 = this.root.name) {
rootPath = rootPath.toUpperCase().replace(/\//g, "\\").replace(uncDriveRegexp, "$1\\");
return rootPath === compare;
return rootPath === compare2;
}
};
exports2.PathWin32 = PathWin32;
@@ -99854,7 +99854,7 @@ var require_b4a = __commonJS({
function byteLength(string, encoding) {
return Buffer.byteLength(string, encoding);
}
function compare(a, b) {
function compare2(a, b) {
return Buffer.compare(a, b);
}
function concat(buffers, totalLength) {
@@ -99955,7 +99955,7 @@ var require_b4a = __commonJS({
allocUnsafe,
allocUnsafeSlow,
byteLength,
compare,
compare: compare2,
concat,
copy,
equals,
+67 -67
View File
@@ -25039,7 +25039,7 @@ var require_to_regex_range = __commonJS({
stop = countZeros(max + 1, zeros) - 1;
}
stops = [...stops];
stops.sort(compare2);
stops.sort(compare3);
return stops;
}
function rangeToPattern(start, stop, options) {
@@ -25111,7 +25111,7 @@ var require_to_regex_range = __commonJS({
for (let i = 0; i < a.length; i++) arr.push([a[i], b[i]]);
return arr;
}
function compare2(a, b) {
function compare3(a, b) {
return a > b ? 1 : b > a ? -1 : 0;
}
function contains(arr, key, val2) {
@@ -30970,8 +30970,8 @@ var require_compare = __commonJS({
"node_modules/semver/functions/compare.js"(exports2, module2) {
"use strict";
var SemVer = require_semver();
var compare2 = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose));
module2.exports = compare2;
var compare3 = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose));
module2.exports = compare3;
}
});
@@ -30979,8 +30979,8 @@ var require_compare = __commonJS({
var require_rcompare = __commonJS({
"node_modules/semver/functions/rcompare.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var rcompare = (a, b, loose) => compare2(b, a, loose);
var compare3 = require_compare();
var rcompare = (a, b, loose) => compare3(b, a, loose);
module2.exports = rcompare;
}
});
@@ -30989,8 +30989,8 @@ var require_rcompare = __commonJS({
var require_compare_loose = __commonJS({
"node_modules/semver/functions/compare-loose.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var compareLoose = (a, b) => compare2(a, b, true);
var compare3 = require_compare();
var compareLoose = (a, b) => compare3(a, b, true);
module2.exports = compareLoose;
}
});
@@ -31033,8 +31033,8 @@ var require_rsort = __commonJS({
var require_gt = __commonJS({
"node_modules/semver/functions/gt.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var gt = (a, b, loose) => compare2(a, b, loose) > 0;
var compare3 = require_compare();
var gt = (a, b, loose) => compare3(a, b, loose) > 0;
module2.exports = gt;
}
});
@@ -31043,9 +31043,9 @@ var require_gt = __commonJS({
var require_lt = __commonJS({
"node_modules/semver/functions/lt.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var lt2 = (a, b, loose) => compare2(a, b, loose) < 0;
module2.exports = lt2;
var compare3 = require_compare();
var lt = (a, b, loose) => compare3(a, b, loose) < 0;
module2.exports = lt;
}
});
@@ -31053,8 +31053,8 @@ var require_lt = __commonJS({
var require_eq = __commonJS({
"node_modules/semver/functions/eq.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var eq = (a, b, loose) => compare2(a, b, loose) === 0;
var compare3 = require_compare();
var eq = (a, b, loose) => compare3(a, b, loose) === 0;
module2.exports = eq;
}
});
@@ -31063,8 +31063,8 @@ var require_eq = __commonJS({
var require_neq = __commonJS({
"node_modules/semver/functions/neq.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var neq = (a, b, loose) => compare2(a, b, loose) !== 0;
var compare3 = require_compare();
var neq = (a, b, loose) => compare3(a, b, loose) !== 0;
module2.exports = neq;
}
});
@@ -31073,8 +31073,8 @@ var require_neq = __commonJS({
var require_gte = __commonJS({
"node_modules/semver/functions/gte.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var gte5 = (a, b, loose) => compare2(a, b, loose) >= 0;
var compare3 = require_compare();
var gte5 = (a, b, loose) => compare3(a, b, loose) >= 0;
module2.exports = gte5;
}
});
@@ -31083,8 +31083,8 @@ var require_gte = __commonJS({
var require_lte = __commonJS({
"node_modules/semver/functions/lte.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var lte = (a, b, loose) => compare2(a, b, loose) <= 0;
var compare3 = require_compare();
var lte = (a, b, loose) => compare3(a, b, loose) <= 0;
module2.exports = lte;
}
});
@@ -31097,7 +31097,7 @@ var require_cmp = __commonJS({
var neq = require_neq();
var gt = require_gt();
var gte5 = require_gte();
var lt2 = require_lt();
var lt = 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 lt2(a, b, loose);
return lt(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 lt2 = require_lt();
var lt = 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 = lt2;
ltfn = lt;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt2;
gtfn = lt;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -31980,12 +31980,12 @@ var require_simplify = __commonJS({
"node_modules/semver/ranges/simplify.js"(exports2, module2) {
"use strict";
var satisfies2 = require_satisfies();
var compare2 = require_compare();
var compare3 = require_compare();
module2.exports = (versions, range, options) => {
const set2 = [];
let first = null;
let prev = null;
const v = versions.sort((a, b) => compare2(a, b, options));
const v = versions.sort((a, b) => compare3(a, b, options));
for (const version of v) {
const included = satisfies2(version, range, options);
if (included) {
@@ -32033,7 +32033,7 @@ var require_subset = __commonJS({
var Comparator = require_comparator();
var { ANY } = Comparator;
var satisfies2 = require_satisfies();
var compare2 = require_compare();
var compare3 = require_compare();
var subset = (sub, dom, options = {}) => {
if (sub === dom) {
return true;
@@ -32078,12 +32078,12 @@ var require_subset = __commonJS({
}
}
const eqSet = /* @__PURE__ */ new Set();
let gt, lt2;
let gt, lt;
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);
lt = lowerLT(lt, c, options);
} else {
eqSet.add(c.semver);
}
@@ -32092,11 +32092,11 @@ var require_subset = __commonJS({
return null;
}
let gtltComp;
if (gt && lt2) {
gtltComp = compare2(gt.semver, lt2.semver, options);
if (gt && lt) {
gtltComp = compare3(gt.semver, lt.semver, options);
if (gtltComp > 0) {
return null;
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) {
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) {
return null;
}
}
@@ -32104,7 +32104,7 @@ var require_subset = __commonJS({
if (gt && !satisfies2(eq, String(gt), options)) {
return null;
}
if (lt2 && !satisfies2(eq, String(lt2), options)) {
if (lt && !satisfies2(eq, String(lt), options)) {
return null;
}
for (const c of dom) {
@@ -32116,9 +32116,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 = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.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 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) {
needDomLTPre = false;
}
for (const c of dom) {
@@ -32139,29 +32139,29 @@ var require_subset = __commonJS({
return false;
}
}
if (lt2) {
if (lt) {
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(lt, c, options);
if (lower === c && lower !== lt) {
return false;
}
} else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) {
} else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) {
return false;
}
}
if (!c.operator && (lt2 || gt) && gtltComp !== 0) {
if (!c.operator && (lt || gt) && gtltComp !== 0) {
return false;
}
}
if (gt && hasDomLT && !lt2 && gtltComp !== 0) {
if (gt && hasDomLT && !lt && gtltComp !== 0) {
return false;
}
if (lt2 && hasDomGT && !gt && gtltComp !== 0) {
if (lt && hasDomGT && !gt && gtltComp !== 0) {
return false;
}
if (needDomGTPre || needDomLTPre) {
@@ -32173,14 +32173,14 @@ var require_subset = __commonJS({
if (!a) {
return b;
}
const comp = compare2(a.semver, b.semver, options);
const comp = compare3(a.semver, b.semver, options);
return comp > 0 ? a : comp < 0 ? b : b.operator === ">" && a.operator === ">=" ? b : a;
};
var lowerLT = (a, b, options) => {
if (!a) {
return b;
}
const comp = compare2(a.semver, b.semver, options);
const comp = compare3(a.semver, b.semver, options);
return comp < 0 ? a : comp > 0 ? b : b.operator === "<" && a.operator === "<=" ? b : a;
};
module2.exports = subset;
@@ -32204,14 +32204,14 @@ var require_semver2 = __commonJS({
var minor = require_minor();
var patch = require_patch();
var prerelease = require_prerelease();
var compare2 = require_compare();
var compare3 = require_compare();
var rcompare = require_rcompare();
var compareLoose = require_compare_loose();
var compareBuild = require_compare_build();
var sort = require_sort();
var rsort = require_rsort();
var gt = require_gt();
var lt2 = require_lt();
var lt = require_lt();
var eq = require_eq();
var neq = require_neq();
var gte5 = require_gte();
@@ -32242,14 +32242,14 @@ var require_semver2 = __commonJS({
minor,
patch,
prerelease,
compare: compare2,
compare: compare3,
rcompare,
compareLoose,
compareBuild,
sort,
rsort,
gt,
lt: lt2,
lt,
eq,
neq,
gte: gte5,
@@ -36110,13 +36110,13 @@ var require_semver3 = __commonJS({
function patch(a, loose) {
return new SemVer(a, loose).patch;
}
exports2.compare = compare2;
function compare2(a, b, loose) {
exports2.compare = compare3;
function compare3(a, b, loose) {
return new SemVer(a, loose).compare(new SemVer(b, loose));
}
exports2.compareLoose = compareLoose;
function compareLoose(a, b) {
return compare2(a, b, true);
return compare3(a, b, true);
}
exports2.compareBuild = compareBuild;
function compareBuild(a, b, loose) {
@@ -36126,7 +36126,7 @@ var require_semver3 = __commonJS({
}
exports2.rcompare = rcompare;
function rcompare(a, b, loose) {
return compare2(b, a, loose);
return compare3(b, a, loose);
}
exports2.sort = sort;
function sort(list, loose) {
@@ -36142,27 +36142,27 @@ var require_semver3 = __commonJS({
}
exports2.gt = gt;
function gt(a, b, loose) {
return compare2(a, b, loose) > 0;
return compare3(a, b, loose) > 0;
}
exports2.lt = lt2;
function lt2(a, b, loose) {
return compare2(a, b, loose) < 0;
exports2.lt = lt;
function lt(a, b, loose) {
return compare3(a, b, loose) < 0;
}
exports2.eq = eq;
function eq(a, b, loose) {
return compare2(a, b, loose) === 0;
return compare3(a, b, loose) === 0;
}
exports2.neq = neq;
function neq(a, b, loose) {
return compare2(a, b, loose) !== 0;
return compare3(a, b, loose) !== 0;
}
exports2.gte = gte5;
function gte5(a, b, loose) {
return compare2(a, b, loose) >= 0;
return compare3(a, b, loose) >= 0;
}
exports2.lte = lte;
function lte(a, b, loose) {
return compare2(a, b, loose) <= 0;
return compare3(a, b, loose) <= 0;
}
exports2.cmp = cmp;
function cmp(a, op, b, loose) {
@@ -36190,7 +36190,7 @@ var require_semver3 = __commonJS({
case ">=":
return gte5(a, b, loose);
case "<":
return lt2(a, b, loose);
return lt(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 = lt;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt2;
gtfn = lt;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -92614,7 +92614,7 @@ async function getNightlyToolsUrl(logger) {
}
}
function getLatestToolcacheVersion(logger) {
const allVersions = toolcache3.findAllVersions("CodeQL").sort((a, b) => semver7.lt(a, b) ? 1 : -1);
const allVersions = toolcache3.findAllVersions("CodeQL").sort((a, b) => semver7.compare(b, a));
logger.debug(
`Found the following versions of the CodeQL tools in the toolcache: ${JSON.stringify(
allVersions
@@ -94798,7 +94798,7 @@ LongPrototype.greaterThanOrEqual = function greaterThanOrEqual(other) {
};
LongPrototype.gte = LongPrototype.greaterThanOrEqual;
LongPrototype.ge = LongPrototype.greaterThanOrEqual;
LongPrototype.compare = function compare(other) {
LongPrototype.compare = function compare2(other) {
if (!isLong(other)) other = fromValue(other);
if (this.eq(other)) return 0;
var thisNeg = this.isNegative(), otherNeg = other.isNegative();
+63 -63
View File
@@ -25121,8 +25121,8 @@ var require_compare = __commonJS({
"node_modules/semver/functions/compare.js"(exports2, module2) {
"use strict";
var SemVer = require_semver();
var compare = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose));
module2.exports = compare;
var compare2 = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose));
module2.exports = compare2;
}
});
@@ -25130,8 +25130,8 @@ var require_compare = __commonJS({
var require_rcompare = __commonJS({
"node_modules/semver/functions/rcompare.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var rcompare = (a, b, loose) => compare(b, a, loose);
var compare2 = require_compare();
var rcompare = (a, b, loose) => compare2(b, a, loose);
module2.exports = rcompare;
}
});
@@ -25140,8 +25140,8 @@ var require_rcompare = __commonJS({
var require_compare_loose = __commonJS({
"node_modules/semver/functions/compare-loose.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var compareLoose = (a, b) => compare(a, b, true);
var compare2 = require_compare();
var compareLoose = (a, b) => compare2(a, b, true);
module2.exports = compareLoose;
}
});
@@ -25184,8 +25184,8 @@ var require_rsort = __commonJS({
var require_gt = __commonJS({
"node_modules/semver/functions/gt.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var gt = (a, b, loose) => compare(a, b, loose) > 0;
var compare2 = require_compare();
var gt = (a, b, loose) => compare2(a, b, loose) > 0;
module2.exports = gt;
}
});
@@ -25194,9 +25194,9 @@ var require_gt = __commonJS({
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 compare2 = require_compare();
var lt = (a, b, loose) => compare2(a, b, loose) < 0;
module2.exports = lt;
}
});
@@ -25204,8 +25204,8 @@ var require_lt = __commonJS({
var require_eq = __commonJS({
"node_modules/semver/functions/eq.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var eq = (a, b, loose) => compare(a, b, loose) === 0;
var compare2 = require_compare();
var eq = (a, b, loose) => compare2(a, b, loose) === 0;
module2.exports = eq;
}
});
@@ -25214,8 +25214,8 @@ var require_eq = __commonJS({
var require_neq = __commonJS({
"node_modules/semver/functions/neq.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var neq = (a, b, loose) => compare(a, b, loose) !== 0;
var compare2 = require_compare();
var neq = (a, b, loose) => compare2(a, b, loose) !== 0;
module2.exports = neq;
}
});
@@ -25224,8 +25224,8 @@ var require_neq = __commonJS({
var require_gte = __commonJS({
"node_modules/semver/functions/gte.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var gte5 = (a, b, loose) => compare(a, b, loose) >= 0;
var compare2 = require_compare();
var gte5 = (a, b, loose) => compare2(a, b, loose) >= 0;
module2.exports = gte5;
}
});
@@ -25234,8 +25234,8 @@ var require_gte = __commonJS({
var require_lte = __commonJS({
"node_modules/semver/functions/lte.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var lte = (a, b, loose) => compare(a, b, loose) <= 0;
var compare2 = require_compare();
var lte = (a, b, loose) => compare2(a, b, loose) <= 0;
module2.exports = lte;
}
});
@@ -25248,7 +25248,7 @@ var require_cmp = __commonJS({
var neq = require_neq();
var gt = require_gt();
var gte5 = require_gte();
var lt2 = require_lt();
var lt = 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 lt2(a, b, loose);
return lt(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 lt2 = require_lt();
var lt = 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 = lt2;
ltfn = lt;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt2;
gtfn = lt;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -26131,12 +26131,12 @@ var require_simplify = __commonJS({
"node_modules/semver/ranges/simplify.js"(exports2, module2) {
"use strict";
var satisfies2 = require_satisfies();
var compare = require_compare();
var compare2 = require_compare();
module2.exports = (versions, range, options) => {
const set2 = [];
let first = null;
let prev = null;
const v = versions.sort((a, b) => compare(a, b, options));
const v = versions.sort((a, b) => compare2(a, b, options));
for (const version of v) {
const included = satisfies2(version, range, options);
if (included) {
@@ -26184,7 +26184,7 @@ var require_subset = __commonJS({
var Comparator = require_comparator();
var { ANY } = Comparator;
var satisfies2 = require_satisfies();
var compare = require_compare();
var compare2 = require_compare();
var subset = (sub, dom, options = {}) => {
if (sub === dom) {
return true;
@@ -26229,12 +26229,12 @@ var require_subset = __commonJS({
}
}
const eqSet = /* @__PURE__ */ new Set();
let gt, lt2;
let gt, lt;
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);
lt = lowerLT(lt, c, options);
} else {
eqSet.add(c.semver);
}
@@ -26243,11 +26243,11 @@ var require_subset = __commonJS({
return null;
}
let gtltComp;
if (gt && lt2) {
gtltComp = compare(gt.semver, lt2.semver, options);
if (gt && lt) {
gtltComp = compare2(gt.semver, lt.semver, options);
if (gtltComp > 0) {
return null;
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) {
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) {
return null;
}
}
@@ -26255,7 +26255,7 @@ var require_subset = __commonJS({
if (gt && !satisfies2(eq, String(gt), options)) {
return null;
}
if (lt2 && !satisfies2(eq, String(lt2), options)) {
if (lt && !satisfies2(eq, String(lt), options)) {
return null;
}
for (const c of dom) {
@@ -26267,9 +26267,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 = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.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 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) {
needDomLTPre = false;
}
for (const c of dom) {
@@ -26290,29 +26290,29 @@ var require_subset = __commonJS({
return false;
}
}
if (lt2) {
if (lt) {
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(lt, c, options);
if (lower === c && lower !== lt) {
return false;
}
} else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) {
} else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) {
return false;
}
}
if (!c.operator && (lt2 || gt) && gtltComp !== 0) {
if (!c.operator && (lt || gt) && gtltComp !== 0) {
return false;
}
}
if (gt && hasDomLT && !lt2 && gtltComp !== 0) {
if (gt && hasDomLT && !lt && gtltComp !== 0) {
return false;
}
if (lt2 && hasDomGT && !gt && gtltComp !== 0) {
if (lt && hasDomGT && !gt && gtltComp !== 0) {
return false;
}
if (needDomGTPre || needDomLTPre) {
@@ -26324,14 +26324,14 @@ var require_subset = __commonJS({
if (!a) {
return b;
}
const comp = compare(a.semver, b.semver, options);
const comp = compare2(a.semver, b.semver, options);
return comp > 0 ? a : comp < 0 ? b : b.operator === ">" && a.operator === ">=" ? b : a;
};
var lowerLT = (a, b, options) => {
if (!a) {
return b;
}
const comp = compare(a.semver, b.semver, options);
const comp = compare2(a.semver, b.semver, options);
return comp < 0 ? a : comp > 0 ? b : b.operator === "<" && a.operator === "<=" ? b : a;
};
module2.exports = subset;
@@ -26355,14 +26355,14 @@ var require_semver2 = __commonJS({
var minor = require_minor();
var patch = require_patch();
var prerelease = require_prerelease();
var compare = require_compare();
var compare2 = require_compare();
var rcompare = require_rcompare();
var compareLoose = require_compare_loose();
var compareBuild = require_compare_build();
var sort = require_sort();
var rsort = require_rsort();
var gt = require_gt();
var lt2 = require_lt();
var lt = require_lt();
var eq = require_eq();
var neq = require_neq();
var gte5 = require_gte();
@@ -26393,14 +26393,14 @@ var require_semver2 = __commonJS({
minor,
patch,
prerelease,
compare,
compare: compare2,
rcompare,
compareLoose,
compareBuild,
sort,
rsort,
gt,
lt: lt2,
lt,
eq,
neq,
gte: gte5,
@@ -30261,13 +30261,13 @@ var require_semver3 = __commonJS({
function patch(a, loose) {
return new SemVer(a, loose).patch;
}
exports2.compare = compare;
function compare(a, b, loose) {
exports2.compare = compare2;
function compare2(a, b, loose) {
return new SemVer(a, loose).compare(new SemVer(b, loose));
}
exports2.compareLoose = compareLoose;
function compareLoose(a, b) {
return compare(a, b, true);
return compare2(a, b, true);
}
exports2.compareBuild = compareBuild;
function compareBuild(a, b, loose) {
@@ -30277,7 +30277,7 @@ var require_semver3 = __commonJS({
}
exports2.rcompare = rcompare;
function rcompare(a, b, loose) {
return compare(b, a, loose);
return compare2(b, a, loose);
}
exports2.sort = sort;
function sort(list, loose) {
@@ -30293,27 +30293,27 @@ var require_semver3 = __commonJS({
}
exports2.gt = gt;
function gt(a, b, loose) {
return compare(a, b, loose) > 0;
return compare2(a, b, loose) > 0;
}
exports2.lt = lt2;
function lt2(a, b, loose) {
return compare(a, b, loose) < 0;
exports2.lt = lt;
function lt(a, b, loose) {
return compare2(a, b, loose) < 0;
}
exports2.eq = eq;
function eq(a, b, loose) {
return compare(a, b, loose) === 0;
return compare2(a, b, loose) === 0;
}
exports2.neq = neq;
function neq(a, b, loose) {
return compare(a, b, loose) !== 0;
return compare2(a, b, loose) !== 0;
}
exports2.gte = gte5;
function gte5(a, b, loose) {
return compare(a, b, loose) >= 0;
return compare2(a, b, loose) >= 0;
}
exports2.lte = lte;
function lte(a, b, loose) {
return compare(a, b, loose) <= 0;
return compare2(a, b, loose) <= 0;
}
exports2.cmp = cmp;
function cmp(a, op, b, loose) {
@@ -30341,7 +30341,7 @@ var require_semver3 = __commonJS({
case ">=":
return gte5(a, b, loose);
case "<":
return lt2(a, b, loose);
return lt(a, b, loose);
case "<=":
return lte(a, b, loose);
default:
@@ -30878,12 +30878,12 @@ var require_semver3 = __commonJS({
case ">":
gtfn = gt;
ltefn = lte;
ltfn = lt2;
ltfn = lt;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt2;
gtfn = lt;
ltefn = gte5;
ltfn = gt;
comp = "<";
+73 -73
View File
@@ -25039,7 +25039,7 @@ var require_to_regex_range = __commonJS({
stop = countZeros(max + 1, zeros) - 1;
}
stops = [...stops];
stops.sort(compare2);
stops.sort(compare3);
return stops;
}
function rangeToPattern(start, stop, options) {
@@ -25111,7 +25111,7 @@ var require_to_regex_range = __commonJS({
for (let i = 0; i < a.length; i++) arr.push([a[i], b[i]]);
return arr;
}
function compare2(a, b) {
function compare3(a, b) {
return a > b ? 1 : b > a ? -1 : 0;
}
function contains(arr, key, val2) {
@@ -30970,8 +30970,8 @@ var require_compare = __commonJS({
"node_modules/semver/functions/compare.js"(exports2, module2) {
"use strict";
var SemVer = require_semver();
var compare2 = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose));
module2.exports = compare2;
var compare3 = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose));
module2.exports = compare3;
}
});
@@ -30979,8 +30979,8 @@ var require_compare = __commonJS({
var require_rcompare = __commonJS({
"node_modules/semver/functions/rcompare.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var rcompare = (a, b, loose) => compare2(b, a, loose);
var compare3 = require_compare();
var rcompare = (a, b, loose) => compare3(b, a, loose);
module2.exports = rcompare;
}
});
@@ -30989,8 +30989,8 @@ var require_rcompare = __commonJS({
var require_compare_loose = __commonJS({
"node_modules/semver/functions/compare-loose.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var compareLoose = (a, b) => compare2(a, b, true);
var compare3 = require_compare();
var compareLoose = (a, b) => compare3(a, b, true);
module2.exports = compareLoose;
}
});
@@ -31033,8 +31033,8 @@ var require_rsort = __commonJS({
var require_gt = __commonJS({
"node_modules/semver/functions/gt.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var gt = (a, b, loose) => compare2(a, b, loose) > 0;
var compare3 = require_compare();
var gt = (a, b, loose) => compare3(a, b, loose) > 0;
module2.exports = gt;
}
});
@@ -31043,9 +31043,9 @@ var require_gt = __commonJS({
var require_lt = __commonJS({
"node_modules/semver/functions/lt.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var lt2 = (a, b, loose) => compare2(a, b, loose) < 0;
module2.exports = lt2;
var compare3 = require_compare();
var lt = (a, b, loose) => compare3(a, b, loose) < 0;
module2.exports = lt;
}
});
@@ -31053,8 +31053,8 @@ var require_lt = __commonJS({
var require_eq = __commonJS({
"node_modules/semver/functions/eq.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var eq = (a, b, loose) => compare2(a, b, loose) === 0;
var compare3 = require_compare();
var eq = (a, b, loose) => compare3(a, b, loose) === 0;
module2.exports = eq;
}
});
@@ -31063,8 +31063,8 @@ var require_eq = __commonJS({
var require_neq = __commonJS({
"node_modules/semver/functions/neq.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var neq = (a, b, loose) => compare2(a, b, loose) !== 0;
var compare3 = require_compare();
var neq = (a, b, loose) => compare3(a, b, loose) !== 0;
module2.exports = neq;
}
});
@@ -31073,8 +31073,8 @@ var require_neq = __commonJS({
var require_gte = __commonJS({
"node_modules/semver/functions/gte.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var gte5 = (a, b, loose) => compare2(a, b, loose) >= 0;
var compare3 = require_compare();
var gte5 = (a, b, loose) => compare3(a, b, loose) >= 0;
module2.exports = gte5;
}
});
@@ -31083,8 +31083,8 @@ var require_gte = __commonJS({
var require_lte = __commonJS({
"node_modules/semver/functions/lte.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var lte = (a, b, loose) => compare2(a, b, loose) <= 0;
var compare3 = require_compare();
var lte = (a, b, loose) => compare3(a, b, loose) <= 0;
module2.exports = lte;
}
});
@@ -31097,7 +31097,7 @@ var require_cmp = __commonJS({
var neq = require_neq();
var gt = require_gt();
var gte5 = require_gte();
var lt2 = require_lt();
var lt = 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 lt2(a, b, loose);
return lt(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 lt2 = require_lt();
var lt = 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 = lt2;
ltfn = lt;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt2;
gtfn = lt;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -31980,12 +31980,12 @@ var require_simplify = __commonJS({
"node_modules/semver/ranges/simplify.js"(exports2, module2) {
"use strict";
var satisfies2 = require_satisfies();
var compare2 = require_compare();
var compare3 = require_compare();
module2.exports = (versions, range, options) => {
const set2 = [];
let first = null;
let prev = null;
const v = versions.sort((a, b) => compare2(a, b, options));
const v = versions.sort((a, b) => compare3(a, b, options));
for (const version of v) {
const included = satisfies2(version, range, options);
if (included) {
@@ -32033,7 +32033,7 @@ var require_subset = __commonJS({
var Comparator = require_comparator();
var { ANY } = Comparator;
var satisfies2 = require_satisfies();
var compare2 = require_compare();
var compare3 = require_compare();
var subset = (sub, dom, options = {}) => {
if (sub === dom) {
return true;
@@ -32078,12 +32078,12 @@ var require_subset = __commonJS({
}
}
const eqSet = /* @__PURE__ */ new Set();
let gt, lt2;
let gt, lt;
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);
lt = lowerLT(lt, c, options);
} else {
eqSet.add(c.semver);
}
@@ -32092,11 +32092,11 @@ var require_subset = __commonJS({
return null;
}
let gtltComp;
if (gt && lt2) {
gtltComp = compare2(gt.semver, lt2.semver, options);
if (gt && lt) {
gtltComp = compare3(gt.semver, lt.semver, options);
if (gtltComp > 0) {
return null;
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) {
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) {
return null;
}
}
@@ -32104,7 +32104,7 @@ var require_subset = __commonJS({
if (gt && !satisfies2(eq, String(gt), options)) {
return null;
}
if (lt2 && !satisfies2(eq, String(lt2), options)) {
if (lt && !satisfies2(eq, String(lt), options)) {
return null;
}
for (const c of dom) {
@@ -32116,9 +32116,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 = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.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 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) {
needDomLTPre = false;
}
for (const c of dom) {
@@ -32139,29 +32139,29 @@ var require_subset = __commonJS({
return false;
}
}
if (lt2) {
if (lt) {
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(lt, c, options);
if (lower === c && lower !== lt) {
return false;
}
} else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) {
} else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) {
return false;
}
}
if (!c.operator && (lt2 || gt) && gtltComp !== 0) {
if (!c.operator && (lt || gt) && gtltComp !== 0) {
return false;
}
}
if (gt && hasDomLT && !lt2 && gtltComp !== 0) {
if (gt && hasDomLT && !lt && gtltComp !== 0) {
return false;
}
if (lt2 && hasDomGT && !gt && gtltComp !== 0) {
if (lt && hasDomGT && !gt && gtltComp !== 0) {
return false;
}
if (needDomGTPre || needDomLTPre) {
@@ -32173,14 +32173,14 @@ var require_subset = __commonJS({
if (!a) {
return b;
}
const comp = compare2(a.semver, b.semver, options);
const comp = compare3(a.semver, b.semver, options);
return comp > 0 ? a : comp < 0 ? b : b.operator === ">" && a.operator === ">=" ? b : a;
};
var lowerLT = (a, b, options) => {
if (!a) {
return b;
}
const comp = compare2(a.semver, b.semver, options);
const comp = compare3(a.semver, b.semver, options);
return comp < 0 ? a : comp > 0 ? b : b.operator === "<" && a.operator === "<=" ? b : a;
};
module2.exports = subset;
@@ -32204,14 +32204,14 @@ var require_semver2 = __commonJS({
var minor = require_minor();
var patch = require_patch();
var prerelease = require_prerelease();
var compare2 = require_compare();
var compare3 = require_compare();
var rcompare = require_rcompare();
var compareLoose = require_compare_loose();
var compareBuild = require_compare_build();
var sort = require_sort();
var rsort = require_rsort();
var gt = require_gt();
var lt2 = require_lt();
var lt = require_lt();
var eq = require_eq();
var neq = require_neq();
var gte5 = require_gte();
@@ -32242,14 +32242,14 @@ var require_semver2 = __commonJS({
minor,
patch,
prerelease,
compare: compare2,
compare: compare3,
rcompare,
compareLoose,
compareBuild,
sort,
rsort,
gt,
lt: lt2,
lt,
eq,
neq,
gte: gte5,
@@ -36110,13 +36110,13 @@ var require_semver3 = __commonJS({
function patch(a, loose) {
return new SemVer(a, loose).patch;
}
exports2.compare = compare2;
function compare2(a, b, loose) {
exports2.compare = compare3;
function compare3(a, b, loose) {
return new SemVer(a, loose).compare(new SemVer(b, loose));
}
exports2.compareLoose = compareLoose;
function compareLoose(a, b) {
return compare2(a, b, true);
return compare3(a, b, true);
}
exports2.compareBuild = compareBuild;
function compareBuild(a, b, loose) {
@@ -36126,7 +36126,7 @@ var require_semver3 = __commonJS({
}
exports2.rcompare = rcompare;
function rcompare(a, b, loose) {
return compare2(b, a, loose);
return compare3(b, a, loose);
}
exports2.sort = sort;
function sort(list, loose) {
@@ -36142,27 +36142,27 @@ var require_semver3 = __commonJS({
}
exports2.gt = gt;
function gt(a, b, loose) {
return compare2(a, b, loose) > 0;
return compare3(a, b, loose) > 0;
}
exports2.lt = lt2;
function lt2(a, b, loose) {
return compare2(a, b, loose) < 0;
exports2.lt = lt;
function lt(a, b, loose) {
return compare3(a, b, loose) < 0;
}
exports2.eq = eq;
function eq(a, b, loose) {
return compare2(a, b, loose) === 0;
return compare3(a, b, loose) === 0;
}
exports2.neq = neq;
function neq(a, b, loose) {
return compare2(a, b, loose) !== 0;
return compare3(a, b, loose) !== 0;
}
exports2.gte = gte5;
function gte5(a, b, loose) {
return compare2(a, b, loose) >= 0;
return compare3(a, b, loose) >= 0;
}
exports2.lte = lte;
function lte(a, b, loose) {
return compare2(a, b, loose) <= 0;
return compare3(a, b, loose) <= 0;
}
exports2.cmp = cmp;
function cmp(a, op, b, loose) {
@@ -36190,7 +36190,7 @@ var require_semver3 = __commonJS({
case ">=":
return gte5(a, b, loose);
case "<":
return lt2(a, b, loose);
return lt(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 = lt;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt2;
gtfn = lt;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -101672,8 +101672,8 @@ var require_commonjs16 = __commonJS({
if (rootPath === this.root.name) {
return this.root;
}
for (const [compare2, root] of Object.entries(this.roots)) {
if (this.sameRoot(rootPath, compare2)) {
for (const [compare3, root] of Object.entries(this.roots)) {
if (this.sameRoot(rootPath, compare3)) {
return this.roots[rootPath] = root;
}
}
@@ -101682,9 +101682,9 @@ var require_commonjs16 = __commonJS({
/**
* @internal
*/
sameRoot(rootPath, compare2 = this.root.name) {
sameRoot(rootPath, compare3 = this.root.name) {
rootPath = rootPath.toUpperCase().replace(/\//g, "\\").replace(uncDriveRegexp, "$1\\");
return rootPath === compare2;
return rootPath === compare3;
}
};
exports2.PathWin32 = PathWin32;
@@ -105703,7 +105703,7 @@ var require_b4a = __commonJS({
function byteLength(string, encoding) {
return Buffer.byteLength(string, encoding);
}
function compare2(a, b) {
function compare3(a, b) {
return Buffer.compare(a, b);
}
function concat(buffers, totalLength) {
@@ -105804,7 +105804,7 @@ var require_b4a = __commonJS({
allocUnsafe,
allocUnsafeSlow,
byteLength,
compare: compare2,
compare: compare3,
concat,
copy,
equals: equals2,
@@ -130596,7 +130596,7 @@ async function getNightlyToolsUrl(logger) {
}
}
function getLatestToolcacheVersion(logger) {
const allVersions = toolcache3.findAllVersions("CodeQL").sort((a, b) => semver7.lt(a, b) ? 1 : -1);
const allVersions = toolcache3.findAllVersions("CodeQL").sort((a, b) => semver7.compare(b, a));
logger.debug(
`Found the following versions of the CodeQL tools in the toolcache: ${JSON.stringify(
allVersions
@@ -132274,7 +132274,7 @@ LongPrototype.greaterThanOrEqual = function greaterThanOrEqual(other) {
};
LongPrototype.gte = LongPrototype.greaterThanOrEqual;
LongPrototype.ge = LongPrototype.greaterThanOrEqual;
LongPrototype.compare = function compare(other) {
LongPrototype.compare = function compare2(other) {
if (!isLong(other)) other = fromValue(other);
if (this.eq(other)) return 0;
var thisNeg = this.isNegative(), otherNeg = other.isNegative();
+66 -66
View File
@@ -20412,8 +20412,8 @@ var require_compare = __commonJS({
"node_modules/semver/functions/compare.js"(exports2, module2) {
"use strict";
var SemVer = require_semver();
var compare = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose));
module2.exports = compare;
var compare2 = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose));
module2.exports = compare2;
}
});
@@ -20421,8 +20421,8 @@ var require_compare = __commonJS({
var require_rcompare = __commonJS({
"node_modules/semver/functions/rcompare.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var rcompare = (a, b, loose) => compare(b, a, loose);
var compare2 = require_compare();
var rcompare = (a, b, loose) => compare2(b, a, loose);
module2.exports = rcompare;
}
});
@@ -20431,8 +20431,8 @@ var require_rcompare = __commonJS({
var require_compare_loose = __commonJS({
"node_modules/semver/functions/compare-loose.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var compareLoose = (a, b) => compare(a, b, true);
var compare2 = require_compare();
var compareLoose = (a, b) => compare2(a, b, true);
module2.exports = compareLoose;
}
});
@@ -20475,8 +20475,8 @@ var require_rsort = __commonJS({
var require_gt = __commonJS({
"node_modules/semver/functions/gt.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var gt = (a, b, loose) => compare(a, b, loose) > 0;
var compare2 = require_compare();
var gt = (a, b, loose) => compare2(a, b, loose) > 0;
module2.exports = gt;
}
});
@@ -20485,9 +20485,9 @@ var require_gt = __commonJS({
var require_lt = __commonJS({
"node_modules/semver/functions/lt.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var lt3 = (a, b, loose) => compare(a, b, loose) < 0;
module2.exports = lt3;
var compare2 = require_compare();
var lt2 = (a, b, loose) => compare2(a, b, loose) < 0;
module2.exports = lt2;
}
});
@@ -20495,8 +20495,8 @@ var require_lt = __commonJS({
var require_eq = __commonJS({
"node_modules/semver/functions/eq.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var eq = (a, b, loose) => compare(a, b, loose) === 0;
var compare2 = require_compare();
var eq = (a, b, loose) => compare2(a, b, loose) === 0;
module2.exports = eq;
}
});
@@ -20505,8 +20505,8 @@ var require_eq = __commonJS({
var require_neq = __commonJS({
"node_modules/semver/functions/neq.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var neq = (a, b, loose) => compare(a, b, loose) !== 0;
var compare2 = require_compare();
var neq = (a, b, loose) => compare2(a, b, loose) !== 0;
module2.exports = neq;
}
});
@@ -20515,8 +20515,8 @@ var require_neq = __commonJS({
var require_gte = __commonJS({
"node_modules/semver/functions/gte.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var gte5 = (a, b, loose) => compare(a, b, loose) >= 0;
var compare2 = require_compare();
var gte5 = (a, b, loose) => compare2(a, b, loose) >= 0;
module2.exports = gte5;
}
});
@@ -20525,8 +20525,8 @@ var require_gte = __commonJS({
var require_lte = __commonJS({
"node_modules/semver/functions/lte.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var lte = (a, b, loose) => compare(a, b, loose) <= 0;
var compare2 = require_compare();
var lte = (a, b, loose) => compare2(a, b, loose) <= 0;
module2.exports = lte;
}
});
@@ -20539,7 +20539,7 @@ var require_cmp = __commonJS({
var neq = require_neq();
var gt = require_gt();
var gte5 = require_gte();
var lt3 = require_lt();
var lt2 = 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 lt3(a, b, loose);
return lt2(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 lt3 = require_lt();
var lt2 = 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 = lt3;
ltfn = lt2;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt3;
gtfn = lt2;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -21422,12 +21422,12 @@ var require_simplify = __commonJS({
"node_modules/semver/ranges/simplify.js"(exports2, module2) {
"use strict";
var satisfies2 = require_satisfies();
var compare = require_compare();
var compare2 = require_compare();
module2.exports = (versions, range, options) => {
const set2 = [];
let first = null;
let prev = null;
const v = versions.sort((a, b) => compare(a, b, options));
const v = versions.sort((a, b) => compare2(a, b, options));
for (const version of v) {
const included = satisfies2(version, range, options);
if (included) {
@@ -21475,7 +21475,7 @@ var require_subset = __commonJS({
var Comparator = require_comparator();
var { ANY } = Comparator;
var satisfies2 = require_satisfies();
var compare = require_compare();
var compare2 = require_compare();
var subset = (sub, dom, options = {}) => {
if (sub === dom) {
return true;
@@ -21520,12 +21520,12 @@ var require_subset = __commonJS({
}
}
const eqSet = /* @__PURE__ */ new Set();
let gt, lt3;
let gt, lt2;
for (const c of sub) {
if (c.operator === ">" || c.operator === ">=") {
gt = higherGT(gt, c, options);
} else if (c.operator === "<" || c.operator === "<=") {
lt3 = lowerLT(lt3, c, options);
lt2 = lowerLT(lt2, c, options);
} else {
eqSet.add(c.semver);
}
@@ -21534,11 +21534,11 @@ var require_subset = __commonJS({
return null;
}
let gtltComp;
if (gt && lt3) {
gtltComp = compare(gt.semver, lt3.semver, options);
if (gt && lt2) {
gtltComp = compare2(gt.semver, lt2.semver, options);
if (gtltComp > 0) {
return null;
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt3.operator !== "<=")) {
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) {
return null;
}
}
@@ -21546,7 +21546,7 @@ var require_subset = __commonJS({
if (gt && !satisfies2(eq, String(gt), options)) {
return null;
}
if (lt3 && !satisfies2(eq, String(lt3), options)) {
if (lt2 && !satisfies2(eq, String(lt2), options)) {
return null;
}
for (const c of dom) {
@@ -21558,9 +21558,9 @@ var require_subset = __commonJS({
}
let higher, lower;
let hasDomLT, hasDomGT;
let needDomLTPre = lt3 && !options.includePrerelease && lt3.semver.prerelease.length ? lt3.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 && lt3.operator === "<" && needDomLTPre.prerelease[0] === 0) {
if (needDomLTPre && needDomLTPre.prerelease.length === 1 && lt2.operator === "<" && needDomLTPre.prerelease[0] === 0) {
needDomLTPre = false;
}
for (const c of dom) {
@@ -21581,29 +21581,29 @@ var require_subset = __commonJS({
return false;
}
}
if (lt3) {
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(lt3, c, options);
if (lower === c && lower !== lt3) {
lower = lowerLT(lt2, c, options);
if (lower === c && lower !== lt2) {
return false;
}
} else if (lt3.operator === "<=" && !satisfies2(lt3.semver, String(c), options)) {
} else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) {
return false;
}
}
if (!c.operator && (lt3 || gt) && gtltComp !== 0) {
if (!c.operator && (lt2 || gt) && gtltComp !== 0) {
return false;
}
}
if (gt && hasDomLT && !lt3 && gtltComp !== 0) {
if (gt && hasDomLT && !lt2 && gtltComp !== 0) {
return false;
}
if (lt3 && hasDomGT && !gt && gtltComp !== 0) {
if (lt2 && hasDomGT && !gt && gtltComp !== 0) {
return false;
}
if (needDomGTPre || needDomLTPre) {
@@ -21615,14 +21615,14 @@ var require_subset = __commonJS({
if (!a) {
return b;
}
const comp = compare(a.semver, b.semver, options);
const comp = compare2(a.semver, b.semver, options);
return comp > 0 ? a : comp < 0 ? b : b.operator === ">" && a.operator === ">=" ? b : a;
};
var lowerLT = (a, b, options) => {
if (!a) {
return b;
}
const comp = compare(a.semver, b.semver, options);
const comp = compare2(a.semver, b.semver, options);
return comp < 0 ? a : comp > 0 ? b : b.operator === "<" && a.operator === "<=" ? b : a;
};
module2.exports = subset;
@@ -21646,14 +21646,14 @@ var require_semver2 = __commonJS({
var minor = require_minor();
var patch = require_patch();
var prerelease = require_prerelease();
var compare = require_compare();
var compare2 = require_compare();
var rcompare = require_rcompare();
var compareLoose = require_compare_loose();
var compareBuild = require_compare_build();
var sort = require_sort();
var rsort = require_rsort();
var gt = require_gt();
var lt3 = require_lt();
var lt2 = require_lt();
var eq = require_eq();
var neq = require_neq();
var gte5 = require_gte();
@@ -21684,14 +21684,14 @@ var require_semver2 = __commonJS({
minor,
patch,
prerelease,
compare,
compare: compare2,
rcompare,
compareLoose,
compareBuild,
sort,
rsort,
gt,
lt: lt3,
lt: lt2,
eq,
neq,
gte: gte5,
@@ -26947,7 +26947,7 @@ var require_to_regex_range = __commonJS({
stop = countZeros(max + 1, zeros) - 1;
}
stops = [...stops];
stops.sort(compare);
stops.sort(compare2);
return stops;
}
function rangeToPattern(start, stop, options) {
@@ -27019,7 +27019,7 @@ var require_to_regex_range = __commonJS({
for (let i = 0; i < a.length; i++) arr.push([a[i], b[i]]);
return arr;
}
function compare(a, b) {
function compare2(a, b) {
return a > b ? 1 : b > a ? -1 : 0;
}
function contains(arr, key, val2) {
@@ -36110,13 +36110,13 @@ var require_semver3 = __commonJS({
function patch(a, loose) {
return new SemVer(a, loose).patch;
}
exports2.compare = compare;
function compare(a, b, loose) {
exports2.compare = compare2;
function compare2(a, b, loose) {
return new SemVer(a, loose).compare(new SemVer(b, loose));
}
exports2.compareLoose = compareLoose;
function compareLoose(a, b) {
return compare(a, b, true);
return compare2(a, b, true);
}
exports2.compareBuild = compareBuild;
function compareBuild(a, b, loose) {
@@ -36126,7 +36126,7 @@ var require_semver3 = __commonJS({
}
exports2.rcompare = rcompare;
function rcompare(a, b, loose) {
return compare(b, a, loose);
return compare2(b, a, loose);
}
exports2.sort = sort;
function sort(list, loose) {
@@ -36142,27 +36142,27 @@ var require_semver3 = __commonJS({
}
exports2.gt = gt;
function gt(a, b, loose) {
return compare(a, b, loose) > 0;
return compare2(a, b, loose) > 0;
}
exports2.lt = lt3;
function lt3(a, b, loose) {
return compare(a, b, loose) < 0;
exports2.lt = lt2;
function lt2(a, b, loose) {
return compare2(a, b, loose) < 0;
}
exports2.eq = eq;
function eq(a, b, loose) {
return compare(a, b, loose) === 0;
return compare2(a, b, loose) === 0;
}
exports2.neq = neq;
function neq(a, b, loose) {
return compare(a, b, loose) !== 0;
return compare2(a, b, loose) !== 0;
}
exports2.gte = gte5;
function gte5(a, b, loose) {
return compare(a, b, loose) >= 0;
return compare2(a, b, loose) >= 0;
}
exports2.lte = lte;
function lte(a, b, loose) {
return compare(a, b, loose) <= 0;
return compare2(a, b, loose) <= 0;
}
exports2.cmp = cmp;
function cmp(a, op, b, loose) {
@@ -36190,7 +36190,7 @@ var require_semver3 = __commonJS({
case ">=":
return gte5(a, b, loose);
case "<":
return lt3(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 = lt3;
ltfn = lt2;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt3;
gtfn = lt2;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -89389,7 +89389,7 @@ async function getNightlyToolsUrl(logger) {
}
}
function getLatestToolcacheVersion(logger) {
const allVersions = toolcache3.findAllVersions("CodeQL").sort((a, b) => semver7.lt(a, b) ? 1 : -1);
const allVersions = toolcache3.findAllVersions("CodeQL").sort((a, b) => semver7.compare(b, a));
logger.debug(
`Found the following versions of the CodeQL tools in the toolcache: ${JSON.stringify(
allVersions
+63 -63
View File
@@ -25121,8 +25121,8 @@ var require_compare = __commonJS({
"node_modules/semver/functions/compare.js"(exports2, module2) {
"use strict";
var SemVer = require_semver();
var compare = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose));
module2.exports = compare;
var compare2 = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose));
module2.exports = compare2;
}
});
@@ -25130,8 +25130,8 @@ var require_compare = __commonJS({
var require_rcompare = __commonJS({
"node_modules/semver/functions/rcompare.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var rcompare = (a, b, loose) => compare(b, a, loose);
var compare2 = require_compare();
var rcompare = (a, b, loose) => compare2(b, a, loose);
module2.exports = rcompare;
}
});
@@ -25140,8 +25140,8 @@ var require_rcompare = __commonJS({
var require_compare_loose = __commonJS({
"node_modules/semver/functions/compare-loose.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var compareLoose = (a, b) => compare(a, b, true);
var compare2 = require_compare();
var compareLoose = (a, b) => compare2(a, b, true);
module2.exports = compareLoose;
}
});
@@ -25184,8 +25184,8 @@ var require_rsort = __commonJS({
var require_gt = __commonJS({
"node_modules/semver/functions/gt.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var gt = (a, b, loose) => compare(a, b, loose) > 0;
var compare2 = require_compare();
var gt = (a, b, loose) => compare2(a, b, loose) > 0;
module2.exports = gt;
}
});
@@ -25194,9 +25194,9 @@ var require_gt = __commonJS({
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 compare2 = require_compare();
var lt = (a, b, loose) => compare2(a, b, loose) < 0;
module2.exports = lt;
}
});
@@ -25204,8 +25204,8 @@ var require_lt = __commonJS({
var require_eq = __commonJS({
"node_modules/semver/functions/eq.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var eq = (a, b, loose) => compare(a, b, loose) === 0;
var compare2 = require_compare();
var eq = (a, b, loose) => compare2(a, b, loose) === 0;
module2.exports = eq;
}
});
@@ -25214,8 +25214,8 @@ var require_eq = __commonJS({
var require_neq = __commonJS({
"node_modules/semver/functions/neq.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var neq = (a, b, loose) => compare(a, b, loose) !== 0;
var compare2 = require_compare();
var neq = (a, b, loose) => compare2(a, b, loose) !== 0;
module2.exports = neq;
}
});
@@ -25224,8 +25224,8 @@ var require_neq = __commonJS({
var require_gte = __commonJS({
"node_modules/semver/functions/gte.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var gte5 = (a, b, loose) => compare(a, b, loose) >= 0;
var compare2 = require_compare();
var gte5 = (a, b, loose) => compare2(a, b, loose) >= 0;
module2.exports = gte5;
}
});
@@ -25234,8 +25234,8 @@ var require_gte = __commonJS({
var require_lte = __commonJS({
"node_modules/semver/functions/lte.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var lte = (a, b, loose) => compare(a, b, loose) <= 0;
var compare2 = require_compare();
var lte = (a, b, loose) => compare2(a, b, loose) <= 0;
module2.exports = lte;
}
});
@@ -25248,7 +25248,7 @@ var require_cmp = __commonJS({
var neq = require_neq();
var gt = require_gt();
var gte5 = require_gte();
var lt2 = require_lt();
var lt = 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 lt2(a, b, loose);
return lt(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 lt2 = require_lt();
var lt = 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 = lt2;
ltfn = lt;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt2;
gtfn = lt;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -26131,12 +26131,12 @@ var require_simplify = __commonJS({
"node_modules/semver/ranges/simplify.js"(exports2, module2) {
"use strict";
var satisfies2 = require_satisfies();
var compare = require_compare();
var compare2 = require_compare();
module2.exports = (versions, range, options) => {
const set2 = [];
let first = null;
let prev = null;
const v = versions.sort((a, b) => compare(a, b, options));
const v = versions.sort((a, b) => compare2(a, b, options));
for (const version of v) {
const included = satisfies2(version, range, options);
if (included) {
@@ -26184,7 +26184,7 @@ var require_subset = __commonJS({
var Comparator = require_comparator();
var { ANY } = Comparator;
var satisfies2 = require_satisfies();
var compare = require_compare();
var compare2 = require_compare();
var subset = (sub, dom, options = {}) => {
if (sub === dom) {
return true;
@@ -26229,12 +26229,12 @@ var require_subset = __commonJS({
}
}
const eqSet = /* @__PURE__ */ new Set();
let gt, lt2;
let gt, lt;
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);
lt = lowerLT(lt, c, options);
} else {
eqSet.add(c.semver);
}
@@ -26243,11 +26243,11 @@ var require_subset = __commonJS({
return null;
}
let gtltComp;
if (gt && lt2) {
gtltComp = compare(gt.semver, lt2.semver, options);
if (gt && lt) {
gtltComp = compare2(gt.semver, lt.semver, options);
if (gtltComp > 0) {
return null;
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) {
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) {
return null;
}
}
@@ -26255,7 +26255,7 @@ var require_subset = __commonJS({
if (gt && !satisfies2(eq, String(gt), options)) {
return null;
}
if (lt2 && !satisfies2(eq, String(lt2), options)) {
if (lt && !satisfies2(eq, String(lt), options)) {
return null;
}
for (const c of dom) {
@@ -26267,9 +26267,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 = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.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 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) {
needDomLTPre = false;
}
for (const c of dom) {
@@ -26290,29 +26290,29 @@ var require_subset = __commonJS({
return false;
}
}
if (lt2) {
if (lt) {
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(lt, c, options);
if (lower === c && lower !== lt) {
return false;
}
} else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) {
} else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) {
return false;
}
}
if (!c.operator && (lt2 || gt) && gtltComp !== 0) {
if (!c.operator && (lt || gt) && gtltComp !== 0) {
return false;
}
}
if (gt && hasDomLT && !lt2 && gtltComp !== 0) {
if (gt && hasDomLT && !lt && gtltComp !== 0) {
return false;
}
if (lt2 && hasDomGT && !gt && gtltComp !== 0) {
if (lt && hasDomGT && !gt && gtltComp !== 0) {
return false;
}
if (needDomGTPre || needDomLTPre) {
@@ -26324,14 +26324,14 @@ var require_subset = __commonJS({
if (!a) {
return b;
}
const comp = compare(a.semver, b.semver, options);
const comp = compare2(a.semver, b.semver, options);
return comp > 0 ? a : comp < 0 ? b : b.operator === ">" && a.operator === ">=" ? b : a;
};
var lowerLT = (a, b, options) => {
if (!a) {
return b;
}
const comp = compare(a.semver, b.semver, options);
const comp = compare2(a.semver, b.semver, options);
return comp < 0 ? a : comp > 0 ? b : b.operator === "<" && a.operator === "<=" ? b : a;
};
module2.exports = subset;
@@ -26355,14 +26355,14 @@ var require_semver2 = __commonJS({
var minor = require_minor();
var patch = require_patch();
var prerelease = require_prerelease();
var compare = require_compare();
var compare2 = require_compare();
var rcompare = require_rcompare();
var compareLoose = require_compare_loose();
var compareBuild = require_compare_build();
var sort = require_sort();
var rsort = require_rsort();
var gt = require_gt();
var lt2 = require_lt();
var lt = require_lt();
var eq = require_eq();
var neq = require_neq();
var gte5 = require_gte();
@@ -26393,14 +26393,14 @@ var require_semver2 = __commonJS({
minor,
patch,
prerelease,
compare,
compare: compare2,
rcompare,
compareLoose,
compareBuild,
sort,
rsort,
gt,
lt: lt2,
lt,
eq,
neq,
gte: gte5,
@@ -30261,13 +30261,13 @@ var require_semver3 = __commonJS({
function patch(a, loose) {
return new SemVer(a, loose).patch;
}
exports2.compare = compare;
function compare(a, b, loose) {
exports2.compare = compare2;
function compare2(a, b, loose) {
return new SemVer(a, loose).compare(new SemVer(b, loose));
}
exports2.compareLoose = compareLoose;
function compareLoose(a, b) {
return compare(a, b, true);
return compare2(a, b, true);
}
exports2.compareBuild = compareBuild;
function compareBuild(a, b, loose) {
@@ -30277,7 +30277,7 @@ var require_semver3 = __commonJS({
}
exports2.rcompare = rcompare;
function rcompare(a, b, loose) {
return compare(b, a, loose);
return compare2(b, a, loose);
}
exports2.sort = sort;
function sort(list, loose) {
@@ -30293,27 +30293,27 @@ var require_semver3 = __commonJS({
}
exports2.gt = gt;
function gt(a, b, loose) {
return compare(a, b, loose) > 0;
return compare2(a, b, loose) > 0;
}
exports2.lt = lt2;
function lt2(a, b, loose) {
return compare(a, b, loose) < 0;
exports2.lt = lt;
function lt(a, b, loose) {
return compare2(a, b, loose) < 0;
}
exports2.eq = eq;
function eq(a, b, loose) {
return compare(a, b, loose) === 0;
return compare2(a, b, loose) === 0;
}
exports2.neq = neq;
function neq(a, b, loose) {
return compare(a, b, loose) !== 0;
return compare2(a, b, loose) !== 0;
}
exports2.gte = gte5;
function gte5(a, b, loose) {
return compare(a, b, loose) >= 0;
return compare2(a, b, loose) >= 0;
}
exports2.lte = lte;
function lte(a, b, loose) {
return compare(a, b, loose) <= 0;
return compare2(a, b, loose) <= 0;
}
exports2.cmp = cmp;
function cmp(a, op, b, loose) {
@@ -30341,7 +30341,7 @@ var require_semver3 = __commonJS({
case ">=":
return gte5(a, b, loose);
case "<":
return lt2(a, b, loose);
return lt(a, b, loose);
case "<=":
return lte(a, b, loose);
default:
@@ -30878,12 +30878,12 @@ var require_semver3 = __commonJS({
case ">":
gtfn = gt;
ltefn = lte;
ltfn = lt2;
ltfn = lt;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt2;
gtfn = lt;
ltefn = gte5;
ltfn = gt;
comp = "<";
+69 -69
View File
@@ -25121,8 +25121,8 @@ var require_compare = __commonJS({
"node_modules/semver/functions/compare.js"(exports2, module2) {
"use strict";
var SemVer = require_semver();
var compare = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose));
module2.exports = compare;
var compare2 = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose));
module2.exports = compare2;
}
});
@@ -25130,8 +25130,8 @@ var require_compare = __commonJS({
var require_rcompare = __commonJS({
"node_modules/semver/functions/rcompare.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var rcompare = (a, b, loose) => compare(b, a, loose);
var compare2 = require_compare();
var rcompare = (a, b, loose) => compare2(b, a, loose);
module2.exports = rcompare;
}
});
@@ -25140,8 +25140,8 @@ var require_rcompare = __commonJS({
var require_compare_loose = __commonJS({
"node_modules/semver/functions/compare-loose.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var compareLoose = (a, b) => compare(a, b, true);
var compare2 = require_compare();
var compareLoose = (a, b) => compare2(a, b, true);
module2.exports = compareLoose;
}
});
@@ -25184,8 +25184,8 @@ var require_rsort = __commonJS({
var require_gt = __commonJS({
"node_modules/semver/functions/gt.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var gt = (a, b, loose) => compare(a, b, loose) > 0;
var compare2 = require_compare();
var gt = (a, b, loose) => compare2(a, b, loose) > 0;
module2.exports = gt;
}
});
@@ -25194,9 +25194,9 @@ var require_gt = __commonJS({
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 compare2 = require_compare();
var lt = (a, b, loose) => compare2(a, b, loose) < 0;
module2.exports = lt;
}
});
@@ -25204,8 +25204,8 @@ var require_lt = __commonJS({
var require_eq = __commonJS({
"node_modules/semver/functions/eq.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var eq = (a, b, loose) => compare(a, b, loose) === 0;
var compare2 = require_compare();
var eq = (a, b, loose) => compare2(a, b, loose) === 0;
module2.exports = eq;
}
});
@@ -25214,8 +25214,8 @@ var require_eq = __commonJS({
var require_neq = __commonJS({
"node_modules/semver/functions/neq.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var neq = (a, b, loose) => compare(a, b, loose) !== 0;
var compare2 = require_compare();
var neq = (a, b, loose) => compare2(a, b, loose) !== 0;
module2.exports = neq;
}
});
@@ -25224,8 +25224,8 @@ var require_neq = __commonJS({
var require_gte = __commonJS({
"node_modules/semver/functions/gte.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var gte5 = (a, b, loose) => compare(a, b, loose) >= 0;
var compare2 = require_compare();
var gte5 = (a, b, loose) => compare2(a, b, loose) >= 0;
module2.exports = gte5;
}
});
@@ -25234,8 +25234,8 @@ var require_gte = __commonJS({
var require_lte = __commonJS({
"node_modules/semver/functions/lte.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var lte = (a, b, loose) => compare(a, b, loose) <= 0;
var compare2 = require_compare();
var lte = (a, b, loose) => compare2(a, b, loose) <= 0;
module2.exports = lte;
}
});
@@ -25248,7 +25248,7 @@ var require_cmp = __commonJS({
var neq = require_neq();
var gt = require_gt();
var gte5 = require_gte();
var lt2 = require_lt();
var lt = 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 lt2(a, b, loose);
return lt(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 lt2 = require_lt();
var lt = 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 = lt2;
ltfn = lt;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt2;
gtfn = lt;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -26131,12 +26131,12 @@ var require_simplify = __commonJS({
"node_modules/semver/ranges/simplify.js"(exports2, module2) {
"use strict";
var satisfies2 = require_satisfies();
var compare = require_compare();
var compare2 = require_compare();
module2.exports = (versions, range, options) => {
const set2 = [];
let first = null;
let prev = null;
const v = versions.sort((a, b) => compare(a, b, options));
const v = versions.sort((a, b) => compare2(a, b, options));
for (const version of v) {
const included = satisfies2(version, range, options);
if (included) {
@@ -26184,7 +26184,7 @@ var require_subset = __commonJS({
var Comparator = require_comparator();
var { ANY } = Comparator;
var satisfies2 = require_satisfies();
var compare = require_compare();
var compare2 = require_compare();
var subset = (sub, dom, options = {}) => {
if (sub === dom) {
return true;
@@ -26229,12 +26229,12 @@ var require_subset = __commonJS({
}
}
const eqSet = /* @__PURE__ */ new Set();
let gt, lt2;
let gt, lt;
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);
lt = lowerLT(lt, c, options);
} else {
eqSet.add(c.semver);
}
@@ -26243,11 +26243,11 @@ var require_subset = __commonJS({
return null;
}
let gtltComp;
if (gt && lt2) {
gtltComp = compare(gt.semver, lt2.semver, options);
if (gt && lt) {
gtltComp = compare2(gt.semver, lt.semver, options);
if (gtltComp > 0) {
return null;
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) {
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) {
return null;
}
}
@@ -26255,7 +26255,7 @@ var require_subset = __commonJS({
if (gt && !satisfies2(eq, String(gt), options)) {
return null;
}
if (lt2 && !satisfies2(eq, String(lt2), options)) {
if (lt && !satisfies2(eq, String(lt), options)) {
return null;
}
for (const c of dom) {
@@ -26267,9 +26267,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 = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.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 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) {
needDomLTPre = false;
}
for (const c of dom) {
@@ -26290,29 +26290,29 @@ var require_subset = __commonJS({
return false;
}
}
if (lt2) {
if (lt) {
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(lt, c, options);
if (lower === c && lower !== lt) {
return false;
}
} else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) {
} else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) {
return false;
}
}
if (!c.operator && (lt2 || gt) && gtltComp !== 0) {
if (!c.operator && (lt || gt) && gtltComp !== 0) {
return false;
}
}
if (gt && hasDomLT && !lt2 && gtltComp !== 0) {
if (gt && hasDomLT && !lt && gtltComp !== 0) {
return false;
}
if (lt2 && hasDomGT && !gt && gtltComp !== 0) {
if (lt && hasDomGT && !gt && gtltComp !== 0) {
return false;
}
if (needDomGTPre || needDomLTPre) {
@@ -26324,14 +26324,14 @@ var require_subset = __commonJS({
if (!a) {
return b;
}
const comp = compare(a.semver, b.semver, options);
const comp = compare2(a.semver, b.semver, options);
return comp > 0 ? a : comp < 0 ? b : b.operator === ">" && a.operator === ">=" ? b : a;
};
var lowerLT = (a, b, options) => {
if (!a) {
return b;
}
const comp = compare(a.semver, b.semver, options);
const comp = compare2(a.semver, b.semver, options);
return comp < 0 ? a : comp > 0 ? b : b.operator === "<" && a.operator === "<=" ? b : a;
};
module2.exports = subset;
@@ -26355,14 +26355,14 @@ var require_semver2 = __commonJS({
var minor = require_minor();
var patch = require_patch();
var prerelease = require_prerelease();
var compare = require_compare();
var compare2 = require_compare();
var rcompare = require_rcompare();
var compareLoose = require_compare_loose();
var compareBuild = require_compare_build();
var sort = require_sort();
var rsort = require_rsort();
var gt = require_gt();
var lt2 = require_lt();
var lt = require_lt();
var eq = require_eq();
var neq = require_neq();
var gte5 = require_gte();
@@ -26393,14 +26393,14 @@ var require_semver2 = __commonJS({
minor,
patch,
prerelease,
compare,
compare: compare2,
rcompare,
compareLoose,
compareBuild,
sort,
rsort,
gt,
lt: lt2,
lt,
eq,
neq,
gte: gte5,
@@ -30261,13 +30261,13 @@ var require_semver3 = __commonJS({
function patch(a, loose) {
return new SemVer(a, loose).patch;
}
exports2.compare = compare;
function compare(a, b, loose) {
exports2.compare = compare2;
function compare2(a, b, loose) {
return new SemVer(a, loose).compare(new SemVer(b, loose));
}
exports2.compareLoose = compareLoose;
function compareLoose(a, b) {
return compare(a, b, true);
return compare2(a, b, true);
}
exports2.compareBuild = compareBuild;
function compareBuild(a, b, loose) {
@@ -30277,7 +30277,7 @@ var require_semver3 = __commonJS({
}
exports2.rcompare = rcompare;
function rcompare(a, b, loose) {
return compare(b, a, loose);
return compare2(b, a, loose);
}
exports2.sort = sort;
function sort(list, loose) {
@@ -30293,27 +30293,27 @@ var require_semver3 = __commonJS({
}
exports2.gt = gt;
function gt(a, b, loose) {
return compare(a, b, loose) > 0;
return compare2(a, b, loose) > 0;
}
exports2.lt = lt2;
function lt2(a, b, loose) {
return compare(a, b, loose) < 0;
exports2.lt = lt;
function lt(a, b, loose) {
return compare2(a, b, loose) < 0;
}
exports2.eq = eq;
function eq(a, b, loose) {
return compare(a, b, loose) === 0;
return compare2(a, b, loose) === 0;
}
exports2.neq = neq;
function neq(a, b, loose) {
return compare(a, b, loose) !== 0;
return compare2(a, b, loose) !== 0;
}
exports2.gte = gte5;
function gte5(a, b, loose) {
return compare(a, b, loose) >= 0;
return compare2(a, b, loose) >= 0;
}
exports2.lte = lte;
function lte(a, b, loose) {
return compare(a, b, loose) <= 0;
return compare2(a, b, loose) <= 0;
}
exports2.cmp = cmp;
function cmp(a, op, b, loose) {
@@ -30341,7 +30341,7 @@ var require_semver3 = __commonJS({
case ">=":
return gte5(a, b, loose);
case "<":
return lt2(a, b, loose);
return lt(a, b, loose);
case "<=":
return lte(a, b, loose);
default:
@@ -30878,12 +30878,12 @@ var require_semver3 = __commonJS({
case ">":
gtfn = gt;
ltefn = lte;
ltfn = lt2;
ltfn = lt;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt2;
gtfn = lt;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -94483,8 +94483,8 @@ var require_commonjs16 = __commonJS({
if (rootPath === this.root.name) {
return this.root;
}
for (const [compare, root] of Object.entries(this.roots)) {
if (this.sameRoot(rootPath, compare)) {
for (const [compare2, root] of Object.entries(this.roots)) {
if (this.sameRoot(rootPath, compare2)) {
return this.roots[rootPath] = root;
}
}
@@ -94493,9 +94493,9 @@ var require_commonjs16 = __commonJS({
/**
* @internal
*/
sameRoot(rootPath, compare = this.root.name) {
sameRoot(rootPath, compare2 = this.root.name) {
rootPath = rootPath.toUpperCase().replace(/\//g, "\\").replace(uncDriveRegexp, "$1\\");
return rootPath === compare;
return rootPath === compare2;
}
};
exports2.PathWin32 = PathWin32;
@@ -98514,7 +98514,7 @@ var require_b4a = __commonJS({
function byteLength(string, encoding) {
return Buffer.byteLength(string, encoding);
}
function compare(a, b) {
function compare2(a, b) {
return Buffer.compare(a, b);
}
function concat(buffers, totalLength) {
@@ -98615,7 +98615,7 @@ var require_b4a = __commonJS({
allocUnsafe,
allocUnsafeSlow,
byteLength,
compare,
compare: compare2,
concat,
copy,
equals,
+67 -67
View File
@@ -26336,7 +26336,7 @@ var require_to_regex_range = __commonJS({
stop = countZeros(max + 1, zeros) - 1;
}
stops = [...stops];
stops.sort(compare2);
stops.sort(compare3);
return stops;
}
function rangeToPattern(start, stop, options) {
@@ -26408,7 +26408,7 @@ var require_to_regex_range = __commonJS({
for (let i = 0; i < a.length; i++) arr.push([a[i], b[i]]);
return arr;
}
function compare2(a, b) {
function compare3(a, b) {
return a > b ? 1 : b > a ? -1 : 0;
}
function contains(arr, key, val2) {
@@ -32267,8 +32267,8 @@ var require_compare = __commonJS({
"node_modules/semver/functions/compare.js"(exports2, module2) {
"use strict";
var SemVer = require_semver();
var compare2 = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose));
module2.exports = compare2;
var compare3 = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose));
module2.exports = compare3;
}
});
@@ -32276,8 +32276,8 @@ var require_compare = __commonJS({
var require_rcompare = __commonJS({
"node_modules/semver/functions/rcompare.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var rcompare = (a, b, loose) => compare2(b, a, loose);
var compare3 = require_compare();
var rcompare = (a, b, loose) => compare3(b, a, loose);
module2.exports = rcompare;
}
});
@@ -32286,8 +32286,8 @@ var require_rcompare = __commonJS({
var require_compare_loose = __commonJS({
"node_modules/semver/functions/compare-loose.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var compareLoose = (a, b) => compare2(a, b, true);
var compare3 = require_compare();
var compareLoose = (a, b) => compare3(a, b, true);
module2.exports = compareLoose;
}
});
@@ -32330,8 +32330,8 @@ var require_rsort = __commonJS({
var require_gt = __commonJS({
"node_modules/semver/functions/gt.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var gt = (a, b, loose) => compare2(a, b, loose) > 0;
var compare3 = require_compare();
var gt = (a, b, loose) => compare3(a, b, loose) > 0;
module2.exports = gt;
}
});
@@ -32340,9 +32340,9 @@ var require_gt = __commonJS({
var require_lt = __commonJS({
"node_modules/semver/functions/lt.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var lt2 = (a, b, loose) => compare2(a, b, loose) < 0;
module2.exports = lt2;
var compare3 = require_compare();
var lt = (a, b, loose) => compare3(a, b, loose) < 0;
module2.exports = lt;
}
});
@@ -32350,8 +32350,8 @@ var require_lt = __commonJS({
var require_eq = __commonJS({
"node_modules/semver/functions/eq.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var eq = (a, b, loose) => compare2(a, b, loose) === 0;
var compare3 = require_compare();
var eq = (a, b, loose) => compare3(a, b, loose) === 0;
module2.exports = eq;
}
});
@@ -32360,8 +32360,8 @@ var require_eq = __commonJS({
var require_neq = __commonJS({
"node_modules/semver/functions/neq.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var neq = (a, b, loose) => compare2(a, b, loose) !== 0;
var compare3 = require_compare();
var neq = (a, b, loose) => compare3(a, b, loose) !== 0;
module2.exports = neq;
}
});
@@ -32370,8 +32370,8 @@ var require_neq = __commonJS({
var require_gte = __commonJS({
"node_modules/semver/functions/gte.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var gte5 = (a, b, loose) => compare2(a, b, loose) >= 0;
var compare3 = require_compare();
var gte5 = (a, b, loose) => compare3(a, b, loose) >= 0;
module2.exports = gte5;
}
});
@@ -32380,8 +32380,8 @@ var require_gte = __commonJS({
var require_lte = __commonJS({
"node_modules/semver/functions/lte.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var lte = (a, b, loose) => compare2(a, b, loose) <= 0;
var compare3 = require_compare();
var lte = (a, b, loose) => compare3(a, b, loose) <= 0;
module2.exports = lte;
}
});
@@ -32394,7 +32394,7 @@ var require_cmp = __commonJS({
var neq = require_neq();
var gt = require_gt();
var gte5 = require_gte();
var lt2 = require_lt();
var lt = 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 lt2(a, b, loose);
return lt(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 lt2 = require_lt();
var lt = 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 = lt2;
ltfn = lt;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt2;
gtfn = lt;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -33277,12 +33277,12 @@ var require_simplify = __commonJS({
"node_modules/semver/ranges/simplify.js"(exports2, module2) {
"use strict";
var satisfies2 = require_satisfies();
var compare2 = require_compare();
var compare3 = require_compare();
module2.exports = (versions, range, options) => {
const set2 = [];
let first = null;
let prev = null;
const v = versions.sort((a, b) => compare2(a, b, options));
const v = versions.sort((a, b) => compare3(a, b, options));
for (const version of v) {
const included = satisfies2(version, range, options);
if (included) {
@@ -33330,7 +33330,7 @@ var require_subset = __commonJS({
var Comparator = require_comparator();
var { ANY } = Comparator;
var satisfies2 = require_satisfies();
var compare2 = require_compare();
var compare3 = require_compare();
var subset = (sub, dom, options = {}) => {
if (sub === dom) {
return true;
@@ -33375,12 +33375,12 @@ var require_subset = __commonJS({
}
}
const eqSet = /* @__PURE__ */ new Set();
let gt, lt2;
let gt, lt;
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);
lt = lowerLT(lt, c, options);
} else {
eqSet.add(c.semver);
}
@@ -33389,11 +33389,11 @@ var require_subset = __commonJS({
return null;
}
let gtltComp;
if (gt && lt2) {
gtltComp = compare2(gt.semver, lt2.semver, options);
if (gt && lt) {
gtltComp = compare3(gt.semver, lt.semver, options);
if (gtltComp > 0) {
return null;
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) {
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) {
return null;
}
}
@@ -33401,7 +33401,7 @@ var require_subset = __commonJS({
if (gt && !satisfies2(eq, String(gt), options)) {
return null;
}
if (lt2 && !satisfies2(eq, String(lt2), options)) {
if (lt && !satisfies2(eq, String(lt), options)) {
return null;
}
for (const c of dom) {
@@ -33413,9 +33413,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 = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.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 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) {
needDomLTPre = false;
}
for (const c of dom) {
@@ -33436,29 +33436,29 @@ var require_subset = __commonJS({
return false;
}
}
if (lt2) {
if (lt) {
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(lt, c, options);
if (lower === c && lower !== lt) {
return false;
}
} else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) {
} else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) {
return false;
}
}
if (!c.operator && (lt2 || gt) && gtltComp !== 0) {
if (!c.operator && (lt || gt) && gtltComp !== 0) {
return false;
}
}
if (gt && hasDomLT && !lt2 && gtltComp !== 0) {
if (gt && hasDomLT && !lt && gtltComp !== 0) {
return false;
}
if (lt2 && hasDomGT && !gt && gtltComp !== 0) {
if (lt && hasDomGT && !gt && gtltComp !== 0) {
return false;
}
if (needDomGTPre || needDomLTPre) {
@@ -33470,14 +33470,14 @@ var require_subset = __commonJS({
if (!a) {
return b;
}
const comp = compare2(a.semver, b.semver, options);
const comp = compare3(a.semver, b.semver, options);
return comp > 0 ? a : comp < 0 ? b : b.operator === ">" && a.operator === ">=" ? b : a;
};
var lowerLT = (a, b, options) => {
if (!a) {
return b;
}
const comp = compare2(a.semver, b.semver, options);
const comp = compare3(a.semver, b.semver, options);
return comp < 0 ? a : comp > 0 ? b : b.operator === "<" && a.operator === "<=" ? b : a;
};
module2.exports = subset;
@@ -33501,14 +33501,14 @@ var require_semver2 = __commonJS({
var minor = require_minor();
var patch = require_patch();
var prerelease = require_prerelease();
var compare2 = require_compare();
var compare3 = require_compare();
var rcompare = require_rcompare();
var compareLoose = require_compare_loose();
var compareBuild = require_compare_build();
var sort = require_sort();
var rsort = require_rsort();
var gt = require_gt();
var lt2 = require_lt();
var lt = require_lt();
var eq = require_eq();
var neq = require_neq();
var gte5 = require_gte();
@@ -33539,14 +33539,14 @@ var require_semver2 = __commonJS({
minor,
patch,
prerelease,
compare: compare2,
compare: compare3,
rcompare,
compareLoose,
compareBuild,
sort,
rsort,
gt,
lt: lt2,
lt,
eq,
neq,
gte: gte5,
@@ -37407,13 +37407,13 @@ var require_semver3 = __commonJS({
function patch(a, loose) {
return new SemVer(a, loose).patch;
}
exports2.compare = compare2;
function compare2(a, b, loose) {
exports2.compare = compare3;
function compare3(a, b, loose) {
return new SemVer(a, loose).compare(new SemVer(b, loose));
}
exports2.compareLoose = compareLoose;
function compareLoose(a, b) {
return compare2(a, b, true);
return compare3(a, b, true);
}
exports2.compareBuild = compareBuild;
function compareBuild(a, b, loose) {
@@ -37423,7 +37423,7 @@ var require_semver3 = __commonJS({
}
exports2.rcompare = rcompare;
function rcompare(a, b, loose) {
return compare2(b, a, loose);
return compare3(b, a, loose);
}
exports2.sort = sort;
function sort(list, loose) {
@@ -37439,27 +37439,27 @@ var require_semver3 = __commonJS({
}
exports2.gt = gt;
function gt(a, b, loose) {
return compare2(a, b, loose) > 0;
return compare3(a, b, loose) > 0;
}
exports2.lt = lt2;
function lt2(a, b, loose) {
return compare2(a, b, loose) < 0;
exports2.lt = lt;
function lt(a, b, loose) {
return compare3(a, b, loose) < 0;
}
exports2.eq = eq;
function eq(a, b, loose) {
return compare2(a, b, loose) === 0;
return compare3(a, b, loose) === 0;
}
exports2.neq = neq;
function neq(a, b, loose) {
return compare2(a, b, loose) !== 0;
return compare3(a, b, loose) !== 0;
}
exports2.gte = gte5;
function gte5(a, b, loose) {
return compare2(a, b, loose) >= 0;
return compare3(a, b, loose) >= 0;
}
exports2.lte = lte;
function lte(a, b, loose) {
return compare2(a, b, loose) <= 0;
return compare3(a, b, loose) <= 0;
}
exports2.cmp = cmp;
function cmp(a, op, b, loose) {
@@ -37487,7 +37487,7 @@ var require_semver3 = __commonJS({
case ">=":
return gte5(a, b, loose);
case "<":
return lt2(a, b, loose);
return lt(a, b, loose);
case "<=":
return lte(a, b, loose);
default:
@@ -38024,12 +38024,12 @@ var require_semver3 = __commonJS({
case ">":
gtfn = gt;
ltefn = lte;
ltfn = lt2;
ltfn = lt;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt2;
gtfn = lt;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -90430,7 +90430,7 @@ async function getNightlyToolsUrl(logger) {
}
}
function getLatestToolcacheVersion(logger) {
const allVersions = toolcache3.findAllVersions("CodeQL").sort((a, b) => semver7.lt(a, b) ? 1 : -1);
const allVersions = toolcache3.findAllVersions("CodeQL").sort((a, b) => semver7.compare(b, a));
logger.debug(
`Found the following versions of the CodeQL tools in the toolcache: ${JSON.stringify(
allVersions
@@ -91633,7 +91633,7 @@ LongPrototype.greaterThanOrEqual = function greaterThanOrEqual(other) {
};
LongPrototype.gte = LongPrototype.greaterThanOrEqual;
LongPrototype.ge = LongPrototype.greaterThanOrEqual;
LongPrototype.compare = function compare(other) {
LongPrototype.compare = function compare2(other) {
if (!isLong(other)) other = fromValue(other);
if (this.eq(other)) return 0;
var thisNeg = this.isNegative(), otherNeg = other.isNegative();
+69 -69
View File
@@ -25121,8 +25121,8 @@ var require_compare = __commonJS({
"node_modules/semver/functions/compare.js"(exports2, module2) {
"use strict";
var SemVer = require_semver();
var compare = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose));
module2.exports = compare;
var compare2 = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose));
module2.exports = compare2;
}
});
@@ -25130,8 +25130,8 @@ var require_compare = __commonJS({
var require_rcompare = __commonJS({
"node_modules/semver/functions/rcompare.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var rcompare = (a, b, loose) => compare(b, a, loose);
var compare2 = require_compare();
var rcompare = (a, b, loose) => compare2(b, a, loose);
module2.exports = rcompare;
}
});
@@ -25140,8 +25140,8 @@ var require_rcompare = __commonJS({
var require_compare_loose = __commonJS({
"node_modules/semver/functions/compare-loose.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var compareLoose = (a, b) => compare(a, b, true);
var compare2 = require_compare();
var compareLoose = (a, b) => compare2(a, b, true);
module2.exports = compareLoose;
}
});
@@ -25184,8 +25184,8 @@ var require_rsort = __commonJS({
var require_gt = __commonJS({
"node_modules/semver/functions/gt.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var gt = (a, b, loose) => compare(a, b, loose) > 0;
var compare2 = require_compare();
var gt = (a, b, loose) => compare2(a, b, loose) > 0;
module2.exports = gt;
}
});
@@ -25194,9 +25194,9 @@ var require_gt = __commonJS({
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 compare2 = require_compare();
var lt = (a, b, loose) => compare2(a, b, loose) < 0;
module2.exports = lt;
}
});
@@ -25204,8 +25204,8 @@ var require_lt = __commonJS({
var require_eq = __commonJS({
"node_modules/semver/functions/eq.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var eq = (a, b, loose) => compare(a, b, loose) === 0;
var compare2 = require_compare();
var eq = (a, b, loose) => compare2(a, b, loose) === 0;
module2.exports = eq;
}
});
@@ -25214,8 +25214,8 @@ var require_eq = __commonJS({
var require_neq = __commonJS({
"node_modules/semver/functions/neq.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var neq = (a, b, loose) => compare(a, b, loose) !== 0;
var compare2 = require_compare();
var neq = (a, b, loose) => compare2(a, b, loose) !== 0;
module2.exports = neq;
}
});
@@ -25224,8 +25224,8 @@ var require_neq = __commonJS({
var require_gte = __commonJS({
"node_modules/semver/functions/gte.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var gte5 = (a, b, loose) => compare(a, b, loose) >= 0;
var compare2 = require_compare();
var gte5 = (a, b, loose) => compare2(a, b, loose) >= 0;
module2.exports = gte5;
}
});
@@ -25234,8 +25234,8 @@ var require_gte = __commonJS({
var require_lte = __commonJS({
"node_modules/semver/functions/lte.js"(exports2, module2) {
"use strict";
var compare = require_compare();
var lte = (a, b, loose) => compare(a, b, loose) <= 0;
var compare2 = require_compare();
var lte = (a, b, loose) => compare2(a, b, loose) <= 0;
module2.exports = lte;
}
});
@@ -25248,7 +25248,7 @@ var require_cmp = __commonJS({
var neq = require_neq();
var gt = require_gt();
var gte5 = require_gte();
var lt2 = require_lt();
var lt = 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 lt2(a, b, loose);
return lt(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 lt2 = require_lt();
var lt = 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 = lt2;
ltfn = lt;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt2;
gtfn = lt;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -26131,12 +26131,12 @@ var require_simplify = __commonJS({
"node_modules/semver/ranges/simplify.js"(exports2, module2) {
"use strict";
var satisfies2 = require_satisfies();
var compare = require_compare();
var compare2 = require_compare();
module2.exports = (versions, range, options) => {
const set2 = [];
let first = null;
let prev = null;
const v = versions.sort((a, b) => compare(a, b, options));
const v = versions.sort((a, b) => compare2(a, b, options));
for (const version of v) {
const included = satisfies2(version, range, options);
if (included) {
@@ -26184,7 +26184,7 @@ var require_subset = __commonJS({
var Comparator = require_comparator();
var { ANY } = Comparator;
var satisfies2 = require_satisfies();
var compare = require_compare();
var compare2 = require_compare();
var subset = (sub, dom, options = {}) => {
if (sub === dom) {
return true;
@@ -26229,12 +26229,12 @@ var require_subset = __commonJS({
}
}
const eqSet = /* @__PURE__ */ new Set();
let gt, lt2;
let gt, lt;
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);
lt = lowerLT(lt, c, options);
} else {
eqSet.add(c.semver);
}
@@ -26243,11 +26243,11 @@ var require_subset = __commonJS({
return null;
}
let gtltComp;
if (gt && lt2) {
gtltComp = compare(gt.semver, lt2.semver, options);
if (gt && lt) {
gtltComp = compare2(gt.semver, lt.semver, options);
if (gtltComp > 0) {
return null;
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) {
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) {
return null;
}
}
@@ -26255,7 +26255,7 @@ var require_subset = __commonJS({
if (gt && !satisfies2(eq, String(gt), options)) {
return null;
}
if (lt2 && !satisfies2(eq, String(lt2), options)) {
if (lt && !satisfies2(eq, String(lt), options)) {
return null;
}
for (const c of dom) {
@@ -26267,9 +26267,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 = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.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 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) {
needDomLTPre = false;
}
for (const c of dom) {
@@ -26290,29 +26290,29 @@ var require_subset = __commonJS({
return false;
}
}
if (lt2) {
if (lt) {
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(lt, c, options);
if (lower === c && lower !== lt) {
return false;
}
} else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) {
} else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) {
return false;
}
}
if (!c.operator && (lt2 || gt) && gtltComp !== 0) {
if (!c.operator && (lt || gt) && gtltComp !== 0) {
return false;
}
}
if (gt && hasDomLT && !lt2 && gtltComp !== 0) {
if (gt && hasDomLT && !lt && gtltComp !== 0) {
return false;
}
if (lt2 && hasDomGT && !gt && gtltComp !== 0) {
if (lt && hasDomGT && !gt && gtltComp !== 0) {
return false;
}
if (needDomGTPre || needDomLTPre) {
@@ -26324,14 +26324,14 @@ var require_subset = __commonJS({
if (!a) {
return b;
}
const comp = compare(a.semver, b.semver, options);
const comp = compare2(a.semver, b.semver, options);
return comp > 0 ? a : comp < 0 ? b : b.operator === ">" && a.operator === ">=" ? b : a;
};
var lowerLT = (a, b, options) => {
if (!a) {
return b;
}
const comp = compare(a.semver, b.semver, options);
const comp = compare2(a.semver, b.semver, options);
return comp < 0 ? a : comp > 0 ? b : b.operator === "<" && a.operator === "<=" ? b : a;
};
module2.exports = subset;
@@ -26355,14 +26355,14 @@ var require_semver2 = __commonJS({
var minor = require_minor();
var patch = require_patch();
var prerelease = require_prerelease();
var compare = require_compare();
var compare2 = require_compare();
var rcompare = require_rcompare();
var compareLoose = require_compare_loose();
var compareBuild = require_compare_build();
var sort = require_sort();
var rsort = require_rsort();
var gt = require_gt();
var lt2 = require_lt();
var lt = require_lt();
var eq = require_eq();
var neq = require_neq();
var gte5 = require_gte();
@@ -26393,14 +26393,14 @@ var require_semver2 = __commonJS({
minor,
patch,
prerelease,
compare,
compare: compare2,
rcompare,
compareLoose,
compareBuild,
sort,
rsort,
gt,
lt: lt2,
lt,
eq,
neq,
gte: gte5,
@@ -88567,8 +88567,8 @@ var require_commonjs16 = __commonJS({
if (rootPath === this.root.name) {
return this.root;
}
for (const [compare, root] of Object.entries(this.roots)) {
if (this.sameRoot(rootPath, compare)) {
for (const [compare2, root] of Object.entries(this.roots)) {
if (this.sameRoot(rootPath, compare2)) {
return this.roots[rootPath] = root;
}
}
@@ -88577,9 +88577,9 @@ var require_commonjs16 = __commonJS({
/**
* @internal
*/
sameRoot(rootPath, compare = this.root.name) {
sameRoot(rootPath, compare2 = this.root.name) {
rootPath = rootPath.toUpperCase().replace(/\//g, "\\").replace(uncDriveRegexp, "$1\\");
return rootPath === compare;
return rootPath === compare2;
}
};
exports2.PathWin32 = PathWin32;
@@ -92598,7 +92598,7 @@ var require_b4a = __commonJS({
function byteLength(string, encoding) {
return Buffer.byteLength(string, encoding);
}
function compare(a, b) {
function compare2(a, b) {
return Buffer.compare(a, b);
}
function concat(buffers, totalLength) {
@@ -92699,7 +92699,7 @@ var require_b4a = __commonJS({
allocUnsafe,
allocUnsafeSlow,
byteLength,
compare,
compare: compare2,
concat,
copy,
equals,
@@ -108085,13 +108085,13 @@ var require_semver3 = __commonJS({
function patch(a, loose) {
return new SemVer(a, loose).patch;
}
exports2.compare = compare;
function compare(a, b, loose) {
exports2.compare = compare2;
function compare2(a, b, loose) {
return new SemVer(a, loose).compare(new SemVer(b, loose));
}
exports2.compareLoose = compareLoose;
function compareLoose(a, b) {
return compare(a, b, true);
return compare2(a, b, true);
}
exports2.compareBuild = compareBuild;
function compareBuild(a, b, loose) {
@@ -108101,7 +108101,7 @@ var require_semver3 = __commonJS({
}
exports2.rcompare = rcompare;
function rcompare(a, b, loose) {
return compare(b, a, loose);
return compare2(b, a, loose);
}
exports2.sort = sort;
function sort(list, loose) {
@@ -108117,27 +108117,27 @@ var require_semver3 = __commonJS({
}
exports2.gt = gt;
function gt(a, b, loose) {
return compare(a, b, loose) > 0;
return compare2(a, b, loose) > 0;
}
exports2.lt = lt2;
function lt2(a, b, loose) {
return compare(a, b, loose) < 0;
exports2.lt = lt;
function lt(a, b, loose) {
return compare2(a, b, loose) < 0;
}
exports2.eq = eq;
function eq(a, b, loose) {
return compare(a, b, loose) === 0;
return compare2(a, b, loose) === 0;
}
exports2.neq = neq;
function neq(a, b, loose) {
return compare(a, b, loose) !== 0;
return compare2(a, b, loose) !== 0;
}
exports2.gte = gte5;
function gte5(a, b, loose) {
return compare(a, b, loose) >= 0;
return compare2(a, b, loose) >= 0;
}
exports2.lte = lte;
function lte(a, b, loose) {
return compare(a, b, loose) <= 0;
return compare2(a, b, loose) <= 0;
}
exports2.cmp = cmp;
function cmp(a, op, b, loose) {
@@ -108165,7 +108165,7 @@ var require_semver3 = __commonJS({
case ">=":
return gte5(a, b, loose);
case "<":
return lt2(a, b, loose);
return lt(a, b, loose);
case "<=":
return lte(a, b, loose);
default:
@@ -108702,12 +108702,12 @@ var require_semver3 = __commonJS({
case ">":
gtfn = gt;
ltefn = lte;
ltfn = lt2;
ltfn = lt;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt2;
gtfn = lt;
ltefn = gte5;
ltfn = gt;
comp = "<";
+67 -67
View File
@@ -25039,7 +25039,7 @@ var require_to_regex_range = __commonJS({
stop = countZeros(max + 1, zeros) - 1;
}
stops = [...stops];
stops.sort(compare2);
stops.sort(compare3);
return stops;
}
function rangeToPattern(start, stop, options) {
@@ -25111,7 +25111,7 @@ var require_to_regex_range = __commonJS({
for (let i = 0; i < a.length; i++) arr.push([a[i], b[i]]);
return arr;
}
function compare2(a, b) {
function compare3(a, b) {
return a > b ? 1 : b > a ? -1 : 0;
}
function contains(arr, key, val2) {
@@ -30970,8 +30970,8 @@ var require_compare = __commonJS({
"node_modules/semver/functions/compare.js"(exports2, module2) {
"use strict";
var SemVer = require_semver();
var compare2 = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose));
module2.exports = compare2;
var compare3 = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose));
module2.exports = compare3;
}
});
@@ -30979,8 +30979,8 @@ var require_compare = __commonJS({
var require_rcompare = __commonJS({
"node_modules/semver/functions/rcompare.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var rcompare = (a, b, loose) => compare2(b, a, loose);
var compare3 = require_compare();
var rcompare = (a, b, loose) => compare3(b, a, loose);
module2.exports = rcompare;
}
});
@@ -30989,8 +30989,8 @@ var require_rcompare = __commonJS({
var require_compare_loose = __commonJS({
"node_modules/semver/functions/compare-loose.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var compareLoose = (a, b) => compare2(a, b, true);
var compare3 = require_compare();
var compareLoose = (a, b) => compare3(a, b, true);
module2.exports = compareLoose;
}
});
@@ -31033,8 +31033,8 @@ var require_rsort = __commonJS({
var require_gt = __commonJS({
"node_modules/semver/functions/gt.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var gt = (a, b, loose) => compare2(a, b, loose) > 0;
var compare3 = require_compare();
var gt = (a, b, loose) => compare3(a, b, loose) > 0;
module2.exports = gt;
}
});
@@ -31043,9 +31043,9 @@ var require_gt = __commonJS({
var require_lt = __commonJS({
"node_modules/semver/functions/lt.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var lt2 = (a, b, loose) => compare2(a, b, loose) < 0;
module2.exports = lt2;
var compare3 = require_compare();
var lt = (a, b, loose) => compare3(a, b, loose) < 0;
module2.exports = lt;
}
});
@@ -31053,8 +31053,8 @@ var require_lt = __commonJS({
var require_eq = __commonJS({
"node_modules/semver/functions/eq.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var eq = (a, b, loose) => compare2(a, b, loose) === 0;
var compare3 = require_compare();
var eq = (a, b, loose) => compare3(a, b, loose) === 0;
module2.exports = eq;
}
});
@@ -31063,8 +31063,8 @@ var require_eq = __commonJS({
var require_neq = __commonJS({
"node_modules/semver/functions/neq.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var neq = (a, b, loose) => compare2(a, b, loose) !== 0;
var compare3 = require_compare();
var neq = (a, b, loose) => compare3(a, b, loose) !== 0;
module2.exports = neq;
}
});
@@ -31073,8 +31073,8 @@ var require_neq = __commonJS({
var require_gte = __commonJS({
"node_modules/semver/functions/gte.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var gte5 = (a, b, loose) => compare2(a, b, loose) >= 0;
var compare3 = require_compare();
var gte5 = (a, b, loose) => compare3(a, b, loose) >= 0;
module2.exports = gte5;
}
});
@@ -31083,8 +31083,8 @@ var require_gte = __commonJS({
var require_lte = __commonJS({
"node_modules/semver/functions/lte.js"(exports2, module2) {
"use strict";
var compare2 = require_compare();
var lte = (a, b, loose) => compare2(a, b, loose) <= 0;
var compare3 = require_compare();
var lte = (a, b, loose) => compare3(a, b, loose) <= 0;
module2.exports = lte;
}
});
@@ -31097,7 +31097,7 @@ var require_cmp = __commonJS({
var neq = require_neq();
var gt = require_gt();
var gte5 = require_gte();
var lt2 = require_lt();
var lt = 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 lt2(a, b, loose);
return lt(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 lt2 = require_lt();
var lt = 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 = lt2;
ltfn = lt;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt2;
gtfn = lt;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -31980,12 +31980,12 @@ var require_simplify = __commonJS({
"node_modules/semver/ranges/simplify.js"(exports2, module2) {
"use strict";
var satisfies2 = require_satisfies();
var compare2 = require_compare();
var compare3 = require_compare();
module2.exports = (versions, range, options) => {
const set2 = [];
let first = null;
let prev = null;
const v = versions.sort((a, b) => compare2(a, b, options));
const v = versions.sort((a, b) => compare3(a, b, options));
for (const version of v) {
const included = satisfies2(version, range, options);
if (included) {
@@ -32033,7 +32033,7 @@ var require_subset = __commonJS({
var Comparator = require_comparator();
var { ANY } = Comparator;
var satisfies2 = require_satisfies();
var compare2 = require_compare();
var compare3 = require_compare();
var subset = (sub, dom, options = {}) => {
if (sub === dom) {
return true;
@@ -32078,12 +32078,12 @@ var require_subset = __commonJS({
}
}
const eqSet = /* @__PURE__ */ new Set();
let gt, lt2;
let gt, lt;
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);
lt = lowerLT(lt, c, options);
} else {
eqSet.add(c.semver);
}
@@ -32092,11 +32092,11 @@ var require_subset = __commonJS({
return null;
}
let gtltComp;
if (gt && lt2) {
gtltComp = compare2(gt.semver, lt2.semver, options);
if (gt && lt) {
gtltComp = compare3(gt.semver, lt.semver, options);
if (gtltComp > 0) {
return null;
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt2.operator !== "<=")) {
} else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) {
return null;
}
}
@@ -32104,7 +32104,7 @@ var require_subset = __commonJS({
if (gt && !satisfies2(eq, String(gt), options)) {
return null;
}
if (lt2 && !satisfies2(eq, String(lt2), options)) {
if (lt && !satisfies2(eq, String(lt), options)) {
return null;
}
for (const c of dom) {
@@ -32116,9 +32116,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 = lt && !options.includePrerelease && lt.semver.prerelease.length ? lt.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 && lt.operator === "<" && needDomLTPre.prerelease[0] === 0) {
needDomLTPre = false;
}
for (const c of dom) {
@@ -32139,29 +32139,29 @@ var require_subset = __commonJS({
return false;
}
}
if (lt2) {
if (lt) {
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(lt, c, options);
if (lower === c && lower !== lt) {
return false;
}
} else if (lt2.operator === "<=" && !satisfies2(lt2.semver, String(c), options)) {
} else if (lt.operator === "<=" && !satisfies2(lt.semver, String(c), options)) {
return false;
}
}
if (!c.operator && (lt2 || gt) && gtltComp !== 0) {
if (!c.operator && (lt || gt) && gtltComp !== 0) {
return false;
}
}
if (gt && hasDomLT && !lt2 && gtltComp !== 0) {
if (gt && hasDomLT && !lt && gtltComp !== 0) {
return false;
}
if (lt2 && hasDomGT && !gt && gtltComp !== 0) {
if (lt && hasDomGT && !gt && gtltComp !== 0) {
return false;
}
if (needDomGTPre || needDomLTPre) {
@@ -32173,14 +32173,14 @@ var require_subset = __commonJS({
if (!a) {
return b;
}
const comp = compare2(a.semver, b.semver, options);
const comp = compare3(a.semver, b.semver, options);
return comp > 0 ? a : comp < 0 ? b : b.operator === ">" && a.operator === ">=" ? b : a;
};
var lowerLT = (a, b, options) => {
if (!a) {
return b;
}
const comp = compare2(a.semver, b.semver, options);
const comp = compare3(a.semver, b.semver, options);
return comp < 0 ? a : comp > 0 ? b : b.operator === "<" && a.operator === "<=" ? b : a;
};
module2.exports = subset;
@@ -32204,14 +32204,14 @@ var require_semver2 = __commonJS({
var minor = require_minor();
var patch = require_patch();
var prerelease = require_prerelease();
var compare2 = require_compare();
var compare3 = require_compare();
var rcompare = require_rcompare();
var compareLoose = require_compare_loose();
var compareBuild = require_compare_build();
var sort = require_sort();
var rsort = require_rsort();
var gt = require_gt();
var lt2 = require_lt();
var lt = require_lt();
var eq = require_eq();
var neq = require_neq();
var gte5 = require_gte();
@@ -32242,14 +32242,14 @@ var require_semver2 = __commonJS({
minor,
patch,
prerelease,
compare: compare2,
compare: compare3,
rcompare,
compareLoose,
compareBuild,
sort,
rsort,
gt,
lt: lt2,
lt,
eq,
neq,
gte: gte5,
@@ -36110,13 +36110,13 @@ var require_semver3 = __commonJS({
function patch(a, loose) {
return new SemVer(a, loose).patch;
}
exports2.compare = compare2;
function compare2(a, b, loose) {
exports2.compare = compare3;
function compare3(a, b, loose) {
return new SemVer(a, loose).compare(new SemVer(b, loose));
}
exports2.compareLoose = compareLoose;
function compareLoose(a, b) {
return compare2(a, b, true);
return compare3(a, b, true);
}
exports2.compareBuild = compareBuild;
function compareBuild(a, b, loose) {
@@ -36126,7 +36126,7 @@ var require_semver3 = __commonJS({
}
exports2.rcompare = rcompare;
function rcompare(a, b, loose) {
return compare2(b, a, loose);
return compare3(b, a, loose);
}
exports2.sort = sort;
function sort(list, loose) {
@@ -36142,27 +36142,27 @@ var require_semver3 = __commonJS({
}
exports2.gt = gt;
function gt(a, b, loose) {
return compare2(a, b, loose) > 0;
return compare3(a, b, loose) > 0;
}
exports2.lt = lt2;
function lt2(a, b, loose) {
return compare2(a, b, loose) < 0;
exports2.lt = lt;
function lt(a, b, loose) {
return compare3(a, b, loose) < 0;
}
exports2.eq = eq;
function eq(a, b, loose) {
return compare2(a, b, loose) === 0;
return compare3(a, b, loose) === 0;
}
exports2.neq = neq;
function neq(a, b, loose) {
return compare2(a, b, loose) !== 0;
return compare3(a, b, loose) !== 0;
}
exports2.gte = gte5;
function gte5(a, b, loose) {
return compare2(a, b, loose) >= 0;
return compare3(a, b, loose) >= 0;
}
exports2.lte = lte;
function lte(a, b, loose) {
return compare2(a, b, loose) <= 0;
return compare3(a, b, loose) <= 0;
}
exports2.cmp = cmp;
function cmp(a, op, b, loose) {
@@ -36190,7 +36190,7 @@ var require_semver3 = __commonJS({
case ">=":
return gte5(a, b, loose);
case "<":
return lt2(a, b, loose);
return lt(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 = lt;
comp = ">";
ecomp = ">=";
break;
case "<":
gtfn = lt2;
gtfn = lt;
ltefn = gte5;
ltfn = gt;
comp = "<";
@@ -91102,7 +91102,7 @@ async function getNightlyToolsUrl(logger) {
}
}
function getLatestToolcacheVersion(logger) {
const allVersions = toolcache3.findAllVersions("CodeQL").sort((a, b) => semver7.lt(a, b) ? 1 : -1);
const allVersions = toolcache3.findAllVersions("CodeQL").sort((a, b) => semver7.compare(b, a));
logger.debug(
`Found the following versions of the CodeQL tools in the toolcache: ${JSON.stringify(
allVersions
@@ -92305,7 +92305,7 @@ LongPrototype.greaterThanOrEqual = function greaterThanOrEqual(other) {
};
LongPrototype.gte = LongPrototype.greaterThanOrEqual;
LongPrototype.ge = LongPrototype.greaterThanOrEqual;
LongPrototype.compare = function compare(other) {
LongPrototype.compare = function compare2(other) {
if (!isLong(other)) other = fromValue(other);
if (this.eq(other)) return 0;
var thisNeg = this.isNegative(), otherNeg = other.isNegative();