agentlang 0.3.5 → 0.3.7

package/src/runtime/exec-graph.ts

@@ -114,7 +114,7 @@ class GraphGenerator extends PatternHandler {
     const cond = handler.getGraph();
     const conseq = await graphFromStatements(ifStmt.statements, env.getActiveModuleName());
     cond.pushSubGraph(conseq);
-    if (ifStmt.else != undefined) {
+    if (ifStmt.else !== undefined) {
       const alter = await graphFromStatements(ifStmt.else.statements, env.getActiveModuleName());
       cond.pushSubGraph(alter);
     } else {
@@ -336,6 +336,7 @@ export async function executeEvent(
       if (kernelCall) {
         env.setInKernelMode(true);
       }
+      env.setActiveEvent(eventInstance);
       await executeEventHelper(eventInstance, env);
     } else if (isAgentEventInstance(eventInstance)) {
       env.setStatementsExecutor(executeStatements);
@@ -348,7 +349,7 @@ export async function executeEvent(
     if (env && env.hasHandlers()) {
       throw err;
     } else {
-      if (env != undefined && activeEnv == undefined) {
+      if (env !== undefined && activeEnv === undefined) {
         await env.rollbackAllTransactions().then(() => {
           txnRolledBack = true;
         });
@@ -356,7 +357,7 @@ export async function executeEvent(
       throw err;
     }
   } finally {
-    if (!txnRolledBack && env != undefined && activeEnv == undefined) {
+    if (!txnRolledBack && env !== undefined && activeEnv === undefined) {
       await env.commitAllTransactions();
     }
   }
@@ -370,7 +371,7 @@ export async function executeEventHelper(eventInstance: Instance, env?: Environm
   }
   const fqn = eventInstance.getFqName();
   let isLocalEnv = false;
-  if (env == undefined) {
+  if (env === undefined) {
     env = new Environment(`${fqn}-env`);
     isLocalEnv = true;
   }
@@ -433,7 +434,7 @@ async function executeStatementsHelper(
 ): Promise<any> {
   const g = await graphFromStatements(stmts);
   let isLocalEnv = false;
-  if (env == undefined) {
+  if (env === undefined) {
     env = new Environment(`stmt-exec-env`);
     isLocalEnv = true;
   }

package/src/runtime/interpreter.ts

@@ -152,7 +152,7 @@ export class Environment extends Instance {
       mkEnvName(name, parent),
       newInstanceAttributes()
     );
-    if (parent != undefined) {
+    if (parent !== undefined) {
       this.parent = parent;
       this.activeModule = parent.activeModule;
       this.activeUser = parent.activeUser;
@@ -234,8 +234,8 @@ export class Environment extends Instance {
 
   override lookup(k: string): Result {
     const v = this.attributes.get(k);
-    if (v == undefined) {
-      if (this.parent != undefined) {
+    if (v === undefined) {
+      if (this.parent !== undefined) {
         return this.parent.lookup(k);
       } else if (this == GlobalEnvironment) {
         return EmptyResult;
@@ -273,7 +273,7 @@ export class Environment extends Instance {
   }
 
   addToScratchPad(k: string, data: any): Environment {
-    if (this.scratchPad == undefined) {
+    if (this.scratchPad === undefined) {
       this.scratchPad = {};
     }
     if (isFqName(k)) {
@@ -352,11 +352,11 @@ export class Environment extends Instance {
   }
 
   isSuspended(): boolean {
-    return this.suspensionId != undefined;
+    return this.suspensionId !== undefined;
   }
 
   suspend(): string {
-    if (this.suspensionId == undefined) {
+    if (this.suspensionId === undefined) {
       const id = this.preGeneratedSuspensionId;
       this.propagateSuspension(id);
       return id;
@@ -634,7 +634,7 @@ export class Environment extends Instance {
 
   popHandlers(): CatchHandlers {
     const r = this.activeCatchHandlers.pop();
-    if (r == undefined) {
+    if (r === undefined) {
       throw new Error(`No more handlers to pop`);
     }
     return r;
@@ -725,7 +725,7 @@ export let evaluate = async function (
     if (env && env.hasHandlers()) {
       throw err;
     } else {
-      if (env != undefined && activeEnv == undefined) {
+      if (env !== undefined && activeEnv === undefined) {
         await env.rollbackAllTransactions().then(() => {
           txnRolledBack = true;
         });
@@ -733,7 +733,7 @@ export let evaluate = async function (
       throw err;
     }
   } finally {
-    if (!txnRolledBack && env != undefined && activeEnv == undefined) {
+    if (!txnRolledBack && env !== undefined && activeEnv === undefined) {
       await env.commitAllTransactions();
     }
   }
@@ -790,7 +790,7 @@ export async function evaluateStatements(
       break;
     }
   }
-  if (continuation != undefined) {
+  if (continuation !== undefined) {
     continuation(env.getLastResult());
   }
 }
@@ -872,8 +872,8 @@ export async function evaluateStatement(stmt: Statement, env: Environment): Prom
 async function maybeHandleNotFound(handlers: CatchHandlers | undefined, env: Environment) {
   const lastResult: Result = env.getLastResult();
   if (
-    lastResult == null ||
-    lastResult == undefined ||
+    lastResult === null ||
+    lastResult === undefined ||
     (lastResult instanceof Array && lastResult.length == 0)
   ) {
     const onNotFound = handlers ? handlers.get('not_found') : undefined;
@@ -904,10 +904,10 @@ export function maybeBindStatementResultToAlias(hints: RuntimeHint[], env: Envir
   for (let i = 0; i < hints.length; ++i) {
     const rh = hints[i];
     if (rh.aliasSpec) {
-      if (rh.aliasSpec.alias != undefined || rh.aliasSpec.aliases.length > 0) {
+      if (rh.aliasSpec.alias !== undefined || rh.aliasSpec.aliases.length > 0) {
         const result: Result = env.getLastResult();
         const alias: string | undefined = rh.aliasSpec.alias;
-        if (alias != undefined) {
+        if (alias !== undefined) {
           env.bind(alias, result);
         } else {
           const aliases: string[] = rh.aliasSpec.aliases;
@@ -1087,21 +1087,21 @@ async function evaluateFullTextSearch(fts: FullTextSearch, env: Environment): Pr
 }
 
 async function evaluateLiteral(lit: Literal, env: Environment): Promise<void> {
-  if (lit.id != undefined) env.setLastResult(env.lookup(lit.id));
-  else if (lit.ref != undefined) env.setLastResult(await followReference(env, lit.ref));
-  else if (lit.fnCall != undefined) await applyFn(lit.fnCall, env, false);
-  else if (lit.asyncFnCall != undefined) await applyFn(lit.asyncFnCall.fnCall, env, true);
-  else if (lit.array != undefined) await realizeArray(lit.array, env);
-  else if (lit.map != undefined) await realizeMap(lit.map, env);
-  else if (lit.num != undefined) env.setLastResult(lit.num);
-  else if (lit.str != undefined) env.setLastResult(restoreSpecialChars(lit.str));
-  else if (lit.bool != undefined) env.setLastResult(lit.bool == 'true' ? true : false);
+  if (lit.id !== undefined) env.setLastResult(env.lookup(lit.id));
+  else if (lit.ref !== undefined) env.setLastResult(await followReference(env, lit.ref));
+  else if (lit.fnCall !== undefined) await applyFn(lit.fnCall, env, false);
+  else if (lit.asyncFnCall !== undefined) await applyFn(lit.asyncFnCall.fnCall, env, true);
+  else if (lit.array !== undefined) await realizeArray(lit.array, env);
+  else if (lit.map !== undefined) await realizeMap(lit.map, env);
+  else if (lit.num !== undefined) env.setLastResult(lit.num);
+  else if (lit.str !== undefined) env.setLastResult(restoreSpecialChars(lit.str));
+  else if (lit.bool !== undefined) env.setLastResult(lit.bool == 'true' ? true : false);
 }
 
 function getMapKey(k: MapKey): Result {
-  if (k.str != undefined) return k.str;
-  else if (k.num != undefined) return k.num;
-  else if (k.bool != undefined) return k.bool == 'true' ? true : false;
+  if (k.str !== undefined) return k.str;
+  else if (k.num !== undefined) return k.num;
+  else if (k.bool !== undefined) return k.bool == 'true' ? true : false;
 }
 
 const DefaultResolverName: string = '-';
@@ -1116,15 +1116,15 @@ async function getResolverForPath(
   const fqEntryName: string = isFqName(entryName) ? entryName : makeFqName(moduleName, entryName);
   const resN: string | undefined = getResolverNameForPath(fqEntryName);
   let res: Resolver | undefined;
-  if (resN == undefined) {
+  if (resN === undefined) {
     res = env.getResolver(DefaultResolverName);
-    if (res == undefined) {
+    if (res === undefined) {
       res = new SqlDbResolver(DefaultResolverName);
       await env.addResolver(res);
     }
   } else {
     res = env.getResolver(resN);
-    if (res == undefined) {
+    if (res === undefined) {
       res = getResolver(fqEntryName);
       await env.addResolver(res);
     }
@@ -1164,10 +1164,10 @@ async function patternToInstance(
         if (isQueryAll) {
           throw new Error(`Cannot specifiy query attribute ${aname} here`);
         }
-        if (qattrs == undefined) qattrs = newInstanceAttributes();
-        if (qattrVals == undefined) qattrVals = newInstanceAttributes();
+        if (qattrs === undefined) qattrs = newInstanceAttributes();
+        if (qattrVals === undefined) qattrVals = newInstanceAttributes();
         aname = aname.slice(0, aname.length - 1);
-        qattrs.set(aname, a.op == undefined ? '=' : a.op);
+        qattrs.set(aname, a.op === undefined ? '=' : a.op);
         qattrVals.set(aname, v);
       } else {
         attrs.set(aname, v);
@@ -1209,7 +1209,7 @@ async function maybeValidateOneOfRefs(inst: Instance, env: Environment) {
   for (let i = 0; i < attrs.length; ++i) {
     const n = attrs[i];
     const v = inst.lookup(n);
-    if (v == undefined) continue;
+    if (v === undefined) continue;
     const attrSpec = inst.record.schema.get(n);
     if (!attrSpec) continue;
     const r = getOneOfRef(attrSpec);
@@ -1254,14 +1254,14 @@ async function evaluateCrudMap(crud: CrudMap, env: Environment): Promise<void> {
         `Query pattern for ${entryName} with 'into' clause cannot be used to update attributes`
       );
     }
-    if (qattrs == undefined && !isQueryAll) {
+    if (qattrs === undefined && !isQueryAll) {
       throw new Error(`Pattern for ${entryName} with 'into' clause must be a query`);
     }
     await evaluateJoinQuery(crud.into, inst, crud.relationships, distinct, env);
     return;
   }
   if (isEntityInstance(inst) || isBetweenRelationship(inst.name, inst.moduleName)) {
-    if (qattrs == undefined && !isQueryAll) {
+    if (qattrs === undefined && !isQueryAll) {
       const parentPath: string | undefined = env.getParentPath();
       if (parentPath) {
         inst.attributes.set(PathAttributeName, parentPath);
@@ -1293,7 +1293,7 @@ async function evaluateCrudMap(crud: CrudMap, env: Environment): Promise<void> {
           env.isInUpsertMode()
         );
       }
-      if (crud.relationships != undefined) {
+      if (crud.relationships !== undefined) {
         for (let i = 0; i < crud.relationships.length; ++i) {
           const rel: RelationshipPattern = crud.relationships[i];
           const relEntry: Relationship = getRelationship(rel.name, moduleName);
@@ -1320,11 +1320,11 @@ async function evaluateCrudMap(crud: CrudMap, env: Environment): Promise<void> {
       const betRelInfo: BetweenRelInfo | undefined = env.getBetweenRelInfo();
       const isReadForUpdate = attrs.size > 0;
       let res: Resolver = Resolver.Default;
-      if (parentPath != undefined) {
+      if (parentPath !== undefined) {
         res = await getResolverForPath(inst.name, inst.moduleName, env);
         const insts: Instance[] = await res.queryChildInstances(parentPath, inst);
         env.setLastResult(insts);
-      } else if (betRelInfo != undefined) {
+      } else if (betRelInfo !== undefined) {
         res = await getResolverForPath(
           betRelInfo.relationship.name,
           betRelInfo.relationship.moduleName,
@@ -1347,7 +1347,7 @@ async function evaluateCrudMap(crud: CrudMap, env: Environment): Promise<void> {
         const insts: Instance[] = await res.queryInstances(inst, isQueryAll, distinct);
         env.setLastResult(insts);
       }
-      if (crud.relationships != undefined) {
+      if (crud.relationships !== undefined) {
         const lastRes: Instance[] = env.getLastResult();
         for (let i = 0; i < crud.relationships.length; ++i) {
           const rel: RelationshipPattern = crud.relationships[i];
@@ -1500,10 +1500,10 @@ async function computeExprAttributes(
   if (exprAttrs || origAttrs) {
     const newEnv = new Environment('expr-env', env);
     inst.attributes.forEach((v: any, k: string) => {
-      if (v != undefined) newEnv.bind(k, v);
+      if (v !== undefined) newEnv.bind(k, v);
     });
     updatedAttrs?.forEach((v: any, k: string) => {
-      if (v != undefined) newEnv.bind(k, v);
+      if (v !== undefined) newEnv.bind(k, v);
     });
     if (exprAttrs) {
       const ks = [...exprAttrs.keys()];
@@ -1685,7 +1685,7 @@ async function agentInvoke(agent: AgentInstance, msg: string, env: Environment):
       while (true) {
         try {
           const obj = agent.maybeValidateJsonResponse(result);
-          if (obj != undefined) {
+          if (obj !== undefined) {
             env.setLastResult(obj);
             env.addToScratchPad(agent.getFqName(), obj);
           }
@@ -1867,7 +1867,7 @@ async function evaluateIf(ifStmt: If, env: Environment): Promise<void> {
   await evaluateExpression(ifStmt.cond, env);
   if (env.getLastResult()) {
     await evaluateStatements(ifStmt.statements, env);
-  } else if (ifStmt.else != undefined) {
+  } else if (ifStmt.else !== undefined) {
     await evaluateStatements(ifStmt.else.statements, env);
   }
 }
@@ -1935,13 +1935,13 @@ export async function evaluateExpression(expr: Expr, env: Environment): Promise<
       await evaluateExpression(expr.e2, env);
       return;
     }
-    if (v1 == null || v1 == undefined) {
+    if (v1 === null || v1 === undefined) {
       env.setLastResult(undefined);
       return;
     }
     await evaluateExpression(expr.e2, env);
     const v2 = env.getLastResult();
-    if (v2 == null || v2 == undefined) {
+    if (v2 === null || v2 === undefined) {
       env.setLastResult(undefined);
       return;
     }
@@ -2021,7 +2021,7 @@ async function followReference(env: Environment, s: string): Promise<Result> {
   for (let i = 0; i < refs.length; ++i) {
     const r: string = refs[i];
     const v: Result | undefined = await getRef(r, src, env);
-    if (v == undefined) return EmptyResult;
+    if (v === undefined) return EmptyResult;
     result = v;
     src = result;
   }
@@ -2030,7 +2030,7 @@ async function followReference(env: Environment, s: string): Promise<Result> {
 
 async function dereferencePath(path: string, env: Environment): Promise<Result> {
   const fqName = fqNameFromPath(path);
-  if (fqName == undefined) {
+  if (fqName === undefined) {
     throw new Error(`Failed to deduce entry-name from path - ${path}`);
   }
   const newEnv = new Environment('path-deref', env);
@@ -2048,9 +2048,9 @@ async function dereferencePath(path: string, env: Environment): Promise<Result>
 
 async function applyFn(fnCall: FnCall, env: Environment, isAsync: boolean): Promise<void> {
   const fnName: string | undefined = fnCall.name;
-  if (fnName != undefined) {
+  if (fnName !== undefined) {
     let args: Array<Result> | null = null;
-    if (fnCall.args != undefined) {
+    if (fnCall.args !== undefined) {
       args = new Array<Result>();
       for (let i = 0; i < fnCall.args.length; ++i) {
         const arg = fnCall.args[i];

package/src/runtime/jsmodules.ts

@@ -74,7 +74,7 @@ async function invokeBuiltInFn(fnName: string, args: Array<any> | null, isAsync:
   } else {
     const pf: Function | undefined = maybeEvalFunction(fnName);
     if (pf instanceof Function) {
-      if (args == null) {
+      if (args === null) {
         if (isAsync) return await pf();
         else return pf();
       } else {
@@ -103,10 +103,10 @@ export async function invokeModuleFn(
     }
     const mname = refs[0];
     const m = importedModules.get(mname);
-    if (m != undefined) {
+    if (m !== undefined) {
       const f = m[refs[1]];
-      if (f != undefined) {
-        if (args == null)
+      if (f !== undefined) {
+        if (args === null)
           if (isAsync) {
             return await f();
           } else return f();
@@ -118,7 +118,7 @@ export async function invokeModuleFn(
   } catch (reason: any) {
     const pf: Function | undefined = maybeEvalFunction(fqFnName);
     if (pf instanceof Function) {
-      if (args == null) {
+      if (args === null) {
         if (isAsync) return await pf();
         else return pf();
       } else {
@@ -134,7 +134,7 @@ export async function invokeModuleFn(
 export function getModuleFn(fqFnName: string): Function | undefined {
   const refs: string[] = splitRefs(fqFnName);
   const m = importedModules.get(refs[0]);
-  if (m != undefined) {
+  if (m !== undefined) {
     return m[refs[1]];
   } else return undefined;
 }

package/src/runtime/loader.ts

@@ -227,7 +227,7 @@ async function loadApp(appDir: string, fsOptions?: any, callback?: Function): Pr
     }
     if (callback) await callback(appSpec);
   }
-  if (appSpec.dependencies != undefined) {
+  if (appSpec.dependencies !== undefined) {
     for (const [depName, _] of Object.entries(appSpec.dependencies)) {
       try {
         const depDirName = `./node_modules/${depName}`;
@@ -355,7 +355,7 @@ async function loadModule(fileName: string, fsOptions?: any, callback?: Function
 let cachedFsAdapter: any = null;
 
 function getFsAdapter(fs: any) {
-  if (cachedFsAdapter == null) {
+  if (cachedFsAdapter === null) {
     // Create an adapter to make our filesystem compatible with Langium
     cachedFsAdapter = {
       // Read file contents as text
@@ -477,7 +477,7 @@ const StandaloneStatements = new Map<string, Statement[]>();
 
 function addStandaloneStatement(stmt: Statement, moduleName: string, userDefined = true) {
   let stmts: Array<Statement> | undefined = StandaloneStatements.get(moduleName);
-  if (stmts == undefined) {
+  if (stmts === undefined) {
     stmts = new Array<Statement>();
   }
   stmts.push(stmt);
@@ -682,11 +682,11 @@ async function addAgentDefinition(
         v = processAgentArray(apdef.value.array, name);
       } else {
         v = apdef.value.str || apdef.value.id || apdef.value.ref || apdef.value.num;
-        if (v == undefined) {
+        if (v === undefined) {
           v = apdef.value.bool;
         }
       }
-      if (v == undefined) {
+      if (v === undefined) {
         throw new Error(`Cannot initialize agent ${name}, only literals can be set for attributes`);
       }
       if (apdef.name == 'llm') {
@@ -765,7 +765,7 @@ function processAgentArray(array: ArrayLiteral, attrName: string): string {
 function processAgentArrayValue(expr: Expr | undefined, attrName: string): string {
   if (expr && isLiteral(expr)) {
     const s = expr.str || expr.id || expr.ref || expr.bool;
-    if (s != undefined) {
+    if (s !== undefined) {
       return s;
     }
     if (expr.array) {