agentlang 0.10.0 → 0.10.1

package/src/language/agentlang.langium

@@ -122,17 +122,14 @@ AliasSpec: ('@as' (alias=ID | '[' ( aliases+=ID (',' aliases+=ID)*)+ ']'));
 ThenSpec: '@then' '{' (statements+=Statement (';' statements+=Statement)*)+ '}';
 
 CrudMap: '{' (name=QueryId (':')? '{''}' 
-             | (name=QualifiedName (':')? '{''}' ',' '@from' source=Literal (',' upsert+='@upsert')?)
+             | (name=QualifiedName (':')? '{''}' ',' '@from' source=Literal)
              | name=QualifiedName (':')? body=CrudMapBody)
              (',' relationships+=RelationshipPattern (',' relationships+=RelationshipPattern)*)?
-             (',' joins+=JoinSpec)*
-             (',' into=SelectIntoSpec)?
-             (',' where=WhereSpec)?
-             (',' groupByClause=GroupByClause)?
-             (',' orderByClause=OrderByClause)?
-             (',' upsert+='@upsert')?
-             (',' distinct+='@distinct')?
-             '}';
+             (',' queryOptions+=QueryOption (',' queryOptions+=QueryOption)*)?
+          '}';
+
+QueryOption: join=JoinSpec | into=SelectIntoSpec | where=WhereSpec | groupByClause=GroupByClause | orderByClause=OrderByClause
+| upsert='@upsert' | distinct='@distinct';
 
 CrudMapBody: '{' (attributes+=SetAttribute (',' attributes+=SetAttribute)*)+ properties+=PropertyDefinition* '}';
 

package/src/language/generated/ast.ts

