ballerina-core 1.0.113 → 1.0.115

package/package.json

@@ -2,7 +2,7 @@
   "name": "ballerina-core",
   "author": "Dr. Giuseppe Maggiore",
   "private": false,
-  "version": "1.0.113",
+  "version": "1.0.115",
   "main": "main.ts",
   "scripts": {
     "prettier": "prettier --write ."

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

@@ -664,7 +664,7 @@ export const fromAPIRawValue =
       let errors: List<string> = List();
       t.fields.forEach((fieldType, fieldName) => {
         const fieldValue = raw[fieldName];
-        if (fieldValue == undefined) {
+        if (fieldValue != null && fieldValue == undefined) {
           return;
         }
         const parsedValue = fromAPIRawValue(
@@ -705,7 +705,7 @@ export const fromAPIRawValue =
         let rowResult: Map<string, PredicateValue> = Map();
         tableType.fields.forEach((fieldType, fieldName) => {
           const fieldValue = row[fieldName];
-          if (fieldValue == undefined) {
+          if (fieldValue != null && fieldValue == undefined) {
             return;
           }
           const parsedValue = fromAPIRawValue(

package/src/forms/domains/parser/state.tsx

@@ -505,6 +505,7 @@ export type ParsedLaunchers = {
       parseGlobalConfiguration: (
         raw: any,
       ) => ValueOrErrors<PredicateValue, string>;
+      parsedFormType: ParsedType<any>;
     }
   >;
 };
@@ -663,7 +664,7 @@ export const parseFormsToLaunchers =
                     disabledFields: _.disabledFields,
                     globalConfiguration: parentContext.globalConfiguration.sync,
                   })),
-              }) as any,
+              } as any),
           )
           .withViewFromProps((props) => props.context.submitButtonWrapper)
           .mapForeignMutationsFromProps(
@@ -874,7 +875,7 @@ export const parseFormsToLaunchers =
                             injectedPrimitives,
                           )(value),
                     })),
-                }) as any,
+                } as any),
             )
             .withViewFromProps((props) => props.context.containerWrapper)
             .mapForeignMutationsFromProps(
@@ -884,6 +885,7 @@ export const parseFormsToLaunchers =
             initialState.formFieldStates,
             initialState.commonFormState,
           ),
+          parsedFormType: formType,
           fromApiParser: (value: any): ValueOrErrors<PredicateValue, string> =>
             fromAPIRawValue(
               formType,

package/src/infinite-data-stream/coroutines/infiniteLoader.ts

@@ -1,47 +1,47 @@
 import { AsyncState } from "../../async/state";
+import { Coroutine } from "../../coroutines/state";
+import { Unit } from "../../fun/domains/unit/state";
 import { replaceWith } from "../../fun/domains/updater/domains/replaceWith/state";
-import { InfiniteStreamState, StreamPosition } from "../state";
+import { InfiniteStreamState, InfiniteStreamWritableState, StreamPosition } from "../state";
 import { StreamCo } from "./builder";
 
-export const InfiniteStreamLoader = <Element extends { Id: string }>() => {
+export const InfiniteStreamLoader = <Element extends { Id: string }>(maxRetries: number = 3) => {
   const Co = StreamCo<Element>();
   const updaters = InfiniteStreamState<Element>().Updaters;
-  // const operations = InfiniteStreamState<Element>().Operations;
 
-  return Co.Seq([
-    Co.SetState(
-      updaters.Core.loadingMore(replaceWith(AsyncState.Default.loading())),
-    ),
-    Co.While(
-      ([current]) => current.loadingMore.kind != "loaded",
-      Co.GetState().then((current) => {
-        return Co.Await(
+  const attemptLoad = (retryCount = 0): Coroutine<InfiniteStreamWritableState<Element>, InfiniteStreamWritableState<Element>, Unit> => Co.GetState().then((current) => {
+      if (current.loadingMore.kind === "loaded") {
+        return Co.Return(true);
+      }
+
+      return Co.Await(
           () => current.getChunk([current.position]),
           () => "error" as const,
-        ).then((apiResult) => {
-          if (apiResult.kind == "l") {
-            return Co.SetState(
-              updaters.Core.loadingMore(
-                replaceWith(AsyncState.Default.loaded({})),
+        ).then((apiResult) => apiResult.kind === "l" ? Co.SetState(
+            updaters.Core.loadingMore(
+              replaceWith(AsyncState.Default.loaded({})),
+            ).then(
+              updaters.Coroutine.addLoadedChunk(
+                current.position.chunkIndex,
+                apiResult.value,
               ).then(
-                updaters.Coroutine.addLoadedChunk(
-                  current.position.chunkIndex,
-                  apiResult.value,
-                ).then(
-                  updaters.Core.position(
-                    StreamPosition.Updaters.Core.shouldLoad(
-                      replaceWith<StreamPosition["shouldLoad"]>(false),
-                    ),
+                updaters.Core.position(
+                  StreamPosition.Updaters.Core.shouldLoad(
+                    replaceWith<StreamPosition["shouldLoad"]>(false),
                   ),
                 ),
               ),
-            );
-          } else {
-            return Co.Wait(500);
-          }
-        });
-      }),
+            ),
+          ) : retryCount < maxRetries ? Co.Wait(500).then(() => attemptLoad(retryCount + 1)) : Co.Return(false)
+        )
+    })
+
+  return Co.Seq([
+    Co.SetState(
+      updaters.Core.loadingMore(replaceWith(AsyncState.Default.loading())),
     ),
+    attemptLoad(),
+    Co.GetState().then((current) => current.loadingMore.kind !== "loaded" ? Co.SetState(updaters.Core.loadingMore(replaceWith(AsyncState.Default.error("max retries reached")))) : Co.Wait(0))
   ]);
 };