naider 1.13.0 → 1.14.0

package/README.md

@@ -727,6 +727,35 @@ i18n "locales/":
 
 Usage: `i18n.t("greeting.hello")`, `i18n.setLang("ja")`.
 
+## Push Notifications
+
+```python
+push env.VAPID_PUBLIC env.VAPID_PRIVATE:
+  endpoint "/subscribe"
+```
+
+Usage: `push.send(subscription, "Title", "Body")`. Compiles to web-push (Node.js) or pywebpush (Python).
+
+## Full-Text Search
+
+```python
+search "meilisearch" "http://localhost:7700" env.MEILI_KEY:
+  index "products"
+```
+
+Usage: `search.query("keyword")`, `search.add(docs)`. Supports Meilisearch and Elasticsearch.
+
+## Image Processing
+
+```python
+image "photo.jpg" -> "output.jpg":
+  resize 800 600
+  grayscale
+  watermark "logo.png"
+```
+
+Operations: `resize`, `crop`, `rotate`, `blur`, `grayscale`, `flip`, `watermark`, `format`. Compiles to sharp (Node.js) or Pillow (Python).
+
 ## Environment Variables
 
 ```python

package/SPEC.naide

@@ -564,3 +564,23 @@ i18n "locales/":
   lang "ja" "ja.json"
 # usage: i18n.t("greeting.hello")
 # usage: i18n.setLang("ja")
+
+
+# ---- Push通知 ----
+push env.VAPID_PUBLIC env.VAPID_PRIVATE:
+  endpoint "/subscribe"
+# usage: push.send(subscription, "Title", "Body")
+
+
+# ---- 全文検索 ----
+search "meilisearch" "http://localhost:7700" env.MEILI_KEY:
+  index "products"
+# usage: search.query("keyword")
+# usage: search.add([{id: 1, name: "Item"}])
+
+
+# ---- 画像処理 ----
+image "photo.jpg" -> "output.jpg":
+  resize 800 600
+  grayscale
+  watermark "logo.png"

package/lsp/server.js

@@ -289,7 +289,7 @@ function getCompletions() {
     'cors', 'auth', 'crud', 'limit', 'cookie', 'session', 'static', 'ws', 'sse',
     'cache', 'view', 'upload', 'group', 'validate', 'openapi', 'error', 'mid', 'prompt',
     'page', 'cli', 'mail', 'graphql', 'desktop', 'screen',
-    'oauth', 'pay', 'storage', 'pdf', 'i18n',
+    'oauth', 'pay', 'storage', 'pdf', 'i18n', 'push', 'search', 'image',
   ];
   const builtins = [
     { label: 'uuid()', detail: 'Generate UUID v4', insertText: 'uuid()' },
@@ -351,6 +351,9 @@ const HOVER_DOCS = {
   'storage': '**storage** — Cloud storage (S3/GCS)\n```naide\nstorage "s3" env.BUCKET env.KEY env.SECRET:\n  region "ap-northeast-1"\n```\nUsage: `storage.upload(key, body)`, `storage.download(key)`',
   'pdf': '**pdf** — PDF generation\n```naide\npdf "report.pdf":\n  title "Report"\n  text "Hello"\n```',
   'i18n': '**i18n** — Internationalization\n```naide\ni18n "locales/":\n  default "en"\n  lang "en" "en.json"\n  lang "ja" "ja.json"\n```\nUsage: `i18n.t("key")`, `i18n.setLang("ja")`',
+  'push': '**push** — Push notifications\n```naide\npush env.VAPID_PUBLIC env.VAPID_PRIVATE:\n  endpoint "/subscribe"\n```\nUsage: `push.send(subscription, title, body)`',
+  'search': '**search** — Full-text search\n```naide\nsearch "meilisearch" "http://localhost:7700" env.KEY:\n  index "products"\n```\nUsage: `search.query("keyword")`, `search.add(docs)`',
+  'image': '**image** — Image processing\n```naide\nimage "input.jpg" -> "output.jpg":\n  resize 800 600\n  grayscale\n  watermark "logo.png"\n```',
 };
 
 function getHover(params) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "naider",
-  "version": "1.13.0",
+  "version": "1.14.0",
   "description": "NAIDE - Node AI Development Environment. AI-specialized language with built-in server, auth, DB, SQL, AI/LLM, WebSocket, bots (Discord/Slack/Telegram/LINE), CLI, HTML, email, GraphQL, desktop, mobile, and more — transpiles to Node.js/Python/Bun.",
   "main": "src/index.js",
   "exports": {

package/src/generator-python.js

@@ -153,6 +153,9 @@ export class PythonGenerator {
       case 'StorageDecl': return this.visitStorage(node);
       case 'PdfDecl': return this.visitPdf(node);
       case 'I18nDecl': return this.visitI18n(node);
+      case 'PushDecl': return this.visitPush(node);
+      case 'SearchDecl': return this.visitSearch(node);
+      case 'ImageDecl': return this.visitImage(node);
       default:
         this.emit(`# unknown: ${node.type}`);
     }
