#68 editor supports formats, schema injection, editor supports ace

Author: miho

jackson/src/main/java/eu/mihosoft/vmf/jackson/VMFJsonSchemaGenerator.java

@@ -446,6 +446,8 @@ private void addDefaultValueAndDescriptionAndConstraintIfAvailable(Property prop
         addFormat(property, propertySchema);
         addUniqueItems(property, propertySchema);
         addInjections(property, propertySchema);
+        addTitle(property, propertySchema);
+        addPropertyOrder(property, propertySchema);
     }
 
     private void addDefaultValue(Property property, Map<String, Object> propertySchema) {
@@ -523,27 +525,31 @@ private void addConstraint(Property property, Map<String, Object> propertySchema
 
     private void addUniqueItems(Property property, Map<String, Object> propertySchema) {
         try {
-            var uniqueItems = property.annotationByKey("vmf:jackson:schema:uniqueItems").get().getValue();
-            if (uniqueItems != null) {
-                propertySchema.put("uniqueItems", Boolean.parseBoolean(uniqueItems));
+            var uniqueItemsOpt = property.annotationByKey("vmf:jackson:schema:uniqueItems");
+            if (uniqueItemsOpt.isPresent() && uniqueItemsOpt.get().getValue() != null) {
+                var uniqueItems = uniqueItemsOpt.get().getValue();
+                if (uniqueItems != null) {
+                    propertySchema.put("uniqueItems", Boolean.parseBoolean(uniqueItems));
+                }
             }
         } catch (Exception e) {
-            // ignore, not possible to get default value
+            throw new RuntimeException("Failed to parse uniqueItems", e);
         }
     }
 
     private void addInjections(Property property, Map<String, Object> propertySchema) {
         try {
-            var injections = property.annotationByKey("vmf:jackson:schema:inject").get().getValue();
-            if (injections != null) {
-                System.out.println("!!!injections: " + injections);
-                // inject json into schema by parsing it and adding it to the schema
-                var injectionsMap = new ObjectMapper().readValue("{"+injections+"}", Map.class);
-                propertySchema.putAll(injectionsMap);
+            var injectionsOpt = property.annotationByKey("vmf:jackson:schema:inject");
+            if (injectionsOpt.isPresent() && injectionsOpt.get().getValue() != null) {
+                var injections = injectionsOpt.get().getValue();
+                if (injections != null) {
+                    // inject json into schema by parsing it and adding it to the schema
+                    var injectionsMap = new ObjectMapper().readValue("{" + injections + "}", Map.class);
+                    propertySchema.putAll(injectionsMap);
+                }
             }
         } catch (Exception e) {
-            // ignore, not possible to get default value
-            e.printStackTrace();
+            throw new RuntimeException("Failed to parse injection JSON", e);
         }
     }
 
@@ -557,4 +563,30 @@ private void addFormat(Property property, Map<String, Object> propertySchema) {
             // ignore, not possible to get default value
         }
     }
+
+    private void addTitle(Property property, Map<String, Object> propertySchema) {
+        try {
+            var title = property.annotationByKey("vmf:jackson:schema:title").get().getValue();
+            if (title != null) {
+                propertySchema.put("title", title);
+            }
+        } catch (Exception e) {
+            // ignore, not possible to get default value
+        }
+    }
+
+    private void addPropertyOrder(Property property, Map<String, Object> propertySchema) {
+        // order is an integer value that specifies the order of the property in the schema
+        try {
+            var orderOpt = property.annotationByKey("vmf:jackson:schema:propertyOrder");
+            if (orderOpt.isPresent() && orderOpt.get().getValue() != null) {
+                var order = orderOpt.get().getValue();
+                if (order != null) {
+                    propertySchema.put("propertyOrder", Integer.parseInt(order));
+                }
+            }
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to parse property order", e);
+        }
+    }
 }

jackson/src/test/vmf/eu/mihosoft/vmf/jackson/test/type_formats01/vmfmodel/FormatModel01.java

@@ -27,6 +27,17 @@ interface Pet {
 
     @Annotation(key = "vmf:jackson:schema:inject", value = "\"title\": \"My Title\"")
     String getOtherProperty();
+
+    @Contains(opposite = "owner")
+    @Annotation(key= "vmf:jackson:schema:format", value = "table")
+    Prop[] getProperties();
+}
+
+interface Prop {
+    String getKey();
+    String getValue();
+    @Container(opposite = "properties")
+    Pet getOwner();
 }
 
 

vmfedit/build.gradle

@@ -105,7 +105,8 @@ task installJsonEditor(type: NpmTask) {
 
 task copyJsonEditorToResources(type: Copy) {
     from 'node_modules/@json-editor/json-editor/dist'
-    into 'src/main/resources/json-editor'
+//    into 'src/main/resources/json-editor'
+    into 'src/main/resources/eu/mihosoft/vmf/vmfedit/json-editor'
     include '**/*'
 }
 
@@ -150,6 +151,16 @@ task copyJSON5ToResources(type: Copy) {
     include '**/*'
 }
 
+task installACEEditor(type: NpmTask) {
+    args = ['install', '[email protected]']
+}
+
+task copyACEEditorToResources(type: Copy) {
+    from 'node_modules/ace-builds/src-min-noconflict'
+    into 'src/main/resources/eu/mihosoft/vmf/vmfedit/ace-builds'
+    include '**/*'
+}
+
 copyJsonEditorToResources.dependsOn installJsonEditor
 processResources.dependsOn copyJsonEditorToResources
 
@@ -165,6 +176,9 @@ processResources.dependsOn copyBootStrapToResources
 copySpectreToResources.dependsOn installSpectre
 processResources.dependsOn copySpectreToResources
 
+copyACEEditorToResources.dependsOn installACEEditor
+processResources.dependsOn copyACEEditorToResources
+
 
 
 jar {

vmfedit/src/main/java/eu/mihosoft/vmf/vmfedit/JsonEditorController.java

@@ -11,6 +11,7 @@
 import netscape.javascript.JSObject;
 
 import java.net.URL;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
@@ -28,6 +29,8 @@ public class JsonEditorController {
     /** The WebView component used to display the JSON editor */
     private final WebView webView;
 
+    private volatile boolean updatingValue = false;
+
     /** Property holding the current JSON schema */
     private final StringProperty schemaProperty = new SimpleStringProperty(
             "{\n" +
@@ -142,7 +145,12 @@ public MyEditorCallback(JsonEditorController control) {
         public void accept(String newValue) {
             new Thread(() -> {
                 Platform.runLater(() -> {
-                    control.valueProperty().set(newValue);
+                    control.updatingValue = true;
+                    try {
+                        control.valueProperty().set(newValue);
+                    } finally {
+                        control.updatingValue = false;
+                    }
                 });
             }).start();
         }
@@ -284,6 +292,11 @@ private void handleSchemaUpdate(String schema) {
      * Attempts to migrate an existing value to a new schema.
      */
     private void attemptValueMigration(String value) {
+
+        if(updatingValue) {
+            return;
+        }
+
         Thread.ofVirtual().start(() -> {
             for (int i = 0; i < 10; i++) {
                 if (trySetValue(value)) break;
@@ -300,6 +313,9 @@ private void attemptValueMigration(String value) {
      * Attempts to set a value in the editor with proper UI thread handling.
      */
     private boolean trySetValue(String value) {
+        if(updatingValue) {
+            return true;
+        }
         var future = new CompletableFuture<Boolean>();
         Platform.runLater(() -> {
             try {

vmfedit/src/main/resources/eu/mihosoft/vmf/vmfedit/json-editor.html

@@ -9,7 +9,8 @@
     <link rel="stylesheet" href="bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="fontawesome-free/css/all.min.css">
     <title>JSON Editor</title>
-    <script src="../../../../json-editor/jsoneditor.js"></script>
+    <script src="json-editor/jsoneditor.js"></script>
+    <script src="ace-builds/ace.js"></script>
     <style>
         body { margin: 0; padding: 0; }
         #editor_holder { width: 100%; height: 100vh; }
@@ -20,6 +21,9 @@
 <div id="editor_holder"></div>
 <script>
 
+    // Set ACE Editor basePath to path
+    window.ace.config.set("basePath", "ace-builds/");
+
     // At the top of your script section, before any other code
     const EditorCallbacks = {
         timestamp: new Date().toLocaleTimeString(),
@@ -55,6 +59,7 @@
     // };
 
     function initEditor(schema) {
+
         console.log("Initializing editor with schema:", schema);
         if (editor) {
             currentValue = editor.getValue();
@@ -100,6 +105,7 @@
 
     window.onload = function() {
         console.log("Window loaded");
+
         initEditor({});
     };