refactor

Author: mob-sakai

bin/cli.js

@@ -1,27 +1,9 @@
 #!/usr/bin/env node
 
-const { getUnityChangeset, scrapeArchivedChangesets, scrapeBetaChangesets } = require("../dist/index");
+const { getUnityChangeset, scrapeArchivedChangesets, scrapeBetaChangesets, toNumber } = require("../dist/index");
 const cli = require('cac')();
 const pkgJson = require('../package.json');
 
-const toNumber = function (version, max = false) {
-  const match = version.toString().match(/^(\d+)\.*(\d*)\.*(\d*)(\w*)(\d*)$/);
-  if (match === null) return 0;
-
-  return parseInt(match[1] || (max ? '9999' : '0')) * 100 * 100 * 100 * 100
-    + parseInt(match[2] || (max ? '99' : '0')) * 100 * 100 * 100
-    + parseInt(match[3] || (max ? '99' : '0')) * 100 * 100
-    + ((match[4] || (max ? 'z' : 'a')).toUpperCase().charCodeAt(0) - 65) * 100
-    + parseInt(match[5] || (max ? '99' : '0'));
-};
-
-const toMinor = function (version) {
-  const match = version.toString().match(/^(\d+)\.*(\d*)\.*(\d*)(\w*)(\d*)$/);
-  if (match === null) return '';
-
-  return `${match[1]}.${match[2]}`;
-};
-
 const groupBy = (array, getKey) =>
   array.reduce((obj, cur, idx, src) => {
     const key = getKey(cur, idx, src);
@@ -64,23 +46,20 @@ cli.command('list', 'List changesets')
     var max = options.max ? toNumber(options.max, true) : Number.MAX_VALUE;
     results = results
       .filter(r => options.grep ? r.version.includes(options.grep) : true)
-      .filter(r => {
-        const n = toNumber(r.version);
-        return min <= n && n <= max;
-      });
+      .filter(r => min <= r.versionNumber && r.versionNumber <= max);
 
     // Group by minor version
     if (options.minorVersions) {
-      results.forEach(r => r.version = toMinor(r.version))
+      results.forEach(r => r.version = r.minor)
       results = Object.values(groupBy(results, r => r.version)).map(g => g[0]);
     }
     // Group by minor version and get latest patch
     else if (options.latestPatch) {
-      results = Object.values(groupBy(results, r => toMinor(r.version))).map(g => g[0]);
+      results = Object.values(groupBy(results, r => r.minor)).map(g => g[0]);
     }
     // Group by minor version and get oldest patch
     else if (options.oldestPatch) {
-      results = Object.values(groupBy(results, r => toMinor(r.version))).map(g => g[g.length - 1]);
+      results = Object.values(groupBy(results, r => r.minor)).map(g => g[g.length - 1]);
     }
 
     // Output versions
@@ -110,6 +89,8 @@ cli
   .example('unity-changeset list')
   .example('unity-changeset list --beta')
   .example('unity-changeset list --versions')
+  .example('unity-changeset list --versions --all')
+  .example('unity-changeset list --versions --all --latest-patch')
   .help()
   .version(pkgJson.version);
 

src/index.ts

@@ -22,7 +22,7 @@ export const getUnityChangeset = async (version: string): Promise<UnityChangeset
     case 'b':
       return await getBetaChangeset(version, 'beta');
     default:
-      throw Error('The given version was not supported')
+      throw Error(`The given life-cycle '${match?.[1]}' (in ${version}) was not supported`)
   }
 };
 
@@ -85,4 +85,8 @@ export const scrapeBetaChangesets = async (onlyLatestPatch: boolean = false): Pr
 
   return Array.from(hrefs)
     .map(href => UnityChangeset.createFromHref(href));
+};
+
+export const toNumber = (version: string, max: boolean): number => {
+  return UnityChangeset.toNumber(version, max);
 };

src/unityChangeset.ts

@@ -1,14 +1,27 @@
 const REGEXP_HUB_LINK = /^unityhub:\/\/(\d{4}\.\d+\.\d+(a|b|f)\d+)\/(\w{12})$/
+const REGEXP_UNITY = /^(\d+)\.(\d+)\.(\d+)([a-zA-Z]+)(\d+)/;
+const REGEXP_UNITY_NUM = /^(\d+)\.?(\d+)?\.?(\d+)?([a-zA-Z]+)?(\d+)?/;
 
 export class UnityChangeset {
   version: string = '';
   changeset: string = '';
+  versionNumber: number = 0;
+  minor: string = '';
+  lifecycle: string = '';
+
 
   constructor(version: string, changeset: string) {
     Object.assign(this, { version, changeset });
+
+    const match = this.version.match(REGEXP_UNITY);
+    if (match) {
+      this.versionNumber = UnityChangeset.toNumber(this.version, false);
+      this.minor = `${match[1]}.${match[2]}`;
+      this.lifecycle = `${match[4]}`;
+    }
   }
 
-  toString() {
+  toString = (): string => {
     return `${this.version}\t${this.changeset}`;
   }
 
@@ -20,4 +33,15 @@ export class UnityChangeset {
     const match = href.match(REGEXP_HUB_LINK);
     return new UnityChangeset(match?.[1] as string, match?.[3] as string);
   };
+
+  static toNumber = (version: string, max: boolean): number => {
+    const match = version.toString().match(REGEXP_UNITY_NUM);
+    if (match === null) return 0;
+
+    return parseInt(match[1] || (max ? '9999' : '0')) * 100 * 100 * 100 * 100
+      + parseInt(match[2] || (max ? '99' : '0')) * 100 * 100 * 100
+      + parseInt(match[3] || (max ? '99' : '0')) * 100 * 100
+      + ((match[4] || (max ? 'z' : 'a')).toUpperCase().charCodeAt(0) - 65) * 100
+      + parseInt(match[5] || (max ? '99' : '0'));
+  };
 }