@@ -2146,4 +2149,103 @@ export class PythonGenerator {
     this.emit(`i18n = I18n()`);
     this.emitRaw('');
   }
+
+  // ===== Push =====
+  visitPush(node) {
+    const publicKey = this.expr(node.publicKey);
+    const privateKey = this.expr(node.privateKey);
+    this.addFromImport('pywebpush', 'webpush');
+    this.emitRaw('');
+    this.emit(`class Push:`);
+    this.indent++;
+    this.emit(`VAPID_PUBLIC = ${publicKey}`);
+    this.emit(`VAPID_PRIVATE = ${privateKey}`);
+    this.emit(`@staticmethod`);
+    this.emit(`def send(subscription, title, body):`);
+    this.indent++;
+    this.emit(`import json`);
+    this.emit(`webpush(subscription_info=subscription, data=json.dumps({'title': title, 'body': body}), vapid_private_key=Push.VAPID_PRIVATE, vapid_claims={'sub': 'mailto:noreply@example.com'})`);
+    this.indent--;
+    this.indent--;
+    this.emit(`push = Push()`);
+    this.emitRaw('');
+  }
+
+  // ===== Search =====
+  visitSearch(node) {
+    const engine = this.rawString(node.engine);
+    const host = this.expr(node.host);
+    const apiKey = this.expr(node.apiKey);
+    const index = node.index ? this.rawString(node.index) : 'default';
+
+    if (engine === 'meilisearch') {
+      this.addImport('meilisearch');
+      this.emitRaw('');
+      this.emit(`__search_client = meilisearch.Client(${host}, ${apiKey})`);
+      this.emit(`__search_index = __search_client.index(${JSON.stringify(index)})`);
+      this.emitRaw('');
+      this.emit(`class Search:`);
+      this.indent++;
+      this.emit(`@staticmethod`);
+      this.emit(`def query(q, **opts): return __search_index.search(q, opts)`);
+      this.emit(`@staticmethod`);
+      this.emit(`def add(docs): return __search_index.add_documents(docs)`);
+      this.emit(`@staticmethod`);
+      this.emit(`def remove(doc_id): return __search_index.delete_document(doc_id)`);
+      this.indent--;
+    } else {
+      this.addFromImport('elasticsearch', 'Elasticsearch');
+      this.emitRaw('');
+      this.emit(`__es = Elasticsearch(${host}, api_key=${apiKey})`);
+      this.emitRaw('');
+      this.emit(`class Search:`);
+      this.indent++;
+      this.emit(`@staticmethod`);
+      this.emit(`def query(q, **opts): return __es.search(index=${JSON.stringify(index)}, query={'match': {'_all': q}}, **opts)`);
+      this.emit(`@staticmethod`);
+      this.emit(`def add(doc): return __es.index(index=${JSON.stringify(index)}, body=doc)`);
+      this.emit(`@staticmethod`);
+      this.emit(`def remove(doc_id): return __es.delete(index=${JSON.stringify(index)}, id=doc_id)`);
+      this.indent--;
+    }
+    this.emit(`search = Search()`);
+    this.emitRaw('');
+  }
+
+  // ===== Image =====
+  visitImage(node) {
+    const input = this.expr(node.input);
+    const output = node.output ? this.expr(node.output) : input;
+    this.addFromImport('PIL', 'Image as PILImage');
+    this.emitRaw('');
+    this.emit(`__img = PILImage.open(${input})`);
+
+    for (const op of node.operations) {
+      if (op.op === 'resize') {
+        const w = op.args[0] || 800;
+        const h = op.args[1] || 600;
+        this.emit(`__img = __img.resize((${w}, ${h}))`);
+      } else if (op.op === 'crop') {
+        const l = op.args[0] || 0, t = op.args[1] || 0, r = op.args[2] || 100, b = op.args[3] || 100;
+        this.emit(`__img = __img.crop((${l}, ${t}, ${r}, ${b}))`);
+      } else if (op.op === 'rotate') {
+        this.emit(`__img = __img.rotate(${op.args[0] || 90})`);
+      } else if (op.op === 'blur') {
+        this.addFromImport('PIL.ImageFilter', 'GaussianBlur');
+        this.emit(`__img = __img.filter(GaussianBlur(radius=${op.args[0] || 5}))`);
+      } else if (op.op === 'grayscale' || op.op === 'greyscale') {
+        this.emit(`__img = __img.convert('L')`);
+      } else if (op.op === 'flip') {
+        this.emit(`__img = __img.transpose(PILImage.FLIP_TOP_BOTTOM)`);
+      } else if (op.op === 'watermark') {
+        const wm = op.args[0] ? this.rawString(op.args[0]) : 'watermark.png';
+        this.emit(`__wm = PILImage.open(${JSON.stringify(wm)})`);
+        this.emit(`__img.paste(__wm, (0, 0), __wm)`);
+      }
+    }
+
+    this.emit(`__img.save(${output})`);
+    this.emit(`print(f"Processed: {${output}}")`);
+    this.emitRaw('');
+  }
 }

