ballerina-core 1.0.136 → 1.0.138

package/package.json

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

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

@@ -257,7 +257,7 @@ export type TableType<T> = {
 export type OneType<T> = {
   kind: "one";
   name: DispatchTypeName;
-  args: Array<DispatchParsedType<T>>;
+  args: DispatchParsedType<T>;
   typeName: DispatchTypeName;
 };
 
@@ -384,7 +384,7 @@ export const DispatchParsedType = {
     }),
     one: <T>(
       name: DispatchTypeName,
-      args: Array<DispatchParsedType<T>>,
+      args: DispatchParsedType<T>,
       typeName: DispatchTypeName,
     ): OneType<T> => ({
       kind: "one",
@@ -752,7 +752,7 @@ export const DispatchParsedType = {
             injectedPrimitives,
           ).Then((parsedArg) =>
             ValueOrErrors.Default.return(
-              DispatchParsedType.Default.one(typeName, [parsedArg], typeName),
+              DispatchParsedType.Default.one(typeName, parsedArg, typeName),
             ),
           );
         return ValueOrErrors.Default.throwOne(

package/src/forms/domains/parser/domains/predicates/domains/extractor/state.ts

@@ -3,18 +3,21 @@ import {
   ValueOrErrors,
   Errors,
   DispatchParsedType,
+  BasicFun,
+  MapRepo
 } from "../../../../../../../../main";
 import { PredicateValue } from "../../state";
 
+type ExtractedTypeInstances = ValueOrErrors<Array<PredicateValue>, Errors<string[]>>
+type TypeInstancesExtractor = BasicFun<PredicateValue, ExtractedTypeInstances>
+
 export const PredicateValueExtractor = {
   Operations: {
     ExtractPredicateValue: (
       lookupName: string,
       typesMap: Map<string, DispatchParsedType<any>>,
       t: DispatchParsedType<any>,
-    ): ((
-      v: PredicateValue,
-    ) => ValueOrErrors<Array<PredicateValue>, Errors<any>>) => {
+    ): TypeInstancesExtractor => {
       const self = PredicateValueExtractor.Operations.ExtractPredicateValue;
       switch (t.kind) {
         case "lookup": {
@@ -29,11 +32,8 @@ export const PredicateValueExtractor = {
               );
           }
 
-          const traverseLookupValue = self(lookupName, typesMap, lookupType);
-          return (v) =>
-            t.name === lookupName
-              ? ValueOrErrors.Default.return([v])
-              : traverseLookupValue(v);
+          return t.name === lookupName ? ((v) => ValueOrErrors.Default.return([v])) :
+            self(lookupName, typesMap, lookupType)
         }
         case "primitive":
           return (_) => ValueOrErrors.Default.return([]);
@@ -52,10 +52,10 @@ export const PredicateValueExtractor = {
           const traverseRecordFields = t.fields.map((f) =>
             self(lookupName, typesMap, f),
           );
-          return (v: PredicateValue) =>
+          return (v: PredicateValue) : ExtractedTypeInstances =>
             !PredicateValue.Operations.IsRecord(v)
               ? ValueOrErrors.Default.throwOne(
-                  Errors.Default.singleton(["not a ValueRecord", v]),
+                  Errors.Default.singleton(["not a ValueRecord", JSON.stringify(v)]),
                 )
               : ValueOrErrors.Operations.All(
                   List(
@@ -79,7 +79,7 @@ export const PredicateValueExtractor = {
               ? ValueOrErrors.Default.throwOne(
                   Errors.Default.singleton([
                     "not a ValueOption (from SingleSelection)",
-                    v,
+                    JSON.stringify(v),
                   ]),
                 )
               : !v.isSome
@@ -98,7 +98,7 @@ export const PredicateValueExtractor = {
               ? ValueOrErrors.Default.throwOne(
                   Errors.Default.singleton([
                     "not a ValueRecord (from MultiSelection)",
-                    v,
+                    JSON.stringify(v),
                   ]),
                 )
               : ValueOrErrors.Operations.All(
@@ -120,7 +120,7 @@ export const PredicateValueExtractor = {
           return (v: PredicateValue) =>
             !PredicateValue.Operations.IsTuple(v)
               ? ValueOrErrors.Default.throwOne(
-                  Errors.Default.singleton(["not a ValueRecord (from Map)", v]),
+                  Errors.Default.singleton(["not a ValueRecord (from Map)", JSON.stringify(v)]),
                 )
               : (
                   ValueOrErrors.Operations.All(
@@ -130,7 +130,7 @@ export const PredicateValueExtractor = {
                           ? ValueOrErrors.Default.throwOne(
                               Errors.Default.singleton([
                                 "not a ValueRecord (from inner Map)",
-                                entry,
+                                JSON.stringify(entry),
                               ]),
                             )
                           : ValueOrErrors.Operations.All(
@@ -162,7 +162,7 @@ export const PredicateValueExtractor = {
           return (v) =>
             !PredicateValue.Operations.IsSum(v)
               ? ValueOrErrors.Default.throwOne(
-                  Errors.Default.singleton(["not a ValueSum", v]),
+                  Errors.Default.singleton(["not a ValueSum", JSON.stringify(v)]),
                 )
               : ValueOrErrors.Operations.All(
                   List(
@@ -184,7 +184,7 @@ export const PredicateValueExtractor = {
           return (v) =>
             !PredicateValue.Operations.IsTuple(v)
               ? ValueOrErrors.Default.throwOne(
-                  Errors.Default.singleton(["not a ValueTuple", v]),
+                  Errors.Default.singleton(["not a ValueTuple", JSON.stringify(v)]),
                 )
               : ValueOrErrors.Operations.All(
                   List(
@@ -199,39 +199,48 @@ export const PredicateValueExtractor = {
                   ),
                 );
         }
-        // case "union": {
-        //   const traverseUnionFields = t.args.map((f) =>
-        //     self(lookupName, typesMap, f.fields),
-        //   );
-        //   return (v) =>
-        //     !PredicateValue.Operations.IsTuple(v)
-        //       ? ValueOrErrors.Default.throwOne(
-        //           Errors.Default.singleton([
-        //             "not a ValueRecord (from union)",
-        //             v,
-        //           ]),
-        //         )
-        //       : (ValueOrErrors.Operations.All(
-        //           traverseUnionFields
-        //             .filter((_, k) => v.fields.has(k))
-        //             .map<ValueOrErrors<Array<PredicateValue>, Errors<any>>>(
-        //               (traverseField, k) => traverseField(v.values.get(k)!),
-        //             )
-        //             .valueSeq()
-        //             .toList(),
-        //         ).Map((listFailingChecks) =>
-        //           listFailingChecks.reduce(
-        //             (acc, curr) => [...acc, ...curr],
-        //             [] as Array<PredicateValue>,
-        //           ),
-        //         ));
-        // }
+        case "union": {
+          const traverseCases:Map<string, TypeInstancesExtractor> = t.args.map((f) =>
+            self(lookupName, typesMap, f)
+          ).toMap();
+          return (v) : ExtractedTypeInstances =>
+            !PredicateValue.Operations.IsUnionCase(v)
+              ? ValueOrErrors.Default.throwOne(
+                  Errors.Default.singleton([
+                    "not a ValueUnion (from union)",
+                    JSON.stringify(v),
+                  ]),
+                )
+              : MapRepo.Operations.tryFindWithError<string, TypeInstancesExtractor, Errors<string[]>>(v.caseName, traverseCases, () => Errors.Default.singleton([
+                    `unexpected union case ${v.caseName}`,
+                    JSON.stringify(v),
+                  ])).Then(
+                (traverseCase:TypeInstancesExtractor) =>
+                  traverseCase(v.fields)
+              )
+        }
+        case "one": {
+          const traverseValue:TypeInstancesExtractor = self(lookupName, typesMap, t.args)
+          return (v) : ExtractedTypeInstances =>
+            PredicateValue.Operations.IsOption(v) ?
+              v.isSome ? traverseValue(v.value)
+              : ValueOrErrors.Default.return([])
+            : PredicateValue.Operations.IsSum(v) ?
+              v.value.kind == "r" ? traverseValue(v.value.value)
+              : ValueOrErrors.Default.return([])
+            : ValueOrErrors.Default.throwOne(
+                  Errors.Default.singleton([
+                    "not a One/Option or One/Sum (from one)",
+                    JSON.stringify(v),
+                  ]),
+                )
+        }
         case "list": {
           const traverseListField = self(lookupName, typesMap, t.args[0]);
           return (v) =>
             !PredicateValue.Operations.IsTuple(v)
               ? ValueOrErrors.Default.throwOne(
-                  Errors.Default.singleton(["not a ValueTuple (from List)", v]),
+                  Errors.Default.singleton(["not a ValueTuple (from List)", JSON.stringify(v)]),
                 )
               : ValueOrErrors.Operations.All(
                   List(v.values.map((v) => traverseListField(v))),
@@ -248,7 +257,7 @@ export const PredicateValueExtractor = {
         default:
           return (_) =>
             ValueOrErrors.Default.throwOne(
-              Errors.Default.singleton(["unknown type", t]),
+              Errors.Default.singleton(["unknown type", JSON.stringify(t)]),
             );
       }
     },