aiplang 2.9.3 → 2.10.0

package/bin/aiplang.js

@@ -5,7 +5,7 @@ const fs   = require('fs')
 const path = require('path')
 const http = require('http')
 
-const VERSION     = '2.9.3'
+const VERSION     = '2.10.0'
 const RUNTIME_DIR = path.join(__dirname, '..', 'runtime')
 const cmd         = process.argv[2]
 const args        = process.argv.slice(3)
@@ -648,9 +648,15 @@ function parseBlock(line) {
     const binding=line.slice(start,idx).trim().replace(/^@/,'@')
     const content=line.slice(idx+1,line.lastIndexOf('}')).trim()
     const em=content.match(/edit\s+(PUT|PATCH)\s+(\S+)/), dm=content.match(/delete\s+(?:DELETE\s+)?(\S+)/)
-    const clean=content.replace(/edit\s+(PUT|PATCH)\s+\S+/g,'').replace(/delete\s+(?:DELETE\s+)?\S+/g,'')
+    const fallbackM=content.match(/fallback\s*:\s*([^|]+)/)
+    const retryM=content.match(/retry\s*:\s*(\S+)/)
+    const clean=content
+      .replace(/edit\s+(PUT|PATCH)\s+\S+/g,'')
+      .replace(/delete\s+(?:DELETE\s+)?\S+/g,'')
+      .replace(/fallback\s*:[^|]+/g,'')
+      .replace(/retry\s*:\s*\S+/g,'')
     const cols=parseCols(clean)
-    return{kind:'table',binding,cols:Array.isArray(cols)?cols:[],empty:parseEmpty(clean),editPath:em?.[2]||null,editMethod:em?.[1]||'PUT',deletePath:dm?.[1]||null,deleteKey:'id',extraClass,animate,variant,style,bg}
+    return{kind:'table',binding,cols:Array.isArray(cols)?cols:[],empty:parseEmpty(clean),editPath:em?.[2]||null,editMethod:em?.[1]||'PUT',deletePath:dm?.[1]||null,deleteKey:'id',fallback:fallbackM?.[1]?.trim()||null,retry:retryM?.[1]||null,extraClass,animate,variant,style,bg}
   }
 
   // ── form ────────────────────────────────────────────────────
@@ -658,12 +664,17 @@ function parseBlock(line) {
     const bi=line.indexOf('{');if(bi===-1) return null
     let head=line.slice(line.startsWith('form{')?4:5,bi).trim()
     const content=line.slice(bi+1,line.lastIndexOf('}')).trim()
-    let action=''; const ai=head.indexOf('=>')
-    if(ai!==-1){action=head.slice(ai+2).trim();head=head.slice(0,ai).trim()}
+    let action='', optimistic=false; const ai=head.indexOf('=>')
+    if(ai!==-1){
+      action=head.slice(ai+2).trim()
+      // Optimistic: => @list.optimistic($result)
+      if(action.includes('.optimistic(')){optimistic=true;action=action.replace('.optimistic','')}
+      head=head.slice(0,ai).trim()
+    }
     const parts=head.trim().split(/\s+/)
     const method=parts[0]&&['GET','POST','PUT','PATCH','DELETE'].includes(parts[0].toUpperCase())?parts[0].toUpperCase():'POST'
     const bpath=parts[method===parts[0].toUpperCase()?1:0]||''
-    return{kind:'form',method,bpath,action,fields:parseFields(content)||[],extraClass,animate,variant,style,bg}
+    return{kind:'form',method,bpath,action,optimistic,fields:parseFields(content)||[],extraClass,animate,variant,style,bg}
   }
 
   // ── pricing ─────────────────────────────────────────────────
