@nanoforge-dev/editor 0.0.2-beta.7f94b8f → 0.0.2-beta.82a2d26

package/dist/server/chunks/{schemas-CAs9LqPk.js → schemas-l8C4cVM-.js}

@@ -1,9 +1,9 @@
 import { n as __exportAll, r as __toESM, t as __commonJSMin } from "./chunk-ByNZkrT6.js";
-import { $ as onDestroy, Ct as clsx, D as ensure_array_like, M as get$1, P as getContext, St as writable, T as derived$1, bt as unsubscribe_stores, ct as setContext, dt as spread_props, ft as store_get, g as bind_props, gt as tick, h as attributes, it as readonly$1, k as escape_html, p as attr_class, tt as props_id, w as derived, y as clsx$1 } from "./events-Bhh2w-5S.js";
-import { Q as stringify$1, f as fromStore } from "./internal2-BH90KZDG.js";
-import "./exports-CWOtdr_a.js";
-import { i as invalidateAll, n as applyAction, t as afterNavigate } from "./client-C2VsBptx.js";
-import { $ as createBitsAttrs, H as StyleToObject, I as Select, K as attachRef, L as Select_content, Q as cn, R as Select_item, U as Switch$1, W as Switch_thumb, X as boxWith$1, dt as mergeProps$1, et as createId, nt as deserialize, rt as enhance, z as Select_trigger } from "./error-DWpaxupR.js";
+import { C as escape_html, K as props_id, O as getContext, S as ensure_array_like, T as get, W as onDestroy, Y as readonly$1, b as derived$1, c as attr_class, d as bind_props, dt as clsx, et as setContext, it as store_get, lt as unsubscribe_stores, m as clsx$1, ot as tick, rt as spread_props, u as attributes, ut as writable, y as derived } from "./index-server-BthNUqCR.js";
+import { Q as stringify$1, f as fromStore } from "./internal2-DhEJvRRa.js";
+import "./exports-D0uQzbjy.js";
+import { i as invalidateAll, n as applyAction, t as afterNavigate } from "./client-DBcQyXdV.js";
+import { $ as createBitsAttrs, H as StyleToObject, I as Select, K as attachRef, L as Select_content, Q as cn, R as Select_item, U as Switch$1, W as Switch_thumb, X as boxWith$1, dt as mergeProps$1, et as createId, nt as deserialize, rt as enhance, z as Select_trigger } from "./error-dHCCrW4T.js";
 //#region node_modules/.pnpm/zod@4.4.3/node_modules/zod/v4/core/core.js
 var _a$1;
 function $constructor(name, initializer, params) {
@@ -434,7 +434,7 @@ const _parse = (_Err) => (schema, value, _ctx, _params) => {
 	}, ctx);
 	if (result instanceof Promise) throw new $ZodAsyncError();
 	if (result.issues.length) {
-		const e = new (_params?.Err ?? _Err)(result.issues.map((iss) => finalizeIssue(iss, ctx, config())));
+		const e = new ((_params?.Err) ?? _Err)(result.issues.map((iss) => finalizeIssue(iss, ctx, config())));
 		captureStackTrace(e, _params?.callee);
 		throw e;
 	}
@@ -451,7 +451,7 @@ const _parseAsync = (_Err) => async (schema, value, _ctx, params) => {
 	}, ctx);
 	if (result instanceof Promise) result = await result;
 	if (result.issues.length) {
-		const e = new (params?.Err ?? _Err)(result.issues.map((iss) => finalizeIssue(iss, ctx, config())));
+		const e = new ((params?.Err) ?? _Err)(result.issues.map((iss) => finalizeIssue(iss, ctx, config())));
 		captureStackTrace(e, params?.callee);
 		throw e;
 	}
@@ -5289,7 +5289,7 @@ function superForm(form, formOptions) {
 		};
 		form = form;
 		const _initialFormId = form.id = options.id ?? form.id;
