agentlang 0.0.18 → 0.0.20

package/src/cli/main.ts

@@ -24,6 +24,9 @@ import { ModuleDefinition } from '../language/generated/ast.js';
 import { z } from 'zod';
 import { Config, setAppConfig } from '../runtime/state.js';
 import { prepareIntegrations } from '../runtime/integrations.js';
+import { isNodeEnv } from '../utils/runtime.js';
+import { OpenAPIClientAxios } from 'openapi-client-axios';
+import { registerOpenApiModule } from '../runtime/openapi.js';
 
 const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
 
@@ -115,6 +118,9 @@ export const runModule = async (fileName: string): Promise<void> => {
         config.integrations.connections
       );
     }
+    if (config.openapi) {
+      await loadOpenApiSpec(config.openapi);
+    }
   } catch (err) {
     if (err instanceof z.ZodError) {
       console.log(chalk.red('Config validation failed:'));
@@ -127,13 +133,21 @@ export const runModule = async (fileName: string): Promise<void> => {
     throw err;
   }
 
-  const r: boolean = await runPreInitTasks();
-  if (!r) {
-    throw new Error('Failed to initialize runtime');
+  try {
+    const r: boolean = await runPreInitTasks();
+    if (!r) {
+      throw new Error('Failed to initialize runtime');
+    }
+    await load(fileName, undefined, async (appSpec?: ApplicationSpec) => {
+      await runPostInitTasks(appSpec, config);
+    });
+  } catch (err: any) {
+    if (isNodeEnv && chalk) {
+      console.error(chalk.red(err));
+    } else {
+      console.error(err);
+    }
   }
-  await load(fileName, undefined, async (appSpec?: ApplicationSpec) => {
-    await runPostInitTasks(appSpec, config);
-  });
 };
 
 export async function internAndRunModule(
@@ -148,3 +162,17 @@ export async function internAndRunModule(
   await runPostInitTasks(appSpec);
   return rm;
 }
+
+async function loadOpenApiSpec(openApiConfig: any[]) {
+  for (let i = 0; i < openApiConfig.length; ++i) {
+    const cfg: any = openApiConfig[i];
+    const api = new OpenAPIClientAxios({ definition: cfg.specUrl });
+    await api.init();
+    const client = await api.getClient();
+    client.defaults.baseURL = cfg.baseUrl
+      ? cfg.baseUrl
+      : cfg.specUrl.substring(0, cfg.specUrl.lastIndexOf('/'));
+    const n = await registerOpenApiModule(cfg.name, { api: api, client: client });
+    logger.info(`OpenAPI module '${n}' registered`);
+  }
+}

package/src/language/agentlang.langium

@@ -92,7 +92,11 @@ Literal: (id=ID | num=Decimal | str=STRING | ref=Ref | bool=Boolean | fnCall=FnC
 
 fragment Body: '{' '}' | '{' (statements+=Statement (';' statements+=Statement)*)+ '}' | '{' statements+=Statement ';'+ '}' | statements+=Statement;
 
-WorkflowDefinition: 'workflow' name=ID Body;
+WorkflowDefinition: 'workflow' name=ID Body hints+=WorkflowHint*;
+
+WorkflowHint: subs=WorkflowSubsHint;
+
+WorkflowSubsHint: '@subs' '(' resolverName=ID ')';
 
 Pattern: expr=Expr | crudMap=CrudMap | if=If | forEach=ForEach | delete=Delete | purge=Purge | fullTextSearch=FullTextSearch | return=Return;
 
@@ -123,13 +127,13 @@ FullTextSearch: '{' name=QueryId query=Literal options=MapLiteral? '}';
 
 Return: 'return' pat=Pattern;
 
-AgentDefinition: 'agent' name=(ID | STRING) (body=AgentDefBody? | '{''}');
+AgentDefinition: 'agent' name=GenericName (body=AgentDefBody? | '{''}');
 
 AgentDefBody: '{' (attributes+=AgentPropertyDef (',' attributes+=AgentPropertyDef)*)+ '}';
 
 AgentPropertyDef: name=ID value=Literal;
 
-ResolverDefinition: 'resolver' name=(ID | STRING) '[' (paths+=STRING (',' paths+=STRING)*)+ ']'
+ResolverDefinition: 'resolver' name=GenericName '[' (paths+=GenericName (',' paths+=GenericName)*)+ ']'
 '{' (methods+=ResolverMethodSpec (',' methods+=ResolverMethodSpec)*)+ '}';
 
 ResolverMethodSpec: key=ResolverMethodName fn=ResolverFnName;
@@ -193,6 +197,8 @@ Ref returns string: ID '.' (Ref | ID);
 
 QualifiedName returns string: Ref | ID;
 
+GenericName returns string: ID | STRING;
+
 terminal ID returns string: NAME ('/' NAME)?;
 
 // recognize an identifier

package/src/language/generated/ast.ts

@@ -52,6 +52,7 @@ export type AgentlangKeywordNames =
     | "@oneof"
     | "@rbac"
     | "@ref"
+    | "@subs"
     | "@then"
     | "@upsert"
     | "@with_unique"
@@ -136,6 +137,12 @@ export function isExpr(item: unknown): item is Expr {
     return reflection.isInstance(item, Expr);
 }
 
+export type GenericName = string;
+
+export function isGenericName(item: unknown): item is GenericName {
+    return (typeof item === 'string' && (/(([_a-zA-Z][\w_]*)(\/([_a-zA-Z][\w_]*))?)/.test(item) || /("(((\\([\s\S]))|((?!(((\\|")|\r)|\n))[\s\S]*?))|(\r?\n))*")/.test(item)));
+}
+
 export type PrimExpr = Group | Literal | NegExpr | NotExpr;
 
 export const PrimExpr = 'PrimExpr';
