@optique/config 1.0.0-dev.783 → 1.0.0-dev.885

package/dist/index.cjs

@@ -95,16 +95,143 @@ function containsDeferredPromptValues(value, seen = /* @__PURE__ */ new WeakSet(
 	}
 	return containsDeferredPromptValuesInOwnProperties(value, seen);
 }
+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
+		};
+		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 {}
+		}
+	}
+	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, seen) {
+	const methodCache = /* @__PURE__ */ new Map();
 	const proxy = new Proxy(value, {
 		get(target, key, receiver) {
 			const descriptor = Object.getOwnPropertyDescriptor(target, key);
-			if (descriptor != null && "value" in descriptor) return stripDeferredPromptValues(descriptor.value, seen);
-			return Reflect.get(target, key, receiver);
+			if (descriptor != null && "value" in descriptor) {
+				if (!descriptor.configurable && !descriptor.writable) return descriptor.value;
+				const val = stripDeferredPromptValues(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 stripDeferredPromptValues(val.apply(this, args), seen);
+						return callMethodOnSanitizedTarget(val, proxy, target, args, stripDeferredPromptValues, 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;
+					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 stripDeferredPromptValues(result.apply(this, args), seen);
+						return callMethodOnSanitizedTarget(result, proxy, target, args, stripDeferredPromptValues, seen);
+					};
+					methodCache.set(key, {
+						fn: result,
+						wrapper
+					});
+					return wrapper;
+				}
+				return function(...args) {
+					if (this !== proxy) return stripDeferredPromptValues(result.apply(this, args), seen);
+					return callMethodOnSanitizedTarget(result, proxy, target, args, stripDeferredPromptValues, seen);
+				};
+			}
+			return stripDeferredPromptValues(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: stripDeferredPromptValues(descriptor.value, seen)
@@ -435,11 +562,7 @@ function getConfigOrDefault(state, options) {
 		configMeta = getActiveConfigMeta(contextId);
 	}
 	let configValue;
-	if (configData !== void 0 && configData !== null) if (typeof options.key === "function") try {
-		configValue = options.key(configData, configMeta);
-	} catch {
-		configValue = void 0;
-	}
+	if (configData !== void 0 && configData !== null) if (typeof options.key === "function") configValue = options.key(configData, configMeta);
 	else configValue = configData[options.key];
 	if (configValue !== void 0) return {
 		success: true,

package/dist/index.js

@@ -72,16 +72,143 @@ function containsDeferredPromptValues(value, seen = /* @__PURE__ */ new WeakSet(
 	}
 	return containsDeferredPromptValuesInOwnProperties(value, seen);
 }
+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
+		};
+		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 {}
+		}
+	}
+	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, seen) {
+	const methodCache = /* @__PURE__ */ new Map();
 	const proxy = new Proxy(value, {
 		get(target, key, receiver) {
 			const descriptor = Object.getOwnPropertyDescriptor(target, key);
-			if (descriptor != null && "value" in descriptor) return stripDeferredPromptValues(descriptor.value, seen);
-			return Reflect.get(target, key, receiver);
+			if (descriptor != null && "value" in descriptor) {
+				if (!descriptor.configurable && !descriptor.writable) return descriptor.value;
+				const val = stripDeferredPromptValues(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 stripDeferredPromptValues(val.apply(this, args), seen);
+						return callMethodOnSanitizedTarget(val, proxy, target, args, stripDeferredPromptValues, 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;
+					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 stripDeferredPromptValues(result.apply(this, args), seen);
+						return callMethodOnSanitizedTarget(result, proxy, target, args, stripDeferredPromptValues, seen);
+					};
+					methodCache.set(key, {
+						fn: result,
+						wrapper
+					});
+					return wrapper;
+				}
+				return function(...args) {
+					if (this !== proxy) return stripDeferredPromptValues(result.apply(this, args), seen);
+					return callMethodOnSanitizedTarget(result, proxy, target, args, stripDeferredPromptValues, seen);
+				};
+			}
+			return stripDeferredPromptValues(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: stripDeferredPromptValues(descriptor.value, seen)
@@ -412,11 +539,7 @@ function getConfigOrDefault(state, options) {
 		configMeta = getActiveConfigMeta(contextId);
 	}
 	let configValue;
-	if (configData !== void 0 && configData !== null) if (typeof options.key === "function") try {
-		configValue = options.key(configData, configMeta);
-	} catch {
-		configValue = void 0;
-	}
+	if (configData !== void 0 && configData !== null) if (typeof options.key === "function") configValue = options.key(configData, configMeta);
 	else configValue = configData[options.key];
 	if (configValue !== void 0) return {
 		success: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/config",
-  "version": "1.0.0-dev.783+64de3665",
+  "version": "1.0.0-dev.885+3300ebe1",
   "description": "Configuration file support for Optique with Standard Schema validation",
   "keywords": [
     "CLI",
@@ -59,7 +59,7 @@
     "@standard-schema/spec": "^1.1.0"
   },
   "dependencies": {
-    "@optique/core": "1.0.0-dev.783+64de3665"
+    "@optique/core": "1.0.0-dev.885+3300ebe1"
   },
   "devDependencies": {
     "@standard-schema/spec": "^1.1.0",
@@ -67,7 +67,7 @@
     "tsdown": "^0.13.0",
     "typescript": "^5.8.3",
     "zod": "^3.25.0 || ^4.0.0",
-    "@optique/env": "1.0.0-dev.783+64de3665"
+    "@optique/env": "1.0.0-dev.885+3300ebe1"
   },
   "scripts": {
     "build": "tsdown",