agentlang 0.10.1 → 0.10.2

package/src/api/http.ts

@@ -58,6 +58,8 @@ import {
   createFileRecord,
   deleteFileRecord,
 } from '../runtime/modules/files.js';
+import * as XLSX from 'xlsx';
+import { objectToQueryPattern } from '../language/parser.js';
 
 export async function startServer(
   appSpec: ApplicationSpec,
@@ -197,6 +199,14 @@ export async function startServer(
     handleMetaGet(req, res);
   });
 
+  app.post('/agentlang/QueryAsCsv', (req: Request, res: Response) => {
+    handleQueryAsCsvPost(req, res);
+  });
+
+  app.post('/agentlang/QueryAsXlsx', (req: Request, res: Response) => {
+    handleQueryAsXlsxPost(req, res);
+  });
+
   if (isNodeEnv && upload && uploadDir) {
     app.post('/uploadFile', upload.single('file'), (req: Request, res: Response) => {
       handleFileUpload(req, res, config);
@@ -730,6 +740,69 @@ function normalizedResult(r: Result): Result {
   }
 }
 
+/**
+ * Converts eval result to an array of flat row objects for CSV/XLSX.
+ * Handles:
+ * - [{ "EntityName": { "attr": "attrval" } }, ...] -> one row per item, columns = Entity + attrs
+ * - [{ "attr": "attrval" }, ...] -> one row per item, columns = attrs
+ * - [[ { "EntityName": { ... } }, ... ]] -> unwrap single outer array, then one row per inner item
+ */
+function evalResultToRows(data: Result): { [key: string]: unknown }[] {
+  let items: Result[];
+  if (Array.isArray(data) && data.length === 1 && Array.isArray(data[0])) {
+    items = data[0] as Result[];
+  } else {
+    items = Array.isArray(data) ? (data as Result[]) : [data];
+  }
+  return items.map((item: Result) => {
+    if (item === null || typeof item !== 'object') {
+      return { value: item };
+    }
+    if (Array.isArray(item)) {
+      return { value: item };
+    }
+    const obj = item as { [key: string]: unknown };
+    const keys = Object.keys(obj);
+    if (keys.length === 1) {
+      const [k] = keys;
+      const v = obj[k];
+      if (
+        v !== null &&
+        typeof v === 'object' &&
+        !Array.isArray(v) &&
+        Object.prototype.toString.call(v) === '[object Object]'
+      ) {
+        return { ...(v as { [key: string]: unknown }) };
+      }
+    }
+    return { ...obj };
+  });
+}
+
+/**
+ * Ensures cell value is stringifiable for CSV/XLSX (nested objects/arrays become JSON string).
+ */
+function cellValue(val: unknown): string | number | boolean | null {
+  if (val === null || val === undefined) return '';
+  if (typeof val === 'object') return JSON.stringify(val);
+  return val as string | number | boolean;
+}
+
+/**
+ * Parses column names from the first instance and returns an array-of-arrays
+ * for the sheet: first row = column names, following rows = data. This ensures
+ * CSV/XLSX output has proper headers (col1, col2, ...) not 0, 1, 2, ...
+ */
+function rowsToSheetAoa(
+  rows: { [key: string]: unknown }[]
+): (string | number | boolean | null)[][] {
+  if (rows.length === 0) return [];
+  const columns = Object.keys(rows[0] as object);
+  const headerRow = columns;
+  const dataRows = rows.map(row => columns.map(col => cellValue(row[col])));
+  return [headerRow, ...dataRows];
+}
+
 async function handleMetaGet(req: Request, res: Response): Promise<void> {
   try {
     const sessionInfo = await verifyAuth('', '', req.headers.authorization);
@@ -957,6 +1030,71 @@ async function handleMetaGet(req: Request, res: Response): Promise<void> {
   }
 }
 
+async function handleQueryAsCsvPost(req: Request, res: Response): Promise<void> {
+  try {
+    const sessionInfo = await verifyAuth('', '', req.headers.authorization);
+    if (isNoSession(sessionInfo)) {
+      res.status(401).send('Authorization required');
+      return;
+    }
+    const q = req.body?.q;
+    if (q === undefined) {
+      res.status(400).send('Missing or invalid pattern');
+      return;
+    }
+    const qs = objectToQueryPattern(q);
+    const result = await parseAndEvaluateStatement(qs, sessionInfo.userId);
+    const normalized = normalizedResult(result);
+    const rows = evalResultToRows(normalized);
+    const aoa = rowsToSheetAoa(rows);
+    const worksheet = XLSX.utils.aoa_to_sheet(aoa);
+    const workbook = XLSX.utils.book_new();
+    XLSX.utils.book_append_sheet(workbook, worksheet, 'Sheet1');
+    const buffer = XLSX.write(workbook, { type: 'buffer', bookType: 'csv' });
+    const filename = `eval-${Date.now()}.csv`;
+    res.setHeader('Content-Disposition', `attachment; filename="${filename}"`);
+    res.contentType('text/csv');
+    res.send(buffer);
+  } catch (err: any) {
+    logger.error(err);
+    if (!res.headersSent) {
+      res.status(statusFromErrorType(err)).send(err?.message ?? err?.toString());
+    }
+  }
+}
+
+async function handleQueryAsXlsxPost(req: Request, res: Response): Promise<void> {
+  try {
+    const sessionInfo = await verifyAuth('', '', req.headers.authorization);
+    if (isNoSession(sessionInfo)) {
+      res.status(401).send('Authorization required');
+      return;
+    }
+    const q = req.body?.q;
+    if (q === undefined) {
+      res.status(400).send('Missing or invalid pattern');
+      return;
+    }
+    const qs = objectToQueryPattern(q);
+    const result = await parseAndEvaluateStatement(qs, sessionInfo.userId);
+    const normalized = normalizedResult(result);
+    const rows = evalResultToRows(normalized);
+    const aoa = rowsToSheetAoa(rows);
+    const worksheet = XLSX.utils.aoa_to_sheet(aoa);
+    const workbook = XLSX.utils.book_new();
+    XLSX.utils.book_append_sheet(workbook, worksheet, 'Sheet1');
+    const buffer = XLSX.write(workbook, { type: 'buffer', bookType: 'xlsx' });
+    const filename = `eval-${Date.now()}.xlsx`;
+    res.setHeader('Content-Disposition', `attachment; filename="${filename}"`);
+    res.contentType('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
+    res.send(buffer);
+  } catch (err: any) {
+    logger.error(err);
+    if (!res.headersSent) {
+      res.status(statusFromErrorType(err)).send(err?.message ?? err?.toString());
+    }
+  }
+}
 async function handleFileUpload(
   req: Request & { file?: Express.Multer.File },
   res: Response,

package/src/language/agentlang.langium

@@ -115,7 +115,9 @@ Statement: pattern=Pattern hints+=RuntimeHint*;
 
 IfWithAlias: '(' if=If ')';
 
-RuntimeHint: aliasSpec=AliasSpec | catchSpec=CatchSpec | thenSpec=ThenSpec;
+RuntimeHint: aliasSpec=AliasSpec | catchSpec=CatchSpec | emptySpec=EmptySpec | thenSpec=ThenSpec;
+
+EmptySpec: '@empty' stmt=Statement;
 
 AliasSpec: ('@as' (alias=ID | '[' ( aliases+=ID (',' aliases+=ID)*)+ ']'));
 

package/src/language/generated/ast.ts

@@ -49,6 +49,7 @@ export type AgentlangKeywordNames =
     | "@catch"
     | "@desc"
     | "@distinct"
+    | "@empty"
     | "@enum"
     | "@expr"
     | "@from"
@@ -586,6 +587,21 @@ export function isElse(item: unknown): item is Else {
     return reflection.isInstance(item, Else.$type);
 }
 
+export interface EmptySpec extends langium.AstNode {
+    readonly $container: RuntimeHint;
+    readonly $type: 'EmptySpec';
+    stmt: Statement;
+}
+
+export const EmptySpec = {
+    $type: 'EmptySpec',
+    stmt: 'stmt'
+} as const;
+
+export function isEmptySpec(item: unknown): item is EmptySpec {
+    return reflection.isInstance(item, EmptySpec.$type);
+}
+
 export interface EntityActionsDefinitions extends langium.AstNode {
     readonly $container: RecordExtraDefinition;
     readonly $type: 'EntityActionsDefinitions';
@@ -1744,6 +1760,7 @@ export interface RuntimeHint extends langium.AstNode {
     readonly $type: 'RuntimeHint';
     aliasSpec?: AliasSpec;
     catchSpec?: CatchSpec;
+    emptySpec?: EmptySpec;
     thenSpec?: ThenSpec;
 }
 
@@ -1751,6 +1768,7 @@ export const RuntimeHint = {
     $type: 'RuntimeHint',
     aliasSpec: 'aliasSpec',
     catchSpec: 'catchSpec',
+    emptySpec: 'emptySpec',
     thenSpec: 'thenSpec'
 } as const;
 
@@ -1864,7 +1882,7 @@ export function isStandaloneStatement(item: unknown): item is StandaloneStatemen
 }
 
 export interface Statement extends langium.AstNode {
-    readonly $container: ArrayLiteral | CaseEntry | ConditionalFlowStep | Else | FlowEntry | ForEach | Handler | If | StandaloneStatement | ThenSpec | WorkflowDefinition;
+    readonly $container: ArrayLiteral | CaseEntry | ConditionalFlowStep | Else | EmptySpec | FlowEntry | ForEach | Handler | If | StandaloneStatement | ThenSpec | WorkflowDefinition;
     readonly $type: 'Statement';
     hints: Array<RuntimeHint>;
     pattern: Pattern;
@@ -2102,6 +2120,7 @@ export type AgentlangAstType = {
     Delete: Delete
     DirectiveDefinition: DirectiveDefinition
     Else: Else
+    EmptySpec: EmptySpec
     EntityActionsDefinitions: EntityActionsDefinitions
     EntityDefinition: EntityDefinition
     EnumSpec: EnumSpec
@@ -2517,6 +2536,15 @@ export class AgentlangAstReflection extends langium.AbstractAstReflection {
             },
             superTypes: []
         },
+        EmptySpec: {
+            name: EmptySpec.$type,
+            properties: {
+                stmt: {
+                    name: EmptySpec.stmt
+                }
+            },
+            superTypes: []
+        },
         EntityActionsDefinitions: {
             name: EntityActionsDefinitions.$type,
             properties: {
@@ -3361,6 +3389,9 @@ export class AgentlangAstReflection extends langium.AbstractAstReflection {
                 catchSpec: {
                     name: RuntimeHint.catchSpec
                 },
+                emptySpec: {
+                    name: RuntimeHint.emptySpec
+                },
                 thenSpec: {
                     name: RuntimeHint.thenSpec
                 }