@theholocron/cli 3.63.0 → 3.65.0

package/dist/index.d.mts

@@ -1,5 +1,6 @@
 import { Analytics, Auth, AuthDescription, AuthEvent, AuthEventType, AuthIdentity, AuthUser, CARDINALITY, CapabilityImpls, CapabilityKey, Cardinality, CardinalityFor, Ci, CiRun, CiRunFilter, CiRunStatus, ConnectionStringOptions, CreateAuthUserInput, Deployment, DeploymentProject, DeploymentProjectSettings, DeploymentRecord, DeploymentTarget, DeploymentTrigger, Dns, DnsRecord, DnsRecordType, EnsureResult, Environment, EnvironmentReviewer, Environments, Errors, Issue, IssueSearchFilter, Issues, LabelDef, LifecycleResult, LifecycleSlot, Logs, NormalizedAuthUser, Notifications, PagesConfig, ParseWebhookInput, ProviderApiError, ProviderIdentity, PullRequest, REQUIRED_CAPABILITIES, RepoRef, RepoSettings, ResolvedCapability, Ruleset, SecretScope, Secrets, Source, StatusCategory, Storage, StorageBranch, TeamEntry, TeamPermission, Tooling, ToolingDoctorReport, TrackerDoctorReport, TrackerUser, Vault, WebhookDashboardInfo, WebhookVerificationError, Wiki, WikiDnsRecord, WikiProvisionOpts, WikiProxyConfig, Workers, isMulti } from "./plugin/capabilities.mjs";
 import { AuthError, RequestOptions, ResolveTokenConfig as ResolveTokenConfig$1, ResolveTokenInput, RestClient, RestClientConfig, createRestClient } from "@theholocron/http-client";
+import { ConfigFileError } from "@theholocron/datapad";
 import { LogLevel } from "@theholocron/logger";
 //#region src/auth/auth-resolver.d.ts
 type ResolveTokenConfig = Omit<ResolveTokenConfig$1, "getKeyringToken">;
@@ -513,9 +514,6 @@ declare function compose(...args: (Capability | Capability[])[]): ComposedPreset
 declare function defineConfig(config: HolocronConfig): HolocronConfig;
 //#endregion
 //#region src/config/load-config.d.ts