package/src/generator.js

@@ -153,6 +153,9 @@ export class Generator {
       case 'StorageDecl': return this.visitStorage(node);
       case 'PdfDecl': return this.visitPdf(node);
       case 'I18nDecl': return this.visitI18n(node);
+      case 'PushDecl': return this.visitPush(node);
+      case 'SearchDecl': return this.visitSearch(node);
+      case 'ImageDecl': return this.visitImage(node);
       default:
         this.emit(`/* unknown: ${node.type} */`);
     }
@@ -2062,4 +2065,110 @@ export class Generator {
     this.emit(`};`);
     this.emitRaw('');
   }
+
+  // ===== Push Notifications =====
+
+  visitPush(node) {
+    const publicKey = this.expr(node.publicKey);
+    const privateKey = this.expr(node.privateKey);
+    const endpoint = node.endpoint ? this.rawPageString(node.endpoint) : '/subscribe';
+
+    this.emit(`import webpush from 'web-push';`);
+    this.emitRaw('');
+    this.emit(`webpush.setVapidDetails('mailto:noreply@example.com', ${publicKey}, ${privateKey});`);
+    this.emitRaw('');
+    this.emit(`const push = {`);
+    this.indent++;
+    this.emit(`async send(subscription, title, body, data = {}) {`);
+    this.indent++;
+    this.emit(`return webpush.sendNotification(subscription, JSON.stringify({ title, body, data }));`);
+    this.indent--;
+    this.emit(`},`);
+    this.emit(`async sendAll(subscriptions, title, body, data = {}) {`);
+    this.indent++;
+    this.emit(`return Promise.allSettled(subscriptions.map(sub => push.send(sub, title, body, data)));`);
+    this.indent--;
+    this.emit(`},`);
+    this.indent--;
+    this.emit(`};`);
+    this.emitRaw('');
+  }
+
+  // ===== Search =====
+
+  visitSearch(node) {
+    const engine = this.rawPageString(node.engine);
+    const host = this.expr(node.host);
+    const apiKey = this.expr(node.apiKey);
+    const index = node.index ? this.rawPageString(node.index) : 'default';
+
+    if (engine === 'meilisearch') {
+      this.emit(`import { MeiliSearch } from 'meilisearch';`);
+      this.emitRaw('');
+      this.emit(`const __searchClient = new MeiliSearch({ host: ${host}, apiKey: ${apiKey} });`);
+      this.emit(`const __searchIndex = __searchClient.index(${JSON.stringify(index)});`);
+      this.emitRaw('');
+      this.emit(`const search = {`);
+      this.indent++;
+      this.emit(`async query(q, opts = {}) { return __searchIndex.search(q, opts); },`);
+      this.emit(`async add(docs) { return __searchIndex.addDocuments(docs); },`);
+      this.emit(`async remove(id) { return __searchIndex.deleteDocument(id); },`);
+      this.emit(`async update(docs) { return __searchIndex.updateDocuments(docs); },`);
+      this.indent--;
+      this.emit(`};`);
+    } else {
+      this.emit(`import { Client } from '@elastic/elasticsearch';`);
+      this.emitRaw('');
+      this.emit(`const __esClient = new Client({ node: ${host}, auth: { apiKey: ${apiKey} } });`);
+      this.emitRaw('');
+      this.emit(`const search = {`);
+      this.indent++;
+      this.emit(`async query(q, opts = {}) { return __esClient.search({ index: ${JSON.stringify(index)}, query: { match: { _all: q } }, ...opts }); },`);
+      this.emit(`async add(doc) { return __esClient.index({ index: ${JSON.stringify(index)}, body: doc }); },`);
+      this.emit(`async remove(id) { return __esClient.delete({ index: ${JSON.stringify(index)}, id }); },`);
+      this.indent--;
+      this.emit(`};`);
+    }
+    this.emitRaw('');
+  }
+
+  // ===== Image Processing =====
+
+  visitImage(node) {
+    const input = this.expr(node.input);
+    const output = node.output ? this.expr(node.output) : input;
+
+    this.emit(`import sharp from 'sharp';`);
+    this.emitRaw('');
+    this.emit(`let __img = sharp(${input});`);
+
+    for (const op of node.operations) {
+      if (op.op === 'resize') {
+        const w = op.args[0] || 800;
+        const h = op.args[1] || null;
+        this.emit(`__img = __img.resize(${w}${h ? ', ' + h : ''});`);
+      } else if (op.op === 'crop') {
+        const l = op.args[0] || 0, t = op.args[1] || 0, w = op.args[2] || 100, h = op.args[3] || 100;
+        this.emit(`__img = __img.extract({ left: ${l}, top: ${t}, width: ${w}, height: ${h} });`);
+      } else if (op.op === 'watermark') {
+        const wm = op.args[0] ? (typeof op.args[0] === 'object' ? this.rawPageString(op.args[0]) : op.args[0]) : 'watermark.png';
+        this.emit(`__img = __img.composite([{ input: ${JSON.stringify(wm)}, gravity: 'southeast' }]);`);
+      } else if (op.op === 'rotate') {
+        this.emit(`__img = __img.rotate(${op.args[0] || 90});`);
+      } else if (op.op === 'blur') {
+        this.emit(`__img = __img.blur(${op.args[0] || 5});`);
+      } else if (op.op === 'grayscale' || op.op === 'greyscale') {
+        this.emit(`__img = __img.grayscale();`);
+      } else if (op.op === 'flip') {
+        this.emit(`__img = __img.flip();`);
+      } else if (op.op === 'format') {
+        const fmt = op.args[0] ? (typeof op.args[0] === 'object' ? this.rawPageString(op.args[0]) : op.args[0]) : 'png';
+        this.emit(`__img = __img.toFormat(${JSON.stringify(fmt)});`);
+      }
+    }
+
+    this.emit(`await __img.toFile(${output});`);
+    this.emit(`console.log('Processed:', ${output});`);
+    this.emitRaw('');
+  }
 }

