agentlang 0.0.8 → 0.0.11

package/src/language/agentlang.langium

@@ -2,7 +2,7 @@ grammar Agentlang
 
 entry ModuleDefinition: 'module' name=ID (imports+=Import)* (defs+=Definition)*;
 
-Import: 'import' path=STRING 'as' name=ID;
+Import: 'import' path=STRING '@as' name=ID;
 
 Definition: SchemaDefinition | RelationshipDefinition | WorkflowDefinition | StandaloneStatement 
 | AgentDefinition | ResolverDefinition ;
@@ -33,7 +33,7 @@ ExtendsClause: 'extends' parentName=ID;
 RelationshipDefinition: 'relationship' name=ID type=('contains' | 'between') nodes=RelNodes properties+=PropertyDefinition*
 (schema=RecordSchemaDefinition)?;
 
-NodeDefinition: name=ID | name=ID 'as' alias=ID;
+NodeDefinition: name=ID | name=ID '@as' alias=ID;
 
 RelNodes: '(' node1=NodeDefinition ',' node2=NodeDefinition ')';
 
@@ -94,13 +94,13 @@ fragment Body: '{' '}' | '{' (statements+=Statement (';' statements+=Statement)*
 
 WorkflowDefinition: 'workflow' name=ID Body;
 
-Pattern: expr=Expr | crudMap=CrudMap | if=If | forEach=ForEach | delete=Delete | purge=Purge | fullTextSearch=FullTextSearch;
+Pattern: expr=Expr | crudMap=CrudMap | if=If | forEach=ForEach | delete=Delete | purge=Purge | fullTextSearch=FullTextSearch | return=Return;
 
 Statement: pattern=Pattern hints+=RuntimeHint*;
 
 RuntimeHint: aliasSpec=AliasSpec | catchSpec=CatchSpec;
 
-AliasSpec: ('as' (alias=ID | '[' ( aliases+=ID (',' aliases+=ID)*)+ ']'));
+AliasSpec: ('@as' (alias=ID | '[' ( aliases+=ID (',' aliases+=ID)*)+ ']'));
 
 CrudMap: '{' (name=QueryId '{''}' 
              | (name=ID '{''}' ',' '@from' source=Literal (',' upsert+='@upsert')?)
@@ -118,6 +118,8 @@ SelectIntoEntry: alias=ID attribute=Ref;
 
 FullTextSearch: '{' name=QueryId query=Literal options=MapLiteral? '}';
 
+Return: 'return' pat=Pattern;
+
 AgentDefinition: 'agent' name=(ID | STRING) (body=AgentDefBody? | '{''}');
 
 AgentDefBody: '{' (attributes+=AgentPropertyDef (',' attributes+=AgentPropertyDef)*)+ '}';
@@ -135,7 +137,7 @@ ResolverMethodName: name=('create' | 'update' | 'upsert' | 'delete' | 'query' |
 
 RelationshipPattern: name=ID pattern=Pattern;
 
-CatchSpec: 'catch' '{' (handlers+=Handler)+ '}';
+CatchSpec: '@catch' '{' (handlers+=Handler)+ '}';
 
 Handler: except=('not_found' | 'error') stmt=Statement;
 

package/src/language/generated/ast.ts

@@ -38,8 +38,10 @@ export type AgentlangKeywordNames =
     | "@"
     | "@actions"
     | "@after"
+    | "@as"
     | "@async"
     | "@before"
+    | "@catch"
     | "@enum"
     | "@expr"
     | "@from"
@@ -54,10 +56,8 @@ export type AgentlangKeywordNames =
     | "agent"
     | "allow"
     | "and"
-    | "as"
     | "await"
     | "between"
-    | "catch"
     | "contains"
     | "create"
     | "delete"
@@ -84,6 +84,7 @@ export type AgentlangKeywordNames =
     | "record"
     | "relationship"
     | "resolver"
+    | "return"
     | "roles"
     | "subscribe"
     | "true"
@@ -705,7 +706,7 @@ export function isOneOfSpec(item: unknown): item is OneOfSpec {
 }
 
 export interface Pattern extends langium.AstNode {
-    readonly $container: Delete | ForEach | Purge | RelationshipPattern | Statement;
+    readonly $container: Delete | ForEach | Purge | RelationshipPattern | Return | Statement;
     readonly $type: 'Pattern';
     crudMap?: CrudMap;
     delete?: Delete;
@@ -714,6 +715,7 @@ export interface Pattern extends langium.AstNode {
     fullTextSearch?: FullTextSearch;
     if?: If;
     purge?: Purge;
+    return?: Return;
 }
 
 export const Pattern = 'Pattern';
@@ -995,6 +997,18 @@ export function isResolverMethodSpec(item: unknown): item is ResolverMethodSpec
     return reflection.isInstance(item, ResolverMethodSpec);
 }
 
+export interface Return extends langium.AstNode {
+    readonly $container: Pattern;
+    readonly $type: 'Return';
+    pat: Pattern;
+}
+
+export const Return = 'Return';
+
+export function isReturn(item: unknown): item is Return {
+    return reflection.isInstance(item, Return);
+}
+
 export interface RuntimeHint extends langium.AstNode {
     readonly $container: Statement;
     readonly $type: 'RuntimeHint';
@@ -1179,6 +1193,7 @@ export type AgentlangAstType = {
     ResolverFnName: ResolverFnName
     ResolverMethodName: ResolverMethodName
     ResolverMethodSpec: ResolverMethodSpec
+    Return: Return
     RuntimeHint: RuntimeHint
     SchemaDefinition: SchemaDefinition
     SelectIntoEntry: SelectIntoEntry
@@ -1194,7 +1209,7 @@ export type AgentlangAstType = {
 export class AgentlangAstReflection extends langium.AbstractAstReflection {
 
     getAllTypes(): string[] {
-        return [ActionEntry, AfterTriggerDefinition, AgentDefBody, AgentDefinition, AgentPropertyDef, AliasSpec, ArrayLiteral, AsyncFnCall, AttributeDefinition, AttributeValueExpression, BeforeTriggerDefinition, BinExpr, CatchSpec, CompositeUniqueDefinition, CrudMap, CrudMapBody, Definition, Delete, Else, EntityActionsDefinitions, EntityDefinition, EnumSpec, EventDefinition, Expr, ExtendsClause, FnCall, ForEach, FullTextSearch, Group, Handler, If, Import, KvPair, KvPairs, Literal, MapEntry, MapKey, MapLiteral, MetaDefinition, ModuleDefinition, NegExpr, NodeDefinition, NotExpr, OneOfSpec, Pattern, PrePostTriggerDefinition, PrimExpr, PropertyDefinition, Purge, RbacAllowSpec, RbacExpressionSpec, RbacOpr, RbacRolesSpec, RbacSpecDefinition, RbacSpecEntries, RbacSpecEntry, RecordDefinition, RecordExtraDefinition, RecordSchemaDefinition, RefSpec, RelNodes, RelationshipDefinition, RelationshipPattern, ResolverDefinition, ResolverFnName, ResolverMethodName, ResolverMethodSpec, RuntimeHint, SchemaDefinition, SelectIntoEntry, SelectIntoSpec, SetAttribute, StandaloneStatement, Statement, TriggerDefinition, TriggerEntry, WorkflowDefinition];
+        return [ActionEntry, AfterTriggerDefinition, AgentDefBody, AgentDefinition, AgentPropertyDef, AliasSpec, ArrayLiteral, AsyncFnCall, AttributeDefinition, AttributeValueExpression, BeforeTriggerDefinition, BinExpr, CatchSpec, CompositeUniqueDefinition, CrudMap, CrudMapBody, Definition, Delete, Else, EntityActionsDefinitions, EntityDefinition, EnumSpec, EventDefinition, Expr, ExtendsClause, FnCall, ForEach, FullTextSearch, Group, Handler, If, Import, KvPair, KvPairs, Literal, MapEntry, MapKey, MapLiteral, MetaDefinition, ModuleDefinition, NegExpr, NodeDefinition, NotExpr, OneOfSpec, Pattern, PrePostTriggerDefinition, PrimExpr, PropertyDefinition, Purge, RbacAllowSpec, RbacExpressionSpec, RbacOpr, RbacRolesSpec, RbacSpecDefinition, RbacSpecEntries, RbacSpecEntry, RecordDefinition, RecordExtraDefinition, RecordSchemaDefinition, RefSpec, RelNodes, RelationshipDefinition, RelationshipPattern, ResolverDefinition, ResolverFnName, ResolverMethodName, ResolverMethodSpec, Return, RuntimeHint, SchemaDefinition, SelectIntoEntry, SelectIntoSpec, SetAttribute, StandaloneStatement, Statement, TriggerDefinition, TriggerEntry, WorkflowDefinition];
     }
 
     protected override computeIsSubtype(subtype: string, supertype: string): boolean {
@@ -1627,7 +1642,8 @@ export class AgentlangAstReflection extends langium.AbstractAstReflection {
                         { name: 'forEach' },
                         { name: 'fullTextSearch' },
                         { name: 'if' },
-                        { name: 'purge' }
+                        { name: 'purge' },
+                        { name: 'return' }
                     ]
                 };
             }
@@ -1820,6 +1836,14 @@ export class AgentlangAstReflection extends langium.AbstractAstReflection {
                     ]
                 };
             }
+            case Return: {
+                return {
+                    name: Return,
+                    properties: [
+                        { name: 'pat' }
+                    ]
+                };
+            }
             case RuntimeHint: {
                 return {
                     name: RuntimeHint,