naider 1.24.5 → 2.0.1

package/examples/async.nx

@@ -1,40 +0,0 @@
--- NAIDE-X async/await
-
-~f fetchData(s:url)a
-  a:res=~fetch(url)
-  a:data=~res.json()
-  >data
-
-~f getTopUsers()l
-  a:data=~fetchData("https://jsonplaceholder.typicode.com/users")
-  l:result=data
-    |>filter((u)=>u.name.length>5)
-    |>map((u)=>({name:u.name,email:u.email}))
-  >result
-
-~f safeFetch(s:url)m
-  !
-    a:data=~fetchData(url)
-    >{ok:true,data:data}
-  !!e
-    log.e"Fetch failed: {e.message}"
-    >{ok:false,error:e.message}
-
-~f loadDash()m
-  l:urls=[
-    "https://jsonplaceholder.typicode.com/users",
-    "https://jsonplaceholder.typicode.com/posts",
-    "https://jsonplaceholder.typicode.com/todos"
-  ]
-  l:results=~~urls.map((url)=>fetchData(url))
-  >{users:results[0],posts:results[1],todos:results[2]}
-
-~f main()
-  log"Fetching data..."
-  m:dash=~safeFetch("https://jsonplaceholder.typicode.com/users")
-  ?dash.ok
-    log"Got {dash.data.length} items"
-  :
-    log.e dash.error
-
-main()

package/examples/crud.nx

@@ -1,64 +0,0 @@
--- NAIDE-X full CRUD
-
-^Todo
-  s:id
-  s:title
-  b:done=false
-  s:createdAt
-
-  f toggle()
-    self.done=not self.done
-
-  f toJSON()m
-    >{id:self.id,title:self.title,done:self.done,createdAt:self.createdAt}
-
-~l:todos=[]
-~i:nextId=1
-
-f findTodo(s:id)a
-  @todo<todos
-    ?todo.id==id
-      >todo
-  >null
-
-f genId()s
-  s:id="todo_{nextId}"
-  nextId+=1
-  >id
-
-$app:8080
-
-  G"/api/todos"
-    >{todos:todos,count:todos.length}
-
-  G"/api/todos/:id"(req,res)
-    a:todo=findTodo(req.params.id)
-    ?todo==null
-      >.s 404 {error:"Todo not found"}
-    >todo
-
-  P"/api/todos"(req,res)
-    m:body=req.body
-    ?not body.title
-      >.s 400 {error:"Title is required"}
-    m:todo={id:genId(),title:body.title,done:false,createdAt:new Date().toISOString()}
-    todos.push(todo)
-    >.s 201 todo
-
-  U"/api/todos/:id"(req,res)
-    a:todo=findTodo(req.params.id)
-    ?todo==null
-      >.s 404 {error:"Todo not found"}
-    m:body=req.body
-    ?body.title
-      todo.title=body.title
-    ?body.done!=null
-      todo.done=body.done
-    >todo
-
-  D"/api/todos/:id"(req,res)
-    i:idx=todos.findIndex((t)=>t.id==req.params.id)
-    ?idx==-1
-      >.s 404 {error:"Todo not found"}
-    todos.splice(idx,1)
-    >{status:"deleted"}

package/examples/fullapp.nx

@@ -1,74 +0,0 @@
--- Full NAIDE-X app with all features
-
-db "data/"
-
-env:
-  PORT int default(3000)
-  JWT_SECRET str required
-
-schema User:
-  id auto
-  name str required min(2) max(50)
-  email str required email
-  password str required
-  role str default("user")
-
-schema Todo:
-  id auto
-  title str required min(1)
-  done bool default(false)
-  created timestamp auto
-
-$app:PORT
-  cors "*"
-  cookie
-  auth JWT_SECRET:
-    protect "/api/*"
-    public "/api/auth/*"
-  limit "/api/*" 100 "1m"
-  static "/public"
-  crud "/api/users" User
-  crud "/api/todos" Todo
-
-  group "/api/v1":
-    G"/status"
-      >{version:"1.0",status:"ok"}
-
-  P"/api/auth/register"(req,res)
-    s:hashed=hash(req.body.password)
-    user=UserStore.create({name:req.body.name,email:req.body.email,password:hashed})
-    ?user.error
-      >.s 400 {errors:user.error}
-    token=auth.sign({id:user.id,role:user.role})
-    >{token,user:{id:user.id,name:user.name,email:user.email}}
-
-  P"/api/auth/login"(req,res)
-    user=UserStore.where({email:req.body.email})[0]
-    ?not user
-      >.s 401 {error:"Invalid credentials"}
-    ?not verify(req.body.password,user.password)
-      >.s 401 {error:"Invalid credentials"}
-    token=auth.sign({id:user.id,role:user.role})
-    >{token}
-
-  G"/health"
-    >{status:"ok"}
-
-  G"/"
-    >.h "<h1>Welcome to NAIDE</h1>"
-
-  ws "/chat":
-    on "connect":
-      send({type:"welcome"})
-    on "message" (data):
-      broadcast(data)
-
-  error (err, req, res):
-    log.error err.message
-    >.s 500 {error:"Internal server error"}
-
-every "30m":
-  log"cleanup running"
-
-watch User.create (event):
-  log"new user: {event.data.name}"

