agentlang 0.0.4 → 0.0.5

package/src/api/http.ts

@@ -233,22 +233,7 @@ async function handleEntityGet(
     if (req.query.tree) {
       pattern = fetchTreePattern(makeFqName(moduleName, entityName), path);
     } else {
-      const r = walkDownInstancePath(path);
-      let moduleName = r[0];
-      let entityName = r[1];
-      const id = r[2];
-      const parts = r[3];
-      if (parts.length == 2 && id == undefined) {
-        pattern = `{${moduleName}/${entityName}? {}}`;
-      } else {
-        moduleName = restoreFqName(moduleName);
-        entityName = restoreFqName(entityName);
-        if (id == undefined) {
-          pattern = `{${moduleName}/${entityName} {${PathAttributeNameQuery}like "${path}%"}}`;
-        } else {
-          pattern = `{${moduleName}/${entityName} {${PathAttributeNameQuery} "${path}"}}`;
-        }
-      }
+      pattern = queryPatternFromPath(path);
     }
     parseAndEvaluateStatement(pattern, sessionInfo.userId).then(ok(res)).catch(internalError(res));
   } catch (err: any) {
@@ -257,6 +242,27 @@ async function handleEntityGet(
   }
 }
 
+function queryPatternFromPath(path: string): string {
+  let pattern = '';
+  const r = walkDownInstancePath(path);
+  let moduleName = r[0];
+  let entityName = r[1];
+  const id = r[2];
+  const parts = r[3];
+  if (parts.length == 2 && id == undefined) {
+    pattern = `{${moduleName}/${entityName}? {}}`;
+  } else {
+    moduleName = restoreFqName(moduleName);
+    entityName = restoreFqName(entityName);
+    if (id == undefined) {
+      pattern = `{${moduleName}/${entityName} {${PathAttributeNameQuery}like "${path}%"}}`;
+    } else {
+      pattern = `{${moduleName}/${entityName} {${PathAttributeNameQuery} "${path}"}}`;
+    }
+  }
+  return pattern;
+}
+
 async function handleEntityPut(
   moduleName: string,
   entityName: string,
@@ -272,6 +278,9 @@ async function handleEntityPut(
     }
     const attrs = objectAsInstanceAttributes(req.body);
     attrs.set(PathAttributeNameQuery, path);
+    const r = walkDownInstancePath(path);
+    moduleName = r[0];
+    entityName = r[1];
     const pattern = patternFromAttributes(moduleName, entityName, attrs);
     parseAndEvaluateStatement(pattern, sessionInfo.userId).then(ok(res)).catch(internalError(res));
   } catch (err: any) {
@@ -293,7 +302,7 @@ async function handleEntityDelete(
       res.status(401).send('Authorization required');
       return;
     }
-    const pattern = `delete {${moduleName}/${entityName} {${PathAttributeNameQuery} "${path}"}}`;
+    const pattern = `delete ${queryPatternFromPath(path)}`;
     parseAndEvaluateStatement(pattern, sessionInfo.userId).then(ok(res)).catch(internalError(res));
   } catch (err: any) {
     logger.error(err);

package/src/language/agentlang.langium

@@ -117,7 +117,11 @@ SelectIntoEntry: alias=ID attribute=Ref;
 
 FullTextSearch: '{' name=QueryId query=Literal options=MapLiteral? '}';
 
-AgentDefinition: 'agent' name=(ID | STRING) (body=CrudMapBody? | '{''}');
+AgentDefinition: 'agent' name=(ID | STRING) (body=AgentDefBody? | '{''}');
+
+AgentDefBody: '{' (attributes+=AgentPropertyDef (',' attributes+=AgentPropertyDef)*)+ '}';
+
+AgentPropertyDef: name=ID value=Literal;
 
 ResolverDefinition: 'resolver' name=(ID | STRING) '[' (paths+=STRING (',' paths+=STRING)*)+ ']'
 '{' (methods+=ResolverMethodSpec (',' methods+=ResolverMethodSpec)*)+ '}';

package/src/language/generated/ast.ts

@@ -190,10 +190,22 @@ export function isAfterTriggerDefinition(item: unknown): item is AfterTriggerDef
     return reflection.isInstance(item, AfterTriggerDefinition);
 }
 
