@optique/env 1.0.0-dev.1903 → 1.0.0-dev.1972

package/dist/index.cjs

@@ -22,9 +22,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 
 //#endregion
 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"));
-const __optique_core_parser = __toESM(require("@optique/core/parser"));
 const __optique_core_valueparser = __toESM(require("@optique/core/valueparser"));
 
 //#region src/index.ts
@@ -106,11 +105,10 @@ function bindEnv(parser, options) {
 	}
 	const deferPromptUntilConfigResolves = parser.shouldDeferCompletion;
 	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
@@ -120,7 +118,7 @@ function bindEnv(parser, options) {
 		initialState: parser.initialState,
 		getSuggestRuntimeNodes(state, path) {
 			const innerState = isEnvBindState(state) ? state.cliState === void 0 ? parser.initialState : state.cliState : 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);
@@ -132,12 +130,11 @@ function bindEnv(parser, options) {
 			const processResult = (result) => {
 				if (result.success) {
 					const cliConsumed = result.consumed.length > 0;
-					const nextState$1 = {
+					const nextState$1 = (0, __optique_core_extension.injectAnnotations)({
 						[envBindStateKey]: 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 } : {},
@@ -149,11 +146,10 @@ function bindEnv(parser, options) {
 					};
 				}
 				if (result.consumed > 0) return result;
-				const nextState = {
+				const nextState = (0, __optique_core_extension.injectAnnotations)({
 					[envBindStateKey]: true,
-					hasCliValue: false,
-					...annotations && { [__optique_core_annotations.annotationKey]: annotations }
-				};
+					hasCliValue: false
+				}, annotations);
 				return {
 					success: true,
 					next: {
@@ -163,11 +159,11 @@ function bindEnv(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 (isEnvBindState(state) && state.hasCliValue) return parser.complete(state.cliState, exec);
-			return getEnvOrDefault(state, options, parser.$mode, parser, isEnvBindState(state) ? state.cliState : (0, __optique_core_annotations.isInjectedAnnotationWrapper)(state) ? void 0 : state, exec);
+			return getEnvOrDefault(state, options, parser.mode, parser, isEnvBindState(state) ? state.cliState : (0, __optique_core_extension.isInjectedAnnotationState)(state) ? void 0 : state, exec);
 		},
 		suggest: parser.suggest,
 		...typeof deferPromptUntilConfigResolves === "function" ? { shouldDeferCompletion: (state, exec) => deferPromptUntilConfigResolves.call(parser, state, exec) } : {},
@@ -176,7 +172,10 @@ function bindEnv(parser, options) {
 			return parser.getDocFragments(state, defaultValue);
 		}
 	};
-	(0, __optique_core_parser.defineInheritedAnnotationParser)(boundParser);
+	(0, __optique_core_extension.defineTraits)(boundParser, {
+		inheritsAnnotations: true,
+		completesFromSource: true
+	});
 	if ("placeholder" in parser) Object.defineProperty(boundParser, "placeholder", {
 		get() {
 			return parser.placeholder;
@@ -194,8 +193,15 @@ function bindEnv(parser, options) {
 		configurable: true,
 		enumerable: false
 	});
-	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);
+			return {
+				success: true,
+				value: options.default
+			};
+		} : void 0,
 		extractSourceValue: (state) => {
 			if (!isEnvBindState(state)) {
 				if (sourceMetadata.preservesSourceValue) return getEnvSourceValue(state, options, state, sourceMetadata.extractSourceValue, parser);
@@ -268,12 +274,12 @@ function getEnvOrDefault(state, options, mode, innerParser, innerState, exec) {
 	if (rawValue !== void 0) {
 		if (typeof rawValue !== "string") {
 			const type = rawValue === null ? "null" : Array.isArray(rawValue) ? "array" : typeof rawValue;
-			return (0, __optique_core_mode_dispatch.wrapForMode)(mode, {
+			return (0, __optique_core_extension.wrapForMode)(mode, {
 				success: false,
 				error: __optique_core_message.message`Environment variable ${(0, __optique_core_message.envVar)(fullKey)} must be a string, but got: ${type}.`
 			});
 		}
-		return (0, __optique_core_mode_dispatch.dispatchByMode)(mode, () => {
+		return (0, __optique_core_extension.dispatchByMode)(mode, () => {
 			const parsed = options.parser.parse(rawValue);
 			return validateSync(parsed);
 		}, async () => {
@@ -281,7 +287,7 @@ function getEnvOrDefault(state, options, mode, innerParser, innerState, exec) {
 			return await validateAsync(parsed);
 		});
 	}
-	if (options.default !== void 0) return (0, __optique_core_mode_dispatch.dispatchByMode)(mode, () => validateSync({
+	if (options.default !== void 0) return (0, __optique_core_extension.dispatchByMode)(mode, () => validateSync({
 		success: true,
 		value: options.default
 	}), () => validateAsync({
@@ -289,10 +295,10 @@ function getEnvOrDefault(state, options, mode, innerParser, innerState, exec) {
 		value: options.default
 	}));
 	if (innerParser != null) {
-		const completeState = innerState ?? (annotations != null && innerParser.initialState == null && Reflect.get(innerParser, __optique_core_parser.inheritParentAnnotationsKey) === true ? (0, __optique_core_annotations.injectAnnotations)(innerParser.initialState, annotations) : innerParser.initialState);
-		return (0, __optique_core_mode_dispatch.wrapForMode)(mode, innerParser.complete(completeState, exec));
+		const completeState = innerState ?? (annotations != null && innerParser.initialState == null && (0, __optique_core_extension.getTraits)(innerParser).inheritsAnnotations === true ? (0, __optique_core_extension.injectAnnotations)(innerParser.initialState, annotations) : innerParser.initialState);
+		return (0, __optique_core_extension.wrapForMode)(mode, innerParser.complete(completeState, exec));
 	}
-	return (0, __optique_core_mode_dispatch.wrapForMode)(mode, {
+	return (0, __optique_core_extension.wrapForMode)(mode, {
 		success: false,
 		error: __optique_core_message.message`Missing required environment variable: ${(0, __optique_core_message.envVar)(fullKey)}`
 	});
@@ -343,7 +349,7 @@ function getEnvSourceValue(state, options, innerState, extractInnerSourceValue,
 				error: __optique_core_message.message`Environment variable ${(0, __optique_core_message.envVar)(fullKey)} must be a string, but got: ${type}.`
 			};
 		}
-		return (0, __optique_core_mode_dispatch.mapModeValue)(options.parser.$mode, options.parser.parse(rawValue), (p) => validateFallback(p));
+		return (0, __optique_core_extension.mapModeValue)(options.parser.mode, options.parser.parse(rawValue), (p) => validateFallback(p));
 	}
 	if (options.default !== void 0) return validateFallback({
 		success: true,
@@ -380,7 +386,7 @@ function bool(options = {}) {
 	const metavar = options.metavar ?? "BOOLEAN";
 	(0, __optique_core_valueparser.ensureNonEmptyString)(metavar);
 	return {
-		$mode: "sync",
+		mode: "sync",
 		metavar,
 		placeholder: false,
 		choices: [true, false],

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { Message } from "@optique/core/message";
-import { Mode, Parser } from "@optique/core/parser";
 import { NonEmptyString, ValueParser } from "@optique/core/valueparser";
 import { SourceContext } from "@optique/core/context";
+import { Mode, Parser } from "@optique/core/parser";
 
 //#region src/index.d.ts
 

package/dist/index.js

@@ -1,7 +1,6 @@
-import { annotationKey, getAnnotations, injectAnnotations, isInjectedAnnotationWrapper } from "@optique/core/annotations";
+import { getAnnotations } from "@optique/core/annotations";
+import { defineTraits, delegateSuggestNodes, dispatchByMode, getTraits, injectAnnotations, isInjectedAnnotationState, mapModeValue, mapSourceMetadata, wrapForMode } from "@optique/core/extension";
 import { envVar, message, valueSet } from "@optique/core/message";
-import { dispatchByMode, mapModeValue, wrapForMode } from "@optique/core/mode-dispatch";
-import { composeWrappedSourceMetadata, defineInheritedAnnotationParser, getDelegatingSuggestRuntimeNodes, inheritParentAnnotationsKey, unmatchedNonCliDependencySourceStateMarker } from "@optique/core/parser";
 import { ensureNonEmptyString, isValueParser } from "@optique/core/valueparser";
 
 //#region src/index.ts
@@ -83,11 +82,10 @@ function bindEnv(parser, options) {
 	}
 	const deferPromptUntilConfigResolves = parser.shouldDeferCompletion;
 	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
@@ -97,7 +95,7 @@ function bindEnv(parser, options) {
 		initialState: parser.initialState,
 		getSuggestRuntimeNodes(state, path) {
 			const innerState = isEnvBindState(state) ? state.cliState === void 0 ? parser.initialState : state.cliState : state;
-			return getDelegatingSuggestRuntimeNodes(parser, boundParser, state, path, innerState);
+			return delegateSuggestNodes(parser, boundParser, state, path, innerState);
 		},
 		parse: (context) => {
 			const annotations = getAnnotations(context.state);
@@ -109,12 +107,11 @@ function bindEnv(parser, options) {
 			const processResult = (result) => {
 				if (result.success) {
 					const cliConsumed = result.consumed.length > 0;
-					const nextState$1 = {
+					const nextState$1 = injectAnnotations({
 						[envBindStateKey]: true,
 						hasCliValue: cliConsumed,
-						cliState: result.next.state,
-						...annotations && { [annotationKey]: annotations }
-					};
+						cliState: result.next.state
+					}, annotations);
 					return {
 						success: true,
 						...result.provisional ? { provisional: true } : {},
@@ -126,11 +123,10 @@ function bindEnv(parser, options) {
 					};
 				}
 				if (result.consumed > 0) return result;
-				const nextState = {
+				const nextState = injectAnnotations({
 					[envBindStateKey]: true,
-					hasCliValue: false,
-					...annotations && { [annotationKey]: annotations }
-				};
+					hasCliValue: false
+				}, annotations);
 				return {
 					success: true,
 					next: {
@@ -140,11 +136,11 @@ function bindEnv(parser, options) {
 					consumed: []
 				};
 			};
-			return mapModeValue(parser.$mode, parser.parse(innerContext), processResult);
+			return mapModeValue(parser.mode, parser.parse(innerContext), processResult);
 		},
 		complete: (state, exec) => {
 			if (isEnvBindState(state) && state.hasCliValue) return parser.complete(state.cliState, exec);
-			return getEnvOrDefault(state, options, parser.$mode, parser, isEnvBindState(state) ? state.cliState : isInjectedAnnotationWrapper(state) ? void 0 : state, exec);
+			return getEnvOrDefault(state, options, parser.mode, parser, isEnvBindState(state) ? state.cliState : isInjectedAnnotationState(state) ? void 0 : state, exec);
 		},
 		suggest: parser.suggest,
 		...typeof deferPromptUntilConfigResolves === "function" ? { shouldDeferCompletion: (state, exec) => deferPromptUntilConfigResolves.call(parser, state, exec) } : {},
@@ -153,7 +149,10 @@ function bindEnv(parser, options) {
 			return parser.getDocFragments(state, defaultValue);
 		}
 	};
-	defineInheritedAnnotationParser(boundParser);
+	defineTraits(boundParser, {
+		inheritsAnnotations: true,
+		completesFromSource: true
+	});
 	if ("placeholder" in parser) Object.defineProperty(boundParser, "placeholder", {
 		get() {
 			return parser.placeholder;
@@ -171,8 +170,15 @@ function bindEnv(parser, options) {
 		configurable: true,
 		enumerable: false
 	});
-	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);
+			return {
+				success: true,
+				value: options.default
+			};
+		} : void 0,
 		extractSourceValue: (state) => {
 			if (!isEnvBindState(state)) {
 				if (sourceMetadata.preservesSourceValue) return getEnvSourceValue(state, options, state, sourceMetadata.extractSourceValue, parser);
@@ -266,7 +272,7 @@ function getEnvOrDefault(state, options, mode, innerParser, innerState, exec) {
 		value: options.default
 	}));
 	if (innerParser != null) {
-		const completeState = innerState ?? (annotations != null && innerParser.initialState == null && Reflect.get(innerParser, inheritParentAnnotationsKey) === true ? injectAnnotations(innerParser.initialState, annotations) : innerParser.initialState);
+		const completeState = innerState ?? (annotations != null && innerParser.initialState == null && getTraits(innerParser).inheritsAnnotations === true ? injectAnnotations(innerParser.initialState, annotations) : innerParser.initialState);
 		return wrapForMode(mode, innerParser.complete(completeState, exec));
 	}
 	return wrapForMode(mode, {
@@ -320,7 +326,7 @@ function getEnvSourceValue(state, options, innerState, extractInnerSourceValue,
 				error: message`Environment variable ${envVar(fullKey)} must be a string, but got: ${type}.`
 			};
 		}
-		return mapModeValue(options.parser.$mode, options.parser.parse(rawValue), (p) => validateFallback(p));
+		return mapModeValue(options.parser.mode, options.parser.parse(rawValue), (p) => validateFallback(p));
 	}
 	if (options.default !== void 0) return validateFallback({
 		success: true,
@@ -357,7 +363,7 @@ function bool(options = {}) {
 	const metavar = options.metavar ?? "BOOLEAN";
 	ensureNonEmptyString(metavar);
 	return {
-		$mode: "sync",
+		mode: "sync",
 		metavar,
 		placeholder: false,
 		choices: [true, false],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/env",
-  "version": "1.0.0-dev.1903+af120cc5",
+  "version": "1.0.0-dev.1972+eebf7c57",
   "description": "Environment variable support for Optique",
   "keywords": [
     "CLI",
@@ -54,7 +54,7 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@optique/core": "1.0.0-dev.1903+af120cc5"
+    "@optique/core": "1.0.0-dev.1972+eebf7c57"
   },
   "devDependencies": {
     "@types/node": "^20.19.9",