ballerina-core 1.0.194 → 1.0.196

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

@@ -39,6 +39,7 @@ import {
   TableAbstractRendererView,
   UnionAbstractRendererView,
   DispatchInjectablesTypes,
+  SpecificationApis,
 } from "../../../../../main";
 import {
   DispatchParsedType,
@@ -634,6 +635,7 @@ export const dispatchDefaultState =
     converters: DispatchApiConverters<T>,
     lookupSources: DispatchLookupSources | undefined,
     tableApiSources: DispatchTableApiSources | undefined,
+    specApis: SpecificationApis,
   ) =>
   (
     t: DispatchParsedType<T>,
@@ -659,6 +661,7 @@ export const dispatchDefaultState =
                 converters,
                 lookupSources,
                 tableApiSources,
+                specApis,
               )(resolvedType, resolvedRenderer),
           ),
         );
@@ -677,6 +680,7 @@ export const dispatchDefaultState =
             converters,
             lookupSources,
             tableApiSources,
+            specApis,
           )(resolvedType, renderer.inlinedRenderer),
         );
       }
@@ -692,6 +696,7 @@ export const dispatchDefaultState =
               converters,
               lookupSources,
               tableApiSources,
+              specApis,
             )(renderer.type, resolvedRenderer),
         );
       }
@@ -796,6 +801,7 @@ export const dispatchDefaultState =
                     converters,
                     lookupSources,
                     tableApiSources,
