@optique/config 1.0.0-dev.1903 → 1.0.0-dev.1970

package/dist/index.cjs

@@ -23,10 +23,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 //#endregion
 const node_fs = __toESM(require("node:fs"));
 const node_path = __toESM(require("node:path"));
-const __optique_core_parser = __toESM(require("@optique/core/parser"));
 const __optique_core_annotations = __toESM(require("@optique/core/annotations"));
+const __optique_core_extension = __toESM(require("@optique/core/extension"));
 const __optique_core_message = __toESM(require("@optique/core/message"));
-const __optique_core_mode_dispatch = __toESM(require("@optique/core/mode-dispatch"));
 
 //#region src/index.ts
 const phase1ConfigAnnotationMarker = Symbol("@optique/config/phase1Annotation");
@@ -250,13 +249,12 @@ 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_annotations.inheritAnnotations)(state, parser.initialState) : state.cliState : state;
+	const getSuggestInnerState = (state) => isConfigBindState(state) ? state.cliState === void 0 ? (0, __optique_core_extension.inheritAnnotations)(state, parser.initialState) : state.cliState : state;
 	const boundParser = {
-		$mode: parser.$mode,
+		mode: parser.mode,
 		$valueType: parser.$valueType,
 		$stateType: parser.$stateType,
 		priority: parser.priority,
-		[__optique_core_parser.unmatchedNonCliDependencySourceStateMarker]: true,
 		usage: options.default !== void 0 ? [{
 			type: "optional",
 			terms: parser.usage
@@ -266,7 +264,7 @@ function bindConfig(parser, options) {
 		initialState: parser.initialState,
 		getSuggestRuntimeNodes(state, path) {
 			const innerState = getSuggestInnerState(state);
-			return (0, __optique_core_parser.getDelegatingSuggestRuntimeNodes)(parser, boundParser, state, path, innerState);
+			return (0, __optique_core_extension.delegateSuggestNodes)(parser, boundParser, state, path, innerState);
 		},
 		parse: (context) => {
 			const annotations = (0, __optique_core_annotations.getAnnotations)(context.state);
@@ -278,12 +276,11 @@ function bindConfig(parser, options) {
 			const processResult = (result) => {
 				if (result.success) {
 					const cliConsumed = result.consumed.length > 0;
-					const newState$1 = {
+					const newState$1 = (0, __optique_core_extension.injectAnnotations)({
 						[configBindStateKey]: true,
 						hasCliValue: cliConsumed,
-						cliState: result.next.state,
-						...annotations && { [__optique_core_annotations.annotationKey]: annotations }
-					};
+						cliState: result.next.state
+					}, annotations);
 					return {
 						success: true,
 						...result.provisional ? { provisional: true } : {},
@@ -295,11 +292,10 @@ function bindConfig(parser, options) {
 					};
 				}
 				if (result.consumed > 0) return result;
-				const newState = {
+				const newState = (0, __optique_core_extension.injectAnnotations)({
 					[configBindStateKey]: true,
-					hasCliValue: false,
-					...annotations && { [__optique_core_annotations.annotationKey]: annotations }
-				};
+					hasCliValue: false
+				}, annotations);
 				return {
 					success: true,
 					next: {
@@ -309,11 +305,11 @@ function bindConfig(parser, options) {
 					consumed: []
 				};
 			};
-			return (0, __optique_core_mode_dispatch.mapModeValue)(parser.$mode, parser.parse(innerContext), processResult);
+			return (0, __optique_core_extension.mapModeValue)(parser.mode, parser.parse(innerContext), processResult);
 		},
 		complete: (state, exec) => {
 			if (isConfigBindState(state) && state.hasCliValue) return parser.complete(state.cliState, exec);
-			return getConfigOrDefault(state, options, parser.$mode, parser);
+			return getConfigOrDefault(state, options, parser.mode, parser);
 		},
 		suggest: (context, prefix) => {
 			const innerState = getSuggestInnerState(context.state);
@@ -329,6 +325,10 @@ function bindConfig(parser, options) {
 			return parser.getDocFragments(state, defaultValue);
 		}
 	};
+	(0, __optique_core_extension.defineTraits)(boundParser, {
+		inheritsAnnotations: true,
+		completesFromSource: true
+	});
 	if ("placeholder" in parser) Object.defineProperty(boundParser, "placeholder", {
 		get() {
 			return parser.placeholder;
@@ -346,8 +346,7 @@ function bindConfig(parser, options) {
 		configurable: true,
 		enumerable: false
 	});
-	(0, __optique_core_parser.defineInheritedAnnotationParser)(boundParser);
-	const dependencyMetadata = (0, __optique_core_parser.composeWrappedSourceMetadata)(parser.dependencyMetadata, (sourceMetadata) => ({
+	const dependencyMetadata = (0, __optique_core_extension.mapSourceMetadata)(parser, (sourceMetadata) => ({
 		...sourceMetadata,
 		getMissingSourceValue: sourceMetadata.preservesSourceValue !== false && options.default !== void 0 ? () => {
 			if (typeof parser.validateValue === "function") return parser.validateValue(options.default);
@@ -407,7 +406,7 @@ function getConfigOrDefault(state, options, mode, innerParser) {
 	} else configValue = configData[options.key];
 	if (configValue !== void 0) return validateFallbackValue(mode, innerParser, configValue);
 	if (options.default !== void 0) return validateFallbackValue(mode, innerParser, options.default);
-	return (0, __optique_core_mode_dispatch.wrapForMode)(mode, {
+	return (0, __optique_core_extension.wrapForMode)(mode, {
 		success: false,
 		error: __optique_core_message.message`Missing required configuration value.`
 	});
@@ -426,7 +425,7 @@ function getConfigOrDefault(state, options, mode, innerParser) {
 *                 thrown by the hook escapes through this path.
 */
 function validateFallbackValue(mode, innerParser, value) {
-	if (innerParser == null || typeof innerParser.validateValue !== "function") return (0, __optique_core_mode_dispatch.wrapForMode)(mode, {
+	if (innerParser == null || typeof innerParser.validateValue !== "function") return (0, __optique_core_extension.wrapForMode)(mode, {
 		success: true,
 		value
 	});

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-import { Parser } from "@optique/core/parser";
 import { StandardSchemaV1 } from "@standard-schema/spec";
 import { ParserValuePlaceholder, SourceContext } from "@optique/core/context";
+import { Parser } from "@optique/core/parser";
 
 //#region src/index.d.ts
 

package/dist/index.js

@@ -1,9 +1,8 @@
 import { readFileSync } from "node:fs";
 import { dirname, resolve } from "node:path";
-import { composeWrappedSourceMetadata, defineInheritedAnnotationParser, getDelegatingSuggestRuntimeNodes, unmatchedNonCliDependencySourceStateMarker } from "@optique/core/parser";
-import { annotationKey, getAnnotations, inheritAnnotations } from "@optique/core/annotations";
+import { getAnnotations } from "@optique/core/annotations";
+import { defineTraits, delegateSuggestNodes, inheritAnnotations, injectAnnotations, mapModeValue, mapSourceMetadata, wrapForMode } from "@optique/core/extension";
 import { message } from "@optique/core/message";
-import { mapModeValue, wrapForMode } from "@optique/core/mode-dispatch";
 
 //#region src/index.ts
 const phase1ConfigAnnotationMarker = Symbol("@optique/config/phase1Annotation");
@@ -229,11 +228,10 @@ function bindConfig(parser, options) {
 	}
 	const getSuggestInnerState = (state) => isConfigBindState(state) ? state.cliState === void 0 ? inheritAnnotations(state, parser.initialState) : state.cliState : state;
 	const boundParser = {
-		$mode: parser.$mode,
+		mode: parser.mode,
 		$valueType: parser.$valueType,
 		$stateType: parser.$stateType,
 		priority: parser.priority,
-		[unmatchedNonCliDependencySourceStateMarker]: true,
 		usage: options.default !== void 0 ? [{
 			type: "optional",
 			terms: parser.usage
@@ -243,7 +241,7 @@ function bindConfig(parser, options) {
 		initialState: parser.initialState,
 		getSuggestRuntimeNodes(state, path) {
 			const innerState = getSuggestInnerState(state);
-			return getDelegatingSuggestRuntimeNodes(parser, boundParser, state, path, innerState);
+			return delegateSuggestNodes(parser, boundParser, state, path, innerState);
 		},
 		parse: (context) => {
 			const annotations = getAnnotations(context.state);
@@ -255,12 +253,11 @@ function bindConfig(parser, options) {
 			const processResult = (result) => {
 				if (result.success) {
 					const cliConsumed = result.consumed.length > 0;
-					const newState$1 = {
+					const newState$1 = injectAnnotations({
 						[configBindStateKey]: true,
 						hasCliValue: cliConsumed,
-						cliState: result.next.state,
-						...annotations && { [annotationKey]: annotations }
-					};
+						cliState: result.next.state
+					}, annotations);
 					return {
 						success: true,
 						...result.provisional ? { provisional: true } : {},
@@ -272,11 +269,10 @@ function bindConfig(parser, options) {
 					};
 				}
 				if (result.consumed > 0) return result;
-				const newState = {
+				const newState = injectAnnotations({
 					[configBindStateKey]: true,
-					hasCliValue: false,
-					...annotations && { [annotationKey]: annotations }
-				};
+					hasCliValue: false
+				}, annotations);
 				return {
 					success: true,
 					next: {
@@ -286,11 +282,11 @@ function bindConfig(parser, options) {
 					consumed: []
 				};
 			};
-			return mapModeValue(parser.$mode, parser.parse(innerContext), processResult);
+			return mapModeValue(parser.mode, parser.parse(innerContext), processResult);
 		},
 		complete: (state, exec) => {
 			if (isConfigBindState(state) && state.hasCliValue) return parser.complete(state.cliState, exec);
-			return getConfigOrDefault(state, options, parser.$mode, parser);
+			return getConfigOrDefault(state, options, parser.mode, parser);
 		},
 		suggest: (context, prefix) => {
 			const innerState = getSuggestInnerState(context.state);
@@ -306,6 +302,10 @@ function bindConfig(parser, options) {
 			return parser.getDocFragments(state, defaultValue);
 		}
 	};
+	defineTraits(boundParser, {
+		inheritsAnnotations: true,
+		completesFromSource: true
+	});
 	if ("placeholder" in parser) Object.defineProperty(boundParser, "placeholder", {
 		get() {
 			return parser.placeholder;
@@ -323,8 +323,7 @@ function bindConfig(parser, options) {
 		configurable: true,
 		enumerable: false
 	});
-	defineInheritedAnnotationParser(boundParser);
-	const dependencyMetadata = composeWrappedSourceMetadata(parser.dependencyMetadata, (sourceMetadata) => ({
+	const dependencyMetadata = mapSourceMetadata(parser, (sourceMetadata) => ({
 		...sourceMetadata,
 		getMissingSourceValue: sourceMetadata.preservesSourceValue !== false && options.default !== void 0 ? () => {
 			if (typeof parser.validateValue === "function") return parser.validateValue(options.default);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/config",
-  "version": "1.0.0-dev.1903+af120cc5",
+  "version": "1.0.0-dev.1970+0182ae32",
   "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.0.0-dev.1903+af120cc5"
+    "@optique/core": "1.0.0-dev.1970+0182ae32"
   },
   "devDependencies": {
     "@standard-schema/spec": "^1.1.0",
@@ -67,7 +67,7 @@
     "tsdown": "^0.13.0",
     "typescript": "^5.8.3",
     "zod": "^3.25.0 || ^4.0.0",
-    "@optique/env": "1.0.0-dev.1903+af120cc5"
+    "@optique/env": "1.0.0-dev.1970+0182ae32"
   },
   "scripts": {
     "build": "tsdown",