ballerina-core 1.0.260 → 1.0.261

package/src/forms/domains/dispatched-forms/runner/domains/dispatcher/domains/table/state.ts

@@ -39,11 +39,7 @@ export const TableDispatcher = {
         ? ValueOrErrors.Default.throwOne("internal error: api is not defined")
         : dispatcherContext.tableApiSources == undefined
           ? ValueOrErrors.Default.throwOne("table api sources are not defined")
-          : Array.isArray(api)
-            ? ValueOrErrors.Default.throwOne(
-                "lookup api not supported for table",
-              )
-            : dispatcherContext.tableApiSources(api),
+          : dispatcherContext.tableApiSources(api),
     DispatchDetailsRenderer: <
       T extends DispatchInjectablesTypes<T>,
       Flags,
@@ -58,7 +54,6 @@ export const TableDispatcher = {
         ExtraContext
       >,
       isInlined: boolean,
-      tableApi: string | undefined,
     ): ValueOrErrors<undefined | Template<any, any, any, any>, string> =>
       renderer.detailsRenderer == undefined
         ? ValueOrErrors.Default.return(undefined)
@@ -67,7 +62,6 @@ export const TableDispatcher = {
             dispatcherContext,
             "table details renderer",
             isInlined,
-            tableApi,
           ),
     Dispatch: <
       T extends DispatchInjectablesTypes<T>,
@@ -82,248 +76,259 @@ export const TableDispatcher = {
         CustomPresentationContext,
         ExtraContext
       >,
-      tableApi: string | undefined,
+      tableApi: string | Array<string> | undefined,
       isInlined: boolean,
     ): ValueOrErrors<Template<any, any, any, any>, string> =>
-      DispatchParsedType.Operations.ResolveLookupType(
-        renderer.type.arg.name,
-        dispatcherContext.types,
-      )
-        .Then((tableEntityType) =>
-          tableEntityType.kind == "record"
-            ? ValueOrErrors.Operations.All(
-                List<
-                  ValueOrErrors<
-                    [
-                      string,
-                      {
-                        template: Template<any, any, any, any>;
-                        disabled?: Expr;
-                        GetDefaultState: () => any;
-                        GetDefaultValue: () => any;
-                      },
-                    ],
-                    string
-                  >
-                >(
-                  renderer.columns
-                    .entrySeq()
-                    .toArray()
-                    .map(([columnName, columnRenderer]) =>
-                      MapRepo.Operations.tryFindWithError(
-                        columnName,
-                        tableEntityType.fields,
-                        () =>
-                          `cannot find column "${columnName}" in table entity type`,
-                      ).Then((columnType) =>
-                        NestedDispatcher.Operations.DispatchAs(
-                          columnRenderer,
-                          dispatcherContext,
-                          `table column ${columnName}`,
-                          isInlined,
-                          tableApi,
-                        ).Then((template) =>
-                          dispatcherContext
-                            .defaultState(columnType, columnRenderer.renderer)
-                            .Then((defaultState) =>
+      Array.isArray(tableApi)
+        ? ValueOrErrors.Default.throwOne("lookup api not supported for table")
+        : DispatchParsedType.Operations.ResolveLookupType(
+            renderer.type.arg.name,
+            dispatcherContext.types,
+          )
+            .Then((tableEntityType) =>
+              tableEntityType.kind == "record"
+                ? ValueOrErrors.Operations.All(
+                    List<
+                      ValueOrErrors<
+                        [
+                          string,
+                          {
+                            template: Template<any, any, any, any>;
+                            disabled?: Expr;
+                            GetDefaultState: () => any;
+                            GetDefaultValue: () => any;
+                          },
+                        ],
+                        string
+                      >
+                    >(
+                      renderer.columns
+                        .entrySeq()
+                        .toArray()
+                        .map(([columnName, columnRenderer]) =>
+                          MapRepo.Operations.tryFindWithError(
+                            columnName,
+                            tableEntityType.fields,
+                            () =>
+                              `cannot find column "${columnName}" in table entity type`,
+                          ).Then((columnType) =>
+                            NestedDispatcher.Operations.DispatchAs(
+                              columnRenderer,
+                              dispatcherContext,
+                              `table column ${columnName}`,
+                              isInlined,
+                            ).Then((template) =>
                               dispatcherContext
-                                .defaultValue(
+                                .defaultState(
                                   columnType,
                                   columnRenderer.renderer,
                                 )
-                                .Then((defaultValue) =>
-                                  ValueOrErrors.Default.return<
-                                    [
-                                      string,
-                                      {
-                                        template: Template<any, any, any, any>;
-                                        disabled?: Expr;
-                                        label: string | undefined;
-                                        GetDefaultState: () => any;
-                                        GetDefaultValue: () => PredicateValue;
-                                      },
-                                    ],
-                                    string
-                                  >([
-                                    columnName,
-                                    {
-                                      // Special attention - tables have a look up arg that represents the table entity type
-                                      template: LookupTypeAbstractRenderer<
-                                        CustomPresentationContext,
-                                        Flags,
-                                        ExtraContext
-                                      >(
-                                        template,
-                                        renderer.type.arg,
-                                        dispatcherContext.IdProvider,
-                                        dispatcherContext.ErrorRenderer,
-                                      ).withView(
-                                        dispatcherContext.lookupTypeRenderer(),
-                                      ),
-                                      disabled: columnRenderer.disabled,
-                                      label: columnRenderer.label,
-                                      GetDefaultState: () => defaultState,
-                                      GetDefaultValue: () => defaultValue,
-                                    },
-                                  ]),
+                                .Then((defaultState) =>
+                                  dispatcherContext
+                                    .defaultValue(
+                                      columnType,
+                                      columnRenderer.renderer,
+                                    )
+                                    .Then((defaultValue) =>
+                                      ValueOrErrors.Default.return<
+                                        [
+                                          string,
+                                          {
+                                            template: Template<
+                                              any,
+                                              any,
+                                              any,
+                                              any
+                                            >;
+                                            disabled?: Expr;
+                                            label: string | undefined;
+                                            GetDefaultState: () => any;
+                                            GetDefaultValue: () => PredicateValue;
+                                          },
+                                        ],
+                                        string
+                                      >([
+                                        columnName,
+                                        {
+                                          // Special attention - tables have a look up arg that represents the table entity type
+                                          template: LookupTypeAbstractRenderer<
+                                            CustomPresentationContext,
+                                            Flags,
+                                            ExtraContext
+                                          >(
+                                            template,
+                                            renderer.type.arg,
+                                            dispatcherContext.IdProvider,
+                                            dispatcherContext.ErrorRenderer,
+                                          ).withView(
+                                            dispatcherContext.lookupTypeRenderer(),
+                                          ),
+                                          disabled: columnRenderer.disabled,
+                                          label: columnRenderer.label,
+                                          GetDefaultState: () => defaultState,
+                                          GetDefaultValue: () => defaultValue,
+                                        },
+                                      ]),
+                                    ),
                                 ),
                             ),
+                          ),
                         ),
-                      ),
                     ),
-                ),
-              ).Then((cellTemplates) =>
-                TableDispatcher.Operations.DispatchDetailsRenderer(
-                  renderer,
-                  dispatcherContext,
-                  isInlined,
-                  tableApi,
-                ).Then((detailsRenderer) => {
-                  const api = renderer.api ?? tableApi;
-                  const filtering =
-                    api == undefined
-                      ? undefined
-                      : (dispatcherContext.specApis.tables?.get(api!)
-                          ?.filtering ?? undefined);
-
-                  // TODO - this can be significantly improved, also to provide an error if something fails
-                  const AllowedFilters: Map<
-                    string,
-                    {
-                      template: Template<any, any, any, any>;
-                      filters: SumNType<any>;
-                      type: DispatchParsedType<any>;
-                      GetDefaultValue: () => PredicateValue;
-                      GetDefaultState: () => any;
-                      label: string | undefined;
-                      tooltip: string | undefined;
-                      details: string | undefined;
-                    }
-                  > = (() => {
-                    if (filtering == undefined) {
-                      return Map([]);
-                    }
-                    return filtering
-                      .map((columnFilters) => ({
-                        template: Dispatcher.Operations.DispatchAs(
-                          columnFilters.displayRenderer,
-                          dispatcherContext,
-                          "table column filter renderer",
-                          false,
-                          isInlined,
-                          tableApi,
-                        ),
-                        filters: columnFilters.filters,
-                        type: columnFilters.displayType,
-                        GetDefaultValue: () =>
-                          dispatcherContext.defaultValue(
-                            columnFilters.displayType,
-                            columnFilters.displayRenderer,
-                          ),
-                        GetDefaultState: () =>
-                          dispatcherContext.defaultState(
-                            columnFilters.displayType,
-                            columnFilters.displayRenderer,
-                          ),
-                        label: columnFilters.label,
-                        tooltip: columnFilters.tooltip,
-                        details: columnFilters.details,
-                      }))
-                      .filter(
-                        (dispatchedFilterRenderer) =>
-                          dispatchedFilterRenderer.template.kind == "value" &&
-                          dispatchedFilterRenderer.GetDefaultValue().kind ==
-                            "value" &&
-                          dispatchedFilterRenderer.GetDefaultState().kind ==
-                            "value",
-                      )
-                      .map((dispatchedFilterRenderer) => ({
-                        template: (
-                          dispatchedFilterRenderer.template as Value<
-                            Template<any, any, any, any>
-                          >
-                        ).value,
-                        filters: dispatchedFilterRenderer.filters,
-                        type: dispatchedFilterRenderer.type,
-                        GetDefaultValue: () =>
-                          (
-                            dispatchedFilterRenderer.GetDefaultValue() as Value<PredicateValue>
-                          ).value,
-                        GetDefaultState: () =>
-                          (
-                            dispatchedFilterRenderer.GetDefaultState() as Value<any>
-                          ).value,
-                        label: dispatchedFilterRenderer.label,
-                        tooltip: dispatchedFilterRenderer.tooltip,
-                        details: dispatchedFilterRenderer.details,
-                      }));
-                  })();
+                  ).Then((cellTemplates) =>
+                    TableDispatcher.Operations.DispatchDetailsRenderer(
+                      renderer,
+                      dispatcherContext,
+                      isInlined,
+                    ).Then((detailsRenderer) => {
+                      const filtering =
+                        tableApi == undefined
+                          ? undefined
+                          : (dispatcherContext.specApis.tables?.get(tableApi)
+                              ?.filtering ?? undefined);
 
-                  return dispatcherContext
-                    .getConcreteRenderer("table", renderer.concreteRenderer)
-                    .Then((concreteRenderer) =>
-                      TableDispatcher.Operations.GetApi(
-                        renderer.api ?? tableApi,
-                        dispatcherContext,
-                      ).Then((tableApiSource) => {
-                        const highlightedFilters =
-                          api == undefined
-                            ? []
-                            : (dispatcherContext.specApis.tables
-                                ?.get(api!)
-                                ?.highlightedFilters?.toArray() ?? []);
-
-                        const sorting =
-                          api == undefined
-                            ? []
-                            : (dispatcherContext.specApis.tables?.get(api!)
-                                ?.sorting ?? []);
-                        return ValueOrErrors.Default.return(
-                          TableAbstractRenderer(
-                            Map(cellTemplates),
-                            renderer.columns,
-                            detailsRenderer,
-                            renderer.detailsRenderer,
-                            renderer.visibleColumns,
-                            renderer.disabledColumns,
-                            dispatcherContext.IdProvider,
-                            dispatcherContext.ErrorRenderer,
-                            tableEntityType,
-                            AllowedFilters,
-                            dispatcherContext.parseToApiByType,
-                            dispatcherContext.parseFromApiByType,
-                            dispatcherContext.parseFromApiByType(
-                              renderer.type.arg,
+                      // TODO - this can be significantly improved, also to provide an error if something fails
+                      const AllowedFilters: Map<
+                        string,
+                        {
+                          template: Template<any, any, any, any>;
+                          filters: SumNType<any>;
+                          type: DispatchParsedType<any>;
+                          GetDefaultValue: () => PredicateValue;
+                          GetDefaultState: () => any;
+                          label: string | undefined;
+                          tooltip: string | undefined;
+                          details: string | undefined;
+                        }
+                      > = (() => {
+                        if (filtering == undefined) {
+                          return Map([]);
+                        }
+                        return filtering
+                          .map((columnFilters) => ({
+                            template: Dispatcher.Operations.DispatchAs(
+                              columnFilters.displayRenderer,
+                              dispatcherContext,
+                              "table column filter renderer",
+                              false,
+                              isInlined,
+                              tableApi,
                             ),
-                            tableApiSource,
+                            filters: columnFilters.filters,
+                            type: columnFilters.displayType,
+                            GetDefaultValue: () =>
+                              dispatcherContext.defaultValue(
+                                columnFilters.displayType,
+                                columnFilters.displayRenderer,
+                              ),
+                            GetDefaultState: () =>
+                              dispatcherContext.defaultState(
+                                columnFilters.displayType,
+                                columnFilters.displayRenderer,
+                              ),
+                            label: columnFilters.label,
+                            tooltip: columnFilters.tooltip,
+                            details: columnFilters.details,
+                          }))
+                          .filter(
+                            (dispatchedFilterRenderer) =>
+                              dispatchedFilterRenderer.template.kind ==
+                                "value" &&
+                              dispatchedFilterRenderer.GetDefaultValue().kind ==
+                                "value" &&
+                              dispatchedFilterRenderer.GetDefaultState().kind ==
+                                "value",
                           )
-                            .mapContext((_: any) => ({
-                              ..._,
-                              type: renderer.type,
-                              apiMethods:
-                                api == undefined
-                                  ? []
-                                  : (dispatcherContext.specApis.tables?.get(
-                                      api!,
-                                    )?.methods ?? []),
-                              sorting,
-                              highlightedFilters,
-                            }))
-                            .withView(concreteRenderer),
+                          .map((dispatchedFilterRenderer) => ({
+                            template: (
+                              dispatchedFilterRenderer.template as Value<
+                                Template<any, any, any, any>
+                              >
+                            ).value,
+                            filters: dispatchedFilterRenderer.filters,
+                            type: dispatchedFilterRenderer.type,
+                            GetDefaultValue: () =>
+                              (
+                                dispatchedFilterRenderer.GetDefaultValue() as Value<PredicateValue>
+                              ).value,
+                            GetDefaultState: () =>
+                              (
+                                dispatchedFilterRenderer.GetDefaultState() as Value<any>
+                              ).value,
+                            label: dispatchedFilterRenderer.label,
+                            tooltip: dispatchedFilterRenderer.tooltip,
+                            details: dispatchedFilterRenderer.details,
+                          }));
+                      })();
+
+                      return dispatcherContext
+                        .getConcreteRenderer("table", renderer.concreteRenderer)
+                        .Then((concreteRenderer) =>
+                          TableDispatcher.Operations.GetApi(
+                            tableApi,
+                            dispatcherContext,
+                          ).Then((tableApiSource) => {
+                            const highlightedFilters =
+                              tableApi == undefined
+                                ? []
+                                : (dispatcherContext.specApis.tables
+                                    ?.get(tableApi)
+                                    ?.highlightedFilters?.toArray() ?? []);
+
+                            const sorting =
+                              tableApi == undefined
+                                ? []
+                                : (dispatcherContext.specApis.tables?.get(
+                                    tableApi,
+                                  )?.sorting ?? []);
+                            return ValueOrErrors.Default.return(
+                              TableAbstractRenderer(
+                                Map(cellTemplates),
+                                renderer.columns,
+                                detailsRenderer,
+                                renderer.detailsRenderer,
+                                renderer.visibleColumns,
+                                renderer.disabledColumns,
+                                dispatcherContext.IdProvider,
+                                dispatcherContext.ErrorRenderer,
+                                tableEntityType,
+                                AllowedFilters,
+                                dispatcherContext.parseToApiByType,
+                                dispatcherContext.parseFromApiByType,
+                                dispatcherContext.parseFromApiByType(
+                                  renderer.type.arg,
+                                ),
+                                tableApiSource,
+                              )
+                                .mapContext((_: any) => ({
+                                  ..._,
+                                  type: renderer.type,
+                                  apiMethods:
+                                    tableApi == undefined
+                                      ? []
+                                      : (dispatcherContext.specApis.tables?.get(
+                                          tableApi,
+                                        )?.methods ?? []),
+                                  sorting,
+                                  highlightedFilters,
+                                }))
+                                .withView(concreteRenderer),
+                            );
+                          }),
                         );
-                      }),
-                    );
-                }),
-              )
-            : ValueOrErrors.Default.throwOne<
-                Template<any, any, any, any>,
-                string
-              >(
-                `expected a record type, but got a ${tableEntityType.kind} type`,
+                    }),
+                  )
+                : ValueOrErrors.Default.throwOne<
+                    Template<any, any, any, any>,
+                    string
+                  >(
+                    `expected a record type, but got a ${tableEntityType.kind} type`,
+                  ),
+            )
+            .MapErrors((errors) =>
+              errors.map(
+                (error) => `${error}\n...When dispatching as table form`,
               ),
-        )
-        .MapErrors((errors) =>
-          errors.map((error) => `${error}\n...When dispatching as table form`),
-        ),
+            ),
   },
 };

package/src/forms/domains/dispatched-forms/runner/domains/dispatcher/domains/tupleDispatcher/state.ts

@@ -29,7 +29,6 @@ export const TupleDispatcher = {
         ExtraContext
       >,
       isInlined: boolean,
-      tableApi: string | undefined,
     ): ValueOrErrors<Template<any, any, any, any>, string> =>
       ValueOrErrors.Operations.All(
         List<ValueOrErrors<[number, Template<any, any, any, any>], string>>(
@@ -39,7 +38,6 @@ export const TupleDispatcher = {
               dispatcherContext,
               `Item ${index + 1}`,
               isInlined,
-              tableApi,
             ).Then((template) =>
               ValueOrErrors.Default.return([index, template]),
             ),

package/src/forms/domains/dispatched-forms/runner/domains/dispatcher/domains/unionDispatcher/state.ts

@@ -31,7 +31,6 @@ export const UnionDispatcher = {
         ExtraContext
       >,
       isNested: boolean,
-      tableApi: string | undefined,
     ): ValueOrErrors<Template<any, any, any, any>, string> =>
       ValueOrErrors.Operations.All(
         List<ValueOrErrors<[string, Template<any, any, any, any>], string>>(
@@ -49,7 +48,7 @@ export const UnionDispatcher = {
                   `case ${caseName}`,
                   isNested,
                   false,
-                  tableApi,
+                  undefined,
                 ).Then((template) =>
                   ValueOrErrors.Default.return<
                     [string, Template<any, any, any, any>],

package/src/forms/domains/dispatched-forms/runner/domains/dispatcher/state.ts

@@ -38,14 +38,14 @@ export const Dispatcher = {
       as: string,
       isNested: boolean,
       isInlined: boolean,
-      tableApi: string | undefined,
+      api: string | Array<string> | undefined,
     ): ValueOrErrors<Template<any, any, any, any>, string> =>
       Dispatcher.Operations.Dispatch(
         renderer,
         dispatcherContext,
         isNested,
         isInlined,
-        tableApi,
+        api,
       ).MapErrors((errors) =>
         errors.map((error) => `${error}\n...When dispatching as: ${as}`),
       ),
@@ -64,7 +64,7 @@ export const Dispatcher = {
       >,
       isNested: boolean,
       isInlined: boolean | undefined,
-      tableApi: string | undefined,
+      api: string | Array<string> | undefined,
     ): ValueOrErrors<Template<any, any, any, any>, string> => {
       // see the deserializer state file for a commeny explaining lookup renderers
       return renderer.kind == "primitiveRenderer"
@@ -74,7 +74,7 @@ export const Dispatcher = {
           ? LookupDispatcher.Operations.Dispatch(
               renderer,
               dispatcherContext,
-              tableApi,
+              api,
             )
           : renderer.kind == "inlinedType-lookupRenderer"
             ? LookupRenderer.Operations.ResolveRenderer(
@@ -86,7 +86,7 @@ export const Dispatcher = {
                   dispatcherContext,
                   isNested,
                   false,
-                  renderer.tableApi ?? tableApi,
+                  api,
                 ),
               )
             : renderer.kind == "recordRenderer"
@@ -95,21 +95,18 @@ export const Dispatcher = {
                   dispatcherContext,
                   isNested,
                   isInlined ?? true,
-                  tableApi,
                 )
               : renderer.kind == "listRenderer"
                 ? ListDispatcher.Operations.Dispatch(
                     renderer,
                     dispatcherContext,
                     isInlined ?? true,
-                    tableApi,
                   )
                 : renderer.kind == "mapRenderer"
                   ? MapDispatcher.Operations.Dispatch(
                       renderer,
                       dispatcherContext,
                       isInlined ?? true,
-                      tableApi,
                     )
                   : (renderer.kind == "enumRenderer" ||
                         renderer.kind == "streamRenderer") &&
@@ -130,14 +127,12 @@ export const Dispatcher = {
                             renderer,
                             dispatcherContext,
                             isInlined ?? true,
-                            tableApi,
                           )
                         : renderer.kind == "readOnlyRenderer"
                           ? ReadOnlyDispatcher.Operations.Dispatch(
                               renderer,
                               dispatcherContext,
                               isInlined ?? true,
-                              tableApi,
                             )
                           : renderer.kind == "sumRenderer" ||
                               renderer.kind == "sumUnitDateRenderer"
@@ -145,13 +140,12 @@ export const Dispatcher = {
                                 renderer,
                                 dispatcherContext,
                                 isInlined ?? true,
-                                tableApi,
                               )
                             : renderer.kind == "tableRenderer"
                               ? TableDispatcher.Operations.Dispatch(
                                   renderer,
                                   dispatcherContext,
-                                  tableApi,
+                                  api,
                                   isInlined ?? true,
                                 )
                               : renderer.kind == "tupleRenderer"
@@ -159,14 +153,12 @@ export const Dispatcher = {
                                     renderer,
                                     dispatcherContext,
                                     isInlined ?? true,
-                                    tableApi,
                                   )
                                 : renderer.kind == "unionRenderer"
                                   ? UnionDispatcher.Operations.Dispatch(
                                       renderer,
                                       dispatcherContext,
                                       isNested,
-                                      tableApi,
                                     )
                                   : ValueOrErrors.Default.throwOne(
                                       `unknown renderer ${renderer.kind}`,