ballerina-core 1.0.192 → 1.0.193

package/package.json

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

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

@@ -1324,30 +1324,15 @@ export const dispatchFromAPIRawValue =
             )}`,
           );
 
-        if (caseType.kind != "record" && caseType.kind != "lookup")
-          return ValueOrErrors.Default.throwOne(
-            `union case ${
-              result.caseName
-            } expected record or lookup type, got ${JSON.stringify(caseType)}`,
-          );
-
         return dispatchFromAPIRawValue(
           caseType,
           types,
           converters,
           injectedPrimitives,
         )(result.fields).Then((value) =>
-          PredicateValue.Operations.IsRecord(value)
-            ? ValueOrErrors.Default.return(
-                PredicateValue.Default.unionCase(result.caseName, value),
-              )
-            : ValueOrErrors.Default.throwOne(
-                `union case ${
-                  result.caseName
-                } expected record, got ${PredicateValue.Operations.GetKind(
-                  value,
-                )}`,
-              ),
+          ValueOrErrors.Default.return(
+            PredicateValue.Default.unionCase(result.caseName, value),
+          ),
         );
       }
 

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

@@ -191,6 +191,8 @@ export const SerializedType = {
     SerializedType.isApplication(_) &&
     _.fun == "ReadOnly" &&
     _.args.length == 1,
+  isRecordFields: (_: unknown) =>
+    typeof _ == "object" && _ != null && !("fun" in _) && !("args" in _),
 };
 
 export type StringSerializedType = string;
@@ -1042,41 +1044,25 @@ export const DispatchParsedType = {
           return ValueOrErrors.Operations.All(
             List<ValueOrErrors<[string, DispatchParsedType<T>], string>>(
               rawType.args.map((unionCase) =>
-                typeof unionCase.fields == "string" // lookup case
-                  ? serializedTypes[unionCase.fields] == undefined // probably dont need this
-                    ? ValueOrErrors.Default.throwOne(
-                        `Cannot find union case type: ${JSON.stringify(
-                          unionCase.fields,
-                        )} in types`,
-                      )
-                    : DispatchParsedType.Operations.ParseRawType(
-                        `Union:Case ${unionCase.caseName}`,
-                        unionCase.fields,
-                        typeNames,
-                        serializedTypes,
-                        alreadyParsedTypes,
-                        injectedPrimitives,
-                      ).Then((parsedType) =>
-                        ValueOrErrors.Default.return([
-                          unionCase.caseName,
-                          parsedType[0],
-                        ]),
-                      )
-                  : DispatchParsedType.Operations.ParseRawType(
-                      `Union:Case ${unionCase.caseName}`,
-                      unionCase.fields == undefined
-                        ? { fields: {} }
-                        : unionCase,
-                      typeNames,
-                      serializedTypes,
-                      alreadyParsedTypes,
-                      injectedPrimitives,
-                    ).Then((parsedType) =>
-                      ValueOrErrors.Default.return([
-                        unionCase.caseName,
-                        parsedType[0],
-                      ]),
-                    ),
+                DispatchParsedType.Operations.ParseRawType(
+                  `Union:Case ${unionCase.caseName}`,
+                  unionCase.fields == undefined
+                    ? { fields: {} }
+                    : // we allow the record fields to be defined directly in the spec instead of
+                      // inside a fields key
+                      SerializedType.isRecordFields(unionCase.fields)
+                      ? { fields: unionCase.fields }
+                      : unionCase.fields,
+                  typeNames,
+                  serializedTypes,
+                  alreadyParsedTypes,
+                  injectedPrimitives,
+                ).Then((parsedType) =>
+                  ValueOrErrors.Default.return([
+                    unionCase.caseName,
+                    parsedType[0],
+                  ]),
+                ),
               ),
             ),
           ).Then((parsedUnionCases) =>

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

@@ -425,7 +425,7 @@ export const PredicateValue = {
       kind: "record",
       fields,
     }),
-    unionCase: (caseName: string, fields: ValueRecord): ValueUnionCase => ({
+    unionCase: (caseName: string, fields: PredicateValue): ValueUnionCase => ({
       kind: "unionCase",
       caseName,
       fields,