@optique/core 1.3.0-dev.2434 → 1.3.0-dev.2437

package/dist/dependency-runtime.cjs

@@ -1356,6 +1356,20 @@ async function completeEffectfulSourcesAsync(nodes, state, runtime, exec, option
 	};
 	const pending = [...nodes];
 	const metadataUniverse = [...nodes];
+	const declarationIndex = new Map(nodes.map((node, index) => [node, index]));
+	const lastPublicationBySource = /* @__PURE__ */ new Map();
+	const recordPublication = (index, sourceId, value) => {
+		const existing = lastPublicationBySource.get(sourceId);
+		if (existing == null || index >= existing.index) lastPublicationBySource.set(sourceId, {
+			index,
+			value
+		});
+		options?.onPublish?.(sourceId, value);
+	};
+	const publishFromNode = (node, sourceId, value) => {
+		runtime.registerSource(sourceId, value);
+		recordPublication(declarationIndex.get(node) ?? 0, sourceId, value);
+	};
 	const providesId = (node, id) => node.parser.dependencyMetadata?.source?.sourceId === id || node.providesSourceIds?.has(id) === true;
 	const demandSession = session?.policy === "demand-only" ? session : void 0;
 	const resolveBarrierAt = async (index) => {
@@ -1378,6 +1392,8 @@ async function completeEffectfulSourcesAsync(nodes, state, runtime, exec, option
 			}
 		};
 		pending[index] = replacement;
+		const originalIndex = declarationIndex.get(candidate);
+		if (originalIndex != null) declarationIndex.set(replacement, originalIndex);
 		const universeIndex = metadataUniverse.indexOf(candidate);
 		if (universeIndex >= 0) metadataUniverse[universeIndex] = replacement;
 		if (resolution != null && demandSession != null) propagateDemand(metadataUniverse, demandSession);
@@ -1419,8 +1435,29 @@ async function completeEffectfulSourcesAsync(nodes, state, runtime, exec, option
 		}
 		pending.splice(pending.indexOf(node), 1);
 		if (node.prepare != null) {
-			const barrierFailure = await node.prepare(barrierContext);
+			const barrierIndex = declarationIndex.get(node) ?? 0;
+			const publishedDuringPrepare = /* @__PURE__ */ new Set();
+			const nodeBarrierContext = {
+				...barrierContext,
+				schedule: (barrierNodes) => completeEffectfulSourcesAsync(barrierNodes, state, runtime, exec, {
+					isReusable: () => false,
+					isCollected: () => true,
+					includeStructural: true,
+					onPublish: (sourceId, value) => {
+						publishedDuringPrepare.add(sourceId);
+						recordPublication(barrierIndex, sourceId, value);
+					}
+				}).then((result$1) => result$1.success ? void 0 : result$1)
+			};
+			const barrierFailure = await node.prepare(nodeBarrierContext);
 			if (barrierFailure != null) return barrierFailure;
+			for (const sourceId of publishedDuringPrepare) {
+				const entry = lastPublicationBySource.get(sourceId);
+				if (entry != null && entry.index > barrierIndex) {
+					runtime.registerSource(sourceId, entry.value);
+					options?.onPublish?.(sourceId, entry.value);
+				}
+			}
 			continue;
 		}
 		const source = node.parser.dependencyMetadata?.source;
@@ -1441,7 +1478,7 @@ async function completeEffectfulSourcesAsync(nodes, state, runtime, exec, option
 					};
 				}
 				if (replayed.deferred === true) continue;
