aiplang 2.11.10 → 2.11.12

package/bin/aiplang.js

@@ -5,7 +5,51 @@ const fs   = require('fs')
 const path = require('path')
 const http = require('http')
 
-const VERSION     = '2.11.10'
+
+// ── ANSI colors — sem dependências ───────────────────────────────
+const CLR = {
+  reset: '\x1b[0m',
+  bold:  '\x1b[1m',
+  dim:   '\x1b[2m',
+  green: '\x1b[32m',
+  blue:  '\x1b[34m',
+  cyan:  '\x1b[36m',
+  yellow:'\x1b[33m',
+  red:   '\x1b[31m',
+  white: '\x1b[37m',
+  gray:  '\x1b[90m',
+}
+const c_ = (color, text) => process.stdout.isTTY ? CLR[color]+text+CLR.reset : text
+const bold  = t => c_('bold', t)
+const dim   = t => c_('dim', t)
+const green = t => c_('green', t)
+const blue  = t => c_('blue', t)
+const cyan  = t => c_('cyan', t)
+const yellow= t => c_('yellow', t)
+const red   = t => c_('red', t)
+const gray  = t => c_('gray', t)
+
+// Spinner simples
+class Spinner {
+  constructor(text) {
+    this.frames = ['⠋','⠙','⠹','⠸','⠼','⠴','⠦','⠧','⠇','⠏']
+    this.i = 0; this.text = text; this.timer = null
+  }
+  start() {
+    if (!process.stdout.isTTY) { process.stdout.write(this.text+'...\n'); return this }
+    this.timer = setInterval(() => {
+      process.stdout.write('\r  ' + cyan(this.frames[this.i++ % this.frames.length]) + '  ' + this.text + '   ')
+    }, 80)
+    return this
+  }
+  stop(ok=true, msg='') {
+    if (this.timer) { clearInterval(this.timer); this.timer = null }
+    if (process.stdout.isTTY) process.stdout.write('\r')
+    console.log('  ' + (ok ? green('✓') : red('✗')) + '  ' + (msg||this.text) + '   ')
+  }
+}
+
+const VERSION     = '2.11.12'
 const RUNTIME_DIR = path.join(__dirname, '..', 'runtime')
 const cmd         = process.argv[2]
 const args        = process.argv.slice(3)
