ballerina-core 1.0.26 → 1.0.28

package/package.json

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

package/src/forms/domains/launcher/domains/edit/coroutines/runner.ts

@@ -71,8 +71,9 @@ export const editFormRunner = <E, FS>() => {
     Co.Template<EditFormForeignMutationsExpected<E, FS>>(synchronize, {
       interval: 100,
       runFilter: (props) =>
-        Debounced.Operations.shouldCoroutineRun(props.context.apiRunner) ||
-        !ApiResponseChecker.Operations.checked(props.context),
+        props.context.entity.sync.kind == "loaded" &&
+        (Debounced.Operations.shouldCoroutineRun(props.context.apiRunner) ||
+        !ApiResponseChecker.Operations.checked(props.context)),
     }),
   ]);
 };

package/src/forms/domains/launcher/domains/edit/state.ts

@@ -27,7 +27,7 @@ export const EditFormState = <E,FS>() => ({
       Synchronized.Default(unit)
     ),
     formState:initialFormState,
-    ...ApiResponseChecker.Default(false),
+    ...ApiResponseChecker.Default(true),
   }),
   Updaters:{
     Core:{

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

@@ -1,6 +1,6 @@
 import { AsyncState, builtInsFromFieldViews, FormsConfig, Sum, Synchronize, Unit } from "../../../../../main"
 import { CoTypedFactory } from "../../../../coroutines/builder"
-import { FormParsingResult, FormsParserContext, FormsParserState, parseForms } from "../state"
+import { FormParsingResult, FormsParserContext, FormsParserState, parseForms, replaceKeywords } from "../state"
 
 export const LoadValidateAndParseFormsConfig = () => {
   const Co = CoTypedFactory<FormsParserContext, FormsParserState>()
@@ -8,7 +8,8 @@ export const LoadValidateAndParseFormsConfig = () => {
  return Co.Template<Unit>(
   Co.GetState().then(current => 
   Synchronize<Unit, FormParsingResult>(async() => {
-    const formsConfig = await current.getFormsConfig()
+    const rawFormsConfig = await current.getFormsConfig();
+    const formsConfig = replaceKeywords(rawFormsConfig, "from api")
     const builtIns = builtInsFromFieldViews(current.fieldViews, current.fieldTypeConverters)
     const validationResult = FormsConfig.Default.validateAndParseAPIResponse(builtIns)(formsConfig)
     if (validationResult.kind == "r")

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

@@ -2,8 +2,7 @@ import { Map, List, Set, OrderedMap } from "immutable"
 import { CollectionReference } from "../../../collection/domains/reference/state";
 import { CollectionSelection } from "../../../collection/domains/selection/state";
 import { BasicFun } from "../../../../../fun/state";
-import { Option, Sum } from "../../../../../collections/domains/sum/state"
-import { Type, TypeDefinition, TypeName } from "../../../../../../main";
+import { replaceKeyword, replaceKeywords, revertKeyword, Type, TypeDefinition, TypeName } from "../../../../../../main";
 
 export const PrimitiveTypes =
   ["string",
@@ -117,86 +116,93 @@ 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 => {
+export const fromAPIRawValue = (t:Type, types:Map<TypeName, TypeDefinition>, builtIns:BuiltIns, converters:ApiConverters, isKeywordsReplaced: boolean = false) => (raw:any) : any => {
   // alert(JSON.stringify(t))
   if (raw == undefined) {
     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)
   }
 
+  const obj = !isKeywordsReplaced ? replaceKeywords(raw, "from api") : raw
+
   if (t.kind == "primitive") {
-    return converters[t.value].fromAPIRawValue(raw)
+    return converters[t.value].fromAPIRawValue(obj)
   } else if (t.kind == "application") { // application here means "generic type application"
     if (t.value == "SingleSelection" && t.args.length == 1) {
-      let result = converters[t.value].fromAPIRawValue(raw)
+      let result = converters[t.value].fromAPIRawValue(obj)
       result = CollectionSelection().Updaters.left(
-        fromAPIRawValue({ kind:"lookup", name:t.args[0] }, types, builtIns, converters))(result)
+        fromAPIRawValue({ kind:"lookup", name:t.args[0] }, types, builtIns, converters, true))(result)
       return result
     }
     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))
+      let result = converters["MultiSelection"].fromAPIRawValue(obj)
+      result = result.map(fromAPIRawValue({ kind:"lookup", name:t.args[0] }, types, builtIns, converters, true))
       return result
     }
     if (t.value == "List" && t.args.length == 1) {
-      let result = converters[t.value].fromAPIRawValue(raw)
+      let result = converters[t.value].fromAPIRawValue(obj)
       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))
+        , types, builtIns, converters, true))
       return result
     }
   } else { // t.kind == lookup: we are dealing with a record/object
-    let result:any = {...raw}
+    let result:any = {...obj}
     const tDef = types.get(t.name)!
     tDef.fields.forEach((fieldType, fieldName) => {
-      const fieldValue = raw[fieldName]
-      result[fieldName] = fromAPIRawValue(fieldType, types, builtIns, converters)(fieldValue)
+      const replacedFieldName = replaceKeyword(fieldName)
+      const fieldValue = obj[replacedFieldName]
+      result[replacedFieldName] = fromAPIRawValue(fieldType, types, builtIns, converters, true)(fieldValue)
     })
     return result
   }
-  console.error(`unsupported type ${JSON.stringify(t)}, returning the raw value right away`)
-  return raw
+  console.error(`unsupported type ${JSON.stringify(t)}, returning the obj value right away`)
+  return obj
 }
 
 
-export const toAPIRawValue = (t:Type, types:Map<TypeName, TypeDefinition>, builtIns:BuiltIns, converters:ApiConverters) => (raw:any) : any => {
+export const toAPIRawValue = (t:Type, types:Map<TypeName, TypeDefinition>, builtIns:BuiltIns, converters:ApiConverters, isKeywordsReverted: boolean = false) => (raw:any) : any => {
+  
+  const obj = !isKeywordsReverted ? replaceKeywords(raw, "to api") : raw
+
   if (t.kind == "primitive") {
-    return converters[t.value].toAPIRawValue(raw as never)
+    return converters[t.value].toAPIRawValue(obj 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)
+      let result = converters[t.value].toAPIRawValue(obj)
       if (result != undefined && typeof result == "object")
-        result = toAPIRawValue({ kind:"lookup", name:t.args[0] }, types, builtIns, converters)(result)
+        result = toAPIRawValue({ kind:"lookup", name:t.args[0] }, types, builtIns, converters, true)(result)
       return result
     }
     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 ${JSON.stringify(t)} ${JSON.stringify(obj)}`)
+      let result = converters["MultiSelection"].toAPIRawValue(obj)
       // alert(`MultiSelect result1 = ${JSON.stringify(result)}`)
       // alert(`${JSON.stringify(t.args[0])}`)
       result = result.map((_:any) => 
-        typeof _ == "object" ? toAPIRawValue({ kind:"lookup", name:t.args[0] }, types, builtIns, converters)(_) : _)
+        typeof _ == "object" ? toAPIRawValue({ kind:"lookup", name:t.args[0] }, types, builtIns, converters, true)(_) : _)
       // alert(`MultiSelect result2 = ${JSON.stringify(result)}`)
       return result
     }
     if (t.value == "List" && t.args.length == 1) {
-      let result = converters[t.value].toAPIRawValue(raw)
+      let result = converters[t.value].toAPIRawValue(obj)
       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))
+        types, builtIns, converters, true))
       return result
     }
   } else { // t.kind == lookup: we are dealing with a record/object
-    let result:any = {...raw}
+    let result:any = {...obj}
     const tDef = types.get(t.name)!
     tDef.fields.forEach((fieldType, fieldName) => {
-      const fieldValue = raw[fieldName]
-      result[fieldName] = toAPIRawValue(fieldType, types, builtIns, converters)(fieldValue)
+      const revertedFieldName = revertKeyword(fieldName)
+      const fieldValue = obj[revertedFieldName]
+      result[revertedFieldName] = toAPIRawValue(fieldType, types, builtIns, converters, true)(fieldValue)
     })
     return result
   }

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

@@ -1,4 +1,4 @@
-import { Collection, Map, OrderedMap, OrderedSet, Set } from "immutable";
+import { List, 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, toAPIRawValue, EditFormForeignMutationsExpected } from "../../../../main";
 import { Value } from "../../../value/state";
 import { CollectionReference } from "../collection/domains/reference/state";
@@ -385,7 +385,8 @@ export const parseForms =
             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))
+          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,
@@ -468,7 +469,60 @@ export const parseForms =
       return Sum.Default.left(parsedLaunchers)
     }
 
+const OVERRIDE_FIELDS = ["value", "sync"];
 
+export const replaceKeyword = (fieldName: string): string => {
+  if (OVERRIDE_FIELDS.includes(fieldName)) {
+    return `__keywordreplacement__${fieldName}__`;
+  }
+  return fieldName;
+};
+
+export const revertKeyword = (fieldName: string): string => {
+  const overridenFieldNames = OVERRIDE_FIELDS.reduce((acc, field) => {
+    const overrideName = `__keywordreplacement__${field}__`;
+    acc[overrideName] = field;
+    return acc;
+  }, {} as any);
+
+  if (fieldName in overridenFieldNames) {
+    return overridenFieldNames[fieldName];
+  }
+  return fieldName;
+};
+
+export const replaceKeywords = (obj: any, kind: "from api" | "to api"): any => {
+  const replacementFn = kind == "from api" ? replaceKeyword : revertKeyword;
+  if (Array.isArray(obj) || List.isList(obj)) {
+    return obj.map((item) =>
+      typeof item == "string"
+        ? replacementFn(item)
+        : replaceKeywords(item, kind )
+    );
+  } else if (typeof obj === "object" && obj !== null) {
+    if(OrderedMap.isOrderedMap(obj)) {
+      return obj.map((_, key) => 
+        replacementFn(key as string)
+      )
+    }
+    if(Map.isMap(obj)) {
+      return obj.map((_, key) =>
+        replacementFn(key as string)
+      )
+    }
+    const copy = { ...obj };
+    Object.keys(copy).forEach((key) => {
+      const value = copy[key];
+      const newKeyName = replacementFn(key);
+      copy[newKeyName] = replaceKeywords(value, kind);
+      if(newKeyName !== key) {
+        delete copy[key]
+      }
+    });
+    return copy;
+  }
+  return obj;
+};
 
 export type FormsParserContext = {
   containerFormView: any,