ballerina-core 1.0.220 → 1.0.221

package/bin/src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/sum/template.js

@@ -11,6 +11,7 @@ import { SumAbstractRendererState } from "./state";
 export const SumAbstractRenderer = (
   IdProvider,
   ErrorRenderer,
+  SerializedType,
   leftTemplate,
   rightTemplate,
 ) => {
@@ -20,18 +21,18 @@ export const SumAbstractRenderer = (
           .mapContext((_) =>
             Object.assign(Object.assign({}, _.customFormState.left), {
               disabled: _.disabled,
-              locked: _.locked,
-              value: PredicateValue.Operations.IsUnit(_.value)
-                ? _.value
-                : _.value.value.value,
+              value: _.value.value.value,
               bindings: _.bindings,
               extraContext: _.extraContext,
               type: _.type.args[0],
               customPresentationContext: _.customPresentationContext,
               remoteEntityVersionIdentifier: _.remoteEntityVersionIdentifier,
-              domNodeAncestorPath: _.domNodeAncestorPath + "[sum][left]",
-              typeAncestors: [_.type].concat(_.typeAncestors),
-              lookupTypeAncestorNames: _.lookupTypeAncestorNames,
+              serializedTypeHierarchy: [SerializedType].concat(
+                _.serializedTypeHierarchy,
+              ),
+              domNodeTypeHierarchy: ["[left]", SerializedType].concat(
+                _.domNodeTypeHierarchy,
+              ),
             }),
           )
           .mapState(
@@ -44,8 +45,6 @@ export const SumAbstractRenderer = (
                 kind: "SumLeft",
                 value: nestedDelta,
                 flags: flags,
-                sourceAncestorLookupTypeNames:
-                  nestedDelta.sourceAncestorLookupTypeNames,
               };
               props.foreignMutations.onChange(
                 elementUpdater.kind == "l"
@@ -83,18 +82,18 @@ export const SumAbstractRenderer = (
           .mapContext((_) =>
             Object.assign(Object.assign({}, _.customFormState.right), {
               disabled: _.disabled,
-              locked: _.locked,
-              value: PredicateValue.Operations.IsUnit(_.value)
-                ? _.value
-                : _.value.value.value,
+              value: _.value.value.value,
               bindings: _.bindings,
               extraContext: _.extraContext,
               type: _.type.args[1],
               customPresentationContext: _.customPresentationContext,
               remoteEntityVersionIdentifier: _.remoteEntityVersionIdentifier,
-              domNodeAncestorPath: _.domNodeAncestorPath + "[sum][right]",
-              typeAncestors: [_.type].concat(_.typeAncestors),
-              lookupTypeAncestorNames: _.lookupTypeAncestorNames,
+              serializedTypeHierarchy: [SerializedType].concat(
+                _.serializedTypeHierarchy,
+              ),
+              domNodeTypeHierarchy: ["[right]", SerializedType].concat(
+                _.domNodeTypeHierarchy,
+              ),
             }),
           )
           .mapState(
@@ -107,8 +106,6 @@ export const SumAbstractRenderer = (
                 kind: "SumRight",
                 value: nestedDelta,
                 flags,
-                sourceAncestorLookupTypeNames:
-                  nestedDelta.sourceAncestorLookupTypeNames,
               };
               props.foreignMutations.onChange(
                 elementUpdater.kind == "l"
@@ -143,16 +140,19 @@ export const SumAbstractRenderer = (
           }))
     : undefined;
   return Template.Default((props) => {
-    const domNodeId = props.context.domNodeAncestorPath + "[sum]";
-    if (
-      !PredicateValue.Operations.IsSum(props.context.value) &&
-      !PredicateValue.Operations.IsUnit(props.context.value)
-    ) {
+    const completeSerializedTypeHierarchy = [SerializedType].concat(
+      props.context.serializedTypeHierarchy,
+    );
+    const domNodeTypeHierarchy = [SerializedType].concat(
+      props.context.domNodeTypeHierarchy,
+    );
+    const domNodeId = domNodeTypeHierarchy.join(".");
+    if (!PredicateValue.Operations.IsSum(props.context.value)) {
       console.error(
-        `Sum or unit value expected but got: ${JSON.stringify(props.context.value)}\n...When rendering \n...${domNodeId}`,
+        `Sum expected but got: ${JSON.stringify(props.context.value)}\n...When rendering sum field\n...${SerializedType}`,
       );
       return _jsx(ErrorRenderer, {
-        message: `${domNodeId}: Sum or unit value expected but got ${JSON.stringify(props.context.value)}`,
+        message: `${domNodeId}: Sum value expected for sum but got ${JSON.stringify(props.context.value)}`,
       });
     }
     return _jsx(_Fragment, {
@@ -163,6 +163,7 @@ export const SumAbstractRenderer = (
           Object.assign({}, props, {
             context: Object.assign(Object.assign({}, props.context), {
               domNodeId,
+              completeSerializedTypeHierarchy,
             }),
             foreignMutations: Object.assign({}, props.foreignMutations),
             embeddedLeftTemplate: embeddedLeftTemplate,

package/bin/src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/sum/template.js.map

@@ -1 +1 @@
-{"version":3,"file":"template.js","sourceRoot":"","sources":["../../../../../../../../../src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/sum/template.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"template.js","sourceRoot":"","sources":["../../../../../../../../../src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/sum/template.tsx"],"names":[],"mappings":"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"}

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

@@ -1,63 +1,101 @@
-import { Map, Set } from "immutable";
-import { DispatchParsedType, DispatchTableApiSource, PredicateValue, SumNType, Unit, ValueOrErrors } from "../../../../../../../../../main";
-export declare const TableInitialiseFiltersAndSortingRunner: <CustomPresentationContext = Unit, ExtraContext = Unit>(filterTypes: Map<string, SumNType<any>>, tableApiSource: DispatchTableApiSource, parseFromApiByType: (type: DispatchParsedType<any>) => (raw: any) => ValueOrErrors<PredicateValue, string>, parseToApiByType: (type: DispatchParsedType<any>, value: PredicateValue, state: any) => ValueOrErrors<any, string>) => import("../../../../../../../../template/state").Template<import("../../state").CommonAbstractRendererReadonlyContext<import("../../../../../../../../../main").TableType<any>, import("../../../../../../parser/domains/predicates/state").ValueTable, CustomPresentationContext, ExtraContext> & {
+import { Map } from "immutable";
+import { ValueInfiniteStreamState } from "../../../../../../../../value-infinite-data-stream/state";
+import {
+  TableAbstractRendererState,
+  Unit,
+} from "../../../../../../../../../main";
+export declare const TableReinitialiseRunner: <
+  CustomPresentationContext = Unit,
+  ExtraContext = Unit,
+>() => import("../../../../../../../../template/state").Template<
+  import("../../state").CommonAbstractRendererReadonlyContext<
+    import("../../../../../../../../../main").TableType<any>,
+    import("../../../../../../parser/domains/predicates/state").ValueTable,
+    CustomPresentationContext,
+    ExtraContext
+  > & {
+    tableApiSource: import("../../../../../deserializer/state").DispatchTableApiSource;
+    fromTableApiParser: (
+      value: unknown,
+    ) => import("../../../../../../../../../main").ValueOrErrors<
+      import("../../../../../../parser/domains/predicates/state").PredicateValue,
+      string
+    >;
     tableHeaders: string[];
     columnLabels: Map<string, string | undefined>;
     apiMethods: Array<import("../../../../../../../../../main").TableMethod>;
-    sorting: Array<string>;
-    highlightedFilters: Array<string>;
-} & import("../../state").CommonAbstractRendererState & {
-    customFormState: {
-        loadingState: "loading" | "loaded" | "error" | "reload from 0";
-        loadMore: "load more" | "loading more" | "don't load more" | "error loading more";
-        isFilteringInitialized: boolean;
-        selectedRows: Set<string>;
-        rowStates: Map<string, import("../../record/state").RecordAbstractRendererState>;
-        selectedDetailRow: import("../state").TableAbstractRendererSelectedDetailRow;
-        filters: Map<string, import("immutable").List<import("../../../../../../parser/domains/predicates/state").ValueFilter>>;
-        sorting: Map<string, "Ascending" | "Descending" | undefined>;
-        filterAndSortParam: string;
-        filterStates: Map<string, import("immutable").List<any>>;
-    };
-}, import("../state").TableAbstractRendererState, any>;
-export declare const TableInitialiseTableRunner: <CustomPresentationContext = Unit, ExtraContext = Unit>(tableApiSource: DispatchTableApiSource, fromTableApiParser: (value: unknown) => ValueOrErrors<PredicateValue, string>) => import("../../../../../../../../template/state").Template<import("../../state").CommonAbstractRendererReadonlyContext<import("../../../../../../../../../main").TableType<any>, import("../../../../../../parser/domains/predicates/state").ValueTable, CustomPresentationContext, ExtraContext> & {
+  } & import("../../state").CommonAbstractRendererState & {
+      customFormState: {
+        selectedRows: import("immutable").Set<string>;
+        rowStates: Map<
+          string,
+          import("../../record/state").RecordAbstractRendererState
+        >;
+        selectedDetailRow: [number, string] | undefined;
+        initializationStatus:
+          | "not initialized"
+          | "initialized"
+          | "reinitializing";
+        streamParams: import("../../../../../../../../debounced/state").Debounced<
+          Map<string, string>
+        >;
+        stream: ValueInfiniteStreamState;
+        getChunkWithParams: import("../../../../../../../../fun/state").BasicFun<
+          Map<string, string>,
+          ValueInfiniteStreamState["getChunk"]
+        >;
+        previousRemoteEntityVersionIdentifier: string;
+        shouldReinitialize: boolean;
+      };
+    },
+  TableAbstractRendererState,
+  any
+>;
+export declare const TableRunner: <
+  CustomPresentationContext = Unit,
+  ExtraContext = Unit,
+>() => import("../../../../../../../../template/state").Template<
+  import("../../state").CommonAbstractRendererReadonlyContext<
+    import("../../../../../../../../../main").TableType<any>,
+    import("../../../../../../parser/domains/predicates/state").ValueTable,
+    CustomPresentationContext,
+    ExtraContext
+  > & {
+    tableApiSource: import("../../../../../deserializer/state").DispatchTableApiSource;
+    fromTableApiParser: (
+      value: unknown,
+    ) => import("../../../../../../../../../main").ValueOrErrors<
+      import("../../../../../../parser/domains/predicates/state").PredicateValue,
+      string
+    >;
     tableHeaders: string[];
     columnLabels: Map<string, string | undefined>;
     apiMethods: Array<import("../../../../../../../../../main").TableMethod>;
-    sorting: Array<string>;
-    highlightedFilters: Array<string>;
-} & Pick<import("../state").TableAbstractRendererForeignMutationsExpected, "onChange"> & import("../../state").CommonAbstractRendererState & {
-    customFormState: {
-        loadingState: "loading" | "loaded" | "error" | "reload from 0";
-        loadMore: "load more" | "loading more" | "don't load more" | "error loading more";
-        isFilteringInitialized: boolean;
-        selectedRows: Set<string>;
-        rowStates: Map<string, import("../../record/state").RecordAbstractRendererState>;
-        selectedDetailRow: import("../state").TableAbstractRendererSelectedDetailRow;
-        filters: Map<string, import("immutable").List<import("../../../../../../parser/domains/predicates/state").ValueFilter>>;
-        sorting: Map<string, "Ascending" | "Descending" | undefined>;
-        filterAndSortParam: string;
-        filterStates: Map<string, import("immutable").List<any>>;
-    };
-}, import("../state").TableAbstractRendererState, any>;
-export declare const TableInfiniteLoaderRunner: <CustomPresentationContext = Unit, ExtraContext = Unit>(tableApiSource: DispatchTableApiSource, fromTableApiParser: (value: unknown) => ValueOrErrors<PredicateValue, string>) => import("../../../../../../../../template/state").Template<import("../../state").CommonAbstractRendererReadonlyContext<import("../../../../../../../../../main").TableType<any>, import("../../../../../../parser/domains/predicates/state").ValueTable, CustomPresentationContext, ExtraContext> & {
-    tableHeaders: string[];
-    columnLabels: Map<string, string | undefined>;
-    apiMethods: Array<import("../../../../../../../../../main").TableMethod>;
-    sorting: Array<string>;
-    highlightedFilters: Array<string>;
-} & Pick<import("../state").TableAbstractRendererForeignMutationsExpected, "onChange"> & import("../../state").CommonAbstractRendererState & {
-    customFormState: {
-        loadingState: "loading" | "loaded" | "error" | "reload from 0";
-        loadMore: "load more" | "loading more" | "don't load more" | "error loading more";
-        isFilteringInitialized: boolean;
-        selectedRows: Set<string>;
-        rowStates: Map<string, import("../../record/state").RecordAbstractRendererState>;
-        selectedDetailRow: import("../state").TableAbstractRendererSelectedDetailRow;
-        filters: Map<string, import("immutable").List<import("../../../../../../parser/domains/predicates/state").ValueFilter>>;
-        sorting: Map<string, "Ascending" | "Descending" | undefined>;
-        filterAndSortParam: string;
-        filterStates: Map<string, import("immutable").List<any>>;
-    };
-}, import("../state").TableAbstractRendererState, any>;
-//# sourceMappingURL=runner.d.ts.map
+  } & import("../../state").CommonAbstractRendererState & {
+      customFormState: {
+        selectedRows: import("immutable").Set<string>;
+        rowStates: Map<
+          string,
+          import("../../record/state").RecordAbstractRendererState
+        >;
+        selectedDetailRow: [number, string] | undefined;
+        initializationStatus:
+          | "not initialized"
+          | "initialized"
+          | "reinitializing";
+        streamParams: import("../../../../../../../../debounced/state").Debounced<
+          Map<string, string>
+        >;
+        stream: ValueInfiniteStreamState;
+        getChunkWithParams: import("../../../../../../../../fun/state").BasicFun<
+          Map<string, string>,
+          ValueInfiniteStreamState["getChunk"]
+        >;
+        previousRemoteEntityVersionIdentifier: string;
+        shouldReinitialize: boolean;
+      };
+    },
+  TableAbstractRendererState,
+  any
+>;
+//# sourceMappingURL=runner.d.ts.map

package/bin/src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/table/coroutines/runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../../../../../../../../src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/table/coroutines/runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAErC,OAAO,EACL,kBAAkB,EAClB,sBAAsB,EACtB,cAAc,EACd,QAAQ,EACR,IAAI,EACJ,aAAa,EACd,MAAM,iCAAiC,CAAC;AAOzC,eAAO,MAAM,sCAAsC,GACjD,yBAAyB,GAAG,IAAI,EAChC,YAAY,GAAG,IAAI,EAEnB,aAAa,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,EACvC,gBAAgB,sBAAsB,EACtC,oBAAoB,CAClB,IAAI,EAAE,kBAAkB,CAAC,GAAG,CAAC,KAC1B,CAAC,GAAG,EAAE,GAAG,KAAK,aAAa,CAAC,cAAc,EAAE,MAAM,CAAC,EACxD,kBAAkB,CAChB,IAAI,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAC7B,KAAK,EAAE,cAAc,EACrB,KAAK,EAAE,GAAG,KACP,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC;;;;;;;;;;;;;;;;;;;sDAc9B,CAAC;AAEJ,eAAO,MAAM,0BAA0B,GACrC,yBAAyB,GAAG,IAAI,EAChC,YAAY,GAAG,IAAI,EAEnB,gBAAgB,sBAAsB,EACtC,oBAAoB,CAAC,KAAK,EAAE,OAAO,KAAK,aAAa,CAAC,cAAc,EAAE,MAAM,CAAC;;;;;;;;;;;;;;;;;;;sDAc5E,CAAC;AAEJ,eAAO,MAAM,yBAAyB,GACpC,yBAAyB,GAAG,IAAI,EAChC,YAAY,GAAG,IAAI,EAEnB,gBAAgB,sBAAsB,EACtC,oBAAoB,CAAC,KAAK,EAAE,OAAO,KAAK,aAAa,CAAC,cAAc,EAAE,MAAM,CAAC;;;;;;;;;;;;;;;;;;;sDAe5E,CAAC"}
+{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../../../../../../../../src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/table/coroutines/runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,EACL,wBAAwB,EAEzB,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAEL,0BAA0B,EAC1B,IAAI,EACL,MAAM,iCAAiC,CAAC;AAoGzC,eAAO,MAAM,uBAAuB,GAClC,yBAAyB,GAAG,IAAI,EAChC,YAAY,GAAG,IAAI;;;;;;;;;;;;;;;;;;mCAYlB,CAAC;AAEJ,eAAO,MAAM,WAAW,GACtB,yBAAyB,GAAG,IAAI,EAChC,YAAY,GAAG,IAAI;;;;;;;;;;;;;;;;;;mCAelB,CAAC"}

package/bin/src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/table/coroutines/runner.js

@@ -1,50 +1,106 @@
-import { Co, InfiniteLoaderCo } from "./builder";
-import { InitialiseFiltersAndSorting } from "./initialiseFiltersAndSorting";
-import { TableInfiniteLoader } from "./infiniteLoader";
-import { InitialiseTable } from "./initialiseTable";
-export const TableInitialiseFiltersAndSortingRunner = (
-  filterTypes,
-  tableApiSource,
-  parseFromApiByType,
-  parseToApiByType,
-) =>
-  Co().Template(
-    InitialiseFiltersAndSorting(
-      tableApiSource,
-      parseFromApiByType,
-      parseToApiByType,
-      filterTypes,
-    ),
-    {
-      interval: 15,
-      runFilter: (props) =>
-        props.context.customFormState.isFilteringInitialized == false,
+import { Map } from "immutable";
+import {
+  ValueInfiniteStreamState,
+  ValueStreamPosition,
+} from "../../../../../../../../value-infinite-data-stream/state";
+import {
+  replaceWith,
+  TableAbstractRendererState,
+} from "../../../../../../../../../main";
+import { CoTypedFactory } from "../../../../../../../../../main";
+const Co = () => CoTypedFactory();
+// TODO -- very unsafe, needs work, checking undefined etc,,,
+const DEFAULT_CHUNK_SIZE = 20;
+// if value exists in entity, use that, otherwise load first chunk from infinite stream
+const intialiseTable = () =>
+  Co()
+    .GetState()
+    .then((current) => {
+      if (current.value == undefined) {
+        return Co().Wait(0);
+      }
+      const initialData = current.value.data;
+      const hasMoreValues = current.value.hasMoreValues;
+      const from = current.value.from;
+      const to = current.value.to;
+      const getChunkWithParams = current.tableApiSource.getMany(
+        current.fromTableApiParser,
+      );
+      return Co().SetState(
+        replaceWith(TableAbstractRendererState.Default()).then(
+          TableAbstractRendererState.Updaters.Core.customFormState.children
+            .stream(
+              replaceWith(
+                ValueInfiniteStreamState.Default(
+                  DEFAULT_CHUNK_SIZE,
+                  getChunkWithParams(Map()),
+                  initialData.size == 0 && hasMoreValues ? "loadMore" : false,
+                ),
+              )
+                .then(
+                  ValueInfiniteStreamState.Updaters.Coroutine.addLoadedChunk(
+                    0,
+                    {
+                      data: initialData,
+                      hasMoreValues: hasMoreValues,
+                      from,
+                      to,
+                    },
+                  ),
+                )
+                .then(
+                  ValueInfiniteStreamState.Updaters.Core.position(
+                    ValueStreamPosition.Updaters.Core.nextStart(
+                      replaceWith(to + 1),
+                    ),
+                  ),
+                ),
+            )
+            .thenMany([
+              TableAbstractRendererState.Updaters.Core.customFormState.children.getChunkWithParams(
+                replaceWith(getChunkWithParams),
+              ),
+              TableAbstractRendererState.Updaters.Template.shouldReinitialize(
+                false,
+              ),
+              TableAbstractRendererState.Updaters.Core.customFormState.children.previousRemoteEntityVersionIdentifier(
+                replaceWith(current.remoteEntityVersionIdentifier),
+              ),
+              TableAbstractRendererState.Updaters.Core.customFormState.children.initializationStatus(
+                replaceWith("initialized"),
+              ),
+            ]),
+        ),
+      );
+    });
+const reinitialise = () =>
+  Co()
+    .GetState()
+    .then((_) => {
+      return Co().SetState(
+        TableAbstractRendererState.Updaters.Core.customFormState.children.initializationStatus(
+          replaceWith("reinitializing"),
+        ),
+      );
+    });
+export const TableReinitialiseRunner = () =>
+  Co().Template(reinitialise(), {
+    interval: 15,
+    runFilter: (props) =>
+      props.context.customFormState.initializationStatus === "initialized" &&
+      props.context.customFormState.shouldReinitialize &&
+      props.context.remoteEntityVersionIdentifier !==
+        props.context.customFormState.previousRemoteEntityVersionIdentifier,
+  });
+export const TableRunner = () =>
+  Co().Template(intialiseTable(), {
+    interval: 15,
+    runFilter: (props) => {
+      return (
+        props.context.customFormState.initializationStatus ===
+          "not initialized" ||
+        props.context.customFormState.initializationStatus === "reinitializing"
+      );
     },
-  );
-export const TableInitialiseTableRunner = (
-  tableApiSource,
-  fromTableApiParser,
-) =>
-  InfiniteLoaderCo().Template(
-    InitialiseTable(tableApiSource, fromTableApiParser),
-    {
-      interval: 15,
-      runFilter: (props) =>
-        props.context.customFormState.isFilteringInitialized &&
-        (props.context.customFormState.loadingState == "loading" ||
-          props.context.customFormState.loadingState == "reload from 0"),
-    },
-  );
-export const TableInfiniteLoaderRunner = (tableApiSource, fromTableApiParser) =>
-  InfiniteLoaderCo().Template(
-    TableInfiniteLoader(tableApiSource, fromTableApiParser),
-    {
-      interval: 15,
-      runFilter: (props) =>
-        props.context.customFormState.isFilteringInitialized &&
-        props.context.customFormState.loadingState == "loaded" &&
-        (props.context.customFormState.loadMore == "load more" ||
-          props.context.customFormState.loadMore == "loading more"),
-    },
-  );
+  });
 //# sourceMappingURL=runner.js.map

package/bin/src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/table/coroutines/runner.js.map

@@ -1 +1 @@
-{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../../../../../../../../src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/table/coroutines/runner.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,EAAE,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAEjD,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,CAAC,MAAM,sCAAsC,GAAG,CAIpD,WAAuC,EACvC,cAAsC,EACtC,kBAEwD,EACxD,gBAI+B,EAC/B,EAAE,CACF,EAAE,EAA2C,CAAC,QAAQ,CACpD,2BAA2B,CACzB,cAAc,EACd,kBAAkB,EAClB,gBAAgB,EAChB,WAAW,CACZ,EACD;IACE,QAAQ,EAAE,EAAE;IACZ,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CACnB,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,sBAAsB,IAAI,KAAK;CAChE,CACF,CAAC;AAEJ,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAIxC,cAAsC,EACtC,kBAA6E,EAC7E,EAAE,CACF,gBAAgB,EAA2C,CAAC,QAAQ,CAClE,eAAe,CACb,cAAc,EACd,kBAAkB,CACnB,EACD;IACE,QAAQ,EAAE,EAAE;IACZ,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CACnB,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,sBAAsB;QACpD,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,YAAY,IAAI,SAAS;YACtD,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,YAAY,IAAI,eAAe,CAAC;CACnE,CACF,CAAC;AAEJ,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAIvC,cAAsC,EACtC,kBAA6E,EAC7E,EAAE,CACF,gBAAgB,EAA2C,CAAC,QAAQ,CAClE,mBAAmB,CACjB,cAAc,EACd,kBAAkB,CACnB,EACD;IACE,QAAQ,EAAE,EAAE;IACZ,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CACnB,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,sBAAsB;QACpD,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,YAAY,IAAI,QAAQ;QACtD,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,QAAQ,IAAI,WAAW;YACpD,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,QAAQ,IAAI,cAAc,CAAC;CAC9D,CACF,CAAC"}
+{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../../../../../../../../src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/table/coroutines/runner.ts"],"names":[],"mappings":"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"}