@optique/env 1.0.0-dev.555 → 1.0.0-dev.556

package/dist/index.cjs

@@ -23,6 +23,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 //#endregion
 const __optique_core_annotations = __toESM(require("@optique/core/annotations"));
 const __optique_core_message = __toESM(require("@optique/core/message"));
+const __optique_core_mode_dispatch = __toESM(require("@optique/core/mode-dispatch"));
 const __optique_core_valueparser = __toESM(require("@optique/core/valueparser"));
 
 //#region src/index.ts
@@ -156,7 +157,7 @@ function bindEnv(parser, options) {
 					consumed: []
 				};
 			};
-			return mapModeValue(parser.$mode, parser.parse(innerContext), processResult);
+			return (0, __optique_core_mode_dispatch.mapModeValue)(parser.$mode, parser.parse(innerContext), processResult);
 		},
 		complete: (state) => {
 			if (isEnvBindState(state) && state.hasCliValue) return parser.complete(state.cliState);
@@ -169,16 +170,6 @@ function bindEnv(parser, options) {
 		}
 	};
 }
-function wrapForMode(mode, value) {
-	if (mode === "async") return Promise.resolve(value);
-	if (value instanceof Promise) throw new TypeError("Synchronous mode cannot wrap Promise value.");
-	return value;
-}
-function mapModeValue(mode, value, mapFn) {
-	if (mode === "async") return Promise.resolve(value).then(mapFn);
-	if (value instanceof Promise) throw new TypeError("Synchronous mode cannot map Promise value.");
-	return mapFn(value);
-}
 function getEnvOrDefault(state, options, mode, innerParser, innerState) {
 	const annotations = (0, __optique_core_annotations.getAnnotations)(state);
 	const sourceData = annotations?.[options.context.id] ?? getActiveEnvSource(options.context.id);
@@ -186,19 +177,19 @@ function getEnvOrDefault(state, options, mode, innerParser, innerState) {
 	const rawValue = sourceData?.source(fullKey);
 	if (rawValue !== void 0) {
 		const parsed = options.parser.parse(rawValue);
-		return wrapForMode(mode, parsed);
+		return (0, __optique_core_mode_dispatch.wrapForMode)(mode, parsed);
 	}
-	if (options.default !== void 0) return wrapForMode(mode, {
+	if (options.default !== void 0) return (0, __optique_core_mode_dispatch.wrapForMode)(mode, {
 		success: true,
 		value: options.default
 	});
 	if (innerParser != null) {
 		const completeState = innerState ?? innerParser.initialState;
-		return wrapForMode(mode, innerParser.complete(completeState));
+		return (0, __optique_core_mode_dispatch.wrapForMode)(mode, innerParser.complete(completeState));
 	}
-	return wrapForMode(mode, {
+	return (0, __optique_core_mode_dispatch.wrapForMode)(mode, {
 		success: false,
-		error: __optique_core_message.message`Missing required environment variable: ${fullKey}.`
+		error: __optique_core_message.message`Missing required environment variable: ${(0, __optique_core_message.envVar)(fullKey)}`
 	});
 }
 const TRUE_LITERALS = [

package/dist/index.js

@@ -1,5 +1,6 @@
 import { annotationKey, getAnnotations } from "@optique/core/annotations";
-import { message, valueSet } from "@optique/core/message";
+import { envVar, message, valueSet } from "@optique/core/message";
+import { mapModeValue, wrapForMode } from "@optique/core/mode-dispatch";
 import { ensureNonEmptyString } from "@optique/core/valueparser";
 
 //#region src/index.ts
@@ -146,16 +147,6 @@ function bindEnv(parser, options) {
 		}
 	};
 }
-function wrapForMode(mode, value) {
-	if (mode === "async") return Promise.resolve(value);
-	if (value instanceof Promise) throw new TypeError("Synchronous mode cannot wrap Promise value.");
-	return value;
-}
-function mapModeValue(mode, value, mapFn) {
-	if (mode === "async") return Promise.resolve(value).then(mapFn);
-	if (value instanceof Promise) throw new TypeError("Synchronous mode cannot map Promise value.");
-	return mapFn(value);
-}
 function getEnvOrDefault(state, options, mode, innerParser, innerState) {
 	const annotations = getAnnotations(state);
 	const sourceData = annotations?.[options.context.id] ?? getActiveEnvSource(options.context.id);
@@ -175,7 +166,7 @@ function getEnvOrDefault(state, options, mode, innerParser, innerState) {
 	}
 	return wrapForMode(mode, {
 		success: false,
-		error: message`Missing required environment variable: ${fullKey}.`
+		error: message`Missing required environment variable: ${envVar(fullKey)}`
 	});
 }
 const TRUE_LITERALS = [

package/package.json

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