-declare class ConfigFileError extends Error {
-  name: string;
-}
 interface LoadedConfig {
   resolved: ResolvedHolocronConfig;
   /** Absolute path to the file the config was read from. */
@@ -523,8 +521,8 @@ interface LoadedConfig {
 }
 /**
  * Read + parse + resolve `holocron.config.*` from the given directory.
- * Search order: json → js → ts. Throws `ConfigFileError` if nothing
- * found, or `ConfigError` if the config is malformed / invalid.
+ * Throws {@link ConfigFileError} when nothing is found or a file cannot
+ * be loaded, or `ConfigError` when the config is invalid.
  */
 declare function loadConfig(cwd: string): Promise<LoadedConfig>;
 //#endregion

package/dist/index.mjs

@@ -3,10 +3,10 @@ import { AuthError, createResolveToken as createResolveToken$1, createRestClient
 import { createEnvLookup } from "@theholocron/env-utils";
 import { Entry, findCredentials } from "@napi-rs/keyring";
 import { execFile } from "node:child_process";
-import { readFile, stat } from "node:fs/promises";
+import { readFile } from "node:fs/promises";
 import { basename, dirname, join } from "node:path";
-import { pathToFileURL } from "node:url";
 import { promisify } from "node:util";
+import { ConfigFileError, ConfigFileError as ConfigFileError$1, loadConfigFile } from "@theholocron/datapad";
 createEnvLookup();
 /**
 * Create an injectable env for commands that accept a fake env in tests.
@@ -312,74 +312,32 @@ function defineConfig(config) {
 //#endregion
 //#region src/config/load-config.ts
 /**
-* `holocron.config.{json,js,ts}` file loader.
+* `holocron.config.{ts,js,mjs,cjs,json}` loader.
 *
-* Search order: json → js → ts. JSON is parsed directly; JS is loaded
-* via native dynamic import; TS is loaded via `tsImport` from tsx (a
-* runtime dep) so operators can write typed configs with `defineConfig`
-* without needing a separate build step.
+* File discovery + module loading (typed configs via `tsx`, no build
+* step) is delegated to `@theholocron/datapad`. This module keeps the
+* holocron-specific parts: filling `name` / `repo.name` defaults and
+* running the config through `resolveConfig`.
 *
-* All three forms are validated through the same `resolveConfig` path.
-* Implements the lookup-order contract from issue #75 / #81.
+* Probe order is TS-first (`.ts` → `.js` → `.mjs` → `.cjs` → `.json`) —
+* see ADR-0010 / issue #75 / #81.
 */
 const execFileAsync = promisify(execFile);
-const CANDIDATE_FILENAMES = [
-	"holocron.config.json",
-	"holocron.config.js",
-	"holocron.config.ts"
-];
-var ConfigFileError = class extends Error {
-	name = "ConfigFileError";
-};
 /**
 * Read + parse + resolve `holocron.config.*` from the given directory.
-* Search order: json → js → ts. Throws `ConfigFileError` if nothing
-* found, or `ConfigError` if the config is malformed / invalid.
+* Throws {@link ConfigFileError} when nothing is found or a file cannot
+* be loaded, or `ConfigError` when the config is invalid.
 */
 async function loadConfig(cwd) {
-	for (const filename of CANDIDATE_FILENAMES) {
-		const fullPath = join(cwd, filename);
-		if (await fileExists(fullPath)) {
-			if (filename.endsWith(".json")) return {
-				resolved: await loadJson(fullPath),
-				filepath: fullPath
-			};
-			if (filename.endsWith(".ts")) return {
-				resolved: await loadTs(fullPath),
-				filepath: fullPath
-			};
-			return {
-				resolved: await loadJs(fullPath),
-				filepath: fullPath
-			};
-		}
-	}
-	throw new ConfigFileError(`no holocron.config.{json,js,ts} found in ${cwd}. Create one — see the README for the schema.`);
-}
-async function loadJson(filepath) {
-	const raw = await readFile(filepath, "utf8");
-	let parsed;
-	try {
-		parsed = JSON.parse(raw);
-	} catch (err) {
-		throw new ConfigError(`${filepath} is not valid JSON: ${err instanceof Error ? err.message : String(err)}`);
-	}
-	return resolveConfig(await deriveDefaults(dirname(filepath), parsed));
-}
-async function loadJs(filepath) {
-	const mod = await import(pathToFileURL(filepath).href);
-	return resolveConfig(await deriveDefaults(dirname(filepath), extractRaw(filepath, mod)));
-}
-async function loadTs(filepath) {
-	const { tsImport } = await import("tsx/esm/api");
-	const mod = await tsImport(pathToFileURL(filepath).href, import.meta.url);
-	return resolveConfig(await deriveDefaults(dirname(filepath), extractRaw(filepath, mod)));
-}
-function extractRaw(filepath, mod) {
-	const outer = mod.default;
-	const raw = outer?.__esModule === true ? outer.default : outer;
-	if (raw === void 0 || raw === null) throw new ConfigFileError(`${filepath} must have a default export (use \`export default defineConfig({…})\`)`);
-	return raw;
+	const found = await loadConfigFile({
+		cwd,
+		name: "holocron"
+	});
+	if (!found) throw new ConfigFileError$1(`no holocron.config.{ts,js,mjs,cjs,json} found in ${cwd}. Create one — see the README for the schema.`);
+	return {
+		resolved: resolveConfig(await deriveDefaults(dirname(found.filepath), found.config)),
+		filepath: found.filepath
+	};
 }
 async function deriveDefaults(configDir, raw) {
 	const result = { ...raw };
@@ -420,12 +378,5 @@ function parseGitRemoteUrl(url) {
 	const sshMatch = url.match(/github\.com:([^/]+\/[^/]+?)(?:\.git)?$/);
 	if (sshMatch) return sshMatch[1];
 }
-async function fileExists(path) {
-	try {
-		return (await stat(path)).isFile();
-	} catch {
-		return false;
-	}
-}
 //#endregion
 export { AuthError, CARDINALITY, ConfigError, ConfigFileError, ProviderApiError, REQUIRED_CAPABILITIES, WebhookVerificationError, compose, createFeatureResolver, createResolveToken, createRestClient, defineConfig, deleteToken, getToken, isMulti, listStoredProviders, loadConfig, resolveConfig, resolveEntry, resolvePluginPackage, setToken };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theholocron/cli",
-  "version": "3.63.0",
+  "version": "3.65.0",
   "description": "The Holocron CLI — a pluggable, capability-based orchestrator for spinning up and operating software projects.",
   "keywords": [
     "cli",
@@ -47,13 +47,13 @@
     "@theholocron/env-utils": "^1.6.0",
     "@theholocron/github-client": "^1.14.2",
     "@theholocron/http-client": "^1.14.2",
-    "@theholocron/registry-doc": "^1.10.0",
+    "@theholocron/registry-doc": "^1.11.0",
     "chalk": "^6.0.0",
     "ora": "^9.4.1",
     "posthog-node": "^5.51.6",
-    "tsx": "4.23.12",
     "yargs": "^18.1.0",
-    "@theholocron/logger": "3.63.0"
+    "@theholocron/logger": "3.65.0",
+    "@theholocron/datapad": "3.65.0"
   },
   "devDependencies": {
     "@theholocron/eslint-config": "^7.32.1",
@@ -67,9 +67,10 @@
     "eslint-plugin-n": "^18.3.0",
     "globals": "^17.11.0",
     "tsdown": "^0.22.14",
+    "tsx": "4.23.12",
     "typescript": "^5.9.3",
     "vitest": "^4.1.11",
-    "@theholocron/rollup-plugin-transform-template": "3.63.0"
+    "@theholocron/rollup-plugin-transform-template": "3.65.0"
   },
   "engines": {
     "node": ">=22.0.0"