Replace all internal uses of utilities with new packages

Signed-off-by: Sebastian Malton <sebastian@malton.name>

packages/core/src/main/helm/__tests__/helm-service.test.ts

@@ -6,14 +6,14 @@
 import { getDiForUnitTesting } from "../../getDiForUnitTesting";
 import listHelmChartsInjectable from "../helm-service/list-helm-charts.injectable";
 import getActiveHelmRepositoriesInjectable from "../repositories/get-active-helm-repositories/get-active-helm-repositories.injectable";
-import type { AsyncResult } from "../../../common/utils/async-result";
+import type { AsyncResult } from "@k8slens/utilities";
 import type { HelmRepo } from "../../../common/helm/helm-repo";
-import { sortBySemverVersion } from "../../../common/utils";
+import { sortBySemverVersion } from "@k8slens/utilities";
 import helmChartManagerInjectable from "../helm-chart-manager.injectable";
 
 describe("Helm Service tests", () => {
   let listHelmCharts: () => Promise<any>;
-  let getActiveHelmRepositoriesMock: jest.Mock<Promise<AsyncResult<HelmRepo[]>>>;
+  let getActiveHelmRepositoriesMock: jest.Mock<AsyncResult<HelmRepo[]>>;
 
   beforeEach(() => {
     const di = getDiForUnitTesting();

packages/core/src/main/helm/helm-chart-manager.ts

@@ -4,7 +4,7 @@
  */
 
 import * as yaml from "js-yaml";
-import { iter, put, sortBySemverVersion } from "../../common/utils";
+import { iter, put, sortBySemverVersion } from "@k8slens/utilities";
 import type { HelmRepo } from "../../common/helm/helm-repo";
 import type { HelmChartManagerCache } from "./helm-chart-manager-cache.injectable";
 import type { Logger } from "../../common/logger";

packages/core/src/main/helm/helm-service/get-helm-release-resources/call-for-kube-resources-by-manifest/call-for-kube-resources-by-manifest.injectable.ts

@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import type { JsonObject } from "type-fest";
-import { json } from "../../../../../common/utils";
+import { json } from "@k8slens/utilities";
 import yaml from "js-yaml";
 import execFileWithInputInjectable from "./exec-file-with-input/exec-file-with-input.injectable";
 import { getErrorMessage } from "../../../../../common/utils/get-error-message";

packages/core/src/main/helm/helm-service/get-helm-release-resources/call-for-kube-resources-by-manifest/exec-file-with-input/exec-file-with-input.injectable.ts

@@ -5,7 +5,7 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import type { AsyncResult } from "../../../../../../common/utils/async-result";
 import nonPromiseExecFileInjectable from "./non-promise-exec-file.injectable";
-import { isNumber } from "../../../../../../common/utils";
+import { isNumber } from "@k8slens/utilities";
 import assert from "assert";
 import type { ChildProcess } from "child_process";
 

packages/core/src/main/helm/helm-service/get-helm-release.injectable.ts

@@ -5,8 +5,8 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import type { Cluster } from "../../../common/cluster/cluster";
 import loggerInjectable from "../../../common/logger.injectable";
-import { isObject, json } from "../../../common/utils";
 import kubeconfigManagerInjectable from "../../kubeconfig-manager/kubeconfig-manager.injectable";
+import { isObject, json } from "@k8slens/utilities";
 import execHelmInjectable from "../exec-helm/exec-helm.injectable";
 import getHelmReleaseResourcesInjectable from "./get-helm-release-resources/get-helm-release-resources.injectable";
 

packages/core/src/main/helm/helm-service/list-helm-charts.injectable.ts

@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import assert from "assert";
-import { object } from "../../../common/utils";
+import { object } from "@k8slens/utilities";
 import getActiveHelmRepositoriesInjectable from "../repositories/get-active-helm-repositories/get-active-helm-repositories.injectable";
 import type { HelmRepo } from "../../../common/helm/helm-repo";
 import helmChartManagerInjectable from "../helm-chart-manager.injectable";

packages/core/src/main/helm/list-helm-releases.injectable.ts

@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import execHelmInjectable from "./exec-helm/exec-helm.injectable";
-import { isObject, json, toCamelCase } from "../../common/utils";
+import { toCamelCase, isObject } from "@k8slens/utilities";
 
 export type ListHelmReleases = (pathToKubeconfig: string, namespace?: string) => Promise<Record<string, any>[]>;
 
@@ -34,7 +34,7 @@ const listHelmReleasesInjectable = getInjectable({
         throw result.error;
       }
 
-      const output = json.parse(result.response);
+      const output = JSON.parse(result.response);
 
       if (!Array.isArray(output) || output.length == 0) {
         return [];

packages/core/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable.ts

@@ -9,7 +9,7 @@ import readYamlFileInjectable from "../../../../common/fs/read-yaml-file.injecta
 import getHelmEnvInjectable from "../../get-helm-env/get-helm-env.injectable";
 import execHelmInjectable from "../../exec-helm/exec-helm.injectable";
 import loggerInjectable from "../../../../common/logger.injectable";
-import type { AsyncResult } from "../../../../common/utils/async-result";
+import type { AsyncResult } from "@k8slens/utilities";
 
 interface HelmRepositoryFromYaml {
   name: string;
@@ -38,7 +38,7 @@ const getActiveHelmRepositoriesInjectable = getInjectable({
 
     const getRepositories = getRepositoriesFor(readYamlFile);
 
-    return async (): Promise<AsyncResult<HelmRepo[]>> => {
+    return async (): AsyncResult<HelmRepo[]> => {
       const envResult = await getHelmEnv();
 
       if (!envResult.callWasSuccessful) {