ballerina-core 1.0.222 → 1.0.224

package/bin/src/value-infinite-data-stream/state.js

@@ -3,217 +3,95 @@ import { Updater } from "../fun/domains/updater/state";
 import { replaceWith } from "../fun/domains/updater/domains/replaceWith/state";
 import { simpleUpdater } from "../fun/domains/updater/domains/simpleUpdater/state";
 import { AsyncState } from "../async/state";
-import { MapRepo, ValueOrErrors, ValueRecord } from "../../main";
+import { MapRepo, ValueOrErrors, ValueRecord, } from "../../main";
 export const ValueStreamPosition = {
-  Default: (initialChunkSize, shouldLoad = false) => ({
-    nextStart: 0,
-    chunkSize: initialChunkSize,
-    chunkIndex: 0,
-    shouldLoad,
-    lastModifiedTime: Date.now(),
-  }),
-  Updaters: {
-    Template: {
-      changeChunkSize: (chunkSize) =>
-        ValueStreamPosition.Updaters.Core.chunkSize(
-          replaceWith(chunkSize),
-        ).then(ValueStreamPosition.Updaters.Template.reload()),
-      reload: () =>
-        ValueStreamPosition.Updaters.Core.lastModifiedTime(
-          replaceWith(Date.now()),
-        )
-          .then(
-            ValueStreamPosition.Updaters.Core.shouldLoad(replaceWith("reload")),
-          )
-          .then(ValueStreamPosition.Updaters.Core.chunkIndex(replaceWith(0))),
-      loadMore: () =>
-        ValueStreamPosition.Updaters.Core.chunkIndex((_) => _ + 1).then(
-          ValueStreamPosition.Updaters.Core.lastModifiedTime(
-            replaceWith(Date.now()),
-          ).then(
-            ValueStreamPosition.Updaters.Core.shouldLoad(
-              replaceWith("loadMore"),
-            ),
-          ),
-        ),
-      initLoad: () =>
-        ValueStreamPosition.Updaters.Core.lastModifiedTime(
-          replaceWith(Date.now()),
-        ).then(
-          ValueStreamPosition.Updaters.Core.shouldLoad(replaceWith("loadMore")),
-        ),
+    Default: (initialChunkSize, shouldLoad = false) => ({
+        nextStart: 0,
+        chunkSize: initialChunkSize,
+        chunkIndex: 0,
+        shouldLoad,
+        lastModifiedTime: Date.now(),
+    }),
+    Updaters: {
+        Template: {
+            changeChunkSize: (chunkSize) => ValueStreamPosition.Updaters.Core.chunkSize(replaceWith(chunkSize)).then(ValueStreamPosition.Updaters.Template.reload()),
+            reload: () => ValueStreamPosition.Updaters.Core.lastModifiedTime(replaceWith(Date.now()))
+                .then(ValueStreamPosition.Updaters.Core.shouldLoad(replaceWith("reload")))
+                .then(ValueStreamPosition.Updaters.Core.chunkIndex(replaceWith(0))),
+            loadMore: () => ValueStreamPosition.Updaters.Core.chunkIndex((_) => _ + 1).then(ValueStreamPosition.Updaters.Core.lastModifiedTime(replaceWith(Date.now())).then(ValueStreamPosition.Updaters.Core.shouldLoad(replaceWith("loadMore")))),
+            initLoad: () => ValueStreamPosition.Updaters.Core.lastModifiedTime(replaceWith(Date.now())).then(ValueStreamPosition.Updaters.Core.shouldLoad(replaceWith("loadMore"))),
+        },
+        Core: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, simpleUpdater()("lastModifiedTime")), simpleUpdater()("shouldLoad")), simpleUpdater()("chunkIndex")), simpleUpdater()("chunkSize")), simpleUpdater()("nextStart")),
+        Coroutine: {},
     },
