refactor: pull up partial application

Pull up creation of partially applied functions so that they a. don't pollute business code and b. are created only once

Author: ComradeVanti

src/app/add-dependencies.ts

@@ -226,6 +226,12 @@ export async function addDependenciesUsing(
     fetchPackument
   );
 
+  const resolveDependencies = partialApply(
+    resolveDependenciesUsing,
+    checkUrlExists,
+    fetchPackument
+  );
+
   async function resolveScopesFor(
     packageName: DomainName,
     verison: SemanticVersion,
@@ -234,9 +240,8 @@ export async function addDependenciesUsing(
     if (source === unityRegistryUrl) return {};
 
     await debugLog(`fetch: ${makePackageReference(packageName, verison)}`);
-    const dependencyGraph = await resolveDependenciesUsing(
-      checkUrlExists,
-      fetchPackument,
+
+    const dependencyGraph = await resolveDependencies(
       sources,
       packageName,
       verison,

src/cli/cmd-add.ts

@@ -3,6 +3,7 @@ import { Logger } from "npmlog";
 import { addDependenciesUsing } from "../app/add-dependencies";
 import { determineEditorVersionUsing } from "../app/determine-editor-version";
 import { loadRegistryAuthUsing } from "../app/get-registry-auth";
+import { partialApply } from "../domain/fp-utils";
 import { DebugLog } from "../domain/logging";
 import { makePackageReference } from "../domain/package-reference";
 import { recordEntries } from "../domain/record-utils";
@@ -59,6 +60,27 @@ export function makeAddCmd(
   log: Logger,
   debugLog: DebugLog
 ) {
+  const determineEditorVersion = partialApply(
+    determineEditorVersionUsing,
+    readTextFile,
+    debugLog
+  );
+
+  const getRegistryAuth = partialApply(
+    loadRegistryAuthUsing,
+    readTextFile,
+    debugLog
+  );
+
+  const addDependencies = partialApply(
+    addDependenciesUsing,
+    readTextFile,
+    writeTextFile,
+    fetchPackument,
+    checkUrlExists,
+    debugLog
+  );
+
   return new Command("add")
     .aliases(["install", "i"])
     .addArgument(pkgArg)
@@ -80,11 +102,7 @@ openupm add @ [otherPkgs...]`
 
         const projectDirectory = options.chdir;
 
-        const editorVersion = await determineEditorVersionUsing(
-          readTextFile,
-          debugLog,
-          projectDirectory
-        );
+        const editorVersion = await determineEditorVersion(projectDirectory);
 
         if (typeof editorVersion === "string")
           log.warn(
@@ -101,18 +119,13 @@ openupm add @ [otherPkgs...]`
 
         const sources = await Promise.all(
           (options.registry ?? [openupmRegistryUrl]).map((it) =>
-            loadRegistryAuthUsing(readTextFile, debugLog, upmConfigPath, it)
+            getRegistryAuth(upmConfigPath, it)
           )
         );
 
         if (options.upstream) sources.push(unityRegistry);
 
-        const addResults = await addDependenciesUsing(
-          readTextFile,
-          writeTextFile,
-          fetchPackument,
-          checkUrlExists,
-          debugLog,
+        const addResults = await addDependencies(
           projectDirectory,
           typeof editorVersion === "string" ? null : editorVersion,
           sources,

src/cli/cmd-deps.ts

@@ -7,6 +7,7 @@ import { loadRegistryAuthUsing } from "../app/get-registry-auth";
 import { queryAllRegistriesLazy } from "../app/query-registries";
 import { resolveDependenciesUsing } from "../app/resolve-dependencies";
 import { PackumentNotFoundError } from "../domain/common-errors";
+import { partialApply } from "../domain/fp-utils";
 import { DebugLog } from "../domain/logging";
 import {
   makePackageReference,
@@ -52,6 +53,23 @@ export function makeDepsCmd(
   log: Logger,
   debugLog: DebugLog
 ) {
+  const getRegistryAuth = partialApply(
+    loadRegistryAuthUsing,
+    readTextFile,
+    debugLog
+  );
+
+  const getLatestVersion = partialApply(
+    fetchLatestPackumentVersionUsing,
+    fetchPackument
+  );
+
+  const resolveDependencies = partialApply(
+    resolveDependenciesUsing,
+    checkUrlExists,
+    fetchPackument
+  );
+
   return new Command("deps")
     .alias("dep")
     .addArgument(pkgArg)
@@ -71,9 +89,7 @@ openupm deps @`
           homePath,
           options.systemUser
         );
-        const primaryRegistry = await loadRegistryAuthUsing(
-          readTextFile,
-          debugLog,
+        const primaryRegistry = await getRegistryAuth(
           upmConfigPath,
           options.registry
         );
@@ -95,11 +111,7 @@ openupm deps @`
             ? requestedVersion
             : (
                 await queryAllRegistriesLazy(sources, (source) =>
-                  fetchLatestPackumentVersionUsing(
-                    fetchPackument,
-                    source,
-                    packageName
-                  )
+                  getLatestVersion(source, packageName)
                 )
               )?.value ?? null;
 
@@ -111,9 +123,7 @@ openupm deps @`
             options.deep
           }`
         );
-        const dependencyGraph = await resolveDependenciesUsing(
-          checkUrlExists,
-          fetchPackument,
+        const dependencyGraph = await resolveDependencies(
           sources,
           packageName,
           latestVersion,

src/cli/cmd-search.ts

@@ -33,12 +33,19 @@ export function makeSearchCmd(
   log: Logger,
   debugLog: DebugLog
 ) {
+  const getRegistryAuth = partialApply(
+    loadRegistryAuthUsing,
+    readTextFile,
+    debugLog
+  );
+
   const searchPackages = partialApply(
     searchPackagesUsing,
     searchRegistry,
     fetchAllPackuments,
     debugLog
   );
+
   return new Command("search")
     .argument("", "The keyword to search")
     .addOption(primaryRegistryUrlOpt)
@@ -54,9 +61,7 @@ export function makeSearchCmd(
           options.systemUser
         );
 
-        const primaryRegistry = await loadRegistryAuthUsing(
-          readTextFile,
-          debugLog,
+        const primaryRegistry = await getRegistryAuth(
           upmConfigPath,
           options.registry
         );

src/cli/cmd-view.ts

@@ -4,6 +4,7 @@ import { EOL } from "os";
 import { loadRegistryAuthUsing } from "../app/get-registry-auth";
 import { queryAllRegistriesLazy } from "../app/query-registries";
 import { PackumentNotFoundError } from "../domain/common-errors";
+import { partialApply } from "../domain/fp-utils";
 import type { DebugLog } from "../domain/logging";
 import { hasVersion, splitPackageReference } from "../domain/package-reference";
 import { unityRegistry } from "../domain/registry";
@@ -33,6 +34,12 @@ export function makeViewCmd(
   debugLog: DebugLog,
   log: Logger
 ) {
+  const getRegistryAuth = partialApply(
+    loadRegistryAuthUsing,
+    readTextFile,
+    debugLog
+  );
+
   return new Command("view")
     .argument("", "Reference to a package", mustBePackageReference)
     .addOption(primaryRegistryUrlOpt)
@@ -49,9 +56,7 @@ export function makeViewCmd(
           options.systemUser
         );
 
-        const primaryRegistry = await loadRegistryAuthUsing(
-          readTextFile,
-          debugLog,
+        const primaryRegistry = await getRegistryAuth(
           upmConfigPath,
           options.registry
         );