use n sources

openupm · Sep 15, 2024 · 8b892ae · 8b892ae
1 parent 5c0777f
commit 8b892ae
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 55 deletions.
diff --git a/src/app/add-dependencies.ts b/src/app/add-dependencies.ts
@@ -1,5 +1,5 @@
 import { CustomError } from "ts-custom-error";
-import type { Err } from "ts-results-es";
+import { Err, Result } from "ts-results-es";
 import { logResolvedDependency } from "../cli/dependency-logging";
 import { PackumentNotFoundError } from "../domain/common-errors";
 import {
@@ -31,7 +31,7 @@ import {
   mapScopedRegistry,
   setDependency,
 } from "../domain/project-manifest";
-import { type Registry, unityRegistry } from "../domain/registry";
+import { type Registry } from "../domain/registry";
 import { type RegistryUrl, unityRegistryUrl } from "../domain/registry-url";
 import {
   addScope,
@@ -40,10 +40,13 @@ import {
 import { SemanticVersion } from "../domain/semantic-version";
 import { isZod } from "../domain/zod-utils";
 import type { ReadTextFile, WriteTextFile } from "../io/fs";
-import type { GetRegistryPackument } from "../io/registry";
+import { type GetRegistryPackument } from "../io/registry";
 import type { CheckUrlExists } from "../io/www";
 import { loadProjectManifestUsing } from "./get-dependencies";
-import { FetchRegistryPackumentVersion } from "./get-registry-packument-version";
+import {
+  FetchRegistryPackumentVersion,
+  type ResolvedPackumentVersion,
+} from "./get-registry-packument-version";
 import { resolveDependenciesUsing } from "./resolve-dependencies";
 import { saveProjectManifestUsing } from "./write-dependencies";
 
@@ -187,9 +190,7 @@ function pickMostFixable(
  * @param projectDirectory The projects root directory.
  * @param editorVersion The projects editor version. Will be used to check
  * compatibility. If set to null then compatibility will not be checked.
- * @param primaryRegistry The primary registry from which to resolve
- * dependencies.
- * @param useUnity Whether to fall back to the Unity registry.
+ * @param sources The sources from which to resolve the packuments.
  * @param force Whether to force add the dependencies.
  * @param shouldAddTestable Whether to also add dependencies to the `testables`.
  * @param pkgs References to the dependencies to add.
@@ -203,8 +204,7 @@ export async function addDependenciesUsing(
   debugLog: DebugLog,
   projectDirectory: string,
   editorVersion: ReleaseVersion | null,
-  primaryRegistry: Registry,
-  useUnity: boolean,
+  sources: ReadonlyArray<Registry>,
   force: boolean,
   shouldAddTestable: boolean,
   pkgs: ReadonlyArray<PackageReference>
@@ -236,7 +236,7 @@ export async function addDependenciesUsing(
     const dependencyGraph = await resolveDependenciesUsing(
       checkUrlExists,
       fetchPackument,
-      [primaryRegistry, unityRegistry],
+      sources,
       packageName,
       verison,
       true
@@ -330,28 +330,30 @@ export async function addDependenciesUsing(
   ): Promise<[SemanticVersion, RegistryUrl]> {
     let versionToAdd = requestedVersion;
 
-    let resolveResult = await getRegistryPackumentVersion(
-      packageName,
-      requestedVersion,
-      primaryRegistry
-    ).promise;
-    if (resolveResult.isErr() && useUnity) {
-      const unityResult = await getRegistryPackumentVersion(
+    let totalResolveResult: Result<
+      ResolvedPackumentVersion,
+      ResolvePackumentVersionError
+    > = Err(new PackumentNotFoundError(packageName));
+
+    for (const source of sources) {
+      const resolveResult = await getRegistryPackumentVersion(
         packageName,
         requestedVersion,
-        unityRegistry
+        source
       ).promise;
-      if (unityResult.isOk()) {
-        resolveResult = unityResult;
+
+      if (resolveResult.isOk()) {
+        totalResolveResult = resolveResult;
+        break;
       } else {
-        resolveResult = pickMostFixable(resolveResult, unityResult);
+        totalResolveResult = pickMostFixable(totalResolveResult, resolveResult);
       }
     }
 
-    if (resolveResult.isErr()) throw resolveResult.error;
+    if (totalResolveResult.isErr()) throw totalResolveResult.error;
 
-    const packumentVersion = resolveResult.value.packumentVersion;
-    const source = resolveResult.value.source;
+    const packumentVersion = totalResolveResult.value.packumentVersion;
+    const source = totalResolveResult.value.source;
     versionToAdd = packumentVersion.version;
 
     // Only do compatibility check when we have a editor version to check against
@@ -408,9 +410,8 @@ export async function addDependenciesUsing(
     );
 
     if (!isUnityPackage && packagesInScope.length > 0) {
-      manifest = mapScopedRegistry(manifest, primaryRegistry.url, (initial) => {
-        let updated =
-          initial ?? makeEmptyScopedRegistryFor(primaryRegistry.url);
+      manifest = mapScopedRegistry(manifest, source, (initial) => {
+        let updated = initial ?? makeEmptyScopedRegistryFor(source);
 
         updated = packagesInScope.reduce(addScope, updated!);
 

diff --git a/src/cli/cmd-add.ts b/src/cli/cmd-add.ts
@@ -8,6 +8,7 @@ import {
   PackageReference,
 } from "../domain/package-reference";
 import { recordEntries } from "../domain/record-utils";
+import { unityRegistry } from "../domain/registry";
 import { getHomePathFromEnv } from "../domain/special-paths";
 import { getUserUpmConfigPathFor } from "../domain/upm-config";
 import type { ReadTextFile, WriteTextFile } from "../io/fs";
@@ -92,6 +93,9 @@ export function makeAddCmd(
       env.primaryRegistryUrl
     );
 
+    const sources = [primaryRegistry];
+    if (env.useUnityRegistry) sources.push(unityRegistry);
+
     const addResults = await addDependenciesUsing(
       readTextFile,
       writeTextFile,
@@ -100,8 +104,7 @@ export function makeAddCmd(
       debugLog,
       projectDirectory,
       typeof editorVersion === "string" ? null : editorVersion,
-      primaryRegistry,
-      env.useUnityRegistry,
+      sources,
       options.force === true,
       options.test === true,
       pkgs

diff --git a/test/integration/app/add-dependencies.test.ts b/test/integration/app/add-dependencies.test.ts
@@ -13,7 +13,7 @@ import { makeEditorVersion } from "../../../src/domain/editor-version";
 import { partialApply } from "../../../src/domain/fp-utils";
 import { noopLogger } from "../../../src/domain/logging";
 import { emptyProjectManifest } from "../../../src/domain/project-manifest";
-import type { Registry } from "../../../src/domain/registry";
+import { unityRegistry, type Registry } from "../../../src/domain/registry";
 import { unityRegistryUrl } from "../../../src/domain/registry-url";
 import { SemanticVersion } from "../../../src/domain/semantic-version";
 import { getRegistryPackumentUsing } from "../../../src/io/registry";
@@ -117,8 +117,7 @@ describe("add dependencies", () => {
     const result = await addDependencies(
       someProjectDir,
       null,
-      someRegistry,
-      true,
+      [someRegistry, unityRegistry],
       true,
       false,
       [badEditorPackument.name]
@@ -138,8 +137,7 @@ describe("add dependencies", () => {
     const result = await addDependencies(
       someProjectDir,
       null,
-      someRegistry,
-      true,
+      [someRegistry, unityRegistry],
       true,
       false,
       [incompatiblePackument.name]
@@ -160,8 +158,7 @@ describe("add dependencies", () => {
       addDependencies(
         someProjectDir,
         makeEditorVersion(2020, 1, 1, "f", 1),
-        someRegistry,
-        true,
+        [someRegistry, unityRegistry],
         false,
         false,
         [incompatiblePackument.name]
@@ -176,8 +173,7 @@ describe("add dependencies", () => {
       addDependencies(
         someProjectDir,
         makeEditorVersion(2020, 1, 1, "f", 1),
-        someRegistry,
-        true,
+        [someRegistry, unityRegistry],
         true,
         false,
         [unknownPackage]
@@ -192,8 +188,7 @@ describe("add dependencies", () => {
       addDependencies(
         someProjectDir,
         makeEditorVersion(2020, 1, 1, "f", 1),
-        someRegistry,
-        true,
+        [someRegistry, unityRegistry],
         false,
         false,
         [badEditorPackument.name]
@@ -205,9 +200,14 @@ describe("add dependencies", () => {
     const { addDependencies } = makeDependencies();
 
     await expect(() =>
-      addDependencies(someProjectDir, null, someRegistry, true, false, false, [
-        packumentWithBadDependency.name,
-      ])
+      addDependencies(
+        someProjectDir,
+        null,
+        [someRegistry, unityRegistry],
+        false,
+        false,
+        [packumentWithBadDependency.name]
+      )
     ).rejects.toBeInstanceOf(UnresolvedDependenciesError);
   });
 
@@ -217,8 +217,7 @@ describe("add dependencies", () => {
     const result = await addDependencies(
       someProjectDir,
       null,
-      someRegistry,
-      true,
+      [someRegistry, unityRegistry],
       true,
       false,
       [packumentWithBadDependency.name]
@@ -238,8 +237,7 @@ describe("add dependencies", () => {
     await addDependencies(
       someProjectDir,
       null,
-      someRegistry,
-      true,
+      [someRegistry, unityRegistry],
       false,
       false,
       [somePackument.name]
@@ -265,8 +263,7 @@ describe("add dependencies", () => {
     await addDependencies(
       someProjectDir,
       null,
-      someRegistry,
-      true,
+      [someRegistry, unityRegistry],
       false,
       false,
       [somePackument.name]
@@ -286,8 +283,7 @@ describe("add dependencies", () => {
     await addDependencies(
       someProjectDir,
       null,
-      someRegistry,
-      true,
+      [someRegistry, unityRegistry],
       false,
       false,
       [somePackument.name]
@@ -313,8 +309,7 @@ describe("add dependencies", () => {
     await addDependencies(
       someProjectDir,
       null,
-      someRegistry,
-      true,
+      [someRegistry, unityRegistry],
       false,
       true,
       [somePackument.name]
@@ -334,8 +329,7 @@ describe("add dependencies", () => {
     await addDependencies(
       someProjectDir,
       null,
-      someRegistry,
-      true,
+      [someRegistry, unityRegistry],
       false,
       true,
       // The second package can not be added