ballerina-core 1.0.256 → 1.0.258

package/src/forms/domains/dispatched-forms/deserializer/domains/specification/domains/forms/domains/renderer/domains/table/state.ts

@@ -9,6 +9,7 @@ import {
   DispatchInjectablesTypes,
   isString,
   PredicateComputedOrInlined,
+  Renderer,
   TableLayout,
   ValueOrErrors,
 } from "../../../../../../../../../../../../../main";
@@ -124,15 +125,25 @@ export const TableRenderer = {
         ExtraContext
       >,
       types: Map<string, DispatchParsedType<T>>,
-    ): ValueOrErrors<NestedRenderer<T> | undefined, string> =>
+      forms: object,
+      alreadyParsedForms: Map<string, Renderer<T>>,
+    ): ValueOrErrors<
+      [NestedRenderer<T> | undefined, Map<string, Renderer<T>>],
+      string
+    > =>
       serialized.detailsRenderer == undefined
-        ? ValueOrErrors.Default.return(undefined)
+        ? ValueOrErrors.Default.return<
+            [NestedRenderer<T> | undefined, Map<string, Renderer<T>>],
+            string
+          >([undefined, alreadyParsedForms])
         : NestedRenderer.Operations.DeserializeAs(
             type.arg,
             serialized.detailsRenderer,
             concreteRenderers,
             "details renderer",
             types,
+            forms,
+            alreadyParsedForms,
           ),
     Deserialize: <
       T extends DispatchInjectablesTypes<T>,
@@ -150,9 +161,14 @@ export const TableRenderer = {
       >,
       types: Map<string, DispatchParsedType<T>>,
       api: string | undefined,
-    ): ValueOrErrors<TableRenderer<T>, string> =>
+      forms: object,
+      alreadyParsedForms: Map<string, Renderer<T>>,
+    ): ValueOrErrors<[TableRenderer<T>, Map<string, Renderer<T>>], string> =>
       api != undefined && Array.isArray(api)
