ballerina-core 1.0.84 → 1.0.86

package/main.ts

@@ -99,6 +99,10 @@ export * from "./src/forms/domains/primitives/domains/secret/state";
 export * from "./src/forms/domains/primitives/domains/secret/template";
 export * from "./src/forms/domains/primitives/domains/map/state";
 export * from "./src/forms/domains/primitives/domains/map/template";
+export * from "./src/forms/domains/primitives/domains/sum/state";
+export * from "./src/forms/domains/primitives/domains/sum/template";
+export * from "./src/forms/domains/primitives/domains/unit/state";
+export * from "./src/forms/domains/primitives/domains/unit/template";
 export * from "./src/forms/domains/parser/state";
 export * from "./src/forms/domains/parser/template";
 export * from "./src/forms/domains/parser/coroutines/runner";
@@ -119,6 +123,8 @@ export * from "./src/forms/domains/parser/domains/injectables/state";
 export * from "./src/forms/domains/parser/domains/predicates/state";
 export * from "./src/forms/domains/launcher/domains/passthrough/state";
 export * from "./src/forms/domains/launcher/domains/passthrough/template";
+export * from "./src/forms/domains/primitives/domains/tuple/state";
+export * from "./src/forms/domains/primitives/domains/tuple/template";
 
 // import { simpleUpdater, simpleUpdaterWithChildren } from "./src/fun/domains/updater/domains/simpleUpdater/state"
 // import { Updater } from "./src/fun/domains/updater/state"

package/package.json

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

package/src/collections/domains/immutable/domains/list/state.ts

@@ -1,6 +1,9 @@
 import { List } from "immutable";
 import { Updater } from "../../../../../fun/domains/updater/state";
 import { BasicFun } from "../../../../../fun/state";
+import { unit } from "../../../../../fun/domains/unit/state";
+import { Option, Sum } from "../../../sum/state";
+import { ValueOrErrors } from "../../../valueOrErrors/state";
 
 export const ListRepo = {
   Default: {},
@@ -32,5 +35,19 @@ export const ListRepo = {
       });
     },
   },
-  Operations: {},
+  Operations: {
+    tryFind: <V>(elementIndex: number, list: List<V>): Option<V> =>
+      list.has(elementIndex)
+        ? Sum.Default.right(list.get(elementIndex)!)
+        : Sum.Default.left(unit),
+    tryFindWithError: <v, e>(
+      i: number,
+      m: List<v>,
+      e: () => e,
+    ): ValueOrErrors<v, e> =>
+      ValueOrErrors.Default.ofOption(
+        m.has(i) ? Sum.Default.right(m.get(i)!) : Sum.Default.left(unit),
+        e,
+      ),
+  },
 };

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

@@ -13,7 +13,6 @@ import {
   Sum,
   TypeName,
   unit,
-  ValueRecord,
   ValueTuple,
 } from "../../../../../../main";
 import { ValueOrErrors } from "../../../../../collections/domains/valueOrErrors/state";
