ballerina-core 1.0.44 → 1.0.46

package/package.json

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

package/src/api-response-handler/coroutines/runner.ts

@@ -18,16 +18,16 @@ export const HandleApiResponse = <
     return AsyncState.Operations.isLoading(asyncState)
       ? CheckerCo.Do(() => {})
       : CheckerCo.Seq([
-        CheckerCo.Do(() => {
-          return AsyncState.Operations.status(asyncState) === 'error'
-            ? handlers.handleError?.(
-              asyncState.kind === 'error' ? asyncState.error : undefined
-            )
-            : handlers.handleSuccess?.(_)
+          CheckerCo.Do(() => {
+            return AsyncState.Operations.status(asyncState) === "error"
+              ? handlers.handleError?.(
+                  asyncState.kind === "error" ? asyncState.error : undefined
+                )
+              : handlers.handleSuccess?.(_);
           }),
           CheckerCo.SetState((_) => ({
             ..._,
-            ...ApiResponseChecker.Updaters.toChecked()(_),
+            ...ApiResponseChecker.Updaters().toChecked()(_),
           })),
         ]);
   });

package/src/api-response-handler/state.ts

@@ -11,20 +11,16 @@ export const ApiResponseChecker = {
   Default: (_?: boolean): ApiResponseChecker => ({
     apiResponseChecked: _ ?? false,
   }),
-  Updaters: {
-    toChecked:
-      <CheckedState extends ApiResponseChecker>(): BasicUpdater<CheckedState> =>
-      (_) => ({
-        ..._,
-        apiResponseChecked: true,
-      }),
-    toUnchecked:
-      <CheckedState extends ApiResponseChecker>(): BasicUpdater<CheckedState> =>
-      (_) => ({
-        ..._,
-        apiResponseChecked: false,
-      }),
-  },
+  Updaters: <CheckedState extends ApiResponseChecker>() => ({
+    toChecked: (): BasicUpdater<CheckedState> => (_) => ({
+      ..._,
+      apiResponseChecked: true,
+    }),
+    toUnchecked: (): BasicUpdater<CheckedState> => (_) => ({
+      ..._,
+      apiResponseChecked: false,
+    }),
+  }),
   Operations: {
     checked: (_: ApiResponseChecker) => _.apiResponseChecked,
   },

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

@@ -1,9 +1,12 @@
-import { ApiErrors, AsyncState, Debounce, Debounced, CreateFormForeignMutationsExpected, CreateFormState, Synchronize, Synchronized, Unit, SimpleCallback, unit, replaceWith } from "../../../../../../../main"
+import { ApiErrors, AsyncState, Debounce, Debounced, CreateFormForeignMutationsExpected, CreateFormState, Synchronize, Synchronized, Unit, HandleApiResponse, ApiResponseChecker } from "../../../../../../../main"
 import { CoTypedFactory } from "../../../../../../coroutines/builder"
 import { CreateFormContext, CreateFormWritableState } from "../state"
 
 export const createFormRunner = <E, FS>() => {
-  const Co = CoTypedFactory<CreateFormContext<E, FS> & { onSubmitted:SimpleCallback<E> }, CreateFormWritableState<E, FS>>()
+  const Co = CoTypedFactory<
+    CreateFormContext<E, FS> & CreateFormForeignMutationsExpected<E, FS>,
+    CreateFormWritableState<E, FS>
+  >()
 
   const init =
     Co.GetState().then(current =>
@@ -16,8 +19,11 @@ export const createFormRunner = <E, FS>() => {
 
   const synchronize =
     Co.Repeat(
-      Co.Seq([
       Co.GetState().then(current =>
+      Co.Seq([
+        Co.SetState(
+          CreateFormState<E, FS>().Updaters.Template.toUnchecked()
+        ),
         Debounce<Synchronized<Unit, Synchronized<E, ApiErrors>>, CreateFormContext<E, FS>>(
           Synchronize<E, ApiErrors>(e => current.api.create([e, current.formState]), _ => "transient failure", 5, 50)
             .embed(
@@ -28,21 +34,18 @@ export const createFormRunner = <E, FS>() => {
         ).embed(
           _ => ({ ..._, ..._.entity }),
           _ => CreateFormState<E, FS>().Updaters.Core.entity(_)
-        )
+        ),
+        HandleApiResponse<
+          CreateFormWritableState<E, FS>,
+          CreateFormContext<E, FS>,
+          Synchronized<E, ApiErrors> | ApiErrors
+        >((_) => AsyncState.Operations.hasValue(_.entity.sync) ? _.entity.sync.value.sync : _.entity.sync, {
+          handleSuccess: current.apiHandlers?.success,
+          handleError: current.apiHandlers?.error,
+        }),
+      ]
       ),
-      Co.GetState().then(current =>
-        AsyncState.Operations.hasValue(current.entity.sync) && AsyncState.Operations.hasValue(current.entity.sync.value.sync) && current.notifySubmitAfterSync ?
-          Co.Seq([
-            Co.Do(() => {
-              if (AsyncState.Operations.hasValue(current.entity.sync) && AsyncState.Operations.hasValue(current.entity.sync.value.sync))
-                current.onSubmitted(current.entity.sync.value)
-            }),
-            Co.SetState(CreateFormState<E,FS>().Updaters.Core.notifySubmitAfterSync(replaceWith(false)))
-          ])
-        : Co.Return(unit)
-      )
-    ])
-    )
+    ))
 
   return Co.Template<CreateFormForeignMutationsExpected<E, FS>>(
     init, {
@@ -53,7 +56,10 @@ export const createFormRunner = <E, FS>() => {
     Co.Template<CreateFormForeignMutationsExpected<E, FS>>(
       synchronize, {
       interval: 15,
-      runFilter: props => Debounced.Operations.shouldCoroutineRun(props.context.entity) || props.context.notifySubmitAfterSync
+      runFilter: props =>
+        props.context.entity.sync.kind === "loaded" &&
+        (Debounced.Operations.shouldCoroutineRun(props.context.entity) ||
+        !ApiResponseChecker.Operations.checked(props.context))
     }
     )
   ])

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

@@ -1,4 +1,4 @@
-import { ApiErrors, AsyncState, BasicUpdater, Debounced, ForeignMutationsInput, id, replaceWith, SimpleCallback, simpleUpdater, Synchronized, Template, unit, Unit, Updater, Value } from "../../../../../../main"
+import { ApiErrors, ApiResponseChecker, AsyncState, BasicUpdater, Debounced, ForeignMutationsInput, FormRefApiHandlers, id, replaceWith, SimpleCallback, simpleUpdater, Synchronized, Template, unit, Unit, Updater, Value } from "../../../../../../main"
 import { BasicFun } from "../../../../../fun/state"
 
 export type CreateFormContext<E,FS> = {
@@ -14,8 +14,7 @@ export type CreateFormState<E,FS> = {
   // first sync is GET (returns E), second is UPDATE (accepts E)
   entity:Debounced<Synchronized<Unit, Synchronized<E, ApiErrors>>>
   formState:FS,
-  notifySubmitAfterSync:boolean
-}
+} & ApiResponseChecker;
 
 export const CreateFormState = <E,FS>() => ({
   Default:(initialFormState:FS) : CreateFormState<E,FS> => ({
@@ -23,15 +22,15 @@ export const CreateFormState = <E,FS>() => ({
       Synchronized.Default(unit)
     ),
     formState:initialFormState,
-    notifySubmitAfterSync:false
+    ...ApiResponseChecker.Default(true),
   }),
   Updaters:{
-    Core:{      
-      ...simpleUpdater<CreateFormState<E,FS>>()("notifySubmitAfterSync"),
+    Core:{
       ...simpleUpdater<CreateFormState<E,FS>>()("entity"),
       ...simpleUpdater<CreateFormState<E,FS>>()("formState"),
     },
     Template:{
+      ...ApiResponseChecker.Updaters<CreateFormState<E, FS>>(),
       entity:(_:BasicUpdater<E>) : Updater<CreateFormState<E,FS>> => 
         CreateFormState<E,FS>().Updaters.Core.entity(
           Debounced.Updaters.Core.value(
@@ -55,8 +54,6 @@ export const CreateFormState = <E,FS>() => ({
                 )
               )
             )
-          ).then(
-            CreateFormState<E,FS>().Updaters.Core.notifySubmitAfterSync(replaceWith(true))
           )
   
     }
@@ -68,4 +65,9 @@ export const CreateFormState = <E,FS>() => ({
 
 export type CreateFormWritableState<E,FS> = CreateFormState<E,FS>
 export type CreateFormForeignMutationsExposed<E,FS> = ReturnType<ReturnType<typeof CreateFormState<E,FS>>["ForeignMutations"]>
-export type CreateFormForeignMutationsExpected<E,FS> = { onSubmitted:SimpleCallback<E> }
+export type CreateFormForeignMutationsExpected<E,FS> = {
+  apiHandlers?: {
+    success?: (_: CreateFormWritableState<E, FS> & CreateFormContext<E, FS> | undefined) => void;
+    error?: <ApiErrors>(_: ApiErrors | undefined) => void;
+  }
+ }

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

@@ -60,6 +60,9 @@ export const CreateFormTemplate = <E, FS>(): CreateFormTemplate<E, FS> =>
     }).any([
       createFormRunner<E, FS>().mapContextFromProps(props => ({
         ...props.context,
-        onSubmitted:props.foreignMutations.onSubmitted
+        apiHandlers: {
+          success: props.foreignMutations.apiHandlers?.success,
+          error: props.foreignMutations.apiHandlers?.error
+        }
       }))
     ])

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

@@ -35,8 +35,7 @@ export const EditFormState = <E,FS>() => ({
       ...simpleUpdater<EditFormState<E,FS>>()("formState"),
     },
     Template:{
-      toChecked: () => ApiResponseChecker.Updaters.toChecked<EditFormState<E, FS>>(),
-      toUnchecked: () => ApiResponseChecker.Updaters.toUnchecked<EditFormState<E, FS>>(),
+      ...ApiResponseChecker.Updaters<EditFormState<E, FS>>(),
       entity:(_:BasicUpdater<E>) : Updater<EditFormState<E,FS>> =>
           EditFormState<E,FS>().Updaters.Core.entity(
             Synchronized.Updaters.sync(

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

@@ -2,23 +2,25 @@ import { BasicFun, Guid, Mapping, simpleUpdater, Sum, Unit } from "../../../../m
 import { FormParsingResult, FormsParserState } from "../parser/state"
 import { OnChange } from "../singleton/state"
 
+export type FormRefApiHandlers<Arg> = {
+  success?: (_: Arg) => void,
+  error?: (_: Arg) => void,
+}
+
 export type FormRef = {
   formName:string
 } & ({
   kind:"edit",
   submitButtonWrapper:any
   entityId:Guid,
-  apiHandlers?: {
-    success?: (_: any) => void,
-    error?: (_: any) => void,
-  }
+  apiHandlers?: FormRefApiHandlers<any>
 } | {
   kind:"map",
   onChange:OnChange<any>
   value:any
 } | {
   kind:"create",
-  onSubmitted: (_: any) => void,
+  apiHandlers?: FormRefApiHandlers<any>,
   submitButtonWrapper:any
 })
 

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

@@ -49,17 +49,19 @@ export const FormRunnerTemplate =
               if (props.context.formRef.kind == "map")
                 props.context.formRef.onChange(_, _path)
             },
-            onSubmitted: (_: any) => {
-              if (props.context.formRef.kind == "create")
-                props.context.formRef.onSubmitted(_)
-            },
             apiHandlers: {
               success: (_: any) => {
-                if (props.context.formRef.kind === 'edit')
+                if (
+                  props.context.formRef.kind === 'edit' ||
+                  props.context.formRef.kind === 'create'
+                )
                   props.context.formRef.apiHandlers?.success?.(_)
               },
               error: (_: any) => {
-                if (props.context.formRef.kind === 'edit')
+                if (
+                  props.context.formRef.kind === 'edit' ||
+                  props.context.formRef.kind === 'create'
+                )
                   props.context.formRef.apiHandlers?.error?.(_)
               }
             }

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

@@ -32,7 +32,7 @@ export type BuiltInApiConverters = {
   "maybeBoolean": ApiConverter<boolean | undefined>
   "base64File": ApiConverter<string>
   "secret": ApiConverter<string>,
-  "Date": ApiConverter<Date>
+  "Date": ApiConverter<Maybe<Date>>
   "CollectionReference": ApiConverter<CollectionReference>
   "SingleSelection": ApiConverter<CollectionSelection<any>>
   "MultiSelection": ApiConverter<OrderedMap<string, any>>

package/src/forms/domains/primitives/domains/date/template.tsx

@@ -17,7 +17,7 @@ export const DateForm = <Context extends FormLabel, ForeignMutationsExpected>(
           props.setState(DateFormState.Updaters.possiblyInvalidInput(Maybe.Updaters.value(replaceWith(_))))
           const newValue = _ == undefined ? _ : new Date(_)
           setTimeout(() => {
-            props.foreignMutations.onChange(Maybe.Updaters.value(replaceWith(newValue)), List())
+            props.foreignMutations.onChange(replaceWith(newValue), List())
           }, 0)
           }
       }} />