@@ -858,11 +869,33 @@ function renderBlock(b, page) {
     case 'testimonial': return rTestimonial(b)
     case 'gallery':     return rGallery(b)
     case 'raw':         return (b.html||'')+'\n'
+    case 'html':        return `<div class="fx-html">${b.content||''}</div>\n`
+    case 'spacer':      return `<div class="fx-spacer" style="height:${esc(b.height||'2rem')}"></div>\n`
+    case 'divider':     return b.label?`<div class="fx-divider"><span class="fx-divider-label">${esc(b.label)}</span></div>\n`:`<hr class="fx-hr">\n`
+    case 'badge':       return `<div class="fx-badge-row"><span class="fx-badge-tag">${esc(b.content||'')}</span></div>\n`
+    case 'card':        return rCardBlock(b)
+    case 'cols':        return rColsBlock(b)
+    case 'each':        return `<div class="fx-each fx-each-${b.variant||'list'}" data-fx-each="${esc(b.binding||'')}" data-fx-tpl="${esc(b.tpl||'')}"${b.style?` style="${b.style.replace(/,/g,';')}"`:''}>\n<div class="fx-each-empty fx-td-empty">Loading...</div></div>\n`
     case 'if':          return `<div class="fx-if-wrap" data-fx-if="${esc(b.cond)}" style="display:none"></div>\n`
     default: return ''
   }
 }
 