+export interface AgentDefBody extends langium.AstNode {
+    readonly $container: AgentDefinition;
+    readonly $type: 'AgentDefBody';
+    attributes: Array<AgentPropertyDef>;
+}
+
+export const AgentDefBody = 'AgentDefBody';
+
+export function isAgentDefBody(item: unknown): item is AgentDefBody {
+    return reflection.isInstance(item, AgentDefBody);
+}
+
 export interface AgentDefinition extends langium.AstNode {
     readonly $container: ModuleDefinition;
     readonly $type: 'AgentDefinition';
-    body?: CrudMapBody;
+    body?: AgentDefBody;
     name: string;
 }
 
@@ -203,6 +215,19 @@ export function isAgentDefinition(item: unknown): item is AgentDefinition {
     return reflection.isInstance(item, AgentDefinition);
 }
 
+export interface AgentPropertyDef extends langium.AstNode {
+    readonly $container: AgentDefBody;
+    readonly $type: 'AgentPropertyDef';
+    name: string;
+    value: Literal;
+}
+
+export const AgentPropertyDef = 'AgentPropertyDef';
+
+export function isAgentPropertyDef(item: unknown): item is AgentPropertyDef {
+    return reflection.isInstance(item, AgentPropertyDef);
+}
+
 export interface AliasSpec extends langium.AstNode {
     readonly $container: RuntimeHint;
     readonly $type: 'AliasSpec';
@@ -326,7 +351,7 @@ export function isCrudMap(item: unknown): item is CrudMap {
 }
 
 export interface CrudMapBody extends langium.AstNode {
-    readonly $container: AgentDefinition | CrudMap;
+    readonly $container: CrudMap;
     readonly $type: 'CrudMapBody';
     attributes: Array<SetAttribute>;
     properties: Array<PropertyDefinition>;
@@ -545,7 +570,7 @@ export function isKvPairs(item: unknown): item is KvPairs {
 }
 
 export interface Literal extends langium.AstNode {
-    readonly $container: AttributeDefinition | BinExpr | FnCall | FullTextSearch | Group | If | KvPair | MapEntry | NegExpr | NotExpr | Pattern | SetAttribute;
+    readonly $container: AgentPropertyDef | AttributeDefinition | BinExpr | FnCall | FullTextSearch | Group | If | KvPair | MapEntry | NegExpr | NotExpr | Pattern | SetAttribute;
     readonly $type: 'Literal';
     array?: ArrayLiteral;
     asyncFnCall?: AsyncFnCall;
@@ -1087,7 +1112,9 @@ export function isWorkflowDefinition(item: unknown): item is WorkflowDefinition
 export type AgentlangAstType = {
     ActionEntry: ActionEntry
     AfterTriggerDefinition: AfterTriggerDefinition
+    AgentDefBody: AgentDefBody
     AgentDefinition: AgentDefinition
+    AgentPropertyDef: AgentPropertyDef
     AliasSpec: AliasSpec
     ArrayLiteral: ArrayLiteral
     AsyncFnCall: AsyncFnCall
@@ -1165,7 +1192,7 @@ export type AgentlangAstType = {
 export class AgentlangAstReflection extends langium.AbstractAstReflection {
 
     getAllTypes(): string[] {
-        return [ActionEntry, AfterTriggerDefinition, AgentDefinition, 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, RuntimeHint, SchemaDefinition, SelectIntoEntry, SelectIntoSpec, SetAttribute, StandaloneStatement, Statement, TriggerDefinition, TriggerEntry, WorkflowDefinition];
     }
 
     protected override computeIsSubtype(subtype: string, supertype: string): boolean {
@@ -1230,6 +1257,14 @@ export class AgentlangAstReflection extends langium.AbstractAstReflection {
                     ]
                 };
             }
+            case AgentDefBody: {
+                return {
+                    name: AgentDefBody,
+                    properties: [
+                        { name: 'attributes', defaultValue: [] }
+                    ]
+                };
+            }
             case AgentDefinition: {
                 return {
                     name: AgentDefinition,
@@ -1239,6 +1274,15 @@ export class AgentlangAstReflection extends langium.AbstractAstReflection {
                     ]
                 };
             }
+            case AgentPropertyDef: {
+                return {
+                    name: AgentPropertyDef,
+                    properties: [
+                        { name: 'name' },
+                        { name: 'value' }
+                    ]
+                };
+            }
             case AliasSpec: {
                 return {
                     name: AliasSpec,