@@ -217,7 +224,7 @@ export interface AgentDefinition extends langium.AstNode {
     readonly $container: ModuleDefinition;
     readonly $type: 'AgentDefinition';
     body?: AgentDefBody;
-    name: string;
+    name: GenericName;
 }
 
 export const AgentDefinition = 'AgentDefinition';
@@ -960,8 +967,8 @@ export interface ResolverDefinition extends langium.AstNode {
     readonly $container: ModuleDefinition;
     readonly $type: 'ResolverDefinition';
     methods: Array<ResolverMethodSpec>;
-    name: string;
-    paths: Array<string>;
+    name: GenericName;
+    paths: Array<GenericName>;
 }
 
 export const ResolverDefinition = 'ResolverDefinition';
@@ -1138,6 +1145,7 @@ export function isTriggerEntry(item: unknown): item is TriggerEntry {
 export interface WorkflowDefinition extends langium.AstNode {
     readonly $container: ModuleDefinition;
     readonly $type: 'WorkflowDefinition';
+    hints: Array<WorkflowHint>;
     name: string;
     statements: Array<Statement>;
 }
@@ -1148,6 +1156,30 @@ export function isWorkflowDefinition(item: unknown): item is WorkflowDefinition
     return reflection.isInstance(item, WorkflowDefinition);
 }
 
+export interface WorkflowHint extends langium.AstNode {
+    readonly $container: WorkflowDefinition;
+    readonly $type: 'WorkflowHint';
+    subs: WorkflowSubsHint;
+}
+
+export const WorkflowHint = 'WorkflowHint';
+
+export function isWorkflowHint(item: unknown): item is WorkflowHint {
+    return reflection.isInstance(item, WorkflowHint);
+}
+
+export interface WorkflowSubsHint extends langium.AstNode {
+    readonly $container: WorkflowHint;
+    readonly $type: 'WorkflowSubsHint';
+    resolverName: string;
+}
+
+export const WorkflowSubsHint = 'WorkflowSubsHint';
+
+export function isWorkflowSubsHint(item: unknown): item is WorkflowSubsHint {
+    return reflection.isInstance(item, WorkflowSubsHint);
+}
+
 export type AgentlangAstType = {
     ActionEntry: ActionEntry
     AfterTriggerDefinition: AfterTriggerDefinition
@@ -1228,12 +1260,14 @@ export type AgentlangAstType = {
     TriggerDefinition: TriggerDefinition
     TriggerEntry: TriggerEntry
     WorkflowDefinition: WorkflowDefinition
+    WorkflowHint: WorkflowHint
+    WorkflowSubsHint: WorkflowSubsHint
 }
 
 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, Return, RuntimeHint, SchemaDefinition, SelectIntoEntry, SelectIntoSpec, SetAttribute, StandaloneStatement, Statement, ThenSpec, 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, ThenSpec, TriggerDefinition, TriggerEntry, WorkflowDefinition, WorkflowHint, WorkflowSubsHint];
     }
 
     protected override computeIsSubtype(subtype: string, supertype: string): boolean {
@@ -1953,11 +1987,28 @@ export class AgentlangAstReflection extends langium.AbstractAstReflection {
                 return {
                     name: WorkflowDefinition,
                     properties: [
+                        { name: 'hints', defaultValue: [] },
                         { name: 'name' },
                         { name: 'statements', defaultValue: [] }
                     ]
                 };
             }
+            case WorkflowHint: {
+                return {
+                    name: WorkflowHint,
+                    properties: [
+                        { name: 'subs' }
+                    ]
+                };
+            }
+            case WorkflowSubsHint: {
+                return {
+                    name: WorkflowSubsHint,
+                    properties: [
+                        { name: 'resolverName' }
+                    ]
+                };
+            }
             default: {
                 return {
                     name: type,