@strictly/define 0.0.30 → 0.0.32

package/dist/index.js

@@ -19,7 +19,7 @@ var __spreadValues = (a, b) => {
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 
-// transformers/copies/copy_to.ts
+// transformers/copies/copyTo.ts
 import {
   map,
   reduce,
@@ -27,7 +27,7 @@ import {
   UnreachableError
 } from "@strictly/base";
 
-// types/definitions.ts
+// types/Type.ts
 var TypeDefType = /* @__PURE__ */ ((TypeDefType2) => {
   TypeDefType2[TypeDefType2["Literal"] = 1] = "Literal";
   TypeDefType2[TypeDefType2["List"] = 2] = "List";
@@ -37,7 +37,7 @@ var TypeDefType = /* @__PURE__ */ ((TypeDefType2) => {
   return TypeDefType2;
 })(TypeDefType || {});
 
-// transformers/copies/copy_to.ts
+// transformers/copies/copyTo.ts
 function copyTo({ definition }, value, copier) {
   return internalCopyTo(
     definition,
@@ -136,14 +136,7 @@ function copyUnion(typeDef, value, copier) {
   } = typeDef;
   if (discriminator != null) {
     const discriminatorValue = value[discriminator];
-    const discriminatingUnion = __spreadProps(__spreadValues({}, internalCopyTo(
-      unions[discriminatorValue],
-      value,
-      copier
-    )), {
-      [discriminator]: discriminatorValue
-    });
-    return copier(discriminatingUnion, typeDef);
+    return internalCopyTo(unions[discriminatorValue], value, copier);
   }
   const allTypeDefs = Object.values(unions);
   const variableTypeDefs = allTypeDefs.filter(function(typeDef2) {
@@ -168,23 +161,22 @@ function copy(t, proto) {
   return copyTo(t, proto, identity);
 }
 
-// transformers/copies/mobx_copy.ts
+// transformers/copies/mobxCopy.ts
 import {
   reduce as reduce3,
   UnreachableError as UnreachableError3
 } from "@strictly/base";
 import {
-  makeObservable,
   observable
 } from "mobx";
 
-// transformers/flatteners/flatten_value_to.ts
+// transformers/flatteners/flattenValueTo.ts
 import {
   reduce as reduce2,
   UnreachableError as UnreachableError2
 } from "@strictly/base";
 
-// transformers/flatteners/json_path.ts
+// transformers/flatteners/jsonPath.ts
 import {
   assertEqual,
   assertState
@@ -212,7 +204,7 @@ function jsonPathUnprefix(prefix, path) {
   return `$${path.slice(prefix.length)}`;
 }
 
-// transformers/flatteners/flatten_value_to.ts
+// transformers/flatteners/flattenValueTo.ts
 function flattenValueTo({ definition }, v, setter, mapper2, listIndicesToKeys = {}) {
   const r = {};
   internalFlattenValue(
@@ -353,7 +345,7 @@ function getUnionTypeDef(typeDef, v) {
   return typeDef.unions[v[typeDef.discriminator]];
 }
 
-// transformers/copies/mobx_copy.ts
+// transformers/copies/mobxCopy.ts
 function observeValue(v, def) {
   if (v == null) {
     return v;
@@ -372,7 +364,7 @@ function observeValue(v, def) {
         }
       );
     case 4 /* Object */:
-      return makeObservable(
+      return observable(
         v,
         reduce3(
           def.fields,
@@ -463,7 +455,7 @@ function internalUnionEquals({
   return o1 === o2 || variableTypeDefs.length === 1 && internalEquals(variableTypeDefs[0], o1, o2);
 }
 
-// transformers/flatteners/flatten_accessors_of_type.ts
+// transformers/flatteners/flattenAccessorsOfType.ts
 function mapAccessor(_t, value, set) {
   return {
     value,
@@ -480,7 +472,7 @@ function flattenAccessorsOfType(t, value, setValue, listIndicesToKeys) {
   );
 }
 
-// transformers/flatteners/flatten_json_value_to_type_paths_of.ts
+// transformers/flatteners/flattenJsonValueToTypePathsOf.ts
 function mapTypePaths(_t, _value, _set, typePath) {
   return typePath;
 }
@@ -495,7 +487,7 @@ function flattenJsonValueToTypePathsOf(t, value, listIndicesToKeys) {
   );
 }
 
-// transformers/flatteners/flatten_type_to.ts
+// transformers/flatteners/flattenTypeTo.ts
 import {
   reduce as reduce4,
   UnreachableError as UnreachableError5
@@ -569,7 +561,7 @@ function internalFlattenUnionTypeDefChildren(path, qualifier, {
   );
 }
 
-// transformers/flatteners/flatten_types_of_type.ts
+// transformers/flatteners/flattenTypesOfType.ts
 function flattenTypesOfType(t) {
   return flattenTypeTo(
     t,
@@ -579,7 +571,7 @@ function flattenTypesOfType(t) {
   );
 }
 
-// transformers/flatteners/flatten_validators_of_validating_type.ts
+// transformers/flatteners/flattenValidatorsOfValidatingType.ts
 function flattenValidatorsOfValidatingType(type) {
   return flattenTypeTo(type, function(definition) {
     const {
@@ -600,7 +592,7 @@ function flattenValidatorsOfValidatingType(type) {
   });
 }
 
-// transformers/flatteners/flatten_values_of_type.ts
+// transformers/flatteners/flattenValuesOfType.ts
 function mapper(_t, v) {
   return v;
 }
@@ -615,7 +607,7 @@ function flattenValuesOfType(typeDef, value, listIndicesToKeys) {
   );
 }
 
-// transformers/flatteners/value_path_to_type_path.ts
+// transformers/flatteners/valuePathToTypePath.ts
 import {
   assertEqual as assertEqual2,
   assertExists,
@@ -767,7 +759,13 @@ function internalJsonValuePathToTypePath(typeDef, qualifiers, valueSteps, allowM
   }
 }
 
-// validation/validators/composite_validator.ts
+// types/builders.ts
+import {
+  map as map3,
+  UnreachableError as UnreachableError8
+} from "@strictly/base";
+
+// validation/validators/CompositeValidator.ts
 var CompositeValidator = class {
   constructor(...validators) {
     __publicField(this, "validators");
@@ -835,7 +833,7 @@ function mergeAnnotations(a1, a2) {
   };
 }
 
-// types/type_of_type.ts
+// types/typeOfType.ts
 import {
   map as map2,
   UnreachableError as UnreachableError7
@@ -1036,18 +1034,45 @@ var UnionTypeDefBuilder = class _UnionTypeDefBuilder extends TypeDefBuilder {
     definition: typeDef
   }) {
     const {
-      unions
+      unions,
+      discriminator
     } = this.definition;
+    const enhancedTypeDef = maybeAddDiscriminatorField(typeDef, discriminator, k);
     return new _UnionTypeDefBuilder(
       __spreadProps(__spreadValues({}, this.definition), {
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
         unions: __spreadProps(__spreadValues({}, unions), {
-          [k]: typeDef
+          [k]: enhancedTypeDef
         })
       })
     );
   }
 };
+function maybeAddDiscriminatorField(t, discriminatorKey, discriminatorLiteral) {
+  if (discriminatorKey == null) {
+    return t;
+  }
+  switch (t.type) {
+    case 2 /* List */:
+    case 1 /* Literal */:
+    case 3 /* Record */:
+      return t;
+    case 4 /* Object */:
+      return __spreadProps(__spreadValues({}, t), {
+        fields: __spreadProps(__spreadValues({}, t.fields), {
+          [discriminatorKey]: literal([discriminatorLiteral]).readonly().required().narrow.definition
+        })
+      });
+    case 5 /* Union */:
+      return __spreadProps(__spreadValues({}, t), {
+        unions: map3(t.unions, (_k, v) => {
+          return maybeAddDiscriminatorField(v, discriminatorKey, discriminatorLiteral);
+        })
+      });
+    default:
+      throw new UnreachableError8(t);
+  }
+}
 function literal(value) {
   return new TypeDefBuilder({
     type: 1 /* Literal */,
@@ -1119,7 +1144,7 @@ function union(discriminator) {
   );
 }
 
-// validation/validators/defined_validator.ts
+// validation/validators/DefinedValidator.ts
 var DefinedValidator = class {
   constructor(error) {
     this.error = error;
@@ -1138,7 +1163,7 @@ var DefinedValidator = class {
   }
 };
 
-// validation/validators/maximum_string_length_validator.ts
+// validation/validators/MaximumStringLengthValidator.ts
 var MaximumStringLengthValidationErrorType = "maximum_string_length";
 var MaximumStringLengthValidator = class {
   constructor(maximumLength) {
@@ -1162,7 +1187,7 @@ var MaximumStringLengthValidator = class {
   }
 };
 
-// validation/validators/minimum_string_length_validator.ts
+// validation/validators/MinimumStringLengthValidator.ts
 var MinimumStringLengthValidationErrorType = "minimum_string_length";
 var MinimumStringLengthValidator = class {
   constructor(minimumLength) {
@@ -1186,7 +1211,7 @@ var MinimumStringLengthValidator = class {
   }
 };
 
-// validation/validators/optional_validator_proxy.ts
+// validation/validators/OptionalValidatorProxy.ts
 var OptionalValidatorProxy = class _OptionalValidatorProxy {
   constructor(proxied, isRequired) {
     this.proxied = proxied;
@@ -1211,7 +1236,7 @@ var OptionalValidatorProxy = class _OptionalValidatorProxy {
   }
 };
 
-// validation/validators/regexp_validator.ts
+// validation/validators/RegexpValidator.ts
 var RegexpValidationErrorType = "regexp";
 var _RegexpValidator = class _RegexpValidator {
   constructor(regexp, intent, {

package/index.ts

@@ -1,30 +1,30 @@
 export * from './transformers/copies/copy'
-export * from './transformers/copies/mobx_copy'
+export * from './transformers/copies/mobxCopy'
 export * from './transformers/equals'
-export * from './transformers/flatteners/flatten_accessors_of_type'
-export * from './transformers/flatteners/flatten_json_value_to_type_paths_of'
-export * from './transformers/flatteners/flatten_types_of_type'
-export * from './transformers/flatteners/flatten_validators_of_validating_type'
-export * from './transformers/flatteners/flatten_value_to'
-export * from './transformers/flatteners/flatten_values_of_type'
-export * from './transformers/flatteners/json_path'
-export * from './transformers/flatteners/value_path_to_type_path'
+export * from './transformers/flatteners/flattenAccessorsOfType'
+export * from './transformers/flatteners/flattenJsonValueToTypePathsOf'
+export * from './transformers/flatteners/flattenTypesOfType'
+export * from './transformers/flatteners/flattenValidatorsOfValidatingType'
+export * from './transformers/flatteners/flattenValuesOfType'
+export * from './transformers/flatteners/flattenValueTo'
+export * from './transformers/flatteners/jsonPath'
+export * from './transformers/flatteners/valuePathToTypePath'
 export * from './types/builders'
-export * from './types/definitions'
-export * from './types/flattened_accessors_of_type'
-export * from './types/flattened_types_of_type'
-export * from './types/flattened_values_of_type'
-export * from './types/mobx_value_of_type'
-export * from './types/paths_of_type'
-export * from './types/readonly_type_of_type'
-export * from './types/strict_definitions'
-export * from './types/value_of_type'
-export * from './types/value_to_type_paths_of_type'
-export * from './types/value_types_of_discriminated_union'
+export * from './types/FlattenedAccessorsOfType'
+export * from './types/FlattenedTypesOfType'
+export * from './types/FlattenedValuesOfType'
+export * from './types/MobxValueOfType'
+export * from './types/PathsOfType'
+export * from './types/ReadonlyTypeOfType'
+export * from './types/StrictType'
+export * from './types/Type'
+export * from './types/ValueOfType'
+export * from './types/ValueToTypePathsOfType'
+export * from './types/ValueTypesOfDiscriminatedUnion'
 export * from './validation/validator'
-export * from './validation/validators/defined_validator'
-export * from './validation/validators/maximum_string_length_validator'
-export * from './validation/validators/minimum_string_length_validator'
-export * from './validation/validators/optional_validator_proxy'
-export * from './validation/validators/regexp_validator'
-export * from './validation/validators_of_values'
+export * from './validation/validators/DefinedValidator'
+export * from './validation/validators/MaximumStringLengthValidator'
+export * from './validation/validators/MinimumStringLengthValidator'
+export * from './validation/validators/OptionalValidatorProxy'
+export * from './validation/validators/RegexpValidator'
+export * from './validation/ValidatorsOfValues'

package/package.json

@@ -38,7 +38,7 @@
     "test:watch": "vitest"
   },
   "type": "module",
-  "version": "0.0.30",
+  "version": "0.0.32",
   "exports": {
     ".": {
       "import": {

package/transformers/copies/copy.ts

@@ -1,10 +1,10 @@
-import { type ReadonlyTypeOfType } from 'types/readonly_type_of_type'
-import { type StrictType } from 'types/strict_definitions'
-import { type ValueOfType } from 'types/value_of_type'
+import { type ReadonlyTypeOfType } from 'types/ReadonlyTypeOfType'
+import { type StrictType } from 'types/StrictType'
+import { type ValueOfType } from 'types/ValueOfType'
 import {
   type AnyValueType,
   copyTo,
-} from './copy_to'
+} from './copyTo'
 
 function identity(v: AnyValueType): AnyValueType {
   return v

package/transformers/copies/{copy_to.ts → copyTo.ts}

@@ -4,13 +4,7 @@ import {
   UnexpectedImplementationError,
   UnreachableError,
 } from '@strictly/base'
-import {
-  type ObjectFieldKey,
-  type TypeDef,
-  TypeDefType,
-  type UnionKey,
-} from 'types/definitions'
-import { type ReadonlyTypeOfType } from 'types/readonly_type_of_type'
+import { type ReadonlyTypeOfType } from 'types/ReadonlyTypeOfType'
 import {
   type StrictListTypeDef,
   type StrictLiteralTypeDef,
@@ -20,8 +14,14 @@ import {
   type StrictType,
   type StrictTypeDef,
   type StrictUnionTypeDef,
-} from 'types/strict_definitions'
-import { type ValueOfType } from 'types/value_of_type'
+} from 'types/StrictType'
+import {
+  type ObjectFieldKey,
+  type TypeDef,
+  TypeDefType,
+  type UnionKey,
+} from 'types/Type'
+import { type ValueOfType } from 'types/ValueOfType'
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type AnyValueType = any
@@ -195,15 +195,7 @@ function copyUnion<
   // is it a discriminated union with a struct?
   if (discriminator != null) {
     const discriminatorValue = value[discriminator]
-    const discriminatingUnion = {
-      ...internalCopyTo(
-        unions[discriminatorValue],
-        value,
-        copier,
-      ),
-      [discriminator]: discriminatorValue,
-    }
-    return copier(discriminatingUnion, typeDef)
+    return internalCopyTo(unions[discriminatorValue], value, copier)
   }
 
   // is it a `<constant1> | <constant2> | X`? We can handle that

package/transformers/copies/{mobx_copy.ts → mobxCopy.ts}

@@ -4,25 +4,24 @@ import {
 } from '@strictly/base'
 import {
   type IObservableFactory,
-  makeObservable,
   observable,
 } from 'mobx'
-import { getUnionTypeDef } from 'transformers/flatteners/flatten_value_to'
-import {
-  type ObjectFieldKey,
-  TypeDefType,
-} from 'types/definitions'
-import { type MobxValueOfType } from 'types/mobx_value_of_type'
-import { type ReadonlyTypeOfType } from 'types/readonly_type_of_type'
+import { getUnionTypeDef } from 'transformers/flatteners/flattenValueTo'
+import { type MobxValueOfType } from 'types/MobxValueOfType'
+import { type ReadonlyTypeOfType } from 'types/ReadonlyTypeOfType'
 import {
   type StrictType,
   type StrictTypeDef,
-} from 'types/strict_definitions'
-import { type ValueOfType } from 'types/value_of_type'
+} from 'types/StrictType'
+import {
+  type ObjectFieldKey,
+  TypeDefType,
+} from 'types/Type'
+import { type ValueOfType } from 'types/ValueOfType'
 import {
   type AnyValueType,
   copyTo,
-} from './copy_to'
+} from './copyTo'
 
 function observeValue(
   v: AnyValueType,
@@ -49,7 +48,7 @@ function observeValue(
       )
     case TypeDefType.Object:
       // `makeObservable` only observes the specified props
-      return makeObservable(
+      return observable(
         v,
         reduce(
           def.fields,

package/transformers/copies/specs/{copy_to.tests.ts → copyTo.tests.ts}

@@ -1,7 +1,7 @@
 import {
   type AnyValueType,
   copyTo,
-} from 'transformers/copies/copy_to'
+} from 'transformers/copies/copyTo'
 import {
   booleanType,
   list,
@@ -12,8 +12,8 @@ import {
   stringType,
   union,
 } from 'types/builders'
-import { TypeDefType } from 'types/definitions'
-import { type StrictTypeDef } from 'types/strict_definitions'
+import { type StrictTypeDef } from 'types/StrictType'
+import { TypeDefType } from 'types/Type'
 
 describe('copyTo', function () {
   function toString(v: AnyValueType, t: StrictTypeDef) {
@@ -134,7 +134,7 @@ describe('copyTo', function () {
         )
 
         expect(c).toEqual({
-          d: 'a',
+          d: '"a"',
           x: '1',
         })
       })

package/transformers/copies/specs/{mobx_copy.tests.ts → mobxCopy.tests.ts}

@@ -1,9 +1,9 @@
-import { mobxCopy } from 'transformers/copies/mobx_copy'
+import { mobxCopy } from 'transformers/copies/mobxCopy'
 import {
   numberType,
   object,
 } from 'types/builders'
-import { type ValueOfType } from 'types/value_of_type'
+import { type ValueOfType } from 'types/ValueOfType'
 
 describe('mobxCopy', function () {
   describe('object', function () {

package/transformers/equals.ts

@@ -9,8 +9,8 @@ import {
   type TypeDef,
   TypeDefType,
   type UnionTypeDef,
-} from 'types/definitions'
-import { type ValueOfType } from 'types/value_of_type'
+} from 'types/Type'
+import { type ValueOfType } from 'types/ValueOfType'
 
 export function equals<T extends Type>({ definition }: T, o1: ValueOfType<T>, o2: ValueOfType<T>): boolean {
   return internalEquals(definition, o1, o2)

package/transformers/flatteners/{flatten_accessors_of_type.ts → flattenAccessorsOfType.ts}

@@ -1,17 +1,17 @@
-import {
-  type Type,
-  type TypeDef,
-} from 'types/definitions'
 import {
   type Accessor,
   type FlattenedAccessorsOfType,
-} from 'types/flattened_accessors_of_type'
-import { type ValueOfType } from 'types/value_of_type'
+} from 'types/FlattenedAccessorsOfType'
+import {
+  type Type,
+  type TypeDef,
+} from 'types/Type'
+import { type ValueOfType } from 'types/ValueOfType'
 import {
   type AnyValueType,
   flattenValueTo,
   type Setter,
-} from './flatten_value_to'
+} from './flattenValueTo'
 
 function mapAccessor(
   _t: TypeDef,

package/transformers/flatteners/{flatten_json_value_to_type_paths_of.ts → flattenJsonValueToTypePathsOf.ts}

@@ -1,13 +1,13 @@
 import {
   type Type,
   type TypeDef,
-} from 'types/definitions'
-import { type ValueOfType } from 'types/value_of_type'
+} from 'types/Type'
+import { type ValueOfType } from 'types/ValueOfType'
 import {
   type AnyValueType,
   flattenValueTo,
   type Setter,
-} from './flatten_value_to'
+} from './flattenValueTo'
 
 function mapTypePaths(
   _t: TypeDef,

package/transformers/flatteners/{flatten_type_to.ts → flattenTypeTo.ts}

@@ -2,9 +2,6 @@ import {
   reduce,
   UnreachableError,
 } from '@strictly/base'
-import {
-  TypeDefType,
-} from 'types/definitions'
 import {
   type StrictListTypeDef,
   type StrictObjectTypeDef,
@@ -12,8 +9,9 @@ import {
   type StrictType,
   type StrictTypeDef,
   type StrictUnionTypeDef,
-} from 'types/strict_definitions'
-import { jsonPath } from './json_path'
+} from 'types/StrictType'
+import { TypeDefType } from 'types/Type'
+import { jsonPath } from './jsonPath'
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type AnyValueType = any

package/transformers/flatteners/{flatten_types_of_type.ts → flattenTypesOfType.ts}

@@ -1,9 +1,9 @@
+import { type StrictType } from 'types/StrictType'
 import {
   type Type,
   type TypeDef,
-} from 'types/definitions'
-import { type StrictType } from 'types/strict_definitions'
-import { flattenTypeTo } from './flatten_type_to'
+} from 'types/Type'
+import { flattenTypeTo } from './flattenTypeTo'
 
 export function flattenTypesOfType<T extends StrictType>(t: T) {
   // Type should be FlattenedTypeDefsOf<T>, but infinite depth error

package/transformers/flatteners/{flatten_validation_errors_of_type.ts → flattenValidationErrorsOfType.ts}

@@ -1,18 +1,18 @@
-import { type AnyValueType } from 'transformers/copies/copy_to'
+import { type AnyValueType } from 'transformers/copies/copyTo'
 import {
   flattenValueTo,
   type Setter,
-} from 'transformers/flatteners/flatten_value_to'
+} from 'transformers/flatteners/flattenValueTo'
 import {
   type ReadonlyDeep,
   type ValueOf,
 } from 'type-fest'
-import { type Type } from 'types/definitions'
-import { type FlattenedTypesOfType } from 'types/flattened_types_of_type'
-import { type FlattenedValuesOfType } from 'types/flattened_values_of_type'
-import { type ReadonlyTypeOfType } from 'types/readonly_type_of_type'
-import { type StrictTypeDef } from 'types/strict_definitions'
-import { type ValueOfType } from 'types/value_of_type'
+import { type FlattenedTypesOfType } from 'types/FlattenedTypesOfType'
+import { type FlattenedValuesOfType } from 'types/FlattenedValuesOfType'
+import { type ReadonlyTypeOfType } from 'types/ReadonlyTypeOfType'
+import { type StrictTypeDef } from 'types/StrictType'
+import { type Type } from 'types/Type'
+import { type ValueOfType } from 'types/ValueOfType'
 import {
   validate,
   type Validator,

package/transformers/flatteners/{flatten_validators_of_validating_type.ts → flattenValidatorsOfValidatingType.ts}

@@ -1,11 +1,11 @@
-import { type FlattenedTypesOfValidatingType } from 'types/flattened_types_of_validating_type'
-import { type FlattenedValidatorsOfValidatingType } from 'types/flattened_validators_of_validating_type'
+import { type FlattenedTypesOfValidatingType } from 'types/FlattenedTypesOfValidatingType'
+import { type FlattenedValidatorsOfValidatingType } from 'types/FlattenedValidatorsOfValidatingType'
 import {
   type ValidatingType,
   type ValidatingTypeDef,
-} from 'types/validating_definitions'
+} from 'types/ValidatingType'
 import { type Validator } from 'validation/validator'
-import { flattenTypeTo } from './flatten_type_to'
+import { flattenTypeTo } from './flattenTypeTo'
 
 export function flattenValidatorsOfValidatingType<
   T extends ValidatingType,

package/transformers/flatteners/{flatten_value_to.ts → flattenValueTo.ts}

@@ -2,12 +2,7 @@ import {
   reduce,
   UnreachableError,
 } from '@strictly/base'
-import {
-  type TypeDef,
-  TypeDefType,
-  type UnionTypeDef,
-} from 'types/definitions'
-import { type ReadonlyTypeOfType } from 'types/readonly_type_of_type'
+import { type ReadonlyTypeOfType } from 'types/ReadonlyTypeOfType'
 import {
   type StrictListTypeDef,
   type StrictObjectTypeDef,
@@ -15,9 +10,14 @@ import {
   type StrictType,
   type StrictTypeDef,
   type StrictUnionTypeDef,
-} from 'types/strict_definitions'
-import { type ValueOfType } from 'types/value_of_type'
-import { jsonPath } from './json_path'
+} from 'types/StrictType'
+import {
+  type TypeDef,
+  TypeDefType,
+  type UnionTypeDef,
+} from 'types/Type'
+import { type ValueOfType } from 'types/ValueOfType'
+import { jsonPath } from './jsonPath'
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type AnyValueType = any
@@ -37,7 +37,7 @@ export function flattenValueTo<
   R extends Readonly<Record<string, M>>,
 >(
   { definition }: T,
-  v: ValueOfType<T>,
+  v: ValueOfType<ReadonlyTypeOfType<T>>,
   setter: Setter<ValueOfType<T>>,
   mapper: Mapper<M>,
   // used to maintain keys when changing lists, note that the format for a list of three elements is