@optique/core 1.0.0-dev.1596 → 1.0.0-dev.1602

package/dist/parser.d.ts

@@ -4,6 +4,8 @@ import { Usage } from "./usage.js";
 import { DocFragments, DocPage } from "./doc.js";
 import { DependencyRegistryLike } from "./registry-types.js";
 import { DeferredMap, ValueParserResult } from "./valueparser.js";
+import { ParserDependencyMetadata } from "./dependency-metadata.js";
+import { DependencyRuntimeContext } from "./dependency-runtime.js";
 import { ConditionalErrorOptions, ConditionalOptions, DuplicateOptionError, GroupOptions, LongestMatchErrorOptions, LongestMatchOptions, MergeOptions, NoMatchContext, ObjectErrorOptions, ObjectOptions, OrErrorOptions, OrOptions, TupleOptions, concat, conditional, group, longestMatch, merge, object, or, tuple } from "./constructs.js";
 import { MultipleErrorOptions, MultipleOptions, WithDefaultError, WithDefaultOptions, map, multiple, nonEmpty, optional, withDefault } from "./modifiers.js";
 import { ArgumentErrorOptions, ArgumentOptions, CommandErrorOptions, CommandOptions, FlagErrorOptions, FlagOptions, OptionErrorOptions, OptionOptions, OptionState, PassThroughFormat, PassThroughOptions, argument, command, constant, fail, flag, option, passThrough } from "./primitives.js";
@@ -251,6 +253,14 @@ interface Parser<M extends Mode = "sync", TValue = unknown, TState = unknown> {
    * @since 1.0.0
    */
   normalizeValue?(value: TValue): TValue;
+  /**
+   * Internal dependency metadata describing this parser's dependency
+   * capabilities.  Used by the dependency runtime to resolve dependencies
+   * without relying on state-shape protocols.
+   * @internal
+   * @since 1.0.0
+   */
+  readonly dependencyMetadata?: ParserDependencyMetadata;
 }
 /**
  * Parser-local frame data containing the input buffer and parser state.
@@ -308,6 +318,13 @@ interface ExecutionContext {
    * @since 0.10.0
    */
   readonly dependencyRegistry?: DependencyRegistryLike;
