Clean up and demo in DocuProject

freon4dsl · Jul 5, 2024 · ffc2480 · ffc2480
1 parent 75ba078
commit ffc2480
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 23 deletions.
diff --git a/packages/core-svelte/src/lib/components/CheckBoxComponent.svelte b/packages/core-svelte/src/lib/components/CheckBoxComponent.svelte
@@ -41,9 +41,9 @@
         editor.selectElementForBox(box);
         event.stopPropagation();
     }
-    $: {
-        console.log("value bool is " + value + ", box.value is " + box.getBoolean());
-    }
+    // $: {
+    //     console.log("value bool is " + value + ", box.value is " + box.getBoolean());
+    // }
 </script>
 
 <span class="checkbox {cssClass}"

diff --git a/packages/core-svelte/src/lib/components/RadioComponent.svelte b/packages/core-svelte/src/lib/components/RadioComponent.svelte
@@ -33,7 +33,7 @@
         box.setFocus = setFocus;
     });
     const onChange = (event: MouseEvent & {currentTarget: EventTarget & HTMLInputElement; }) => {
-        console.log("RadioComponent.onChange for box " + box.role + ", value:" + value);
+        // console.log("RadioComponent.onChange for box " + box.role + ", value:" + value);
         value = !value;
         box.setBoolean(!value);
         if (box.selectable) {
@@ -42,12 +42,12 @@
         event.stopPropagation();
     }
     const onClick = (event: MouseEvent & {currentTarget: EventTarget & HTMLInputElement; }) => {
-        console.log("RadioComponent.onChange for box " + box.role + ", value:" + value);
+        // console.log("RadioComponent.onChange for box " + box.role + ", value:" + value);
         event.stopPropagation();
     }
-    $: {
-        console.log("value bool is " + value + ", box.value is " + box.getBoolean());
-    }
+    // $: {
+    //     console.log("value bool is " + value + ", box.value is " + box.getBoolean());
+    // }
 </script>
 
 <span class="radio {cssClass}"

diff --git a/packages/core-svelte/src/lib/components/SwitchComponent.svelte b/packages/core-svelte/src/lib/components/SwitchComponent.svelte
@@ -44,9 +44,9 @@
         }
         event.stopPropagation();
     }