@@ -26,55 +70,27 @@ const hSize = n => n<1024?`${n}B`:`${(n/1024).toFixed(1)}KB`
 
 if (!cmd||cmd==='--help'||cmd==='-h') {
   console.log(`
-  aiplang v${VERSION}
-  AI-first web language — full apps in ~20 lines.
-
-  Usage:
-    npx aiplang init [name]                  create project (default template)
-    npx aiplang init [name] --template <t>   use template: saas|landing|crud|dashboard|portfolio|blog
-    npx aiplang init [name] --template ./my.aip     use a local .aip file as template
-    npx aiplang init [name] --template my-custom     use a saved custom template
-    npx aiplang serve [dir]                  dev server + hot reload
-    npx aiplang build [dir/file]             compile → static HTML
-    npx aiplang validate <app.aip>           validate syntax with AI-friendly errors
-    npx aiplang types   <app.aip>            generate TypeScript types (.d.ts)
-    npx aiplang context [app.aip]            dump minimal AI context (<500 tokens)
-    npx aiplang new <page>                   new page template
-    npx aiplang --version
-
-  Full-stack:
-    npx aiplang start app.aip           start full-stack server (API + DB + frontend)
-    PORT=8080 aiplang start app.aip     custom port
-
-  Templates:
-    npx aiplang template list                list all templates (built-in + custom)
-    npx aiplang template save <n>            save current project as template
-    npx aiplang template save <n> --from <f> save a specific .aip file as template
-    npx aiplang template edit <n>            open template in editor
-    npx aiplang template show <n>            print template source
-    npx aiplang template export <n>          export template to .aip file
-    npx aiplang template remove <n>          delete a custom template
-
-  Custom template variables:
-    {{name}}  project name
-    {{year}}  current year
-
-  Customization:
-    # Bancos de dados suportados:
-    #   ~db sqlite   ./app.db          (padrão — sem configuração)
-    #   ~db pg       $DATABASE_URL     (PostgreSQL)
-    #   ~db mysql    $MYSQL_URL        (MySQL / MariaDB)
-    #   ~db mongodb  $MONGODB_URL      (MongoDB)
-    #   ~db redis    $REDIS_URL        (Redis — cache/session)
-    ~theme accent=#7c3aed radius=1.5rem font=Syne bg=#000 text=#fff
-    hero{...} animate:fade-up
-    row3{...} class:my-class animate:stagger
-    raw{<div>any HTML here</div>}
-
-  GitHub: https://github.com/isacamartin/aiplang
-  npm:    https://npmjs.com/package/aiplang
-  Docs:   https://isacamartin.github.io/aiplang
-  `)
+  ${bold(cyan('aiplang'))} ${dim('v'+VERSION)}  ${gray('AI-First Web Language')}
+
+  ${bold('Usage:')}
+    ${cyan('npx aiplang')} ${yellow('<command>')} ${gray('[options]')}
+
+  ${bold('Commands:')}
+    ${green('start')}   ${gray('<file.aip> [port]')}    Start dev server
+    ${green('build')}   ${gray('<file.aip> --out <dir>')} Build static HTML
+    ${green('validate')}${gray(' <file.aip>')}           Lint syntax
+    ${green('types')}   ${gray('<file.aip>')}            Generate TypeScript .d.ts
+    ${green('context')} ${gray('<file.aip>')}            AI context summary
+    ${green('init')}    ${gray('[project-name]')}        Create new project
+
+  ${bold('Examples:')}
+    ${dim('npx aiplang start app.aip')}
+    ${dim('npx aiplang build app.aip --out ./dist')}
+    ${dim('npx aiplang init my-saas')}
+
+  ${bold('Docs:')}  ${blue('https://github.com/isacamartin/aiplang')}
+  ${bold('npm:')}   ${blue('npmjs.com/package/aiplang')}
+`)
   process.exit(0)
 }
 if (cmd==='--version'||cmd==='-v') { console.log(`aiplang v${VERSION}`); process.exit(0) }
@@ -686,7 +702,7 @@ function generateTypes(app, srcFile) {
   }
 
   lines.push(`// ── aiplang version ──────────────────────────────────────────`)
-  lines.push(`export const AIPLANG_VERSION     = '2.11.10'`)
+  lines.push(`export const AIPLANG_VERSION     = '2.11.12'`)
   lines.push(``)
   return lines.join('\n')
 }
