Fix formatting to match prettier.

actions · Nov 30, 2021 · 9c1600a · 9c1600a
1 parent 1bc2528
commit 9c1600a
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 34 deletions.
diff --git a/__tests__/distributors/microsoft-installer.test.ts b/__tests__/distributors/microsoft-installer.test.ts
@@ -4,7 +4,7 @@ import { ArchitectureOptions } from '../../src/distributions/microsoft/models';
 describe('getArchitectureOptions', () => {
   it.each([
     ['x64', { bitness: '64', arch: 'x86' }],
-    ['aarch64', { bitness: '64', arch: 'arm' }],
+    ['aarch64', { bitness: '64', arch: 'arm' }]
   ] as [string, ArchitectureOptions][])('parse architecture %s -> %s', (input, expected) => {
     const distributions = new MicrosoftDistributions({
       architecture: input,
@@ -43,23 +43,35 @@ describe('findPackageForDownload', () => {
   });
 
   it.each([
-    ['17.x', '17.0.1', 'https://aka.ms/download-jdk/microsoft-jdk-17.0.1.12.1-{{OS_TYPE}}-x64.tar.gz'],
-    ['16.0.x', '16.0.2', 'https://aka.ms/download-jdk/microsoft-jdk-16.0.2.7.1-{{OS_TYPE}}-x64.tar.gz'],
-    ['11.0.13', '11.0.13', 'https://aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-{{OS_TYPE}}-x64.tar.gz'],
+    [
+      '17.x',
+      '17.0.1',
+      'https://aka.ms/download-jdk/microsoft-jdk-17.0.1.12.1-{{OS_TYPE}}-x64.tar.gz'
+    ],
+    [
+      '16.0.x',
+      '16.0.2',
+      'https://aka.ms/download-jdk/microsoft-jdk-16.0.2.7.1-{{OS_TYPE}}-x64.tar.gz'
+    ],
+    [
+      '11.0.13',
+      '11.0.13',
+      'https://aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-{{OS_TYPE}}-x64.tar.gz'
+    ]
   ])('version is %s -> %s', async (input, expectedVersion, expectedUrl) => {
     const result = await distribution['findPackageForDownload'](input);
     expect(result.version).toBe(expectedVersion);
     var os: string;
     switch (process.platform) {
-        case 'darwin':
-            os = 'macos';
-            break;
-        case 'win32':
-            os = 'windows';
-            break;
-        default:
-            os = process.platform.toString();
-            break;
+      case 'darwin':
+        os = 'macos';
+        break;
+      case 'win32':
+        os = 'windows';
+        break;
+      default:
+        os = process.platform.toString();
+        break;
     }
     expect(result.url).toBe(expectedUrl.replace('{{OS_TYPE}}', os));
   });
@@ -82,7 +94,7 @@ describe('getPlatformOption', () => {
   it.each([
     ['linux', 'linux'],
     ['darwin', 'macos'],
-    ['win32', 'windows'],
+    ['win32', 'windows']
   ])('os version %s -> %s', (input, expected) => {
     const actual = distributions['getPlatformOption'](input as NodeJS.Platform);
 

diff --git a/src/distributions/distribution-factory.ts b/src/distributions/distribution-factory.ts
@@ -38,7 +38,7 @@ export function getJavaDistribution(
     case JavaDistribution.Liberica:
       return new LibericaDistributions(installerOptions);
     case JavaDistribution.Microsoft:
-        return new MicrosoftDistributions(installerOptions);
+      return new MicrosoftDistributions(installerOptions);
     default:
       return null;
   }

diff --git a/src/distributions/microsoft/installer.ts b/src/distributions/microsoft/installer.ts
@@ -44,7 +44,9 @@ export class MicrosoftDistributions extends JavaBase {
     const availableVersionsRaw = await this.getAvailableVersions();
 
     const availableVersions = availableVersionsRaw.map(item => ({
-      url: `https://aka.ms/download-jdk/microsoft-jdk-${item.fullVersion}-${this.getPlatformOption()}-${this.architecture}.tar.gz`,
+      url: `https://aka.ms/download-jdk/microsoft-jdk-${
+        item.fullVersion
+      }-${this.getPlatformOption()}-${this.architecture}.tar.gz`,
       version: this.convertVersionToSemver(item)
     }));
 
@@ -69,22 +71,26 @@ export class MicrosoftDistributions extends JavaBase {
     console.time('microsoft-retrieve-available-versions');
 
     // TODO get these dynamically!
-    var jdkVersions = [{
-      majorVersion: 17,
-      minorVersion: 0,
-      patchVersion: 1,
-      fullVersion: '17.0.1.12.1'
-    }, {
-      majorVersion: 16,
-      minorVersion: 0,
-      patchVersion: 2,
-      fullVersion: '16.0.2.7.1'
-    }, {
-      majorVersion: 11,
-      minorVersion: 0,
-      patchVersion: 13,
-      fullVersion: '11.0.13.8.1'
-    }];
+    var jdkVersions = [
+      {
+        majorVersion: 17,
+        minorVersion: 0,
+        patchVersion: 1,
+        fullVersion: '17.0.1.12.1'
+      },
+      {
+        majorVersion: 16,
+        minorVersion: 0,
+        patchVersion: 2,
+        fullVersion: '16.0.2.7.1'
+      },
+      {
+        majorVersion: 11,
+        minorVersion: 0,
+        patchVersion: 13,
+        fullVersion: '11.0.13.8.1'
+      }
+    ];
 
     return jdkVersions;
   }
@@ -120,4 +126,4 @@ export class MicrosoftDistributions extends JavaBase {
   private convertVersionToSemver(version: MicrosoftVersion): string {
     return `${version.majorVersion}.${version.minorVersion}.${version.patchVersion}`;
   }
-}
+}
diff --git a/src/distributions/microsoft/models.ts b/src/distributions/microsoft/models.ts
@@ -14,4 +14,4 @@ export interface MicrosoftVersion {
   minorVersion: number;
   patchVersion: number;
   fullVersion: string;
-}
+}