ballerina-core 1.0.40 → 1.0.43

package/package.json

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

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

@@ -3,7 +3,7 @@ import { ApiConverters, BoolExpr, BuiltIns, FieldName, FormsConfigMerger, Inject
 
 export type FieldConfig = {
   renderer: string;
-  label: string;
+  label?: string;
   tooltip?: string;
   api: { stream?: string, enumOptions?: string };
   elementRenderer?: string;
@@ -478,7 +478,7 @@ export const FormsConfig = {
           formDef.fields = formDef.fields.set(
             fieldName, {
             renderer: fieldConfig.renderer,
-            label: fieldConfig.label ?? revertKeyword(fieldName),
+            label: fieldConfig.label,
             tooltip: fieldConfig.tooltip,
             elementTooltip: fieldConfig.elementTooltip,
             elementRenderer: fieldConfig.elementRenderer,

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

@@ -24,7 +24,7 @@ const parseOptions = (leafPredicates: any, options: any) => {
 };
 
 export const FieldView = //<Context, FieldViews extends DefaultFieldViews, EnumFieldConfigs extends {}, EnumSources extends {}>() => <ViewType extends keyof FieldViews, ViewName extends keyof FieldViews[ViewType]>
-  <T,>(fieldConfig:FieldConfig, fieldViews: any, viewType: any, viewName: any, fieldName: string, label: string, tooltip: string | undefined, enumFieldConfigs: EnumOptionsSources, enumSources: any, leafPredicates: any, injectedPrimitives?: InjectedPrimitives<T>): any =>
+  <T,>(fieldConfig:FieldConfig, fieldViews: any, viewType: any, viewName: any, label: string | undefined, tooltip: string | undefined, enumFieldConfigs: EnumOptionsSources, enumSources: any, leafPredicates: any, injectedPrimitives?: InjectedPrimitives<T>): any =>
   {
     if (viewType == "maybeBoolean")
       return MaybeBooleanForm<any & FormLabel, Unit>()
@@ -208,8 +208,8 @@ export const ParseForm = <T,>(
           ).withView(((fieldViews as any)[viewType] as any)[viewName]() as any)
             .mapContext<any>(_ => ({ ..._, label, tooltip }))
         } else { // the list argument is a primitive
-          const elementForm = FieldView(fieldConfig, fieldViews, fieldNameToElementViewCategory(formFieldElementRenderers)(fieldName) as any, elementRendererName, fieldName, elementLabel ?? label, elementTooltip, EnumOptionsSources, fieldsOptionsConfig, leafPredicates, injectedPrimitives)
-          const initialFormState = FieldFormState(fieldConfig, fieldViews, fieldNameToElementViewCategory(formFieldElementRenderers)(fieldName) as any, elementRendererName, fieldName, InfiniteStreamSources, fieldsInfiniteStreamsConfig, injectedPrimitives);
+          const elementForm = FieldView(fieldConfig, fieldViews, fieldNameToElementViewCategory(formFieldElementRenderers)(fieldName) as any, elementRendererName, elementLabel, elementTooltip, EnumOptionsSources, fieldsOptionsConfig, leafPredicates, injectedPrimitives)
+          const initialFormState = FieldFormState(fieldConfig, fieldViews, fieldNameToElementViewCategory(formFieldElementRenderers)(fieldName) as any, elementRendererName, InfiniteStreamSources, fieldsInfiniteStreamsConfig, injectedPrimitives);
           formConfig[fieldName] = ListForm<any, any, any & FormLabel, Unit>(
             { Default: () => initialFormState },
             { Default: () => initialElementValue },
@@ -239,7 +239,7 @@ export const ParseForm = <T,>(
           const initialValueValue = defaultValue(valueType)
           const getFormAndInitialState = (elementRenderers:any, rendererName:any, fieldConfig:FieldConfig) => {
             const formDef = otherForms.get(rendererName)
-            const elementLabel = elementRenderers[fieldName].label ?? label
+            const elementLabel = elementRenderers[fieldName].label
             const elementTooltip = elementRenderers[fieldName].tooltip
             if (formDef != undefined) {
               return [
@@ -248,7 +248,7 @@ export const ParseForm = <T,>(
               ]
             } else {
               const categoryName = fieldNameToElementViewCategory(elementRenderers)(fieldName) as any
-              const form = FieldView(fieldConfig, fieldViews, categoryName, rendererName, fieldName, elementLabel, elementTooltip, EnumOptionsSources, fieldsOptionsConfig, leafPredicates, injectedPrimitives)
+              const form = FieldView(fieldConfig, fieldViews, categoryName, rendererName, elementLabel, elementTooltip, EnumOptionsSources, fieldsOptionsConfig, leafPredicates, injectedPrimitives)
               const initialFormState = FieldFormState(fieldConfig, fieldViews, categoryName, rendererName, fieldName, InfiniteStreamSources, fieldsInfiniteStreamsConfig, injectedPrimitives);
               return [
                 form,
@@ -272,7 +272,7 @@ export const ParseForm = <T,>(
           ).withView(((fieldViews as any)[viewType] as any)[viewName]() as any)
             .mapContext<any>(_ => ({ ..._, label, tooltip }))
         } else {
-          formConfig[fieldName] = FieldView(fieldConfig, fieldViews, viewType, viewName, fieldName, label, tooltip, EnumOptionsSources, fieldsOptionsConfig, leafPredicates, injectedPrimitives);
+          formConfig[fieldName] = FieldView(fieldConfig, fieldViews, viewType, viewName, label, tooltip, EnumOptionsSources, fieldsOptionsConfig, leafPredicates, injectedPrimitives);
         }
       }
     }
@@ -409,6 +409,15 @@ export const parseForms =
               if (formsConfig.forms.has(field.elementRenderer))
                 traverse(formsConfig.forms.get(field.elementRenderer)!)
             }
+            if (fieldType?.kind == "application" && fieldType?.value == "Map" && fieldType?.args.length == 2 && field.mapRenderer != undefined) {
+              const mapRenderer = field.mapRenderer
+              if (mapRenderer && formsConfig.forms.has(mapRenderer.keyRenderer.renderer)) {
+                traverse(formsConfig.forms.get(mapRenderer.keyRenderer.renderer)!)
+              }
+              if (mapRenderer && formsConfig.forms.has(mapRenderer.valueRenderer.renderer)) {
+                traverse(formsConfig.forms.get(mapRenderer.valueRenderer.renderer)!)
+              }
+            }
           } catch (error) {
             errors.push(`unhandled error: ${JSON.stringify(error)} -> ${formDef.name}`)
           }
@@ -591,6 +600,9 @@ export const revertKeyword = (fieldName: string): string => {
 
 export const replaceKeywords = (obj: any, kind: "from api" | "to api"): any => {
   const replacementFn = kind == "from api" ? replaceKeyword : revertKeyword;
+  if(obj instanceof Date && !isNaN(obj.valueOf())) {
+    return obj;
+  }
   if (Array.isArray(obj) || List.isList(obj)) {
     return obj.map((item) =>
       typeof item == "string"

package/src/forms/domains/singleton/domains/form-label/state.ts

@@ -1,2 +1,2 @@
 
-export type FormLabel = { label: string; tooltip?: string; };
+export type FormLabel = { label?: string; tooltip?: string; };