-    Core: Object.assign(
-      Object.assign(
-        Object.assign(
-          Object.assign(
-            Object.assign({}, simpleUpdater()("lastModifiedTime")),
-            simpleUpdater()("shouldLoad"),
-          ),
-          simpleUpdater()("chunkIndex"),
-        ),
-        simpleUpdater()("chunkSize"),
-      ),
-      simpleUpdater()("nextStart"),
-    ),
-    Coroutine: {},
-  },
 };
 export const ValueChunk = {
-  Default: (hasMoreValues, data, from, to) => ({
-    hasMoreValues,
-    data,
-    from,
-    to,
-  }),
-  Updaters: {
-    Core: Object.assign(
-      Object.assign(
-        Object.assign(
-          Object.assign({}, simpleUpdater()("hasMoreValues")),
-          simpleUpdater()("data"),
-        ),
-        simpleUpdater()("from"),
-      ),
-      simpleUpdater()("to"),
-    ),
-    Template: {
-      updateValue: (valueId, valueUpdater) =>
-        ValueChunk.Updaters.Core.data(
-          MapRepo.Updaters.update(valueId, valueUpdater),
-        ),
-      updateValueItem: (valueId, itemId, valueUpdater) =>
-        ValueChunk.Updaters.Core.data(
-          MapRepo.Updaters.update(
-            valueId,
-            ValueRecord.Updaters.update(itemId, valueUpdater),
-          ),
-        ),
+    Default: (hasMoreValues, data, from, to) => ({
+        hasMoreValues,
+        data,
+        from,
+        to,
+    }),
+    Updaters: {
+        Core: Object.assign(Object.assign(Object.assign(Object.assign({}, simpleUpdater()("hasMoreValues")), simpleUpdater()("data")), simpleUpdater()("from")), simpleUpdater()("to")),
+        Template: {
+            updateValue: (valueId, valueUpdater) => ValueChunk.Updaters.Core.data(MapRepo.Updaters.update(valueId, valueUpdater)),
+            updateValueItem: (valueId, itemId, valueUpdater) => ValueChunk.Updaters.Core.data(MapRepo.Updaters.update(valueId, ValueRecord.Updaters.update(itemId, valueUpdater))),
+        },
     },
-  },
 };
 export const StateChunkItem = {
-  Default: (state) => Map(state),
+    Default: (state) => Map(state),
 };
 export const StateChunk = {
-  Default: (state) => Map(state),
+    Default: (state) => Map(state),
 };
 export const ValueInfiniteStreamState = {
-  Default: (initialChunkSize, getChunk, shouldLoad) => ({
-    loadingMore: AsyncState.Default.unloaded(),
-    loadedElements: OrderedMap(),
-    position: ValueStreamPosition.Default(initialChunkSize, shouldLoad),
-    getChunk,
-  }),
-  Operations: {
-    shouldCoroutineRun: (current) => current.position.shouldLoad != false,
-    loadNextPage: (current) => {
-      var _a;
-      return (
-        current.position.shouldLoad !== false &&
-        ((_a = current.loadedElements.last()) === null || _a === void 0
-          ? void 0
-          : _a.hasMoreValues) !== false
-      );
-    },
-    getChunkIndexForValue: (current, valueId) =>
-      ValueOrErrors.Default.return(
-        current.loadedElements.findLastKey((chunk) => chunk.data.has(valueId)),
-      ).Then((chunkIndex) =>
-        chunkIndex == undefined
-          ? ValueOrErrors.Default.throwOne("value not found in any chunks")
-          : ValueOrErrors.Default.return(chunkIndex),
-      ),
-  },
-  Updaters: {
-    Coroutine: {
-      addLoadedChunk: (chunkIndex, newChunk) =>
-        ValueInfiniteStreamState.Updaters.Core.loadedElements((_) =>
-          _.set(chunkIndex, newChunk),
-        ),
+    Default: (initialChunkSize, getChunk, shouldLoad) => ({
+        loadingMore: AsyncState.Default.unloaded(),
+        loadedElements: OrderedMap(),
+        position: ValueStreamPosition.Default(initialChunkSize, shouldLoad),
+        getChunk,
+    }),
+    Operations: {
+        shouldCoroutineRun: (current) => current.position.shouldLoad != false,
+        loadNextPage: (current) => {
+            var _a;
+            return current.position.shouldLoad !== false &&
+                ((_a = current.loadedElements.last()) === null || _a === void 0 ? void 0 : _a.hasMoreValues) !== false;
+        },
+        getChunkIndexForValue: (current, valueId) => ValueOrErrors.Default.return(current.loadedElements.findLastKey((chunk) => chunk.data.has(valueId))).Then((chunkIndex) => chunkIndex == undefined
+            ? ValueOrErrors.Default.throwOne("value not found in any chunks")
+            : ValueOrErrors.Default.return(chunkIndex)),
     },
-    Core: Object.assign(
-      Object.assign(
-        Object.assign(
-          Object.assign({}, simpleUpdater()("getChunk")),
-          simpleUpdater()("loadingMore"),
-        ),
-        simpleUpdater()("loadedElements"),
-      ),
-      {
-        whenNotAlreadyLoading: (_) => {
-          return Updater((current) => {
-            if (ValueInfiniteStreamState.Operations.loadNextPage(current)) {
-              return current;
-            }
-            return _(current);
-          });
+    Updaters: {
+        Coroutine: {
+            addLoadedChunk: (chunkIndex, newChunk) => ValueInfiniteStreamState.Updaters.Core.loadedElements((_) => _.set(chunkIndex, newChunk)),
+        },
+        Core: Object.assign(Object.assign(Object.assign(Object.assign({}, simpleUpdater()("getChunk")), simpleUpdater()("loadingMore")), simpleUpdater()("loadedElements")), { whenNotAlreadyLoading: (_) => {
+                return Updater((current) => {
+                    if (ValueInfiniteStreamState.Operations.loadNextPage(current)) {
+                        return current;
+                    }
+                    return _(current);
+                });
+            }, position: (positionUpdater) => Updater((current) => {
+                const newPosition = positionUpdater(current.position);
+                let newState = current;
+                if (newPosition.chunkSize != current.position.chunkSize)
+                    newState =
+                        ValueInfiniteStreamState.Updaters.Core.clearLoadedElements()(newState);
+                return Object.assign(Object.assign({}, newState), { position: newPosition });
+            }), clearLoadedElements: () => ValueInfiniteStreamState.Updaters.Core.loadedElements((_) => OrderedMap()) }),
+        Template: {
+            reload: (getChunk) => ValueInfiniteStreamState.Updaters.Core.position(ValueStreamPosition.Updaters.Template.reload())
+                .then(ValueInfiniteStreamState.Updaters.Core.clearLoadedElements())
+                .then(ValueInfiniteStreamState.Updaters.Core.getChunk(replaceWith(getChunk))),
+            loadMore: () => ValueInfiniteStreamState.Updaters.Core.whenNotAlreadyLoading(ValueInfiniteStreamState.Updaters.Core.position(ValueStreamPosition.Updaters.Template.loadMore())),
+            initLoad: () => ValueInfiniteStreamState.Updaters.Core.whenNotAlreadyLoading(ValueInfiniteStreamState.Updaters.Core.position(ValueStreamPosition.Updaters.Template.initLoad())),
+            updateChunkValue: (chunkIndex, chunkValueKey) => (valueUpdater) => ValueInfiniteStreamState.Updaters.Core.loadedElements(MapRepo.Updaters.update(chunkIndex, ValueChunk.Updaters.Template.updateValue(chunkValueKey, valueUpdater))),
+            updateChunkValueItem: (chunkIndex, chunkValueKey, chunkValueItemKey) => (valueUpdater) => ValueInfiniteStreamState.Updaters.Core.loadedElements(MapRepo.Updaters.update(chunkIndex, ValueChunk.Updaters.Template.updateValueItem(chunkValueKey, chunkValueItemKey, valueUpdater))),
         },
-        position: (positionUpdater) =>
-          Updater((current) => {
-            const newPosition = positionUpdater(current.position);
-            let newState = current;
-            if (newPosition.chunkSize != current.position.chunkSize)
-              newState =
-                ValueInfiniteStreamState.Updaters.Core.clearLoadedElements()(
-                  newState,
-                );
-            return Object.assign(Object.assign({}, newState), {
-              position: newPosition,
-            });
-          }),
-        clearLoadedElements: () =>
-          ValueInfiniteStreamState.Updaters.Core.loadedElements((_) =>
-            OrderedMap(),
-          ),
-      },
-    ),
-    Template: {
-      reload: (getChunk) =>
-        ValueInfiniteStreamState.Updaters.Core.position(
-          ValueStreamPosition.Updaters.Template.reload(),
-        )
-          .then(ValueInfiniteStreamState.Updaters.Core.clearLoadedElements())
-          .then(
-            ValueInfiniteStreamState.Updaters.Core.getChunk(
-              replaceWith(getChunk),
-            ),
-          ),
-      loadMore: () =>
-        ValueInfiniteStreamState.Updaters.Core.whenNotAlreadyLoading(
-          ValueInfiniteStreamState.Updaters.Core.position(
-            ValueStreamPosition.Updaters.Template.loadMore(),
-          ),
-        ),
-      initLoad: () =>
-        ValueInfiniteStreamState.Updaters.Core.whenNotAlreadyLoading(
-          ValueInfiniteStreamState.Updaters.Core.position(
-            ValueStreamPosition.Updaters.Template.initLoad(),
-          ),
-        ),
-      updateChunkValue: (chunkIndex, chunkValueKey) => (valueUpdater) =>
-        ValueInfiniteStreamState.Updaters.Core.loadedElements(
-          MapRepo.Updaters.update(
-            chunkIndex,
-            ValueChunk.Updaters.Template.updateValue(
-              chunkValueKey,
-              valueUpdater,
-            ),
-          ),
-        ),
-      updateChunkValueItem:
-        (chunkIndex, chunkValueKey, chunkValueItemKey) => (valueUpdater) =>
-          ValueInfiniteStreamState.Updaters.Core.loadedElements(
-            MapRepo.Updaters.update(
-              chunkIndex,
-              ValueChunk.Updaters.Template.updateValueItem(
-                chunkValueKey,
-                chunkValueItemKey,
-                valueUpdater,
-              ),
-            ),
-          ),
     },
-  },
 };
-//# sourceMappingURL=state.js.map
+//# sourceMappingURL=state.js.map

package/bin/src/value-infinite-data-stream/template.d.ts

@@ -1,9 +1,4 @@
 import { Unit } from "../fun/domains/unit/state";
 import { Template } from "../template/state";
-export declare const ValueInfiniteStreamTemplate: Template<
-  import("./state").ValueInfiniteStreamState,
-  import("./state").ValueInfiniteStreamState,
-  Unit,
-  Unit
->;
-//# sourceMappingURL=template.d.ts.map
+export declare const ValueInfiniteStreamTemplate: Template<import("./state").ValueInfiniteStreamState, import("./state").ValueInfiniteStreamState, Unit, Unit>;
+//# sourceMappingURL=template.d.ts.map

package/bin/src/value-infinite-data-stream/template.js

@@ -1,7 +1,5 @@
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 import { Template } from "../template/state";
 import { ValueStreamDataLoader } from "./coroutines/runner";
-export const ValueInfiniteStreamTemplate = Template.Default((_props) =>
-  _jsx(_Fragment, {}),
-).any([ValueStreamDataLoader()]);
-//# sourceMappingURL=template.js.map
+export const ValueInfiniteStreamTemplate = Template.Default((_props) => _jsx(_Fragment, {})).any([ValueStreamDataLoader()]);
+//# sourceMappingURL=template.js.map

package/bin/src/visibility/state.d.ts

@@ -1,5 +1,2 @@
-export type Visibility =
-  | "fully-visible"
-  | "fully-invisible"
-  | "partially-visible";
-//# sourceMappingURL=state.d.ts.map
+export type Visibility = "fully-visible" | "fully-invisible" | "partially-visible";
+//# sourceMappingURL=state.d.ts.map

package/bin/src/visibility/state.js

@@ -1,2 +1,2 @@
 export {};
-//# sourceMappingURL=state.js.map
+//# sourceMappingURL=state.js.map

package/package.json

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

package/src/forms/domains/dispatched-forms/deserializer/coroutines/runner.ts

@@ -96,13 +96,8 @@ export const LoadAndDeserializeSpecification = <
             current.defaultRecordConcreteRenderer,
             current.defaultNestedRecordConcreteRenderer,
             current.concreteRenderers,
-            current.infiniteStreamSources,
-            current.enumOptionsSources,
-            current.entityApis,
             current.IdWrapper,
             current.ErrorRenderer,
-            current.tableApiSources,
-            current.lookupSources,
           )(deserializationResult.value);
 
           if (result.kind == "errors") {

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

@@ -84,9 +84,6 @@ export type DispatcherContext<
   injectedPrimitives: DispatchInjectedPrimitives<T> | undefined;
   apiConverters: DispatchApiConverters<T>;
   specApis: SpecificationApis<T>;
-  infiniteStreamSources: DispatchInfiniteStreamSources;
-  enumOptionsSources: DispatchEnumOptionsSources;
-  entityApis: DispatchEntityApis;
   getConcreteRendererKind: (viewName: string) => ValueOrErrors<string, string>;
   getConcreteRenderer: ReturnType<
     typeof tryGetConcreteRenderer<
@@ -119,6 +116,10 @@ export type DispatcherContext<
     renderer: Renderer<T>,
   ) => ValueOrErrors<PredicateValue, string>;
   defaultState: (
+    infiniteStreamSources: DispatchInfiniteStreamSources,
+    lookupSources: DispatchLookupSources | undefined,
+    tableApiSources: DispatchTableApiSources | undefined,
+  ) => (
     t: DispatchParsedType<T>,
     renderer: Renderer<T>,
   ) => ValueOrErrors<any, string>;
@@ -126,8 +127,6 @@ export type DispatcherContext<
   types: Map<DispatchTypeName, DispatchParsedType<T>>;
   IdProvider: (props: IdWrapperProps) => React.ReactNode;
   ErrorRenderer: (props: ErrorRendererProps) => React.ReactNode;
-  tableApiSources?: DispatchTableApiSources;
-  lookupSources?: DispatchLookupSources;
   parseFromApiByType: (
     type: DispatchParsedType<T>,
   ) => (raw: any) => ValueOrErrors<PredicateValue, string>;
@@ -293,13 +292,8 @@ export const parseDispatchFormsToLaunchers =
       CustomPresentationContexts,
       ExtraContext
     >,
-    infiniteStreamSources: DispatchInfiniteStreamSources,
-    enumOptionsSources: DispatchEnumOptionsSources,
-    entityApis: DispatchEntityApis,
     IdProvider: (props: IdWrapperProps) => React.ReactNode,
     ErrorRenderer: (props: ErrorRendererProps) => React.ReactNode,
-    tableApiSources?: DispatchTableApiSources,
-    lookupSources?: DispatchLookupSources,
   ) =>
   (
     specification: Specification<T>,
@@ -378,11 +372,6 @@ export const parseDispatchFormsToLaunchers =
             forms: specification.forms,
             injectedPrimitives,
             apiConverters,
-            infiniteStreamSources,
-            lookupSources,
-            enumOptionsSources,
-            tableApiSources,
-            entityApis,
             concreteRenderers,
             lookupTypeRenderer,
             getConcreteRendererKind: concreteRendererToKind(concreteRenderers),
@@ -398,16 +387,21 @@ export const parseDispatchFormsToLaunchers =
               specification.types,
               specification.forms,
             ),
-            defaultState: dispatchDefaultState(
-              infiniteStreamSources,
-              injectedPrimitives,
-              specification.types,
-              specification.forms,
-              apiConverters,
-              lookupSources,
-              tableApiSources,
-              specification.apis,
-            ),
+            defaultState: (
+              infiniteStreamSources: DispatchInfiniteStreamSources,
+              lookupSources: DispatchLookupSources | undefined,
+              tableApiSources: DispatchTableApiSources | undefined,
+            ) =>
+              dispatchDefaultState(
+                infiniteStreamSources,
+                injectedPrimitives,
+                specification.types,
+                specification.forms,
+                apiConverters,
+                lookupSources,
+                tableApiSources,
+                specification.apis,
+              ),
             types: specification.types,
             parseFromApiByType: (type: DispatchParsedType<T>) =>
               dispatchFromAPIRawValue(
@@ -500,13 +494,8 @@ export type DispatchFormsParserContext<
   IdWrapper: (props: IdWrapperProps) => React.ReactNode;
   ErrorRenderer: (props: ErrorRendererProps) => React.ReactNode;
   fieldTypeConverters: DispatchApiConverters<T>;
-  infiniteStreamSources: DispatchInfiniteStreamSources;
-  lookupSources?: DispatchLookupSources;
-  enumOptionsSources: DispatchEnumOptionsSources;
-  entityApis: DispatchEntityApis;
   getFormsConfig: BasicFun<void, Promise<any>>;
   injectedPrimitives?: DispatchInjectables<T>;
-  tableApiSources?: DispatchTableApiSources;
 };
 
 export type DispatchFormsParserState<

package/src/forms/domains/dispatched-forms/runner/coroutines/runner.ts

@@ -1,6 +1,7 @@
 import { AsyncState } from "../../../../../async/state";
 import { CoTypedFactory } from "../../../../../coroutines/builder";
 import {
+  ApiSources,
   DispatchFormRunnerContext,
   DispatchFormRunnerForeignMutationsExpected,
   DispatchFormRunnerStatus,
@@ -9,7 +10,30 @@ import { id } from "../../../../../fun/domains/id/state";
 import { DispatchFormRunnerState } from "../state";
 import { replaceWith } from "../../../../../fun/domains/updater/domains/replaceWith/state";
 import { List } from "immutable";
-import { DispatchInjectablesTypes, Dispatcher } from "../../../../../../main";
+import {
+  DispatchInjectablesTypes,
+  Dispatcher,
+  DispatcherContext,
+  DispatchParsedType,
+  Renderer,
+  ValueOrErrors,
+} from "../../../../../../main";
+
+export type DispatcherContextWithApiSources<
+  T extends DispatchInjectablesTypes<T>,
+  Flags,
+  CustomPresentationContexts,
+  ExtraContext,
+> = Omit<
+  DispatcherContext<T, Flags, CustomPresentationContexts, ExtraContext>,
+  "defaultState"
+> &
+  ApiSources & {
+    defaultState: (
+      t: DispatchParsedType<T>,
+      renderer: Renderer<T>,
+    ) => ValueOrErrors<any, string>;
+  };
 
 export const DispatchFormRunner = <
   T extends DispatchInjectablesTypes<T>,
@@ -114,9 +138,24 @@ export const DispatchFormRunner = <
                 );
               }
 
+              const dispatcherContextWithApiSources: DispatcherContextWithApiSources<
+                T,
+                Flags,
+                CustomPresentationContexts,
+                ExtraContext
+              > = {
+                ...dispatcherContext,
+                ...launcherRef.apiSources,
+                defaultState: dispatcherContext.defaultState(
+                  launcherRef.apiSources.infiniteStreamSources,
+                  launcherRef.apiSources.lookupSources,
+                  launcherRef.apiSources.tableApiSources,
+                ),
+              };
+
               const Form = Dispatcher.Operations.Dispatch(
                 passthroughFormLauncher.renderer,
-                dispatcherContext,
+                dispatcherContextWithApiSources,
                 false,
                 false,
                 undefined,
@@ -133,9 +172,10 @@ export const DispatchFormRunner = <
               }
 
               const initialState = dispatcherContext.defaultState(
-                passthroughFormLauncher.type,
-                passthroughFormLauncher.renderer,
-              );
+                launcherRef.apiSources.infiniteStreamSources,
+                launcherRef.apiSources.lookupSources,
+                launcherRef.apiSources.tableApiSources,
+              )(passthroughFormLauncher.type, passthroughFormLauncher.renderer);
 
               if (initialState.kind == "errors") {
                 console.error(

package/src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/table/coroutines/loadWithRetries.ts

@@ -49,7 +49,7 @@ export const TableLoadWithRetries =
                         current.customFormState.loadingState ==
                           "reload from 0" || current.value.to == 0
                           ? 0
-                          : current.value.to + 1,
+                          : current.value.to,
                       filtersAndSorting:
                         current.customFormState.filterAndSortParam,
                     }),

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

