refactor: extract search service

src/cli/cmd-add.ts

@@ -48,7 +48,7 @@ import { logValidDependency } from "./dependency-logging";
 import { unityRegistryUrl } from "../domain/registry-url";
 import { tryGetTargetEditorVersionFor } from "../domain/package-manifest";
 import { VersionNotFoundError } from "../domain/packument";
-import {FetchPackumentError} from "../io/packument-io";
+import { FetchPackumentError } from "../io/packument-io";
 
 export class InvalidPackumentDataError extends CustomError {
   private readonly _class = "InvalidPackumentDataError";

src/cli/cmd-search.ts

@@ -2,12 +2,10 @@ import * as os from "os";
 import { EnvParseError, ParseEnvService } from "../services/parse-env";
 import { CmdOptions } from "./options";
 import { formatAsTable } from "./output-formatting";
-import { AsyncResult, Ok, Result } from "ts-results-es";
+import { Ok, Result } from "ts-results-es";
 import { HttpErrorBase } from "npm-registry-fetch/lib/errors";
-import { SearchedPackument, SearchRegistry } from "../io/npm-search";
-import { Registry } from "../domain/registry";
-import { FetchAllPackuments } from "../io/all-packuments-io";
 import { Logger } from "npmlog";
+import { SearchPackages } from "../services/search-packages";
 
 export type SearchError = EnvParseError | HttpErrorBase;
 
@@ -28,66 +26,33 @@ export type SearchCmd = (
  */
 export function makeSearchCmd(
   parseEnv: ParseEnvService,
-  searchRegistry: SearchRegistry,
-  fetchAllPackuments: FetchAllPackuments,
+  searchPackages: SearchPackages,
   log: Logger
 ): SearchCmd {
-  function searchEndpoint(
-    registry: Registry,
-    keyword: string
-  ): AsyncResult<ReadonlyArray<SearchedPackument>, HttpErrorBase> {
-    return searchRegistry(registry, keyword).map((results) => {
-      log.verbose("npmsearch", results.join(os.EOL));
-      return results;
-    });
-  }
-
-  function searchOld(
-    registry: Registry,
-    keyword: string
-  ): AsyncResult<SearchedPackument[], HttpErrorBase> {
-    return fetchAllPackuments(registry).map((allPackuments) => {
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      const { _updated, ...packumentEntries } = allPackuments;
-      const packuments = Object.values(packumentEntries);
-
-      log.verbose("endpoint.all", packuments.join(os.EOL));
-
-      // filter keyword
-      const klc = keyword.toLowerCase();
-
-      return packuments.filter((packument) =>
-        packument.name.toLowerCase().includes(klc)
-      );
-    });
-  }
-
   return async (keyword, options) => {
     // parse env
     const envResult = await parseEnv(options);
     if (envResult.isErr()) return envResult;
     const env = envResult.value;
 
-    // search endpoint
-    let result = await searchEndpoint(env.registry, keyword).promise;
-
-    // search old search
-    if (result.isErr()) {
+    let usedEndpoint = "npmsearch";
+    const searchResult = await searchPackages(env.registry, keyword, () => {
+      usedEndpoint = "endpoint.all";
       log.warn("", "fast search endpoint is not available, using old search.");
-      result = await searchOld(env.registry, keyword).promise;
-    }
-    if (result.isErr()) {
+    }).promise;
+
+    if (searchResult.isErr()) {
       log.warn("", "/-/all endpoint is not available");
-      return result;
+      return searchResult;
     }
 
-    const results = result.value;
-
+    const results = searchResult.value;
     if (results.length === 0) {
       log.notice("", `No matches found for "${keyword}"`);
       return Ok(undefined);
     }
 
+    log.verbose(usedEndpoint, results.map((it) => it.name).join(os.EOL));
     console.log(formatAsTable(results));
     return Ok(undefined);
   };

src/cli/cmd-view.ts

@@ -16,7 +16,7 @@ import {
 } from "../common-errors";
 import { Logger } from "npmlog";
 
-import {FetchPackument} from "../io/packument-io";
+import { FetchPackument } from "../io/packument-io";
 
 export type ViewOptions = CmdOptions;
 

src/cli/index.ts

@@ -43,6 +43,7 @@ import { makeCwdGetter, makeHomePathGetter } from "../io/special-paths";
 import { makeProjectVersionLoader } from "../io/project-version-io";
 import { makeSaveAuthToUpmConfigService } from "../services/upm-auth";
 import { makePackumentFetcher } from "../io/packument-io";
+import { makePackagesSearcher } from "../services/search-packages";
 
 // Composition root
 
@@ -84,6 +85,7 @@ const saveAuthToUpmConfig = makeSaveAuthToUpmConfigService(
   loadUpmConfig,
   writeFile
 );
+const searchPackages = makePackagesSearcher(searchRegistry, fetchAllPackuments);
 
 const addCmd = makeAddCmd(
   parseEnv,
@@ -101,12 +103,7 @@ const loginCmd = makeLoginCmd(
   saveAuthToUpmConfig,
   log
 );
-const searchCmd = makeSearchCmd(
-  parseEnv,
-  searchRegistry,
-  fetchAllPackuments,
-  log
-);
+const searchCmd = makeSearchCmd(parseEnv, searchPackages, log);
 const depsCmd = makeDepsCmd(parseEnv, resolveDependencies, log);
 const removeCmd = makeRemoveCmd(
   parseEnv,

src/services/dependency-resolving.ts

@@ -20,7 +20,7 @@ import {
 import { Err, Ok, Result } from "ts-results-es";
 import { PackumentNotFoundError } from "../common-errors";
 import { HttpErrorBase } from "npm-registry-fetch/lib/errors";
-import {FetchPackumentError} from "../io/packument-io";
+import { FetchPackumentError } from "../io/packument-io";
 
 export type DependencyBase = {
   /**

src/services/resolve-latest-version.ts

@@ -5,7 +5,7 @@ import { SemanticVersion } from "../domain/semantic-version";
 import { PackumentNotFoundError } from "../common-errors";
 import { NoVersionsError, tryGetLatestVersion } from "../domain/packument";
 import { recordKeys } from "../utils/record-utils";
-import {FetchPackumentError, FetchPackument} from "../io/packument-io";
+import { FetchPackumentError, FetchPackument } from "../io/packument-io";
 
 /**
  * Error which may occur when resolving the latest version for a package.

src/services/resolve-remote-packument.ts

@@ -8,7 +8,7 @@ import {
 } from "../packument-resolving";
 import { PackumentNotFoundError } from "../common-errors";
 import { tryResolvePackumentVersion } from "../domain/packument";
-import {FetchPackumentError, FetchPackument} from "../io/packument-io";
+import { FetchPackumentError, FetchPackument } from "../io/packument-io";
 
 /**
  * Service function for resolving remove packuments.

src/services/search-packages.ts

@@ -0,0 +1,45 @@
+import { Registry } from "../domain/registry";
+import { AsyncResult } from "ts-results-es";
+import { SearchedPackument, SearchRegistry } from "../io/npm-search";
+import { FetchAllPackuments } from "../io/all-packuments-io";
+import { HttpErrorBase } from "npm-registry-fetch/lib/errors";
+
+export type SearchPackagesError = HttpErrorBase;
+
+export type SearchPackages = (
+  registry: Registry,
+  keyword: string,
+  onUseAllFallback?: () => void
+) => AsyncResult<ReadonlyArray<SearchedPackument>, SearchPackagesError>;
+
+export function makePackagesSearcher(
+  searchRegistry: SearchRegistry,
+  fetchAllPackuments: FetchAllPackuments
+): SearchPackages {
+  function searchInAll(
+    registry: Registry,
+    keyword: string
+  ): AsyncResult<SearchedPackument[], HttpErrorBase> {
+    return fetchAllPackuments(registry).map((allPackuments) => {
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      const { _updated, ...packumentEntries } = allPackuments;
+      const packuments = Object.values(packumentEntries);
+
+      // filter keyword
+      const klc = keyword.toLowerCase();
+
+      return packuments.filter((packument) =>
+        packument.name.toLowerCase().includes(klc)
+      );
+    });
+  }
+
+  return (registry, keyword, onUseOldSearch) => {
+    // search endpoint
+    return searchRegistry(registry, keyword).orElse(() => {
+      // search old search
+      onUseOldSearch && onUseOldSearch();
+      return searchInAll(registry, keyword);
+    });
+  };
+}