json-object-editor 0.10.633 → 0.10.636

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-object-editor",
-  "version": "0.10.633",
+  "version": "0.10.636",
   "description": "JOE the Json Object Editor | Platform Edition",
   "main": "app.js",
   "scripts": {

package/server/plugins/chatgpt.js

@@ -580,16 +580,21 @@ function shrinkUnderstandObjectMessagesForTokens(messages) {
     }
 
     // Normalize model output that should contain JSON. Models often wrap JSON
-    // in markdown fences (```json ... ```); this helper strips fences and
-    // attempts to isolate the first well-formed JSON object substring.
+    // in markdown fences (```json ... ```), and may prepend/append prose. This
+    // helper strips fences and tries to isolate the first well-formed JSON
+    // object/array substring so JSON.parse has the best chance of succeeding.
     function extractJsonText(raw) {
         if (!raw) { return ''; }
         let t = String(raw).trim();
-        // Strip leading ```... fence
-        if (t.startsWith('```')) {
-            const firstNewline = t.indexOf('\n');
+        // If there is any ```...``` fenced block, prefer its contents.
+        const fenceIdx = t.indexOf('```json') !== -1 ? t.indexOf('```json') : t.indexOf('```');
+        if (fenceIdx !== -1) {
+            let start = fenceIdx;
+            const firstNewline = t.indexOf('\n', start);
             if (firstNewline !== -1) {
                 t = t.substring(firstNewline + 1);
+            } else {
+                t = t.substring(start + 3);
             }
             const lastFence = t.lastIndexOf('```');
             if (lastFence !== -1) {
@@ -597,12 +602,17 @@ function shrinkUnderstandObjectMessagesForTokens(messages) {
             }
             t = t.trim();
         }
-        // If there's extra prose around the JSON, slice from first { to last }
-        if (t[0] !== '{') {
+        // If there's extra prose around the JSON, slice from first {/[ to last }/]
+        if (t[0] !== '{' && t[0] !== '[') {
             const firstBrace = t.indexOf('{');
-            const lastBrace = t.lastIndexOf('}');
-            if (firstBrace !== -1 && lastBrace !== -1 && lastBrace > firstBrace) {
-                t = t.slice(firstBrace, lastBrace + 1);
+            const firstBracket = t.indexOf('[');
+            let first = -1;
+            if (firstBrace === -1) { first = firstBracket; }
+            else if (firstBracket === -1) { first = firstBrace; }
+            else { first = Math.min(firstBrace, firstBracket); }
+            const lastBrace = Math.max(t.lastIndexOf('}'), t.lastIndexOf(']'));
+            if (first !== -1 && lastBrace !== -1 && lastBrace > first) {
+                t = t.slice(first, lastBrace + 1);
             }
         }
         return t.trim();
@@ -656,7 +666,7 @@ function shrinkUnderstandObjectMessagesForTokens(messages) {
             }, null, '  ');
 
             const openai = newClient();
-            const model = body.model || 'gpt-4o-mini';
+            const model = body.model || 'gpt-4o-mini';////'gpt-5-nano';
 
             // For simplicity and robustness, use plain text output and instruct the
             // model to return a strict JSON object. We previously attempted the
@@ -667,6 +677,14 @@ function shrinkUnderstandObjectMessagesForTokens(messages) {
                 instructions: systemText,
                 input: userInput
             };
+            // Optional web_search tool: if the caller sets allow_web truthy, expose
+            // the built-in web_search capability and let the model decide when to
+            // call it.
+            if (body.allow_web) {
+                coloredLog("allowing web search");
+                requestBase.tools = [{ type: 'web_search' }];
+                requestBase.tool_choice = 'auto';
+            }
 
             let response;
             if (assistantId) {
@@ -706,6 +724,13 @@ function shrinkUnderstandObjectMessagesForTokens(messages) {
                     filteredPatch[f] = patch[f];
                 }
             });
+            // If we got no fields back on the first attempt, retry once before
+            // giving up. Avoid infinite loops by marking a retry flag.
+            if (!Object.keys(filteredPatch).length && !body._retry) {
+                coloredLog('[autofill] empty patch, retrying once');
+                const retryBody = Object.assign({}, body, { _retry: true });
+                return await self.autofill(retryBody, req, res);
+            }
 
             // Optional save
             let savedItem = null;

package/server/schemas/form.js

@@ -25,7 +25,7 @@ var form ={
         {section_start:'Content'},
             {name:'sections',type:'objectList',properties:['name','id'],comment:'name will be displayed, id is for css and js'},
         // {name:'questions',type:'objectReference',values:'question'},
-            {name:'questions',type:'buckets',values:'question',
+            {name:'questions',type:'buckets',values:'question',reloadable:true,
             comment:'Drag questions to the section of the form they belong in. <joe-button onclick="_joe.Fields.rerender(\'questions\');" class="joe-reload-button joe-button joe-iconed-button">reload form sections</joe-button>',
             bucketCount:function(item){
                 return (item.sections && item.sections.length) || 1;
@@ -37,12 +37,15 @@ var form ={
                 })
                 return names;
             },
-            template:'<joe-subtext>${question_type}</joe-subtext><joe-title>${name}</joe-title><joe-subtitle>${fieldname}</joe-subtitle>'
-        
+            template:function(f,q){
+                return `<joe-subtext>${q.question_type}</joe-subtext>
+                <joe-title>${q.name}</joe-title>
+                <joe-subtitle>${q.title || ''}</joe-subtitle>
+                    <joe-subtitle>${q.fieldname||''}</joe-subtitle>`;
+                }
             },
         {section_end:'Content'},
-        {section_start:'Submission'},
-            {label:'Submit Action'},
+        {section_start:'Functions',collapsed:true},
 
             {label:'On Client'},
             {name:'validate',type:'code',language:'javascript',
@@ -53,7 +56,7 @@ var form ={
             {label:'On Server'},
             {name:'server_action',type:'code',language:'javascript',
                 comment:'function called on server, function(submission,form_info,request)'},
-        {section_end:'Submission'},
+        {section_end:'Functions'},
         {sidebar_start:'right'},
         'updated',
             {section_start:'Preview'},
@@ -71,7 +74,7 @@ var form ={
             },
             {section_end:'Preview'},
             {section_start:'Adv'},
-                'form_button_label',
+                {name:'form_button_label',display:'form button label',type:'text',comment:'label for the form submit button'},
                 {name:'hostname',comment:'joe hostname'},
                 {name:'save_submission', type:'boolean', display:'save submission',comment:"use standard submission object"},
                 {name:'upsert_submission', type:'boolean', display:'upsert submission',

package/server/schemas/question.js

@@ -1,6 +1,23 @@
 var question ={
     title: 'Q | ${name}',
     info:"The question panel is where you can manage the questions used to build a form.",
+    subsets:function(){
+        return [{name:'Required',filter:{required:true},stripeColor:'#ff9999'}
+
+        ].concat(_joe.Filter.Options.getDatasetPropertyValues(
+            'question',
+            'question_type',
+            { group: 'fieldtype', collapsed: false } // optional grouping
+        ));
+    },
+    stripeColor:function(item){
+        if(item.required){
+            return {
+                title:'Required',
+                color:'#ff9999'
+            };
+        }
+    },
     filters:function(item){
         return _joe.Filter.Options.tags({group:true,untagged:true,collapsed:true});
     },
@@ -20,12 +37,12 @@ var question ={
                 return (['multiple','select'].indexOf(item.question_type) == -1);
             }
         },
-        {name:'option_template',width:'33%',
+        {name:'option_template',width:'33%',display:'option template',comment:'template for each option, use ${property} to display the property value.',
             hidden:function(item){
                 return (['multiple','select'].indexOf(item.question_type) == -1);
             }
         },
-        {name:'value_template',width:'33%',
+        {name:'value_template',width:'33%',display:'value template',comment:'defaults to _id',
             hidden:function(item){
                 return (['multiple','select'].indexOf(item.question_type) == -1);
             }