@strictly/react-form 0.0.34 → 0.0.36

package/.out/core/mobx/FormModel.d.ts

@@ -32,10 +32,14 @@ export type ContextOf<TypePathsToAdapters extends Partial<Readonly<Record<string
     readonly [K in keyof TypePathsToAdapters]: TypePathsToAdapters[K] extends undefined ? undefined : unknown extends ContextOfFieldAdapter<NonNullable<TypePathsToAdapters[K]>> ? never : ContextOfFieldAdapter<NonNullable<TypePathsToAdapters[K]>>;
 }[keyof TypePathsToAdapters] | {}>;
 export type FormMode = 'edit' | 'create';
+export type FormModelContextSource<ContextType, V, ValuePath extends string | number | symbol> = {
+    forPath(value: V, valuePath: ValuePath): ContextType;
+};
 export declare abstract class FormModel<T extends Type, ValueToTypePaths extends Readonly<Record<string, string>>, TypePathsToAdapters extends FlattenedTypePathsToAdaptersOf<FlattenedValuesOfType<T, '*'>, ContextType>, ContextType = ContextOf<TypePathsToAdapters>, ValuePathsToAdapters extends ValuePathsToAdaptersOf<TypePathsToAdapters, ValueToTypePaths> = ValuePathsToAdaptersOf<TypePathsToAdapters, ValueToTypePaths>> {
     readonly type: T;
     private readonly originalValue;
     protected readonly adapters: TypePathsToAdapters;
+    protected readonly contextSource: FormModelContextSource<ContextType, ValueOfType<ReadonlyTypeOfType<T>>, keyof ValuePathsToAdapters>;
     protected readonly mode: FormMode;
     private accessor observableValue;
     accessor fieldOverrides: FlattenedFieldOverrides<ValuePathsToAdapters>;
@@ -44,8 +48,7 @@ export declare abstract class FormModel<T extends Type, ValueToTypePaths extends
     private readonly flattenedTypeDefs;
     private readonly originalValues;
     private readonly listIndicesToKeys;
-    constructor(type: T, originalValue: ValueOfType<ReadonlyTypeOfType<T>>, adapters: TypePathsToAdapters, mode: FormMode);
-    protected abstract toContext(value: ValueOfType<ReadonlyTypeOfType<T>>, valuePath: keyof ValuePathsToAdapters): ContextType;
+    constructor(type: T, originalValue: ValueOfType<ReadonlyTypeOfType<T>>, adapters: TypePathsToAdapters, contextSource: FormModelContextSource<ContextType, ValueOfType<ReadonlyTypeOfType<T>>, keyof ValuePathsToAdapters>, mode: FormMode);
     get forceMutableFields(): boolean;
     get value(): ValueOfType<ReadonlyTypeOfType<T>>;
     get fields(): SimplifyDeep<FlattenedConvertedFieldsOf<ValuePathsToAdapters>>;

package/.out/core/mobx/FormModel.js

@@ -87,7 +87,7 @@ let FormModel = (() => {
             set errorOverrides(value) { __classPrivateFieldSet(this, _FormModel_errorOverrides_accessor_storage, value, "f"); }
             get validation() { return __classPrivateFieldGet(this, _FormModel_validation_accessor_storage, "f"); }
             set validation(value) { __classPrivateFieldSet(this, _FormModel_validation_accessor_storage, value, "f"); }
-            constructor(type, originalValue, adapters, mode) {
+            constructor(type, originalValue, adapters, contextSource, mode) {
                 Object.defineProperty(this, "type", {
                     enumerable: true,
                     configurable: true,
@@ -106,6 +106,12 @@ let FormModel = (() => {
                     writable: true,
                     value: adapters
                 });
+                Object.defineProperty(this, "contextSource", {
+                    enumerable: true,
+                    configurable: true,
+                    writable: true,
+                    value: contextSource
+                });
                 Object.defineProperty(this, "mode", {
                     enumerable: true,
                     configurable: true,
@@ -144,7 +150,7 @@ let FormModel = (() => {
                 // then returned to
                 const conversions = flattenValueTo(type, originalValue, () => { }, (_t, fieldValue, _setter, typePath, valuePath) => {
                     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-                    const contextValue = this.toContext(originalValue, valuePath);
+                    const contextValue = contextSource.forPath(originalValue, valuePath);
                     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
                     const adapter = this.adapters[typePath];
                     if (adapter == null) {
@@ -230,7 +236,7 @@ let FormModel = (() => {
                 const accessor = this.getAccessorForValuePath(valuePath);
                 // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
                 const fieldTypeDef = this.flattenedTypeDefs[typePath];
-                const context = this.toContext(this.observableValue, valuePath);
+                const context = this.contextSource.forPath(this.observableValue, valuePath);
                 // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
                 const defaultValue = create(valuePath, context);
                 const { value, required, readonly, } = convert(accessor != null
@@ -362,7 +368,7 @@ let FormModel = (() => {
                     elementTypePath, 
                     // TODO what can we use for the value path here?
                     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-                    this.toContext(this.observableValue, valuePath));
+                    this.contextSource.forPath(this.observableValue, valuePath));
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 const originalList = accessor.value;
                 const newList = [
@@ -408,7 +414,7 @@ let FormModel = (() => {
                 const { revert } = this.getAdapterForValuePath(valuePath);
                 assertExists(revert, 'setting value not supported {}', valuePath);
                 // eslint-disable-next-line @typescript-eslint/consistent-type-assertions, @typescript-eslint/no-explicit-any
-                const conversion = revert(value, valuePath, this.toContext(this.observableValue, valuePath));
+                const conversion = revert(value, valuePath, this.contextSource.forPath(this.observableValue, valuePath));
                 const accessor = this.getAccessorForValuePath(valuePath);
                 return runInAction(() => {
                     this.fieldOverrides[valuePath] = [value];
@@ -462,8 +468,8 @@ let FormModel = (() => {
                     return;
                 }
                 const { convert, create, } = adapter;
-                // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-                const context = this.toContext(this.observableValue, valuePath);
+                const context = this.contextSource.forPath(this.observableValue, // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+                valuePath);
                 const value = create(valuePath, context);
                 const { value: displayValue, } = convert(value, valuePath, context);
                 // eslint-disable-next-line @typescript-eslint/consistent-type-assertions

package/.out/core/mobx/specs/FormModel.tests.js

@@ -12,13 +12,18 @@ import { createMockedAdapter, resetMockAdapter, } from './fixtures';
 const IS_NAN_ERROR = 1;
 const originalIntegerToStringAdapter = adapterFromTwoWayConverter(new IntegerToStringConverter(IS_NAN_ERROR), prototypingFieldValueFactory(0));
 const originalBooleanToBooleanAdapter = identityAdapter(false);
-class TestFormModel extends FormModel {
-    toContext(value, valuePath) {
+class TestFormContextSource {
+    forPath(value, valuePath) {
         return {
             value,
             valuePath,
         };
     }
+}
+class TestFormModel extends FormModel {
+    constructor(type, originalValue, adapters, mode) {
+        super(type, originalValue, adapters, new TestFormContextSource(), mode);
+    }
     setFieldValueAndValidate(valuePath, value) {
         this.setFieldValue(valuePath, value, Validation.Always);
     }