+                    specApis,
                   )(_, renderer.itemRenderers[index].renderer).Then(
                     (itemState) =>
                       ValueOrErrors.Default.return([index, itemState]),
@@ -821,6 +827,7 @@ export const dispatchDefaultState =
               converters,
               lookupSources,
               tableApiSources,
+              specApis,
             )(t.args[0], renderer.leftRenderer.renderer).Then((left) =>
               renderer.rightRenderer == undefined
                 ? ValueOrErrors.Default.throwOne(
@@ -834,6 +841,7 @@ export const dispatchDefaultState =
                     converters,
                     lookupSources,
                     tableApiSources,
+                    specApis,
                   )(t.args[1], renderer.rightRenderer.renderer).Then((right) =>
                     ValueOrErrors.Default.return(
                       SumAbstractRendererState.Default({
@@ -859,44 +867,59 @@ export const dispatchDefaultState =
           ? ValueOrErrors.Default.throwOne(
               `received non one renderer kind "${renderer.kind}" when resolving defaultState for one`,
             )
-          : lookupSources == undefined
-            ? ValueOrErrors.Default.throwOne(
-                `lookup sources referenced but no lookup sources are provided`,
-              )
-            : lookupSources(renderer.api[0]) == undefined
+          : specApis.lookups != undefined &&
+              specApis.lookups.get(renderer.api[0]) != undefined &&
+              specApis.lookups.get(renderer.api[0])?.one != undefined &&
+              specApis.lookups.get(renderer.api[0])?.one.get(renderer.api[1]) !=
+                undefined &&
+              specApis.lookups.get(renderer.api[0])?.one.get(renderer.api[1])
+                ?.methods.getManyUnlinked
+            ? lookupSources == undefined
               ? ValueOrErrors.Default.throwOne(
-                  `cannot find lookup source for ${renderer.api[0]}`,
+                  `lookup sources referenced but no lookup sources are provided`,
                 )
-              : lookupSources(renderer.api[0]).Then((lookupSource) =>
-                  lookupSource.one == undefined
-                    ? ValueOrErrors.Default.throwOne(
-                        `one source not provided for ${renderer.api[0]}`,
-                      )
-                    : lookupSource.one!(renderer.api[1]) // safe because we check for undefined above but type system doesn't know that
-                        .Then((oneSource) =>
-                          MapRepo.Operations.tryFindWithError(
-                            t.arg.name,
-                            types,
-                            () =>
-                              `cannot find lookup type ${JSON.stringify(
-                                t.arg.name,
-                              )} in ${JSON.stringify(t)}`,
-                          ).Then((lookupType) =>
-                            ValueOrErrors.Default.return(
-                              OneAbstractRendererState.Default(
-                                oneSource.getManyUnlinked(
-                                  dispatchFromAPIRawValue(
-                                    lookupType,
-                                    types,
-                                    converters,
-                                    injectedPrimitives,
+              : lookupSources(renderer.api[0]) == undefined
+                ? ValueOrErrors.Default.throwOne(
+                    `cannot find lookup source for ${renderer.api[0]}`,
+                  )
+                : lookupSources(renderer.api[0]).Then((lookupSource) =>
+                    lookupSource.one == undefined
+                      ? ValueOrErrors.Default.throwOne(
+                          `one source not provided for ${renderer.api[0]}`,
+                        )
+                      : lookupSource.one!(renderer.api[1]) // safe because we check for undefined above but type system doesn't know that
+                          .Then((oneSource) =>
+                            oneSource.getManyUnlinked == undefined
+                              ? ValueOrErrors.Default.throwOne(
+                                  `getManyUnlinked not provided for ${renderer.api[0]}-${renderer.api[1]}`,
+                                )
+                              : MapRepo.Operations.tryFindWithError(
+                                  t.arg.name,
+                                  types,
+                                  () =>
+                                    `cannot find lookup type ${JSON.stringify(
+                                      t.arg.name,
+                                    )} in ${JSON.stringify(t)}`,
+                                ).Then((lookupType) =>
+                                  ValueOrErrors.Default.return(
+                                    OneAbstractRendererState.Default(
+                                      oneSource.getManyUnlinked!(
+                                        // safe because we check for undefined above but type system doesn't know that
+                                        dispatchFromAPIRawValue(
+                                          lookupType,
+                                          types,
+                                          converters,
+                                          injectedPrimitives,
+                                        ),
+                                      ),
+                                    ),
                                   ),
                                 ),
-                              ),
-                            ),
                           ),
-                        ),
-                );
+                  )
+            : ValueOrErrors.Default.return(
+                OneAbstractRendererState.Default(undefined),
+              );
 
       if (t.kind == "readOnly")
         return renderer.kind != "readOnlyRenderer"
@@ -911,6 +934,7 @@ export const dispatchDefaultState =
               converters,
               lookupSources,
               tableApiSources,
+              specApis,
             )(t.arg, renderer.childRenderer.renderer).Then((childState) =>
               ValueOrErrors.Default.return(
                 ReadOnlyAbstractRendererState.Default.childFormState(
@@ -944,6 +968,7 @@ export const dispatchDefaultState =
                         converters,
                         lookupSources,
                         tableApiSources,
+                        specApis,
                       )(fieldType, fieldRenderer.renderer).Then((value) =>
                         ValueOrErrors.Default.return([fieldName, value]),
                       ),
@@ -982,6 +1007,7 @@ export const dispatchDefaultState =
                         converters,
                         lookupSources,
                         tableApiSources,
+                        specApis,
                       )(caseType, caseRenderer).Then((caseState) =>
                         ValueOrErrors.Default.return([caseName, caseState]),
                       ),

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

@@ -203,82 +203,72 @@ export const TableApis = {
 };
 
 export type LookupApiName = string;
-export type LookupApis = Map<LookupApiName, LookupApi>;
-export type LookupApi = {
-  enums?: EnumApis;
-  streams?: StreamApis;
-  tables?: TableApis;
-  lookups?: LookupApis;
-  one?: Map<
-    string,
-    {
-      type: DispatchTypeName;
-      methods: {
-        update: boolean;
-        getManyUnlinked: boolean;
-        create: boolean;
-        delete: boolean;
-      };
-    }
-  >;
-  many?: Map<
-    string,
-    {
-      type: DispatchTypeName;
-      methods: {
-        update: boolean;
-        getManyUnlinked: boolean;
-        create: boolean;
-        delete: boolean;
-      };
-    }
-  >;
-};
+export type LookupApis = Map<LookupApiName, { one: LookupApiOne }>;
+export type LookupApiOne = Map<
+  string,
+  {
+    type: DispatchTypeName;
+    methods: {
+      get: boolean;
+      update: boolean;
+      getManyUnlinked: boolean;
+      create: boolean;
+      delete: boolean;
+    };
+  }
+>;
 
 // TODO add many deserialization
 export const LookupApis = {
   Operations: {
-    isLookupApi: (
+    isOneApi: (
       _: unknown,
     ): _ is {
-      enums?: unknown;
-      streams?: unknown;
-      tables?: unknown;
-      lookups?: unknown;
-      one?: unknown;
-      many?: unknown;
-    } => DispatchIsObject(_),
+      one: {
+        [key: string]: {
+          type: DispatchTypeName;
+          methods: Array<string>;
+        };
+      };
+    } =>
+      DispatchIsObject(_) &&
+      "one" in _ &&
+      DispatchIsObject(_.one) &&
+      Object.values(_.one).every(
+        (value) =>
+          isObject(value) &&
+          "type" in value &&
+          isString(value.type) &&
+          "methods" in value &&
+          Array.isArray(value.methods) &&
+          value.methods.every((method) => isString(method)),
+      ),
     DeserializeOne: (
-      serializedLookupApi: unknown,
-    ): ValueOrErrors<LookupApi, string> =>
-      !LookupApis.Operations.isLookupApi(serializedLookupApi)
-        ? ValueOrErrors.Default.throwOne(`serializedLookupApi is not an object`)
-        : EnumApis.Operations.Deserialize(serializedLookupApi.enums)
-            .Then((enums) =>
-              StreamApis.Operations.Deserialize(
-                serializedLookupApi.streams,
-              ).Then((streams) =>
-                TableApis.Operations.Deserialize(
-                  serializedLookupApi.tables,
-                ).Then((tables) =>
-                  LookupApis.Operations.Deserialize(
-                    serializedLookupApi.lookups,
-                  ).Then((lookups) =>
-                    ValueOrErrors.Default.return({
-                      enums,
-                      streams,
-                      tables,
-                      lookups,
-                    }),
-                  ),
-                ),
-              ),
-            )
-            .MapErrors((errors) =>
-              errors.map(
-                (error) => `${error}\n...When deserializing lookup api`,
-              ),
+      serializedOneApi: unknown,
+    ): ValueOrErrors<LookupApiOne, string> =>
+      !LookupApis.Operations.isOneApi(serializedOneApi)
+        ? ValueOrErrors.Default.throwOne<LookupApiOne, string>(
+            `serializedLookupApi is not a valid lookup api`,
+          )
+        : ValueOrErrors.Default.return<LookupApiOne, string>(
+            Map(
+              Object.entries(serializedOneApi.one).map(([key, value]) => [
+                key,
+                {
+                  type: value.type,
+                  methods: {
+                    get: value.methods.includes("get"),
+                    update: value.methods.includes("update"),
+                    getManyUnlinked: value.methods.includes("getManyUnlinked"),
+                    create: value.methods.includes("create"),
+                    delete: value.methods.includes("delete"),
+                  },
+                },
+              ]),
             ),
+          ).MapErrors((errors) =>
+            errors.map((error) => `${error}\n...When deserializing lookup api`),
+          ),
     Deserialize: (
       serializedApiLookups?: unknown,
     ): ValueOrErrors<undefined | LookupApis, string> =>
@@ -289,15 +279,19 @@ export const LookupApis = {
               `serializedApiLookups is not an object`,
             )
           : ValueOrErrors.Operations.All(
-              List<ValueOrErrors<[LookupApiName, LookupApi], string>>(
+              List<
+                ValueOrErrors<[LookupApiName, { one: LookupApiOne }], string>
+              >(
                 Object.entries(serializedApiLookups).map(([key, value]) =>
-                  ValueOrErrors.Default.return([key, value]),
+                  LookupApis.Operations.DeserializeOne(value).Then((one) =>
+                    ValueOrErrors.Default.return([key, { one }]),
+                  ),
                 ),
               ),
             )
               .Then((entries) =>
                 ValueOrErrors.Default.return(
-                  Map<LookupApiName, LookupApi>(entries),
+                  Map<LookupApiName, { one: LookupApiOne }>(entries),
                 ),
               )
               .MapErrors((errors) =>

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

@@ -200,14 +200,16 @@ export type DispatchTableApiSources = BasicFun<
 
 export type DispatchApiName = string;
 export type DispatchOneSource = {
-  get: BasicFun<Guid, Promise<any>>;
-  getManyUnlinked: BasicFun<
-    BasicFun<any, ValueOrErrors<PredicateValue, string>>,
-    BasicFun<
-      Guid,
-      BasicFun<Map<string, string>, ValueInfiniteStreamState["getChunk"]>
-    >
-  >;
+  get: BasicFun<Guid, Promise<any>> | undefined;
+  getManyUnlinked:
+    | BasicFun<
+        BasicFun<any, ValueOrErrors<PredicateValue, string>>,
+        BasicFun<
+          Guid,
+          BasicFun<Map<string, string>, ValueInfiniteStreamState["getChunk"]>
+        >
+      >
+    | undefined;
 };
 
 export type DispatchLookupSources = (typeName: string) => ValueOrErrors<
@@ -376,6 +378,7 @@ export const parseDispatchFormsToLaunchers =
               apiConverters,
               lookupSources,
               tableApiSources,
+              specification.apis,
             ),
             types: specification.types,
             parseFromApiByType: (type: DispatchParsedType<T>) =>

package/src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/one/coroutines/_initializeOne.ts

@@ -14,7 +14,6 @@ import {
   Option,
 } from "../../../../../../../../../main";
 import { InitializeCo } from "./builder";
-import { initializeStream } from "./_initializeStream";
 
 export const initializeOne = <
   CustomPresentationContext = Unit,
@@ -23,11 +22,6 @@ export const initializeOne = <
   InitializeCo<CustomPresentationContext, ExtraContext>()
     .GetState()
     .then((current) => {
-      const InstantiatedInitializeCo = InitializeCo<
-        CustomPresentationContext,
-        ExtraContext
-      >();
-
       const maybeId = OneAbstractRendererState.Operations.GetIdFromContext(
         current,
       ).MapErrors((_) =>
@@ -38,71 +32,41 @@ export const initializeOne = <
 
       if (maybeId.kind === "errors") {
         console.error(maybeId.errors.join("\n"));
-        return InstantiatedInitializeCo.Wait(0);
-      }
-
-      const initializationCompletedCo = InitializeCo<
-        CustomPresentationContext,
-        ExtraContext
-      >().Seq([
-        InstantiatedInitializeCo.SetState(
-          current.customFormState.status == "open"
-            ? OneAbstractRendererState.Updaters.Core.customFormState.children.stream(
-                Sum.Updaters.left(
-                  ValueInfiniteStreamState.Updaters.Template.loadMore(),
-                ),
-              )
-            : IdUpdater,
-        ),
-      ]);
-
-      const hasInitialValue =
-        (PredicateValue.Operations.IsOption(current.value) &&
-          current.value.isSome) ||
-        PredicateValue.Operations.IsUnit(current.value);
-
-      if (hasInitialValue) {
-        return InstantiatedInitializeCo.Seq([initializationCompletedCo]);
+        return InitializeCo<CustomPresentationContext, ExtraContext>().Wait(0);
       }
 
-      const initializeValueCo = InitializeCo<
-        CustomPresentationContext,
-        ExtraContext
-      >()
+      return InitializeCo<CustomPresentationContext, ExtraContext>()
         .Await(
-          () => current.getApi(maybeId.value),
+          // get Api being defined is in the run condition and is a sign that this could be lazy loaded
+          () => current.getApi!(maybeId.value),
           (_) => console.error("error while getting api value for the one", _),
         )
         .then((value) =>
-          InstantiatedInitializeCo.Do(() => {
-            return current.fromApiParser(value.value).Then((result) => {
-              const updater = replaceWith<ValueOption | ValueUnit>(
-                ValueOption.Default.some(result),
-              );
-              const delta: DispatchDelta<BaseFlags> = {
-                kind: "OneReplace",
-                replace: result,
-                flags: {
-                  kind: "localOnly",
-                },
-                type: current.type,
-                sourceAncestorLookupTypeNames: current.lookupTypeAncestorNames,
-              };
-              current.onChange(Option.Default.some(updater), delta);
+          InitializeCo<CustomPresentationContext, ExtraContext>().Do(() => {
+            current
+              .fromApiParser(value.value)
+              .Then((result) => {
+                const updater = replaceWith<ValueOption | ValueUnit>(
+                  ValueOption.Default.some(result),
+                );
+                const delta: DispatchDelta<BaseFlags> = {
+                  kind: "OneReplace",
+                  replace: result,
+                  flags: {
+                    kind: "localOnly",
+                  },
+                  type: current.type,
+                  sourceAncestorLookupTypeNames:
+                    current.lookupTypeAncestorNames,
+                };
+                current.onChange(Option.Default.some(updater), delta);
 
-              return ValueOrErrors.Default.return(result);
-            });
+                return ValueOrErrors.Default.return(result);
+              })
+              .MapErrors((_) => {
+                console.error("error while parsing api value for the one", _);
+                return _;
+              });
           }),
         );
-
-      const initializeStreamCo = initializeStream<
-        CustomPresentationContext,
-        ExtraContext
-      >();
-
-      return InstantiatedInitializeCo.Seq([
-        initializeValueCo,
-        initializeStreamCo,
-        initializationCompletedCo,
-      ]);
     });

package/src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/one/coroutines/_initializeStream.ts

@@ -30,7 +30,8 @@ export const initializeStream = <
             Sum.Default.left(
               ValueInfiniteStreamState.Default(
                 100,
-                current.customFormState.getChunkWithParams(maybeId.value)(
+                // safe because we check for undefined in the runFilter
+                current.customFormState.getChunkWithParams!(maybeId.value)(
                   current.customFormState.streamParams.value,
                 ),
               ),

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

@@ -33,7 +33,9 @@ export const initializeOneRunner = <
       // if the value is some, we already have something to pass to the renderers
       // -> we don't have to run the initialization coroutine
       // if the inner value is unit, we are rendering a partial one
-      props.context.value.kind === "option" && !props.context.value.isSome,
+      props.context.value.kind === "option" &&
+      !props.context.value.isSome &&
+      props.context.getApi != undefined,
   });
 
 export const initializeStreamRunner = <
@@ -45,7 +47,9 @@ export const initializeStreamRunner = <
     OneAbstractRendererForeignMutationsExpected<Flags>
   >(initializeStream<CustomPresentationContext, ExtraContext>(), {
     interval: 15,
-    runFilter: (props) => props.context.customFormState.stream.kind === "r",
+    runFilter: (props) =>
+      props.context.customFormState.stream.kind === "r" &&
+      props.context.customFormState.getChunkWithParams !== undefined,
   });
 
 export const oneTableDebouncerRunner = <
@@ -60,7 +64,7 @@ export const oneTableDebouncerRunner = <
     runFilter: (props) =>
       Debounced.Operations.shouldCoroutineRun(
         props.context.customFormState.streamParams,
-      ),
+      ) && props.context.customFormState.getChunkWithParams !== undefined,
   });
 
 export const oneTableLoaderRunner = <

package/src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/one/state.ts

@@ -43,7 +43,7 @@ export type OneAbstractRendererReadonlyContext<
   CustomPresentationContext,
   ExtraContext
 > & {
-  getApi: BasicFun<Guid, Promise<unknown>>;
+  getApi?: BasicFun<Guid, Promise<unknown>>;
   fromApiParser: (value: unknown) => ValueOrErrors<ValueRecord, string>;
   remoteEntityVersionIdentifier: string;
 };
@@ -55,19 +55,23 @@ export type OneAbstractRendererState = CommonAbstractRendererState & {
     streamParams: Debounced<Value<Map<string, string>>>;
     status: "open" | "closed";
     stream: Sum<ValueInfiniteStreamState, "not initialized">;
-    getChunkWithParams: BasicFun<
-      string,
-      BasicFun<Map<string, string>, ValueInfiniteStreamState["getChunk"]>
-    >;
+    getChunkWithParams:
+      | BasicFun<
+          string,
+          BasicFun<Map<string, string>, ValueInfiniteStreamState["getChunk"]>
+        >
+      | undefined;
   };
 };
 
 export const OneAbstractRendererState = {
   Default: (
-    getChunk: BasicFun<
-      string,
-      BasicFun<Map<string, string>, ValueInfiniteStreamState["getChunk"]>
-    >,
+    getChunk:
+      | BasicFun<
+          string,
+          BasicFun<Map<string, string>, ValueInfiniteStreamState["getChunk"]>
+        >
+      | undefined,
   ): OneAbstractRendererState => ({
     ...CommonAbstractRendererState.Default(),
     customFormState: {

package/src/forms/domains/dispatched-forms/runner/domains/abstract-renderers/one/template.tsx

@@ -331,7 +331,7 @@ export const OneAbstractRenderer = <
                           0
                         ? OneAbstractRendererState.Updaters.Core.customFormState.children.stream(
                             Sum.Updaters.left(
-                              ValueInfiniteStreamState.Updaters.Template.loadMore(),
+                              ValueInfiniteStreamState.Updaters.Template.initLoad(),
                             ),
                           )
                         : id,
@@ -450,7 +450,8 @@ export const OneAbstractRenderer = <
             OneAbstractRendererState.Updaters.Core.customFormState.children.stream(
               Sum.Updaters.left(
                 ValueInfiniteStreamState.Updaters.Template.reload(
-                  props.context.customFormState.getChunkWithParams(
+                  // safe because we check for undefined in the runFilter
+                  props.context.customFormState.getChunkWithParams!(
                     maybeId.value,
                   )(props.context.customFormState.streamParams.value),
                 ),