ballerina-core 1.0.28 → 1.0.31

package/main.ts

@@ -91,6 +91,8 @@ export * from "./src/forms/domains/primitives/domains/searchable-infinite-stream
 export * from "./src/forms/domains/primitives/domains/searchable-infinite-stream-multiselect/template"
 export * from "./src/forms/domains/primitives/domains/list/state"
 export * from "./src/forms/domains/primitives/domains/list/template"
+export * from "./src/forms/domains/primitives/domains/map/state"
+export * from "./src/forms/domains/primitives/domains/map/template"
 export * from "./src/forms/domains/singleton/domains/mapping/state"
 export * from "./src/forms/domains/singleton/domains/mapping/template"
 export * from "./src/forms/domains/parser/state"

package/package.json

@@ -2,7 +2,7 @@
   "name": "ballerina-core",
   "author": "Dr. Giuseppe Maggiore",
   "private": false,
-  "version": "1.0.28",
+  "version": "1.0.31",
   "main": "main.ts",
   "dependencies": {
     "immutable": "^5.0.0-beta.5",

package/src/async/domains/mirroring/domains/entity/domains/loaded-collection-entity/state.ts

@@ -1,3 +1,4 @@
+import { Sum } from "../../../../../../../../main";
 import { DebouncedStatus, DirtyStatus } from "../../../../../../../debounced/state";
 import { AsyncState } from "../../../../../../state";
 import { CollectionEntity } from "../../../collection/state";
@@ -7,7 +8,7 @@ export type LoadedCollectionEntity<E> = LoadedEntity<E> & {
   isRemoved:boolean;
   lastUpdated: number;
   dirty: DirtyStatus;
-  status: DebouncedStatus;
+  status: Sum<DebouncedStatus, "debug off">;
 };
 export const LoadedCollectionEntity = {
   Default:{

package/src/async/domains/mirroring/domains/entity/domains/loaded-entity/state.ts

@@ -1,3 +1,4 @@
+import { Sum } from "../../../../../../../../main";
 import { DebouncedStatus, DirtyStatus } from "../../../../../../../debounced/state";
 import { AsyncState } from "../../../../../../state";
 import { Entity } from "../../state";
@@ -10,7 +11,7 @@ export type LoadedEntity<E> = {
   synchronizationErrors:Array<any>;
   lastUpdated: number;
   dirty: DirtyStatus;
-  status: DebouncedStatus;
+  status: Sum<DebouncedStatus, "debug off">;
 };
 export const LoadedEntity = {
   Default:{

package/src/debounced/coroutines/debounce.ts

@@ -26,11 +26,18 @@ export const Debounce = <value, context = Unit>(
     Co.SetState(
       updaters.Core.dirty(replaceWith<DirtyStatus>("dirty but being processed"))
     ),
-    Co.SetState(
-      updaters.Core.status(
-        replaceWith<DebouncedStatus>("just detected dirty, starting processing")
-      )
-    ),
+    Co.GetState().then((current) => {
+      if (current.status.kind == "l") {
+        return Co.SetState(
+          updaters.Core.status(
+            replaceWith<DebouncedStatus>(
+              "just detected dirty, starting processing"
+            )
+          )
+        );
+      }
+      else return Co.Do(() => {});
+    }),
     Co.Any([
       // shortcircuit the validation if it takes longer than the whole cycle in the presence of an underwater update of the field
       Co.Seq([
@@ -40,22 +47,36 @@ export const Debounce = <value, context = Unit>(
             Date.now() - current.lastUpdated <= debounceDurationInMs,
           Co.Wait(debounceDurationInMs / 5)
         ),
-        Co.SetState(
-          updaters.Core.status(
-            replaceWith<DebouncedStatus>("processing shortcircuited")
-          )
-        ),
+        Co.GetState().then((current) => {
+          if (current.status.kind == "l") {
+            return Co.SetState(
+              updaters.Core.status(
+                replaceWith<DebouncedStatus>(
+                  "processing shortcircuited"
+                )
+              )
+            );
+          }
+          else return Co.Do(() => {});
+        }),
         Co.Wait(debounceDurationInMs / 2),
       ]),
       k
         .embed((_: Debounced<value & context>) => _, updaters.Core.value)
         .then((apiResult) => {
           return Co.Seq([
-            Co.SetState(
-              updaters.Core.status(
-                replaceWith<DebouncedStatus>("processing finished")
-              )
-            ),
+            Co.GetState().then((current) => {
+              if (current.status.kind == "l") {
+                return Co.SetState(
+                  updaters.Core.status(
+                    replaceWith<DebouncedStatus>(
+                      "processing finished"
+                    )
+                  )
+                );
+              }
+              else return Co.Do(() => {});
+            }),
             // Co.Wait(250)
           ]).then(() => {
             return Co.GetState().then((current) => {
@@ -64,13 +85,18 @@ export const Debounce = <value, context = Unit>(
                 // maybe a new change has already reset dirty, in that case we need to start all over again
                 if (current.dirty == "dirty but being processed") {
                   return Co.Seq([
-                    Co.SetState(
-                      updaters.Core.status(
-                        replaceWith<DebouncedStatus>(
-                          "state was still dirty but being processed, resetting to not dirty"
-                        )
-                      )
-                    ),
+                    Co.GetState().then((current) => {
+                      if (current.status.kind == "l") {
+                        return Co.SetState(
+                          updaters.Core.status(
+                            replaceWith<DebouncedStatus>(
+                              "state was still dirty but being processed, resetting to not dirty"
+                            )
+                          )
+                        );
+                      }
+                      else return Co.Do(() => {});
+                    }),
                     // use UpdateState to make sure that we look up the state at the last possible moment to account for delays
                     Co.UpdateState((state) =>
                       state.dirty == "dirty but being processed"
@@ -82,13 +108,18 @@ export const Debounce = <value, context = Unit>(
                   ]);
                 } else {
                   return Co.Seq([
-                    Co.SetState(
-                      updaters.Core.status(
-                        replaceWith<DebouncedStatus>(
-                          "state was changed underwater back to dirty, leaving the dirty flag alone"
-                        )
-                      )
-                    ),
+                    Co.GetState().then((current) => {
+                      if (current.status.kind == "l") {
+                        return Co.SetState(
+                          updaters.Core.status(
+                            replaceWith<DebouncedStatus>(
+                               "state was changed underwater back to dirty, leaving the dirty flag alone"
+                            )
+                          )
+                        );
+                      }
+                      else return Co.Do(() => {});
+                    }),
                     Co.SetState(
                       updaters.Core.dirty(replaceWith<DirtyStatus>("dirty"))
                     ),
@@ -97,13 +128,18 @@ export const Debounce = <value, context = Unit>(
                 }
               } else {
                 return Co.Seq([
-                  Co.SetState(
-                    updaters.Core.status(
-                      replaceWith<DebouncedStatus>(
-                        "inner call failed with transient failure"
-                      )
-                    )
-                  ),
+                  Co.GetState().then((current) => {
+                    if (current.status.kind == "l") {
+                      return Co.SetState(
+                        updaters.Core.status(
+                          replaceWith<DebouncedStatus>(
+                             "inner call failed with transient failure"
+                          )
+                        )
+                      );
+                    }
+                    else return Co.Do(() => {});
+                  }),
                   Co.SetState(
                     updaters.Core.dirty(replaceWith<DirtyStatus>("dirty"))
                   ),

package/src/debounced/state.ts

@@ -1,3 +1,4 @@
+import { Sum } from "../../main";
 import { replaceWith } from "../fun/domains/updater/domains/replaceWith/state";
 import { BasicUpdater, Updater } from "../fun/domains/updater/state";
 
@@ -7,19 +8,19 @@ export type DebouncedStatus = "waiting for dirty" | "just detected dirty, starti
 	| "processing shortcircuited"
 	| "state was changed underwater back to dirty, leaving the dirty flag alone"
 	| "inner call failed with transient failure"
-export type Debounced<Value> = Value & { lastUpdated: number; dirty: DirtyStatus; status:DebouncedStatus };
+export type Debounced<Value> = Value & { lastUpdated: number; dirty: DirtyStatus; status: Sum<DebouncedStatus, "debug off"> };
 export const Debounced = {
-	Default: <v>(initialValue: v): Debounced<v> => ({
+	Default: <v>(initialValue: v, debug?: boolean): Debounced<v> => ({
 		...initialValue,
 		lastUpdated: 0,
 		dirty: "not dirty",
-		status: "waiting for dirty"
+		status: debug ? Sum.Default.left("waiting for dirty") : Sum.Default.right("debug off")
 	}),
 	Updaters: {
 		Core:{
 			status: <v>(_: BasicUpdater<DebouncedStatus>): Updater<Debounced<v>> => Updater<Debounced<v>>(current => ({
 				...current,
-				status: _(current.status),
+				status: current.status.kind == "l" ? Sum.Default.left(_(current.status.value)) : Sum.Default.right("debug off"),
 			})),
 			dirty: <v>(_: BasicUpdater<DirtyStatus>): Updater<Debounced<v>> => Updater<Debounced<v>>(current => ({
 				...current,

package/src/forms/domains/launcher/domains/edit/coroutines/runner.ts

@@ -23,7 +23,7 @@ export const editFormRunner = <E, FS>() => {
 
   const init = Co.GetState().then((current) =>
     Synchronize<Unit, E>(
-      () => current.api.get(),
+      () => current.api.get(current.entityId),
       (_) => "transient failure",
       5,
       50
@@ -46,7 +46,7 @@ export const editFormRunner = <E, FS>() => {
             5,
             50
           ),
-          current.debounceRateMs ?? 15
+          15
         ).embed(
           (_) => ({ ..._, ..._.apiRunner }),
           EditFormState<E, FS>().Updaters.Core.apiRunner

package/src/forms/domains/launcher/domains/edit/state.ts

@@ -1,4 +1,4 @@
-import { ApiResponseChecker, AsyncState, BasicUpdater, Debounced, ForeignMutationsInput, id, SimpleCallback, simpleUpdater, Synchronized, Template, unit, Unit, Updater, Value } from "../../../../../../main"
+import { ApiResponseChecker, AsyncState, BasicUpdater, Debounced, ForeignMutationsInput, Guid, id, SimpleCallback, simpleUpdater, Synchronized, Template, unit, Unit, Updater, Value } from "../../../../../../main"
 import { BasicFun } from "../../../../../fun/state"
 
 export type ApiErrors = Array<string>
@@ -6,11 +6,10 @@ export type ApiErrors = Array<string>
 export type EditFormContext<E,FS> = {
   entityId:string,
   api:{
-    get:() => Promise<E>,
+    get:(id: Guid) => Promise<E>,
     update:BasicFun<E, Promise<ApiErrors>>
   },
-  actualForm:Template<Value<E> & FS, FS, { onChange:SimpleCallback<BasicUpdater<E>> }>
-  debounceRateMs?: number
+  actualForm:Template<Value<E> & FS, FS, { onChange:SimpleCallback<BasicUpdater<E>>}>
 }
 
 export type EditFormState<E,FS> = {
@@ -39,19 +38,19 @@ export const EditFormState = <E,FS>() => ({
       toChecked: () => ApiResponseChecker.Updaters.toChecked<EditFormState<E, FS>>(),
       toUnchecked: () => ApiResponseChecker.Updaters.toUnchecked<EditFormState<E, FS>>(),
       entity:(_:BasicUpdater<E>) : Updater<EditFormState<E,FS>> => 
-        EditFormState<E,FS>().Updaters.Core.apiRunner(
-          Debounced.Updaters.Template.value(
+          EditFormState<E,FS>().Updaters.Core.entity(
             Synchronized.Updaters.sync(
               AsyncState.Operations.map(
-                  id
+                  _
               )
             )
-          )
-        ).then(
-          EditFormState<E,FS>().Updaters.Core.entity(
+          ),
+      submit: () : Updater<EditFormState<E,FS>> =>
+        EditFormState<E,FS>().Updaters.Core.apiRunner(
+          Debounced.Updaters.Template.value(
             Synchronized.Updaters.sync(
               AsyncState.Operations.map(
-                  _
+                  id
               )
             )
           )

package/src/forms/domains/launcher/domains/edit/template.tsx

@@ -1,19 +1,41 @@
-import { AsyncState, editFormRunner, replaceWith, unit } from "../../../../../../main";
+import { AsyncState, editFormRunner, replaceWith, SimpleCallback, unit } from "../../../../../../main";
 import { Template } from "../../../../../template/state";
 import { EditFormContext, EditFormForeignMutationsExpected, EditFormState, EditFormWritableState } from "./state";
 
+export type EditFormView<E, FS> =
+  Template<
+  EditFormContext<E, FS> & EditFormWritableState<E, FS>,
+  EditFormWritableState<E, FS>,
+  EditFormForeignMutationsExpected<E, FS> & { onSubmit: SimpleCallback<void> },
+    {
+      actualForm: JSX.Element | undefined
+    }>
 export type EditFormTemplate<E, FS> =
   Template<
     EditFormContext<E, FS> & EditFormWritableState<E, FS>,
     EditFormWritableState<E, FS>,
-    EditFormForeignMutationsExpected<E, FS>>
+    EditFormForeignMutationsExpected<E, FS>,
+    EditFormView<E, FS>>
 export const EditFormTemplate = <E, FS>() : EditFormTemplate<E,FS> =>
   Template.Default<
     EditFormContext<E, FS> & EditFormWritableState<E, FS>,
     EditFormWritableState<E, FS>,
-    EditFormForeignMutationsExpected<E, FS>>(props =>
+    EditFormForeignMutationsExpected<E, FS>,
+    EditFormView<E, FS>
+    >(props =>
       <>
-        {
+      {
+        props.view({
+          ...props,
+          foreignMutations: {
+            ...props.foreignMutations,
+            onSubmit: () => {
+              props.setState(EditFormState<E, FS>().Updaters.Template.submit())
+            }
+          },
+          view: {
+            ...props.view,
+            actualForm:
           !AsyncState.Operations.hasValue(props.context.entity.sync) ? undefined :
             props.context.actualForm({
               context: {
@@ -28,11 +50,13 @@ export const EditFormTemplate = <E, FS>() : EditFormTemplate<E,FS> =>
               foreignMutations: {
                 onChange: (e) => {
                   props.setState(EditFormState<E, FS>().Updaters.Template.entity(e))
-                }
+                },
               },
               view: unit
             })
-        }
+          }
+        })
+      }
       </>
     ).any([
       editFormRunner<E, FS>().mapContextFromProps(props => ({

package/src/forms/domains/launcher/state.ts

@@ -6,8 +6,8 @@ export type FormRef = {
   formName:string
 } & ({
   kind:"edit",
+  submitButtonWrapper:any
   entityId:Guid,
-  debounceRateMs?:number
   apiHandlers?: {
     success?: (_: any) => void,
     error?: (_: any) => void,

package/src/forms/domains/launcher/template.tsx

@@ -25,7 +25,6 @@ export const FormRunnerTemplate =
         <props.context.form.value.form
           context={{
             ...props.context.form.value.formState,
-            debounceRateMs: props.context.formRef.kind == "edit" ? props.context.formRef.debounceRateMs : undefined,
             entityId: props.context.formRef.kind == "edit" ? props.context.formRef.entityId : undefined,
             value: props.context.formRef.kind == "map" ? props.context.formRef.value : undefined,
             formState: props.context.formRef.kind == "map" ? props.context.form.value.formState : props.context.form.value.formState.formState,
@@ -35,7 +34,7 @@ export const FormRunnerTemplate =
                 props.context.formRef.kind == "map" ? props.context.form.value.mapping.from(props.context.formRef.value) :
                   props.context.form.value.formState?.entity.sync?.value,
             },
-            submitButtonWrapper: props.context.formRef.kind == "create" ? props.context.formRef.submitButtonWrapper : undefined
+            submitButtonWrapper: (props.context.formRef.kind == "create" || props.context.formRef.kind == "edit" )  ? props.context.formRef.submitButtonWrapper : undefined
           }}
           setState={(_: BasicUpdater<any>) => props.setState(
             FormRunnerState.Updaters.form(

package/src/forms/domains/parser/domains/built-ins/state.ts

@@ -16,7 +16,8 @@ export type PrimitiveType = (typeof PrimitiveTypes)[number]
 export const GenericTypes = [
   "SingleSelection",
   "MultiSelection",
-  "List"] as const
+  "List",
+  "Map"] as const
 export type GenericType = (typeof GenericTypes)[number]
 
 export type ApiConverter<T> = { fromAPIRawValue: BasicFun<any, T>, toAPIRawValue: BasicFun<T, any> }
@@ -30,6 +31,7 @@ export type ApiConverters = {
   "SingleSelection": ApiConverter<CollectionSelection<any>>
   "MultiSelection": ApiConverter<OrderedMap<string, any>>
   "List": ApiConverter<List<any>>
+  "Map": ApiConverter<List<[any, any]>>
 }
 
 export type PrimitiveBuiltIn = { renderers: Set<keyof BuiltIns["renderers"]>, apiConverters: ApiConverter<any>, defaultValue: any }
@@ -48,6 +50,7 @@ export type BuiltIns = {
     streamSingleSelection: Set<string>;
     streamMultiSelection: Set<string>;
     list: Set<string>;
+    map: Set<string>;
   };
 };
 
@@ -65,7 +68,8 @@ export const builtInsFromFieldViews = (fieldViews: any, fieldTypeConverters: Api
     "generics": Map([
       ["SingleSelection", { apiConverters: fieldTypeConverters["SingleSelection"], defaultValue: CollectionSelection().Default.right("no selection") }] as [string, GenericBuiltIn],
       ["Multiselection", { apiConverters: fieldTypeConverters["SingleSelection"], defaultValue: Map() }] as [string, GenericBuiltIn],
-      ["List", { apiConverters: fieldTypeConverters["SingleSelection"], defaultValue: List() }] as [string, GenericBuiltIn]
+      ["List", { apiConverters: fieldTypeConverters["SingleSelection"], defaultValue: List() }] as [string, GenericBuiltIn],
+      ["Map", { apiConverters: fieldTypeConverters["SingleSelection"], defaultValue: List() }] as [string, GenericBuiltIn]
     ]),
     "renderers": {
       "boolean": Set(),
@@ -78,6 +82,7 @@ export const builtInsFromFieldViews = (fieldViews: any, fieldTypeConverters: Api
       "number": Set(),
       "string": Set(),
       "list": Set(),
+      "map": Set(),
     }
   }
   Object.keys(builtins.renderers).forEach((_categoryName) => {
@@ -92,31 +97,53 @@ export const builtInsFromFieldViews = (fieldViews: any, fieldTypeConverters: Api
 }
 
 
-export const defaultValue = (types:Map<TypeName, TypeDefinition>, builtIns:BuiltIns) => (t: TypeName): any => {
-  let primitive = builtIns.primitives.get(t)
-  if (primitive != undefined) {
-    return primitive.defaultValue
-  } else {
-    let generic = builtIns.generics.get(t)
-    if (generic != undefined) {
-      return generic.defaultValue
+export const defaultValue = (types: Map<TypeName, TypeDefinition>, builtIns: BuiltIns) => (t: TypeName | Type): any => {
+  if (typeof t == "string") {
+    let primitive = builtIns.primitives.get(t)
+    if (primitive != undefined) {
+      return primitive.defaultValue
     } else {
-      let custom = types.get(t)
-      if (custom != undefined) {
-        let res = {} as any
-        custom.fields.forEach((field, fieldName) => {
-          res[fieldName] = defaultValue(types, builtIns)(field.kind == "primitive" ? field.value : field.kind == "lookup" ? field.name : field.value)
+      let generic = builtIns.generics.get(t)
+      if (generic != undefined) {
+        return generic.defaultValue
+      } else {
+        let custom = types.get(t)
+        if (custom != undefined) {
+          let res = {} as any
+          custom.fields.forEach((field, fieldName) => {
+            res[fieldName] = defaultValue(types, builtIns)(field.kind == "primitive" ? field.value : field.kind == "lookup" ? field.name : field.value)
+          }
+          )
+          return res
+        } else {
+          debugger
+          throw `cannot find type ${t} when resolving defaultValue`
         }
-        )
+      }
+    }
+  } else {
+    if (t.kind == "application") {
+      const generic = builtIns.generics.get(t.value)
+      if (generic) {
+        const res = generic.defaultValue
         return res
-      } else {
-        throw `cannot find type ${t} when resolving defaultValue`
       }
     }
+    debugger
+    throw `cannot find type ${t} when resolving defaultValue`
+  }
+}
+
+
+const parseTypeIShouldBePartOfFormValidation = (t:any) : TypeName | Type => {
+  if (typeof t == "string") return t
+  if ("fun" in t && "args" in t && Array.isArray(t.args)) {
+    return { kind:"application", value:t.fun, args:t.args }
   }
+  return null!
 }
 
-export const fromAPIRawValue = (t:Type, types:Map<TypeName, TypeDefinition>, builtIns:BuiltIns, converters:ApiConverters, isKeywordsReplaced: boolean = false) => (raw:any) : any => {
+export const fromAPIRawValue = (t: Type, types: Map<TypeName, TypeDefinition>, builtIns: BuiltIns, converters: ApiConverters, isKeywordsReplaced: boolean = false) => (raw: any): any => {
   // alert(JSON.stringify(t))
   if (raw == undefined) {
     console.warn(`instantiating default value for type ${JSON.stringify(t)}: the value was undefined so something is missing from the API response`)
@@ -131,25 +158,49 @@ export const fromAPIRawValue = (t:Type, types:Map<TypeName, TypeDefinition>, bui
     if (t.value == "SingleSelection" && t.args.length == 1) {
       let result = converters[t.value].fromAPIRawValue(obj)
       result = CollectionSelection().Updaters.left(
-        fromAPIRawValue({ kind:"lookup", name:t.args[0] }, types, builtIns, converters, true))(result)
+        fromAPIRawValue({ kind: "lookup", name: t.args[0] }, types, builtIns, converters, true))(result)
       return result
     }
     if ((t.value == "Multiselection" || t.value == "MultiSelection") && t.args.length == 1) {
       let result = converters["MultiSelection"].fromAPIRawValue(obj)
-      result = result.map(fromAPIRawValue({ kind:"lookup", name:t.args[0] }, types, builtIns, converters, true))
+      result = result.map(fromAPIRawValue({ kind: "lookup", name: t.args[0] }, types, builtIns, converters, true))
       return result
     }
     if (t.value == "List" && t.args.length == 1) {
       let result = converters[t.value].fromAPIRawValue(obj)
       result = result.map(fromAPIRawValue(
         PrimitiveTypes.some(_ => _ == t.args[0]) ?
-          { kind:"primitive", value:t.args[0] as PrimitiveType }
-        : { kind:"lookup", name:t.args[0] }
+          { kind: "primitive", value: t.args[0] as PrimitiveType }
+          : { kind: "lookup", name: t.args[0] }
         , types, builtIns, converters, true))
       return result
     }
+    if (t.value == "Map" && t.args.length == 2) {
+      let result = converters[t.value].fromAPIRawValue(obj)
+      let t_args = t.args.map(parseTypeIShouldBePartOfFormValidation)
+      result = result.map(keyValue => ([
+        fromAPIRawValue(
+          typeof t_args[0] == "string" ? 
+            PrimitiveTypes.some(_ => _ == t_args[0]) ?
+              { kind: "primitive", value: t_args[0] as PrimitiveType }
+            : { kind: "lookup", name: t_args[0] }
+          :
+            t_args[0], 
+            types, builtIns, converters, true)(keyValue[0]),
+        fromAPIRawValue(
+          typeof t_args[1] == "string" ? 
+            PrimitiveTypes.some(_ => _ == t_args[1]) ?
+              { kind: "primitive", value: t_args[1] as PrimitiveType }
+            : { kind: "lookup", name: t_args[1] }
+          :
+            t_args[1], 
+            types, builtIns, converters, true)(keyValue[1]),
+      ])
+      )
+      return result
+    }
   } else { // t.kind == lookup: we are dealing with a record/object
-    let result:any = {...obj}
+    let result: any = { ...obj }
     const tDef = types.get(t.name)!
     tDef.fields.forEach((fieldType, fieldName) => {
       const replacedFieldName = replaceKeyword(fieldName)
@@ -163,8 +214,8 @@ export const fromAPIRawValue = (t:Type, types:Map<TypeName, TypeDefinition>, bui
 }
 
 
-export const toAPIRawValue = (t:Type, types:Map<TypeName, TypeDefinition>, builtIns:BuiltIns, converters:ApiConverters, isKeywordsReverted: boolean = false) => (raw:any) : any => {
-  
+export const toAPIRawValue = (t: Type, types: Map<TypeName, TypeDefinition>, builtIns: BuiltIns, converters: ApiConverters, isKeywordsReverted: boolean = false) => (raw: any): any => {
+
   const obj = !isKeywordsReverted ? replaceKeywords(raw, "to api") : raw
 
   if (t.kind == "primitive") {
@@ -173,7 +224,7 @@ export const toAPIRawValue = (t:Type, types:Map<TypeName, TypeDefinition>, built
     if (t.value == "SingleSelection" && t.args.length == 1) {
       let result = converters[t.value].toAPIRawValue(obj)
       if (result != undefined && typeof result == "object")
-        result = toAPIRawValue({ kind:"lookup", name:t.args[0] }, types, builtIns, converters, true)(result)
+        result = toAPIRawValue({ kind: "lookup", name: t.args[0] }, types, builtIns, converters, true)(result)
       return result
     }
     if ((t.value == "Multiselection" || t.value == "MultiSelection") && t.args.length == 1) {
@@ -181,8 +232,8 @@ export const toAPIRawValue = (t:Type, types:Map<TypeName, TypeDefinition>, built
       let result = converters["MultiSelection"].toAPIRawValue(obj)
       // alert(`MultiSelect result1 = ${JSON.stringify(result)}`)
       // alert(`${JSON.stringify(t.args[0])}`)
-      result = result.map((_:any) => 
-        typeof _ == "object" ? toAPIRawValue({ kind:"lookup", name:t.args[0] }, types, builtIns, converters, true)(_) : _)
+      result = result.map((_: any) =>
+        typeof _ == "object" ? toAPIRawValue({ kind: "lookup", name: t.args[0] }, types, builtIns, converters, true)(_) : _)
       // alert(`MultiSelect result2 = ${JSON.stringify(result)}`)
       return result
     }
@@ -190,14 +241,41 @@ export const toAPIRawValue = (t:Type, types:Map<TypeName, TypeDefinition>, built
       let result = converters[t.value].toAPIRawValue(obj)
       result = result.map(toAPIRawValue(
         PrimitiveTypes.some(_ => _ == t.args[0]) ?
-          { kind:"primitive", value:t.args[0] as PrimitiveType }
-        : { kind:"lookup", name:t.args[0] },
+          { kind: "primitive", value: t.args[0] as PrimitiveType }
+          : { kind: "lookup", name: t.args[0] },
         // { kind:"lookup", name:t.args[0] }, 
         types, builtIns, converters, true))
       return result
     }
+    if (t.value == "Map" && t.args.length == 2) {
+      let result = converters[t.value].toAPIRawValue(obj)
+
+      let t_args = t.args.map(parseTypeIShouldBePartOfFormValidation)
+      result = result.map((keyValue: any) => ([
+        toAPIRawValue(
+          typeof t_args[0] == "string" ? 
+            PrimitiveTypes.some(_ => _ == t_args[0]) ?
+              { kind: "primitive", value: t_args[0] as PrimitiveType }
+            : { kind: "lookup", name: t_args[0] }
+          :
+            t_args[0], 
+            types, builtIns, converters, true)(keyValue[0]),
+        toAPIRawValue(
+          typeof t_args[1] == "string" ? 
+            PrimitiveTypes.some(_ => _ == t_args[1]) ?
+              { kind: "primitive", value: t_args[1] as PrimitiveType }
+            : { kind: "lookup", name: t_args[1] }
+          :
+            t_args[1], 
+          types, builtIns, converters, true)(keyValue[1]),
+      ])
+      )
+
+      return result
+    }
+
   } else { // t.kind == lookup: we are dealing with a record/object
-    let result:any = {...obj}
+    let result: any = { ...obj }
     const tDef = types.get(t.name)!
     tDef.fields.forEach((fieldType, fieldName) => {
       const revertedFieldName = revertKeyword(fieldName)
@@ -206,5 +284,5 @@ export const toAPIRawValue = (t:Type, types:Map<TypeName, TypeDefinition>, built
     })
     return result
   }
-  return defaultValue(types, builtIns)(t.value)     
+  return defaultValue(types, builtIns)(t.value)
 }