@optique/core 1.0.0-dev.523 → 1.0.0-dev.552

package/dist/parser.js

@@ -1,4 +1,4 @@
-import { annotationKey } from "./annotations.js";
+import { injectAnnotations, isInjectedAnnotationWrapper, unwrapInjectedAnnotationWrapper } from "./annotations.js";
 import { message } from "./message.js";
 import { dispatchByMode } from "./mode-dispatch.js";
 import { normalizeUsage } from "./usage.js";
@@ -7,6 +7,11 @@ import { WithDefaultError, map, multiple, nonEmpty, optional, withDefault } from
 import { argument, command, constant, fail, flag, option, passThrough } from "./primitives.js";
 
 //#region src/parser.ts
+function injectAnnotationsIntoState(state, options) {
+	const annotations = options?.annotations;
+	if (annotations == null) return state;
+	return injectAnnotations(state, annotations);
+}
 /**
 * Parses an array of command-line arguments using the provided combined parser.
 * This function processes the input arguments, applying the parser to each
@@ -30,11 +35,8 @@ import { argument, command, constant, fail, flag, option, passThrough } from "./
 * @since 0.10.0 Added optional `options` parameter for annotations support.
 */
 function parseSync(parser, args, options) {
-	let initialState = parser.initialState;
-	if (options?.annotations) initialState = {
-		...typeof initialState === "object" && initialState !== null ? initialState : {},
-		[annotationKey]: options.annotations
-	};
+	const initialState = injectAnnotationsIntoState(parser.initialState, options);
+	const shouldUnwrapAnnotatedValue = options?.annotations != null || isInjectedAnnotationWrapper(parser.initialState);
 	let context = {
 		buffer: args,
 		optionsTerminated: false,
@@ -57,7 +59,7 @@ function parseSync(parser, args, options) {
 	const endResult = parser.complete(context.state);
 	return endResult.success ? {
 		success: true,
-		value: endResult.value
+		value: shouldUnwrapAnnotatedValue ? unwrapInjectedAnnotationWrapper(endResult.value) : endResult.value
 	} : {
 		success: false,
 		error: endResult.error
@@ -83,11 +85,8 @@ function parseSync(parser, args, options) {
 * @since 0.10.0 Added optional `options` parameter for annotations support.
 */
 async function parseAsync(parser, args, options) {
-	let initialState = parser.initialState;
-	if (options?.annotations) initialState = {
-		...typeof initialState === "object" && initialState !== null ? initialState : {},
-		[annotationKey]: options.annotations
-	};
+	const initialState = injectAnnotationsIntoState(parser.initialState, options);
+	const shouldUnwrapAnnotatedValue = options?.annotations != null || isInjectedAnnotationWrapper(parser.initialState);
 	let context = {
 		buffer: args,
 		optionsTerminated: false,
@@ -110,7 +109,7 @@ async function parseAsync(parser, args, options) {
 	const endResult = await parser.complete(context.state);
 	return endResult.success ? {
 		success: true,
-		value: endResult.value
+		value: shouldUnwrapAnnotatedValue ? unwrapInjectedAnnotationWrapper(endResult.value) : endResult.value
 	} : {
 		success: false,
 		error: endResult.error
@@ -180,11 +179,7 @@ function parse(parser, args, options) {
 function suggestSync(parser, args, options) {
 	const allButLast = args.slice(0, -1);
 	const prefix = args[args.length - 1];
-	let initialState = parser.initialState;
-	if (options?.annotations) initialState = {
-		...typeof initialState === "object" && initialState !== null ? initialState : {},
-		[annotationKey]: options.annotations
-	};
+	const initialState = injectAnnotationsIntoState(parser.initialState, options);
 	let context = {
 		buffer: allButLast,
 		optionsTerminated: false,
@@ -223,11 +218,7 @@ function suggestSync(parser, args, options) {
 async function suggestAsync(parser, args, options) {
 	const allButLast = args.slice(0, -1);
 	const prefix = args[args.length - 1];
-	let initialState = parser.initialState;
-	if (options?.annotations) initialState = {
-		...typeof initialState === "object" && initialState !== null ? initialState : {},
-		[annotationKey]: options.annotations
-	};
+	const initialState = injectAnnotationsIntoState(parser.initialState, options);
 	let context = {
 		buffer: allButLast,
 		optionsTerminated: false,
@@ -338,11 +329,7 @@ function getDocPage(parser, args = [], options) {
 * Internal sync implementation of getDocPage.
 */
 function getDocPageSyncImpl(parser, args, options) {
-	let initialState = parser.initialState;
-	if (options?.annotations) initialState = {
-		...typeof initialState === "object" && initialState !== null ? initialState : {},
-		[annotationKey]: options.annotations
-	};
+	const initialState = injectAnnotationsIntoState(parser.initialState, options);
 	let context = {
 		buffer: args,
 		optionsTerminated: false,
@@ -360,11 +347,7 @@ function getDocPageSyncImpl(parser, args, options) {
 * Internal async implementation of getDocPage.
 */
 async function getDocPageAsyncImpl(parser, args, options) {
-	let initialState = parser.initialState;
-	if (options?.annotations) initialState = {
-		...typeof initialState === "object" && initialState !== null ? initialState : {},
-		[annotationKey]: options.annotations
-	};
+	const initialState = injectAnnotationsIntoState(parser.initialState, options);
 	let context = {
 		buffer: args,
 		optionsTerminated: false,

package/dist/primitives.cjs

@@ -1,3 +1,4 @@
+const require_annotations = require('./annotations.cjs');
 const require_message = require('./message.cjs');
 const require_dependency = require('./dependency.cjs');
 const require_mode_dispatch = require('./mode-dispatch.cjs');
@@ -1115,6 +1116,13 @@ function passThrough(options = {}) {
 	const format = options.format ?? "equalsOnly";
 	const optionPattern = /^-[a-z0-9-]|^--[a-z0-9-]+/i;
 	const equalsOptionPattern = /^--[a-z0-9-]+=/i;
+	const annotateFreshArray = (source, target) => {
+		const annotations = require_annotations.getAnnotations(source);
+		if (annotations === void 0) return target;
+		const annotated = target;
+		annotated[require_annotations.annotationKey] = annotations;
+		return annotated;
+	};
 	return {
 		$valueType: [],
 		$stateType: [],
@@ -1139,7 +1147,7 @@ function passThrough(options = {}) {
 					next: {
 						...context,
 						buffer: [],
-						state: [...context.state, ...captured]
+						state: annotateFreshArray(context.state, [...context.state, ...captured])
 					},
 					consumed: captured
 				};
@@ -1160,7 +1168,7 @@ function passThrough(options = {}) {
 					next: {
 						...context,
 						buffer: context.buffer.slice(1),
-						state: [...context.state, token]
+						state: annotateFreshArray(context.state, [...context.state, token])
 					},
 					consumed: [token]
 				};
@@ -1176,7 +1184,7 @@ function passThrough(options = {}) {
 					next: {
 						...context,
 						buffer: context.buffer.slice(1),
-						state: [...context.state, token]
+						state: annotateFreshArray(context.state, [...context.state, token])
 					},
 					consumed: [token]
 				};
@@ -1186,11 +1194,11 @@ function passThrough(options = {}) {
 					next: {
 						...context,
 						buffer: context.buffer.slice(2),
-						state: [
+						state: annotateFreshArray(context.state, [
 							...context.state,
 							token,
 							nextToken
-						]
+						])
 					},
 					consumed: [token, nextToken]
 				};
@@ -1199,7 +1207,7 @@ function passThrough(options = {}) {
 					next: {
 						...context,
 						buffer: context.buffer.slice(1),
-						state: [...context.state, token]
+						state: annotateFreshArray(context.state, [...context.state, token])
 					},
 					consumed: [token]
 				};
@@ -1211,10 +1219,15 @@ function passThrough(options = {}) {
 			};
 		},
 		complete(state) {
-			return {
+			if (require_annotations.getAnnotations(state) == null) return {
 				success: true,
 				value: state
 			};
+			const copied = [...state];
+			return {
+				success: true,
+				value: copied
+			};
 		},
 		suggest(_context, _prefix) {
 			return [];

package/dist/primitives.js

@@ -1,3 +1,4 @@
+import { annotationKey, getAnnotations } from "./annotations.js";
 import { message, metavar, optionName, optionNames, text, valueSet } from "./message.js";
 import { createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, dependencyId, getDefaultValuesFunction, getDependencyIds, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isPendingDependencySourceState, suggestWithDependency } from "./dependency.js";
 import { dispatchIterableByMode } from "./mode-dispatch.js";
@@ -1115,6 +1116,13 @@ function passThrough(options = {}) {
 	const format = options.format ?? "equalsOnly";
 	const optionPattern = /^-[a-z0-9-]|^--[a-z0-9-]+/i;
 	const equalsOptionPattern = /^--[a-z0-9-]+=/i;
+	const annotateFreshArray = (source, target) => {
+		const annotations = getAnnotations(source);
+		if (annotations === void 0) return target;
+		const annotated = target;
+		annotated[annotationKey] = annotations;
+		return annotated;
+	};
 	return {
 		$valueType: [],
 		$stateType: [],
@@ -1139,7 +1147,7 @@ function passThrough(options = {}) {
 					next: {
 						...context,
 						buffer: [],
-						state: [...context.state, ...captured]
+						state: annotateFreshArray(context.state, [...context.state, ...captured])
 					},
 					consumed: captured
 				};
@@ -1160,7 +1168,7 @@ function passThrough(options = {}) {
 					next: {
 						...context,
 						buffer: context.buffer.slice(1),
-						state: [...context.state, token]
+						state: annotateFreshArray(context.state, [...context.state, token])
 					},
 					consumed: [token]
 				};
@@ -1176,7 +1184,7 @@ function passThrough(options = {}) {
 					next: {
 						...context,
 						buffer: context.buffer.slice(1),
-						state: [...context.state, token]
+						state: annotateFreshArray(context.state, [...context.state, token])
 					},
 					consumed: [token]
 				};
@@ -1186,11 +1194,11 @@ function passThrough(options = {}) {
 					next: {
 						...context,
 						buffer: context.buffer.slice(2),
-						state: [
+						state: annotateFreshArray(context.state, [
 							...context.state,
 							token,
 							nextToken
-						]
+						])
 					},
 					consumed: [token, nextToken]
 				};
@@ -1199,7 +1207,7 @@ function passThrough(options = {}) {
 					next: {
 						...context,
 						buffer: context.buffer.slice(1),
-						state: [...context.state, token]
+						state: annotateFreshArray(context.state, [...context.state, token])
 					},
 					consumed: [token]
 				};
@@ -1211,10 +1219,15 @@ function passThrough(options = {}) {
 			};
 		},
 		complete(state) {
-			return {
+			if (getAnnotations(state) == null) return {
 				success: true,
 				value: state
 			};
+			const copied = [...state];
+			return {
+				success: true,
+				value: copied
+			};
 		},
 		suggest(_context, _prefix) {
 			return [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.0.0-dev.523+c2f04b11",
+  "version": "1.0.0-dev.552+30c7ea22",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",