-				runtime.registerSource(source.sourceId, replayed.value);
+				publishFromNode(node, source.sourceId, replayed.value);
 				if (source.preservesSourceValue && (options?.isReusable?.(node) ?? true)) completed.push({
 					key: node.path[node.path.length - 1],
 					result: replayed
@@ -1452,7 +1489,7 @@ async function completeEffectfulSourcesAsync(nodes, state, runtime, exec, option
 			if (source.extractSourceValue == null || collected === false) continue;
 			const extracted = await source.extractSourceValue(node.state);
 			if (extracted?.success === true && extracted.value !== void 0) {
-				runtime.registerSource(source.sourceId, extracted.value);
+				publishFromNode(node, source.sourceId, extracted.value);
 				continue;
 			}
 			if (options?.includeStructural === true && extracted?.success !== false && node.matched !== true && source.preservesSourceValue && source.getMissingSourceValue != null && !runtime.hasSource(source.sourceId) && !runtime.isSourceFailed(source.sourceId)) {
@@ -1469,7 +1506,7 @@ async function completeEffectfulSourcesAsync(nodes, state, runtime, exec, option
 					}
 					session?.missingDefaultsByOccurrence.set(source.getMissingSourceValue, fallback);
 				}
-				if (fallback.success) runtime.registerSource(source.sourceId, fallback.value);
+				if (fallback.success) publishFromNode(node, source.sourceId, fallback.value);
 				else {
 					runtime.markSourceFailed(source.sourceId);
 					propagateRuntimeSourceFailures(nodes, runtime);
@@ -1512,7 +1549,7 @@ async function completeEffectfulSourcesAsync(nodes, state, runtime, exec, option
 			key: node.path[node.path.length - 1],
 			result
 		});
-		if (result.value !== void 0) runtime.registerSource(source.sourceId, result.value);
+		if (result.value !== void 0) publishFromNode(node, source.sourceId, result.value);
 	}
 	return {
 		success: true,

package/dist/dependency-runtime.d.cts

@@ -751,6 +751,17 @@ interface CompleteEffectfulSourcesOptions {
    * return.
    */
   readonly includeStructural?: boolean;
+  /**
+   * Observes every source value this pass registers, including values a
+   * nested barrier pass reports through its own callback and values a
+   * barrier exit re-asserts.  A barrier's nested scheduling call sets
+   * this so the enclosing pass can attribute the branch's publications
+   * to the barrier's declaration position and restore a later-declared
+   * occurrence the branch overwrote; the callback carries no positional
+   * information of its own, because declaration indices are meaningful
+   * only within a single pass.
+   */
+  readonly onPublish?: (sourceId: symbol, value: unknown) => void;
 }
 /**
  * Replaces a barrier failure cached in the run-scoped session with a

package/dist/dependency-runtime.d.ts

@@ -751,6 +751,17 @@ interface CompleteEffectfulSourcesOptions {
    * return.
    */
   readonly includeStructural?: boolean;
+  /**
+   * Observes every source value this pass registers, including values a
+   * nested barrier pass reports through its own callback and values a
+   * barrier exit re-asserts.  A barrier's nested scheduling call sets
+   * this so the enclosing pass can attribute the branch's publications
+   * to the barrier's declaration position and restore a later-declared
+   * occurrence the branch overwrote; the callback carries no positional
+   * information of its own, because declaration indices are meaningful
+   * only within a single pass.
+   */
+  readonly onPublish?: (sourceId: symbol, value: unknown) => void;
 }
 /**
  * Replaces a barrier failure cached in the run-scoped session with a

package/dist/dependency-runtime.js

@@ -1356,6 +1356,20 @@ async function completeEffectfulSourcesAsync(nodes, state, runtime, exec, option
 	};
 	const pending = [...nodes];
 	const metadataUniverse = [...nodes];
+	const declarationIndex = new Map(nodes.map((node, index) => [node, index]));
+	const lastPublicationBySource = /* @__PURE__ */ new Map();
+	const recordPublication = (index, sourceId, value) => {
+		const existing = lastPublicationBySource.get(sourceId);
+		if (existing == null || index >= existing.index) lastPublicationBySource.set(sourceId, {
+			index,
+			value
+		});
+		options?.onPublish?.(sourceId, value);
+	};
+	const publishFromNode = (node, sourceId, value) => {
+		runtime.registerSource(sourceId, value);
+		recordPublication(declarationIndex.get(node) ?? 0, sourceId, value);
+	};
 	const providesId = (node, id) => node.parser.dependencyMetadata?.source?.sourceId === id || node.providesSourceIds?.has(id) === true;
 	const demandSession = session?.policy === "demand-only" ? session : void 0;
 	const resolveBarrierAt = async (index) => {
@@ -1378,6 +1392,8 @@ async function completeEffectfulSourcesAsync(nodes, state, runtime, exec, option
 			}
 		};
 		pending[index] = replacement;
+		const originalIndex = declarationIndex.get(candidate);
+		if (originalIndex != null) declarationIndex.set(replacement, originalIndex);
 		const universeIndex = metadataUniverse.indexOf(candidate);
 		if (universeIndex >= 0) metadataUniverse[universeIndex] = replacement;
 		if (resolution != null && demandSession != null) propagateDemand(metadataUniverse, demandSession);
@@ -1419,8 +1435,29 @@ async function completeEffectfulSourcesAsync(nodes, state, runtime, exec, option
 		}
 		pending.splice(pending.indexOf(node), 1);
 		if (node.prepare != null) {
-			const barrierFailure = await node.prepare(barrierContext);
+			const barrierIndex = declarationIndex.get(node) ?? 0;
+			const publishedDuringPrepare = /* @__PURE__ */ new Set();
+			const nodeBarrierContext = {
+				...barrierContext,
+				schedule: (barrierNodes) => completeEffectfulSourcesAsync(barrierNodes, state, runtime, exec, {
+					isReusable: () => false,
+					isCollected: () => true,
+					includeStructural: true,
+					onPublish: (sourceId, value) => {
+						publishedDuringPrepare.add(sourceId);
+						recordPublication(barrierIndex, sourceId, value);
+					}
+				}).then((result$1) => result$1.success ? void 0 : result$1)
+			};
+			const barrierFailure = await node.prepare(nodeBarrierContext);
 			if (barrierFailure != null) return barrierFailure;
+			for (const sourceId of publishedDuringPrepare) {
+				const entry = lastPublicationBySource.get(sourceId);
+				if (entry != null && entry.index > barrierIndex) {
+					runtime.registerSource(sourceId, entry.value);
+					options?.onPublish?.(sourceId, entry.value);
+				}
+			}
 			continue;
 		}
 		const source = node.parser.dependencyMetadata?.source;
@@ -1441,7 +1478,7 @@ async function completeEffectfulSourcesAsync(nodes, state, runtime, exec, option
 					};
 				}
 				if (replayed.deferred === true) continue;
-				runtime.registerSource(source.sourceId, replayed.value);
+				publishFromNode(node, source.sourceId, replayed.value);
 				if (source.preservesSourceValue && (options?.isReusable?.(node) ?? true)) completed.push({
 					key: node.path[node.path.length - 1],
 					result: replayed
@@ -1452,7 +1489,7 @@ async function completeEffectfulSourcesAsync(nodes, state, runtime, exec, option
 			if (source.extractSourceValue == null || collected === false) continue;
 			const extracted = await source.extractSourceValue(node.state);
 			if (extracted?.success === true && extracted.value !== void 0) {
-				runtime.registerSource(source.sourceId, extracted.value);
+				publishFromNode(node, source.sourceId, extracted.value);
 				continue;
 			}
 			if (options?.includeStructural === true && extracted?.success !== false && node.matched !== true && source.preservesSourceValue && source.getMissingSourceValue != null && !runtime.hasSource(source.sourceId) && !runtime.isSourceFailed(source.sourceId)) {
@@ -1469,7 +1506,7 @@ async function completeEffectfulSourcesAsync(nodes, state, runtime, exec, option
 					}
 					session?.missingDefaultsByOccurrence.set(source.getMissingSourceValue, fallback);
 				}
-				if (fallback.success) runtime.registerSource(source.sourceId, fallback.value);
+				if (fallback.success) publishFromNode(node, source.sourceId, fallback.value);
 				else {
 					runtime.markSourceFailed(source.sourceId);
 					propagateRuntimeSourceFailures(nodes, runtime);
@@ -1512,7 +1549,7 @@ async function completeEffectfulSourcesAsync(nodes, state, runtime, exec, option
 			key: node.path[node.path.length - 1],
 			result
 		});
-		if (result.value !== void 0) runtime.registerSource(source.sourceId, result.value);
+		if (result.value !== void 0) publishFromNode(node, source.sourceId, result.value);
 	}
 	return {
 		success: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.3.0-dev.2434",
+  "version": "1.3.0-dev.2437",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",
@@ -221,7 +221,7 @@
   },
   "sideEffects": false,
   "devDependencies": {
-    "@optique/env": "1.3.0-dev.2434+6eaf6d6e",
+    "@optique/env": "1.3.0-dev.2437+257322bc",
     "@types/node": "^24.0.0",
     "fast-check": "^4.7.0",
     "tsdown": "^0.13.0",