package/examples/hello.nx

@@ -1,29 +0,0 @@
--- NAIDE-X hello world
-
-s:name="World"
-i:count=3
-
-f greet(s:who)s
-  >"Hello, {who}!"
-
-@i<0..count
-  s:msg=greet(name)
-  log msg
-
-?count>5
-  log"many"
-|count>2
-  log"a few"
-:
-  log"few"
-
-l:items=["apple","banana","cherry"]
-
-@fruit<items
-  log"I like {fruit}"
-
-s:status="ok"
-%status
-  "ok": log "All good"
-  "error": log "Something went wrong"
-  _: log "Unknown"

package/examples/server.nx

@@ -1,27 +0,0 @@
--- NAIDE-X REST API server
-
-$app:3000
-
-  G"/"
-    >{message:"Welcome to NAIDE-X API"}
-
-  G"/users"
-    l:users=[
-      {id:1,name:"Alice",age:30},
-      {id:2,name:"Bob",age:25}
-    ]
-    >users
-
-  G"/users/:id"(req,res)
-    s:id=req.params.id
-    >{id:id,name:"User {id}"}
-
-  P"/users"(req,res)
-    m:body=req.body
-    log"Creating user: {body.name}"
-    >{status:"created",user:body}
-
-  D"/users/:id"(req,res)
-    s:id=req.params.id
-    log"Deleting user {id}"
-    >{status:"deleted",id:id}

package/examples/sql-app.nx

@@ -1,23 +0,0 @@
--- SQLite-backed API (NAIDE-X)
--- npm install better-sqlite3
-
-db.sql "sqlite" "app.db"
-
-env:
-  PORT int default(3000)
-
-schema Task:
-  id auto
-  title str required min(1) max(200)
-  done bool default(false)
-
-$app:PORT
-  cors "*"
-  crud "/api/tasks" Task
-
-  U"/api/tasks/:id/toggle"(req,res)
-    task=TaskStore.getById(req.params.id)
-    ?not task
-      >.s 404 {error:"Not found"}
-    updated=TaskStore.update(req.params.id,{done:!task.done})
-    >updated

package/examples/todo-api.nx

@@ -1,31 +0,0 @@
--- Todo API in NAIDE-X (~80% fewer tokens)
--- Run: naide examples/todo-api.nx
-
-db "data/"
-
-env:
-  PORT int default(3000)
-
-schema Todo:
-  id auto
-  title str required min(1) max(200)
-  done bool default(false)
-  created timestamp auto
-
-$app:PORT
-  cors "*"
-  cookie
-  cache "/api/todos" "30s"
-  validate "/api/todos" Todo
-  crud "/api/todos" Todo
-  openapi "/docs"
-  G"/"
-    >.h "<h1>Todo API</h1><p>GET /api/todos | /docs</p>"
-  G"/api/stats"(req,res)
-    l:all=TodoStore.all()
-    i:total=all.length
-    i:done=all.filter((t)=>t.done).length
-    >{total,done,pending:total-done}
-  error (err,req,res):
-    log.e err.message
-    >.s 500 {error:err.message}

package/src/preprocess.js

