json-object-editor 0.10.642 → 0.10.653

package/js/JsonObjectEditor.jquery.craydent.js

@@ -5104,9 +5104,145 @@ this.renderHTMLContent = function(specs){
 		} else if (elem.msRequestFullscreen) { /* IE11 */
 			elem.msRequestFullscreen();
 		}
-    }
+    };
     encapsulateFieldType('code',self.renderCodeField,
     {fullscreen:this.fullScreenCodeEditor});
+
+/*----------------------------->
+ Q.1 | JSON Field
+ <-----------------------------*/
+    this.renderJsonField = function(prop){
+        /*|{
+            tags:'render,field,json',
+            specs:'value,standard_field_properties',
+            description:'JSON object editor using Ace in JSON mode; always pretty-prints on load/blur/save.'
+        }|*/
+        var height = (prop.height)?'style="height:'+prop.height+';"' : '';
+        var editor_id = cuid();
+        var rawValue = (typeof prop.value == "undefined") ? {} : prop.value;
+        var displayValue;
+        // Ensure we start from an object and pretty JSON string
+        if (typeof rawValue == "string") {
+            try{
+                rawValue = JSON.parse(rawValue);
+            }catch(e){
+                // fallback: leave as raw string, Ace/validation will handle parse errors on blur/save
+            }
+        }
+        if (rawValue === null || typeof rawValue == "undefined") {
+            rawValue = {};
+        }
+        if (typeof rawValue == "object") {
+            try{
+                displayValue = JSON.stringify(rawValue,null,2);
+            }catch(e){
+                displayValue = "{}";
+            }
+        }else{
+            // Non-object (number/boolean/etc.) – stringify as-is but still require valid JSON
+            try{
+                displayValue = JSON.stringify(rawValue,null,2);
+            }catch(e){
+                displayValue = "{}";
+            }
+        }
+        var html =
+            '<div class="clear joe-ace-holder joe-rendering-field joe-field" '
+            +height+' data-ace_id="'+editor_id+'" data-ftype="ace" name="'+prop.name+'">'+
+            '<textarea class="" id="'+editor_id+'" >'
+            +(displayValue || "{}")+
+            '</textarea>'+
+            '</div>'+
+        '<script>'+
+            'try{\
+                var editor = ace.edit("'+editor_id+'");\
+                editor.setTheme("ace/theme/tomorrow");\
+                editor.getSession().setUseWrapMode(true);\
+                editor.getSession().setMode("ace/mode/json");\
+                editor.setOptions({\
+                    enableBasicAutocompletion: true,\
+                    enableLiveAutocompletion: false\
+                });\
+                _joe.ace_editors["'+editor_id+'"] = editor;\
+            }catch(e){ console && console.warn && console.warn("ACE json init error",e);}'
+        +' </script>';
+        return html;
+    };
+    // Helper to (re)parse and pretty-print a json field from its Ace editor.
+    function _normalizeJsonField(fieldName,opts){
+        opts = opts || {};
+        var parent = getJoe(self.joe_index);
+        var $holder = parent.overlay.find('.joe-ace-holder[name="'+fieldName+'"]');
+        if(!$holder.length){ return { ok:true }; }
+        var editorId = $holder.data('ace_id');
+        var editor = _joe.ace_editors[editorId];
+        if(!editor){ return { ok:true }; }
+        var text = editor.getValue();
+        if(!text || !text.trim()){
+            // default to empty object
+            text = '{}';
+        }
+        try{
+            var parsed = JSON.parse(text);
+            // must be an object; if not, still allow but keep as-is
+            try{
+                var pretty = JSON.stringify(parsed,null,2);
+                editor.setValue(pretty,-1);
+            }catch(_e){}
+            $holder.removeClass('joe-field-error');
+            return { ok:true, parsed:parsed };
+        }catch(e){
+            // Attempt a light-weight "loose JSON" fix for common cases:
+            //  - Unquoted identifier keys: { name:"Corey" } -> { "name":"Corey" }
+            //  - Single-quoted strings: { "name":'Corey' } -> { "name":"Corey" }
+            //  - Trailing commas: { "a":1, } -> { "a":1 }
+            var fixed = text;
+            try{
+                // Quote bare identifier keys following { or , and before :
+                fixed = fixed.replace(/([{\[],\s*|[{]\s*|,\s*)([A-Za-z_][A-Za-z0-9_]*)\s*:/g,function(m,prefix,key){
+                    return prefix+'"'+key+'":';
+                });
+                // Convert single-quoted strings to double-quoted strings
+                fixed = fixed.replace(/'([^'\\]*(?:\\.[^'\\]*)*)'/g,'"$1"');
+                // Remove trailing commas before } or ]
+                fixed = fixed.replace(/,\s*([}\]])/g,'$1');
+
+                var reparsed = JSON.parse(fixed);
+                try{
+                    var prettyFixed = JSON.stringify(reparsed,null,2);
+                    editor.setValue(prettyFixed,-1);
+                }catch(_e2){}
+                $holder.removeClass('joe-field-error');
+                return { ok:true, parsed:reparsed };
+            }catch(_fixErr){
+                $holder.addClass('joe-field-error');
+                if(opts.showMessage && parent.showMessage){
+                    parent.showMessage("Field '"+fieldName+"' must be valid JSON (object).");
+                }
+                return { ok:false, error:e };
+            }
+        }
+    }
+    encapsulateFieldType('json',self.renderJsonField,{
+        ready:function(){
+            // Attach blur handlers to normalize/validate json fields when panel shows
+            var parent = getJoe(self.joe_index);
+            parent.overlay.find('.joe-ace-holder[name]').each(function(){
+                var name = $(this).attr('name');
+                var field = self.getField(name);
+                if(!field){ return true; }
+                var ftype = (self.propAsFuncOrValue(field.type)||'').toLowerCase();
+                if(ftype != 'json'){ return true; }
+                var editorId = $(this).data('ace_id');
+                var editor = _joe.ace_editors[editorId];
+                if(!editor){ return true; }
+                editor.on('blur',function(){
+                    _normalizeJsonField(name,{showMessage:false});
+                });
+            });
+        },
+        normalize:_normalizeJsonField
+    });
 /*----------------------------->
  Q.2 | QR Field
  <-----------------------------*/
@@ -7557,6 +7693,11 @@ Field Rendering Helpers
          //ready objectlist
          self.Fields.objectlist.ready();
 
+        //ready json (Ace-based) fields
+        if(self.Fields.json && self.Fields.json.ready){
+            self.Fields.json.ready();
+        }
+
 
         //sidebars
         if(self.current.sidebars){
@@ -7682,10 +7823,26 @@ Field Rendering Helpers
             var f,test_info;
             for(var c in changes){
                 f = self.getField(c);
-                
-
                 if(c[0] != '$' && c != 'joeUpdated' && f && f.type !='content' && !parseBoolean(f.passthrough)){
-                    if(JSON.stringify(_joe.current.object[c]) == JSON.stringify(cc_construct[c])){
+                    // Special handling for json fields: compare parsed objects so
+                    // whitespace/formatting-only changes are ignored.
+                    var ftype = (self.propAsFuncOrValue(f.type)||'').toLowerCase();
+                    if(ftype == 'json'){
+                        var orig = _joe.current.object[c];
+                        var rawNew = cc_construct[c];
+                        var sameJson = false;
+                        try{
+                            var parsedOrig = (typeof orig == "string") ? JSON.parse(orig) : orig;
+                            var parsedNew = (typeof rawNew == "string") ? JSON.parse(rawNew) : rawNew;
+                            sameJson = (JSON.stringify(parsedOrig) == JSON.stringify(parsedNew));
+                        }catch(_e){
+                            // parse failure means it is definitely a change that needs attention
+                            sameJson = false;
+                        }
+                        if(sameJson){
+                            continue;
+                        }
+                    }else if(JSON.stringify(_joe.current.object[c]) == JSON.stringify(cc_construct[c])){
                         continue;
                     }
                     if(['qrcode'].indexOf(f.type) != -1){
@@ -7988,6 +8145,27 @@ Field Rendering Helpers
 		}
 		var callback = callback || self.current.callback || (self.current.schema && self.current.schema.callback) || defaultCallback; //logit;
 		var newObj = self.constructObjectFromFields(self.joe_index);
+		// Normalize json fields: parse to objects and block save on invalid JSON.
+        if(_joe && _joe.current && _joe.current.fields){
+            var jsonField, ftype, normResult;
+            for(var i=0, tot=_joe.current.fields.length; i<tot; i++){
+                jsonField = _joe.current.fields[i];
+                ftype = (self.propAsFuncOrValue(jsonField.type)||'').toLowerCase();
+                if(ftype != 'json'){ continue; }
+                // Ensure editor content is normalized and valid
+                normResult = self.Fields.json && self.Fields.json.normalize
+                    ? self.Fields.json.normalize(jsonField.name,{showMessage:true})
+                    : { ok:true };
+                if(!normResult.ok){
+                    // invalid JSON – do not proceed with save
+                    return false;
+                }
+                // Use parsed object if available; default to {} when missing
+                var parsed = (normResult.parsed || (newObj[jsonField.name] && typeof newObj[jsonField.name] == "object"
+                    ? newObj[jsonField.name] : {}));
+                newObj[jsonField.name] = parsed;
+            }
+        }
 		newObj.joeUpdated = new Date();
         overwrites = overwrites || {};
 		var obj = $.extend(newObj,overwrites);
@@ -10679,7 +10857,9 @@ logit(intent)
 /*-------------------------------------------------------------------->
      //Colors
 <--------------------------------------------------------------------*/
-    this.Colors={}
+    this.Colors={
+        "ai":"#0D9488"
+    }
     this.Colors.priority = {
         1:'#cc4500',
         2:'#FFee33',

package/js/joe-ai.js

@@ -1675,6 +1675,63 @@
       }
     };
 
+    /**
+     * Run the Thought agent for the current schema object.
+     * Used by the core `proposeThought` field.
+     */
+    Ai.runProposeThought = function(scopeId, textareaId, model){
+      try{
+        if (!scopeId) {
+          alert('Save the item before proposing thoughts.');
+          return;
+        }
+        var ta = document.getElementById(textareaId);
+        if (!ta) {
+          alert('Prompt field not found.');
+          return;
+        }
+        var prompt = (ta.value || '').trim();
+        if (!prompt) {
+          alert('Please enter a prompt for the Thought run.');
+          return;
+        }
+        var params = {
+          agent_id: 'thought_agent_default',
+          scope_id: scopeId,
+          user_input: prompt
+        };
+        if (model) {
+          params.model = model;
+        }
+        var body = {
+          jsonrpc: '2.0',
+          id: String(Date.now()),
+          method: 'runThoughtAgent',
+          params: params
+        };
+        fetch('/mcp', {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify(body)
+        }).then(function(res){
+          return res.json();
+        }).then(function(payload){
+          var result = (payload && (payload.result || payload)) || {};
+          var count = result.proposed_thoughts_count || 0;
+          if (window._joe && _joe.toast) {
+            _joe.toast('Thought agent run complete. Proposed ' + count + ' thoughts.');
+          } else {
+            alert('Thought agent run complete. Proposed ' + count + ' thoughts.');
+          }
+        }).catch(function(err){
+          console.error('Ai.runProposeThought error', err);
+          alert('Failed to run Thought agent: ' + (err && err.message || err));
+        });
+      }catch(e){
+        console.error('Ai.runProposeThought error', e);
+      }
+    };
+
     Ai.applyAutofillPatch = function(patch = {}){
       Object.keys(patch).forEach(function(fname){
         try {

package/js/joe.js

@@ -1,6 +1,6 @@
 /* --------------------------------------------------------
  *
- *  json-object-editor - v0.10.636
+ *  json-object-editor - v0.10.653
  *  Created by: Corey Hadden
  *
  * -------------------------------------------------------- */
@@ -5110,9 +5110,145 @@ this.renderHTMLContent = function(specs){
 		} else if (elem.msRequestFullscreen) { /* IE11 */
 			elem.msRequestFullscreen();
 		}
-    }
+    };
     encapsulateFieldType('code',self.renderCodeField,
     {fullscreen:this.fullScreenCodeEditor});
+
+/*----------------------------->
+ Q.1 | JSON Field
+ <-----------------------------*/
+    this.renderJsonField = function(prop){
+        /*|{
+            tags:'render,field,json',
+            specs:'value,standard_field_properties',
+            description:'JSON object editor using Ace in JSON mode; always pretty-prints on load/blur/save.'
+        }|*/
+        var height = (prop.height)?'style="height:'+prop.height+';"' : '';
+        var editor_id = cuid();
+        var rawValue = (typeof prop.value == "undefined") ? {} : prop.value;
+        var displayValue;
+        // Ensure we start from an object and pretty JSON string
+        if (typeof rawValue == "string") {
+            try{
+                rawValue = JSON.parse(rawValue);
+            }catch(e){
+                // fallback: leave as raw string, Ace/validation will handle parse errors on blur/save
+            }
+        }
+        if (rawValue === null || typeof rawValue == "undefined") {
+            rawValue = {};
+        }
+        if (typeof rawValue == "object") {
+            try{
+                displayValue = JSON.stringify(rawValue,null,2);
+            }catch(e){
+                displayValue = "{}";
+            }
+        }else{
+            // Non-object (number/boolean/etc.) – stringify as-is but still require valid JSON
+            try{
+                displayValue = JSON.stringify(rawValue,null,2);
+            }catch(e){
+                displayValue = "{}";
+            }
+        }
+        var html =
+            '<div class="clear joe-ace-holder joe-rendering-field joe-field" '
+            +height+' data-ace_id="'+editor_id+'" data-ftype="ace" name="'+prop.name+'">'+
+            '<textarea class="" id="'+editor_id+'" >'
+            +(displayValue || "{}")+
+            '</textarea>'+
+            '</div>'+
+        '<script>'+
+            'try{\
+                var editor = ace.edit("'+editor_id+'");\
+                editor.setTheme("ace/theme/tomorrow");\
+                editor.getSession().setUseWrapMode(true);\
+                editor.getSession().setMode("ace/mode/json");\
+                editor.setOptions({\
+                    enableBasicAutocompletion: true,\
+                    enableLiveAutocompletion: false\
+                });\
+                _joe.ace_editors["'+editor_id+'"] = editor;\
+            }catch(e){ console && console.warn && console.warn("ACE json init error",e);}'
+        +' </script>';
+        return html;
+    };
+    // Helper to (re)parse and pretty-print a json field from its Ace editor.
+    function _normalizeJsonField(fieldName,opts){
+        opts = opts || {};
+        var parent = getJoe(self.joe_index);
+        var $holder = parent.overlay.find('.joe-ace-holder[name="'+fieldName+'"]');
+        if(!$holder.length){ return { ok:true }; }
+        var editorId = $holder.data('ace_id');
+        var editor = _joe.ace_editors[editorId];
+        if(!editor){ return { ok:true }; }
+        var text = editor.getValue();
+        if(!text || !text.trim()){
+            // default to empty object
+            text = '{}';
+        }
+        try{
+            var parsed = JSON.parse(text);
+            // must be an object; if not, still allow but keep as-is
+            try{
+                var pretty = JSON.stringify(parsed,null,2);
+                editor.setValue(pretty,-1);
+            }catch(_e){}
+            $holder.removeClass('joe-field-error');
+            return { ok:true, parsed:parsed };
+        }catch(e){
+            // Attempt a light-weight "loose JSON" fix for common cases:
+            //  - Unquoted identifier keys: { name:"Corey" } -> { "name":"Corey" }
+            //  - Single-quoted strings: { "name":'Corey' } -> { "name":"Corey" }
+            //  - Trailing commas: { "a":1, } -> { "a":1 }
+            var fixed = text;
+            try{
+                // Quote bare identifier keys following { or , and before :
+                fixed = fixed.replace(/([{\[],\s*|[{]\s*|,\s*)([A-Za-z_][A-Za-z0-9_]*)\s*:/g,function(m,prefix,key){
+                    return prefix+'"'+key+'":';
+                });
+                // Convert single-quoted strings to double-quoted strings
+                fixed = fixed.replace(/'([^'\\]*(?:\\.[^'\\]*)*)'/g,'"$1"');
+                // Remove trailing commas before } or ]
+                fixed = fixed.replace(/,\s*([}\]])/g,'$1');
+
+                var reparsed = JSON.parse(fixed);
+                try{
+                    var prettyFixed = JSON.stringify(reparsed,null,2);
+                    editor.setValue(prettyFixed,-1);
+                }catch(_e2){}
+                $holder.removeClass('joe-field-error');
+                return { ok:true, parsed:reparsed };
+            }catch(_fixErr){
+                $holder.addClass('joe-field-error');
+                if(opts.showMessage && parent.showMessage){
+                    parent.showMessage("Field '"+fieldName+"' must be valid JSON (object).");
+                }
+                return { ok:false, error:e };
+            }
+        }
+    }
+    encapsulateFieldType('json',self.renderJsonField,{
+        ready:function(){
+            // Attach blur handlers to normalize/validate json fields when panel shows
+            var parent = getJoe(self.joe_index);
+            parent.overlay.find('.joe-ace-holder[name]').each(function(){
+                var name = $(this).attr('name');
+                var field = self.getField(name);
+                if(!field){ return true; }
+                var ftype = (self.propAsFuncOrValue(field.type)||'').toLowerCase();
+                if(ftype != 'json'){ return true; }
+                var editorId = $(this).data('ace_id');
+                var editor = _joe.ace_editors[editorId];
+                if(!editor){ return true; }
+                editor.on('blur',function(){
+                    _normalizeJsonField(name,{showMessage:false});
+                });
+            });
+        },
+        normalize:_normalizeJsonField
+    });
 /*----------------------------->
  Q.2 | QR Field
  <-----------------------------*/
@@ -7563,6 +7699,11 @@ Field Rendering Helpers
          //ready objectlist
          self.Fields.objectlist.ready();
 
+        //ready json (Ace-based) fields
+        if(self.Fields.json && self.Fields.json.ready){
+            self.Fields.json.ready();
+        }
+
 
         //sidebars
         if(self.current.sidebars){
@@ -7688,10 +7829,26 @@ Field Rendering Helpers
             var f,test_info;
             for(var c in changes){
                 f = self.getField(c);
-                
-
                 if(c[0] != '$' && c != 'joeUpdated' && f && f.type !='content' && !parseBoolean(f.passthrough)){
-                    if(JSON.stringify(_joe.current.object[c]) == JSON.stringify(cc_construct[c])){
+                    // Special handling for json fields: compare parsed objects so
+                    // whitespace/formatting-only changes are ignored.
+                    var ftype = (self.propAsFuncOrValue(f.type)||'').toLowerCase();
+                    if(ftype == 'json'){
+                        var orig = _joe.current.object[c];
+                        var rawNew = cc_construct[c];
+                        var sameJson = false;
+                        try{
+                            var parsedOrig = (typeof orig == "string") ? JSON.parse(orig) : orig;
+                            var parsedNew = (typeof rawNew == "string") ? JSON.parse(rawNew) : rawNew;
+                            sameJson = (JSON.stringify(parsedOrig) == JSON.stringify(parsedNew));
+                        }catch(_e){
+                            // parse failure means it is definitely a change that needs attention
+                            sameJson = false;
+                        }
+                        if(sameJson){
+                            continue;
+                        }
+                    }else if(JSON.stringify(_joe.current.object[c]) == JSON.stringify(cc_construct[c])){
                         continue;
                     }
                     if(['qrcode'].indexOf(f.type) != -1){
@@ -7994,6 +8151,27 @@ Field Rendering Helpers
 		}
 		var callback = callback || self.current.callback || (self.current.schema && self.current.schema.callback) || defaultCallback; //logit;
 		var newObj = self.constructObjectFromFields(self.joe_index);
+		// Normalize json fields: parse to objects and block save on invalid JSON.
+        if(_joe && _joe.current && _joe.current.fields){
+            var jsonField, ftype, normResult;
+            for(var i=0, tot=_joe.current.fields.length; i<tot; i++){
+                jsonField = _joe.current.fields[i];
+                ftype = (self.propAsFuncOrValue(jsonField.type)||'').toLowerCase();
+                if(ftype != 'json'){ continue; }
+                // Ensure editor content is normalized and valid
+                normResult = self.Fields.json && self.Fields.json.normalize
+                    ? self.Fields.json.normalize(jsonField.name,{showMessage:true})
+                    : { ok:true };
+                if(!normResult.ok){
+                    // invalid JSON – do not proceed with save
+                    return false;
+                }
+                // Use parsed object if available; default to {} when missing
+                var parsed = (normResult.parsed || (newObj[jsonField.name] && typeof newObj[jsonField.name] == "object"
+                    ? newObj[jsonField.name] : {}));
+                newObj[jsonField.name] = parsed;
+            }
+        }
 		newObj.joeUpdated = new Date();
         overwrites = overwrites || {};
 		var obj = $.extend(newObj,overwrites);
@@ -10685,7 +10863,9 @@ logit(intent)
 /*-------------------------------------------------------------------->
      //Colors
 <--------------------------------------------------------------------*/
-    this.Colors={}
+    this.Colors={
+        "ai":"#0D9488"
+    }
     this.Colors.priority = {
         1:'#cc4500',
         2:'#FFee33',