vde-layout 1.0.0 → 1.0.2

package/README.md

@@ -30,7 +30,7 @@ pnpm run ci
 ```
 
 ## Quick Start
-1. Create a YAML file at `~/.config/vde/layout.yml` (or any supported location; see "Configuration Search Order").
+1. Create a YAML file at `~/.config/vde/layout/config.yml` (legacy `~/.config/vde/layout.yml` is also supported; see "Configuration Search Order").
 2. Paste a preset definition:
    ```yaml
    presets:
@@ -73,7 +73,7 @@ pnpm run ci
 - `vde-layout dev --backend wezterm` - Use the WezTerm backend (defaults to `tmux` when omitted).
 - `vde-layout dev --current-window` - Reuse the current tmux window (or active WezTerm tab) after confirming that other panes can be closed.
 - `vde-layout dev --new-window` - Force creation of a new tmux window or WezTerm tab even when presets or defaults request reuse.
-- `vde-layout --config /path/to/layout.yml` - Load presets from a specific file.
+- `vde-layout --config /path/to/config.yml` - Load presets from a specific file.
 - `vde-layout --help` - Show usage.
 - `vde-layout --version` / `vde-layout -v` - Print package version.
 
@@ -88,12 +88,16 @@ vde-layout resolves backends in the following order: CLI flag (`--backend`), pre
   - `--new-window` spawns a new tab in the active window when one is available, otherwise creates a fresh window.
 
 ## Configuration Search Order
-When no `--config` flag is provided, vde-layout searches for configuration files in the following order:
-1. `$VDE_CONFIG_PATH/layout.yml` (if `VDE_CONFIG_PATH` is set).
-2. `$XDG_CONFIG_HOME/vde/layout.yml` or `~/.config/vde/layout.yml` when `XDG_CONFIG_HOME` is unset.
-3. `<project-root>/.vde/layout.yml` (discovered by walking up from the current directory).
-
-All existing files are merged, with project-specific definitions taking precedence over shared ones.
+When no `--config` flag is provided, vde-layout checks candidate files in this order for `findConfigFile()`:
+1. `<project-root>/.vde/layout.yml` (discovered by walking up from the current directory).
+2. `$VDE_CONFIG_PATH/layout.yml` (if `VDE_CONFIG_PATH` is set).
+3. `$XDG_CONFIG_HOME/vde/layout/config.yml` (or `~/.config/vde/layout/config.yml` when `XDG_CONFIG_HOME` is unset).
+4. `$XDG_CONFIG_HOME/vde/layout.yml` fallback (or `~/.config/vde/layout.yml`).
+
+For `loadConfig()`, vde-layout merges shared scopes first and project scope last:
+1. `$VDE_CONFIG_PATH/layout.yml`
+2. XDG scope (`.../vde/layout/config.yml` or fallback `.../vde/layout.yml`; first existing file only)
+3. `<project-root>/.vde/layout.yml`
 
 ## Preset Structure
 Each preset is an object under the `presets` key:

package/dist/index.mjs

