From e25fd13757c25a111a5eea56327baa391dc9b925 Mon Sep 17 00:00:00 2001
From: Dmitry Shibanov <shibanov-1997@inbox.ru>
Date: Tue, 29 Nov 2022 16:14:33 +0100
Subject: [PATCH] comment code

---
 dist/setup/index.js | 46 +++++++++++++++++---------------
 src/installer.ts    | 65 +++++++++++++++++++++++----------------------
 2 files changed, 57 insertions(+), 54 deletions(-)

diff --git a/dist/setup/index.js b/dist/setup/index.js
index 80f0f8f0..d2061e7d 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -73233,28 +73233,33 @@ exports.distributionOf = (versionSpec) => {
     return Distributions.DEFAULT;
 };
 exports.semverVersionMatcherFactory = (range) => {
-    const matcher = (potential) => {
-        core.debug(`potential is ${potential}`);
-        return semver.satisfies(potential, range);
-    };
-    core.debug(`range is ${range}`);
+    const matcher = (potential) => semver.satisfies(potential, range);
     matcher.factory = exports.semverVersionMatcherFactory;
     return matcher;
 };
-exports.canaryRangeVersionMatcherFactory = (version) => {
-    const { range, includePrerelease } = createRangePreRelease(version, Distributions.CANARY);
-    const matcher = (potential) => semver.satisfies(potential.replace(Distributions.CANARY, `${Distributions.CANARY}.`), range, { includePrerelease: includePrerelease });
-    matcher.factory = exports.canaryRangeVersionMatcherFactory;
-    return matcher;
-};
-exports.nightlyRangeVersionMatcherFactory = (version) => {
-    const { range, includePrerelease } = createRangePreRelease(version, Distributions.NIGHTLY);
-    const matcher = (potential) => exports.distributionOf(potential) === Distributions.NIGHTLY &&
-        semver.satisfies(potential.replace(Distributions.NIGHTLY, `${Distributions.NIGHTLY}.`), range, { includePrerelease: includePrerelease });
+// export const canaryRangeVersionMatcherFactory = (
+//   version: string
+// ): VersionMatcher => {
+//   const {range, includePrerelease} = createRangePreRelease(
+//     version,
+//     Distributions.CANARY
+//   )!;
+//   const matcher = (potential: string): boolean =>
+//     semver.satisfies(
+//       potential.replace(Distributions.CANARY, `${Distributions.CANARY}.`),
+//       range!,
+//       {includePrerelease: includePrerelease}
+//     );
+//   matcher.factory = canaryRangeVersionMatcherFactory;
+//   return matcher;
+// };
+exports.nightlyRangeVersionMatcherFactory = (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.nightlyRangeVersionMatcherFactory;
     return matcher;
 };
-// [raw, prerelease]
 exports.splitVersionSpec = (versionSpec) => versionSpec.split(/-(.*)/s);
 const createRangePreRelease = (versionSpec, preRelease = '') => {
     let range;
@@ -73263,16 +73268,12 @@ const createRangePreRelease = (versionSpec, preRelease = '') => {
     const rawVersion = isValidVersion ? raw : semver.coerce(raw);
     if (rawVersion) {
         if (`-${prerelease}` !== preRelease) {
-            core.debug(`came to full version ${preRelease}`);
             range = `${rawVersion}${`-${prerelease}`.replace(preRelease, `${preRelease}.`)}`;
         }
         else {
-            core.debug('came to range version');
             range = `${semver.validRange(`^${rawVersion}${preRelease}`)}-0`;
         }
     }
-    core.debug(`prerelease is ${prerelease}, preRelease is ${preRelease}`);
-    core.debug(`Version Range for ${versionSpec} is ${range}`);
     return { range, includePrerelease: !isValidVersion };
 };
 function versionMatcherFactory(versionSpec) {
@@ -73282,9 +73283,10 @@ function versionMatcherFactory(versionSpec) {
     if (validVersion) {
         switch (exports.distributionOf(versionSpec)) {
             case Distributions.CANARY:
-                return exports.canaryRangeVersionMatcherFactory(versionSpec);
             case Distributions.NIGHTLY:
-                return exports.nightlyRangeVersionMatcherFactory(versionSpec);
+                return exports.nightlyRangeVersionMatcherFactory(versionSpec, Distributions.CANARY);
+            case Distributions.NIGHTLY:
+                return exports.nightlyRangeVersionMatcherFactory(versionSpec, Distributions.NIGHTLY);
             case Distributions.RC:
             case Distributions.DEFAULT:
                 return exports.semverVersionMatcherFactory(versionSpec);
diff --git a/src/installer.ts b/src/installer.ts
index 5e1fc2cc..7049b538 100644
--- a/src/installer.ts
+++ b/src/installer.ts
@@ -56,43 +56,42 @@ interface VersionMatcher {
 }
 
 export const semverVersionMatcherFactory = (range: string): VersionMatcher => {
-  const matcher = (potential: string): boolean =>{
-    core.debug(`potential is ${potential}`)
-    return semver.satisfies(potential, range);
-  }
-  core.debug(`range is ${range}`);
+  const matcher = (potential: string): boolean =>
+    semver.satisfies(potential, range);
+
   matcher.factory = semverVersionMatcherFactory;
   return matcher;
 };
 
-export const canaryRangeVersionMatcherFactory = (
-  version: string
-): VersionMatcher => {
-  const {range, includePrerelease} = createRangePreRelease(
-    version,
-    Distributions.CANARY
-  )!;
-  const matcher = (potential: string): boolean =>
-    semver.satisfies(
-      potential.replace(Distributions.CANARY, `${Distributions.CANARY}.`),
-      range!,
-      {includePrerelease: includePrerelease}
-    );
-  matcher.factory = canaryRangeVersionMatcherFactory;
-  return matcher;
-};
+// export const canaryRangeVersionMatcherFactory = (
+//   version: string
+// ): VersionMatcher => {
+//   const {range, includePrerelease} = createRangePreRelease(
+//     version,
+//     Distributions.CANARY
+//   )!;
+//   const matcher = (potential: string): boolean =>
+//     semver.satisfies(
+//       potential.replace(Distributions.CANARY, `${Distributions.CANARY}.`),
+//       range!,
+//       {includePrerelease: includePrerelease}
+//     );
+//   matcher.factory = canaryRangeVersionMatcherFactory;
+//   return matcher;
+// };
 
 export const nightlyRangeVersionMatcherFactory = (
-  version: string
+  version: string,
+  distribution: string
 ): VersionMatcher => {
   const {range, includePrerelease} = createRangePreRelease(
     version,
-    Distributions.NIGHTLY
+    distribution
   )!;
   const matcher = (potential: string): boolean =>
-    distributionOf(potential) === Distributions.NIGHTLY &&
+    distributionOf(potential) === distribution &&
     semver.satisfies(
-      potential.replace(Distributions.NIGHTLY, `${Distributions.NIGHTLY}.`),
+      potential.replace(distribution, `${distribution}.`),
       range!,
       {includePrerelease: includePrerelease}
     );
@@ -100,7 +99,6 @@ export const nightlyRangeVersionMatcherFactory = (
   return matcher;
 };
 
-// [raw, prerelease]
 export const splitVersionSpec = (versionSpec: string): string[] =>
   versionSpec.split(/-(.*)/s);
 
@@ -115,18 +113,14 @@ const createRangePreRelease = (
 
   if (rawVersion) {
     if (`-${prerelease}` !== preRelease) {
-      core.debug(`came to full version ${preRelease}`);
       range = `${rawVersion}${`-${prerelease}`.replace(
         preRelease,
         `${preRelease}.`
       )}`;
     } else {
-      core.debug('came to range version');
       range = `${semver.validRange(`^${rawVersion}${preRelease}`)}-0`;
     }
   }
-  core.debug(`prerelease is ${prerelease}, preRelease is ${preRelease}`);
-  core.debug(`Version Range for ${versionSpec} is ${range}`);
 
   return {range, includePrerelease: !isValidVersion};
 };
@@ -138,9 +132,16 @@ export function versionMatcherFactory(versionSpec: string): VersionMatcher {
   if (validVersion) {
     switch (distributionOf(versionSpec)) {
       case Distributions.CANARY:
-        return canaryRangeVersionMatcherFactory(versionSpec);
       case Distributions.NIGHTLY:
-        return nightlyRangeVersionMatcherFactory(versionSpec);
+        return nightlyRangeVersionMatcherFactory(
+          versionSpec,
+          Distributions.CANARY
+        );
+      case Distributions.NIGHTLY:
+        return nightlyRangeVersionMatcherFactory(
+          versionSpec,
+          Distributions.NIGHTLY
+        );
       case Distributions.RC:
       case Distributions.DEFAULT:
         return semverVersionMatcherFactory(versionSpec);