Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Combine functions #5

Open
wants to merge 5 commits into
base: v-sdolin/v8-canary
Choose a base branch
from
Open

Combine functions #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c849fe6
convert logic initial
dmitry-shibanov Nov 29, 2022
e25fd13
comment code
dmitry-shibanov Nov 29, 2022
3533caf
remove case for Nightly
dmitry-shibanov Nov 29, 2022
b372056
remove unused code
dmitry-shibanov Nov 29, 2022
b717bf1
remove if
dmitry-shibanov Nov 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 28 additions & 58 deletions dist/setup/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73218,15 +73218,15 @@ const semver = __importStar(__nccwpck_require__(5911));
const fs_1 = __importDefault(__nccwpck_require__(7147));
var Distributions;
(function (Distributions) {
Distributions["DEFAULT"] = "default";
Distributions["CANARY"] = "v8-canary";
Distributions["NIGHTLY"] = "nightly";
Distributions["RC"] = "rc";
Distributions["DEFAULT"] = "";
Distributions["CANARY"] = "-v8-canary";
Distributions["NIGHTLY"] = "-nightly";
Distributions["RC"] = "-rc";
})(Distributions = exports.Distributions || (exports.Distributions = {}));
exports.distributionOf = (versionSpec) => {
if (versionSpec.includes('-v8-canary'))
if (versionSpec.includes(Distributions.CANARY))
return Distributions.CANARY;
if (versionSpec.includes('nightly'))
if (versionSpec.includes(Distributions.NIGHTLY))
return Distributions.NIGHTLY;
if (semver.prerelease(versionSpec))
return Distributions.RC;
Expand All @@ -73237,74 +73237,44 @@ exports.semverVersionMatcherFactory = (range) => {
matcher.factory = exports.semverVersionMatcherFactory;
return matcher;
};
exports.canaryRangeVersionMatcherFactory = (version) => {
const range = semver.validRange(`^${version}`);
const matcher = (potential) => semver.satisfies(potential.replace('-v8-canary', '+v8-canary.'), range);
matcher.factory = exports.canaryRangeVersionMatcherFactory;
exports.nightlyV8MatcherFactory = (version, distribution) => {
const { range, includePrerelease } = createRangePreRelease(version, distribution);
const matcher = (potential) => exports.distributionOf(potential) === distribution &&
semver.satisfies(potential.replace(distribution, `${distribution}.`), range, { includePrerelease: includePrerelease });
matcher.factory = exports.nightlyV8MatcherFactory;
return matcher;
};
exports.canaryExactVersionMatcherFactory = (version, timestamp) => {
const range = `${version}-${timestamp}`;
const matcher = (potential) => semver.satisfies(potential, range);
matcher.factory = exports.canaryExactVersionMatcherFactory;
return matcher;
};
exports.nightlyRangeVersionMatcherFactory = (version) => {
const range = semver.validRange(`^${version}`);
// TODO: this makes v20.1.1-nightly to do not match v20.1.1-nightly20221103f7e2421e91
// const range = `${semver.validRange(`^${version}-0`)}-0`;
const matcher = (potential) => exports.distributionOf(potential) === Distributions.NIGHTLY &&
// TODO: dmitry's variant was potential.replace('-nightly', '-nightly.') that made
// all unit tests to fail
semver.satisfies(potential.replace('-nightly', '+nightly.'), range /*, {
// TODO: what is for?
includePrerelease: true
}*/);
matcher.factory = exports.nightlyRangeVersionMatcherFactory;
return matcher;
};
exports.nightlyExactVersionMatcherFactory = (version, timestamp) => {
const range = `${version}-${timestamp.replace('nightly', 'nightly.')}`;
const matcher = (potential) => exports.distributionOf(potential) === Distributions.NIGHTLY &&
semver.satisfies(potential.replace('-nightly', '-nightly.'), range /*, {
// TODO: what is for?
includePrerelease: true
}*/);
matcher.factory = exports.nightlyExactVersionMatcherFactory;
return matcher;
};
const alwaysFalseVersionMatcherFactory = () => {
const matcher = () => false;
matcher.factory = alwaysFalseVersionMatcherFactory;
return matcher;
};
const alwaysFalseVersionMatcher = alwaysFalseVersionMatcherFactory();
// [raw, prerelease]
exports.splitVersionSpec = (versionSpec) => versionSpec.split(/-(.*)/s);
const createRangePreRelease = (versionSpec, distribution = '') => {
let range;
const [raw, prerelease] = exports.splitVersionSpec(versionSpec);
const isValidVersion = semver.valid(raw);
const rawVersion = (isValidVersion ? raw : semver.coerce(raw));
if (`-${prerelease}` !== distribution) {
range = `${rawVersion}${`-${prerelease}`.replace(distribution, `${distribution}.`)}`;
}
else {
range = `${semver.validRange(`^${rawVersion}${distribution}`)}-0`;
}
return { range, includePrerelease: !isValidVersion };
};
function versionMatcherFactory(versionSpec) {
var _a;
const [raw, prerelease] = exports.splitVersionSpec(versionSpec);
const raw = exports.splitVersionSpec(versionSpec)[0];
const validVersion = semver.valid(raw) ? raw : (_a = semver.coerce(raw)) === null || _a === void 0 ? void 0 : _a.version;
const distribution = exports.distributionOf(versionSpec);
if (validVersion) {
switch (exports.distributionOf(versionSpec)) {
switch (distribution) {
case Distributions.CANARY:
return prerelease === 'v8-canary' // this means versionSpec does not have timestamp
? exports.canaryRangeVersionMatcherFactory(validVersion)
: exports.canaryExactVersionMatcherFactory(validVersion, prerelease);
case Distributions.NIGHTLY:
return prerelease === 'nightly' // this means versionSpec does not have prerelease tag
? exports.nightlyRangeVersionMatcherFactory(validVersion)
: exports.nightlyExactVersionMatcherFactory(validVersion, prerelease);
return exports.nightlyV8MatcherFactory(versionSpec, distribution);
case Distributions.RC:
case Distributions.DEFAULT:
return exports.semverVersionMatcherFactory(versionSpec);
}
}
else {
// TODO: i prefer to have implicit exception for the malformed input
throw Error(`Invalid version input "${versionSpec}"`);
// TODO: but it is possible to silently fail
// return alwaysFalseVersionMatcher
}
}
exports.versionMatcherFactory = versionMatcherFactory;
Expand Down
123 changes: 44 additions & 79 deletions src/installer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import fs from 'fs';
// see https://nodejs.org/dist/index.json
// for nightly https://nodejs.org/download/nightly/index.json
// for rc https://nodejs.org/download/rc/index.json
// for canary https://nodejs.org/download/v8-canary/index.json
//
export interface INodeVersion {
version: string;
Expand All @@ -31,15 +32,15 @@ interface INodeRelease extends tc.IToolRelease {
}

export enum Distributions {
DEFAULT = 'default',
CANARY = 'v8-canary',
NIGHTLY = 'nightly',
RC = 'rc'
DEFAULT = '',
CANARY = '-v8-canary',
NIGHTLY = '-nightly',
RC = '-rc'
}

export const distributionOf = (versionSpec: string): Distributions => {
if (versionSpec.includes('-v8-canary')) return Distributions.CANARY;
if (versionSpec.includes('nightly')) return Distributions.NIGHTLY;
if (versionSpec.includes(Distributions.CANARY)) return Distributions.CANARY;
if (versionSpec.includes(Distributions.NIGHTLY)) return Distributions.NIGHTLY;
if (semver.prerelease(versionSpec)) return Distributions.RC;
return Distributions.DEFAULT;
};
Expand All @@ -57,106 +58,70 @@ interface VersionMatcher {
export const semverVersionMatcherFactory = (range: string): VersionMatcher => {
const matcher = (potential: string): boolean =>
semver.satisfies(potential, range);
matcher.factory = semverVersionMatcherFactory;
return matcher;
};

export const canaryRangeVersionMatcherFactory = (
version: string
): VersionMatcher => {
const range = semver.validRange(`^${version}`);
const matcher = (potential: string): boolean =>
semver.satisfies(potential.replace('-v8-canary', '+v8-canary.'), range);
matcher.factory = canaryRangeVersionMatcherFactory;
return matcher;
};

export const canaryExactVersionMatcherFactory = (
version: string,
timestamp: string
): VersionMatcher => {
const range = `${version}-${timestamp}`;
const matcher = (potential: string): boolean =>
semver.satisfies(potential, range);
matcher.factory = canaryExactVersionMatcherFactory;
return matcher;
};

export const nightlyRangeVersionMatcherFactory = (
version: string
): VersionMatcher => {
const range = semver.validRange(`^${version}`);
// TODO: this makes v20.1.1-nightly to do not match v20.1.1-nightly20221103f7e2421e91
// const range = `${semver.validRange(`^${version}-0`)}-0`;
const matcher = (potential: string): boolean =>
distributionOf(potential) === Distributions.NIGHTLY &&
// TODO: dmitry's variant was potential.replace('-nightly', '-nightly.') that made
// all unit tests to fail
semver.satisfies(
potential.replace('-nightly', '+nightly.'),
range /*, {
// TODO: what is for?
includePrerelease: true
}*/
);
matcher.factory = nightlyRangeVersionMatcherFactory;
matcher.factory = semverVersionMatcherFactory;
return matcher;
};

export const nightlyExactVersionMatcherFactory = (
export const nightlyV8MatcherFactory = (
version: string,
timestamp: string
distribution: string
): VersionMatcher => {
const range = `${version}-${timestamp.replace('nightly', 'nightly.')}`;
const {range, includePrerelease} = createRangePreRelease(
version,
distribution
)!;
const matcher = (potential: string): boolean =>
distributionOf(potential) === Distributions.NIGHTLY &&
distributionOf(potential) === distribution &&
semver.satisfies(
potential.replace('-nightly', '-nightly.'),
range /*, {
// TODO: what is for?
includePrerelease: true
}*/
potential.replace(distribution, `${distribution}.`),
range!,
{includePrerelease: includePrerelease}
);
matcher.factory = nightlyExactVersionMatcherFactory;
matcher.factory = nightlyV8MatcherFactory;
return matcher;
};

const alwaysFalseVersionMatcherFactory = (): VersionMatcher => {
const matcher = () => false;
matcher.factory = alwaysFalseVersionMatcherFactory;
return matcher;
};

const alwaysFalseVersionMatcher = alwaysFalseVersionMatcherFactory();

// [raw, prerelease]
export const splitVersionSpec = (versionSpec: string): string[] =>
versionSpec.split(/-(.*)/s);

export function versionMatcherFactory(versionSpec: string): VersionMatcher {
const createRangePreRelease = (
versionSpec: string,
distribution: string = ''
) => {
let range: string | undefined;
const [raw, prerelease] = splitVersionSpec(versionSpec);
const isValidVersion = semver.valid(raw);
const rawVersion = (isValidVersion ? raw : semver.coerce(raw))!;

if (`-${prerelease}` !== distribution) {
range = `${rawVersion}${`-${prerelease}`.replace(
distribution,
`${distribution}.`
)}`;
} else {
range = `${semver.validRange(`^${rawVersion}${distribution}`)}-0`;
}

return {range, includePrerelease: !isValidVersion};
};

export function versionMatcherFactory(versionSpec: string): VersionMatcher {
const raw = splitVersionSpec(versionSpec)[0];
const validVersion = semver.valid(raw) ? raw : semver.coerce(raw)?.version;
const distribution = distributionOf(versionSpec);

if (validVersion) {
switch (distributionOf(versionSpec)) {
switch (distribution) {
case Distributions.CANARY:
return prerelease === 'v8-canary' // this means versionSpec does not have timestamp
? canaryRangeVersionMatcherFactory(validVersion)
: canaryExactVersionMatcherFactory(validVersion, prerelease);
case Distributions.NIGHTLY:
return prerelease === 'nightly' // this means versionSpec does not have prerelease tag
? nightlyRangeVersionMatcherFactory(validVersion)
: nightlyExactVersionMatcherFactory(validVersion, prerelease);
return nightlyV8MatcherFactory(versionSpec, distribution);
case Distributions.RC:
case Distributions.DEFAULT:
return semverVersionMatcherFactory(versionSpec);
}
} else {
// TODO: i prefer to have implicit exception for the malformed input
throw Error(`Invalid version input "${versionSpec}"`);

// TODO: but it is possible to silently fail
// return alwaysFalseVersionMatcher
}
}

Expand Down