+  /**
+   * The dependency runtime context for dependency resolution.
+   * Coexists with `dependencyRegistry` during the transition period.
+   * @internal
+   * @since 1.0.0
+   */
+  readonly dependencyRuntime?: DependencyRuntimeContext;
 }
 /**
  * The context of the parser, which includes the input buffer and the state.

package/dist/primitives.cjs

@@ -6,6 +6,7 @@ const require_validate = require('./validate.cjs');
 const require_usage = require('./usage.cjs');
 const require_suggestion = require('./suggestion.cjs');
 const require_usage_internals = require('./usage-internals.cjs');
+const require_dependency_metadata = require('./dependency-metadata.cjs');
 const require_valueparser = require('./valueparser.cjs');
 
 //#region src/primitives.ts
@@ -598,6 +599,10 @@ function option(...args) {
 		enumerable: false,
 		writable: false
 	});
+	if (valueParser != null) {
+		const depMeta = require_dependency_metadata.extractDependencyMetadata(valueParser);
+		if (depMeta != null) result.dependencyMetadata = depMeta;
+	}
 	return result;
 }
 /**
@@ -963,6 +968,8 @@ function argument(valueParser, options = {}) {
 		configurable: true,
 		enumerable: false
 	});
+	const depMeta = require_dependency_metadata.extractDependencyMetadata(valueParser);
+	if (depMeta != null) result.dependencyMetadata = depMeta;
 	return result;
 }
 function* suggestCommandSync(context, prefix, name, parser, options) {

package/dist/primitives.js

@@ -6,6 +6,7 @@ import { validateCommandNames, validateOptionNames } from "./validate.js";
 import { extractOptionNames, isDocHidden, isSuggestionHidden } from "./usage.js";
 import { DEFAULT_FIND_SIMILAR_OPTIONS, createErrorWithSuggestions, createSuggestionMessage, findSimilar } from "./suggestion.js";
 import { extractLeadingCommandNames } from "./usage-internals.js";
+import { extractDependencyMetadata } from "./dependency-metadata.js";
 import { isValueParser } from "./valueparser.js";
 
 //#region src/primitives.ts
@@ -598,6 +599,10 @@ function option(...args) {
 		enumerable: false,
 		writable: false
 	});
+	if (valueParser != null) {
+		const depMeta = extractDependencyMetadata(valueParser);
+		if (depMeta != null) result.dependencyMetadata = depMeta;
+	}
 	return result;
 }
 /**
@@ -963,6 +968,8 @@ function argument(valueParser, options = {}) {
 		configurable: true,
 		enumerable: false
 	});
+	const depMeta = extractDependencyMetadata(valueParser);
+	if (depMeta != null) result.dependencyMetadata = depMeta;
 	return result;
 }
 function* suggestCommandSync(context, prefix, name, parser, options) {

package/dist/valueparser.cjs

@@ -1745,21 +1745,24 @@ function socketAddress(options) {
 		},
 		parse(input) {
 			const trimmed = input.trim();
+			const searchInput = input.trimStart();
 			const canOmitPort = defaultPort !== void 0 && !requirePort;
 			let firstHostError;
 			let validHostInvalidPortError;
 			let trailingSepHost;
 			let trailingSepHostError;
 			let anySeparatorFound = false;
-			let searchFrom = trimmed.length;
+			let trailingSepInTrimmedRegion = false;
+			let searchFrom = searchInput.length;
 			while (searchFrom > 0) {
-				const separatorIndex = trimmed.lastIndexOf(separator, searchFrom - 1);
+				const separatorIndex = searchInput.lastIndexOf(separator, searchFrom - 1);
 				if (separatorIndex === -1) break;
 				anySeparatorFound = true;
-				const hostPart = trimmed.substring(0, separatorIndex);
-				const portPart = trimmed.substring(separatorIndex + separator.length);
+				const hostPart = searchInput.substring(0, separatorIndex).trim();
+				const portPart = searchInput.substring(separatorIndex + separator.length).trim();
 				if (portPart === "") {
 					if (trailingSepHost === void 0 && trailingSepHostError === void 0) {
+						if (separatorIndex + separator.length > trimmed.length) trailingSepInTrimmedRegion = true;
 						const hostResult = parseHost(hostPart);
 						if (hostResult.success) trailingSepHost = hostResult.value;
 						else trailingSepHostError = {
@@ -1856,7 +1859,7 @@ function socketAddress(options) {
 			let hostOnlyResult;
 			if (!requirePort || trailingSepHost !== void 0 || trailingSepHostError !== void 0) {
 				hostOnlyResult = parseHost(trimmed);
-				if (canOmitPort && hostOnlyResult.success) return {
+				if (canOmitPort && hostOnlyResult.success && !trailingSepInTrimmedRegion) return {
 					success: true,
 					value: {
 						host: hostOnlyResult.value,
@@ -1864,14 +1867,7 @@ function socketAddress(options) {
 					}
 				};
 			}
-			if (trailingSepHost !== void 0 && hostOnlyResult !== void 0 && !hostOnlyResult.success) {
-				if (canOmitPort) return {
-					success: true,
-					value: {
-						host: trailingSepHost,
-						port: defaultPort
-					}
-				};
+			if (trailingSepHost !== void 0 && hostOnlyResult !== void 0 && (!hostOnlyResult.success || trailingSepInTrimmedRegion)) {
 				const errorMsg$1 = options?.errors?.missingPort;
 				const msg = typeof errorMsg$1 === "function" ? errorMsg$1(input) : errorMsg$1 ?? require_message.message`Port number is required but was not specified.`;
 				return {
@@ -1879,7 +1875,7 @@ function socketAddress(options) {
 					error: msg
 				};
 			}
-			if (trailingSepHostError !== void 0 && hostOnlyResult !== void 0 && !hostOnlyResult.success) {
+			if (trailingSepHostError !== void 0 && hostOnlyResult !== void 0 && (!hostOnlyResult.success || trailingSepInTrimmedRegion)) {
 				const errorMsg$1 = options?.errors?.invalidFormat;
 				if (errorMsg$1) {
 					const msg = typeof errorMsg$1 === "function" ? errorMsg$1(input) : errorMsg$1;

package/dist/valueparser.js

@@ -1745,21 +1745,24 @@ function socketAddress(options) {
 		},
 		parse(input) {
 			const trimmed = input.trim();
+			const searchInput = input.trimStart();
 			const canOmitPort = defaultPort !== void 0 && !requirePort;
 			let firstHostError;
 			let validHostInvalidPortError;
 			let trailingSepHost;
 			let trailingSepHostError;
 			let anySeparatorFound = false;
-			let searchFrom = trimmed.length;
+			let trailingSepInTrimmedRegion = false;
+			let searchFrom = searchInput.length;
 			while (searchFrom > 0) {
-				const separatorIndex = trimmed.lastIndexOf(separator, searchFrom - 1);
+				const separatorIndex = searchInput.lastIndexOf(separator, searchFrom - 1);
 				if (separatorIndex === -1) break;
 				anySeparatorFound = true;
-				const hostPart = trimmed.substring(0, separatorIndex);
-				const portPart = trimmed.substring(separatorIndex + separator.length);
+				const hostPart = searchInput.substring(0, separatorIndex).trim();
+				const portPart = searchInput.substring(separatorIndex + separator.length).trim();
 				if (portPart === "") {
 					if (trailingSepHost === void 0 && trailingSepHostError === void 0) {
+						if (separatorIndex + separator.length > trimmed.length) trailingSepInTrimmedRegion = true;
 						const hostResult = parseHost(hostPart);
 						if (hostResult.success) trailingSepHost = hostResult.value;
 						else trailingSepHostError = {
@@ -1856,7 +1859,7 @@ function socketAddress(options) {
 			let hostOnlyResult;
 			if (!requirePort || trailingSepHost !== void 0 || trailingSepHostError !== void 0) {
 				hostOnlyResult = parseHost(trimmed);
-				if (canOmitPort && hostOnlyResult.success) return {
+				if (canOmitPort && hostOnlyResult.success && !trailingSepInTrimmedRegion) return {
 					success: true,
 					value: {
 						host: hostOnlyResult.value,
@@ -1864,14 +1867,7 @@ function socketAddress(options) {
 					}
 				};
 			}
-			if (trailingSepHost !== void 0 && hostOnlyResult !== void 0 && !hostOnlyResult.success) {
-				if (canOmitPort) return {
-					success: true,
-					value: {
-						host: trailingSepHost,
-						port: defaultPort
-					}
-				};
+			if (trailingSepHost !== void 0 && hostOnlyResult !== void 0 && (!hostOnlyResult.success || trailingSepInTrimmedRegion)) {
 				const errorMsg$1 = options?.errors?.missingPort;
 				const msg = typeof errorMsg$1 === "function" ? errorMsg$1(input) : errorMsg$1 ?? message`Port number is required but was not specified.`;
 				return {
@@ -1879,7 +1875,7 @@ function socketAddress(options) {
 					error: msg
 				};
 			}
-			if (trailingSepHostError !== void 0 && hostOnlyResult !== void 0 && !hostOnlyResult.success) {
+			if (trailingSepHostError !== void 0 && hostOnlyResult !== void 0 && (!hostOnlyResult.success || trailingSepInTrimmedRegion)) {
 				const errorMsg$1 = options?.errors?.invalidFormat;
 				if (errorMsg$1) {
 					const msg = typeof errorMsg$1 === "function" ? errorMsg$1(input) : errorMsg$1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.0.0-dev.1596+91310a38",
+  "version": "1.0.0-dev.1602+d81eb3b1",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",