@@ -1,4 +1,3 @@
-import { DispatcherContext } from "../../../../../deserializer/state";
 import {
   DispatchInjectablesTypes,
   ListAbstractRenderer,
@@ -7,6 +6,7 @@ import {
 } from "../../../../../../../../../main";
 import { ListRenderer } from "../../../../../deserializer/domains/specification/domains/forms/domains/renderer/domains/list/state";
 import { NestedDispatcher } from "../nestedDispatcher/state";
+import { DispatcherContextWithApiSources } from "../../../../coroutines/runner";
 
 //TODO check type
 export const ListDispatcher = {
@@ -18,7 +18,7 @@ export const ListDispatcher = {
       ExtraContext,
     >(
       renderer: ListRenderer<T>,
-      dispatcherContext: DispatcherContext<
+      dispatcherContext: DispatcherContextWithApiSources<
         T,
         Flags,
         CustomPresentationContexts,

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

@@ -4,12 +4,10 @@ import {
   LookupTypeAbstractRenderer,
   Template,
 } from "../../../../../../../../../main";
-import {
-  DispatcherContext,
-  ValueOrErrors,
-} from "../../../../../../../../../main";
+import { ValueOrErrors } from "../../../../../../../../../main";
 import { LookupRenderer } from "../../../../../deserializer/domains/specification/domains/forms/domains/renderer/domains/lookup/state";
 import { Dispatcher } from "../../state";
+import { DispatcherContextWithApiSources } from "../../../../coroutines/runner";
 
 export const LookupDispatcher = {
   Operations: {
@@ -20,7 +18,7 @@ export const LookupDispatcher = {
       ExtraContext,
     >(
       renderer: LookupRenderer<T>,
-      dispatcherContext: DispatcherContext<
+      dispatcherContext: DispatcherContextWithApiSources<
         T,
         Flags,
         CustomPresentationContexts,

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

@@ -5,7 +5,7 @@ import {
   Template,
 } from "../../../../../../../../../main";
 import { MapRenderer } from "../../../../../deserializer/domains/specification/domains/forms/domains/renderer/domains/map/state";
-import { DispatcherContext } from "../../../../../deserializer/state";
+import { DispatcherContextWithApiSources } from "../../../../coroutines/runner";
 import { NestedDispatcher } from "../nestedDispatcher/state";
 
 export const MapDispatcher = {
@@ -17,7 +17,7 @@ export const MapDispatcher = {
       ExtraContext,
     >(
       renderer: MapRenderer<T>,
-      dispatcherContext: DispatcherContext<
+      dispatcherContext: DispatcherContextWithApiSources<
         T,
         Flags,
         CustomPresentationContexts,

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

@@ -1,6 +1,5 @@
 import {
   EnumMultiselectAbstractRenderer,
-  DispatcherContext,
   InfiniteMultiselectDropdownFormAbstractRenderer,
   ValueOrErrors,
   PredicateValue,
@@ -14,6 +13,7 @@ import { Template } from "../../../../../../../../template/state";
 import { OrderedMap } from "immutable";
 import { StreamRenderer } from "../../../../../deserializer/domains/specification/domains/forms/domains/renderer/domains/stream/state";
 import { EnumRenderer } from "../../../../../deserializer/domains/specification/domains/forms/domains/renderer/domains/enum/state";
+import { DispatcherContextWithApiSources } from "../../../../coroutines/runner";
 
 export const MultiSelectionDispatcher = {
   Operations: {
@@ -24,7 +24,7 @@ export const MultiSelectionDispatcher = {
       ExtraContext,
     >(
       renderer: EnumRenderer<T> | StreamRenderer<T>,
-      dispatcherContext: DispatcherContext<
+      dispatcherContext: DispatcherContextWithApiSources<
         T,
         Flags,
         CustomPresentationContexts,