@@ -248,7 +248,8 @@ const createConfigLoader = (options = {}) => {
 		const candidates = [];
 		const projectCandidate = findProjectConfigCandidate();
 		if (projectCandidate !== null) candidates.push(projectCandidate);
-		candidates.push(...buildDefaultSearchPaths());
+		const defaultSearchPathGroups = buildDefaultSearchPathGroups();
+		candidates.push(...flattenSearchPathGroups(defaultSearchPathGroups));
 		return [...new Set(candidates)];
 	};
 	const loadConfig = async () => {
@@ -258,16 +259,16 @@ const createConfigLoader = (options = {}) => {
 			return validateYAML(await safeReadFile(filePath));
 		}
 		const searchPaths = computeCachedSearchPaths();
-		const existingPaths = await filterExistingPaths(searchPaths);
-		if (existingPaths.length === 0) throw createConfigError("Configuration file not found", ErrorCodes.CONFIG_NOT_FOUND, { searchPaths });
+		const globalPaths = await resolveFirstExistingPaths(buildDefaultSearchPathGroups());
 		const projectPath = findProjectConfigCandidate();
-		const globalPaths = existingPaths.filter((filePath) => filePath !== projectPath);
+		const projectConfigExists = projectPath !== null ? await fs.pathExists(projectPath) : false;
+		if (globalPaths.length === 0 && !projectConfigExists) throw createConfigError("Configuration file not found", ErrorCodes.CONFIG_NOT_FOUND, { searchPaths });
 		let mergedConfig = { presets: {} };
 		for (const globalPath of globalPaths) {
 			const config = validateYAML(await safeReadFile(globalPath));
 			mergedConfig = mergeConfigs(mergedConfig, config, emitWarning);
 		}
-		if (projectPath !== null && await fs.pathExists(projectPath)) {
+		if (projectPath !== null && projectConfigExists) {
 			const config = validateYAML(await safeReadFile(projectPath));
 			mergedConfig = mergeConfigs(mergedConfig, config, emitWarning);
 		}
@@ -287,15 +288,30 @@ const createConfigLoader = (options = {}) => {
 		getSearchPaths: () => computeCachedSearchPaths()
 	};
 };
-const buildDefaultSearchPaths = () => {
-	const paths = [];
+const buildDefaultSearchPathGroups = () => {
+	const pathGroups = [];
 	const vdeConfigPath = process.env.VDE_CONFIG_PATH;
-	if (vdeConfigPath !== void 0) paths.push(path.join(vdeConfigPath, "layout.yml"));
+	if (vdeConfigPath !== void 0) pathGroups.push([path.join(vdeConfigPath, "layout.yml")]);
 	const homeDir = process.env.HOME ?? os.homedir();
 	const xdgConfigHome = process.env.XDG_CONFIG_HOME ?? path.join(homeDir, ".config");
-	paths.push(path.join(xdgConfigHome, "vde", "layout.yml"));
+	pathGroups.push([path.join(xdgConfigHome, "vde", "layout", "config.yml"), path.join(xdgConfigHome, "vde", "layout.yml")]);
+	return pathGroups.map((group) => [...new Set(group)]);
+};
+const flattenSearchPathGroups = (pathGroups) => {
+	const paths = [];
+	for (const group of pathGroups) paths.push(...group);
 	return [...new Set(paths)];
 };
+const resolveFirstExistingPaths = async (pathGroups) => {
+	const existingPaths = await Promise.all(pathGroups.map(async (group) => findFirstExisting(group)));
+	const seenPaths = /* @__PURE__ */ new Set();
+	const resolvedPaths = [];
+	for (const existingPath of existingPaths) if (existingPath !== null && !seenPaths.has(existingPath)) {
+		seenPaths.add(existingPath);
+		resolvedPaths.push(existingPath);
+	}
+	return resolvedPaths;
+};
 const findProjectConfigCandidate = () => {
 	let currentDir = process.cwd();
 	const { root } = path.parse(currentDir);
@@ -313,11 +329,6 @@ const findFirstExisting = async (paths) => {
 	for (const candidate of paths) if (await fs.pathExists(candidate)) return candidate;
 	return null;
 };
-const filterExistingPaths = async (paths) => {
-	const existing = [];
-	for (const candidate of paths) if (await fs.pathExists(candidate)) existing.push(candidate);
-	return existing;
-};
 const safeReadFile = async (filePath) => {
 	try {
 		return await fs.readFile(filePath, "utf8");
@@ -630,14 +641,14 @@ const sanitizeLayoutForSchemaValidation = (node) => {
 	};
 };
 const convertLayoutIssueToCompileError = ({ issue, source, basePath, layout }) => {
-	if (issue.path[0] === "panes" && issue.code === "invalid_type") return compileError("LAYOUT_PANES_MISSING", {
+	if (isMissingArrayIssue(issue, "panes")) return compileError("LAYOUT_PANES_MISSING", {
 		source,
-		message: "panes array is missing",
+		message: "panes array is missing or empty",
 		path: `${basePath}.panes`
 	});
-	if (issue.path[0] === "ratio" && issue.code === "invalid_type") return compileError("LAYOUT_RATIO_MISSING", {
+	if (isMissingArrayIssue(issue, "ratio")) return compileError("LAYOUT_RATIO_MISSING", {
 		source,
-		message: "ratio array is missing",
+		message: "ratio array is missing or empty",
 		path: `${basePath}.ratio`
 	});
 	if (issue.path.includes("type")) return compileError("LAYOUT_INVALID_ORIENTATION", {
@@ -668,6 +679,10 @@ const convertLayoutIssueToCompileError = ({ issue, source, basePath, layout }) =
 		}
 	});
 };
+const isMissingArrayIssue = (issue, field) => {
+	if (issue.path.length !== 1 || issue.path[0] !== field) return false;
+	return issue.code === "invalid_type" || issue.code === "too_small" && issue.type === "array";
+};
 const getRatioLengthDetails = (layout) => {
 	if (!isRecord(layout)) return;
 	const ratio = layout.ratio;
@@ -1264,34 +1279,33 @@ const resolvePaneMapping = (paneMap, virtualId) => {
 
 //#endregion
 //#region src/executor/split-step.ts
-const resolveSplitOrientation = (step) => {
+const asSplitStep = (step, field) => {
 	if (step.kind !== "split") throw createCoreError("execution", {
 		code: ErrorCodes.INVALID_PLAN,
-		message: "Non-split step cannot resolve split orientation",
+		message: `Non-split step cannot resolve split ${field}`,
 		path: step.id,
 		details: { kind: step.kind }
 	});
-	if (step.orientation === "horizontal" || step.orientation === "vertical") return step.orientation;
+	return step;
+};
+const resolveSplitOrientation = (step) => {
+	const splitStep = asSplitStep(step, "orientation");
+	if (splitStep.orientation === "horizontal" || splitStep.orientation === "vertical") return splitStep.orientation;
 	throw createCoreError("execution", {
 		code: ErrorCodes.INVALID_PLAN,
 		message: "Split step missing orientation metadata",
-		path: step.id,
-		details: { orientation: step.orientation }
+		path: splitStep.id,
+		details: { orientation: splitStep.orientation }
 	});
 };
 const resolveSplitPercentage = (step) => {
-	if (step.kind !== "split") throw createCoreError("execution", {
-		code: ErrorCodes.INVALID_PLAN,
-		message: "Non-split step cannot resolve split percentage",
-		path: step.id,
-		details: { kind: step.kind }
-	});
-	if (typeof step.percentage === "number" && Number.isFinite(step.percentage)) return String(clampSplitPercentage(step.percentage));
+	const splitStep = asSplitStep(step, "percentage");
+	if (typeof splitStep.percentage === "number" && Number.isFinite(splitStep.percentage)) return String(clampSplitPercentage(splitStep.percentage));
 	throw createCoreError("execution", {
 		code: ErrorCodes.INVALID_PLAN,
 		message: "Split step missing percentage metadata",
-		path: step.id,
-		details: { percentage: step.percentage }
+		path: splitStep.id,
+		details: { percentage: splitStep.percentage }
 	});
 };
 const clampSplitPercentage = (value) => {