@theholocron/cli 5.0.0-alpha.151 → 5.0.0-alpha.152

package/dist/cli.mjs

@@ -10,7 +10,7 @@ import { LOG_LEVELS, NoopAnalyticsSink, NoopErrorSink, redactObject } from "@the
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 import { AuthError, ProviderApiError, ProviderApiError as ProviderApiError$1, createRestClient } from "@theholocron/http-client";
-import { createEnvLookup } from "@theholocron/env-utils";
+import { createEnvLookup, firstEnv, withEnvPrefix } from "@theholocron/env-utils";
 import { Entry, findCredentials } from "@napi-rs/keyring";
 import { pathToFileURL } from "node:url";
 import { errorMessage } from "@theholocron/misc-utils";
@@ -37,6 +37,13 @@ import search from "@inquirer/search";
 /** Singleton env for simple global lookups throughout the CLI. */
 const env = createEnvLookup();
 /**
+* `get("KEY")` tries `HOLOCRON_KEY` first, then `KEY`. Use it for settings that
+* have both a Holocron-namespaced override and a vendor-native name; do not use
+* it for `HOLOCRON_*` variables that have no bare fallback (`HOLOCRON_ORG`,
+* `HOLOCRON_LOG_LEVEL`, …), where the bare name would be wrong.
+*/
+const holocronEnv = withEnvPrefix(env, "HOLOCRON");
+/**
 * Create an injectable env for commands that accept a fake env in tests.
 * Pass `input.env` when available, falls back to `process.env`.
 */
@@ -450,10 +457,10 @@ function resolveCliAxiom(opts) {
 		const fromEnv = resolveAxiomFromEnv();
 		if (fromEnv) return fromEnv;
 	}
-	const dataset = isGlobal ? GLOBAL_AXIOM_DATASET : env.get("HOLOCRON_AXIOM_DATASET") || env.get("AXIOM_DATASET") || opts.configAxiomDataset;
+	const dataset = isGlobal ? GLOBAL_AXIOM_DATASET : holocronEnv.get("AXIOM_DATASET") ?? opts.configAxiomDataset;
 	if (!dataset) return void 0;
 	const org = opts.org ?? env.get("HOLOCRON_ORG");
-	const token = env.get("HOLOCRON_AXIOM_TOKEN") || env.get("AXIOM_TOKEN") || (org ? getToken(`axiom.${org}`) : null) || getToken("axiom");
+	const token = holocronEnv.get("AXIOM_TOKEN") || (org ? getToken(`axiom.${org}`) : null) || getToken("axiom");
 	return token ? {
 		dataset,
 		token
@@ -813,10 +820,8 @@ const defaultImporter = async (pkg) => {
 * pulling FROM it would just re-store the same value.
 */
 function resolveAuthSetToken(input) {
-	const e = makeEnv(input.env);
-	const upper = input.provider.toUpperCase();
-	const holocronKey = `HOLOCRON_${upper}_TOKEN`;
-	return input.positional || e.get(holocronKey) || e.get(`${upper}_TOKEN`) || null;
+	const e = withEnvPrefix(makeEnv(input.env), "HOLOCRON");
+	return input.positional || e.get(`${input.provider.toUpperCase()}_TOKEN`) || null;
 }
 async function runAuthSet(input) {
 	const print = input.print ?? ((l) => console.log(l));
@@ -6561,7 +6566,11 @@ async function runSyncReadme(input) {
 //#endregion
 //#region src/commands/sync-wiki.ts
 function resolveToken(input) {
-	return input.token ?? input.context.cliToken ?? process.env.HOLOCRON_READ_TOKEN ?? process.env.GH_TOKEN ?? process.env.GITHUB_TOKEN;
+	return input.token ?? input.context.cliToken ?? firstEnv(env, [
+		"HOLOCRON_READ_TOKEN",
+		"GH_TOKEN",
+		"GITHUB_TOKEN"
+	]);
 }
 function deriveBasepath(domain, repoName) {
 	if (domain) {
@@ -7384,15 +7393,15 @@ const FALLBACK_POSTHOG_PROJECT_TOKEN = "phc_AC4vFCvYzwnzmG7Vg5nEc3PZKZztoPyfKp4L
 const DEFAULT_POSTHOG_HOST = "https://us.i.posthog.com";
 /** Resolve the Sentry DSN. `""` → error telemetry disabled. */
 function resolveDsn() {
-	return env.get("HOLOCRON_SENTRY_DSN") ?? env.get("SENTRY_DSN") ?? FALLBACK_DSN;
+	return holocronEnv.get("SENTRY_DSN") ?? FALLBACK_DSN;
 }
 /** Resolve the PostHog project key. `""` → usage analytics disabled. */
 function resolvePostHogKey() {
-	return env.get("HOLOCRON_POSTHOG_PROJECT_TOKEN") ?? env.get("POSTHOG_PROJECT_TOKEN") ?? FALLBACK_POSTHOG_PROJECT_TOKEN;
+	return holocronEnv.get("POSTHOG_PROJECT_TOKEN") ?? FALLBACK_POSTHOG_PROJECT_TOKEN;
 }
 /** Resolve the PostHog ingest host. */
 function resolvePostHogHost() {
-	return env.get("HOLOCRON_POSTHOG_HOST") ?? env.get("POSTHOG_HOST") ?? DEFAULT_POSTHOG_HOST;
+	return holocronEnv.get("POSTHOG_HOST") ?? DEFAULT_POSTHOG_HOST;
 }
 //#endregion
 //#region src/telemetry.ts