@theholocron/astromech 5.0.0-alpha.148 → 5.0.0-alpha.150

package/dist/config/index.d.mts

@@ -1,4 +1,5 @@
 import { n as TaskEntry, r as TasksConfig, t as TaskConfigItem } from "../schema.type-BUiSrwS5.mjs";
+import { Loaded } from "@theholocron/datapad";
 //#region src/config/define.d.ts
 /**
  * Typed identity helper for `astromech.config.ts`:
@@ -13,6 +14,23 @@ import { n as TaskEntry, r as TasksConfig, t as TaskConfigItem } from "../schema
  */
 declare const defineConfig: <C extends TasksConfig>(config: C) => C;
 //#endregion
+//#region src/config/load.type.d.ts
+/**
+ * The `tasks` value in each source. A dedicated `astromech.config.*`
+ * default-exports the full {@link TasksConfig} object; the `tasks` key of
+ * `holocron.config.*` is the bare item array (it mirrors the old
+ * `workflows` key). Either form is accepted from either source.
+ */
+type TasksInput = TasksConfig | TaskConfigItem[];
+interface LoadTasksConfigOptions {
+  /**
+   * The `holocron.config.*` the caller has already loaded (`null`: it looked and
+   * there is none), so it isn't found and loaded a second time. Leave it unset
+   * to have `loadTasksConfig` find it itself.
+   */
+  holocron?: Loaded<object> | null;
+}
+//#endregion
 //#region src/config/load.d.ts
 /**
  * Resolve the task manifest for a repo: the `tasks` key of
@@ -23,21 +41,15 @@ declare const defineConfig: <C extends TasksConfig>(config: C) => C;
  * `walkUp: true` — `holocron run`/`ci` are usable from any subdirectory of
  * a repo, not only its exact root (datapad walks up to the nearest `.git`
  * boundary; see `@theholocron/datapad`'s own doc comment).
+ *
+ * A caller that has already loaded `holocron.config.*` passes it as
+ * `options.holocron` so it is not found and loaded again.
  */
-declare function loadTasksConfig(cwd: string): Promise<TasksConfig>;
-//#endregion
-//#region src/config/load.type.d.ts
-/**
- * The `tasks` value in each source. A dedicated `astromech.config.*`
- * default-exports the full {@link TasksConfig} object; the `tasks` key of
- * `holocron.config.*` is the bare item array (it mirrors the old
- * `workflows` key). Either form is accepted from either source.
- */
-type TasksInput = TasksConfig | TaskConfigItem[];
+declare function loadTasksConfig(cwd: string, options?: LoadTasksConfigOptions): Promise<TasksConfig>;
 //#endregion
 //#region src/config/merge-tasks-layers.d.ts
 /**
- * The merge step of {@link loadTasksConfig}, for callers that load the two
+ * The same layering as {@link loadTasksConfig}, for callers that load the two
  * sources some other way (Sentinel reads them from the GitHub API, not
  * from disk, holocron#916): `holocron.config.*`'s `tasks` value first,
  * then a dedicated `astromech.config.*`'s default export merged on top.

package/dist/config/index.mjs

@@ -1,5 +1,5 @@
-import { n as mergeTasksLayers, r as normalizeTaskEntry, t as loadTasksConfig } from "../load-BqpxDjMJ.mjs";
-import { createDefineConfig } from "@theholocron/datapad";
+import { n as coerceTasks, r as normalizeTaskEntry, t as loadTasksConfig } from "../load-ToVjaKPr.mjs";
+import { createDefineConfig, mergeLayers } from "@theholocron/datapad";
 //#region src/config/define.ts
 /**
 * Typed identity helper for `astromech.config.ts`:
@@ -14,4 +14,16 @@ import { createDefineConfig } from "@theholocron/datapad";
 */
 const defineConfig = createDefineConfig();
 //#endregion
+//#region src/config/merge-tasks-layers.ts
+/**
+* The same layering as {@link loadTasksConfig}, for callers that load the two
+* sources some other way (Sentinel reads them from the GitHub API, not
+* from disk, holocron#916): `holocron.config.*`'s `tasks` value first,
+* then a dedicated `astromech.config.*`'s default export merged on top.
+* Either may be `undefined` (source absent); returns `{}` when both are.
+*/
+function mergeTasksLayers(parentTasks, dedicated) {
+	return mergeLayers([coerceTasks(parentTasks), coerceTasks(dedicated)]) ?? {};
+}
+//#endregion
 export { defineConfig, loadTasksConfig, mergeTasksLayers, normalizeTaskEntry };

