json-object-editor 0.10.509 → 0.10.521

package/server/modules/Schemas.js

@@ -1,112 +1,322 @@
-var fs = require('fs');
-var serverPath = '../';
-function Schemas(){
-    var self = this;
-    this.schema = {};
-    this.schemaList =[];
-    this.raw_schemas = {};
-    this.updateDelay = 1200;
-    //this.core = {};
-    var internalSchemasDir = __dirname+'/../schemas';
-    //console.log('internal schema dir = '+internalSchemasDir);
-    JOE.schemaDir = schemaDir = JOE.appDir+'/'+JOE.webconfig.schemaDir+'/';
-
-    this.load = function(s){
-
-        //console.log('[schema] loading '+s);
-        var schema,raw_schema;
-        if(s.indexOf('.js') == -1){s+= '.js';}
-        try{
-            var schemapath = JOE.schemaDir + s;
-            fs.accessSync(schemapath, fs.F_OK);
-                
-        }catch(e){
-            var schemapath = serverPath+'schemas/' + s;
-        }
-        try{
-            try{
-                delete require.cache[require.resolve(schemapath)];
-            }catch(e){
-                console.log('[schema][error] '+s+' not deleted');
-            }
-            schema = require(schemapath);
-            
-        }catch(e){
-            schema = {error:'schema '+s+' not found'};
-            console.log(e,schema);
-        }
-
-        /*raw_schema = self.raw_schemas[s.replace('.js','')] = $c.merge({},schema);
-        if(raw_schema.events){
-            raw_schema.events = $c.merge({},raw_schema.events);
-        }*/
-        raw_schema = self.raw_schemas[s.replace('.js','')] = schema.duplicate(true);
-        JOE.Utils.stringFunctions(schema);
-        let schemaname = s.replace('.js','')
-        self.schema[schemaname] = schema;
-        self.schemaList.push(schemaname);
-        return schema;
-    }
-    this.updateTimeout;
-    this.update = function(doItNow){
-        if(doItNow){
-            var lBM = new Benchmarker();
-            var schema_to_load = [];
-            //go through all the server files, then the schemadir files\
-            schema_to_load = schema_to_load.concat(fs.readdirSync(internalSchemasDir));
-            //schema_to_load = schema_to_load.concat(fs.readdirSync('server/schemas'));
-            schema_to_load = schema_to_load.concat(fs.readdirSync(JOE.schemaDir));
-            schema_to_load.map(function(sc){
-                self.load(sc);
-            })
-            logit(JOE.Utils.color('[schema] ','module')+schema_to_load.length+' updated in '+lBM.stop()+' secs'); 
-        }else{
-            clearTimeout(self.updateTimeout);
-            self.updateTimeout = setTimeout(self.update,self.updateDelay,true);
-            //logit(JOE.Utils.color('[schema] ','module')+'updating in '+ this.updateDelay/1000); 
-
-        }
-    }
-    JOE.Utils.setupFileFolder(schemaDir,'schemas',self.update);
-    fs.watch(internalSchemasDir,function(){
-            self.update();
-    });
-
-    this.events = function(item,events,specs){
-        try{
-            var specs = specs || {};
-            var schemaprop = specs.schemaprop || "itemtype";
-            var schemaname = item[schemaprop];
-            var schema_def = self.raw_schemas[schemaname];
-            
-            if(schema_def){
-                
-                if(typeof events == "string"){
-                    events = events.split(',');
-                }
-                events.map(function(event){
-                    if(schema_def.events && schema_def.events[event]){
-                        if(typeof schema_def.events[event] == "function"){
-                            try{
-                               
-                                schema_def.events[event](item,specs);
-                                logit('[event] '+schemaname+' > '+event);
-                            }catch(e){
-                                console.log(JOE.Utils.color('[schema]event error: ','error')+event+':'+e);
-                            }
-                        }else{
-                            logit('no event'+event+' for '+schemaname );
-                        }
-                    }
-                })
-            }else{
-                logit('schema "'+schemaname+'" not found');
-            }
-        }catch(e){
-            console.log(JOE.Utils.color('[schema] hook error: ','error')+events+':'+e);
-        }
-    }
-    this.update();
-    return self;
-}
+var fs = require('fs');
+var serverPath = '../';
+function Schemas(){
+    var self = this;
+    this.schema = {};
+    this.schemaList =[];
+    this.raw_schemas = {};
+    this.summary = {};
+    this.summaryGeneratedAt = null;
+    this.updateDelay = 1200;
+    //this.core = {};
+    var internalSchemasDir = __dirname+'/../schemas';
+    //console.log('internal schema dir = '+internalSchemasDir);
+    JOE.schemaDir = schemaDir = JOE.appDir+'/'+JOE.webconfig.schemaDir+'/';
+
+    this.load = function(s){
+
+        //console.log('[schema] loading '+s);
+        var schema,raw_schema;
+        var origin = 'instance';
+        if(s.indexOf('.js') == -1){s+= '.js';}
+        try{
+            var schemapath = JOE.schemaDir + s;
+            fs.accessSync(schemapath, fs.F_OK);
+                
+        }catch(e){
+            var schemapath = serverPath+'schemas/' + s;
+            origin = 'core';
+        }
+        try{
+            try{
+                delete require.cache[require.resolve(schemapath)];
+            }catch(e){
+                console.log('[schema][error] '+s+' not deleted');
+            }
+            schema = require(schemapath);
+            try { schema.__origin = origin; } catch(_e) {}
+            
+        }catch(e){
+            schema = {error:'schema '+s+' not found'};
+            console.log(e,schema);
+        }
+
+        /*raw_schema = self.raw_schemas[s.replace('.js','')] = $c.merge({},schema);
+        if(raw_schema.events){
+            raw_schema.events = $c.merge({},raw_schema.events);
+        }*/
+        raw_schema = self.raw_schemas[s.replace('.js','')] = schema.duplicate(true);
+        JOE.Utils.stringFunctions(schema);
+        let schemaname = s.replace('.js','')
+        self.schema[schemaname] = schema;
+        self.schemaList.push(schemaname);
+        return schema;
+    }
+    this.updateTimeout;
+    // Build normalized schema summaries for agents and tooling
+    this.buildSummary = function(){
+        try{
+            var summaries = {};
+            var MAX_META_LEN = 160;
+            function truncMeta(v){
+                if (typeof v !== 'string') return v;
+                return (v.length > MAX_META_LEN) ? (v.slice(0, MAX_META_LEN-1) + '…') : v;
+            }
+            // First pass: collect outbound relationships and field basics
+            Object.keys(self.schema||{}).forEach(function(name){
+                var def = self.schema[name] || {};
+                var fieldDefs = [];
+                var outbound = [];
+                var searchable = Array.isArray(def.searchables) ? def.searchables.slice() : [];
+                var allowedSorts = [];
+                var defaultSort = null;
+
+                // Sorters
+                if (Array.isArray(def.sorter)){
+                    def.sorter.forEach(function(s){
+                        var fieldName = null, dir = 'asc';
+                        if (typeof s === 'string'){
+                            fieldName = s.replace(/^!/, function(){ dir='desc'; return ''; });
+                        } else if (s && typeof s === 'object' && typeof s.field === 'string'){
+                            fieldName = s.field.replace(/^!/, function(){ dir='desc'; return ''; });
+                        }
+                        if (fieldName){
+                            allowedSorts.push(fieldName);
+                            if (!defaultSort) { defaultSort = { field: fieldName, dir: dir }; }
+                        }
+                    });
+                }
+                if (!defaultSort){ defaultSort = { field: 'joeUpdated', dir: 'desc' }; }
+
+                // Fields (robust extraction)
+                var rawFields = [];
+                try{
+                    if (Array.isArray(def.fields)) { rawFields = def.fields; }
+                    else if (typeof def.fields === 'function') { rawFields = def.fields.call(def) || []; }
+                }catch(_e){ rawFields = []; }
+
+                function inferRef(fieldObj){
+                    var tSchema = null, isRef = false, isArr = false;
+                    var t = fieldObj.type || 'unknown';
+                    if (t === 'objectList' || t === 'array') { isArr = true; }
+                    if (t === 'select'){
+                        if (typeof fieldObj.schema === 'string'){ isRef = true; tSchema = fieldObj.schema; }
+                        else if (typeof fieldObj.values === 'string'){ isRef = true; tSchema = fieldObj.values; }
+                        else if (typeof fieldObj.goto === 'string'){ isRef = true; tSchema = fieldObj.goto; }
+                    }
+                    // Heuristics by name
+                    var n = fieldObj.name || '';
+                    if (!isRef && typeof n === 'string'){
+                        if (n === 'status'){ isRef = true; tSchema = 'status'; }
+                        else if (n === 'project'){ isRef = true; tSchema = 'project'; }
+                        else if (n === 'assignee'){ isRef = true; tSchema = 'user'; }
+                        else if (n === 'members'){ isRef = true; tSchema = 'user'; isArr = true; }
+                        else if (n === 'tags'){ isRef = true; tSchema = 'tag'; isArr = true; }
+                        else if (/_id$/.test(n)){ isRef = true; tSchema = n.replace(/_id$/, ''); }
+                        else if (/Id$/.test(n)){ isRef = true; tSchema = n.replace(/Id$/, ''); }
+                    }
+                    return { isReference: !!isRef, targetSchema: tSchema, isArray: !!isArr };
+                }
+
+                function pushFieldEntry(entry){
+                    if (!entry) return;
+                    if (typeof entry === 'string'){
+                        // string shorthand
+                        var refGuess = inferRef({ name: entry, type: 'string' });
+                        fieldDefs.push({ name: entry, type: 'string', isArray: false, isReference: refGuess.isReference, targetSchema: refGuess.targetSchema });
+                        if (refGuess.isReference && refGuess.targetSchema){ outbound.push({ field: entry, targetSchema: refGuess.targetSchema }); }
+                        return;
+                    }
+                    if (typeof entry === 'object'){
+                        // skip layout markers
+                        if (entry.section_start || entry.section_end || entry.sidebar_start || entry.sidebar_end) { return; }
+                        // Treat extend as a real field mapped to core definition with specs overlay
+                        if (entry.extend){
+                            try{
+                                var fname = entry.extend;
+                                var coreDef = (JOE && JOE.Fields && (JOE.Fields.core || JOE.Fields.fields) && (JOE.Fields.core[fname] || JOE.Fields.fields[fname])) || null;
+                                var inferredType = (entry.specs && entry.specs.type) || (coreDef && coreDef.type) || 'string';
+                                var ref2 = inferRef({ name: fname, type: inferredType });
+                                var fobjE = { name: fname, type: inferredType, isArray: !!(coreDef && coreDef.isArray) || (inferredType==='objectList'), isReference: ref2.isReference, targetSchema: ref2.targetSchema };
+                                if (entry.specs && entry.specs.display) { fobjE.display = entry.specs.display; }
+                                else if (coreDef && coreDef.display) { fobjE.display = coreDef.display; }
+                                if (entry.specs && entry.specs.comment) { fobjE.comment = truncMeta(entry.specs.comment); }
+                                else if (coreDef && coreDef.comment) { fobjE.comment = truncMeta(coreDef.comment); }
+                                if (entry.specs && entry.specs.tooltip) { fobjE.tooltip = truncMeta(entry.specs.tooltip); }
+                                else if (coreDef && coreDef.tooltip) { fobjE.tooltip = truncMeta(coreDef.tooltip); }
+                                fieldDefs.push(fobjE);
+                                if (ref2.isReference && ref2.targetSchema){ outbound.push({ field: fname, targetSchema: ref2.targetSchema, cardinality: (fobjE.isArray ? 'many' : 'one') }); }
+                                return;
+                            }catch(_e){ /* fall through */ }
+                        }
+                        if (entry.name){
+                            var t = entry.type || 'unknown';
+                            var ref = inferRef(entry);
+                            var fobj = { name: entry.name, type: t, isArray: !!ref.isArray || t === 'objectList', isReference: ref.isReference, targetSchema: ref.targetSchema };
+                            if (entry.display) { fobj.display = entry.display; }
+                            if (entry.comment) { fobj.comment = truncMeta(entry.comment); }
+                            if (entry.tooltip) { fobj.tooltip = truncMeta(entry.tooltip); }
+                            fieldDefs.push(fobj);
+                            if (ref.isReference && ref.targetSchema){ outbound.push({ field: entry.name, targetSchema: ref.targetSchema, cardinality: (ref.isArray || t === 'objectList') ? 'many' : 'one' }); }
+                        }
+                        // If objectList has properties, we don't descend (embedded), keep top-level only
+                    }
+                }
+
+                rawFields.forEach(pushFieldEntry);
+                // Ensure core timestamps/ids appear even if not declared explicitly
+                ['_id','itemtype','joeUpdated','created'].forEach(function(coreName){
+                    if (!fieldDefs.some(function(fd){ return fd.name === coreName; })){
+                        fieldDefs.push({ name: coreName, type: coreName === '_id' ? 'string' : (coreName==='joeUpdated'||coreName==='created'?'date-time':'string') });
+                    }
+                });
+
+                // Label field guess
+                var labelField = null;
+                ['name','title','label'].some(function(c){
+                    var has = fieldDefs.some(function(fd){ return fd && fd.name === c; });
+                    if (has){ labelField = c; return true; }
+                    return false;
+                });
+
+                // Ensure common sorts appear
+                ['joeUpdated','created','name'].forEach(function(sf){ if (allowedSorts.indexOf(sf) === -1) { allowedSorts.push(sf); } });
+
+                var baseSummary = {
+                    description: (def.summary && typeof def.summary.description === 'string') ? def.summary.description : '',
+                    purpose: (def.summary && typeof def.summary.purpose === 'string') ? def.summary.purpose : '',
+                    wip: !!def.wip,
+                    source: (def.summary && typeof def.summary.source === 'string') ? def.summary.source : ((def.__origin === 'core') ? 'core' : 'instance'),
+                    labelField: labelField || 'name',
+                    defaultSort: defaultSort,
+                    searchableFields: searchable,
+                    allowedSorts: allowedSorts,
+                    relationships: { outbound: outbound, inbound: { graphRef: 'server/relationships.graph.json' } },
+                    fields: fieldDefs,
+                    fieldCountBase: fieldDefs.length,
+                    joeManagedFields: ['created','joeUpdated']
+                };
+                // Allow curated overrides from schema.summary
+                var finalSummary = baseSummary;
+                if (def.summary && typeof def.summary === 'object'){
+                    // Shallow merge top-level props, but merge fields by name (do not replace entire list)
+                    var curated = def.summary;
+                    finalSummary = Object.assign({}, baseSummary, curated);
+                    try{
+                        var mergedFields = (baseSummary.fields||[]).slice();
+                        var byName = {};
+                        mergedFields.forEach(function(f, idx){ byName[f.name] = { idx: idx, field: f }; });
+                        if (Array.isArray(curated.fields)){
+                            curated.fields.forEach(function(cf){
+                                if (!cf || !cf.name) return;
+                                if (byName[cf.name]){
+                                    // overlay curated props onto base field
+                                    var existing = mergedFields[byName[cf.name].idx];
+                                    mergedFields[byName[cf.name].idx] = Object.assign({}, existing, cf);
+                                } else {
+                                    mergedFields.push(cf);
+                                }
+                            });
+                        }
+                        finalSummary.fields = mergedFields;
+                    }catch(_e){ finalSummary.fields = baseSummary.fields; }
+                }
+                // Enrich curated fields with display/comment/tooltip from base when missing
+                try{
+                    var baseFieldByName = {};
+                    (baseSummary.fields||[]).forEach(function(f){ baseFieldByName[f.name] = f; });
+                    (finalSummary.fields||[]).forEach(function(f){
+                        var bf = baseFieldByName[f.name];
+                        if (!bf) return;
+                        if (f.display == null && bf.display != null) f.display = bf.display;
+                        if (f.comment == null && bf.comment != null) f.comment = truncMeta(bf.comment);
+                        if (f.tooltip == null && bf.tooltip != null) f.tooltip = truncMeta(bf.tooltip);
+                        if (f.comment) f.comment = truncMeta(f.comment);
+                        if (f.tooltip) f.tooltip = truncMeta(f.tooltip);
+                    });
+                }catch(_e){}
+
+                // Final counts
+                try{
+                    finalSummary.fieldCount = Array.isArray(finalSummary.fields) ? finalSummary.fields.length : 0;
+                    if (typeof finalSummary.fieldCountBase !== 'number'){
+                        finalSummary.fieldCountBase = baseSummary.fieldCountBase || 0;
+                    }
+                }catch(_e){}
+
+                summaries[name] = finalSummary;
+            });
+
+            // Inbound relationships will be maintained in a shared graph file; do not compute here
+
+            self.summary = summaries;
+            self.summaryGeneratedAt = new Date();
+        }catch(e){
+            console.log('[Schemas] buildSummary error:', e);
+        }
+    }
+
+    this.update = function(doItNow){
+        if(doItNow){
+            var lBM = new Benchmarker();
+            var schema_to_load = [];
+            //go through all the server files, then the schemadir files\
+            schema_to_load = schema_to_load.concat(fs.readdirSync(internalSchemasDir));
+            //schema_to_load = schema_to_load.concat(fs.readdirSync('server/schemas'));
+            schema_to_load = schema_to_load.concat(fs.readdirSync(JOE.schemaDir));
+            schema_to_load.map(function(sc){
+                self.load(sc);
+            })
+            // Build normalized summaries after load
+            try { self.buildSummary(); } catch(_e){}
+            logit(JOE.Utils.color('[schema] ','module')+schema_to_load.length+' updated in '+lBM.stop()+' secs'); 
+        }else{
+            clearTimeout(self.updateTimeout);
+            self.updateTimeout = setTimeout(self.update,self.updateDelay,true);
+            //logit(JOE.Utils.color('[schema] ','module')+'updating in '+ this.updateDelay/1000); 
+
+        }
+    }
+    JOE.Utils.setupFileFolder(schemaDir,'schemas',self.update);
+    fs.watch(internalSchemasDir,function(){
+            self.update();
+    });
+
+    this.events = function(item,events,specs){
+        try{
+            var specs = specs || {};
+            var schemaprop = specs.schemaprop || "itemtype";
+            var schemaname = item[schemaprop];
+            var schema_def = self.raw_schemas[schemaname];
+            
+            if(schema_def){
+                
+                if(typeof events == "string"){
+                    events = events.split(',');
+                }
+                events.map(function(event){
+                    if(schema_def.events && schema_def.events[event]){
+                        if(typeof schema_def.events[event] == "function"){
+                            try{
+                               
+                                schema_def.events[event](item,specs);
+                                logit('[event] '+schemaname+' > '+event);
+                            }catch(e){
+                                console.log(JOE.Utils.color('[schema]event error: ','error')+event+':'+e);
+                            }
+                        }else{
+                            logit('no event'+event+' for '+schemaname );
+                        }
+                    }
+                })
+            }else{
+                logit('schema "'+schemaname+'" not found');
+            }
+        }catch(e){
+            console.log(JOE.Utils.color('[schema] hook error: ','error')+events+':'+e);
+        }
+    }
+    this.update();
+    return self;
+}
 module.exports = new Schemas();

