ballerina-core 1.0.57 → 1.0.58

package/package.json

@@ -2,7 +2,7 @@
   "name": "ballerina-core",
   "author": "Dr. Giuseppe Maggiore",
   "private": false,
-  "version": "1.0.57",
+  "version": "1.0.58",
   "main": "main.ts",
   "dependencies": {
     "immutable": "^5.0.0-beta.5",

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

@@ -32,7 +32,7 @@ export type BuiltInApiConverters = {
   "boolean": ApiConverter<boolean>
   "maybeBoolean": ApiConverter<boolean | undefined>
   "base64File": ApiConverter<string>
-  "secret": ApiConverter<string>,
+  "secret": ApiConverter<string>
   "Date": ApiConverter<Maybe<Date>>
   "CollectionReference": ApiConverter<CollectionReference>
   "SingleSelection": ApiConverter<CollectionSelection<any>>
@@ -294,15 +294,25 @@ export const toAPIRawValue = <T>(t: Type, types: Map<TypeName, TypeDefinition>,
       return ValueOrErrors.Operations.All(parsedMap.concat(nonUniqueKeyErrors))
     }
   } else { // t.kind == lookup: we are dealing with a record/object or extended type 
-    const tDef = types.get(t.name)!
-    if("extends" in tDef && tDef.extends.length == 1) {
-      return ValueOrErrors.Operations.Return(converters[(tDef.extends[0] as keyof BuiltInApiConverters)].toAPIRawValue([raw, formState.modifiedByUser] as never))
-    }    
-    const convertedMap = tDef.fields.mapEntries(([fieldName, fieldType] ) => {
+    const convertMap = (typeDefinition: TypeDefinition, isExtended: boolean) => (typeDefinition).fields.mapEntries(([fieldName, fieldType] ) => {
       const fieldValue = raw[fieldName]
-      const converted = toAPIRawValue(fieldType, types, builtIns, converters, injectedPrimitives)(fieldValue, formState.formFieldStates[fieldName])
+      const fieldFormState = isExtended ? formState : formState.formFieldStates[fieldName]
+      const converted = toAPIRawValue(fieldType, types, builtIns, converters, injectedPrimitives)(fieldValue, fieldFormState)
       return [fieldName, converted]
     })
+
+    const tDef = types.get(t.name)!
+    const isExtended = "extends" in tDef && tDef.extends.length == 1
+    // Check for deprecated primitive CollectionReference - later should return error in this case
+    if(isExtended && !types.has(tDef.extends[0])) {
+      console.warn(`Deprecated: Primitive Collection Reference. Please use a CollectionReference in the form config instead. Cannot find type ${tDef.extends[0]} when resolving toAPIRawValue, assuming the deprecated primitive CollectionReference is being used.`)
+      return ValueOrErrors.Operations.Return(converters["CollectionReference"].toAPIRawValue([raw, formState.modifiedByUser] as never))
+    }
+
+    const extendedTDef = isExtended ? types.get(tDef.extends[0])! : undefined;
+
+    const convertedMap = extendedTDef ? convertMap(extendedTDef, true) : convertMap(tDef, false)
+
     if(convertedMap.some((valueOrError) => valueOrError.kind == "errors")) {
       const propertiesWithErrors = convertedMap.filter((valueOrError) => valueOrError.kind == "errors")
       const namedErrors = propertiesWithErrors.map((value, key) => value.MapErrors(_ => _.map((_: string) => `${key}: ${_}`)))

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

@@ -160,8 +160,8 @@ export const FormsConfig = {
                 errors = errors.push(`arg ${fieldDef.args[0]} in type ${typeName} references non existent type`);
                 return
               }
-              if (argType.extends.length != 1 || argType.extends[0] != "CollectionReference")
-                errors = errors.push(`field ${fieldName} in type ${typeName}: SingleSelection requires ${argType.name} to 'extend CollectionReference'`);
+              if (argType.extends.length != 1 || (argType.extends[0] != "CollectionReference" && !types.has(argType.extends[0])))
+                errors = errors.push(`field ${fieldName} in type ${typeName}: SingleSelection requires ${argType.name} to extend ${argType.extends[0]}`);
             }
           }
           if (fieldDef.kind == "application" && fieldDef.value == "Multiselection") {
@@ -173,8 +173,8 @@ export const FormsConfig = {
                 errors = errors.push(`arg ${fieldDef.args[0]} in type ${typeName} references non existent type`);
                 return errors
               }
-              if (argType.extends.length != 1 || argType.extends[0] != "CollectionReference")
-                errors = errors.push(`field ${fieldName} in type ${typeName}: Multiselection requires ${argType.name} to 'extend CollectionReference'`);
+              if (argType.extends.length != 1 || (argType.extends[0] != "CollectionReference" && !types.has(argType.extends[0])))
+                errors = errors.push(`field ${fieldName} in type ${typeName}: Multiselection requires ${argType.name} to extend ${argType.extends[0]}`);
             }
           }
           if (fieldDef.kind == "application" && fieldDef.value == "List") {