@optique/config 1.1.0-dev.2087 → 1.1.0-dev.2096

package/dist/index.cjs

@@ -269,7 +269,30 @@ function bindConfig(parser, options) {
 		const annotations = (0, __optique_core_annotations.getAnnotations)(state);
 		return annotations?.[options.context.id] === phase1ConfigAnnotationMarker;
 	}
-	const getSuggestInnerState = (state) => isConfigBindState(state) ? state.cliState === void 0 ? (0, __optique_core_extension.inheritAnnotations)(state, parser.initialState) : state.cliState : state;
+	function getInnerState(state) {
+		if (!isConfigBindState(state)) return state;
+		if (state.cliState !== void 0) return state.cliState;
+		const initialState = parser.initialState;
+		if (initialState != null && typeof initialState !== "object") return initialState;
+		const annotated = (0, __optique_core_extension.inheritAnnotations)(state, initialState);
+		if (annotated === initialState && initialState != null && typeof initialState === "object") {
+			const annotations = (0, __optique_core_annotations.getAnnotations)(state);
+			return annotations == null ? initialState : (0, __optique_core_extension.withAnnotationView)(initialState, annotations);
+		}
+		return annotated;
+	}
+	function hasConfigFallback(state) {
+		if (options.default !== void 0) return true;
+		const annotations = (0, __optique_core_annotations.getAnnotations)(state);
+		const annotationValue = annotations?.[options.context.id];
+		const configData = annotationValue?.data;
+		const configMeta = annotationValue?.meta;
+		if (configData == null) return false;
+		if (typeof options.key !== "function") return configData[options.key] !== void 0;
+		const configValue = options.key(configData, configMeta);
+		if (configValue != null && (typeof configValue === "object" || typeof configValue === "function") && "then" in configValue && typeof configValue.then === "function") throw new TypeError("The key callback must return a synchronous value, but got a thenable.");
+		return configValue !== void 0;
+	}
 	const boundParser = {
 		mode: parser.mode,
 		$valueType: parser.$valueType,
@@ -282,8 +305,17 @@ function bindConfig(parser, options) {
 		leadingNames: parser.leadingNames,
 		acceptingAnyToken: parser.acceptingAnyToken,
 		initialState: parser.initialState,
+		canSkip(state, exec) {
+			if (isConfigBindState(state)) {
+				if (state.hasCliValue) return parser.canSkip?.(state.cliState, exec) === true;
+				if (hasConfigFallback(state)) return true;
+				return parser.canSkip?.(getInnerState(state), exec) === true;
+			}
+			if (hasConfigFallback(state)) return true;
+			return parser.canSkip?.(state, exec) === true;
+		},
 		getSuggestRuntimeNodes(state, path) {
-			const innerState = getSuggestInnerState(state);
+			const innerState = getInnerState(state);
 			return (0, __optique_core_extension.delegateSuggestNodes)(parser, boundParser, state, path, innerState);
 		},
 		parse: (context) => {
@@ -332,7 +364,7 @@ function bindConfig(parser, options) {
 			return getConfigOrDefault(state, options, parser.mode, parser);
 		},
 		suggest: (context, prefix) => {
-			const innerState = getSuggestInnerState(context.state);
+			const innerState = getInnerState(context.state);
 			const innerContext = innerState !== context.state ? {
 				...context,
 				state: innerState

package/dist/index.js

@@ -1,7 +1,7 @@
 import { readFileSync } from "node:fs";
 import { dirname, resolve } from "node:path";
 import { getAnnotations } from "@optique/core/annotations";
-import { defineTraits, delegateSuggestNodes, inheritAnnotations, injectAnnotations, mapModeValue, mapSourceMetadata, wrapForMode } from "@optique/core/extension";
+import { defineTraits, delegateSuggestNodes, inheritAnnotations, injectAnnotations, mapModeValue, mapSourceMetadata, withAnnotationView, wrapForMode } from "@optique/core/extension";
 import { message } from "@optique/core/message";
 
 //#region src/index.ts
@@ -246,7 +246,30 @@ function bindConfig(parser, options) {
 		const annotations = getAnnotations(state);
 		return annotations?.[options.context.id] === phase1ConfigAnnotationMarker;
 	}
-	const getSuggestInnerState = (state) => isConfigBindState(state) ? state.cliState === void 0 ? inheritAnnotations(state, parser.initialState) : state.cliState : state;
+	function getInnerState(state) {
+		if (!isConfigBindState(state)) return state;
+		if (state.cliState !== void 0) return state.cliState;
+		const initialState = parser.initialState;
+		if (initialState != null && typeof initialState !== "object") return initialState;
+		const annotated = inheritAnnotations(state, initialState);
+		if (annotated === initialState && initialState != null && typeof initialState === "object") {
+			const annotations = getAnnotations(state);
+			return annotations == null ? initialState : withAnnotationView(initialState, annotations);
+		}
+		return annotated;
+	}
+	function hasConfigFallback(state) {
+		if (options.default !== void 0) return true;
+		const annotations = getAnnotations(state);
+		const annotationValue = annotations?.[options.context.id];
+		const configData = annotationValue?.data;
+		const configMeta = annotationValue?.meta;
+		if (configData == null) return false;
+		if (typeof options.key !== "function") return configData[options.key] !== void 0;
+		const configValue = options.key(configData, configMeta);
+		if (configValue != null && (typeof configValue === "object" || typeof configValue === "function") && "then" in configValue && typeof configValue.then === "function") throw new TypeError("The key callback must return a synchronous value, but got a thenable.");
+		return configValue !== void 0;
+	}
 	const boundParser = {
 		mode: parser.mode,
 		$valueType: parser.$valueType,
@@ -259,8 +282,17 @@ function bindConfig(parser, options) {
 		leadingNames: parser.leadingNames,
 		acceptingAnyToken: parser.acceptingAnyToken,
 		initialState: parser.initialState,
+		canSkip(state, exec) {
+			if (isConfigBindState(state)) {
+				if (state.hasCliValue) return parser.canSkip?.(state.cliState, exec) === true;
+				if (hasConfigFallback(state)) return true;
+				return parser.canSkip?.(getInnerState(state), exec) === true;
+			}
+			if (hasConfigFallback(state)) return true;
+			return parser.canSkip?.(state, exec) === true;
+		},
 		getSuggestRuntimeNodes(state, path) {
-			const innerState = getSuggestInnerState(state);
+			const innerState = getInnerState(state);
 			return delegateSuggestNodes(parser, boundParser, state, path, innerState);
 		},
 		parse: (context) => {
@@ -309,7 +341,7 @@ function bindConfig(parser, options) {
 			return getConfigOrDefault(state, options, parser.mode, parser);
 		},
 		suggest: (context, prefix) => {
-			const innerState = getSuggestInnerState(context.state);
+			const innerState = getInnerState(context.state);
 			const innerContext = innerState !== context.state ? {
 				...context,
 				state: innerState

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/config",
-  "version": "1.1.0-dev.2087",
+  "version": "1.1.0-dev.2096",
   "description": "Configuration file support for Optique with Standard Schema validation",
   "keywords": [
     "CLI",
@@ -59,7 +59,7 @@
     "@standard-schema/spec": "^1.1.0"
   },
   "dependencies": {
-    "@optique/core": "1.1.0-dev.2087+a3bd6720"
+    "@optique/core": "1.1.0-dev.2096+8eda4929"
   },
   "devDependencies": {
     "@standard-schema/spec": "^1.1.0",
@@ -68,7 +68,7 @@
     "tsdown": "^0.13.0",
     "typescript": "^5.8.3",
     "zod": "^3.25.0 || ^4.0.0",
-    "@optique/env": "1.1.0-dev.2087+a3bd6720"
+    "@optique/env": "1.1.0-dev.2096+8eda4929"
   },
   "scripts": {
     "build": "tsdown",