package/server/modules/Server.js

@@ -156,12 +156,18 @@ server.get('/mcp-test.html',auth,function(req,res){
 server.get('/mcp-export.html',auth,function(req,res){
     res.sendFile(path.join(JOE.joedir,'_www','mcp-export.html'));
 });
+server.get('/mcp-schemas.html',auth,function(req,res){
+    res.sendFile(path.join(JOE.joedir,'_www','mcp-schemas.html'));
+});
 server.get(JOE.webconfig.joepath+'_www/mcp-test.html',auth,function(req,res){
     res.sendFile(path.join(JOE.joedir,'_www','mcp-test.html'));
 });
 server.get(JOE.webconfig.joepath+'_www/mcp-export.html',auth,function(req,res){
     res.sendFile(path.join(JOE.joedir,'_www','mcp-export.html'));
 });
+server.get(JOE.webconfig.joepath+'_www/mcp-schemas.html',auth,function(req,res){
+    res.sendFile(path.join(JOE.joedir,'_www','mcp-schemas.html'));
+});
 
 server.use(JOE.webconfig.joepath,express.static(JOE.joedir));
 
@@ -528,23 +534,28 @@ server.get(['/API/schema/:names','/API/schemas/:names'],auth,function(req,res,ne
     }else if(!JOE.Data || !JOE.Data.user || !JOE.Data.user.length){
        isNew = true;
     }
+    var useSummary = (req.query.summaryOnly === 'true' || req.query.summaryOnly === true || req.query.summaries === 'true' || req.query.view === 'summary');
     schemaname.map(function(s){
         if(isSuper || isNew || permitted.indexOf(s) != -1){
-            payload[s] = JOE.Schemas.schema[s];
-        }
-    });
-    var F = (req.query.fields||req.params.fields||'core').split(',');
-    F.map(function(f){
-        try {
-            fieldspath = serverPath+'fields/' + f + '.js';
-            delete require.cache[require.resolve(fieldspath)];
-            fields = require(fieldspath);
-            stringFunctions(fields);
-            JOE.Fields[f]=fields;
-        }catch(e){
-            fields ={error:'field '+f+' not found'};
+            payload[s] = useSummary ? (JOE.Schemas.summary && JOE.Schemas.summary[s]) : JOE.Schemas.schema[s];
         }
     });
+    var Fraw = (req.query.fields||req.params.fields||'core');
+    var noFields = (Fraw === 'none') || (useSummary === true);
+    if (!noFields){
+        var F = Fraw.split(',');
+        F.map(function(f){
+            try {
+                fieldspath = serverPath+'fields/' + f + '.js';
+                delete require.cache[require.resolve(fieldspath)];
+                fields = require(fieldspath);
+                stringFunctions(fields);
+                JOE.Fields[f]=fields;
+            }catch(e){
+                fields ={error:'field '+f+' not found'};
+            }
+        });
+    }
     
     var bm = sBM.stop();
     switch(format){
@@ -555,7 +566,7 @@ server.get(['/API/schema/:names','/API/schemas/:names'],auth,function(req,res,ne
             res.send('var joe_info = '+js_payload);
             break;
         default:
-            res.jsonp({schemas:payload,fields:fields,benchmark:bm});
+            res.jsonp({schemas:payload,fields:fields,benchmark:bm, summaryOnly: !!useSummary});
             break;
     }
 
@@ -673,7 +684,7 @@ server.get(['/API/save/','/API/save/:itemid'],auth,function(req,res,next){
                 object[prop] = $c.parseBoolean(object[prop]);
             }
         }
-        object.joeUpdated = new Date();
+        object.joeUpdated = new Date().toISOString();
     //TODO: check to make sure schema idprop is present
     JOE.Storage.save(object,object.itemtype,function(err,results){
         //var object = merge({},results);

package/server/modules/Storage.js

@@ -97,6 +97,15 @@ function Storage(specs){
             var specs = $c.merge({history:true},(specs||{}));
             var user = specs.user || {name:'anonymous'};
 
+            // Ensure timestamps: always set joeUpdated; set created only on create when missing
+            try{
+                if(!data.joeUpdated){ data.joeUpdated = new Date().toISOString(); }
+                if(!data.created){
+                    var cachedBefore = (data && data._id && JOE && JOE.Cache && JOE.Cache.findByID) ? JOE.Cache.findByID(collection,data._id) : null;
+                    if(!cachedBefore){ data.created = new Date().toISOString(); }
+                }
+            }catch(_e){}
+
             if(JOE.Mongo){
                 logit(moduleName+' mongo saving -> '+colorize(collection,'schema'));
                 

package/server/relationships.graph.json

@@ -0,0 +1,5 @@
+{
+  "version": 1,
+  "generatedAt": null,
+  "schemas": {}
+}

package/server/schemas/block.js

@@ -1,5 +1,42 @@
 var block = {
     info:"A block is a small chunk of reusable content, which can be customized when it is placed in a page or layout.",
+    // Curated summary for agents
+    summary:{
+        description:'Reusable content component or template used within layouts and pages.',
+        purpose:'Blocks encapsulate content or logic. They can be used directly or defined as templates (is_template) to generate other blocks.',
+        labelField:'name',
+        defaultSort:{ field:'name', dir:'asc' },
+        searchableFields:['name','info','_id'],
+        allowedSorts:['name','joeUpdated','created'],
+        relationships:{
+            outbound:[
+                { field:'site', targetSchema:'site', cardinality:'one' },
+                { field:'includes', targetSchema:'include', cardinality:'many' },
+                { field:'use_template', targetSchema:'block', cardinality:'one' }
+            ],
+            inbound:{ graphRef:'server/relationships.graph.json' }
+        },
+        joeManagedFields:['created','joeUpdated'],
+        fields:[
+            { name:'_id', type:'string', required:true },
+            { name:'itemtype', type:'string', required:true, const:'block' },
+            { name:'name', type:'string', required:true },
+            { name:'info', type:'string' },
+            { name:'description', type:'string' },
+            { name:'use_template', type:'string', isReference:true, targetSchema:'block' },
+            { name:'is_template', type:'boolean' },
+            { name:'template_type', type:'string', enumValues:['code','module'] },
+            { name:'template', type:'string' },
+            { name:'block_fields', type:'objectList' },
+            { name:'content_type', type:'string', enumValues:['wysiwyg','code','module'] },
+            { name:'content', type:'string' },
+            { name:'process_functions', type:'objectList' },
+            { name:'site', type:'string', isReference:true, targetSchema:'site' },
+            { name:'includes', type:'string', isArray:true, isReference:true, targetSchema:'include' },
+            { name:'joeUpdated', type:'string', format:'date-time', required:true },
+            { name:'created', type:'string', format:'date-time', required:true }
+        ]
+    },
     sorter:['name',{value:'!is_template',display:'template'}],
     subsets:function(){
         var subs = [];

package/server/schemas/board.js

@@ -17,7 +17,8 @@ var board = function(){return{
         'dataset',
         '_id','created','itemtype'
     ],
-    idprop : "_id"
+    idprop : "_id",
+    wip:true
 }};
 
 module.exports = board();

package/server/schemas/budget.js

@@ -2,6 +2,33 @@ var schema = {
     title : '${name}',
     info:"Use a budget to track your income and expenses.",
 menuicon:'<svg xmlns="http://www.w3.org/2000/svg" viewBox="-15 -15 80 80"><path d="M18.5 2.6C14.4 2.6 11 5.9 11 10.1 11 11.2 11.3 12.3 11.8 13.3L13.5 12.4C13.2 11.7 13 10.9 13 10.1 13 7 15.4 4.6 18.5 4.6 21.5 4.6 24 7 24 10.1L26 10.1C26 5.9 22.6 2.6 18.5 2.6zM37.2 6.9A1 1 0 0 0 37.1 7 1 1 0 0 0 37 7C34.5 7.6 31.6 9.2 29.7 12.6 28 12.2 26.2 11.9 24.3 11.9 18.6 11.9 14.2 13.7 10.7 16.4 8.9 17.8 7.5 19.7 6.7 22 6.3 21.9 5.9 21.7 5.5 21.4 4.7 20.9 4 20.1 4 18.8 4 17.7 4.5 16.8 5.3 16.4A1 1 0 0 0 4.9 14.5 1 1 0 0 0 4.6 14.6C2.9 15.3 2 17 2 18.8 2 20.9 3.2 22.3 4.3 23.1 5 23.5 5.6 23.8 6.1 23.9 5.7 25.4 5.6 27 5.7 28.8 5.8 33.2 8.9 36.5 11.1 38.3A1 1 0 0 0 11.2 38.3C11.4 38.5 11.4 38.6 11.4 38.6 11.5 38.6 11.5 38.6 11.4 38.8 11.1 39.8 10.5 41.2 10.5 41.2A1 1 0 0 0 10.5 41.2C10 42.6 10.7 44.2 12.1 44.7A1 1 0 0 0 12.1 44.7L15.3 45.9C16.7 46.4 18.3 45.7 18.8 44.3 18.8 44.3 19.2 43.2 19.6 42.3 19.6 42.1 19.7 42.1 19.7 42.1 19.8 42.1 19.8 42.1 19.8 42.1 20.5 42.2 21.9 42.6 24.3 42.6 26.7 42.6 28 42.4 28.7 42.3 28.8 42.3 28.9 42.3 28.9 42.3 28.9 42.4 28.9 42.4 28.9 42.4 28.9 42.5 28.9 42.5 28.9 42.5 29.3 43.4 29.6 44.3 29.7 44.3 29.7 44.4 29.7 44.4 29.7 44.4 30.2 45.7 31.8 46.4 33.2 45.9L36.4 44.7A1 1 0 0 0 36.4 44.7C37.8 44.2 38.5 42.6 37.9 41.2L37.4 39.8A1 1 0 0 0 37.3 39.7C37.3 39.7 37.4 39.7 37.4 39.7 37.4 39.7 37.2 39.7 37.6 39.6 40 38.2 41.9 36.2 43 33.8 43.1 33.5 43.2 33.4 43.3 33.3 43.4 33.2 43.4 33.2 43.8 33.2L45.4 33.2C46.8 33.2 48 32 48 30.5L48 25.7C48 24.2 46.8 23 45.4 23L43.8 23C43.5 23 43.4 23 43.4 23 42.9 20.1 41 16.5 36.7 14.7 36.7 12.6 37.2 11 38.2 8.3A1 1 0 0 0 37.2 6.9zM35.6 9.8C35 11.6 34.6 13.3 34.6 15.3A1 1 0 0 0 35.3 16.2C39.5 17.7 41 20.9 41.4 23.4 41.6 24.4 42.6 25 43.8 25L45.4 25C45.7 25 46 25.3 46 25.7L46 30.5C46 30.9 45.7 31.2 45.4 31.2L43.8 31.2C43 31.2 42.4 31.4 41.9 31.8 41.5 32.2 41.3 32.6 41.2 32.9 40.2 35 38.7 36.7 36.6 37.8 35.8 38.2 35.4 39 35.4 39.6 35.4 40.1 35.5 40.4 35.6 40.5L35.6 40.5 35.6 40.7 36.1 41.9C36.2 42.3 36 42.7 35.7 42.8L32.4 44.1C32.1 44.2 31.6 44 31.5 43.6A1 1 0 0 0 31.5 43.6C31.5 43.6 31.1 42.7 30.8 41.8 30.7 41.4 30.5 40.9 30 40.6 29.5 40.3 29 40.3 28.6 40.3 27.7 40.4 26.5 40.6 24.3 40.6 22.1 40.6 21 40.3 20.2 40.1 19.8 40 19.2 40 18.7 40.3 18.1 40.6 17.9 41.1 17.8 41.6 17.4 42.5 17 43.6 17 43.6 16.8 44 16.4 44.2 16 44.1L12.8 42.8C12.4 42.7 12.3 42.3 12.4 41.9 12.4 41.9 13 40.5 13.3 39.5 13.5 38.8 13.4 38 13.2 37.6 12.9 37.1 12.5 36.8 12.4 36.8 10.4 35.1 7.8 32.3 7.7 28.7 7.4 23.6 9.2 20.1 11.9 18 15.1 15.5 19 13.9 24.3 13.9 26.3 13.9 28.2 14.2 30 14.6A1 1 0 0 0 31.1 14.1C32.2 11.6 33.9 10.5 35.6 9.8zM36.5 23.1C35.4 23.1 34.6 23.9 34.6 25 34.6 26.1 35.4 26.9 36.5 26.9 37.5 26.9 38.4 26.1 38.4 25 38.4 23.9 37.5 23.1 36.5 23.1z"/></svg>',
+    // Curated summary for agents
+    summary:{
+        description:'Spending or income target tracked against ledgers via tags.',
+        purpose:'Use budgets to set target amounts and analyze spending history. Budgets link to ledgers sharing the same tags.',
+        labelField:'name',
+        defaultSort:{ field:'joeUpdated', dir:'desc' },
+        searchableFields:['name','info','_id'],
+        allowedSorts:['joeUpdated','created','name','amount'],
+        relationships:{
+            outbound:[
+                { field:'tags', targetSchema:'tag', cardinality:'many' }
+            ],
+            inbound:{ graphRef:'server/relationships.graph.json' }
+        },
+        joeManagedFields:['created','joeUpdated'],
+        fields:[
+            { name:'_id', type:'string', required:true },
+            { name:'itemtype', type:'string', required:true, const:'budget' },
+            { name:'name', type:'string', required:true },
+            { name:'info', type:'string' },
+            { name:'additive', type:'boolean', display:'Sum actuals', comment:'Dynamic budget: amount equals the sum of matching transactions for the period; no remaining shown.' },
+            { name:'amount', type:'number' },
+            { name:'tags', type:'string', isArray:true, isReference:true, targetSchema:'tag' },
+            { name:'joeUpdated', type:'string', format:'date-time', required:true },
+            { name:'created', type:'string', format:'date-time', required:true }
+        ]
+    },
     listView:{
         title:
         '<joe-title class="joe-fright">-$${amount}</joe-title>'+
@@ -13,7 +40,7 @@ menuicon:'<svg xmlns="http://www.w3.org/2000/svg" viewBox="-15 -15 80 80"><path
     fields:[
         'name',
         'info',
-        'additive:boolean',
+        {name:'additive', type:'boolean', display:'Sum actuals', comment:'If checked, this budget is dynamic: its amount equals the sum of matching transactions for the selected period. No remaining is shown. Use for roll‑up categories (e.g., income or passthrough).'},
         {name:'amount',type:'number',comment:'the default amount'},
         'tags',
             {sidebar_start:'right'},