-    $: {
-        console.log("value bool is " + value + ", box.value is " + box.getBoolean());
-    }
+    // $: {
+    //     console.log("value bool is " + value + ", box.value is " + box.getBoolean());
+    // }
 </script>
 
 {#if design == 'inner'}

diff --git a/packages/meta/src/__tests__/editor-tests/checkEditUnitStructure.test.ts b/packages/meta/src/__tests__/editor-tests/checkEditUnitStructure.test.ts
@@ -196,8 +196,9 @@ describe("Checking FretEditUnit: ", () => {
             expect(myBoolProjection).not.toBeNull();
             expect(myBoolProjection).not.toBeUndefined();
             expect(myBoolProjection!.boolInfo).not.toBeUndefined();
-            expect(myBoolProjection!.boolInfo!.trueKeyword).toBe("xxxx");
-            expect(myBoolProjection!.boolInfo!.falseKeyword).toBeUndefined();
+            expect(myBoolProjection!.boolInfo!.keywords).not.toBeUndefined();
+            expect(myBoolProjection!.boolInfo!.keywords!.trueKeyword).toBe("xxxx");
+            expect(myBoolProjection!.boolInfo!.keywords!.falseKeyword).toBeUndefined();
         }
 
         // test the second boolean prop, with two keywords present
@@ -224,8 +225,9 @@ describe("Checking FretEditUnit: ", () => {
             expect(myBoolProjection).not.toBeUndefined();
             expect(myBoolProjection!.boolInfo).not.toBeNull();
             expect(myBoolProjection!.boolInfo).not.toBeUndefined();
-            expect(myBoolProjection!.boolInfo!.trueKeyword).toBe("aap");
-            expect(myBoolProjection!.boolInfo!.falseKeyword).toBe("noot");
+            expect(myBoolProjection!.boolInfo!.keywords).not.toBeUndefined();
+            expect(myBoolProjection!.boolInfo!.keywords!.trueKeyword).toBe("aap");
+            expect(myBoolProjection!.boolInfo!.keywords!.falseKeyword).toBe("noot");
         }
     });
 

diff --git a/packages/meta/src/editordef/generator/templates/ProjectionTemplate.ts b/packages/meta/src/editordef/generator/templates/ProjectionTemplate.ts
@@ -41,7 +41,6 @@ export class ProjectionTemplate {
     // The values for the boolean keywords are set on initialization (by a call to 'setStandardBooleanKeywords').
     private trueKeyword: string = "true";
     private falseKeyword: string = "false";
-    // @ts-ignore TODO remove
     private stdBoolDisplayType: string = "text";
     // The classes, functions, etc. to import are collected during the creation of the content for the generated file,
     // to avoid unused imports. All imports are stored in the following three variables.
@@ -598,7 +597,7 @@ export class ProjectionTemplate {
         }
     }
 
-    private listPrimitivePropertyProjection(property: FreMetaPrimitiveProperty, element: string, boolInfo?: BoolDisplayType | undefined, listInfo?: ListInfo | undefined): string {
+    private listPrimitivePropertyProjection(property: FreMetaPrimitiveProperty, element: string, boolInfo?: BoolDisplayType, listInfo?: ListInfo): string {
         let direction: string = "verticalList";
         if (!!listInfo && listInfo.direction === FreEditProjectionDirection.Horizontal) {
             direction = "horizontalList";

diff --git a/packages/meta/src/editordef/parser/FreEditCreators.ts b/packages/meta/src/editordef/parser/FreEditCreators.ts
@@ -366,7 +366,6 @@ export function createBooleanPropertyProjection(data: { expression: any, project
         result.location = data["location"];
         result.location.filename = currentFileName;
     }
-    console.log("Boolean property: " + result.toString())
     return result;
 }
 

diff --git a/packages/samples/DocuProject/src/defs/editor-main-default.edit b/packages/samples/DocuProject/src/defs/editor-main-default.edit
@@ -12,7 +12,13 @@ Product {[ ${self.product} ]}
 
 BaseProduct {[
     Base Products ${name} for ${theme}
-        may be used: ${self.isApprovedLevel3 checkbox}
+        is still under construction: ${self.isUnderConstruction switch}
+        is approved level1: ${self.isApprovedLevel1 radio [Sure | NoWay]}
+        is approved level2: ${self.isApprovedLevel2 inner-switch}
+        is approved level3: ${self.isApprovedLevel3 checkbox}
+        yields profit: ${self.yieldsProfit text [Plenty | Little]}
+
+
         ${parts}
 ]}
 

diff --git a/packages/samples/DocuProject/src/defs/editor-specials.edit b/packages/samples/DocuProject/src/defs/editor-specials.edit
@@ -2,12 +2,12 @@ editor specials
 
 BaseProduct {[
     /* In this projection 'self.parts' is always shown according to the projection */
-    /* defined for concept InsurancePart in the editor 'comments'.                 */
+    /* defined for concept InsurancePart in the editor 'specials'.                 */
     Base Products ${self.name} for ${self.theme}
         is still under construction: ${self.isUnderConstruction switch}
-        is approved level1: ${self.isApproved1 radio}
-        is approved level2: ${self.isApproved2 inner-switch}
-        is approved level3: ${self.isApproved3 checkbox}
+        is approved level1: ${self.isApprovedLevel1 radio}
+        is approved level2: ${self.isApprovedLevel2 inner-switch}
+        is approved level3: ${self.isApprovedLevel3 checkbox}
         yields profit: ${self.yieldsProfit}
         ${self.parts:comments}
 ]}