-        ? ValueOrErrors.Default.throwOne("lookup api not supported for table")
+        ? ValueOrErrors.Default.throwOne<
+            [TableRenderer<T>, Map<string, Renderer<T>>],
+            string
+          >("lookup api not supported for table")
         : TableRenderer.Operations.tryAsValidTableForm(serialized)
             .Then((validTableForm) =>
               DispatchParsedType.Operations.ResolveLookupType(
@@ -160,65 +176,100 @@ export const TableRenderer = {
                 types,
               ).Then((resolvedType) =>
                 resolvedType.kind != "record"
-                  ? ValueOrErrors.Default.throwOne<TableRenderer<T>, string>(
+                  ? ValueOrErrors.Default.throwOne<
+                      [TableRenderer<T>, Map<string, Renderer<T>>],
+                      string
+                    >(
                       `table arg ${JSON.stringify(
                         resolvedType.kind,
                       )} is not a record type`,
                     )
-                  : ValueOrErrors.Operations.All(
-                      List<
-                        ValueOrErrors<[string, TableCellRenderer<T>], string>
+                  : validTableForm.columns
+                      .toArray()
+                      .reduce<
+                        ValueOrErrors<
+                          [
+                            Map<string, TableCellRenderer<T>>,
+                            Map<string, Renderer<T>>,
+                          ],
+                          string
+                        >
                       >(
-                        validTableForm.columns
-                          .toArray()
-                          .map(([columnName, columnRenderer]) =>
-                            DispatchParsedType.Operations.ResolveLookupType(
-                              columnName,
-                              resolvedType.fields,
-                            ).Then((columnType) =>
-                              TableCellRenderer.Operations.Deserialize(
-                                columnType,
-                                columnRenderer,
-                                concreteRenderers,
-                                types,
+                        (acc, [columnName, columnRenderer]) =>
+                          acc.Then(
+                            ([columnsMap, accumulatedAlreadyParsedForms]) =>
+                              DispatchParsedType.Operations.ResolveLookupType(
                                 columnName,
-                              ).Then((renderer) =>
-                                ValueOrErrors.Default.return<
-                                  [string, TableCellRenderer<T>],
-                                  string
-                                >([columnName, renderer]),
+                                resolvedType.fields,
+                              ).Then((columnType) =>
+                                TableCellRenderer.Operations.Deserialize(
+                                  columnType,
+                                  columnRenderer,
+                                  concreteRenderers,
+                                  types,
+                                  columnName,
+                                  forms,
+                                  accumulatedAlreadyParsedForms,
+                                ).Then(([renderer, newAlreadyParsedForms]) =>
+                                  ValueOrErrors.Default.return<
+                                    [
+                                      Map<string, TableCellRenderer<T>>,
+                                      Map<string, Renderer<T>>,
+                                    ],
+                                    string
+                                  >([
+                                    columnsMap.set(columnName, renderer),
+                                    newAlreadyParsedForms,
+                                  ]),
+                                ),
                               ),
-                            ),
                           ),
-                      ),
-                    ).Then((columns) =>
-                      TableLayout.Operations.ParseLayout(
-                        validTableForm.visibleColumns,
-                      ).Then((visibileColumnsLayout) =>
+                        ValueOrErrors.Default.return<
+                          [
+                            Map<string, TableCellRenderer<T>>,
+                            Map<string, Renderer<T>>,
+                          ],
+                          string
+                        >([
+                          Map<string, TableCellRenderer<T>>(),
+                          alreadyParsedForms,
+                        ]),
+                      )
+                      .Then(([columnsMap, accumulatedAlreadyParsedForms]) =>
                         TableLayout.Operations.ParseLayout(
-                          validTableForm.disabledColumns,
-                        ).Then((disabledColumnsLayout) =>
-                          TableRenderer.Operations.DeserializeDetailsRenderer(
-                            type,
-                            validTableForm,
-                            concreteRenderers,
-                            types,
-                          ).Then((detailsRenderer) =>
-                            ValueOrErrors.Default.return(
-                              TableRenderer.Default(
-                                type,
-                                Map<string, TableCellRenderer<T>>(columns),
-                                visibileColumnsLayout,
-                                disabledColumnsLayout,
-                                validTableForm.renderer,
-                                detailsRenderer,
-                                api,
-                              ),
+                          validTableForm.visibleColumns,
+                        ).Then((visibileColumnsLayout) =>
+                          TableLayout.Operations.ParseLayout(
+                            validTableForm.disabledColumns,
+                          ).Then((disabledColumnsLayout) =>
+                            TableRenderer.Operations.DeserializeDetailsRenderer(
+                              type,
+                              validTableForm,
+                              concreteRenderers,
+                              types,
+                              forms,
+                              accumulatedAlreadyParsedForms,
+                            ).Then(
+                              ([detailsRenderer, finalAlreadyParsedForms]) =>
+                                ValueOrErrors.Default.return<
+                                  [TableRenderer<T>, Map<string, Renderer<T>>],
+                                  string
+                                >([
+                                  TableRenderer.Default(
+                                    type,
+                                    columnsMap,
+                                    visibileColumnsLayout,
+                                    disabledColumnsLayout,
+                                    validTableForm.renderer,
+                                    detailsRenderer,
+                                    api,
+                                  ),
+                                  finalAlreadyParsedForms,
+                                ]),
                             ),
                           ),
                         ),
                       ),
-                    ),
               ),
             )
             .MapErrors((errors) =>

package/src/forms/domains/dispatched-forms/deserializer/domains/specification/domains/forms/domains/renderer/domains/tuple/state.ts

@@ -1,4 +1,4 @@
-import { List, Map } from "immutable";
+import { Map } from "immutable";
 import { NestedRenderer } from "../nestedRenderer/state";
 import { DispatchParsedType, TupleType } from "../../../../../types/state";
 import { Renderer } from "../../state";
@@ -72,32 +72,31 @@ export const TupleRenderer = {
         ExtraContext
       >,
       types: Map<string, DispatchParsedType<T>>,
-    ): ValueOrErrors<TupleRenderer<T>, string> =>
+      forms: object,
+      alreadyParsedForms: Map<string, Renderer<T>>,
+    ): ValueOrErrors<[TupleRenderer<T>, Map<string, Renderer<T>>], string> =>
       TupleRenderer.Operations.tryAsValidTupleRenderer(serialized)
         .Then((validatedSerialized) =>
-          ValueOrErrors.Operations.All(
-            List<ValueOrErrors<NestedRenderer<T>, string>>(
-              validatedSerialized.itemRenderers.map((itemRenderer, index) =>
-                NestedRenderer.Operations.DeserializeAs(
-                  type.args[index],
-                  itemRenderer,
-                  concreteRenderers,
-                  `Item ${index + 1}`,
-                  types,
-                ).Then((deserializedItemRenderer) =>
-                  ValueOrErrors.Default.return(deserializedItemRenderer),
+          validatedSerialized.itemRenderers
+            .reduce<
+              ValueOrErrors<
+                [Array<NestedRenderer<T>>, Map<string, Renderer<T>>],
+                string
+              >
+            >((acc, itemRenderer, index) => acc.Then(([itemRenderersArray, accumulatedAlreadyParsedForms]) => NestedRenderer.Operations.DeserializeAs(type.args[index], itemRenderer, concreteRenderers, `Item ${index + 1}`, types, forms, accumulatedAlreadyParsedForms).Then(([deserializedItemRenderer, newAlreadyParsedForms]) => ValueOrErrors.Default.return<[Array<NestedRenderer<T>>, Map<string, Renderer<T>>], string>([[...itemRenderersArray, deserializedItemRenderer], newAlreadyParsedForms]))), ValueOrErrors.Default.return<[Array<NestedRenderer<T>>, Map<string, Renderer<T>>], string>([[], alreadyParsedForms]))
+            .Then(([itemRenderersArray, accumulatedAlreadyParsedForms]) =>
+              ValueOrErrors.Default.return<
+                [TupleRenderer<T>, Map<string, Renderer<T>>],
+                string
+              >([
+                TupleRenderer.Default(
+                  type,
+                  validatedSerialized.renderer,
+                  itemRenderersArray,
                 ),
-              ),
+                accumulatedAlreadyParsedForms,
+              ]),
             ),
-          ).Then((deserializedItemRenderers) =>
-            ValueOrErrors.Default.return(
-              TupleRenderer.Default(
-                type,
-                validatedSerialized.renderer,
-                deserializedItemRenderers.toArray(),
-              ),
-            ),
-          ),
         )
         .MapErrors((errors) =>
           errors.map((error) => `${error}\n...When parsing as Tuple renderer`),

package/src/forms/domains/dispatched-forms/deserializer/domains/specification/domains/forms/domains/renderer/domains/union/state.ts

@@ -7,7 +7,7 @@ import {
 } from "../../../../../../../../../../../../../main";
 import { DispatchIsObject, UnionType } from "../../../../../types/state";
 import { DispatchParsedType } from "../../../../../types/state";
-import { List, Map } from "immutable";
+import { Map } from "immutable";
 import { Renderer } from "../../state";
 
 export type SerializedUnionRenderer = {
@@ -70,15 +70,21 @@ export const UnionRenderer = {
         ExtraContext
       >,
       types: Map<string, DispatchParsedType<T>>,
-    ): ValueOrErrors<UnionRenderer<T>, string> =>
+      forms: object,
+      alreadyParsedForms: Map<string, Renderer<T>>,
+    ): ValueOrErrors<[UnionRenderer<T>, Map<string, Renderer<T>>], string> =>
       UnionRenderer.Operations.tryAsValidUnionForm(serialized)
         .Then((validSerialized) =>
-          ValueOrErrors.Operations.All(
-            List<ValueOrErrors<[string, Renderer<T>], string>>(
-              validSerialized.cases
-                .entrySeq()
-                .toArray()
-                .map(([caseName, caseRenderer]) =>
+          validSerialized.cases
+            .entrySeq()
+            .reduce<
+              ValueOrErrors<
+                [Map<string, Renderer<T>>, Map<string, Renderer<T>>],
+                string
+              >
+            >(
+              (acc, [caseName, caseRenderer]) =>
+                acc.Then(([casesMap, accumulatedAlreadyParsedForms]) =>
                   MapRepo.Operations.tryFindWithError(
                     caseName,
                     type.args,
@@ -96,21 +102,33 @@ export const UnionRenderer = {
                       concreteRenderers,
                       types,
                       undefined,
-                    ).Then((caseRenderer) =>
-                      ValueOrErrors.Default.return([caseName, caseRenderer]),
+                      forms,
+                      accumulatedAlreadyParsedForms,
+                    ).Then(([caseRenderer, newAlreadyParsedForms]) =>
+                      ValueOrErrors.Default.return<
+                        [Map<string, Renderer<T>>, Map<string, Renderer<T>>],
+                        string
+                      >([
+                        casesMap.set(caseName, caseRenderer),
+                        newAlreadyParsedForms,
+                      ]),
                     ),
                   ),
                 ),
+              ValueOrErrors.Default.return<
+                [Map<string, Renderer<T>>, Map<string, Renderer<T>>],
+                string
+              >([Map<string, Renderer<T>>(), alreadyParsedForms]),
+            )
+            .Then(([casesMap, accumulatedAlreadyParsedForms]) =>
+              ValueOrErrors.Default.return<
+                [UnionRenderer<T>, Map<string, Renderer<T>>],
+                string
+              >([
+                UnionRenderer.Default(type, casesMap, validSerialized.renderer),
+                accumulatedAlreadyParsedForms,
+              ]),
             ),
-          ).Then((caseTuples) =>
-            ValueOrErrors.Default.return(
-              UnionRenderer.Default(
-                type,
-                Map(caseTuples),
-                validSerialized.renderer,
-              ),
-            ),
-          ),
         )
         .MapErrors((errors) =>
           errors.map((error) => `${error}\n...When parsing as union form`),

package/src/forms/domains/dispatched-forms/deserializer/domains/specification/domains/forms/domains/renderer/state.ts

@@ -117,13 +117,17 @@ export const Renderer = {
       as: string,
       types: Map<string, DispatchParsedType<T>>,
       tableApi: string | undefined,
-    ): ValueOrErrors<Renderer<T>, string> =>
+      forms: object,
+      alreadyParsedForms: Map<string, Renderer<T>>,
+    ): ValueOrErrors<[Renderer<T>, Map<string, Renderer<T>>], string> =>
       Renderer.Operations.Deserialize(
         type,
         serialized,
         concreteRenderers,
         types,
         tableApi,
+        forms,
+        alreadyParsedForms,
       ).MapErrors((errors) =>
         errors.map((error) => `${error}\n...When parsing as ${as}`),
       ),
@@ -143,7 +147,9 @@ export const Renderer = {
       >,
       types: Map<string, DispatchParsedType<T>>,
       tableApi: string | undefined, // Necessary because the table api is currently defined outside of the renderer, so a lookup has to be able to pass it to the looked up renderer
-    ): ValueOrErrors<Renderer<T>, string> =>
+      forms: object,
+      alreadyParsedForms: Map<string, Renderer<T>>,
+    ): ValueOrErrors<[Renderer<T>, Map<string, Renderer<T>>], string> =>
       /*
         Important semantics of lookup vs inlined renderers and types:
 
@@ -191,6 +197,8 @@ export const Renderer = {
                 tableApi,
                 concreteRenderers,
                 types,
+                forms,
+                alreadyParsedForms,
               )
             : LookupRenderer.Operations.Deserialize(
                 // lookup type and inlined renderer (case 2)
@@ -201,10 +209,18 @@ export const Renderer = {
                 tableApi,
                 concreteRenderers,
                 types,
+                forms,
+                alreadyParsedForms,
               )
           : typeof serialized == "string"
             ? type.kind == "primitive" // special case
-              ? PrimitiveRenderer.Operations.Deserialize(type, serialized)
+              ? PrimitiveRenderer.Operations.Deserialize(type, serialized).Then(
+                  (renderer) =>
+                    ValueOrErrors.Default.return([
+                      renderer,
+                      alreadyParsedForms,
+                    ]),
+                )
               : // inlined type and lookup renderer (case 3)
                 LookupRenderer.Operations.Deserialize(
                   SerializedLookup.Default.InlinedTypeLookupRenderer(
@@ -214,16 +230,30 @@ export const Renderer = {
                   tableApi,
                   concreteRenderers,
                   types,
+                  forms,
+                  alreadyParsedForms,
                 )
             : // All other cases are inlined renderers and inlined types (case 4)
               Renderer.Operations.HasOptions(serialized) &&
                 (type.kind == "singleSelection" ||
                   type.kind == "multiSelection")
-              ? EnumRenderer.Operations.Deserialize(type, serialized)
+              ? EnumRenderer.Operations.Deserialize(type, serialized).Then(
+                  (renderer) =>
+                    ValueOrErrors.Default.return([
+                      renderer,
+                      alreadyParsedForms,
+                    ]),
+                )
               : Renderer.Operations.HasStream(serialized) &&
                   (type.kind == "singleSelection" ||
                     type.kind == "multiSelection")
-                ? StreamRenderer.Operations.Deserialize(type, serialized)
+                ? StreamRenderer.Operations.Deserialize(type, serialized).Then(
+                    (renderer) =>
+                      ValueOrErrors.Default.return([
+                        renderer,
+                        alreadyParsedForms,
+                      ]),
+                  )
                 : Renderer.Operations.HasColumns(serialized) &&
                     type.kind == "table"
                   ? TableRenderer.Operations.Deserialize(
@@ -232,6 +262,13 @@ export const Renderer = {
                       concreteRenderers,
                       types,
                       tableApi,
+                      forms,
+                      alreadyParsedForms,
+                    ).Then(([renderer, newAlreadyParsedForms]) =>
+                      ValueOrErrors.Default.return([
+                        renderer,
+                        newAlreadyParsedForms,
+                      ]),
                     )
                   : type.kind == "list"
                     ? ListRenderer.Operations.Deserialize(
@@ -239,6 +276,8 @@ export const Renderer = {
                         serialized,
                         concreteRenderers,
                         types,
+                        forms,
+                        alreadyParsedForms,
                       )
                     : type.kind == "map"
                       ? MapRenderer.Operations.Deserialize(
@@ -246,6 +285,8 @@ export const Renderer = {
                           serialized,
                           concreteRenderers,
                           types,
+                          forms,
+                          alreadyParsedForms,
                         )
                       : type.kind == "one"
                         ? OneRenderer.Operations.Deserialize(
@@ -253,6 +294,8 @@ export const Renderer = {
                             serialized,
                             concreteRenderers,
                             types,
+                            forms,
+                            alreadyParsedForms,
                           )
                         : type.kind == "readOnly"
                           ? ReadOnlyRenderer.Operations.Deserialize(
@@ -260,6 +303,8 @@ export const Renderer = {
                               serialized,
                               concreteRenderers,
                               types,
+                              forms,
+                              alreadyParsedForms,
                             )
                           : Renderer.Operations.IsSumUnitDate(
                                 serialized,
@@ -268,6 +313,11 @@ export const Renderer = {
                             ? BaseSumUnitDateRenderer.Operations.Deserialize(
                                 type,
                                 serialized,
+                              ).Then((renderer) =>
+                                ValueOrErrors.Default.return([
+                                  renderer,
+                                  alreadyParsedForms,
+                                ]),
                               )
                             : type.kind == "sum"
                               ? SumRenderer.Operations.Deserialize(
@@ -275,6 +325,8 @@ export const Renderer = {
                                   serialized,
                                   concreteRenderers,
                                   types,
+                                  forms,
+                                  alreadyParsedForms,
                                 )
                               : type.kind == "record"
                                 ? RecordRenderer.Operations.Deserialize(
@@ -282,6 +334,8 @@ export const Renderer = {
                                     serialized,
                                     concreteRenderers,
                                     types,
+                                    forms,
+                                    alreadyParsedForms,
                                   )
                                 : type.kind == "union"
                                   ? UnionRenderer.Operations.Deserialize(
@@ -289,6 +343,8 @@ export const Renderer = {
                                       serialized,
                                       concreteRenderers,
                                       types,
+                                      forms,
+                                      alreadyParsedForms,
                                     )
                                   : type.kind == "tuple"
                                     ? TupleRenderer.Operations.Deserialize(
@@ -296,9 +352,11 @@ export const Renderer = {
                                         serialized,
                                         concreteRenderers,
                                         types,
+                                        forms,
+                                        alreadyParsedForms,
                                       )
                                     : ValueOrErrors.Default.throwOne<
-                                        Renderer<T>,
+                                        [Renderer<T>, Map<string, Renderer<T>>],
                                         string
                                       >(
                                         `Unknown renderer ${JSON.stringify(serialized, null, 2)} and type of kind ${