@optique/core 1.0.0-dev.1495 → 1.0.0-dev.1500

package/dist/dependency.cjs

@@ -204,6 +204,13 @@ function createSyncDerivedFromParser(sourceId, options) {
 	return {
 		$mode: "sync",
 		metavar: options.metavar,
+		get placeholder() {
+			try {
+				return options.factory(...options.defaultValues()).placeholder;
+			} catch {
+				return void 0;
+			}
+		},
 		[derivedValueParserMarker]: true,
 		[dependencyId]: sourceId,
 		[dependencyIds]: alldependencyIds,
@@ -290,6 +297,13 @@ function createAsyncDerivedFromParserFromAsyncFactory(sourceId, options) {
 	return {
 		$mode: "async",
 		metavar: options.metavar,
+		get placeholder() {
+			try {
+				return options.factory(...options.defaultValues()).placeholder;
+			} catch {
+				return void 0;
+			}
+		},
 		[derivedValueParserMarker]: true,
 		[dependencyId]: sourceId,
 		[dependencyIds]: alldependencyIds,
@@ -366,6 +380,13 @@ function createAsyncDerivedFromParserFromSyncFactory(sourceId, options) {
 	return {
 		$mode: "async",
 		metavar: options.metavar,
+		get placeholder() {
+			try {
+				return options.factory(...options.defaultValues()).placeholder;
+			} catch {
+				return void 0;
+			}
+		},
 		[derivedValueParserMarker]: true,
 		[dependencyId]: sourceId,
 		[dependencyIds]: alldependencyIds,
@@ -446,6 +467,13 @@ function createSyncDerivedParser(sourceId, options) {
 	return {
 		$mode: "sync",
 		metavar: options.metavar,
+		get placeholder() {
+			try {
+				return options.factory(options.defaultValue()).placeholder;
+			} catch {
+				return void 0;
+			}
+		},
 		[derivedValueParserMarker]: true,
 		[dependencyId]: sourceId,
 		parse(input) {
@@ -528,6 +556,13 @@ function createAsyncDerivedParserFromAsyncFactory(sourceId, options) {
 	return {
 		$mode: "async",
 		metavar: options.metavar,
+		get placeholder() {
+			try {
+				return options.factory(options.defaultValue()).placeholder;
+			} catch {
+				return void 0;
+			}
+		},
 		[derivedValueParserMarker]: true,
 		[dependencyId]: sourceId,
 		parse(input) {
@@ -600,6 +635,13 @@ function createAsyncDerivedParserFromSyncFactory(sourceId, options) {
 	return {
 		$mode: "async",
 		metavar: options.metavar,
+		get placeholder() {
+			try {
+				return options.factory(options.defaultValue()).placeholder;
+			} catch {
+				return void 0;
+			}
+		},
 		[derivedValueParserMarker]: true,
 		[dependencyId]: sourceId,
 		parse(input) {

package/dist/dependency.js

@@ -204,6 +204,13 @@ function createSyncDerivedFromParser(sourceId, options) {
 	return {
 		$mode: "sync",
 		metavar: options.metavar,
+		get placeholder() {
+			try {
+				return options.factory(...options.defaultValues()).placeholder;
+			} catch {
+				return void 0;
+			}
+		},
 		[derivedValueParserMarker]: true,
 		[dependencyId]: sourceId,
 		[dependencyIds]: alldependencyIds,
@@ -290,6 +297,13 @@ function createAsyncDerivedFromParserFromAsyncFactory(sourceId, options) {
 	return {
 		$mode: "async",
 		metavar: options.metavar,
+		get placeholder() {
+			try {
+				return options.factory(...options.defaultValues()).placeholder;
+			} catch {
+				return void 0;
+			}
+		},
 		[derivedValueParserMarker]: true,
 		[dependencyId]: sourceId,
 		[dependencyIds]: alldependencyIds,
@@ -366,6 +380,13 @@ function createAsyncDerivedFromParserFromSyncFactory(sourceId, options) {
 	return {
 		$mode: "async",
 		metavar: options.metavar,
+		get placeholder() {
+			try {
+				return options.factory(...options.defaultValues()).placeholder;
+			} catch {
+				return void 0;
+			}
+		},
 		[derivedValueParserMarker]: true,
 		[dependencyId]: sourceId,
 		[dependencyIds]: alldependencyIds,
@@ -446,6 +467,13 @@ function createSyncDerivedParser(sourceId, options) {
 	return {
 		$mode: "sync",
 		metavar: options.metavar,
+		get placeholder() {
+			try {
+				return options.factory(options.defaultValue()).placeholder;
+			} catch {
+				return void 0;
+			}
+		},
 		[derivedValueParserMarker]: true,
 		[dependencyId]: sourceId,
 		parse(input) {
@@ -528,6 +556,13 @@ function createAsyncDerivedParserFromAsyncFactory(sourceId, options) {
 	return {
 		$mode: "async",
 		metavar: options.metavar,
+		get placeholder() {
+			try {
+				return options.factory(options.defaultValue()).placeholder;
+			} catch {
+				return void 0;
+			}
+		},
 		[derivedValueParserMarker]: true,
 		[dependencyId]: sourceId,
 		parse(input) {
@@ -600,6 +635,13 @@ function createAsyncDerivedParserFromSyncFactory(sourceId, options) {
 	return {
 		$mode: "async",
 		metavar: options.metavar,
+		get placeholder() {
+			try {
+				return options.factory(options.defaultValue()).placeholder;
+			} catch {
+				return void 0;
+			}
+		},
 		[derivedValueParserMarker]: true,
 		[dependencyId]: sourceId,
 		parse(input) {

package/dist/facade.cjs

@@ -6,282 +6,72 @@ const require_validate = require('./validate.cjs');
 const require_usage = require('./usage.cjs');
 const require_doc = require('./doc.cjs');
 const require_constructs = require('./constructs.cjs');
-const require_context = require('./context.cjs');
 const require_modifiers = require('./modifiers.cjs');
 const require_valueparser = require('./valueparser.cjs');
 const require_primitives = require('./primitives.cjs');
 const require_parser = require('./parser.cjs');
 
 //#region src/facade.ts
+function finalizeParsedForContext(context, parsed) {
+	return context.finalizeParsed != null ? context.finalizeParsed(parsed) : parsed;
+}
 function isPlainObject(value$1) {
 	const proto = Object.getPrototypeOf(value$1);
 	return proto === Object.prototype || proto === null;
 }
-function shouldSkipCollectionOwnKey(value$1, key) {
-	if (Array.isArray(value$1)) return key === "length" || typeof key === "string" && Number.isInteger(Number(key)) && String(Number(key)) === key;
-	return false;
-}
-function containsPlaceholderValuesInOwnProperties(value$1, seen) {
-	for (const key of Reflect.ownKeys(value$1)) {
-		if (shouldSkipCollectionOwnKey(value$1, key)) continue;
-		const descriptor = Object.getOwnPropertyDescriptor(value$1, key);
-		if (descriptor != null && "value" in descriptor && containsPlaceholderValues(descriptor.value, seen)) return true;
-	}
-	return false;
-}
-function copySanitizedOwnProperties(source, target, seen) {
-	for (const key of Reflect.ownKeys(source)) {
-		if (shouldSkipCollectionOwnKey(source, key)) continue;
-		const descriptor = Object.getOwnPropertyDescriptor(source, key);
-		if (descriptor == null) continue;
-		if ("value" in descriptor) descriptor.value = stripPlaceholderValues(descriptor.value, seen);
-		Object.defineProperty(target, key, descriptor);
-	}
-}
-function createArrayCloneLike(value$1) {
-	try {
-		const arrayCtor = value$1.constructor;
-		return Reflect.construct(Array, [value$1.length], arrayCtor);
-	} catch {
-		return new Array(value$1.length);
-	}
-}
-function createSetCloneLike(value$1) {
-	try {
-		const setCtor = value$1.constructor;
-		return Reflect.construct(Set, [], setCtor);
-	} catch {
-		return /* @__PURE__ */ new Set();
-	}
-}
-function createMapCloneLike(value$1) {
-	try {
-		const mapCtor = value$1.constructor;
-		return Reflect.construct(Map, [], mapCtor);
-	} catch {
-		return /* @__PURE__ */ new Map();
-	}
-}
-function containsPlaceholderValues(value$1, seen = /* @__PURE__ */ new WeakSet()) {
-	if (require_context.isPlaceholderValue(value$1)) return true;
-	if (value$1 == null || typeof value$1 !== "object") return false;
-	if (seen.has(value$1)) return false;
-	seen.add(value$1);
-	if (Array.isArray(value$1)) {
-		if (value$1.some((item) => containsPlaceholderValues(item, seen))) return true;
-		return containsPlaceholderValuesInOwnProperties(value$1, seen);
-	}
-	if (value$1 instanceof Set) {
-		for (const entryValue of value$1) if (containsPlaceholderValues(entryValue, seen)) return true;
-		return containsPlaceholderValuesInOwnProperties(value$1, seen);
-	}
-	if (value$1 instanceof Map) {
-		for (const [key, entryValue] of value$1) if (containsPlaceholderValues(key, seen) || containsPlaceholderValues(entryValue, seen)) return true;
-		return containsPlaceholderValuesInOwnProperties(value$1, seen);
-	}
-	return containsPlaceholderValuesInOwnProperties(value$1, seen);
-}
-function stripPlaceholderValues(value$1, seen = /* @__PURE__ */ new WeakMap()) {
-	if (require_context.isPlaceholderValue(value$1)) return void 0;
-	if (value$1 == null || typeof value$1 !== "object") return value$1;
-	const cached = seen.get(value$1);
-	if (cached !== void 0) return cached;
-	if (Array.isArray(value$1)) {
-		if (!containsPlaceholderValues(value$1)) return value$1;
-		const clone$1 = createArrayCloneLike(value$1);
-		seen.set(value$1, clone$1);
-		for (let i = 0; i < value$1.length; i++) clone$1[i] = stripPlaceholderValues(value$1[i], seen);
-		copySanitizedOwnProperties(value$1, clone$1, seen);
-		return clone$1;
-	}
-	if (value$1 instanceof Set) {
-		if (!containsPlaceholderValues(value$1)) return value$1;
-		const clone$1 = createSetCloneLike(value$1);
-		seen.set(value$1, clone$1);
-		for (const entryValue of value$1) clone$1.add(stripPlaceholderValues(entryValue, seen));
-		copySanitizedOwnProperties(value$1, clone$1, seen);
-		return clone$1;
-	}
-	if (value$1 instanceof Map) {
-		if (!containsPlaceholderValues(value$1)) return value$1;
-		const clone$1 = createMapCloneLike(value$1);
-		seen.set(value$1, clone$1);
-		for (const [key, entryValue] of value$1) clone$1.set(stripPlaceholderValues(key, seen), stripPlaceholderValues(entryValue, seen));
-		copySanitizedOwnProperties(value$1, clone$1, seen);
-		return clone$1;
-	}
-	if (!isPlainObject(value$1)) {
-		if (!containsPlaceholderValues(value$1)) return value$1;
-		return createSanitizedNonPlainView(value$1, seen);
-	}
-	const clone = Object.create(Object.getPrototypeOf(value$1));
-	seen.set(value$1, clone);
-	for (const key of Reflect.ownKeys(value$1)) {
-		const descriptor = Object.getOwnPropertyDescriptor(value$1, key);
-		if (descriptor == null) continue;
-		if ("value" in descriptor) descriptor.value = stripPlaceholderValues(descriptor.value, seen);
-		Object.defineProperty(clone, key, descriptor);
-	}
-	return clone;
-}
-function finalizeParsedForContext(context, parsed) {
-	return context.finalizeParsed != null ? context.finalizeParsed(parsed) : parsed;
-}
-const SANITIZE_FAILED = Symbol("sanitizeFailed");
-const activeSanitizations = /* @__PURE__ */ new WeakMap();
-function callWithSanitizedOwnProperties(target, fn, args, strip, seen) {
-	let active = activeSanitizations.get(target);
-	if (active != null) active.count++;
-	else {
-		const saved = /* @__PURE__ */ new Map();
-		const sanitizedValues = /* @__PURE__ */ new Map();
-		for (const key of Reflect.ownKeys(target)) {
-			const desc = Object.getOwnPropertyDescriptor(target, key);
-			if (desc != null && "value" in desc) {
-				let stripped;
-				try {
-					stripped = strip(desc.value, seen);
-				} catch {
-					for (const [k, d] of saved) try {
-						Object.defineProperty(target, k, d);
-					} catch {}
-					return SANITIZE_FAILED;
-				}
-				if (stripped !== desc.value) try {
-					Object.defineProperty(target, key, {
-						...desc,
-						value: stripped
-					});
-					saved.set(key, desc);
-					sanitizedValues.set(key, stripped);
-				} catch {
-					for (const [k, d] of saved) try {
-						Object.defineProperty(target, k, d);
-					} catch {}
-					return SANITIZE_FAILED;
-				}
-			}
-		}
-		active = {
-			saved,
-			sanitizedValues,
-			count: 1
+function prepareParsedForContexts(parsed, deferred, deferredKeys) {
+	if (!deferred) return parsed;
+	if (deferredKeys != null && deferredKeys.size === 0 && parsed != null && typeof parsed === "object") return void 0;
+	if (deferredKeys != null && deferredKeys.size > 0 && parsed != null && typeof parsed === "object" && !isPlainObject(parsed) && !Array.isArray(parsed)) return void 0;
+	if (deferredKeys != null && deferredKeys.size > 0 && parsed != null && typeof parsed === "object" && (isPlainObject(parsed) || Array.isArray(parsed))) {
+		const getDeferredEntry = (key) => {
+			const entry = deferredKeys.get(key);
+			if (entry !== void 0) return entry;
+			if (typeof key === "string") {
+				const num = Number(key);
+				if (Number.isInteger(num)) return deferredKeys.get(num);
+			} else if (typeof key === "number") return deferredKeys.get(String(key));
+			return void 0;
 		};
-		activeSanitizations.set(target, active);
-	}
-	function release() {
-		active.count--;
-		if (active.count === 0) {
-			activeSanitizations.delete(target);
-			for (const [key, desc] of active.saved) try {
-				const current = Object.getOwnPropertyDescriptor(target, key);
-				if (current == null) continue;
-				if ("value" in current && current.value !== active.sanitizedValues.get(key)) continue;
-				Object.defineProperty(target, key, desc);
-			} catch {}
+		const ownKeys = Reflect.ownKeys(parsed);
+		let hasMatchingKey = false;
+		for (const key of ownKeys) if (getDeferredEntry(key) !== void 0) {
+			hasMatchingKey = true;
+			break;
 		}
-	}
-	let result;
-	try {
-		result = fn.apply(target, args);
-	} catch (e) {
-		release();
-		throw e;
-	}
-	if (result instanceof Promise) return result.then((v) => {
-		release();
-		return strip(v, seen);
-	}, (e) => {
-		release();
-		throw e;
-	});
-	release();
-	return strip(result, seen);
-}
-function callMethodOnSanitizedTarget(fn, proxy, target, args, strip, seen) {
-	const result = callWithSanitizedOwnProperties(target, fn, args, strip, seen);
-	if (result !== SANITIZE_FAILED) return result;
-	const fallback = fn.apply(proxy, args);
-	if (fallback instanceof Promise) return fallback.then((v) => strip(v, seen));
-	return strip(fallback, seen);
-}
-function createSanitizedNonPlainView(value$1, seen) {
-	const methodCache = /* @__PURE__ */ new Map();
-	const proxy = new Proxy(value$1, {
-		get(target, key, receiver) {
-			const descriptor = Object.getOwnPropertyDescriptor(target, key);
-			if (descriptor != null && "value" in descriptor) {
-				if (!descriptor.configurable && !descriptor.writable) return descriptor.value;
-				const val = stripPlaceholderValues(descriptor.value, seen);
-				if (typeof val === "function") {
-					if (!descriptor.configurable && !descriptor.writable || /^class[\s{]/.test(Function.prototype.toString.call(val))) return val;
-					const cached = methodCache.get(key);
-					if (cached != null && cached.fn === val) return cached.wrapper;
-					const wrapper = function(...args) {
-						if (this !== proxy) return stripPlaceholderValues(val.apply(this, args), seen);
-						return callMethodOnSanitizedTarget(val, proxy, target, args, stripPlaceholderValues, seen);
-					};
-					methodCache.set(key, {
-						fn: val,
-						wrapper
-					});
-					return wrapper;
-				}
-				return val;
-			}
-			let isAccessor = false;
-			for (let proto = target; proto != null; proto = Object.getPrototypeOf(proto)) {
-				const d = Object.getOwnPropertyDescriptor(proto, key);
-				if (d != null) {
-					isAccessor = "get" in d;
+		if (hasMatchingKey) {
+			const isArray = Array.isArray(parsed);
+			let allDeferred = true;
+			for (const key of ownKeys) {
+				if (isArray && key === "length") continue;
+				const desc = Object.getOwnPropertyDescriptor(parsed, key);
+				if (desc != null && "value" in desc && getDeferredEntry(key) === void 0) {
+					allDeferred = false;
 					break;
 				}
 			}
-			const result = Reflect.get(target, key, receiver);
-			if (typeof result === "function") {
-				if (/^class[\s{]/.test(Function.prototype.toString.call(result))) return result;
-				if (!isAccessor) {
-					const cached = methodCache.get(key);
-					if (cached != null && cached.fn === result) return cached.wrapper;
-					const wrapper = function(...args) {
-						if (this !== proxy) return stripPlaceholderValues(result.apply(this, args), seen);
-						return callMethodOnSanitizedTarget(result, proxy, target, args, stripPlaceholderValues, seen);
-					};
-					methodCache.set(key, {
-						fn: result,
-						wrapper
-					});
-					return wrapper;
-				}
-				return function(...args) {
-					if (this !== proxy) return stripPlaceholderValues(result.apply(this, args), seen);
-					return callMethodOnSanitizedTarget(result, proxy, target, args, stripPlaceholderValues, seen);
-				};
+			if (allDeferred) return void 0;
+			const clone = isArray ? new Array(parsed.length) : Object.create(Object.getPrototypeOf(parsed));
+			for (const key of ownKeys) {
+				const desc = Object.getOwnPropertyDescriptor(parsed, key);
+				if (desc == null) continue;
+				const entry = getDeferredEntry(key);
+				if ("value" in desc && entry !== void 0) if (entry === null) Object.defineProperty(clone, key, {
+					...desc,
+					value: void 0
+				});
+				else Object.defineProperty(clone, key, {
+					...desc,
+					value: prepareParsedForContexts(desc.value, true, entry)
+				});
+				else Object.defineProperty(clone, key, desc);
 			}
-			return stripPlaceholderValues(result, seen);
-		},
-		getOwnPropertyDescriptor(target, key) {
-			const descriptor = Object.getOwnPropertyDescriptor(target, key);
-			if (descriptor == null || !("value" in descriptor)) return descriptor;
-			if (!descriptor.configurable && !descriptor.writable) return descriptor;
-			return {
-				...descriptor,
-				value: stripPlaceholderValues(descriptor.value, seen)
-			};
+			return clone;
 		}
-	});
-	seen.set(value$1, proxy);
-	return proxy;
-}
-function prepareParsedForContexts(parsed) {
-	if (parsed == null || typeof parsed !== "object") return stripPlaceholderValues(parsed);
-	if (require_context.isPlaceholderValue(parsed)) return void 0;
-	if (Array.isArray(parsed) || isPlainObject(parsed) || parsed instanceof Set || parsed instanceof Map) {
-		if (!containsPlaceholderValues(parsed)) return parsed;
-		return stripPlaceholderValues(parsed);
+		return void 0;
 	}
-	if (!containsPlaceholderValues(parsed)) return parsed;
-	return createSanitizedNonPlainView(parsed, /* @__PURE__ */ new WeakMap());
+	if (parsed == null || typeof parsed !== "object") return void 0;
+	return parsed;
 }
 function withPreparedParsedForContext(context, preparedParsed, run) {
 	return run(finalizeParsedForContext(context, preparedParsed));
@@ -1210,9 +1000,9 @@ async function collectPhase1Annotations(contexts, options) {
 * @param options Optional context-required options to pass to each context.
 * @returns Promise that resolves to merged annotations.
 */
-async function collectAnnotations(contexts, parsed, options) {
+async function collectAnnotations(contexts, parsed, options, deferred, deferredKeys) {
 	const annotationsList = [];
-	const preparedParsed = prepareParsedForContexts(parsed);
+	const preparedParsed = prepareParsedForContexts(parsed, deferred, deferredKeys);
 	for (const context of contexts) {
 		const mergedAnnotations = await withPreparedParsedForContext(context, preparedParsed, async (contextParsed) => {
 			const result = context.getAnnotations(contextParsed, options);
@@ -1273,9 +1063,9 @@ function needsTwoPhaseContext(context, result) {
 * @returns Merged annotations.
 * @throws Error if any context returns a Promise.
 */
-function collectAnnotationsSync(contexts, parsed, options) {
+function collectAnnotationsSync(contexts, parsed, options, deferred, deferredKeys) {
 	const annotationsList = [];
-	const preparedParsed = prepareParsedForContexts(parsed);
+	const preparedParsed = prepareParsedForContexts(parsed, deferred, deferredKeys);
 	for (const context of contexts) {
 		const mergedAnnotations = withPreparedParsedForContext(context, preparedParsed, (contextParsed) => {
 			const result = context.getAnnotations(contextParsed, options);
@@ -1401,14 +1191,19 @@ async function runWith(parser, programName, contexts, options) {
 		}
 		const augmentedParser1 = injectAnnotationsIntoParser(parser, phase1Annotations);
 		let firstPassResult;
+		let firstPassDeferred;
+		let firstPassDeferredKeys;
 		let firstPassFailed = false;
 		try {
 			if (parser.$mode === "async") firstPassResult = await require_parser.parseAsync(augmentedParser1, args);
 			else firstPassResult = require_parser.parseSync(augmentedParser1, args);
 			if (typeof firstPassResult === "object" && firstPassResult !== null && "success" in firstPassResult) {
 				const result = firstPassResult;
-				if (result.success) firstPassResult = result.value;
-				else firstPassFailed = true;
+				if (result.success) {
+					firstPassResult = result.value;
+					firstPassDeferred = result.deferred;
+					firstPassDeferredKeys = result.deferredKeys;
+				} else firstPassFailed = true;
 			}
 		} catch {
 			firstPassFailed = true;
@@ -1418,7 +1213,7 @@ async function runWith(parser, programName, contexts, options) {
 			if (parser.$mode === "async") return runParser(augmentedParser, programName, args, options);
 			return Promise.resolve(runParser(augmentedParser, programName, args, options));
 		}
-		const { annotationsList: phase2AnnotationsList } = await collectAnnotations(contexts, firstPassResult, ctxOptions);
+		const { annotationsList: phase2AnnotationsList } = await collectAnnotations(contexts, firstPassResult, ctxOptions, firstPassDeferred, firstPassDeferredKeys);
 		const finalAnnotations = mergeTwoPhaseAnnotations(phase1AnnotationsList, phase2AnnotationsList);
 		const augmentedParser2 = injectAnnotationsIntoParser(parser, finalAnnotations);
 		if (parser.$mode === "async") return runParser(augmentedParser2, programName, args, options);
@@ -1461,14 +1256,19 @@ function runWithSync(parser, programName, contexts, options) {
 		}
 		const augmentedParser1 = injectAnnotationsIntoParser(parser, phase1Annotations);
 		let firstPassResult;
+		let firstPassDeferred;
+		let firstPassDeferredKeys;
 		try {
 			const result = require_parser.parseSync(augmentedParser1, args);
-			if (result.success) firstPassResult = result.value;
-			else return runParser(augmentedParser1, programName, args, options);
+			if (result.success) {
+				firstPassResult = result.value;
+				firstPassDeferred = result.deferred;
+				firstPassDeferredKeys = result.deferredKeys;
+			} else return runParser(augmentedParser1, programName, args, options);
 		} catch {
 			return runParser(augmentedParser1, programName, args, options);
 		}
-		const { annotationsList: phase2AnnotationsList } = collectAnnotationsSync(contexts, firstPassResult, ctxOptions);
+		const { annotationsList: phase2AnnotationsList } = collectAnnotationsSync(contexts, firstPassResult, ctxOptions, firstPassDeferred, firstPassDeferredKeys);
 		const finalAnnotations = mergeTwoPhaseAnnotations(phase1AnnotationsList, phase2AnnotationsList);
 		const augmentedParser2 = injectAnnotationsIntoParser(parser, finalAnnotations);
 		return runParser(augmentedParser2, programName, args, options);