ballerina-core 1.0.18 → 1.0.20

package/package.json

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

package/src/forms/domains/collection/domains/reference/state.ts

@@ -4,10 +4,11 @@ import { simpleUpdater } from "../../../../../../main";
 export type CollectionReference = {
   id: string;
   displayName: string;
+  source?:"enum"|"stream"
 };
 export const CollectionReference = {
-  Default: Object.assign((id: string, displayName: string): CollectionReference => ({
-    id, displayName
+  Default: Object.assign((id: string, displayName: string, source?:"enum"|"stream"): CollectionReference => ({
+    id, displayName, source
   }), {
     empty: (): CollectionReference => CollectionReference.Default("", "")
   }),

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

@@ -176,7 +176,8 @@ export const toAPIRawValue = (t:Type, types:Map<TypeName, TypeDefinition>, built
       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))
+      result = result.map((_:any) => 
+        typeof _ == "object" ? toAPIRawValue({ kind:"lookup", name:t.args[0] }, types, builtIns, converters)(_) : _)
       // alert(`MultiSelect result2 = ${JSON.stringify(result)}`)
       return result
     }

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]>
-  (fieldViews: any, viewType: any, viewName: any, fieldName: string, label: string, enumFieldConfigs: any, enumSources: any, leafPredicates: any): any => // FieldView<Context, FieldViews, ViewType, ViewName> => 
+  (fieldViews: any, viewType: any, viewName: any, fieldName: string, label: string, enumFieldConfigs: EnumOptionsSources, enumSources: any, leafPredicates: any): any => // FieldView<Context, FieldViews, ViewType, ViewName> => 
   {
     if (viewType == "maybeBoolean")
       return MaybeBooleanForm<any & FormLabel, Unit>(_ => PromiseRepo.Default.mock(() => []))
@@ -50,13 +50,13 @@ export const FieldView = //<Context, FieldViews extends DefaultFieldViews, EnumF
       return EnumForm<any & FormLabel & BaseEnumContext<any, CollectionReference>, Unit, CollectionReference>(_ => PromiseRepo.Default.mock(() => []))
         .withView(((fieldViews as any)[viewType] as any)[viewName]() as any)
         .mapContext<any & EnumFormState<any & BaseEnumContext<any, CollectionReference>, CollectionReference> & Value<CollectionSelection<CollectionReference>>>(_ => ({
-          ..._, label: label, getOptions: () => ((enumFieldConfigs as any)((enumSources as any)[fieldName]) as Promise<any>).then(options => parseOptions(leafPredicates, options))
+          ..._, label: label, getOptions: () => ((enumFieldConfigs as any)(((enumSources as any)[fieldName]))() as Promise<any>).then(options => parseOptions(leafPredicates, options))
         })) as any
     if (viewType == "enumMultiSelection")
       return EnumMultiselectForm<any & FormLabel & BaseEnumContext<any, CollectionReference>, Unit, CollectionReference>(_ => PromiseRepo.Default.mock(() => []))
         .withView(((fieldViews as any)[viewType] as any)[viewName]() as any)
         .mapContext<any & EnumFormState<any & BaseEnumContext<any, CollectionReference>, CollectionReference> & Value<OrderedMap<Guid, CollectionReference>>>(_ => ({
-          ..._, label: label, getOptions: () => ((enumFieldConfigs as any)((enumSources as any)[fieldName]) as Promise<any>).then(options => parseOptions(leafPredicates, options))
+          ..._, label: label, getOptions: () => ((enumFieldConfigs as any)(((enumSources as any)[fieldName]))() as Promise<any>).then(options => parseOptions(leafPredicates, options))
         })) as any
     if (viewType == "streamSingleSelection")
       return SearchableInfiniteStreamForm<CollectionReference, any & FormLabel, Unit>(_ => PromiseRepo.Default.mock(() => []))
@@ -108,7 +108,7 @@ export const ParseForm = (
   fieldsInfiniteStreamsConfig: any,
   fieldsOptionsConfig: any,
   InfiniteStreamSources: any,
-  EnumOptionsSources: any,
+  EnumOptionsSources: EnumOptionsSources,
   leafPredicates: any,
   visibleFieldsBoolExprs: any,
   disabledFieldsBoolExprs: any,
@@ -274,7 +274,7 @@ export type EntityApis = {
 export type EnumName = string
 
 
-export type EnumOptionsSources = BasicFun<EnumName, Promise<Array<[CollectionReference, BoolExpr<Unit>]>>>
+export type EnumOptionsSources = BasicFun<EnumName, BasicFun<Unit,Promise<Array<[CollectionReference, BoolExpr<Unit>]>>>>
 export const parseForms =
   <LeafPredicates,>(
     builtIns: BuiltIns,