+function rCardBlock(b) {
+  const img=b.img?`<img src="${esc(b.img)}" class="fx-card-img" alt="${esc(b.title||'')}" loading="lazy">`:'';
+  const badge=b.badge?`<span class="fx-card-badge">${esc(b.badge)}</span>`:'';
+  const title=b.title?`<h3 class="fx-card-title">${esc(b.title)}</h3>`:'';
+  const sub=b.subtitle?`<p class="fx-card-body">${esc(b.subtitle)}</p>`:'';
+  const link=b.link?`<a href="${esc(b.link.split(':')[0])}" class="fx-card-link">${esc(b.link.split(':')[1]||'View')} →</a>`:'';
+  const bg=b.bg?` style="background:${b.bg}"`:b.style?` style="${b.style.replace(/,/g,';')}"`:''
+  return`<div class="fx-card"${bg}>${img}${badge}${title}${sub}${link}</div>\n`
+}
+function rColsBlock(b) {
+  const cols=(b.items||[]).map(col=>`<div class="fx-col">${col}</div>`).join('')
+  const style=b.style?` style="${b.style.replace(/,/g,';')}"`:''
+  return`<div class="fx-cols fx-cols-${b.n||2}"${style}>${cols}</div>\n`
+}
+
 function rNav(b) {
   if(!b.items?.[0]) return ''
   const it=b.items[0]
@@ -973,7 +1006,9 @@ function rTable(b) {
   const da=b.deletePath?` data-fx-delete="${esc(b.deletePath)}"`:''
   const at=(b.editPath||b.deletePath)?'<th class="fx-th fx-th-actions">Actions</th>':''
   const span=cols.length+((b.editPath||b.deletePath)?1:0)
-  return `<div class="fx-table-wrap"><table class="fx-table" data-fx-table="${esc(b.binding)}" data-fx-cols='${keys}' data-fx-col-map='${cm}'${ea}${da}><thead><tr>${ths}${at}</tr></thead><tbody class="fx-tbody"><tr><td colspan="${span}" class="fx-td-empty">${esc(b.empty)}</td></tr></tbody></table></div>\n`
+  const fallbackAttr=b.fallback?` data-fx-fallback="${esc(b.fallback)}"`:''
+  const retryAttr=b.retry?` data-fx-retry="${esc(b.retry)}"`:''
+  return `<div class="fx-table-wrap"><table class="fx-table" data-fx-table="${esc(b.binding)}" data-fx-cols='${keys}' data-fx-col-map='${cm}'${ea}${da}${fallbackAttr}${retryAttr}><thead><tr>${ths}${at}</tr></thead><tbody class="fx-tbody"><tr><td colspan="${span}" class="fx-td-empty">${esc(b.empty)}</td></tr></tbody></table></div>\n`
 }
 
 function rForm(b) {
@@ -993,7 +1028,8 @@ function rForm(b) {
   if(v==='minimal') {
     return `<div class="fx-form-minimal"><form data-fx-form="${esc(b.bpath)}" data-fx-method="${esc(b.method)}" data-fx-action="${esc(b.action)}">${fields}<div class="fx-form-msg"></div><button type="submit" class="fx-btn">${esc(label)}</button></form></div>\n`
   }
-  return `<div class="fx-form-wrap"><form class="fx-form"${bgStyle} data-fx-form="${esc(b.bpath)}" data-fx-method="${esc(b.method)}" data-fx-action="${esc(b.action)}">${fields}<div class="fx-form-msg"></div><button type="submit" class="fx-btn">${esc(label)}</button></form></div>\n`
+  const optAttr=b.optimistic?' data-fx-optimistic="true"':''
+  return `<div class="fx-form-wrap"><form class="fx-form"${bgStyle}${optAttr} data-fx-form="${esc(b.bpath)}" data-fx-method="${esc(b.method)}" data-fx-action="${esc(b.action)}">${fields}<div class="fx-form-msg"></div><button type="submit" class="fx-btn">${esc(label)}</button></form></div>\n`
 }
 
 function rBtn(b) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiplang",
-  "version": "2.9.3",
+  "version": "2.10.0",
   "description": "AI-first web language. One .aip file = complete app. Frontend + backend + database + auth.",
   "keywords": [
     "aiplang",

package/server/server.js

@@ -325,7 +325,9 @@ function validateAndCoerce(data, schema) {
 
     // Coerce type
     if (val !== undefined && val !== null) {
-      if (def.type === 'int') {
+      if (Array.isArray(val) || (typeof val === 'object' && val !== null && def.type !== 'json')) {
+        errors.push(`${col}: expected ${def.type}, got ${Array.isArray(val)?'array':'object'}`)
+      } else if (def.type === 'int') {
         const n = parseInt(val)
         if (isNaN(n)) errors.push(`${col}: expected integer, got "${val}"`)
         else out[col] = n
@@ -706,7 +708,13 @@ function parseEventLine(s) { const m=s.match(/^(\S+)\s*=>\s*(.+)$/); return{even
 function parseField(line) {
   const p=line.split(':').map(s=>s.trim())
   const f={name:p[0],type:p[1]||'text',modifiers:[],enumVals:[],default:null}
-  for(let j=2;j<p.length;j++){const x=p[j];if(x.startsWith('default='))f.default=x.slice(8);else if(x.startsWith('enum:'))f.enumVals=x.slice(5).split(',');else if(x)f.modifiers.push(x)}
+  // If type is enum, p[2] contains comma-separated values directly
+  if (f.type === 'enum' && p[2] && !p[2].startsWith('default=') && !['required','unique','hashed','pk','auto','index'].includes(p[2])) {
+    f.enumVals = p[2].split(',').map(v=>v.trim()).filter(Boolean)
+    for(let j=3;j<p.length;j++){const x=p[j];if(x.startsWith('default='))f.default=x.slice(8);else if(x)f.modifiers.push(x)}
+  } else {
+    for(let j=2;j<p.length;j++){const x=p[j];if(x.startsWith('default='))f.default=x.slice(8);else if(x.startsWith('enum:'))f.enumVals=x.slice(5).split(',').map(v=>v.trim());else if(x)f.modifiers.push(x)}
+  }
   return f
 }
 function parseAPILine(line, route) {
@@ -1710,7 +1718,7 @@ async function startServer(aipFile, port = 3000) {
   migrateModels(app.models)
 
   // Register models
-  for (const m of app.models) srv.registerModel(m.name, { softDelete: m.softDelete, timestamps: true })
+  for (const m of app.models) srv.registerModel(m.name, MODEL_DEFS[m.name] || { softDelete: m.softDelete, timestamps: true })
 
   // Events
   for (const ev of app.events) on(ev.event, (data) => console.log(`[aiplang:event] ${ev.event}:`, ev.action))
@@ -1789,7 +1797,7 @@ async function startServer(aipFile, port = 3000) {
 
   // Health
   srv.addRoute('GET', '/health', (req, res) => res.json(200, {
-    status:'ok', version:'2.9.3',
+    status:'ok', version:'2.10.0',
     models: app.models.map(m=>m.name),
     routes: app.apis.length, pages: app.pages.length,
     admin: app.admin?.prefix || null,