dsh-motion-ui 0.5.6 → 0.7.0

package/lib/normalize-authoring.js

@@ -1,10 +1,12 @@
 // Lossless transport repairs only at protocol-typed positions. Never traverse
 // arbitrary data/state payloads or rewrite labels, HTML, CSS or JavaScript.
 const object = v => v !== null && typeof v === 'object' && !Array.isArray(v);
+import {visualDocument,VISUAL_TYPES} from './visual.js';
+import {COMPONENTS} from './components.js';
 const own = (v,k) => Object.hasOwn(v,k);
 const singleItem = v => object(v) && Object.keys(v).length === 1 && own(v,'item');
-const array = v => singleItem(v) && Array.isArray(v.item) ? v.item : v;
-const numericOps = new Set(['add','sub','mul','div','min','max','round','abs','lt','lte','gt','gte']);
+const array = v => {let candidate=v;for(let i=0;i<8&&singleItem(candidate);i++)candidate=candidate.item;return Array.isArray(candidate)?candidate:v};
+const numericOps = new Set(['add','sub','mul','div','min','max','round','ceil','floor','abs','lt','lte','gt','gte']);
 function number(v) {
   if (typeof v !== 'string' || !/^-?(?:0|[1-9]\d*)(?:\.\d+)?(?:e[+-]?\d+)?$/i.test(v.trim())) return v;
   const n = Number(v);
@@ -23,6 +25,8 @@ function expression(e, numeric = false, logical = false) {
   return e;
 }
 export function normalizeAuthoring(doc) {
+  if (Array.isArray(doc)) doc=visualDocument(doc);
+  if (object(doc)&&!own(doc,'nodes')&&(own(doc,'items')||typeof doc.type==='string')) doc=visualDocument(doc);
   if (!object(doc)) return doc;
   if (own(doc,'version')) doc.version = number(doc.version);
   if (object(doc.state)) for (const k of Object.keys(doc.state)) {
@@ -50,14 +54,59 @@ export function normalizeAuthoring(doc) {
     if (!Array.isArray(list)) return list;
     for (const node of list) {
       if (!object(node)) continue;
+      if(['text','heading','callout'].includes(node.type)&&own(node,'content')){
+        // Collapse aliases only when no conflicting content would be lost.
+        if(!own(node,'text')){node.text=node.content;delete node.content}
+        else if(node.text===node.content)delete node.content;
+      }
+      if(['text','heading','callout'].includes(node.type)&&typeof node.text==='string'){
+        const spans=array(node.spans);
+        if(Array.isArray(spans)&&spans.every(s=>object(s)&&typeof s.text==='string')&&spans.map(s=>s.text).join('')===node.text)delete node.text;
+      }
+      if(node.type==='table'&&own(node,'types')){
+        const columns=array(node.columns),rows=array(node.rows),types=array(node.types);
+        const allowed=['id','type','label','columns','rows','types'];
+        if(Object.keys(node).every(k=>allowed.includes(k))&&Array.isArray(columns)&&columns.length&&columns.every(c=>object(c)&&typeof c.key==='string'&&typeof c.label==='string'&&Object.keys(c).every(k=>['key','label','unit'].includes(k)))&&new Set(columns.map(c=>c.key)).size===columns.length&&Array.isArray(rows)&&rows.every(object)&&Array.isArray(types)&&types.length===columns.length&&types.every(t=>['text','num','delta','bar','badge'].includes(t))){
+          const spec={...(node.label?{title:node.label}:{}),items:[{type:'table',columns:columns.map(c=>c.label+(c.unit?` (${c.unit})`:'')),rows:rows.map(row=>columns.map(c=>row[c.key]??null)),types}]},id=node.id;
+          for(const k of Object.keys(node))delete node[k];
+          Object.assign(node,{...(id!==undefined?{id}:{}),type:'visual',spec});
+        }
+      }
+      // Extended-only nodes have an unambiguous native visual wrapper. Keep
+      // the author's ID so mixed documents need no extra repair round.
+      if(typeof node.id==='string'&&VISUAL_TYPES.includes(node.type)&&!own(COMPONENTS,node.type)){
+        const spec={items:[{...node}]},id=node.id;
+        for(const k of Object.keys(node))delete node[k];
+        Object.assign(node,{id,type:'visual',spec});
+      }
+      // Positional cells map losslessly to an explicit ordered, unique column list.
+      if(node.type==='table'&&Array.isArray(node.columns)&&node.columns.length&&node.columns.every(c=>object(c)&&typeof c.key==='string')&&new Set(node.columns.map(c=>c.key)).size===node.columns.length&&Array.isArray(node.rows)&&node.rows.every(row=>Array.isArray(row)&&row.length===node.columns.length)){
+        node.rows=node.rows.map(row=>Object.fromEntries(node.columns.map((c,i)=>[c.key,row[i]])));
+      }
+      if(node.type==='table'&&Array.isArray(node.columns)&&node.columns.length&&Array.isArray(node.rows)&&node.rows.every(Array.isArray)&&node.columns.every(c=>object(c)&&Number.isInteger(c.key)&&c.key>=0)&&new Set(node.columns.map(c=>c.key)).size===node.columns.length){
+        const columns=node.columns.map(c=>({...c,key:'col_'+c.key}));
+        node.rows=node.rows.map(row=>Object.fromEntries(node.columns.map(c=>['col_'+c.key,row[c.key]??null])));node.columns=columns;
+      }
+      if(node.type==='visual'&&typeof node.id==='string'){
+        node.stateKey??='visual_'+node.id;doc.state??={};
+        if(!own(doc.state,node.stateKey))doc.state[node.stateKey]={type:'json',default:{}};
+      }
       if (node.type === 'sandbox') {
         if (!own(node,'title')) node.title = doc.title;
         if (!own(node,'fallback')) node.fallback = doc.fallback;
       }
-      for (const field of ['children','items','columns','stateKeys','dataKeys','derivedKeys']) if (own(node,field)) node[field] = array(node[field]);
+      for (const field of ['children','items','columns','libraries','stateKeys','dataKeys','derivedKeys']) if (own(node,field)) node[field] = array(node[field]);
       if (['table','chart'].includes(node.type) && own(node,'rows')) node.rows = array(node.rows);
       for (const field of ['decimals','height']) if (own(node,field)) node[field] = number(node[field]);
+      if(['row','column'].includes(node.type)){if(own(node,'gap'))node.gap=number(node.gap);if(node.type==='row'&&own(node,'columns'))node.columns=number(node.columns)}
+      if(['text','heading','callout'].includes(node.type)){
+        for(const field of ['size','weight','lineHeight'])if(own(node,field))node[field]=number(node[field]);
+        if(own(node,'spans'))node.spans=array(node.spans);
+        if(Array.isArray(node.spans))for(const span of node.spans)if(object(span))for(const field of ['size','weight','lineHeight'])if(own(span,field))span[field]=number(span[field]);
+      }
       if (node.type === 'details' && own(node,'open')) node.open = boolean(node.open);
+      if(node.type==='text'&&own(node,'copyable'))node.copyable=boolean(node.copyable);
+      if(node.type==='code'&&own(node,'wrap'))node.wrap=boolean(node.wrap);
       for (const field of ['text','value','max','rows']) if (own(node,field)) expression(node[field],node.type === 'progress');
       if (['row','column','card','details'].includes(node.type) && own(node,'children')) node.children = nodes(node.children);
     }

package/lib/normalize-visual.js

@@ -0,0 +1,36 @@
+// Repair transport encodings only where the component schema declares a type.
+// Opaque JSON, ECharts options, source code and user data retain their contents.
+export function normalizeVisual(value, schemas) {
+ const unwrap=v=>v&&typeof v==='object'&&!Array.isArray(v)&&Object.keys(v).length===1&&Array.isArray(v.item)?v.item:v;
+ const scalar=(v,kind)=>kind==='number'&&typeof v==='string'&&v.trim()!==''&&Number.isFinite(Number(v))?Number(v):kind==='boolean'&&(v==='true'||v==='false')?v==='true':v;
+ function record(input,schema,depth=0){
+  if(!input||typeof input!=='object'||Array.isArray(input)||depth>32)return input;
+  const out={...input};
+  for(const [key,v]of Object.entries(input)){
+   const target=schema.aliases?.[key]??key,kind=schema.fields?.[target];
+   if(kind==='array'||kind==='nodes'){
+    let array=unwrap(v);
+    if(Array.isArray(array))array=array.map(x=>kind==='nodes'?node(x,depth+1):schema.nested?.[target]?record(x,schema.nested[target],depth+1):x);
+    out[key]=array;
+   }else out[key]=scalar(v,kind);
+  }
+  return out;
+ }
+ function node(v,depth){
+  if(!v||typeof v!=='object'||Array.isArray(v))return v;
+  // Native v1 uses heading, while the extended vocabulary calls it text.
+  // This spelling has an unambiguous equivalent and should not cost a retry.
+  if(v.type==='heading'){v={...v,type:'text',content:v.content??v.text??v.title,size:v.size??'h3'};delete v.text;delete v.title}
+  if(['card','row','col','grid'].includes(v.type)&&v.items===undefined&&Array.isArray(unwrap(v.children))){v={...v,items:unwrap(v.children)};delete v.children}
+  const out=record(v,schemas[v.type]??{},depth);
+  if(v.type==='quiz'&&Array.isArray(out.options))out.options=out.options.map(x=>record(x,{fields:{correct:'boolean'}}));
+  if(v.type==='table')for(const key of ['rows','data','items','details'])if(Array.isArray(out[key]))out[key]=out[key].map(row=>{row=unwrap(row);return key==='details'&&Array.isArray(row)?row.map(x=>node(x,depth+1)):row});
+  if(v.type==='echart')for(const key of ['data','series','links'])if(Array.isArray(out[key]))out[key]=out[key].map(x=>record(x,{fields:{value:'number',data:'array'},nested:{data:{fields:{value:'number'}}}}));
+  return out;
+ }
+ if(Array.isArray(value))return {items:value.map(x=>node(x,0))};
+ if(!value||typeof value!=='object')return value;
+ const out={...value},items=unwrap(value.items);
+ if(Array.isArray(items))out.items=items.map(x=>node(x,0));
+ return out;
+}

package/lib/presentation.js

@@ -1,5 +1,5 @@
 // Public, bounded presentation vocabulary. Never accept arbitrary CSS or SVG from the model.
-export const UI_ICONS = Object.freeze(['sparkles', 'sliders', 'layers', 'chart', 'gauge', 'cpu', 'database', 'info', 'check', 'warning', 'arrow', 'target']);
+export const UI_ICONS = Object.freeze(['sparkles', 'sliders', 'layers', 'chart', 'gauge', 'cpu', 'database', 'info', 'check', 'warning', 'arrow', 'target','external','file','globe']);
 export const UI_TONES = Object.freeze(['neutral', 'accent', 'success', 'warning', 'danger']);
 export const UI_LAYOUTS = Object.freeze(['dashboard', 'workbench', 'comparison', 'guide', 'status', 'report']);
 export const UI_ACCENTS = Object.freeze(['blue', 'teal', 'violet', 'amber', 'rose']);