@@ -32,6 +31,7 @@ const simpleMapKeyToIdentifer = (key: any): string => {
 };
 
 export const PrimitiveTypes = [
+  "unit",
   "guid", //resolves to string
   "string",
   "number",
@@ -48,7 +48,9 @@ export const GenericTypes = [
   "List",
   "Map",
   "Union",
+  "Tuple",
   "Option",
+  "Sum",
 ] as const;
 export type GenericType = (typeof GenericTypes)[number];
 
@@ -61,7 +63,7 @@ export type ApiConverters<
 > = { [key in keyof T]: ApiConverter<T[key]["type"]> } & BuiltInApiConverters;
 
 export type VerifiedRawUnionCase = {
-  case: string;
+  caseName: string;
   fields: Record<string, any>;
 };
 
@@ -71,7 +73,7 @@ export const VerifiedRawUnionCase = {
       return (
         typeof value == "object" &&
         "caseName" in value &&
-        typeof value.case == "string" &&
+        typeof value.caseName == "string" &&
         "fields" in value &&
         typeof value.fields == "object"
       );
@@ -98,6 +100,15 @@ export const RawOption = {
   },
 };
 
+export type RawSum = { Kind: "l" | "r"; Value: any };
+export const RawSum = {
+  Operations: {
+    IsRawSum: (value: any): value is RawSum => {
+      return typeof value == "object" && "Kind" in value && "Value" in value;
+    },
+  },
+};
+
 export type BuiltInApiConverters = {
   string: ApiConverter<string>;
   number: ApiConverter<number>;
@@ -114,6 +125,8 @@ export type BuiltInApiConverters = {
   >;
   List: ApiConverter<List<any>>;
   Map: ApiConverter<List<[any, any]>>;
+  Tuple: ApiConverter<List<any>>;
+  Sum: ApiConverter<Sum<any, any>>;
 };
 
 export type PrimitiveBuiltIn = {
@@ -125,6 +138,7 @@ export type BuiltIns = {
   primitives: Map<string, PrimitiveBuiltIn>;
   generics: Map<string, GenericBuiltIn>;
   renderers: {
+    unit: Set<string>;
     boolean: Set<string>;
     number: Set<string>;
     string: Set<string>;
@@ -137,12 +151,21 @@ export type BuiltIns = {
     streamMultiSelection: Set<string>;
     list: Set<string>;
     map: Set<string>;
+    tuple: Set<string>;
+    sum: Set<string>;
   };
 };
 
 export const builtInsFromFieldViews = (fieldViews: any): BuiltIns => {
   const builtins: BuiltIns = {
     primitives: Map<string, PrimitiveBuiltIn>([
+      [
+        "unit",
+        {
+          renderers: Set(["unit"]),
+          defaultValue: PredicateValue.Default.unit(),
+        },
+      ] as [string, PrimitiveBuiltIn],
       [
         "string",
         {
@@ -215,6 +238,21 @@ export const builtInsFromFieldViews = (fieldViews: any): BuiltIns => {
         string,
         GenericBuiltIn,
       ],
+      [
+        "Tuple",
+        {
+          defaultValue: (values: PredicateValue[]) =>
+            PredicateValue.Default.tuple(List(values)),
+        },
+      ] as [string, GenericBuiltIn],
+      [
+        "Sum",
+        {
+          defaultValue: PredicateValue.Default.sum(
+            Sum.Default.right(PredicateValue.Default.unit()),
+          ),
+        },
+      ],
       ["Union", { defaultValue: PredicateValue.Default.record(Map()) }] as [
         string,
         GenericBuiltIn,
@@ -230,6 +268,7 @@ export const builtInsFromFieldViews = (fieldViews: any): BuiltIns => {
       ] as [string, GenericBuiltIn],
     ]),
     renderers: {
+      unit: Set(),
       boolean: Set(),
       date: Set(),
       enumMultiSelection: Set(),
@@ -239,9 +278,11 @@ export const builtInsFromFieldViews = (fieldViews: any): BuiltIns => {
       number: Set(),
       string: Set(),
       list: Set(),
+      tuple: Set(),
       base64File: Set(),
       secret: Set(),
       map: Set(),
+      sum: Set(),
     },
   };
   Object.keys(builtins.renderers).forEach((_categoryName) => {
@@ -272,6 +313,15 @@ export const defaultValue =
       if (injectedPrimitive != undefined) return injectedPrimitive.defaultValue;
     }
 
+    if (t.kind == "application" && t.value == "Tuple") {
+      return builtIns.generics
+        .get("Tuple")!
+        .defaultValue(
+          t.args.map((_) =>
+            defaultValue(types, builtIns, injectedPrimitives)(_),
+          ),
+        );
+    }
     if (t.kind == "application") {
       const generic = builtIns.generics.get(t.value);
       if (generic) return generic.defaultValue;
@@ -309,13 +359,19 @@ export const fromAPIRawValue =
     injectedPrimitives?: InjectedPrimitives<T>,
   ) =>
   (raw: any): ValueOrErrors<PredicateValue, string> => {
-    if (raw == undefined) {
+    // allow undefined for unit
+    if (raw == undefined && (t.kind !== "primitive" || t.value != "unit")) {
       return ValueOrErrors.Default.throwOne(
         `raw value is undefined for type ${JSON.stringify(t)}`,
       );
     }
 
     if (t.kind == "primitive") {
+      // unit is a special kind of primitive
+      if (t.value == "unit") {
+        return ValueOrErrors.Default.return(PredicateValue.Default.unit());
+      }
+
       if (!PredicateValue.Operations.IsPrimitive(raw)) {
         return ValueOrErrors.Default.throwOne(
           `primitive expected but got ${JSON.stringify(raw)}`,
@@ -331,10 +387,10 @@ export const fromAPIRawValue =
           `union expected but got ${JSON.stringify(raw)}`,
         );
       }
-      const caseType = t.args.get(raw.case);
+      const caseType = t.args.get(raw.caseName);
       if (caseType == undefined) {
         return ValueOrErrors.Default.throwOne(
-          `union case ${raw.case} not found in type ${JSON.stringify(t)}`,
+          `union case ${raw.caseName} not found in type ${JSON.stringify(t)}`,
         );
       }
       return fromAPIRawValue(
@@ -371,7 +427,7 @@ export const fromAPIRawValue =
           );
         }
         return ValueOrErrors.Default.return(
-          PredicateValue.Default.unionCase(result.case, fields),
+          PredicateValue.Default.unionCase(result.caseName, fields),
         );
       });
     }
@@ -470,7 +526,7 @@ export const fromAPIRawValue =
 
         if (
           raw.some(
-            (_) => typeof _ != "object" || !("key" in _) || !("value" in _),
+            (_) => typeof _ != "object" || !("Key" in _) || !("Value" in _),
           )
         ) {
           return ValueOrErrors.Default.throwOne(
@@ -479,7 +535,6 @@ export const fromAPIRawValue =
             )}`,
           );
         }
-
         const result = converters[t.value].fromAPIRawValue(raw);
 
         return ValueOrErrors.Operations.All(
@@ -512,6 +567,72 @@ export const fromAPIRawValue =
           ),
         );
       }
+
+      if (t.value == "Tuple") {
+        if (!Array.isArray(raw))
+          return ValueOrErrors.Default.throwOne(
+            `Array expected but got ${JSON.stringify(raw)}`,
+          );
+        if (raw.length != t.args.length)
+          return ValueOrErrors.Default.throwOne(
+            `Array length mismatch expected tuple length: ${t.args.length} expected but got ${raw.length}`,
+          );
+
+        const result = converters[t.value].fromAPIRawValue(raw);
+        return ValueOrErrors.Operations.All(
+          List<ValueOrErrors<PredicateValue, string>>(
+            result.map((_, index) =>
+              fromAPIRawValue(
+                t.args[index],
+                types,
+                builtIns,
+                converters,
+                injectedPrimitives,
+              )(_),
+            ),
+          ),
+        ).Then((values) =>
+          ValueOrErrors.Default.return(
+            PredicateValue.Default.tuple(List(values)),
+          ),
+        );
+      }
+
+      if (t.value === "Sum" && t.args.length === 2) {
+        if (!RawSum.Operations.IsRawSum(raw)) {
+          return ValueOrErrors.Default.throwOne(
+            `Sum expected but got ${JSON.stringify(raw)}`,
+          );
+        }
+
+        const result = converters[t.value].fromAPIRawValue(raw);
+
+        if (raw.Kind === "l") {
+          return fromAPIRawValue(
+            t.args[0],
+            types,
+            builtIns,
+            converters,
+            injectedPrimitives,
+          )(result.value).Then((value) =>
+            ValueOrErrors.Default.return(
+              PredicateValue.Default.sum(Sum.Default.left(value)),
+            ),
+          );
+        }
+
+        return fromAPIRawValue(
+          t.args[1],
+          types,
+          builtIns,
+          converters,
+          injectedPrimitives,
+        )(result.value).Then((value) =>
+          ValueOrErrors.Default.return(
+            PredicateValue.Default.sum(Sum.Default.right(value)),
+          ),
+        );
+      }
     }
 
     if (t.kind == "lookup")
@@ -572,7 +693,7 @@ export const toAPIRawValue =
       return ValueOrErrors.Operations.Return(
         converters[t.value as string | keyof T].toAPIRawValue([
           raw,
-          formState.modifiedByUser,
+          formState.commonFormState.modifiedByUser,
         ]),
       );
     }
@@ -595,8 +716,8 @@ export const toAPIRawValue =
       }
       return ValueOrErrors.Operations.Return(
         converters[t.kind].toAPIRawValue([
-          { case: raw.caseName, fields: raw.fields },
-          formState.modifiedByUser,
+          { caseName: raw.caseName, fields: raw.fields },
+          formState.commonFormState.modifiedByUser,
         ]),
       );
     }
@@ -627,14 +748,14 @@ export const toAPIRawValue =
           return ValueOrErrors.Operations.Return(
             converters[t.value].toAPIRawValue([
               Sum.Default.left(rawValue),
-              formState.modifiedByUser,
+              formState.commonFormState.modifiedByUser,
             ]),
           );
         } else {
           return ValueOrErrors.Operations.Return(
             converters[t.value].toAPIRawValue([
               Sum.Default.right("no selection"),
-              formState.modifiedByUser,
+              formState.commonFormState.modifiedByUser,
             ]),
           );
         }
@@ -689,7 +810,7 @@ export const toAPIRawValue =
                     })
                     .toArray(),
                 ),
-                formState.modifiedByUser,
+                formState.commonFormState.modifiedByUser,
               ]),
             ),
         );
@@ -716,7 +837,7 @@ export const toAPIRawValue =
           ValueOrErrors.Default.return(
             converters["List"].toAPIRawValue([
               values,
-              formState.modifiedByUser,
+              formState.commonFormState.modifiedByUser,
             ]),
           ),
         );
@@ -731,7 +852,7 @@ export const toAPIRawValue =
             injectedPrimitives,
           )(
             (keyValue as ValueTuple).values.get(0)!,
-            formState.elementFormStates.get(index).KeyFormState.commonFormState,
+            formState.elementFormStates.get(index).KeyFormState,
           )
             .Then((possiblyUndefinedKey) => {
               if (
@@ -761,8 +882,7 @@ export const toAPIRawValue =
                 injectedPrimitives,
               )(
                 (keyValue as ValueTuple).values.get(1)!,
-                formState.elementFormStates.get(index).ValueFormState
-                  .commonFormState,
+                formState.elementFormStates.get(index).ValueFormState,
               ).Then((value) =>
                 ValueOrErrors.Default.return([key, value] as [any, any]),
               ),
@@ -783,6 +903,74 @@ export const toAPIRawValue =
           );
         });
       }
+
+      if (t.value === "Sum") {
+        if (!PredicateValue.Operations.IsSum(raw)) {
+          return ValueOrErrors.Default.throwOne(
+            `Sum expected but got ${JSON.stringify(raw)}`,
+          );
+        }
+
+        if (raw.value.kind === "l") {
+          return toAPIRawValue(
+            t.args[0],
+            types,
+            builtIns,
+            converters,
+            injectedPrimitives,
+          )(raw.value.value, formState.customFormState.left).Then((value) =>
+            ValueOrErrors.Default.return(
+              converters["Sum"].toAPIRawValue([
+                Sum.Default.left(value),
+                formState.commonFormState.modifiedByUser,
+              ]),
+            ),
+          );
+        }
+
+        return toAPIRawValue(
+          t.args[1],
+          types,
+          builtIns,
+          converters,
+          injectedPrimitives,
+        )(raw.value.value, formState.customFormState.right).Then((value) =>
+          ValueOrErrors.Default.return(
+            converters["Sum"].toAPIRawValue([
+              Sum.Default.right(value),
+              formState.commonFormState.modifiedByUser,
+            ]),
+          ),
+        );
+      }
+
+      if (t.value == "Tuple") {
+        if (!PredicateValue.Operations.IsTuple(raw)) {
+          return ValueOrErrors.Default.throwOne(
+            `Tuple expected but got ${JSON.stringify(raw)}`,
+          );
+        }
+        return ValueOrErrors.Operations.All(
+          List(
+            raw.values.map((value, index) => {
+              return toAPIRawValue(
+                t.args[index],
+                types,
+                builtIns,
+                converters,
+                injectedPrimitives,
+              )(value, formState.elementFormStates.get(index));
+            }),
+          ),
+        ).Then((values) =>
+          ValueOrErrors.Default.return(
+            converters["Tuple"].toAPIRawValue([
+              values,
+              formState.commonFormState.modifiedByUser,
+            ]),
+          ),
+        );
+      }
     }
 
     if (t.kind == "lookup")