Skip to content

Commit

Permalink
make registry multi arg
Browse files Browse the repository at this point in the history
  • Loading branch information
ComradeVanti committed Sep 17, 2024
1 parent 3f880c6 commit f0b88ab
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 8 deletions.
14 changes: 6 additions & 8 deletions src/cli/cmd-add.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import type { GetRegistryPackument } from "../io/registry";
import type { CheckUrlExists } from "../io/www";
import { eachValue } from "./cli-parsing";
import { withErrorLogger } from "./error-logging";
import { primaryRegistryUrlOpt } from "./opt-registry";
import { primaryRegistriesUrlOpt } from "./opt-registry";
import { systemUserOpt } from "./opt-system-user";
import { upstreamOpt } from "./opt-upstream";
import { workDirOpt } from "./opt-wd";
Expand Down Expand Up @@ -64,7 +64,7 @@ export function makeAddCmd(
.addArgument(otherPkgsArg)
.addOption(addTestableOpt)
.addOption(forceOpt)
.addOption(primaryRegistryUrlOpt)
.addOption(primaryRegistriesUrlOpt)
.addOption(workDirOpt)
.addOption(systemUserOpt)
.addOption(upstreamOpt)
Expand Down Expand Up @@ -98,14 +98,12 @@ openupm add <pkg>@<version> [otherPkgs...]`
options.systemUser
);

const primaryRegistry = await loadRegistryAuthUsing(
readTextFile,
debugLog,
upmConfigPath,
options.registry
const sources = await Promise.all(
options.registry.map((it) =>
loadRegistryAuthUsing(readTextFile, debugLog, upmConfigPath, it)
)
);

const sources = [primaryRegistry];
if (options.upstream) sources.push(unityRegistry);

const addResults = await addDependenciesUsing(
Expand Down
12 changes: 12 additions & 0 deletions src/cli/opt-registry.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Option } from "@commander-js/extra-typings";
import { openupmRegistryUrl } from "../domain/registry-url";
import { eachValue } from "./cli-parsing";
import { mustBeRegistryUrl } from "./validators";

/**
Expand All @@ -12,3 +13,14 @@ export const primaryRegistryUrlOpt = new Option(
)
.argParser(mustBeRegistryUrl)
.default(openupmRegistryUrl, "Use the openupm registry by default");

/**
* CLI option for multiple primary registries from which to resolve packages.
* Defaults to just {@link openupmRegistryUrl}.
*/
export const primaryRegistriesUrlOpt = new Option(
"-r, --registry <url...>",
"specify registry url"
)
.argParser(eachValue(mustBeRegistryUrl))
.default([openupmRegistryUrl], "Use the openupm registry by default");

0 comments on commit f0b88ab

Please sign in to comment.