@@ -1,308 +0,0 @@
-const TYPE_MAP = { s: 'str', i: 'int', n: 'num', b: 'bool', l: 'list', m: 'map', a: 'any', j: 'json', v: 'void' };
-const TYPE_CHARS = new Set(Object.keys(TYPE_MAP));
-
-function expandType(ch) { return TYPE_MAP[ch] || ch; }
-
-function expandParams(paramStr) {
-  if (!paramStr) return '';
-  return paramStr.split(',').map(p => {
-    p = p.trim();
-    if (!p) return p;
-    const m = p.match(/^(\.\.\.)?([ sinblmaj]):(.+)$/);
-    if (m) return `${m[1] || ''}${expandType(m[2])} ${m[3]}`;
-    const m2 = p.match(/^(\.\.\.)?([ sinblmaj])(\w+)$/);
-    if (m2) return `${m2[1] || ''}${expandType(m2[2])} ${m2[3]}`;
-    return p;
-  }).join(', ');
-}
-
-function transformFunc(rest, isAsync, isPublic) {
-  const pub = isPublic ? 'pub ' : '';
-  const fn = isAsync ? 'fn.async' : 'fn';
-  const nameM = rest.match(/^(\w+)/);
-  if (!nameM) return `${pub}${fn} ${rest}:`;
-  const name = nameM[1];
-  let rem = rest.slice(name.length);
-
-  let params = '';
-  if (rem.startsWith('(')) {
-    let depth = 1, i = 1;
-    while (i < rem.length && depth > 0) {
-      if (rem[i] === '(') depth++;
-      if (rem[i] === ')') depth--;
-      i++;
-    }
-    params = expandParams(rem.slice(1, i - 1));
-    rem = rem.slice(i).trim();
-  }
-
-  let retType = '';
-  if (rem.length > 0 && TYPE_CHARS.has(rem[0]) && (rem.length === 1 || !rem[1].match(/\w/))) {
-    retType = ` -> ${expandType(rem[0])}`;
-  }
-
-  return `${pub}${fn} ${name}(${params})${retType}:`;
-}
-
-function transformRoute(method, rest) {
-  const m = rest.match(/^("[^"]*")\s*(\[[^\]]*\])?\s*(\([^)]*\))?\s*(.*)$/);
-  if (!m) return `${method} ${rest}:`;
-  const path = m[1];
-  const middleware = m[2] ? ` ${m[2]}` : '';
-  const routeParams = m[3] ? ` ${m[3]}` : '';
-  const inline = m[4] ? m[4].trim() : '';
-
-  if (inline) {
-    const body = transformContent(inline);
-    return `${method} ${path}${middleware}${routeParams}:\n  ${body}`;
-  }
-  return `${method} ${path}${middleware}${routeParams}:`;
-}
-
-function transformAwait(text) {
-  // ~~ → await.all
-  text = text.replace(/~~/g, 'await.all ');
-  // ~ before identifier or ( → await (but not ~f, ~TYPE: which are handled at line level)
-  text = text.replace(/~(\w)/g, (_, ch) => `await ${ch}`);
-  text = text.replace(/~\(/g, 'await (');
-  return text;
-}
-
-function transformContent(line) {
-  // Log shorthands
-  line = line.replace(/\blog\.e\b/g, 'log.error');
-  line = line.replace(/\blog\.w\b/g, 'log.warn');
-  line = line.replace(/\blog\.i\b/g, 'log.info');
-  line = line.replace(/\blog\.d\b/g, 'log.debug');
-  // log"msg" → log "msg"
-  line = line.replace(/\blog"/g, 'log "');
-  line = line.replace(/\blog\.error"/g, 'log.error "');
-  line = line.replace(/\blog\.warn"/g, 'log.warn "');
-  line = line.replace(/\blog\.info"/g, 'log.info "');
-  line = line.replace(/\blog\.debug"/g, 'log.debug "');
-  // Await transforms
-  line = transformAwait(line);
-  return line;
-}
-
-export function preprocess(source) {
-  const lines = source.split('\n');
-  const result = [];
-
-  for (let raw of lines) {
-    const indentM = raw.match(/^(\s*)/);
-    const indent = indentM ? indentM[1] : '';
-    let line = raw.slice(indent.length);
-
-    // Empty line
-    if (!line.trim()) { result.push(''); continue; }
-
-    // Comment: -- → #
-    if (line.startsWith('--')) { result.push(indent + '#' + line.slice(2)); continue; }
-
-    // Keep # comments as-is
-    if (line.startsWith('#') && !line.startsWith('#=')) { result.push(raw); continue; }
-
-    const first = line[0];
-    const second = line[1] || '';
-    let out = '';
-
-    // > return
-    if (first === '>' && second !== '=' && second !== '>') {
-      const rest = line.slice(1).trim();
-      if (rest.startsWith('.s ') || rest.startsWith('.s(')) {
-        out = 'ret.status ' + transformContent(rest.slice(3));
-      } else if (rest.startsWith('.r ')) {
-        out = 'ret.redirect ' + transformContent(rest.slice(3));
-      } else if (rest.startsWith('.h ')) {
-        out = 'ret.html ' + transformContent(rest.slice(3));
-      } else if (rest.startsWith('.t ')) {
-        out = 'ret.text ' + transformContent(rest.slice(3));
-      } else if (rest.startsWith('.f ')) {
-        out = 'ret.file ' + transformContent(rest.slice(3));
-      } else if (rest.startsWith('.v ')) {
-        out = 'ret.render ' + transformContent(rest.slice(3));
-      } else if (rest.startsWith('.d ')) {
-        out = 'ret.download ' + transformContent(rest.slice(3));
-      } else {
-        out = rest ? 'ret ' + transformContent(rest) : 'ret';
-      }
-    }
-    // ? if
-    else if (first === '?' && second !== '.' && second !== '?') {
-      out = 'if ' + transformContent(line.slice(1).trim()) + ':';
-    }
-    // | elif (but not |>)
-    else if (first === '|' && second !== '>') {
-      out = 'elif ' + transformContent(line.slice(1).trim()) + ':';
-    }
-    // : else (alone on line)
-    else if (line.trim() === ':') {
-      out = 'else:';
-    }
-    // @ loop
-    else if (first === '@') {
-      const rest = line.slice(1);
-      const loopM = rest.match(/^(\w+(?:,\w+)?)<(.+)$/);
-      if (loopM) {
-        const vars = loopM[1];
-        const col = transformContent(loopM[2]);
-        if (col.includes('..')) {
-          const [start, end] = col.split('..');
-          out = `for ${vars} in ${start}..${end}:`;
-        } else if (vars.includes(',')) {
-          const [k, v] = vars.split(',');
-          out = `each ${k}, ${v} in ${col}:`;
-        } else {
-          out = `each ${vars} in ${col}:`;
-        }
-      } else {
-        out = transformContent(line);
-      }
-    }
-    // * while
-    else if (first === '*') {
-      out = 'while ' + transformContent(line.slice(1).trim()) + ':';
-    }
-    // !!! ensure/finally (before !! and ! checks)
-    else if (first === '!' && second === '!' && (line[2] || '') === '!') {
-      out = 'ensure:';
-    }
-    // !! catch (before ! try check)
-    else if (first === '!' && second === '!') {
-      const rest = line.slice(2).trim();
-      out = rest ? `fail ${rest}:` : 'fail:';
-    }
-    // ! try (alone)
-    else if (line.trim() === '!') {
-      out = 'try:';
-    }
-    // $ server
-    else if (first === '$') {
-      const rest = line.slice(1);
-      const srvM = rest.match(/^(\w+):(.+)$/);
-      if (srvM) {
-        out = `server ${srvM[1]} port ${transformContent(srvM[2].trim())}:`;
-      } else {
-        out = `server ${rest.trim()}:`;
-      }
-    }
-    // HTTP routes: G P U D
-    else if (first === 'G' && second === '"') { out = transformRoute('get', line.slice(1)); }
-    else if (first === 'P' && second === '"') { out = transformRoute('post', line.slice(1)); }
-    else if (first === 'U' && second === '"') { out = transformRoute('put', line.slice(1)); }
-    else if (first === 'D' && second === '"') { out = transformRoute('del', line.slice(1)); }
-    else if (first === 'X' && second === '"') { out = transformRoute('patch', line.slice(1)); }
-    // ^ model
-    else if (first === '^') {
-      const rest = line.slice(1).trim();
-      const extM = rest.match(/^(\w+)<(\w+)$/);
-      if (extM) {
-        out = `model ${extM[1]} extends ${extM[2]}:`;
-      } else {
-        out = `model ${rest}:`;
-      }
-    }
-    // < import
-    else if (first === '<') {
-      const rest = line.slice(1);
-      if (rest.startsWith('{')) {
-        const impM = rest.match(/^\{([^}]+)\}"(.+)"$/);
-        if (impM) {
-          out = `use {${impM[1]}} from "${impM[2]}"`;
-        } else {
-          out = transformContent(line);
-        }
-      } else {
-        const fromM = rest.match(/^(\w+)"(.+)"$/);
-        if (fromM) {
-          out = `use ${fromM[1]} from "${fromM[2]}"`;
-        } else {
-          out = `use ${rest.trim()}`;
-        }
-      }
-    }
-    // % match
-    else if (first === '%') {
-      out = 'match ' + transformContent(line.slice(1).trim()) + ':';
-    }
-    // + export prefix
-    else if (first === '+') {
-      const inner = line.slice(1);
-      if (inner.startsWith('~f ')) {
-        out = transformFunc(inner.slice(3), true, true);
-      } else if (inner.startsWith('f ')) {
-        out = transformFunc(inner.slice(2), false, true);
-      } else {
-        const tvM = inner.match(/^([sinblmaj]):(\w+)=(.+)$/);
-        if (tvM) {
-          out = `pub ${expandType(tvM[1])} ${tvM[2]} = ${transformContent(tvM[3])}`;
-        } else {
-          out = 'pub ' + transformContent(inner);
-        }
-      }
-    }
-    // ~f async function
-    else if (first === '~' && second === 'f' && line[2] === ' ') {
-      out = transformFunc(line.slice(3), true, false);
-    }
-    // ~TYPE:name=value → mutable
-    else if (first === '~' && TYPE_CHARS.has(second) && line[2] === ':') {
-      const rest = line.slice(1);
-      const tvM = rest.match(/^([sinblmaj]):(\w+)=(.+)$/);
-      if (tvM) {
-        out = `mut ${expandType(tvM[1])} ${tvM[2]} = ${transformContent(tvM[3])}`;
-      } else {
-        // Mutable field without assignment: ~s:name
-        const fieldM = rest.match(/^([sinblmaj]):(\w+)$/);
-        if (fieldM) {
-          out = `mut ${expandType(fieldM[1])} ${fieldM[2]}`;
-        } else {
-          out = transformContent(line);
-        }
-      }
-    }
-    // f function
-    else if (first === 'f' && second === ' ') {
-      out = transformFunc(line.slice(2), false, false);
-    }
-    // TYPE:name=value → typed variable
-    else if (TYPE_CHARS.has(first) && second === ':') {
-      const rest = line;
-      const tvM = rest.match(/^([sinblmaj]):(\w+)=(.+)$/);
-      if (tvM) {
-        out = `${expandType(tvM[1])} ${tvM[2]} = ${transformContent(tvM[3])}`;
-      } else {
-        // Could be a type field in model: s:name (no assignment)
-        const fieldM = rest.match(/^([sinblmaj]):(\w+)$/);
-        if (fieldM) {
-          out = `${expandType(fieldM[1])} ${fieldM[2]}`;
-        } else {
-          // type:name=... with complex value
-          const fieldDefM = rest.match(/^([sinblmaj]):(\w+)=(.+)$/);
-          if (fieldDefM) {
-            out = `${expandType(fieldDefM[1])} ${fieldDefM[2]} = ${transformContent(fieldDefM[3])}`;
-          } else {
-            out = transformContent(line);
-          }
-        }
-      }
-    }
-    // Default: apply inline transforms
-    else {
-      out = transformContent(line);
-    }
-
-    // Handle multi-line output from route transform
-    if (out.includes('\n')) {
-      const subLines = out.split('\n');
-      for (const sl of subLines) {
-        result.push(indent + sl);
-      }
-    } else {
-      result.push(indent + out);
-    }
-  }
-
-  return result.join('\n');
-}

package/vscode-naide/language-configuration-nx.json

@@ -1,32 +0,0 @@
-{
-  "comments": {
-    "lineComment": "--"
-  },
-  "brackets": [
-    ["{", "}"],
-    ["[", "]"],
-    ["(", ")"]
-  ],
-  "autoClosingPairs": [
-    { "open": "{", "close": "}" },
-    { "open": "[", "close": "]" },
-    { "open": "(", "close": ")" },
-    { "open": "\"", "close": "\"" },
-    { "open": "'", "close": "'" }
-  ],
-  "surroundingPairs": [
-    { "open": "{", "close": "}" },
-    { "open": "[", "close": "]" },
-    { "open": "(", "close": ")" },
-    { "open": "\"", "close": "\"" },
-    { "open": "'", "close": "'" }
-  ],
-  "indentationRules": {
-    "increaseIndentPattern": "^\\s*(fn|fn\\.async|if|elif|else|each|for|while|match|try|fail|ensure|server|model|on|schema|crud|auth|env|every|watch|ws|group|upload|queue|job|test|get|post|put|del|patch|error|sse|view|cache|mid|validate|openapi|static|session|cookie|cors|limit)\\b.*:\\s*$",
-    "decreaseIndentPattern": "^\\s*(elif|else|fail|ensure)\\b"
-  },
-  "folding": {
-    "offSide": true
-  },
-  "wordPattern": "(-?\\d*\\.\\d\\w*)|([^\\`\\~\\!\\@\\#\\%\\^\\&\\*\\(\\)\\-\\=\\+\\[\\{\\]\\}\\\\\\|\\;\\:\\'\\\"\\,\\.\\<\\>\\/\\?\\s]+)"
-}