@@ -697,7 +713,7 @@ function _cap(s) { return s ? s[0].toUpperCase() + s.slice(1) : s }
 function validateAipSrc(source) {
   const errors = []
   const lines = source.split('\n')
-  const knownDirs = new Set(['db','auth','env','mail','s3','stripe','plan','admin','realtime','use','plugin','import','store','ssr','interval','mount','theme','guard','validate','unique','hash','check','cache','rateLimit','broadcast','soft-delete','belongs'])
+  const knownDirs = new Set(['db','auth','env','mail','s3','stripe','plan','admin','realtime','use','plugin','import','store','ssr','interval','mount','theme','guard','validate','unique','hash','check','cache','rateLimit','broadcast','soft-delete','belongs','var','component','end'])
   for (let i=0; i<lines.length; i++) {
     const line = lines[i].trim()
     if (!line || line.startsWith('#')) continue
@@ -856,7 +872,7 @@ if (cmd==='build') {
   const pages=parsePages(src)
   if(!pages.length){console.error('\n  ✗  No pages found.\n');process.exit(1)}
   fs.mkdirSync(outDir,{recursive:true})
-  console.log(`\n  aiplang build v${VERSION} — ${files.length} file(s)\n`)
+  console.log(`\n  ${bold(cyan('aiplang'))} build ${dim('v'+VERSION)} — ${files.length} file(s)\n`)
   let total=0
   for(const page of pages){
     const html=renderPage(page,pages)
@@ -936,7 +952,49 @@ console.error(`\n  ✗  Unknown command: ${cmd}\n  Run aiplang --help\n`)
 process.exit(1)
 
 function parsePages(src) {
-  return src.split(/\n---\n/).map(s=>parsePage(s.trim())).filter(Boolean)
+  // ── Extrair variáveis globais ~var ──────────────────────────────
+  const gVars = {}
+  src.split('\n').forEach(line => {
+    const vm = line.trim().match(/^~var\s+(\w+)\s*=\s*(.+)$/)
+    if (vm) gVars[vm[1].trim()] = vm[2].trim().replace(/^["']|["']$/g,'')
+  })
+
+  // ── Extrair componentes ~component name(params) ... ~end ────────
+  const gComponents = {}
+  const compRx = /^~component\s+(\w+)\s*\(([^)]*)\)\s*$([\s\S]*?)^~end\s*$/mg
+  let m; while((m=compRx.exec(src))!==null) {
+    const name   = m[1].trim()
+    const params = m[2].split(',').map(p=>p.trim()).filter(Boolean)
+    const body   = m[3]
+    gComponents[name] = { params, body }
+  }
+
+  // ── Expandir ~use name(arg1, arg2) → corpo do componente ───────
+  function expandComponents(s) {
+    if (!Object.keys(gComponents).length) return s
+    return s.replace(/^~use\s+(\w+)\s*\(([^)]*)\)\s*$/mg, (_, name, argsStr) => {
+      const comp = gComponents[name]
+      if (!comp) return `# ~use: component "${name}" not found`
+      const args = argsStr.split(',').map(a=>a.trim())
+      let body = comp.body
+      comp.params.forEach((p,i) => {
+        body = body.replace(new RegExp('\\$'+p, 'g'), args[i] !== undefined ? args[i] : '')
+      })
+      return body
+    })
+  }
+
+  // ── Expandir $var ───────────────────────────────────────────────
+  function expand(s) {
+    let r = expandComponents(s)
+    if (Object.keys(gVars).length)
+      r = r.replace(/\$(\w+)/g, (m,k) => gVars[k]!==undefined ? gVars[k] : m)
+    return r
+  }
+
+  // Remover blocos ~component...~end antes de parsear
+  const cleanSrc = src.replace(/^~component[\s\S]*?^~end\s*$/mg, '')
+  return cleanSrc.split(/\n---\n/).map(s=>parsePage(expand(s.trim()))).filter(Boolean)
 }
 
 function parsePage(src) {
@@ -944,6 +1002,10 @@ function parsePage(src) {
   if(!lines.length) return null
   const p={id:'page',theme:'dark',route:'/',customTheme:null,themeVars:null,state:{},queries:[],blocks:[]}
   for(const line of lines) {
+    if(line.startsWith('~var '))       continue  // já processado globalmente
+    if(line.startsWith('~component '))  continue  // componente já expandido
+    if(line.startsWith('~use '))        continue  // já expandido
+    if(line.startsWith('~end'))         continue  // fim de componente
     if(line.startsWith('%')) {
       const pts=line.slice(1).trim().split(/\s+/)
       p.id=pts[0]||'page'; p.route=pts[2]||'/'
@@ -1206,6 +1268,18 @@ function applyMods(html, b) {
 
 function renderPage(page, allPages) {
   const needsJS=page.queries.length>0||page.blocks.some(b=>['table','list','form','if','btn','select','faq'].includes(b.kind))
+  // Expandir variáveis $var no conteúdo da página
+  const _vars = (page.appVars||{})
+  function expandVars(s) {
+    if (!s || typeof s !== 'string' || !Object.keys(_vars).length) return s
+    return s.replace(/\$(\w+)/g, (m, k) => _vars[k] !== undefined ? _vars[k] : m)
+  }
+  // Pré-processar rawLine de cada bloco
+  page.blocks.forEach(b => {
+    if (b.rawLine) b.rawLine = expandVars(b.rawLine)
+    if (b.title) b.title = expandVars(b.title)
+    if (b.sub) b.sub = expandVars(b.sub)
+  })
   const body=page.blocks.map(b=>{try{return applyMods(renderBlock(b,page),b)}catch(e){console.error('[aiplang] Block render error:',b.kind,e.message);return ''}}).join('')
 
   const tableBlocks = page.blocks.filter(b => b.kind === 'table' && b.binding && b.cols && b.cols.length)
@@ -1260,8 +1334,12 @@ function renderPage(page, allPages) {
 <meta name="description" content="${esc((()=>{const h=page.blocks.find(b=>b.kind==='hero');if(!h)return '';const m=h.rawLine&&h.rawLine.match(/\{([^}]+)\}/);if(!m)return '';const p=m[1].split('>');const s=p[0].split('|')[1];return s?s.trim():''})())}">
 <meta property="og:title" content="${_title}">
 <meta property="og:type" content="website">
+<link rel="preconnect" href="https://fonts.googleapis.com">
+<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
 <meta property="og:type" content="website">
-<style>${css(page.theme)}${customVars}${themeVarCSS}</style>
+<link rel="preconnect" href="https://fonts.googleapis.com">
+<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+<style>${minCSS(css(page.theme)+customVars+themeVarCSS)}</style>
 </head>
 <body>
 ${body}${hydrate}
@@ -1305,7 +1383,27 @@ function renderBlock(b, page) {
     case 'chart':       return rChart(b)
     case 'kanban':      return rKanban(b)
     case 'editor':      return rEditor(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 'each': {
+      // SSR: se a página tem dados do binding (via ~ssr), renderizar server-side
+      const _eachBinding = b.binding||''
+      const _eachData = page && page.ssrData && page.ssrData[_eachBinding.replace('@','')]
+      if (_eachData && Array.isArray(_eachData) && _eachData.length > 0) {
+        // SSR: expandir template para cada item
+        const _tpl = b.tpl||''
+        const _items = _eachData.map((item, idx) => {
+          let row = _tpl
+          // Substituir {item.campo} e {item} pelos valores reais
+          row = row.replace(/\{item\.(\w+)\}/g, (_, k) => esc(String(item[k]??'')))
+          row = row.replace(/\{item\}/g, esc(String(item??'')))
+          // Renderizar o bloco expandido
+          try { return applyMods(renderBlock(parseBlock(row)||{kind:'html',content:row}, page), {}) } catch { return '' }
+        }).join('')
+        const style = b.style ? ` style="${b.style.replace(/,/g,';')}"` : ''
+        return `<div class="fx-each fx-each-${b.variant||'list'} fx-each-ssr" data-fx-each="${esc(_eachBinding)}"${style}>${_items}</div>\n`
+      }
+      // Client-side fallback (comportamento original)
+      return `<div class="fx-each fx-each-${b.variant||'list'}" data-fx-each="${esc(_eachBinding)}" 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 ''
   }
@@ -1862,6 +1960,16 @@ function genThemeVarCSS(t) {
 }
 
 
+function minCSS(s) {
+  if(!s) return ''
+  return s
+    .replace(/\/\*[\s\S]*?\*\//g,'')
+    .replace(/\s*([{};:,>~+|])\s*/g,'$1')
+    .replace(/\s+/g,' ')
+    .replace(/;}/g,'}')
+    .trim()
+}
+
 function css(theme) {
   // ════════════════════════════════════════════════════════════════
   // GEIST DESIGN SYSTEM — Vercel's design language for aiplang
@@ -1869,7 +1977,7 @@ function css(theme) {
   // Fonts: Geist Sans + Geist Mono (Google Fonts)
   // ════════════════════════════════════════════════════════════════
   const base = `
-@import url('https://fonts.googleapis.com/css2?family=Geist:wght@300;400;500;600;700;800;900&family=Geist+Mono:wght@400;500;700&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Geist:wght@300;400;500;600;700;800;900&family=Geist+Mono:wght@400;500;700&display=swap&display=swap');
 
 :root {
   --geist-font:'Geist','Geist Sans',-apple-system,BlinkMacSystemFont,system-ui,sans-serif;

package/package.json

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

package/server/server.js

@@ -1806,6 +1806,25 @@ class AiplangServer {
       if (this._requestLogger) this._requestLogger(req, Date.now() - _start)
       return
     }
+    // Servir arquivos estaticos /public/*
+    const _sext = req.path && req.path.match(/\.([a-zA-Z0-9]+)$/)
+    if (_sext && req.method === 'GET') {
+      const _appDir = server && server._appDir ? server._appDir : process.cwd()
+      const _cands = [
+        require('path').join(_appDir,'public',req.path),
+        require('path').join(process.cwd(),'public',req.path),
+        require('path').join(_appDir,req.path.slice(1)),
+      ]
+      for (const _fp of _cands) {
+        if (require('fs').existsSync(_fp)) {
+          const _mime = getMimeType(_fp)
+          const _buf  = require('fs').readFileSync(_fp)
+          res.setHeader('Cache-Control','public,max-age=86400')
+          res.writeHead(200,{'Content-Type':_mime,'Content-Length':_buf.length})
+          return res.end(_buf)
+        }
+      }
+    }
     const _404b='{"error":"Not found"}'; res.writeHead(404,{'Content-Type':'application/json','Content-Length':18}); res.end(_404b)
   }
 
@@ -1858,7 +1877,8 @@ async function parseBody(req) {
 // ═══════════════════════════════════════════════════════════════════
 function renderHTML(page, allPages) {
   const needsJS=page.queries.length>0||page.blocks.some(b=>['table','form','if','btn','select','faq'].includes(b.kind))
-  const body=page.blocks.map(b=>renderBlock(b)).join('')
+  const ssrData = page.ssrData || {}
+  const body=page.blocks.map(b=>renderBlock(b, ssrData)).join('')
   const config=needsJS?JSON.stringify({id:page.id,theme:page.theme,state:page.state,routes:allPages.map(p=>p.route),queries:page.queries}):''
   const hydrate=needsJS?`<script>window.__AIPLANG_PAGE__=${config};</script><script src="/aiplang-hydrate.js" defer></script>`:''
   const themeCSS=page.themeVars?genThemeCSS(page.themeVars):''
@@ -1866,8 +1886,9 @@ function renderHTML(page, allPages) {
   return `<!DOCTYPE html><html lang="en"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>${page.id}</title><style>${baseCSS(page.theme)}${customCSS}${themeCSS}</style></head><body>${body}${hydrate}</body></html>`
 }
 
-function renderBlock(b) {
+function renderBlock(b, ssrData) {
   const line=b.rawLine
+  ssrData = ssrData || {}
   let animate='',extraClass=''
   const am=line.match(/\banimate:(\S+)/); if(am)animate='fx-anim-'+am[1]
   const cm=line.match(/\bclass:(\S+)/); if(cm)extraClass=cm[1]
@@ -1886,6 +1907,23 @@ function renderBlock(b) {
     case 'faq': return rFaq(line)
     case 'testimonial':return rTestimonial(line)
     case 'gallery':return rGallery(line)
+    case 'each': {
+      const _bind = line.match(/data-fx-each="([^"]+)"/)
+      const _tpl  = line.match(/data-fx-tpl="([^"]+)"/)
+      const _bkey = (_bind && _bind[1]) ? _bind[1].replace('@','') : ''
+      const _data = ssrData[_bkey]
+      if (_data && Array.isArray(_data) && _data.length > 0) {
+        const _t = _tpl ? _tpl[1] : ''
+        const _items = _data.map(item => {
+          let row = _t
+          row = row.replace(/\{item\.(\w+)\}/g, (_,k) => esc(String(item[k]??'')))
+          row = row.replace(/\{item\}/g, esc(String(item??'')))
+          return row
+        }).join('')
+        return `<div class="fx-each fx-each-ssr">${_items}</div>\n`
+      }
+      return line + '\n'
+    }
     case 'raw': return extractBody(line)+'\n'
     case 'if':  return `<div class="fx-if-wrap" data-fx-if="${esc(extractCond(line))}" style="display:none"></div>\n`
     default: return ''
@@ -2137,6 +2175,17 @@ function getMime(filename) {
   return types[ext] || 'application/octet-stream'
 }
 
+// Cache-Control helper
+function _cacheHeaders(res, type, maxAge=0) {
+  if (type && (type.startsWith('image/') || type.startsWith('font/') || type.endsWith('javascript') || type.endsWith('css'))) {
+    res.setHeader('Cache-Control', `public, max-age=${maxAge||86400}, immutable`)
+  } else if (type && type.includes('html')) {
+    res.setHeader('Cache-Control', 'no-cache')
+  } else {
+    res.setHeader('Cache-Control', 'public, max-age=3600')
+  }
+}
+
 // ═══════════════════════════════════════════════════════════════════
 // PLUGIN SYSTEM — ~plugin ./my-plugin.js | ~use rate-limit max=100
 // ═══════════════════════════════════════════════════════════════════
@@ -2377,8 +2426,21 @@ async function startServer(aipFile, port = 3000) {
 
   // Frontend
   for (const page of app.pages) {
-    srv.addRoute('GET', page.route, (req, res) => {
-      const html = renderHTML(page, app.pages)
+    srv.addRoute('GET', page.route, async (req, res) => {
+      // Executar SSR queries para each{} blocks
+      const ssrData = {}
+      for (const q of (page.queries||[])) {
+        if (q.trigger === 'ssr' || q.trigger === 'mount') {
+          try {
+            const Model = q.model && srv.models[q.model]
+            if (Model) {
+              const data = await Model.all()
+              if (q.binding) ssrData[q.binding.replace('@','')] = data
+            }
+          } catch(e) { /* ignore SSR query errors */ }
+        }
+      }
+      const html = renderHTML({...page, ssrData}, app.pages)
       res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' }); res.end(html)
     })
     console.log(`[aiplang] Page:   ${page.route}`)
@@ -2387,7 +2449,7 @@ async function startServer(aipFile, port = 3000) {
   // Static assets
   srv.addRoute('GET', '/aiplang-hydrate.js', (req, res) => {
     const p = path.join(__dirname, '..', 'runtime', 'aiplang-hydrate.js')
-    if (fs.existsSync(p)) { res.writeHead(200,{'Content-Type':'application/javascript'}); res.end(fs.readFileSync(p)) }
+    if (fs.existsSync(p)) { res.setHeader('Cache-Control','public,max-age=86400'); res.writeHead(200,{'Content-Type':'application/javascript'}); res.end(fs.readFileSync(p)) }
     else { res.writeHead(404); res.end('// not found') }
   })
 
@@ -2432,7 +2494,7 @@ async function startServer(aipFile, port = 3000) {
   })
 
   srv.addRoute('GET', '/health', (req, res) => res.json(200, {
-    status:'ok', version:'2.11.10',
+    status:'ok', version:'2.11.12',
     models: app.models.map(m=>m.name),
     routes: app.apis.length, pages: app.pages.length,
     admin: app.admin?.prefix || null,