-		const _currentPage = get$1(page) ?? (STORYBOOK_MODE ? {} : void 0);
+		const _currentPage = get(page) ?? (STORYBOOK_MODE ? {} : void 0);
 		/**
 		* Need to clone the form data, in case it's used to populate multiple forms
 		* and in components that are mounted and destroyed multiple times.
@@ -5428,7 +5428,7 @@ function superForm(form, formOptions) {
 				fieldProxy({ form: Form$2 }, path, options).set(value);
 			},
 			get(path) {
-				return get$1(fieldProxy(Form$2, path));
+				return get(fieldProxy(Form$2, path));
 			}
 		};
 		else changeEvent = {
@@ -5438,7 +5438,7 @@ function superForm(form, formOptions) {
 				fieldProxy({ form: Form$2 }, path, options).set(value);
 			},
 			get(path) {
-				return get$1(fieldProxy(Form$2, path));
+				return get(fieldProxy(Form$2, path));
 			}
 		};
 		options.onChange(changeEvent);
@@ -5520,7 +5520,7 @@ function superForm(form, formOptions) {
 			if (isEventError && options.validationMethod == "oninput") return addError();
 			if (immediate && !multiple && isEventError) return addError();
 			if (multiple) {
-				const errorPath = pathExists(get$1(Errors), error.path.slice(0, -1));
+				const errorPath = pathExists(get(Errors), error.path.slice(0, -1));
 				if (errorPath?.value && typeof errorPath?.value == "object") {
 					for (const errors of Object.values(errorPath.value)) if (Array.isArray(errors)) return addError();
 				}
@@ -5784,7 +5784,7 @@ function superForm(form, formOptions) {
 		__data.valid = form.valid;
 		if (options.flashMessage && shouldSyncFlash(options)) {
 			const flash = options.flashMessage.module.getFlash(page);
-			if (message && get$1(flash) === void 0) flash.set(message);
+			if (message && get(flash) === void 0) flash.set(message);
 		}
 	}
 	const formEvents = {
@@ -6814,41 +6814,10 @@ function IsKind(value, kind) {
 function IsSchema(value) {
 	return IsObject$1(value);
 }
-/** Creates an OptionalAddAction. */
-function OptionalAddAction(type) {
-	return Create({ ["~kind"]: "OptionalAddAction" }, { type }, {});
-}
-/** Returns true if this value is a OptionalAddAction. */
-function IsOptionalAddAction(value) {
-	return IsObject$1(value) && HasPropertyKey(value, "~kind") && HasPropertyKey(value, "type") && IsEqual(value["~kind"], "OptionalAddAction") && IsSchema(value.type);
-}
-/** Creates a OptionalRemoveAction. */
-function OptionalRemoveAction(type) {
-	return Create({ ["~kind"]: "OptionalRemoveAction" }, { type }, {});
-}
-/** Returns true if this value is a OptionalRemoveAction. */
-function IsOptionalRemoveAction(value) {
-	return IsObject$1(value) && HasPropertyKey(value, "~kind") && HasPropertyKey(value, "type") && IsEqual(value["~kind"], "OptionalRemoveAction") && IsSchema(value.type);
-}
-/** Creates a ReadonlyAddAction. */
-function ReadonlyAddAction(type) {
-	return Create({ ["~kind"]: "ReadonlyAddAction" }, { type }, {});
-}
-/** Returns true if this value is a ReadonlyAddAction. */
-function IsReadonlyAddAction(value) {
-	return IsObject$1(value) && HasPropertyKey(value, "~kind") && HasPropertyKey(value, "type") && IsEqual(value["~kind"], "ReadonlyAddAction") && IsSchema(value.type);
-}
-/** Creates a ReadonlyRemoveAction. */
-function ReadonlyRemoveAction(type) {
-	return Create({ ["~kind"]: "ReadonlyRemoveAction" }, { type }, {});
-}
-/** Returns true if this value is a ReadonlyRemoveAction. */
-function IsReadonlyRemoveAction(value) {
-	return IsObject$1(value) && HasPropertyKey(value, "~kind") && HasPropertyKey(value, "type") && IsEqual(value["~kind"], "ReadonlyRemoveAction") && IsSchema(value.type);
-}
 /** Creates a Deferred action. */
 function Deferred(action, parameters, options) {
 	return Create({ "~kind": "Deferred" }, {
+		type: "deferred",
 		action,
 		parameters,
 		options
@@ -6858,73 +6827,6 @@ function Deferred(action, parameters, options) {
 function IsDeferred(value) {
 	return IsKind(value, "Deferred");
 }
-/**
-* Creates a Promise type.
-*
-* @deprecated This type is being removed in the next version of TypeBox. A fallback will be provided under examples.
-*/
-function _Promise_(item, options) {
-	return Create({ ["~kind"]: "Promise" }, {
-		type: "promise",
-		item
-	}, options);
-}
-/** Returns true if the given type is TPromise. */
-function IsPromise(value) {
-	return IsKind(value, "Promise");
-}
-/** Extracts options from a TPromise. */
-function PromiseOptions(type) {
-	return Discard(type, [
-		"~kind",
-		"type",
-		"item"
-	]);
-}
-/** Adds Immutable to the given type. */
-function ImmutableAdd(type) {
-	return Update(type, { "~immutable": true }, {});
-}
-/** Applies an Immutable modifier to the given type. */
-function Immutable(type) {
-	return ImmutableAdd(type);
-}
-/** Returns true if the given value is a TImmutable */
-function IsImmutable(value) {
-	return IsSchema(value) && HasPropertyKey(value, "~immutable");
-}
-/** Removes Optional from the given type. */
-function OptionalRemove(type) {
-	return Discard(type, ["~optional"]);
-}
-/** Adds Optional to the given type. */
-function OptionalAdd(type) {
-	return Update(type, { "~optional": true }, {});
-}
-/** Applies an Optional modifier to the given type. */
-function Optional$2(type) {
-	return OptionalAdd(type);
-}
-/** Returns true if the given value is TOptional */
-function IsOptional(value) {
-	return IsSchema(value) && HasPropertyKey(value, "~optional");
-}
-/** Removes a Readonly property modifier from the given type. */
-function ReadonlyRemove(type) {
-	return Discard(type, ["~readonly"]);
-}
-/** Adds a Readonly property modifier to the given type. */
-function ReadonlyAdd(type) {
-	return Update(type, { "~readonly": true }, {});
-}
-/** Applies an Readonly property modifier to the given type. */
-function Readonly$1(type) {
-	return ReadonlyAdd(type);
-}
-/** Returns true if the given value is a TReadonly */
-function IsReadonly(value) {
-	return IsSchema(value) && HasPropertyKey(value, "~readonly");
-}
 function BaseProperty(value) {
 	return {
 		enumerable: Get().enumerableKind,
@@ -7043,7 +6945,7 @@ function AsyncIteratorOptions(type) {
 	]);
 }
 /** Creates a Constructor type. */
-function Constructor$1(parameters, instanceType, options = {}) {
+function Constructor(parameters, instanceType, options = {}) {
 	return Create({ "~kind": "Constructor" }, {
 		type: "constructor",
 		parameters,
@@ -7121,6 +7023,31 @@ function Never(options) {
 function IsNever(value) {
 	return IsKind(value, "Never");
 }
+function AddOptionalOperation(type) {
+	return Update(type, { "~optional": true }, {});
+}
+function AddOptionalAction(type, options) {
+	return Update(AddOptionalOperation(type), {}, options);
+}
+function AddOptionalInstantiate(context, state, type, options) {
+	return AddOptionalAction(InstantiateType(context, state, type), options);
+}
+/** Creates a deferred AddOptional action. */
+function AddOptionalDeferred(type, options = {}) {
+	return Deferred("AddOptional", [type], options);
+}
+/** Applies an AddOptional action to a type. */
+function AddOptional(type, options = {}) {
+	return AddOptionalAction(type, options);
+}
+/** Applies an Optional modifier to the given type. */
+function Optional$2(type) {
+	return AddOptional(type);
+}
+/** Returns true if the given value is TOptional */
+function IsOptional(value) {
+	return IsSchema(value) && HasPropertyKey(value, "~optional");
+}
 /** Creates a RequiredArray derived from the given TProperties value. */
 function RequiredArray(properties) {
 	return Keys(properties).filter((key) => !IsOptional(properties[key]));
@@ -7347,6 +7274,39 @@ function Encode(type, callback) {
 function IsCodec(value) {
 	return IsSchema(value) && HasPropertyKey(value, "~codec") && IsObject$1(value["~codec"]) && HasPropertyKey(value["~codec"], "encode") && HasPropertyKey(value["~codec"], "decode");
 }
+/** Applies an Immutable modifier to the given type. */
+function Immutable(type) {
+	return AddImmutable(type);
+}
+/** Returns true if the given value is a TImmutable */
+function IsImmutable(value) {
+	return IsSchema(value) && HasPropertyKey(value, "~immutable");
+}
+function AddReadonlyOperation(type) {
+	return Update(type, { "~readonly": true }, {});
+}
+function AddReadonlyAction(type, options) {
+	return Update(AddReadonlyOperation(type), {}, options);
+}
+function AddReadonlyInstantiate(context, state, type, options) {
+	return AddReadonlyAction(InstantiateType(context, state, type), options);
+}
+/** Creates a deferred AddReadonly action. */
+function AddReadonlyDeferred(type, options = {}) {
+	return Deferred("AddReadonly", [type], options);
+}
+/** Applies an AddReadonly action to a type. */
+function AddReadonly(type, options = {}) {
+	return AddReadonlyAction(type, options);
+}
+/** Applies an Readonly property modifier to the given type. */
+function Readonly$1(type) {
+	return AddReadonly(type);
+}
+/** Returns true if the given value is a TReadonly */
+function IsReadonly(value) {
+	return IsSchema(value) && HasPropertyKey(value, "~readonly");
+}
 /** Applies a Refine check to the given type. */
 function RefineAdd(type, refinement) {
 	return Update(type, { "~refine": IsRefine(type) ? [...type["~refine"], refinement] : [refinement] }, {});
@@ -7452,7 +7412,7 @@ function LiteralTypeName(value) {
 	})();
 }
 /** Creates a Literal type. */
-function Literal$1(value, options) {
+function Literal(value, options) {
 	return Create({ "~kind": "Literal" }, {
 		type: LiteralTypeName(value),
 		const: value
@@ -7528,6 +7488,29 @@ function Parameter$1(...args) {
 function IsParameter(value) {
 	return IsKind(value, "Parameter");
 }
+/**
+* Creates a Promise type.
+*
+* @deprecated This type is being removed in the next version of TypeBox. A fallback will be provided under examples.
+*/
+function _Promise_(item, options) {
+	return Create({ ["~kind"]: "Promise" }, {
+		type: "promise",
+		item
+	}, options);
+}
+/** Returns true if the given type is TPromise. */
+function IsPromise(value) {
+	return IsKind(value, "Promise");
+}
+/** Extracts options from a TPromise. */
+function PromiseOptions(type) {
+	return Discard(type, [
+		"~kind",
+		"type",
+		"item"
+	]);
+}
 /** Creates a String type. */
 function String$2(options) {
 	return Create({ "~kind": "String" }, { type: "string" }, options);
@@ -7579,7 +7562,7 @@ function DecodeFromSpan(variants, types) {
 	return TakeLeft(types, (left, right) => DecodeFromSpan(FromType$16(variants, left), right), () => variants);
 }
 function VariantsToLiterals(variants) {
-	return variants.map((variant) => Literal$1(variant));
+	return variants.map((variant) => Literal(variant));
 }
 function DecodeTypesAsUnion(types) {
 	return Union(VariantsToLiterals(DecodeFromSpan([], types)));
@@ -7620,7 +7603,7 @@ function FromBooleanKey(value) {
 	});
 }
 /** Creates a Tuple type. */
-function Tuple$1(types, options = {}) {
+function Tuple(types, options = {}) {
 	const [items, minItems, additionalItems] = [
 		types,
 		types.length,
@@ -7647,6 +7630,40 @@ function TupleOptions(type) {
 		"additionalItems"
 	]);
 }
+function RemoveReadonlyOperation(type) {
+	return Discard(type, ["~readonly"]);
+}
+function RemoveReadonlyAction(type, options) {
+	return Update(RemoveReadonlyOperation(type), {}, options);
+}
+function RemoveReadonlyInstantiate(context, state, type, options) {
+	return RemoveReadonlyAction(InstantiateType(context, state, type), options);
+}
+/** Creates a deferred RemoveReadonly action. */
+function RemoveReadonlyDeferred(type, options = {}) {
+	return Deferred("RemoveReadonly", [type], options);
+}
+/** Applies an RemoveReadonly action to a type. */
+function RemoveReadonly(type, options = {}) {
+	return RemoveReadonlyAction(type, options);
+}
+function RemoveOptionalOperation(type) {
+	return Discard(type, ["~optional"]);
+}
+function RemoveOptionalAction(type, options) {
+	return Update(RemoveOptionalOperation(type), {}, options);
+}
+function RemoveOptionalInstantiate(context, state, type, options) {
+	return RemoveOptionalAction(InstantiateType(context, state, type), options);
+}
+/** Creates a deferred RemoveOptional action. */
+function RemoveOptionalDeferred(type, options = {}) {
+	return Deferred("RemoveOptional", [type], options);
+}
+/** Applies an RemoveOptional action to a type. */
+function RemoveOptional(type, options = {}) {
+	return RemoveOptionalAction(type, options);
+}
 function TupleElementsToProperties(types) {
 	return types.reduceRight((result, right, index) => {
 		return {
@@ -7667,8 +7684,8 @@ function IsOptionalProperty(left, right) {
 function CompositeProperty(left, right) {
 	const isReadonly = IsReadonlyProperty(left, right);
 	const isOptional = IsOptionalProperty(left, right);
-	const property = ReadonlyRemove(OptionalRemove(EvaluateIntersect([left, right])));
-	return isReadonly && isOptional ? ReadonlyAdd(OptionalAdd(property)) : isReadonly && !isOptional ? ReadonlyAdd(property) : !isReadonly && isOptional ? OptionalAdd(property) : property;
+	const property = RemoveReadonly(RemoveOptional(EvaluateIntersect([left, right])));
+	return isReadonly && isOptional ? AddReadonly(AddOptional(property)) : isReadonly && !isOptional ? AddReadonly(property) : !isReadonly && isOptional ? AddOptional(property) : property;
 }
 function CompositePropertyKey(left, right, key) {
 	return key in left ? key in right ? CompositeProperty(left[key], right[key]) : left[key] : key in right ? right[key] : Never();
@@ -7732,7 +7749,7 @@ function EvaluateDependent(if_, then_, else_) {
 	return EvaluateUnion([Intersect([if_, then_]), ExcludeOperation(else_, if_)]);
 }
 function EvaluateEnum(values) {
-	return EvaluateUnion(values.map((value) => Literal$1(value)));
+	return EvaluateUnion(values.map((value) => Literal(value)));
 }
 function EvaluateIntersect(types) {
 	return Broaden(Distribute$1(types));
@@ -7964,14 +7981,23 @@ function KeywordVoidMapping(input) {
 function KeywordThisMapping(input) {
 	return This();
 }
-function KeywordMapping(input) {
-	return input;
+function LiteralBigIntMapping(input) {
+	return Literal(BigInt(input));
+}
+function LiteralBooleanMapping(input) {
+	return Literal(IsEqual(input, "true"));
+}
+function LiteralNumberMapping(input) {
+	return Literal(parseFloat(input));
+}
+function LiteralStringMapping(input) {
+	return Literal(input);
 }
 function TemplateInterpolateMapping(input) {
 	return input[1];
 }
 function TemplateSpanMapping(input) {
-	return Literal$1(input);
+	return Literal(input);
 }
 function TemplateBodyMapping(input) {
 	return IsEqual(input.length, 3) ? [
@@ -7986,20 +8012,8 @@ function TemplateLiteralTypesMapping(input) {
 function TemplateLiteralMapping(input) {
 	return TemplateLiteralDeferred(input);
 }
-function LiteralBigIntMapping(input) {
-	return Literal$1(BigInt(input));
-}
-function LiteralBooleanMapping(input) {
-	return Literal$1(IsEqual(input, "true"));
-}
-function LiteralNumberMapping(input) {
-	return Literal$1(parseFloat(input));
-}
-function LiteralStringMapping(input) {
-	return Literal$1(input);
-}
-function LiteralMapping(input) {
-	return input;
+function DependentMapping(input) {
+	return IsEqual(input.length, 6) ? Dependent$1(input[1], input[3], input[5]) : Dependent$1(input[1], input[3], Unknown());
 }
 function KeyOfMapping(input) {
 	return input.length > 0;
@@ -8062,7 +8076,7 @@ function ExprMapping(input) {
 	return ExprBinaryMapping(left, rest);
 }
 function ExprReadonlyMapping(input) {
-	return ImmutableAdd(input[1]);
+	return AddImmutableDeferred(input[1]);
 }
 function ExprPipeMapping(input) {
 	return input[1];
@@ -8099,7 +8113,7 @@ function OptionalMapping(input) {
 }
 function PropertyMapping(input) {
 	const [isReadonly, key, isOptional, _colon, type] = input;
-	return { [key]: isReadonly && isOptional ? ReadonlyAdd(OptionalAdd(type)) : isReadonly && !isOptional ? ReadonlyAdd(type) : !isReadonly && isOptional ? OptionalAdd(type) : type };
+	return { [key]: isReadonly && isOptional ? AddReadonlyDeferred(AddOptionalDeferred(type)) : isReadonly && !isOptional ? AddReadonlyDeferred(type) : !isReadonly && isOptional ? AddOptionalDeferred(type) : type };
 }
 function PropertyDelimiterMapping(input) {
 	return input;
@@ -8120,16 +8134,16 @@ function _Object_Mapping(input) {
 	return _Object_$1(properties, IsEqual(Keys(patternProperties).length, 0) ? {} : { patternProperties });
 }
 function ElementNamedMapping(input) {
-	return IsEqual(input.length, 5) ? ReadonlyAdd(OptionalAdd(input[4])) : IsEqual(input.length, 3) ? input[2] : IsEqual(input.length, 4) ? IsEqual(input[2], "readonly") ? ReadonlyAdd(input[3]) : OptionalAdd(input[3]) : Unreachable();
+	return IsEqual(input.length, 5) ? AddReadonlyDeferred(AddOptionalDeferred(input[4])) : IsEqual(input.length, 3) ? input[2] : IsEqual(input.length, 4) ? IsEqual(input[2], "readonly") ? AddReadonlyDeferred(input[3]) : AddOptionalDeferred(input[3]) : Unreachable();
 }
 function ElementReadonlyOptionalMapping(input) {
-	return ReadonlyAdd(OptionalAdd(input[1]));
+	return AddReadonlyDeferred(AddOptionalDeferred(input[1]));
 }
 function ElementReadonlyMapping(input) {
-	return ReadonlyAdd(input[1]);
+	return AddReadonlyDeferred(input[1]);
 }
 function ElementOptionalMapping(input) {
-	return OptionalAdd(input[0]);
+	return AddOptionalDeferred(input[0]);
 }
 function ElementBaseMapping(input) {
 	return input;
@@ -8140,17 +8154,17 @@ function ElementMapping(input) {
 function ElementListMapping(input) {
 	return Delimited(input);
 }
-function TupleMapping(input) {
-	return Tuple$1(input[1]);
+function _Tuple_Mapping(input) {
+	return Tuple(input[1]);
 }
 function ParameterReadonlyOptionalMapping(input) {
-	return ReadonlyAdd(OptionalAdd(input[4]));
+	return AddReadonlyDeferred(AddOptionalDeferred(input[4]));
 }
 function ParameterReadonlyMapping(input) {
-	return ReadonlyAdd(input[3]);
+	return AddReadonlyDeferred(input[3]);
 }
 function ParameterOptionalMapping(input) {
-	return OptionalAdd(input[3]);
+	return AddOptionalDeferred(input[3]);
 }
 function ParameterTypeMapping(input) {
 	return input[2];
@@ -8167,17 +8181,17 @@ function ParameterListMapping(input) {
 function _Function_Mapping(input) {
 	return _Function_$1(input[1], input[4]);
 }
-function ConstructorMapping(input) {
-	return Constructor$1(input[2], input[5]);
+function _Constructor_Mapping(input) {
+	return Constructor(input[2], input[5]);
 }
-function ApplyReadonly$1(state, type) {
-	return IsEqual(state, "remove") ? ReadonlyRemoveAction(type) : IsEqual(state, "add") ? ReadonlyAddAction(type) : type;
+function ApplyReadonly(state, type) {
+	return IsEqual(state, "remove") ? RemoveReadonlyDeferred(type) : IsEqual(state, "add") ? AddReadonlyDeferred(type) : type;
 }
 function MappedReadonlyMapping(input) {
 	return IsEqual(input.length, 2) && IsEqual(input[0], "-") ? "remove" : IsEqual(input.length, 2) && IsEqual(input[0], "+") ? "add" : IsEqual(input.length, 1) ? "add" : "none";
 }
-function ApplyOptional$1(state, type) {
-	return IsEqual(state, "remove") ? OptionalRemoveAction(type) : IsEqual(state, "add") ? OptionalAddAction(type) : type;
+function ApplyOptional(state, type) {
+	return IsEqual(state, "remove") ? RemoveOptionalDeferred(type) : IsEqual(state, "add") ? AddOptionalDeferred(type) : type;
 }
 function MappedOptionalMapping(input) {
 	return IsEqual(input.length, 2) && IsEqual(input[0], "-") ? "remove" : IsEqual(input.length, 2) && IsEqual(input[0], "+") ? "add" : IsEqual(input.length, 1) ? "add" : "none";
@@ -8185,48 +8199,48 @@ function MappedOptionalMapping(input) {
 function MappedAsMapping(input) {
 	return IsEqual(input.length, 2) ? [input[1]] : [];
 }
-function MappedMapping(input) {
-	return IsArray$1(input[6]) && IsEqual(input[6].length, 1) ? MappedDeferred(Identifier(input[3]), input[5], input[6][0], ApplyReadonly$1(input[1], ApplyOptional$1(input[8], input[10]))) : MappedDeferred(Identifier(input[3]), input[5], Ref(input[3]), ApplyReadonly$1(input[1], ApplyOptional$1(input[8], input[10])));
-}
-function DependentMapping(input) {
-	return IsEqual(input.length, 6) ? Dependent$1(input[1], input[3], input[5]) : Dependent$1(input[1], input[3], Unknown());
+function _Mapped_Mapping(input) {
+	return IsArray$1(input[6]) && IsEqual(input[6].length, 1) ? MappedDeferred(Identifier(input[3]), input[5], input[6][0], ApplyReadonly(input[1], ApplyOptional(input[8], input[10]))) : MappedDeferred(Identifier(input[3]), input[5], Ref(input[3]), ApplyReadonly(input[1], ApplyOptional(input[8], input[10])));
 }
 function ReferenceMapping(input) {
 	return Ref(input);
 }
-function JsonNumberMapping(input) {
+function WithBigIntMapping(input) {
+	return BigInt(input);
+}
+function WithNumberMapping(input) {
 	return parseFloat(input);
 }
-function JsonBooleanMapping(input) {
+function WithBooleanMapping(input) {
 	return IsEqual(input, "true");
 }
-function JsonStringMapping(input) {
+function WithStringMapping(input) {
 	return input;
 }
-function JsonNullMapping(input) {
+function WithNullMapping(input) {
 	return null;
 }
-function JsonPropertyMapping(input) {
+function WithPropertyMapping(input) {
 	return { [input[0]]: input[2] };
 }
-function JsonPropertyListMapping(input) {
+function WithPropertyListMapping(input) {
 	return Delimited(input);
 }
-function JsonObjectMappingReduce(propertyList) {
+function WithObjectMappingReduce(propertyList) {
 	return propertyList.reduce((result, left) => {
 		return Assign(result, left);
 	}, {});
 }
-function JsonObjectMapping(input) {
-	return JsonObjectMappingReduce(input[1]);
+function WithObjectMapping(input) {
+	return WithObjectMappingReduce(input[1]);
 }
-function JsonElementListMapping(input) {
+function WithElementListMapping(input) {
 	return Delimited(input);
 }
-function JsonArrayMapping(input) {
+function WithArrayMapping(input) {
 	return input[1];
 }
-function JsonMapping(input) {
+function WithValueMapping(input) {
 	return input;
 }
 function PatternBigIntMapping(input) {
@@ -8245,7 +8259,7 @@ function PatternNeverMapping(input) {
 	return Never();
 }
 function PatternTextMapping(input) {
-	return Literal$1(input);
+	return Literal(input);
 }
 function PatternBaseMapping(input) {
 	return input;
@@ -8542,7 +8556,6 @@ var KeywordNever = (input) => If(Const("never", input), ([_0, input]) => [Keywor
 var KeywordSymbol = (input) => If(Const("symbol", input), ([_0, input]) => [KeywordSymbolMapping(_0), input]);
 var KeywordVoid = (input) => If(Const("void", input), ([_0, input]) => [KeywordVoidMapping(_0), input]);
 var KeywordThis = (input) => If(Const("this", input), ([_0, input]) => [KeywordThisMapping(_0), input]);
-var Keyword = (input) => If(If(KeywordString(input), ([_0, input]) => [_0, input], () => If(KeywordNumber(input), ([_0, input]) => [_0, input], () => If(KeywordBoolean(input), ([_0, input]) => [_0, input], () => If(KeywordUndefined(input), ([_0, input]) => [_0, input], () => If(KeywordNull(input), ([_0, input]) => [_0, input], () => If(KeywordInteger(input), ([_0, input]) => [_0, input], () => If(KeywordBigInt(input), ([_0, input]) => [_0, input], () => If(KeywordUnknown(input), ([_0, input]) => [_0, input], () => If(KeywordAny(input), ([_0, input]) => [_0, input], () => If(KeywordObject(input), ([_0, input]) => [_0, input], () => If(KeywordNever(input), ([_0, input]) => [_0, input], () => If(KeywordSymbol(input), ([_0, input]) => [_0, input], () => If(KeywordVoid(input), ([_0, input]) => [_0, input], () => If(KeywordThis(input), ([_0, input]) => [_0, input], () => [])))))))))))))), ([_0, input]) => [KeywordMapping(_0), input]);
 var TemplateInterpolate = (input) => If(If(Const("${", input), ([_0, input]) => If(Type(input), ([_1, input]) => If(Const("}", input), ([_2, input]) => [[
 	_0,
 	_1,
@@ -8560,11 +8573,23 @@ var TemplateLiteralTypes = (input) => If(If(Const("`", input), ([_0, input]) =>
 	_2
 ], input]))), ([_0, input]) => [TemplateLiteralTypesMapping(_0), input]);
 var TemplateLiteral$1 = (input) => If(TemplateLiteralTypes(input), ([_0, input]) => [TemplateLiteralMapping(_0), input]);
+var Dependent = (input) => If(If(If(Const("if", input), ([_0, input]) => If(Type(input), ([_1, input]) => If(Const("then", input), ([_2, input]) => If(Type(input), ([_3, input]) => If(Const("else", input), ([_4, input]) => If(Type(input), ([_5, input]) => [[
+	_0,
+	_1,
+	_2,
+	_3,
+	_4,
+	_5
+], input])))))), ([_0, input]) => [_0, input], () => If(If(Const("if", input), ([_0, input]) => If(Type(input), ([_1, input]) => If(Const("then", input), ([_2, input]) => If(Type(input), ([_3, input]) => [[
+	_0,
+	_1,
+	_2,
+	_3
+], input])))), ([_0, input]) => [_0, input], () => [])), ([_0, input]) => [DependentMapping(_0), input]);
 var LiteralBigInt = (input) => If(BigInt$1(input), ([_0, input]) => [LiteralBigIntMapping(_0), input]);
 var LiteralBoolean = (input) => If(If(Const("true", input), ([_0, input]) => [_0, input], () => If(Const("false", input), ([_0, input]) => [_0, input], () => [])), ([_0, input]) => [LiteralBooleanMapping(_0), input]);
 var LiteralNumber = (input) => If(Number$1(input), ([_0, input]) => [LiteralNumberMapping(_0), input]);
 var LiteralString = (input) => If(String$1(["'", "\""], input), ([_0, input]) => [LiteralStringMapping(_0), input]);
-var Literal = (input) => If(If(LiteralBigInt(input), ([_0, input]) => [_0, input], () => If(LiteralBoolean(input), ([_0, input]) => [_0, input], () => If(LiteralNumber(input), ([_0, input]) => [_0, input], () => If(LiteralString(input), ([_0, input]) => [_0, input], () => [])))), ([_0, input]) => [LiteralMapping(_0), input]);
 var KeyOf$1 = (input) => If(If(If(Const("keyof", input), ([_0, input]) => [[_0], input]), ([_0, input]) => [_0, input], () => If([[], input], ([_0, input]) => [_0, input], () => [])), ([_0, input]) => [KeyOfMapping(_0), input]);
 var IndexArray_0 = (input, result = []) => If(If(If(Const("[", input), ([_0, input]) => If(Type(input), ([_1, input]) => If(Const("]", input), ([_2, input]) => [[
 	_0,
@@ -8584,8 +8609,8 @@ var Base = (input) => If(If(If(Const("(", input), ([_0, input]) => If(Type(input
 	_0,
 	_1,
 	_2
-], input]))), ([_0, input]) => [_0, input], () => If(Keyword(input), ([_0, input]) => [_0, input], () => If(_Object_(input), ([_0, input]) => [_0, input], () => If(Tuple(input), ([_0, input]) => [_0, input], () => If(TemplateLiteral$1(input), ([_0, input]) => [_0, input], () => If(Literal(input), ([_0, input]) => [_0, input], () => If(Constructor(input), ([_0, input]) => [_0, input], () => If(_Function_(input), ([_0, input]) => [_0, input], () => If(Mapped$1(input), ([_0, input]) => [_0, input], () => If(Dependent(input), ([_0, input]) => [_0, input], () => If(GenericCall(input), ([_0, input]) => [_0, input], () => If(Reference(input), ([_0, input]) => [_0, input], () => [])))))))))))), ([_0, input]) => [BaseMapping(_0), input]);
-var With$1 = (input) => If(If(If(Const("with", input), ([_0, input]) => If(JsonObject(input), ([_1, input]) => [[_0, _1], input])), ([_0, input]) => [_0, input], () => If([[], input], ([_0, input]) => [_0, input], () => [])), ([_0, input]) => [WithMapping(_0), input]);
+], input]))), ([_0, input]) => [_0, input], () => If(KeywordString(input), ([_0, input]) => [_0, input], () => If(KeywordNumber(input), ([_0, input]) => [_0, input], () => If(KeywordBoolean(input), ([_0, input]) => [_0, input], () => If(KeywordUndefined(input), ([_0, input]) => [_0, input], () => If(KeywordNull(input), ([_0, input]) => [_0, input], () => If(KeywordInteger(input), ([_0, input]) => [_0, input], () => If(KeywordBigInt(input), ([_0, input]) => [_0, input], () => If(KeywordUnknown(input), ([_0, input]) => [_0, input], () => If(KeywordAny(input), ([_0, input]) => [_0, input], () => If(KeywordObject(input), ([_0, input]) => [_0, input], () => If(KeywordNever(input), ([_0, input]) => [_0, input], () => If(KeywordSymbol(input), ([_0, input]) => [_0, input], () => If(KeywordVoid(input), ([_0, input]) => [_0, input], () => If(KeywordThis(input), ([_0, input]) => [_0, input], () => If(LiteralBigInt(input), ([_0, input]) => [_0, input], () => If(LiteralBoolean(input), ([_0, input]) => [_0, input], () => If(LiteralNumber(input), ([_0, input]) => [_0, input], () => If(LiteralString(input), ([_0, input]) => [_0, input], () => If(TemplateLiteral$1(input), ([_0, input]) => [_0, input], () => If(Dependent(input), ([_0, input]) => [_0, input], () => If(_Object_(input), ([_0, input]) => [_0, input], () => If(_Tuple_(input), ([_0, input]) => [_0, input], () => If(_Constructor_(input), ([_0, input]) => [_0, input], () => If(_Function_(input), ([_0, input]) => [_0, input], () => If(_Mapped_(input), ([_0, input]) => [_0, input], () => If(GenericCall(input), ([_0, input]) => [_0, input], () => If(Reference(input), ([_0, input]) => [_0, input], () => [])))))))))))))))))))))))))))), ([_0, input]) => [BaseMapping(_0), input]);
+var With$1 = (input) => If(If(If(Const("with", input), ([_0, input]) => If(WithObject(input), ([_1, input]) => [[_0, _1], input])), ([_0, input]) => [_0, input], () => If([[], input], ([_0, input]) => [_0, input], () => [])), ([_0, input]) => [WithMapping(_0), input]);
 var Factor = (input) => If(If(KeyOf$1(input), ([_0, input]) => If(Base(input), ([_1, input]) => If(IndexArray(input), ([_2, input]) => If(Extends$1(input), ([_3, input]) => If(With$1(input), ([_4, input]) => [[
 	_0,
 	_1,
@@ -8680,11 +8705,11 @@ var ElementBase = (input) => If(If(ElementNamed(input), ([_0, input]) => [_0, in
 var Element$1 = (input) => If(If(If(Const("...", input), ([_0, input]) => If(ElementBase(input), ([_1, input]) => [[_0, _1], input])), ([_0, input]) => [_0, input], () => If(If(ElementBase(input), ([_0, input]) => [[_0], input]), ([_0, input]) => [_0, input], () => [])), ([_0, input]) => [ElementMapping(_0), input]);
 var ElementList_0 = (input, result = []) => If(If(Element$1(input), ([_0, input]) => If(Const(",", input), ([_1, input]) => [[_0, _1], input])), ([_0, input]) => ElementList_0(input, [...result, _0]), () => [result, input]);
 var ElementList = (input) => If(If(ElementList_0(input), ([_0, input]) => If(If(If(Element$1(input), ([_0, input]) => [[_0], input]), ([_0, input]) => [_0, input], () => If([[], input], ([_0, input]) => [_0, input], () => [])), ([_1, input]) => [[_0, _1], input])), ([_0, input]) => [ElementListMapping(_0), input]);
-var Tuple = (input) => If(If(Const("[", input), ([_0, input]) => If(ElementList(input), ([_1, input]) => If(Const("]", input), ([_2, input]) => [[
+var _Tuple_ = (input) => If(If(Const("[", input), ([_0, input]) => If(ElementList(input), ([_1, input]) => If(Const("]", input), ([_2, input]) => [[
 	_0,
 	_1,
 	_2
-], input]))), ([_0, input]) => [TupleMapping(_0), input]);
+], input]))), ([_0, input]) => [_Tuple_Mapping(_0), input]);
 var ParameterReadonlyOptional = (input) => If(If(Ident(input), ([_0, input]) => If(Const("?", input), ([_1, input]) => If(Const(":", input), ([_2, input]) => If(Const("readonly", input), ([_3, input]) => If(Type(input), ([_4, input]) => [[
 	_0,
 	_1,
@@ -8720,18 +8745,18 @@ var _Function_ = (input) => If(If(Const("(", input), ([_0, input]) => If(Paramet
 	_3,
 	_4
 ], input]))))), ([_0, input]) => [_Function_Mapping(_0), input]);
-var Constructor = (input) => If(If(Const("new", input), ([_0, input]) => If(Const("(", input), ([_1, input]) => If(ParameterList(input), ([_2, input]) => If(Const(")", input), ([_3, input]) => If(Const("=>", input), ([_4, input]) => If(Type(input), ([_5, input]) => [[
+var _Constructor_ = (input) => If(If(Const("new", input), ([_0, input]) => If(Const("(", input), ([_1, input]) => If(ParameterList(input), ([_2, input]) => If(Const(")", input), ([_3, input]) => If(Const("=>", input), ([_4, input]) => If(Type(input), ([_5, input]) => [[
 	_0,
 	_1,
 	_2,
 	_3,
 	_4,
 	_5
-], input])))))), ([_0, input]) => [ConstructorMapping(_0), input]);
+], input])))))), ([_0, input]) => [_Constructor_Mapping(_0), input]);
 var MappedReadonly = (input) => If(If(If(Const("+", input), ([_0, input]) => If(Const("readonly", input), ([_1, input]) => [[_0, _1], input])), ([_0, input]) => [_0, input], () => If(If(Const("-", input), ([_0, input]) => If(Const("readonly", input), ([_1, input]) => [[_0, _1], input])), ([_0, input]) => [_0, input], () => If(If(Const("readonly", input), ([_0, input]) => [[_0], input]), ([_0, input]) => [_0, input], () => If([[], input], ([_0, input]) => [_0, input], () => [])))), ([_0, input]) => [MappedReadonlyMapping(_0), input]);
 var MappedOptional = (input) => If(If(If(Const("+", input), ([_0, input]) => If(Const("?", input), ([_1, input]) => [[_0, _1], input])), ([_0, input]) => [_0, input], () => If(If(Const("-", input), ([_0, input]) => If(Const("?", input), ([_1, input]) => [[_0, _1], input])), ([_0, input]) => [_0, input], () => If(If(Const("?", input), ([_0, input]) => [[_0], input]), ([_0, input]) => [_0, input], () => If([[], input], ([_0, input]) => [_0, input], () => [])))), ([_0, input]) => [MappedOptionalMapping(_0), input]);
 var MappedAs = (input) => If(If(If(Const("as", input), ([_0, input]) => If(Type(input), ([_1, input]) => [[_0, _1], input])), ([_0, input]) => [_0, input], () => If([[], input], ([_0, input]) => [_0, input], () => [])), ([_0, input]) => [MappedAsMapping(_0), input]);
-var Mapped$1 = (input) => If(If(Const("{", input), ([_0, input]) => If(MappedReadonly(input), ([_1, input]) => If(Const("[", input), ([_2, input]) => If(Ident(input), ([_3, input]) => If(Const("in", input), ([_4, input]) => If(Type(input), ([_5, input]) => If(MappedAs(input), ([_6, input]) => If(Const("]", input), ([_7, input]) => If(MappedOptional(input), ([_8, input]) => If(Const(":", input), ([_9, input]) => If(Type(input), ([_10, input]) => If(OptionalSemiColon(input), ([_11, input]) => If(Const("}", input), ([_12, input]) => [[
+var _Mapped_ = (input) => If(If(Const("{", input), ([_0, input]) => If(MappedReadonly(input), ([_1, input]) => If(Const("[", input), ([_2, input]) => If(Ident(input), ([_3, input]) => If(Const("in", input), ([_4, input]) => If(Type(input), ([_5, input]) => If(MappedAs(input), ([_6, input]) => If(Const("]", input), ([_7, input]) => If(MappedOptional(input), ([_8, input]) => If(Const(":", input), ([_9, input]) => If(Type(input), ([_10, input]) => If(OptionalSemiColon(input), ([_11, input]) => If(Const("}", input), ([_12, input]) => [[
 	_0,
 	_1,
 	_2,
@@ -8745,45 +8770,34 @@ var Mapped$1 = (input) => If(If(Const("{", input), ([_0, input]) => If(MappedRea
 	_10,
 	_11,
 	_12
-], input]))))))))))))), ([_0, input]) => [MappedMapping(_0), input]);
-var Dependent = (input) => If(If(If(Const("if", input), ([_0, input]) => If(Type(input), ([_1, input]) => If(Const("then", input), ([_2, input]) => If(Type(input), ([_3, input]) => If(Const("else", input), ([_4, input]) => If(Type(input), ([_5, input]) => [[
-	_0,
-	_1,
-	_2,
-	_3,
-	_4,
-	_5
-], input])))))), ([_0, input]) => [_0, input], () => If(If(Const("if", input), ([_0, input]) => If(Type(input), ([_1, input]) => If(Const("then", input), ([_2, input]) => If(Type(input), ([_3, input]) => [[
-	_0,
-	_1,
-	_2,
-	_3
-], input])))), ([_0, input]) => [_0, input], () => [])), ([_0, input]) => [DependentMapping(_0), input]);
+], input]))))))))))))), ([_0, input]) => [_Mapped_Mapping(_0), input]);
 var Reference = (input) => If(Ident(input), ([_0, input]) => [ReferenceMapping(_0), input]);
-var JsonNumber = (input) => If(Number$1(input), ([_0, input]) => [JsonNumberMapping(_0), input]);
-var JsonBoolean = (input) => If(If(Const("true", input), ([_0, input]) => [_0, input], () => If(Const("false", input), ([_0, input]) => [_0, input], () => [])), ([_0, input]) => [JsonBooleanMapping(_0), input]);
-var JsonString = (input) => If(String$1(["\"", "'"], input), ([_0, input]) => [JsonStringMapping(_0), input]);
-var JsonNull = (input) => If(Const("null", input), ([_0, input]) => [JsonNullMapping(_0), input]);
-var JsonProperty = (input) => If(If(PropertyKey(input), ([_0, input]) => If(Const(":", input), ([_1, input]) => If(Json(input), ([_2, input]) => [[
+var WithBigInt = (input) => If(BigInt$1(input), ([_0, input]) => [WithBigIntMapping(_0), input]);
+var WithNumber = (input) => If(Number$1(input), ([_0, input]) => [WithNumberMapping(_0), input]);
+var WithBoolean = (input) => If(If(Const("true", input), ([_0, input]) => [_0, input], () => If(Const("false", input), ([_0, input]) => [_0, input], () => [])), ([_0, input]) => [WithBooleanMapping(_0), input]);
+var WithString = (input) => If(String$1(["\"", "'"], input), ([_0, input]) => [WithStringMapping(_0), input]);
+var WithNull = (input) => If(Const("null", input), ([_0, input]) => [WithNullMapping(_0), input]);
+var WithUndefined = (input) => If(Const("undefined", input), ([_0, input]) => [void 0, input]);
+var WithProperty = (input) => If(If(PropertyKey(input), ([_0, input]) => If(Const(":", input), ([_1, input]) => If(WithValue(input), ([_2, input]) => [[
 	_0,
 	_1,
 	_2
-], input]))), ([_0, input]) => [JsonPropertyMapping(_0), input]);
-var JsonPropertyList_0 = (input, result = []) => If(If(JsonProperty(input), ([_0, input]) => If(PropertyDelimiter(input), ([_1, input]) => [[_0, _1], input])), ([_0, input]) => JsonPropertyList_0(input, [...result, _0]), () => [result, input]);
-var JsonPropertyList = (input) => If(If(JsonPropertyList_0(input), ([_0, input]) => If(If(If(JsonProperty(input), ([_0, input]) => [[_0], input]), ([_0, input]) => [_0, input], () => If([[], input], ([_0, input]) => [_0, input], () => [])), ([_1, input]) => [[_0, _1], input])), ([_0, input]) => [JsonPropertyListMapping(_0), input]);
-var JsonObject = (input) => If(If(Const("{", input), ([_0, input]) => If(JsonPropertyList(input), ([_1, input]) => If(Const("}", input), ([_2, input]) => [[
+], input]))), ([_0, input]) => [WithPropertyMapping(_0), input]);
+var WithPropertyList_0 = (input, result = []) => If(If(WithProperty(input), ([_0, input]) => If(PropertyDelimiter(input), ([_1, input]) => [[_0, _1], input])), ([_0, input]) => WithPropertyList_0(input, [...result, _0]), () => [result, input]);
+var WithPropertyList = (input) => If(If(WithPropertyList_0(input), ([_0, input]) => If(If(If(WithProperty(input), ([_0, input]) => [[_0], input]), ([_0, input]) => [_0, input], () => If([[], input], ([_0, input]) => [_0, input], () => [])), ([_1, input]) => [[_0, _1], input])), ([_0, input]) => [WithPropertyListMapping(_0), input]);
+var WithObject = (input) => If(If(Const("{", input), ([_0, input]) => If(WithPropertyList(input), ([_1, input]) => If(Const("}", input), ([_2, input]) => [[
 	_0,
 	_1,
 	_2
-], input]))), ([_0, input]) => [JsonObjectMapping(_0), input]);
-var JsonElementList_0 = (input, result = []) => If(If(Json(input), ([_0, input]) => If(Const(",", input), ([_1, input]) => [[_0, _1], input])), ([_0, input]) => JsonElementList_0(input, [...result, _0]), () => [result, input]);
-var JsonElementList = (input) => If(If(JsonElementList_0(input), ([_0, input]) => If(If(If(Json(input), ([_0, input]) => [[_0], input]), ([_0, input]) => [_0, input], () => If([[], input], ([_0, input]) => [_0, input], () => [])), ([_1, input]) => [[_0, _1], input])), ([_0, input]) => [JsonElementListMapping(_0), input]);
-var JsonArray = (input) => If(If(Const("[", input), ([_0, input]) => If(JsonElementList(input), ([_1, input]) => If(Const("]", input), ([_2, input]) => [[
+], input]))), ([_0, input]) => [WithObjectMapping(_0), input]);
+var WithElementList_0 = (input, result = []) => If(If(WithValue(input), ([_0, input]) => If(Const(",", input), ([_1, input]) => [[_0, _1], input])), ([_0, input]) => WithElementList_0(input, [...result, _0]), () => [result, input]);
+var WithElementList = (input) => If(If(WithElementList_0(input), ([_0, input]) => If(If(If(WithValue(input), ([_0, input]) => [[_0], input]), ([_0, input]) => [_0, input], () => If([[], input], ([_0, input]) => [_0, input], () => [])), ([_1, input]) => [[_0, _1], input])), ([_0, input]) => [WithElementListMapping(_0), input]);
+var WithArray = (input) => If(If(Const("[", input), ([_0, input]) => If(WithElementList(input), ([_1, input]) => If(Const("]", input), ([_2, input]) => [[
 	_0,
 	_1,
 	_2
-], input]))), ([_0, input]) => [JsonArrayMapping(_0), input]);
-var Json = (input) => If(If(JsonNumber(input), ([_0, input]) => [_0, input], () => If(JsonBoolean(input), ([_0, input]) => [_0, input], () => If(JsonString(input), ([_0, input]) => [_0, input], () => If(JsonNull(input), ([_0, input]) => [_0, input], () => If(JsonObject(input), ([_0, input]) => [_0, input], () => If(JsonArray(input), ([_0, input]) => [_0, input], () => [])))))), ([_0, input]) => [JsonMapping(_0), input]);
+], input]))), ([_0, input]) => [WithArrayMapping(_0), input]);
+var WithValue = (input) => If(If(WithBigInt(input), ([_0, input]) => [_0, input], () => If(WithNumber(input), ([_0, input]) => [_0, input], () => If(WithBoolean(input), ([_0, input]) => [_0, input], () => If(WithString(input), ([_0, input]) => [_0, input], () => If(WithNull(input), ([_0, input]) => [_0, input], () => If(WithUndefined(input), ([_0, input]) => [_0, input], () => If(WithObject(input), ([_0, input]) => [_0, input], () => If(WithArray(input), ([_0, input]) => [_0, input], () => [])))))))), ([_0, input]) => [WithValueMapping(_0), input]);
 var PatternBigInt = (input) => If(Const("-?(?:0|[1-9][0-9]*)n", input), ([_0, input]) => [PatternBigIntMapping(_0), input]);
 var PatternString = (input) => If(Const(".*", input), ([_0, input]) => [PatternStringMapping(_0), input]);
 var PatternNumber = (input) => If(Const("-?(?:0|[1-9][0-9]*)(?:\\.[0-9]+)?", input), ([_0, input]) => [PatternNumberMapping(_0), input]);
@@ -8882,7 +8896,7 @@ function EncodeNumber(right, pattern) {
 	return EncodeTypes(right, `${pattern}${NumberPattern}`);
 }
 function EncodeBoolean(right, pattern) {
-	return EncodeType(Union([Literal$1("false"), Literal$1("true")]), right, pattern);
+	return EncodeType(Union([Literal("false"), Literal("true")]), right, pattern);
 }
 function EncodeString(right, pattern) {
 	return EncodeTypes(right, `${pattern}.*`);
@@ -9062,16 +9076,16 @@ function ExtendsLiteralValue(inferred, left, right) {
 	return left === right ? ExtendsTrue(inferred) : ExtendsFalse();
 }
 function ExtendsLiteralBigInt(inferred, left, right) {
-	return IsLiteral(right) ? ExtendsLiteralValue(inferred, left, right.const) : IsBigInt(right) ? ExtendsTrue(inferred) : ExtendsRight(inferred, Literal$1(left), right);
+	return IsLiteral(right) ? ExtendsLiteralValue(inferred, left, right.const) : IsBigInt(right) ? ExtendsTrue(inferred) : ExtendsRight(inferred, Literal(left), right);
 }
 function ExtendsLiteralBoolean(inferred, left, right) {
-	return IsLiteral(right) ? ExtendsLiteralValue(inferred, left, right.const) : IsBoolean(right) ? ExtendsTrue(inferred) : ExtendsRight(inferred, Literal$1(left), right);
+	return IsLiteral(right) ? ExtendsLiteralValue(inferred, left, right.const) : IsBoolean(right) ? ExtendsTrue(inferred) : ExtendsRight(inferred, Literal(left), right);
 }
 function ExtendsLiteralNumber(inferred, left, right) {
-	return IsLiteral(right) ? ExtendsLiteralValue(inferred, left, right.const) : IsNumber(right) ? ExtendsTrue(inferred) : ExtendsRight(inferred, Literal$1(left), right);
+	return IsLiteral(right) ? ExtendsLiteralValue(inferred, left, right.const) : IsNumber(right) ? ExtendsTrue(inferred) : ExtendsRight(inferred, Literal(left), right);
 }
 function ExtendsLiteralString(inferred, left, right) {
-	return IsLiteral(right) ? ExtendsLiteralValue(inferred, left, right.const) : IsString(right) ? ExtendsTrue(inferred) : ExtendsRight(inferred, Literal$1(left), right);
+	return IsLiteral(right) ? ExtendsLiteralValue(inferred, left, right.const) : IsString(right) ? ExtendsTrue(inferred) : ExtendsRight(inferred, Literal(left), right);
 }
 function ExtendsLiteral(inferred, left, right) {
 	return IsBigInt$1(left.const) ? ExtendsLiteralBigInt(inferred, left.const, right) : IsBoolean$1(left.const) ? ExtendsLiteralBoolean(inferred, left.const, right) : IsNumber$1(left.const) ? ExtendsLiteralNumber(inferred, left.const, right) : IsString$1(left.const) ? ExtendsLiteralString(inferred, left.const, right) : Unreachable$1();
@@ -9148,7 +9162,7 @@ function TryInferResults(rest, right, result = []) {
 }
 function InferTupleResult(inferred, name, left, right) {
 	const results = TryInferResults(left, right);
-	return IsArray$1(results) ? ExtendsTrue(Assign(inferred, { [name]: Tuple$1(results) })) : ExtendsFalse();
+	return IsArray$1(results) ? ExtendsTrue(Assign(inferred, { [name]: Tuple(results) })) : ExtendsFalse();
 }
 function InferUnionResult(inferred, name, left, right) {
 	const results = TryInferResults(left, right);
@@ -9178,7 +9192,7 @@ function Elements(inferred, reversed, leftRest, rightRest) {
 	return ElementsRight(inferred, reversed, leftRest, rightRest);
 }
 function ExtendsTupleToTuple(inferred, left, right) {
-	const instantiatedRight = InstantiateElements(inferred, { callstack: [] }, right);
+	const instantiatedRight = InstantiateElements(inferred, State([], []), right);
 	const reversed = Reversed(instantiatedRight);
 	return Elements(inferred, reversed, ApplyReverse(left, reversed), ApplyReverse(instantiatedRight, reversed));
 }
@@ -9187,8 +9201,8 @@ function ExtendsTupleToArray(inferred, left, right) {
 	return IsInferable(inferrable) ? InferUnionResult(inferred, inferrable["name"], left, inferrable["type"]) : TakeLeft(left, (head, tail) => Match(ExtendsLeft(inferred, head, right), (inferred) => ExtendsTupleToArray(inferred, tail, right), () => ExtendsFalse()), () => ExtendsTrue(inferred));
 }
 function ExtendsTuple(inferred, left, right) {
-	const instantiatedLeft = InstantiateElements(inferred, { callstack: [] }, left);
-	return IsTuple(right) ? ExtendsTupleToTuple(inferred, instantiatedLeft, right.items) : IsArray(right) ? ExtendsTupleToArray(inferred, instantiatedLeft, right.items) : ExtendsRight(inferred, Tuple$1(instantiatedLeft), right);
+	const instantiatedLeft = InstantiateElements(inferred, State([], []), left);
+	return IsTuple(right) ? ExtendsTupleToTuple(inferred, instantiatedLeft, right.items) : IsArray(right) ? ExtendsTupleToArray(inferred, instantiatedLeft, right.items) : ExtendsRight(inferred, Tuple(instantiatedLeft), right);
 }
 function ExtendsUndefined(inferred, left, right) {
 	return IsVoid(right) ? ExtendsTrue(inferred) : IsUndefined(right) ? ExtendsTrue(inferred) : ExtendsRight(inferred, left, right);
@@ -9293,7 +9307,7 @@ function FromTypes$1(types) {
 	}, []);
 }
 function FromType$13(type) {
-	return IsRef(type) ? FromRef$1(type.$ref) : IsArray(type) ? _Array_(FromType$13(type.items), ArrayOptions(type)) : IsAsyncIterator(type) ? AsyncIterator(FromType$13(type.iteratorItems)) : IsConstructor(type) ? Constructor$1(FromTypes$1(type.parameters), FromType$13(type.instanceType)) : IsFunction(type) ? _Function_$1(FromTypes$1(type.parameters), FromType$13(type.returnType)) : IsIntersect(type) ? Intersect(FromTypes$1(type.allOf)) : IsIterator(type) ? Iterator(FromType$13(type.iteratorItems)) : IsObject(type) ? _Object_$1(FromProperties(type.properties)) : IsPromise(type) ? _Promise_(FromType$13(type.item)) : IsRecord(type) ? Record(RecordKey(type), FromType$13(RecordValue(type))) : IsUnion(type) ? Union(FromTypes$1(type.anyOf)) : IsTuple(type) ? Tuple$1(FromTypes$1(type.items)) : type;
+	return IsRef(type) ? FromRef$1(type.$ref) : IsArray(type) ? _Array_(FromType$13(type.items), ArrayOptions(type)) : IsAsyncIterator(type) ? AsyncIterator(FromType$13(type.iteratorItems)) : IsConstructor(type) ? Constructor(FromTypes$1(type.parameters), FromType$13(type.instanceType)) : IsFunction(type) ? _Function_$1(FromTypes$1(type.parameters), FromType$13(type.returnType)) : IsIntersect(type) ? Intersect(FromTypes$1(type.allOf)) : IsIterator(type) ? Iterator(FromType$13(type.iteratorItems)) : IsObject(type) ? _Object_$1(FromProperties(type.properties)) : IsPromise(type) ? _Promise_(FromType$13(type.item)) : IsRecord(type) ? Record(RecordKey(type), FromType$13(RecordValue(type))) : IsUnion(type) ? Union(FromTypes$1(type.anyOf)) : IsTuple(type) ? Tuple(FromTypes$1(type.items)) : type;
 }
 function CyclicAnyFromParameters(defs, ref) {
 	return ref in defs ? FromType$13(defs[ref]) : Unknown();
@@ -9303,8 +9317,8 @@ function CyclicExtends(type) {
 	return CyclicAnyFromParameters(type.$defs, type.$ref);
 }
 function CyclicInterface(context, heritage, properties) {
-	const instantiatedHeritage = InstantiateTypes(context, { callstack: [] }, heritage);
-	const instantiatedProperties = InstantiateProperties({}, { callstack: [] }, properties);
+	const instantiatedHeritage = InstantiateTypes(context, State([], []), heritage);
+	const instantiatedProperties = InstantiateProperties({}, State([], []), properties);
 	return EvaluateIntersect([...instantiatedHeritage, _Object_$1(instantiatedProperties)]);
 }
 function CyclicDefinitions(context, dependencies) {
@@ -9454,7 +9468,9 @@ function IsTailCall(state, name) {
 	return IsEqual(Peek(state), name);
 }
 function CallDispatch(context, state, target, parameters, expression, arguments_) {
-	return InstantiateType(context, state, InstantiateType(ResolveArgumentsContext(context, state, parameters, arguments_), { callstack: [...state.callstack, target.$ref] }, expression));
+	const argumentsContext = ResolveArgumentsContext(context, state, parameters, arguments_);
+	const returnType = InstantiateType(argumentsContext, State([...state["callstack"], target["$ref"]], state["visited"]), expression);
+	return InstantiateType(argumentsContext, State([], []), returnType);
 }
 function CallDistributed(context, state, target, parameters, expression, distributedArguments) {
 	return distributedArguments.reduce((result, arguments_) => [...result, CallDispatch(context, state, target, parameters, expression, arguments_)], []);
@@ -9472,23 +9488,54 @@ function CallInstantiate(context, state, target, arguments_) {
 }
 function CallConstruct(target, arguments_) {
 	return Create({ ["~kind"]: "Call" }, {
+		type: "call",
 		target,
 		arguments: arguments_
 	}, {});
 }
 /** Creates a Call type. */
 function Call(target, arguments_) {
-	return CallInstantiate({}, { callstack: [] }, target, arguments_);
+	return CallInstantiate({}, State([], []), target, arguments_);
 }
 /** Returns true if the given type is a TCall. */
 function IsCall(value) {
 	return IsKind(value, "Call");
 }
+function RemoveImmutableOperation(type) {
+	return Discard(type, ["~immutable"]);
+}
+function RemoveImmutableAction(type, options) {
+	return Update(RemoveImmutableOperation(type), {}, options);
+}
+function RemoveImmutableInstantiate(context, state, type, options) {
+	return RemoveImmutableAction(InstantiateType(context, state, type), options);
+}
+/** Creates a deferred Awaited action. */
+function AwaitedDeferred(type, options = {}) {
+	return Deferred("Awaited", [type], options);
+}
+/**
+* Applies an Awaited action to a type.
+*
+* @deprecated This action is being removed in the next version of TypeBox.
+*/
+function Awaited(type, options = {}) {
+	return AwaitedAction(type, options);
+}
+function AwaitedOperation(type) {
+	return IsPromise(type) ? AwaitedOperation(type.item) : type;
+}
+function AwaitedAction(type, options) {
+	return CanInstantiate([type]) ? Update(AwaitedOperation(type), {}, options) : AwaitedDeferred(type, options);
+}
+function AwaitedInstantiate(context, state, type, options) {
+	return AwaitedAction(InstantiateType(context, state, type), options);
+}
 function ApplyMapping(mapping, value) {
 	return mapping(value);
 }
 function FromLiteral$2(mapping, value) {
-	return IsString$1(value) ? Literal$1(ApplyMapping(mapping, value)) : Literal$1(value);
+	return IsString$1(value) ? Literal(ApplyMapping(mapping, value)) : Literal(value);
 }
 function FromTemplateLiteral$2(mapping, pattern) {
 	return FromType$11(mapping, EvaluateTemplateLiteral(pattern));
@@ -9570,7 +9617,7 @@ function ConditionalDeferred(left, right, true_, false_, options = {}) {
 }
 /** Applies a Conditional action to the given types. */
 function Conditional(left, right, true_, false_, options = {}) {
-	return ConditionalAction({}, { callstack: [] }, left, right, true_, false_, options);
+	return ConditionalAction({}, State([], []), left, right, true_, false_, options);
 }
 function ConditionalOperation(context, state, left, right, true_, false_) {
 	const extendsResult = Extends(context, left, right);
@@ -9591,7 +9638,8 @@ function ConstructorParameters(type, options = {}) {
 	return ConstructorParametersAction(type, options);
 }
 function ConstructorParametersOperation(type) {
-	return Tuple$1(InstantiateElements({}, { callstack: [] }, IsConstructor(type) ? type["parameters"] : []));
+	const parameters = IsConstructor(type) ? type["parameters"] : [];
+	return Tuple(InstantiateElements({}, State([], []), parameters));
 }
 function ConstructorParametersAction(type, options) {
 	return CanInstantiate([type]) ? Update(ConstructorParametersOperation(type), {}, options) : ConstructorParametersDeferred(type, options);
@@ -9641,7 +9689,7 @@ function ExtractInstantiate(context, state, left, right, options) {
 }
 function KeysToLiterals(keys) {
 	return keys.reduce((result, left) => {
-		return IsLiteralValue(left) ? [...result, Literal$1(left)] : result;
+		return IsLiteralValue(left) ? [...result, Literal(left)] : result;
 	}, []);
 }
 function KeysToIndexer(keys) {
@@ -9688,7 +9736,7 @@ function FromObject$5(properties) {
 	return properties;
 }
 function FromTuple$3(types) {
-	return FromType$10(TupleToObject(Tuple$1(types)));
+	return FromType$10(TupleToObject(Tuple(types)));
 }
 function CollapseUnionProperties(left, right) {
 	return Keys(left).filter((key) => key in right).reduce((result, key) => {
@@ -9722,7 +9770,7 @@ function ConvertToIntegerKey(value) {
 	return integerKeyPattern.test(normal) ? parseInt(normal) : value;
 }
 function NormalizeLiteral(value) {
-	return Literal$1(ConvertToIntegerKey(value));
+	return Literal(ConvertToIntegerKey(value));
 }
 function NormalizeIndexerTypes(types) {
 	return types.map((type) => NormalizeIndexer(type));
@@ -9772,7 +9820,7 @@ function FromTypes(properties, types) {
 	return types.map((type) => FromType$8(properties, type));
 }
 function FromType$8(properties, type) {
-	return IsArray(type) ? _Array_(FromType$8(properties, type.items)) : IsAsyncIterator(type) ? AsyncIterator(FromType$8(properties, type.iteratorItems)) : IsConstructor(type) ? Constructor$1(FromTypes(properties, type.parameters), FromType$8(properties, type.instanceType)) : IsFunction(type) ? _Function_$1(FromTypes(properties, type.parameters), FromType$8(properties, type.returnType)) : IsIterator(type) ? Iterator(FromType$8(properties, type.iteratorItems)) : IsPromise(type) ? _Promise_(FromType$8(properties, type.item)) : IsTuple(type) ? Tuple$1(FromTypes(properties, type.items)) : IsUnion(type) ? Union(FromTypes(properties, type.anyOf)) : IsIntersect(type) ? Intersect(FromTypes(properties, type.allOf)) : IsThis(type) ? _Object_$1(properties) : type;
+	return IsArray(type) ? _Array_(FromType$8(properties, type.items)) : IsAsyncIterator(type) ? AsyncIterator(FromType$8(properties, type.iteratorItems)) : IsConstructor(type) ? Constructor(FromTypes(properties, type.parameters), FromType$8(properties, type.instanceType)) : IsFunction(type) ? _Function_$1(FromTypes(properties, type.parameters), FromType$8(properties, type.returnType)) : IsIterator(type) ? Iterator(FromType$8(properties, type.iteratorItems)) : IsPromise(type) ? _Promise_(FromType$8(properties, type.item)) : IsTuple(type) ? Tuple(FromTypes(properties, type.items)) : IsUnion(type) ? Union(FromTypes(properties, type.anyOf)) : IsIntersect(type) ? Intersect(FromTypes(properties, type.allOf)) : IsThis(type) ? _Object_$1(properties) : type;
 }
 function ExpandThis(properties, type) {
 	return FromType$8(properties, type);
@@ -9799,7 +9847,7 @@ function FromObject$4(properties, indexer) {
 	return IsNumber(indexer) ? FromIndexerNumber(properties) : FromIndexer(properties, indexer);
 }
 function ConvertLiteral(value) {
-	return Literal$1(ConvertToIntegerKey(value));
+	return Literal(ConvertToIntegerKey(value));
 }
 function ArrayIndexerTypes(types) {
 	return types.map((type) => FormatArrayIndexer(type));
@@ -9810,7 +9858,7 @@ function FormatArrayIndexer(type) {
 }
 function IndexElementsWithIndexer(types, indexer) {
 	return types.reduceRight((result, right, index) => {
-		return IsExtendsTrueLike(Extends({}, Literal$1(index), indexer)) ? [right, ...result] : result;
+		return IsExtendsTrueLike(Extends({}, Literal(index), indexer)) ? [right, ...result] : result;
 	}, []);
 }
 function FromTupleWithIndexer(types, indexer) {
@@ -9820,7 +9868,7 @@ function FromTupleWithoutIndexer(types) {
 	return EvaluateUnionFast(types);
 }
 function FromTuple$2(types, indexer) {
-	return IsLiteral(indexer) && IsEqual(indexer.const, "length") ? Literal$1(types.length) : IsNumber(indexer) || IsInteger(indexer) ? FromTupleWithoutIndexer(types) : FromTupleWithIndexer(types, indexer);
+	return IsLiteral(indexer) && IsEqual(indexer.const, "length") ? Literal(types.length) : IsNumber(indexer) || IsInteger(indexer) ? FromTupleWithoutIndexer(types) : FromTupleWithIndexer(types, indexer);
 }
 function FromType$7(type, indexer) {
 	return IsArray(type) ? FromArray$2(type.items, indexer) : IsObject(type) ? FromObject$4(type.properties, indexer) : IsTuple(type) ? FromTuple$2(type.items, indexer) : Never();
@@ -9871,7 +9919,7 @@ function FromArray$1(_type) {
 }
 function FromPropertyKeys(keys) {
 	return keys.reduce((result, left) => {
-		return IsLiteralValue(left) ? [...result, Literal$1(ConvertToIntegerKey(left))] : Unreachable$1();
+		return IsLiteralValue(left) ? [...result, Literal(ConvertToIntegerKey(left))] : Unreachable$1();
 	}, []);
 }
 function FromObject$3(properties) {
@@ -9881,7 +9929,7 @@ function FromRecord(type) {
 	return RecordKey(type);
 }
 function FromTuple$1(types) {
-	return EvaluateUnionFast(types.map((_, index) => Literal$1(index)));
+	return EvaluateUnionFast(types.map((_, index) => Literal(index)));
 }
 function FromType$6(type) {
 	return IsAny(type) ? FromAny() : IsArray(type) ? FromArray$1(type.items) : IsObject(type) ? FromObject$3(type.properties) : IsRecord(type) ? FromRecord(type) : IsTuple(type) ? FromTuple$1(type.items) : Never();
@@ -9906,7 +9954,7 @@ function MappedDeferred(identifier, type, as, property, options = {}) {
 }
 /** Applies a Mapped action using the given types. */
 function Mapped(identifier, type, as, property, options = {}) {
-	return MappedAction({}, { callstack: [] }, identifier, type, as, property, options);
+	return MappedAction({}, State([], []), identifier, type, as, property, options);
 }
 function FromTemplateLiteral(pattern) {
 	return FromType$5(EvaluateTemplateLiteral(pattern));
@@ -9920,7 +9968,7 @@ function FromEnum(values) {
 	return FromType$5(EvaluateEnum(values));
 }
 function FromLiteral(value) {
-	return IsNumber$1(value) ? [Literal$1(`${value}`)] : [Literal$1(value)];
+	return IsNumber$1(value) ? [Literal(`${value}`)] : [Literal(value)];
 }
 function FromType$5(type) {
 	return IsEnum(type) ? FromEnum(type.enum) : IsLiteral(type) ? FromLiteral(type.const) : IsTemplateLiteral(type) ? FromTemplateLiteral(type.pattern) : IsUnion(type) ? FromUnion$3(type.anyOf) : [type];
@@ -9956,33 +10004,35 @@ function MappedAction(context, state, identifier, type, as, property, options) {
 function MappedInstantiate(context, state, identifier, type, as, property, options) {
 	return MappedAction(context, state, identifier, InstantiateType(context, state, type), as, property, options);
 }
-function InstantiateCyclics(context, cyclicKeys) {
-	return Keys(context).filter((key) => cyclicKeys.includes(key)).reduce((result, key) => {
+function InstantiateCyclics(context, declarations, cyclicKeys) {
+	const declarationContext = Assign(context, declarations);
+	return Keys(declarations).filter((key) => cyclicKeys.includes(key)).reduce((result, key) => {
 		return {
 			...result,
-			[key]: InstantiateCyclic(context, key, context[key])
+			[key]: InstantiateCyclic(declarationContext, key, declarations[key])
 		};
 	}, {});
 }
-function InstantiateNonCyclics(context, cyclicKeys) {
-	return Keys(context).filter((key) => !cyclicKeys.includes(key)).reduce((result, key) => {
+function InstantiateNonCyclics(context, declarations, cyclicKeys) {
+	const declarationContext = Assign(context, declarations);
+	return Keys(declarations).filter((key) => !cyclicKeys.includes(key)).reduce((result, key) => {
 		return {
 			...result,
-			[key]: InstantiateType(context, { callstack: [] }, context[key])
+			[key]: InstantiateType(declarationContext, State([], []), declarations[key])
 		};
 	}, {});
 }
-function InstantiateModule(context, options) {
-	const cyclicCandidates = CyclicCandidates(context);
-	const instantiatedCyclics = InstantiateCyclics(context, cyclicCandidates);
-	const instantiatedNonCyclics = InstantiateNonCyclics(context, cyclicCandidates);
+function InstantiateModule(context, declarations, options) {
+	const cyclicCandidates = CyclicCandidates(declarations);
+	const instantiatedCyclics = InstantiateCyclics(context, declarations, cyclicCandidates);
+	const instantiatedNonCyclics = InstantiateNonCyclics(context, declarations, cyclicCandidates);
 	return Update({
 		...instantiatedCyclics,
 		...instantiatedNonCyclics
 	}, {}, options);
 }
-function ModuleInstantiate(context, _state, properties, options) {
-	return InstantiateModule(Assign(context, properties), options);
+function ModuleInstantiate(context, _state, declarations, options) {
+	return InstantiateModule(context, declarations, options);
 }
 /** Creates a deferred NonNullable action. */
 function NonNullableDeferred(type, options = {}) {
@@ -10040,7 +10090,8 @@ function Parameters(type, options = {}) {
 	return ParametersAction(type, options);
 }
 function ParametersOperation(type) {
-	return Tuple$1(InstantiateElements({}, { callstack: [] }, IsFunction(type) ? type["parameters"] : []));
+	const parameters = IsFunction(type) ? type["parameters"] : [];
+	return Tuple(InstantiateElements({}, State([], []), parameters));
 }
 function ParametersAction(type, options) {
 	return CanInstantiate([type]) ? Update(ParametersOperation(type), {}, options) : ParametersDeferred(type, options);
@@ -10073,7 +10124,7 @@ function FromObject$2(properties) {
 	return _Object_$1(Keys(properties).reduce((result, left) => {
 		return {
 			...result,
-			[left]: Optional$2(properties[left])
+			[left]: AddOptional(properties[left])
 		};
 	}, {}));
 }
@@ -10122,7 +10173,7 @@ function ReadonlyObject(type, options = {}) {
 */
 var ReadonlyType = ReadonlyObject;
 function FromArray(type) {
-	return Immutable(_Array_(type));
+	return AddImmutable(_Array_(type));
 }
 function FromCyclic$1(defs, ref) {
 	const partial = FromType$1(CyclicTarget(defs, ref));
@@ -10138,12 +10189,12 @@ function FromObject$1(properties) {
 	return _Object_$1(Keys(properties).reduce((result, left) => {
 		return {
 			...result,
-			[left]: Readonly$1(properties[left])
+			[left]: AddReadonly(properties[left])
 		};
 	}, {}));
 }
 function FromTuple(types) {
-	return Immutable(Tuple$1(types));
+	return AddImmutable(Tuple(types));
 }
 function FromUnion$1(types) {
 	return Union(types.map((type) => FromType$1(type)));
@@ -10158,7 +10209,7 @@ function ReadonlyObjectInstantiate(context, state, type, options) {
 	return ReadonlyObjectAction(InstantiateType(context, state, type), options);
 }
 function RefInstantiate(context, state, type, ref) {
-	return ref in context ? CyclicCheck([ref], context, context[ref]) ? type : InstantiateType(context, state, context[ref]) : type;
+	return state.visited.includes(ref) ? type : ref in context ? InstantiateType(context, State(state["callstack"], [...state["visited"], ref]), context[ref]) : type;
 }
 function FromCyclic(defs, ref) {
 	const partial = FromType(CyclicTarget(defs, ref));
@@ -10177,7 +10228,7 @@ function FromObject(properties) {
 	return _Object_$1(Keys(properties).reduce((result, left) => {
 		return {
 			...result,
-			[left]: OptionalRemove(properties[left])
+			[left]: RemoveOptional(properties[left])
 		};
 	}, {}));
 }
@@ -10244,22 +10295,15 @@ function RestSpread(types) {
 		return [...result, ...SpreadElement(left)];
 	}, []);
 }
+function State(callstack, visited) {
+	return {
+		callstack,
+		visited
+	};
+}
 function CanInstantiate(types) {
 	return TakeLeft(types, (left, right) => IsRef(left) ? false : CanInstantiate(right), () => true);
 }
-function ModifierActions(type, readonly, optional) {
-	return IsReadonlyRemoveAction(type) ? ModifierActions(type.type, "remove", optional) : IsOptionalRemoveAction(type) ? ModifierActions(type.type, readonly, "remove") : IsReadonlyAddAction(type) ? ModifierActions(type.type, "add", optional) : IsOptionalAddAction(type) ? ModifierActions(type.type, readonly, "add") : [
-		type,
-		readonly,
-		optional
-	];
-}
-function ApplyReadonly(action, type) {
-	return IsEqual(action, "remove") ? ReadonlyRemove(type) : IsEqual(action, "add") ? ReadonlyAdd(type) : type;
-}
-function ApplyOptional(action, type) {
-	return IsEqual(action, "remove") ? OptionalRemove(type) : IsEqual(action, "add") ? OptionalAdd(type) : type;
-}
 function InstantiateProperties(context, state, properties) {
 	return Keys(properties).reduce((result, key) => {
 		return {
@@ -10275,40 +10319,41 @@ function InstantiateTypes(context, state, types) {
 	return types.map((type) => InstantiateType(context, state, type));
 }
 function InstantiateDeferred(context, state, action, parameters, options) {
-	return IsEqual(action, "Awaited") ? AwaitedInstantiate(context, state, parameters[0], options) : IsEqual(action, "Capitalize") ? CapitalizeInstantiate(context, state, parameters[0], options) : IsEqual(action, "Conditional") ? ConditionalInstantiate(context, state, parameters[0], parameters[1], parameters[2], parameters[3], options) : IsEqual(action, "ConstructorParameters") ? ConstructorParametersInstantiate(context, state, parameters[0], options) : IsEqual(action, "Evaluate") ? EvaluateInstantiate(context, state, parameters[0], options) : IsEqual(action, "Exclude") ? ExcludeInstantiate(context, state, parameters[0], parameters[1], options) : IsEqual(action, "Extract") ? ExtractInstantiate(context, state, parameters[0], parameters[1], options) : IsEqual(action, "Index") ? IndexInstantiate(context, state, parameters[0], parameters[1], options) : IsEqual(action, "InstanceType") ? InstanceTypeInstantiate(context, state, parameters[0], options) : IsEqual(action, "Interface") ? InterfaceInstantiate(context, state, parameters[0], parameters[1], options) : IsEqual(action, "KeyOf") ? KeyOfInstantiate(context, state, parameters[0], options) : IsEqual(action, "Lowercase") ? LowercaseInstantiate(context, state, parameters[0], options) : IsEqual(action, "Mapped") ? MappedInstantiate(context, state, parameters[0], parameters[1], parameters[2], parameters[3], options) : IsEqual(action, "Module") ? ModuleInstantiate(context, state, parameters[0], options) : IsEqual(action, "NonNullable") ? NonNullableInstantiate(context, state, parameters[0], options) : IsEqual(action, "Pick") ? PickInstantiate(context, state, parameters[0], parameters[1], options) : IsEqual(action, "Parameters") ? ParametersInstantiate(context, state, parameters[0], options) : IsEqual(action, "Partial") ? PartialInstantiate(context, state, parameters[0], options) : IsEqual(action, "Omit") ? OmitInstantiate(context, state, parameters[0], parameters[1], options) : IsEqual(action, "ReadonlyObject") ? ReadonlyObjectInstantiate(context, state, parameters[0], options) : IsEqual(action, "Record") ? RecordInstantiate(context, state, parameters[0], parameters[1], options) : IsEqual(action, "Required") ? RequiredInstantiate(context, state, parameters[0], options) : IsEqual(action, "ReturnType") ? ReturnTypeInstantiate(context, state, parameters[0], options) : IsEqual(action, "TemplateLiteral") ? TemplateLiteralInstantiate(context, state, parameters[0], options) : IsEqual(action, "Uncapitalize") ? UncapitalizeInstantiate(context, state, parameters[0], options) : IsEqual(action, "Uppercase") ? UppercaseInstantiate(context, state, parameters[0], options) : IsEqual(action, "With") ? WithInstantiate(context, state, parameters[0], parameters[1]) : Deferred(action, parameters, options);
+	return IsEqual(action, "AddImmutable") ? AddImmutableInstantiate(context, state, parameters[0], options) : IsEqual(action, "RemoveImmutable") ? RemoveImmutableInstantiate(context, state, parameters[0], options) : IsEqual(action, "AddReadonly") ? AddReadonlyInstantiate(context, state, parameters[0], options) : IsEqual(action, "RemoveReadonly") ? RemoveReadonlyInstantiate(context, state, parameters[0], options) : IsEqual(action, "AddOptional") ? AddOptionalInstantiate(context, state, parameters[0], options) : IsEqual(action, "RemoveOptional") ? RemoveOptionalInstantiate(context, state, parameters[0], options) : IsEqual(action, "Awaited") ? AwaitedInstantiate(context, state, parameters[0], options) : IsEqual(action, "Capitalize") ? CapitalizeInstantiate(context, state, parameters[0], options) : IsEqual(action, "Conditional") ? ConditionalInstantiate(context, state, parameters[0], parameters[1], parameters[2], parameters[3], options) : IsEqual(action, "ConstructorParameters") ? ConstructorParametersInstantiate(context, state, parameters[0], options) : IsEqual(action, "Evaluate") ? EvaluateInstantiate(context, state, parameters[0], options) : IsEqual(action, "Exclude") ? ExcludeInstantiate(context, state, parameters[0], parameters[1], options) : IsEqual(action, "Extract") ? ExtractInstantiate(context, state, parameters[0], parameters[1], options) : IsEqual(action, "Index") ? IndexInstantiate(context, state, parameters[0], parameters[1], options) : IsEqual(action, "InstanceType") ? InstanceTypeInstantiate(context, state, parameters[0], options) : IsEqual(action, "Interface") ? InterfaceInstantiate(context, state, parameters[0], parameters[1], options) : IsEqual(action, "KeyOf") ? KeyOfInstantiate(context, state, parameters[0], options) : IsEqual(action, "Lowercase") ? LowercaseInstantiate(context, state, parameters[0], options) : IsEqual(action, "Mapped") ? MappedInstantiate(context, state, parameters[0], parameters[1], parameters[2], parameters[3], options) : IsEqual(action, "Module") ? ModuleInstantiate(context, state, parameters[0], options) : IsEqual(action, "NonNullable") ? NonNullableInstantiate(context, state, parameters[0], options) : IsEqual(action, "Pick") ? PickInstantiate(context, state, parameters[0], parameters[1], options) : IsEqual(action, "Parameters") ? ParametersInstantiate(context, state, parameters[0], options) : IsEqual(action, "Partial") ? PartialInstantiate(context, state, parameters[0], options) : IsEqual(action, "Omit") ? OmitInstantiate(context, state, parameters[0], parameters[1], options) : IsEqual(action, "ReadonlyObject") ? ReadonlyObjectInstantiate(context, state, parameters[0], options) : IsEqual(action, "Record") ? RecordInstantiate(context, state, parameters[0], parameters[1], options) : IsEqual(action, "Required") ? RequiredInstantiate(context, state, parameters[0], options) : IsEqual(action, "ReturnType") ? ReturnTypeInstantiate(context, state, parameters[0], options) : IsEqual(action, "TemplateLiteral") ? TemplateLiteralInstantiate(context, state, parameters[0], options) : IsEqual(action, "Uncapitalize") ? UncapitalizeInstantiate(context, state, parameters[0], options) : IsEqual(action, "Uppercase") ? UppercaseInstantiate(context, state, parameters[0], options) : IsEqual(action, "With") ? WithInstantiate(context, state, parameters[0], parameters[1]) : Deferred(action, parameters, options);
+}
+function InstantiateImmediate(context, state, type) {
+	type = IsBase(type) ? type.Clone() : type;
+	return IsRef(type) ? RefInstantiate(context, state, type, type.$ref) : IsArray(type) ? _Array_(InstantiateType(context, state, type.items), ArrayOptions(type)) : IsAsyncIterator(type) ? AsyncIterator(InstantiateType(context, state, type.iteratorItems), AsyncIteratorOptions(type)) : IsCall(type) ? CallInstantiate(context, state, type.target, type.arguments) : IsConstructor(type) ? Constructor(InstantiateTypes(context, state, type.parameters), InstantiateType(context, state, type.instanceType), ConstructorOptions(type)) : IsDeferred(type) ? InstantiateDeferred(context, state, type.action, type.parameters, type.options) : IsFunction(type) ? _Function_$1(InstantiateTypes(context, state, type.parameters), InstantiateType(context, state, type.returnType), FunctionOptions(type)) : IsDependent(type) ? Dependent$1(InstantiateType(context, state, type.if), InstantiateType(context, state, type.then), InstantiateType(context, state, type.else), DependentOptions(type)) : IsIntersect(type) ? Intersect(InstantiateTypes(context, state, type.allOf), IntersectOptions(type)) : IsIterator(type) ? Iterator(InstantiateType(context, state, type.iteratorItems), IteratorOptions(type)) : IsObject(type) ? _Object_$1(InstantiateProperties(context, state, type.properties), ObjectOptions(type)) : IsPromise(type) ? _Promise_(InstantiateType(context, state, type.item), PromiseOptions(type)) : IsRecord(type) ? RecordFromPattern(RecordPattern(type), InstantiateType(context, state, RecordValue(type))) : IsRest(type) ? Rest(InstantiateType(context, state, type.items)) : IsTuple(type) ? Tuple(InstantiateElements(context, state, type.items), TupleOptions(type)) : IsUnion(type) ? Union(InstantiateTypes(context, state, type.anyOf), UnionOptions(type)) : type;
+}
+function WithModifiers(type, instantiatedType) {
+	const withImmutable = IsImmutable(type) ? Immutable(instantiatedType) : instantiatedType;
+	const withReadonly = IsReadonly(type) ? Readonly$1(withImmutable) : withImmutable;
+	return IsOptional(type) ? Optional$2(withReadonly) : withReadonly;
 }
-function InstantiateType(context, state, input) {
-	const immutable = IsImmutable(input);
-	const modifiers = ModifierActions(input, IsReadonly(input) ? "add" : "none", IsOptional(input) ? "add" : "none");
-	const type = IsBase(modifiers[0]) ? modifiers[0].Clone() : modifiers[0];
-	const instantiated = IsRef(type) ? RefInstantiate(context, state, type, type.$ref) : IsArray(type) ? _Array_(InstantiateType(context, state, type.items), ArrayOptions(type)) : IsAsyncIterator(type) ? AsyncIterator(InstantiateType(context, state, type.iteratorItems), AsyncIteratorOptions(type)) : IsCall(type) ? CallInstantiate(context, state, type.target, type.arguments) : IsConstructor(type) ? Constructor$1(InstantiateTypes(context, state, type.parameters), InstantiateType(context, state, type.instanceType), ConstructorOptions(type)) : IsDeferred(type) ? InstantiateDeferred(context, state, type.action, type.parameters, type.options) : IsFunction(type) ? _Function_$1(InstantiateTypes(context, state, type.parameters), InstantiateType(context, state, type.returnType), FunctionOptions(type)) : IsDependent(type) ? Dependent$1(InstantiateType(context, state, type.if), InstantiateType(context, state, type.then), InstantiateType(context, state, type.else), DependentOptions(type)) : IsIntersect(type) ? Intersect(InstantiateTypes(context, state, type.allOf), IntersectOptions(type)) : IsIterator(type) ? Iterator(InstantiateType(context, state, type.iteratorItems), IteratorOptions(type)) : IsObject(type) ? _Object_$1(InstantiateProperties(context, state, type.properties), ObjectOptions(type)) : IsPromise(type) ? _Promise_(InstantiateType(context, state, type.item), PromiseOptions(type)) : IsRecord(type) ? RecordFromPattern(RecordPattern(type), InstantiateType(context, state, RecordValue(type))) : IsRest(type) ? Rest(InstantiateType(context, state, type.items)) : IsTuple(type) ? Tuple$1(InstantiateElements(context, state, type.items), TupleOptions(type)) : IsUnion(type) ? Union(InstantiateTypes(context, state, type.anyOf), UnionOptions(type)) : type;
-	const withImmutable = immutable ? Immutable(instantiated) : instantiated;
-	return ApplyReadonly(modifiers[1], ApplyOptional(modifiers[2], withImmutable));
+function InstantiateType(context, state, type) {
+	const instantiatedType = InstantiateImmediate(context, state, type);
+	return IsDeferred(type) ? instantiatedType : WithModifiers(type, instantiatedType);
 }
 /** Instantiates computed schematics using the given context and type. */
 function Instantiate(context, type) {
-	return InstantiateType(context, { callstack: [] }, type);
+	return InstantiateType(context, State([], []), type);
 }
-function AwaitedOperation(type) {
-	return IsPromise(type) ? AwaitedOperation(type.item) : type;
+function AddImmutableOperation(type) {
+	return Update(type, { "~immutable": true }, {});
 }
-function AwaitedAction(type, options) {
-	return CanInstantiate([type]) ? Update(AwaitedOperation(type), {}, options) : AwaitedDeferred(type, options);
+function AddImmutableAction(type, options) {
+	return Update(AddImmutableOperation(type), {}, options);
 }
-function AwaitedInstantiate(context, state, type, options) {
-	return AwaitedAction(InstantiateType(context, state, type), options);
+function AddImmutableInstantiate(context, state, type, options) {
+	return AddImmutableAction(InstantiateType(context, state, type), options);
 }
-/** Creates a deferred Awaited action. */
-function AwaitedDeferred(type, options = {}) {
-	return Deferred("Awaited", [type], options);
+/** Creates a deferred AddImmutable action. */
+function AddImmutableDeferred(type, options = {}) {
+	return Deferred("AddImmutable", [type], options);
 }
-/**
-* Applies an Awaited action to a type.
-*
-* @deprecated This action is being removed in the next version of TypeBox.
-*/
-function Awaited(type, options = {}) {
-	return AwaitedAction(type, options);
+/** Applies an AddImmutable action to a type. */
+function AddImmutable(type, options = {}) {
+	return AddImmutableAction(type, options);
 }
 /** Creates a deferred Evaluate action. */
 function EvaluateDeferred(type, options = {}) {
@@ -10319,12 +10364,12 @@ function Evaluate(type, options = {}) {
 	return EvaluateAction(type, options);
 }
 /** Creates a deferred Module action. */
-function ModuleDeferred(context, options = {}) {
-	return Deferred("Module", [context], options);
+function ModuleDeferred(declarations, options = {}) {
+	return Deferred("Module", [declarations], options);
 }
-/** Applies a Module transformation action to the embedded property types. */
-function Module(context, options = {}) {
-	return Instantiate({}, ModuleDeferred(context, options));
+/** Creates a Module with the given declarations */
+function Module(declarations, options = {}) {
+	return ModuleInstantiate({}, State([], []), declarations, options);
 }
 /** Parses a type from a TypeScript type expression */
 function Script(...args) {
@@ -10350,7 +10395,7 @@ function Script(...args) {
 		]
 	});
 	const result = Script$1(input);
-	return Update(IsArray$1(result) && IsEqual(result.length, 2) ? InstantiateType(context, { callstack: [] }, result[0]) : Never(), {}, options);
+	return Update(IsArray$1(result) && IsEqual(result.length, 2) ? InstantiateType(context, State([], []), result[0]) : Never(), {}, options);
 }
 (/* @__PURE__ */ __exportAll({
 	Any: () => Any,
@@ -10364,7 +10409,7 @@ function Script(...args) {
 	Capitalize: () => Capitalize,
 	Codec: () => Codec,
 	Conditional: () => Conditional,
-	Constructor: () => Constructor$1,
+	Constructor: () => Constructor,
 	ConstructorParameters: () => ConstructorParameters,
 	Cyclic: () => Cyclic,
 	Decode: () => Decode,
@@ -10436,7 +10481,7 @@ function Script(...args) {
 	IsVoid: () => IsVoid,
 	Iterator: () => Iterator,
 	KeyOf: () => KeyOf,
-	Literal: () => Literal$1,
+	Literal: () => Literal,
 	Lowercase: () => Lowercase,
 	Mapped: () => Mapped,
 	Module: () => Module,
@@ -10470,7 +10515,7 @@ function Script(...args) {
 	Symbol: () => Symbol$1,
 	TemplateLiteral: () => TemplateLiteral,
 	This: () => This,
-	Tuple: () => Tuple$1,
+	Tuple: () => Tuple,
 	Uncapitalize: () => Uncapitalize,
 	Undefined: () => Undefined,
 	Union: () => Union,
@@ -11361,4 +11406,4 @@ function superRefine(fn, params) {
 //#endregion
 export { Form$1 as a, FormFieldSwitch as c, string as i, useForm as l, boolean as n, FormField as o, object as r, FormFieldSelect as s, _enum as t };
 
-//# sourceMappingURL=schemas-CAs9LqPk.js.map
+//# sourceMappingURL=schemas-l8C4cVM-.js.map