ballerina-core 1.0.12 → 1.0.14

package/package.json

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

package/src/forms/domains/parser/coroutines/runner.ts

@@ -15,6 +15,7 @@ export const LoadValidateAndParseFormsConfig = () => {
       return Sum.Default.right(validationResult.value)
     return parseForms(
       builtIns,
+      current.fieldTypeConverters,
       current.containerFormView,
       current.nestedContainerFormView,
       current.fieldViews,

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

@@ -118,8 +118,9 @@ export const defaultValue = (types:Map<TypeName, TypeDefinition>, builtIns:Built
 }
 
 export const fromAPIRawValue = (t:Type, types:Map<TypeName, TypeDefinition>, builtIns:BuiltIns, converters:ApiConverters) => (raw:any) : any => {
+  // alert(JSON.stringify(t))
   if (raw == undefined) {
-    console.error(`instantiating default value for type ${JSON.stringify(t)}: something is missing from the API response`)
+    console.warn(`instantiating default value for type ${JSON.stringify(t)}: the value was undefined so something is missing from the API response`)
     return defaultValue(types, builtIns)(t.kind == "primitive" ? t.value : t.kind == "lookup" ? t.name : t.value)
   }
 
@@ -132,58 +133,71 @@ export const fromAPIRawValue = (t:Type, types:Map<TypeName, TypeDefinition>, bui
         fromAPIRawValue({ kind:"lookup", name:t.args[0] }, types, builtIns, converters))(result)
       return result
     }
-    if (t.value == "MultiSelection" && t.args.length == 1) {
-      let result = converters[t.value].fromAPIRawValue(raw)
+    if ((t.value == "Multiselection" || t.value == "MultiSelection") && t.args.length == 1) {
+      let result = converters["MultiSelection"].fromAPIRawValue(raw)
       result = result.map(fromAPIRawValue({ kind:"lookup", name:t.args[0] }, types, builtIns, converters))
       return result
     }
     if (t.value == "List" && t.args.length == 1) {
       let result = converters[t.value].fromAPIRawValue(raw)
-      result = result.map(fromAPIRawValue({ kind:"lookup", name:t.args[0] }, types, builtIns, converters))
+      result = result.map(fromAPIRawValue(
+        PrimitiveTypes.some(_ => _ == t.args[0]) ?
+          { kind:"primitive", value:t.args[0] as PrimitiveType }
+        : { kind:"lookup", name:t.args[0] }
+        , types, builtIns, converters))
       return result
     }
   } else { // t.kind == lookup: we are dealing with a record/object
-    let result:any = {}
+    let result:any = {...raw}
     const tDef = types.get(t.name)!
     tDef.fields.forEach((fieldType, fieldName) => {
-      result[fieldName] = fromAPIRawValue(fieldType, types, builtIns, converters)(raw[fieldName])
+      const fieldValue = raw[fieldName]
+      result[fieldName] = fromAPIRawValue(fieldType, types, builtIns, converters)(fieldValue)
     })
     return result
   }
-  console.error(`instantiating default value for type ${JSON.stringify(t)}: something is missing from the API response`)
-  return defaultValue(types, builtIns)(t.value)     
+  console.error(`unsupported type ${JSON.stringify(t)}, returning the raw value right away`)
+  return raw
 }
 
 
 export const toAPIRawValue = (t:Type, types:Map<TypeName, TypeDefinition>, builtIns:BuiltIns, converters:ApiConverters) => (raw:any) : any => {
   if (t.kind == "primitive") {
-    // t.value == ""
     return converters[t.value].toAPIRawValue(raw as never)
   } else if (t.kind == "application") { // application here means "generic type application"
     if (t.value == "SingleSelection" && t.args.length == 1) {
       let result = converters[t.value].toAPIRawValue(raw)
-      result = CollectionSelection().Updaters.left(
-        toAPIRawValue({ kind:"lookup", name:t.args[0] }, types, builtIns, converters))(result)
+      if (result != undefined)
+        result = toAPIRawValue({ kind:"lookup", name:t.args[0] }, types, builtIns, converters)(result)
       return result
     }
-    if (t.value == "MultiSelection" && t.args.length == 1) {
-      let result = converters[t.value].toAPIRawValue(raw)
+    if ((t.value == "Multiselection" || t.value == "MultiSelection") && t.args.length == 1) {
+      // alert(`MultiSelect ${JSON.stringify(t)} ${JSON.stringify(raw)}`)
+      let result = converters["MultiSelection"].toAPIRawValue(raw)
+      // alert(`MultiSelect result1 = ${JSON.stringify(result)}`)
+      // alert(`${JSON.stringify(t.args[0])}`)
       result = result.map(toAPIRawValue({ kind:"lookup", name:t.args[0] }, types, builtIns, converters))
+      // alert(`MultiSelect result2 = ${JSON.stringify(result)}`)
       return result
     }
     if (t.value == "List" && t.args.length == 1) {
       let result = converters[t.value].toAPIRawValue(raw)
-      result = result.map(toAPIRawValue({ kind:"lookup", name:t.args[0] }, types, builtIns, converters))
+      result = result.map(toAPIRawValue(
+        PrimitiveTypes.some(_ => _ == t.args[0]) ?
+          { kind:"primitive", value:t.args[0] as PrimitiveType }
+        : { kind:"lookup", name:t.args[0] },
+        // { kind:"lookup", name:t.args[0] }, 
+        types, builtIns, converters))
       return result
     }
   } else { // t.kind == lookup: we are dealing with a record/object
-    let result:any = {}
+    let result:any = {...raw}
     const tDef = types.get(t.name)!
     tDef.fields.forEach((fieldType, fieldName) => {
-      result[fieldName] = toAPIRawValue(fieldType, types, builtIns, converters)(raw[fieldName])
+      const fieldValue = raw[fieldName]
+      result[fieldName] = toAPIRawValue(fieldType, types, builtIns, converters)(fieldValue)
     })
     return result
   }
-  console.error(`instantiating default value for type ${JSON.stringify(t)}: something is missing from the API response`)
   return defaultValue(types, builtIns)(t.value)     
 }

package/src/forms/domains/parser/state.tsx

@@ -1,5 +1,5 @@
 import { Collection, Map, OrderedMap, OrderedSet, Set } from "immutable";
-import { BoolExpr, Unit, PromiseRepo, Guid, LeafPredicatesEvaluators, Predicate, FormsConfig, BuiltIns, FormDef, Sum, BasicFun, Template, unit, EditFormState, EditFormTemplate, ApiErrors, CreateFormTemplate, EntityFormTemplate, SharedFormState, CreateFormState, Entity, EditFormContext, CreateFormContext, MappedEntityFormTemplate, Mapping, FormValidationResult, Synchronized, simpleUpdater, PrimitiveType, GenericType, ApiConverter, TypeName, ListFieldState, ListForm, TypeDefinition, ApiConverters, defaultValue, fromAPIRawValue } from "../../../../main";
+import { BoolExpr, Unit, PromiseRepo, Guid, LeafPredicatesEvaluators, Predicate, FormsConfig, BuiltIns, FormDef, Sum, BasicFun, Template, unit, EditFormState, EditFormTemplate, ApiErrors, CreateFormTemplate, EntityFormTemplate, SharedFormState, CreateFormState, Entity, EditFormContext, CreateFormContext, MappedEntityFormTemplate, Mapping, FormValidationResult, Synchronized, simpleUpdater, PrimitiveType, GenericType, ApiConverter, TypeName, ListFieldState, ListForm, TypeDefinition, ApiConverters, defaultValue, fromAPIRawValue, toAPIRawValue } from "../../../../main";
 import { Value } from "../../../value/state";
 import { CollectionReference } from "../collection/domains/reference/state";
 import { CollectionSelection } from "../collection/domains/selection/state";
@@ -91,10 +91,13 @@ export const FieldFormState = //<Context, FieldViews extends DefaultFieldViews,
 export type ParsedForm = {
   initialFormState: any,
   formConfig: any,
+  formName: string,
+  formDef: FormDef,
   visibleFields: any,
   disabledFields: any,
 }
 export const ParseForm = (
+  formName: string,
   formDef: FormDef,
   containerFormView: any,
   nestedContainerFormView: any,
@@ -201,6 +204,8 @@ export const ParseForm = (
 
   return ({
     initialFormState,
+    formName,
+    formDef,
     formConfig,
     visibleFields,
     disabledFields,
@@ -273,6 +278,7 @@ export type EnumOptionsSources = BasicFun<EnumName, Promise<Array<[CollectionRef
 export const parseForms =
   <LeafPredicates,>(
     builtIns: BuiltIns,
+    apiConverters: ApiConverters,
     containerFormView: any,
     nestedContainerFormView: any,
     fieldViews: any,
@@ -321,6 +327,7 @@ export const parseForms =
 
         try {
           const parsedForm = ParseForm(
+            formName,
             formConfig,
             containerFormView,
             nestedContainerFormView,
@@ -359,8 +366,13 @@ export const parseForms =
         const form = parsedForm.form
         const initialState = parsedForm.initialFormState
         const api = {
-          get: entityApis.get(launcher.api),
-          update: entityApis.update(launcher.api)
+          get: (id:string) => entityApis.get(launcher.api)(id).then((raw: any) => {
+            // alert(JSON.stringify(raw))
+            // alert(JSON.stringify(parsedForm.formDef.type))
+            const parsed = fromAPIRawValue({ kind: "lookup", name: parsedForm.formDef.type }, formsConfig.types, builtIns, apiConverters)(raw)
+            return parsed
+          }),
+          update: (value:any) => entityApis.update(launcher.api)(toAPIRawValue({ kind: "lookup", name: parsedForm.formDef.type }, formsConfig.types, builtIns, apiConverters)(value))
         }
         parsedLaunchers.edit = parsedLaunchers.edit.set(
           launcherName,
@@ -381,13 +393,18 @@ export const parseForms =
         const form = parsedForm.form
         const initialState = parsedForm.initialFormState
         const api = {
-          create: entityApis.create(launcher.api),
-          default: (_:Unit) => entityApis.default(launcher.api)(unit)
-          // .then((raw:undefined) => {
-          //   alert(JSON.stringify(parsedForm.formConfig))
-          //   const parsed = fromAPIRawValue({ kind:"lookup", name:"" }, null!, null!, null!)(raw)
-          //   return parsed
-          // })
+          create: (value:any) => {
+            // alert(`type = ${JSON.stringify(parsedForm.formDef.type)}`)
+            // alert(`value = ${JSON.stringify(value)}`)
+            const raw = toAPIRawValue({ kind: "lookup", name: parsedForm.formDef.type }, formsConfig.types, builtIns, apiConverters)(value)
+            alert(`raw = ${JSON.stringify(raw.interests)}`)
+            return entityApis.create(launcher.api)(raw)
+          },
+          default: (_: Unit) => entityApis.default(launcher.api)(unit)
+            .then((raw: any) => {
+              const parsed = fromAPIRawValue({ kind: "lookup", name: parsedForm.formDef.type }, formsConfig.types, builtIns, apiConverters)(raw)
+              return parsed
+            })
         }
         parsedLaunchers.create = parsedLaunchers.create.set(
           launcherName,