@@ -453,31 +453,19 @@ export interface CrudMap extends langium.AstNode {
     readonly $container: Pattern;
     readonly $type: 'CrudMap';
     body?: CrudMapBody;
-    distinct: Array<'@distinct'>;
-    groupByClause?: GroupByClause;
-    into?: SelectIntoSpec;
-    joins: Array<JoinSpec>;
     name: QualifiedName | QueryId;
-    orderByClause?: OrderByClause;
+    queryOptions: Array<QueryOption>;
     relationships: Array<RelationshipPattern>;
     source?: Literal;
-    upsert: Array<'@upsert'>;
-    where?: WhereSpec;
 }
 
 export const CrudMap = {
     $type: 'CrudMap',
     body: 'body',
-    distinct: 'distinct',
-    groupByClause: 'groupByClause',
-    into: 'into',
-    joins: 'joins',
     name: 'name',
-    orderByClause: 'orderByClause',
+    queryOptions: 'queryOptions',
     relationships: 'relationships',
-    source: 'source',
-    upsert: 'upsert',
-    where: 'where'
+    source: 'source'
 } as const;
 
 export function isCrudMap(item: unknown): item is CrudMap {
@@ -882,7 +870,7 @@ export function isGroup(item: unknown): item is Group {
 }
 
 export interface GroupByClause extends langium.AstNode {
-    readonly $container: CrudMap;
+    readonly $container: QueryOption;
     readonly $type: 'GroupByClause';
     colNames: Array<QualifiedName>;
 }
@@ -965,7 +953,7 @@ export function isImport(item: unknown): item is Import {
 }
 
 export interface JoinSpec extends langium.AstNode {
-    readonly $container: CrudMap;
+    readonly $container: QueryOption;
     readonly $type: 'JoinSpec';
     lhs: QueryId;
     name: QualifiedName;
@@ -1203,7 +1191,7 @@ export function isOneOfSpec(item: unknown): item is OneOfSpec {
 }
 
 export interface OrderByClause extends langium.AstNode {
-    readonly $container: CrudMap;
+    readonly $container: QueryOption;
     readonly $type: 'OrderByClause';
     colNames: Array<QualifiedName>;
     order?: '@asc' | '@desc';
@@ -1368,6 +1356,33 @@ export function isQueryId(item: unknown): item is QueryId {
     return typeof item === 'string';
 }
 
+export interface QueryOption extends langium.AstNode {
+    readonly $container: CrudMap;
+    readonly $type: 'QueryOption';
+    distinct?: '@distinct';
+    groupByClause?: GroupByClause;
+    into?: SelectIntoSpec;
+    join?: JoinSpec;
+    orderByClause?: OrderByClause;
+    upsert?: '@upsert';
+    where?: WhereSpec;
+}
+
+export const QueryOption = {
+    $type: 'QueryOption',
+    distinct: 'distinct',
+    groupByClause: 'groupByClause',
+    into: 'into',
+    join: 'join',
+    orderByClause: 'orderByClause',
+    upsert: 'upsert',
+    where: 'where'
+} as const;
+
+export function isQueryOption(item: unknown): item is QueryOption {
+    return reflection.isInstance(item, QueryOption.$type);
+}
+
 export interface RbacAllowSpec extends langium.AstNode {
     readonly $container: RbacSpecEntry;
     readonly $type: 'RbacAllowSpec';
@@ -1792,7 +1807,7 @@ export function isSelectIntoEntry(item: unknown): item is SelectIntoEntry {
 }
 
 export interface SelectIntoSpec extends langium.AstNode {
-    readonly $container: CrudMap;
+    readonly $container: QueryOption;
     readonly $type: 'SelectIntoSpec';
     entries: Array<SelectIntoEntry>;
 }
@@ -1942,7 +1957,7 @@ export function isTriggerEntry(item: unknown): item is TriggerEntry {
 }
 
 export interface WhereSpec extends langium.AstNode {
-    readonly $container: CrudMap;
+    readonly $container: QueryOption;
     readonly $type: 'WhereSpec';
     clauses: Array<WhereSpecClause>;
 }
@@ -2131,6 +2146,7 @@ export type AgentlangAstType = {
     PublicEventDefinition: PublicEventDefinition
     PublicWorkflowDefinition: PublicWorkflowDefinition
     Purge: Purge
+    QueryOption: QueryOption
     RbacAllowSpec: RbacAllowSpec
     RbacExpressionSpec: RbacExpressionSpec
     RbacOpr: RbacOpr
@@ -2408,25 +2424,12 @@ export class AgentlangAstReflection extends langium.AbstractAstReflection {
                 body: {
                     name: CrudMap.body
                 },
-                distinct: {
-                    name: CrudMap.distinct,
-                    defaultValue: []
-                },
-                groupByClause: {
-                    name: CrudMap.groupByClause
-                },
-                into: {
-                    name: CrudMap.into
-                },
-                joins: {
-                    name: CrudMap.joins,
-                    defaultValue: []
-                },
                 name: {
                     name: CrudMap.name
                 },
-                orderByClause: {
-                    name: CrudMap.orderByClause
+                queryOptions: {
+                    name: CrudMap.queryOptions,
+                    defaultValue: []
                 },
                 relationships: {
                     name: CrudMap.relationships,
@@ -2434,13 +2437,6 @@ export class AgentlangAstReflection extends langium.AbstractAstReflection {
                 },
                 source: {
                     name: CrudMap.source
-                },
-                upsert: {
-                    name: CrudMap.upsert,
-                    defaultValue: []
-                },
-                where: {
-                    name: CrudMap.where
                 }
             },
             superTypes: []
@@ -3074,6 +3070,33 @@ export class AgentlangAstReflection extends langium.AbstractAstReflection {
             },
             superTypes: []
         },
+        QueryOption: {
+            name: QueryOption.$type,
+            properties: {
+                distinct: {
+                    name: QueryOption.distinct
+                },
+                groupByClause: {
+                    name: QueryOption.groupByClause
+                },
+                into: {
+                    name: QueryOption.into
+                },
+                join: {
+                    name: QueryOption.join
+                },
+                orderByClause: {
+                    name: QueryOption.orderByClause
+                },
+                upsert: {
+                    name: QueryOption.upsert
+                },
+                where: {
+                    name: QueryOption.where
+                }
+            },
+            superTypes: []
+        },
         RbacAllowSpec: {
             name: RbacAllowSpec.$type,
             properties: {