fix: merged modules

Signed-off-by: Akos Kitta <[email protected]>

Author: Akos Kitta

Diff for: arduino-ide-extension/src/browser/widgets/component-list/item-action.ts

@@ -1,33 +0,0 @@
-import { Installable } from '../../../common/protocol';
-
-export const ItemActionLiterals = [
-  'installLatest',
-  'installSelected',
-  'update',
-  'remove',
-  'unknown',
-] as const;
-export type ItemActionType = typeof ItemActionLiterals[number];
-
-export function itemAction(params: {
-  installed?: Installable.Version | undefined;
-  available: Installable.Version[];
-  selected?: Installable.Version;
-}): ItemActionType {
-  const { installed, available } = params;
-  const latest = Installable.latest(available);
-  if (!latest || (installed && !available.includes(installed))) {
-    return 'unknown';
-  }
-  const selected = params.selected ?? latest;
-  if (installed === selected) {
-    return 'remove';
-  }
-  if (installed) {
-    return selected === latest && installed !== latest
-      ? 'update'
-      : 'installSelected';
-  } else {
-    return selected === latest ? 'installLatest' : 'installSelected';
-  }
-}

Diff for: arduino-ide-extension/src/browser/widgets/component-list/list-item-renderer.tsx

@@ -1,12 +1,11 @@
-import * as React from '@theia/core/shared/react';
-import { inject, injectable } from '@theia/core/shared/inversify';
 import { WindowService } from '@theia/core/lib/browser/window/window-service';
-import { Installable } from '../../../common/protocol/installable';
-import { ArduinoComponent } from '../../../common/protocol/arduino-component';
-import { ComponentListItem } from './component-list-item';
-import { nls } from '@theia/core/lib/common';
+import { nls } from '@theia/core/lib/common/nls';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import * as React from '@theia/core/shared/react';
 import { Unknown } from '../../../common/nls';
-import { itemAction } from './item-action';
+import type { ArduinoComponent } from '../../../common/protocol/arduino-component';
+import { Installable } from '../../../common/protocol/installable';
+import type { ComponentListItem } from './component-list-item';
 
 @injectable()
 export class ListItemRenderer<T extends ArduinoComponent> {
@@ -62,7 +61,7 @@ export class ListItemRenderer<T extends ArduinoComponent> {
       }
     };
 
-    const actionType = itemAction({
+    const actionType = Installable.action({
       installed: installedVersion,
       available: availableVersions,
       selected: selectedVersion,

Diff for: arduino-ide-extension/src/common/protocol/installable.ts

@@ -51,6 +51,38 @@ export namespace Installable {
     };
   }
 
+  export const ActionLiterals = [
+    'installLatest',
+    'installSelected',
+    'update',
+    'remove',
+    'unknown',
+  ] as const;
+  export type Action = typeof ActionLiterals[number];
+
+  export function action(params: {
+    installed?: Version | undefined;
+    available: Version[];
+    selected?: Version;
+  }): Action {
+    const { installed, available } = params;
+    const latest = Installable.latest(available);
+    if (!latest || (installed && !available.includes(installed))) {
+      return 'unknown';
+    }
+    const selected = params.selected ?? latest;
+    if (installed === selected) {
+      return 'remove';
+    }
+    if (installed) {
+      return selected === latest && installed !== latest
+        ? 'update'
+        : 'installSelected';
+    } else {
+      return selected === latest ? 'installLatest' : 'installSelected';
+    }
+  }
+
   export function latest(versions: Version[]): Version | undefined {
     if (!versions.length) {
       return undefined;

Diff for: arduino-ide-extension/src/test/browser/item-action.test.ts

@@ -39,4 +39,94 @@ describe('installable', () => {
       });
     });
   });
+
+  describe('action', () => {
+    const installLatest: Installable.Action = 'installLatest';
+    const installSelected: Installable.Action = 'installSelected';
+    const update: Installable.Action = 'update';
+    const remove: Installable.Action = 'remove';
+    const unknown: Installable.Action = 'unknown';
+    const notAvailable = '0.0.0';
+    const latest = '2.0.0';
+    // shuffled versions
+    const available: Installable.Version[] = [
+      '1.4.1',
+      '1.0.0',
+      latest,
+      '2.0.0-beta.1',
+      '1.5',
+    ];
+
+    it("should result 'unknown' if available is empty", () => {
+      expect(Installable.action({ available: [] })).to.be.equal(unknown);
+    });
+    it("should result 'unknown' if installed is not in available", () => {
+      expect(
+        Installable.action({ available, installed: notAvailable })
+      ).to.be.equal(unknown);
+    });
+
+    it("should result 'installLatest' if not installed and not selected", () => {
+      expect(Installable.action({ available })).to.be.equal(installLatest);
+    });
+    it("should result 'installLatest' if not installed and latest is selected", () => {
+      expect(Installable.action({ available, selected: latest })).to.be.equal(
+        installLatest
+      );
+    });
+
+    it("should result 'installSelected' if not installed and not latest is selected", () => {
+      available
+        .filter((version) => version !== latest)
+        .forEach((selected) =>
+          expect(
+            Installable.action({
+              available,
+              selected,
+            })
+          ).to.be.equal(installSelected)
+        );
+    });
+    it("should result 'installSelected' if installed and the selected is neither the latest nor the installed", () => {
+      available.forEach((installed) =>
+        available
+          .filter((selected) => selected !== latest && selected !== installed)
+          .forEach((selected) =>
+            expect(
+              Installable.action({
+                installed,
+                available,
+                selected,
+              })
+            ).to.be.equal(installSelected)
+          )
+      );
+    });
+
+    it("should result 'update' if the installed version is not the latest and the latest is selected", () => {
+      available
+        .filter((installed) => installed !== latest)
+        .forEach((installed) =>
+          expect(
+            Installable.action({
+              installed,
+              available,
+              selected: latest,
+            })
+          ).to.be.equal(update)
+        );
+    });
+
+    it("should result 'remove' if the selected version equals the installed version", () => {
+      available.forEach((version) =>
+        expect(
+          Installable.action({
+            installed: version,
+            available,
+            selected: version,
+          })
+        ).to.be.equal(remove)
+      );
+    });
+  });
 });