package/dist/index.mjs

@@ -1,8 +1,8 @@
-import { r as normalizeTaskEntry, t as loadTasksConfig } from "./load-BqpxDjMJ.mjs";
+import { r as normalizeTaskEntry, t as loadTasksConfig } from "./load-ToVjaKPr.mjs";
 import { existsSync, readFileSync, readdirSync } from "node:fs";
-import { join, relative } from "node:path";
+import { dependencyNames, detectPackageManager, listWorkspacePackagesSync, readPackageJsonSync } from "@theholocron/pkg-utils";
 import { stringifyJson } from "@theholocron/json-utils";
-import { dependencyNames, detectPackageManager, readPackageJsonSync } from "@theholocron/pkg-utils";
+import { join, relative } from "node:path";
 import { spawnSync } from "node:child_process";
 import { findExecutableSync } from "@theholocron/fs-utils";
 //#region src/templates/codecov/codecov.yml
@@ -75,24 +75,6 @@ function mergeCodecovComponents(existing, packages) {
 	if (idx === -1) return ensureIfNotFound(existing);
 	return ensureIfNotFound(existing.slice(0, idx + 24)) + codecovComponentBlock(packages);
 }
-function readWorkspaceDir(repoRoot, dir) {
-	const dirPath = join(repoRoot, dir);
-	if (!existsSync(dirPath)) return [];
-	const packages = [];
-	for (const entry of readdirSync(dirPath, { withFileTypes: true })) {
-		if (!entry.isDirectory()) continue;
-		try {
-			const raw = readFileSync(join(dirPath, entry.name, "package.json"), "utf8");
-			const pkg = JSON.parse(raw);
-			if (typeof pkg.name === "string") packages.push({
-				slug: entry.name,
-				name: pkg.name,
-				dir
-			});
-		} catch {}
-	}
-	return packages;
-}
 /**
 * Every public `packages/*`, `apps/*`, and `plugins/*` workspace, sorted by
 * slug. `[]` when none of the three directories exist. Monorepo templates
@@ -102,11 +84,18 @@ function readWorkspaceDir(repoRoot, dir) {
 * component so `codecov/patch/<slug>` actually posts for each.
 */
 function readWorkspacePackages(repoRoot) {
-	return [
-		...readWorkspaceDir(repoRoot, "packages"),
-		...readWorkspaceDir(repoRoot, "apps"),
-		...readWorkspaceDir(repoRoot, "plugins")
-	].sort((a, b) => a.slug.localeCompare(b.slug));
+	return listWorkspacePackagesSync(repoRoot, { roots: [
+		"packages",
+		"apps",
+		"plugins"
+	] }).flatMap(({ name, relativeDir }) => {
+		const [dir, slug] = relativeDir.split("/");
+		return name ? [{
+			slug,
+			name,
+			dir
+		}] : [];
+	}).sort((a, b) => a.slug.localeCompare(b.slug));
 }
 /** A brand-new `codecov.yml` — the scaffold header + the base template + this repo's component list. */
 function createCodecovConfig(packages) {
@@ -2194,35 +2183,28 @@ async function waitForPublished({ packages, run, sleep, now, cwd, timeoutMs = WA
 }
 //#endregion
 //#region src/tasks/deploy-on-release/workspace-packages.ts
-function scanWorkspaceDir(dirPath, { readJson, listDirs }) {
-	let folders;
-	try {
-		folders = listDirs(dirPath);
-	} catch {
-		return [];
-	}
-	return folders.flatMap((folder) => {
-		try {
-			const manifest = readJson(join(dirPath, folder, "package.json"));
-			if (!manifest.name) return [];
-			return [{
-				name: manifest.name,
-				dir: join(dirPath, folder),
-				version: manifest.version,
-				dependencies: manifest.dependencies ?? {}
-			}];
-		} catch {
-			return [];
-		}
-	});
-}
 /**
 * Every package under `<repoRoot>/packages/*` and `<repoRoot>/plugins/*`
 * with a readable, named `package.json` — `holocron`'s own layout splits
 * vendor plugin packages into `plugins/*`, sibling to `packages/*`.
 */
-function workspacePackages(repoRoot, tree) {
-	return [...scanWorkspaceDir(join(repoRoot, "packages"), tree), ...scanWorkspaceDir(join(repoRoot, "plugins"), tree)];
+function workspacePackages(repoRoot, { readJson, listDirs }) {
+	return listWorkspacePackagesSync(repoRoot, {
+		roots: ["packages", "plugins"],
+		readFile: (path) => JSON.stringify(readJson(path)),
+		listDirs: (path) => {
+			try {
+				return listDirs(path);
+			} catch {
+				throw Object.assign(/* @__PURE__ */ new Error(`ENOENT: ${path}`), { code: "ENOENT" });
+			}
+		}
+	}).flatMap(({ name, dir, manifest }) => name ? [{
+		name,
+		dir,
+		version: manifest.version,
+		dependencies: manifest.dependencies ?? {}
+	}] : []);
 }
 //#endregion
 //#region src/tasks/deploy-on-release/deploy-on-release.ts

package/dist/{load-BqpxDjMJ.mjs → load-ToVjaKPr.mjs}

@@ -1,4 +1,4 @@
-import { loadConfigFile, mergeConfig } from "@theholocron/datapad";
+import { loadLayered } from "@theholocron/datapad";
 //#region src/config/schema.ts
 /**
 * The `tasks` config shape — the single manifest of what a repo runs.
@@ -24,18 +24,6 @@ function coerceTasks(value) {
 	return Array.isArray(value) ? { tasks: value } : value;
 }
 //#endregion
-//#region src/config/merge-tasks-layers.ts
-/**
-* The merge step of {@link loadTasksConfig}, for callers that load the two
-* sources some other way (Sentinel reads them from the GitHub API, not
-* from disk, holocron#916): `holocron.config.*`'s `tasks` value first,
-* then a dedicated `astromech.config.*`'s default export merged on top.
-* Either may be `undefined` (source absent); returns `{}` when both are.
-*/
-function mergeTasksLayers(parentTasks, dedicated) {
-	return [coerceTasks(parentTasks), coerceTasks(dedicated)].filter((layer) => layer !== void 0).reduce((acc, layer) => mergeConfig(acc, layer), {});
-}
-//#endregion
 //#region src/config/load.ts
 /**
 * Resolve the task manifest for a repo: the `tasks` key of
@@ -46,18 +34,22 @@ function mergeTasksLayers(parentTasks, dedicated) {
 * `walkUp: true` — `holocron run`/`ci` are usable from any subdirectory of
 * a repo, not only its exact root (datapad walks up to the nearest `.git`
 * boundary; see `@theholocron/datapad`'s own doc comment).
+*
+* A caller that has already loaded `holocron.config.*` passes it as
+* `options.holocron` so it is not found and loaded again.
 */
-async function loadTasksConfig(cwd) {
-	const dedicated = await loadConfigFile({
+async function loadTasksConfig(cwd, options = {}) {
+	return (await loadLayered({
 		cwd,
 		name: "astromech",
-		walkUp: true
-	});
-	return mergeTasksLayers((await loadConfigFile({
-		cwd,
-		name: "holocron",
-		walkUp: true
-	}))?.config.tasks, dedicated?.config);
+		walkUp: true,
+		fallback: {
+			file: "holocron",
+			key: "tasks",
+			preloaded: options.holocron
+		},
+		coerce: (raw) => coerceTasks(raw)
+	}))?.config ?? {};
 }
 //#endregion
-export { mergeTasksLayers as n, normalizeTaskEntry as r, loadTasksConfig as t };
+export { coerceTasks as n, normalizeTaskEntry as r, loadTasksConfig as t };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theholocron/astromech",
-  "version": "5.0.0-alpha.148",
+  "version": "5.0.0-alpha.150",
   "description": "The Holocron task runner — one task manifest drives `holocron run`, `holocron run ci`, the CI workflows, package.json scripts, linters, and required checks.",
   "keywords": [
     "ci",
@@ -37,10 +37,10 @@
     "dist"
   ],
   "dependencies": {
-    "@theholocron/fs-utils": "^1.12.0",
-    "@theholocron/json-utils": "^1.12.0",
-    "@theholocron/pkg-utils": "^1.12.0",
-    "@theholocron/datapad": "5.0.0-alpha.148"
+    "@theholocron/fs-utils": "^1.13.0",
+    "@theholocron/json-utils": "^1.13.0",
+    "@theholocron/pkg-utils": "^1.13.0",
+    "@theholocron/datapad": "5.0.0-alpha.150"
   },
   "devDependencies": {
     "@theholocron/eslint-config": "^8.7.1",
@@ -56,7 +56,7 @@
     "tsdown": "^0.22.14",
     "typescript": "^5.9.3",
     "vitest": "^4.1.11",
-    "@theholocron/rollup-plugin-transform-template": "5.0.0-alpha.148"
+    "@theholocron/rollup-plugin-transform-template": "5.0.0-alpha.150"
   },
   "engines": {
     "node": ">=22"