package/src/parser.js

@@ -113,7 +113,8 @@ export class Parser {
       type === T.PAGE || type === T.CLI_APP || type === T.MAIL ||
       type === T.GRAPHQL || type === T.DESKTOP || type === T.SCREEN ||
       type === T.OAUTH || type === T.PAY || type === T.STORAGE ||
-      type === T.PDF || type === T.I18N;
+      type === T.PDF || type === T.I18N ||
+      type === T.PUSH || type === T.SEARCH || type === T.IMAGE;
   }
 
   expectPropertyName() {
@@ -180,6 +181,9 @@ export class Parser {
       case T.STORAGE: return this.parseStorage();
       case T.PDF: return this.parsePdf();
       case T.I18N: return this.parseI18n();
+      case T.PUSH: return this.parsePush();
+      case T.SEARCH: return this.parseSearch();
+      case T.IMAGE: return this.parseImage();
       case T.MODEL: return this.parseModel();
       case T.ON: return this.parseOn();
       case T.LOG: return this.parseLog();
@@ -1156,6 +1160,7 @@ export class Parser {
       case T.PAGE: case T.CLI_APP: case T.MAIL:
       case T.GRAPHQL: case T.DESKTOP: case T.SCREEN:
       case T.OAUTH: case T.PAY: case T.STORAGE: case T.PDF: case T.I18N:
+      case T.PUSH: case T.SEARCH: case T.IMAGE:
       case T.FROM: case T.AS: case T.IN:
         this.advance();
         return new ASTNode('Identifier', { name: tok.value });
@@ -2068,4 +2073,79 @@ export class Parser {
     if (this.at(T.DEDENT)) this.advance();
     return new ASTNode('I18nDecl', { dir, defaultLang, langs });
   }
+
+  // push "vapid_public" "vapid_private":
+  //   endpoint "/subscribe"
+  parsePush() {
+    this.expect(T.PUSH);
+    const publicKey = this.parseExpression();
+    const privateKey = this.parseExpression();
+    this.expect(T.COLON);
+    this.skipNewlines();
+    this.expect(T.INDENT);
+    let endpoint = null;
+    while (!this.at(T.DEDENT) && !this.at(T.EOF)) {
+      this.skipNewlines();
+      if (this.at(T.DEDENT) || this.at(T.EOF)) break;
+      const kw = this.peek().value;
+      if (kw === 'endpoint') { this.advance(); endpoint = this.parseString(); }
+      else { this.advance(); }
+      this.skipNewlines();
+    }
+    if (this.at(T.DEDENT)) this.advance();
+    return new ASTNode('PushDecl', { publicKey, privateKey, endpoint });
+  }
+
+  // search "meilisearch" "http://localhost:7700" apiKey:
+  //   index "products"
+  parseSearch() {
+    this.expect(T.SEARCH);
+    const engine = this.parseString();
+    const host = this.parseExpression();
+    const apiKey = this.parseExpression();
+    this.expect(T.COLON);
+    this.skipNewlines();
+    this.expect(T.INDENT);
+    let index = null;
+    while (!this.at(T.DEDENT) && !this.at(T.EOF)) {
+      this.skipNewlines();
+      if (this.at(T.DEDENT) || this.at(T.EOF)) break;
+      const kw = this.peek().value;
+      if (kw === 'index') { this.advance(); index = this.parseString(); }
+      else { this.advance(); }
+      this.skipNewlines();
+    }
+    if (this.at(T.DEDENT)) this.advance();
+    return new ASTNode('SearchDecl', { engine, host, apiKey, index });
+  }
+
+  // image "input.jpg" -> "output.jpg":
+  //   resize 800 600
+  //   crop 100 100 400 300
+  //   watermark "logo.png"
+  parseImage() {
+    this.expect(T.IMAGE);
+    const input = this.parseExpression();
+    let output = null;
+    if (this.at(T.ARROW)) { this.advance(); output = this.parseExpression(); }
+    this.expect(T.COLON);
+    this.skipNewlines();
+    this.expect(T.INDENT);
+    const operations = [];
+    while (!this.at(T.DEDENT) && !this.at(T.EOF)) {
+      this.skipNewlines();
+      if (this.at(T.DEDENT) || this.at(T.EOF)) break;
+      const op = this.advance().value;
+      const args = [];
+      while (!this.at(T.NEWLINE) && !this.at(T.DEDENT) && !this.at(T.EOF)) {
+        if (this.at(T.STRING)) { args.push(this.parseString()); }
+        else if (this.at(T.NUMBER)) { args.push(this.advance().value); }
+        else { args.push(this.parseExpression()); break; }
+      }
+      operations.push({ op, args });
+      this.skipNewlines();
+    }
+    if (this.at(T.DEDENT)) this.advance();
+    return new ASTNode('ImageDecl', { input, output, operations });
+  }
 }

package/src/tokens.js

@@ -98,6 +98,9 @@ export const T = {
   STORAGE: 'STORAGE',
   PDF: 'PDF',
   I18N: 'I18N',
+  PUSH: 'PUSH',
+  SEARCH: 'SEARCH',
+  IMAGE: 'IMAGE',
 
   // Operators
   ASSIGN: 'ASSIGN',
@@ -224,6 +227,9 @@ export const KEYWORDS = {
   'storage': T.STORAGE,
   'pdf': T.PDF,
   'i18n': T.I18N,
+  'push': T.PUSH,
+  'search': T.SEARCH,
+  'image': T.IMAGE,
   'true': T.BOOL,
   'false': T.BOOL,
   'null': T.NULL,

package/vscode-naide/syntaxes/naide.tmLanguage.json

@@ -87,7 +87,7 @@
       "name": "keyword.control.naide"
     },
     "keywords-server": {
-      "match": "\\b(server|bot|slash|get|post|put|del|patch|mid|cors|limit|auth|crud|static|ws|sse|group|upload|cookie|session|view|cache|validate|openapi|error|on|page|cli|mail|graphql|desktop|screen|oauth|pay|storage|pdf|i18n)\\b",
+      "match": "\\b(server|bot|slash|get|post|put|del|patch|mid|cors|limit|auth|crud|static|ws|sse|group|upload|cookie|session|view|cache|validate|openapi|error|on|page|cli|mail|graphql|desktop|screen|oauth|pay|storage|pdf|i18n|push|search|image)\\b",
       "name": "keyword.other.naide"
     },
     "keywords-declaration": {