agentlang 0.3.0 → 0.3.2

package/src/runtime/modules/auth.ts

@@ -44,25 +44,25 @@ workflow AfterDeleteUser {
   {RemoveUserSession {id AfterDeleteUser.User.id}}
 }
 
-workflow CreateUser {
+@public workflow CreateUser {
   {User {id CreateUser.id,
          email CreateUser.email,
          firstName CreateUser.firstName,
          lastName CreateUser.lastName}}
 }
 
-workflow UpdateUser {
+@public workflow UpdateUser {
   {User {id UpdateUser.id,
          firstName UpdateUser.firstName,
          lastName UpdateUser.lastName}, @upsert}
 }
 
-workflow FindUser {
+@public workflow FindUser {
   {User {id? FindUser.id}} @as [user];
   user
 }
 
-workflow FindUserByEmail {
+@public workflow FindUserByEmail {
   {User {email? FindUserByEmail.email}} @as [user];
   user
 }
@@ -84,20 +84,20 @@ entity Permission {
 
 relationship RolePermission between(Role, Permission)
 
-workflow CreateRole {
+@public workflow CreateRole {
     {Role {name CreateRole.name}, @upsert}
 }
 
-workflow FindRole {
+@public workflow FindRole {
     {Role {name? FindRole.name}} @as [role];
     role
 }
 
-workflow ListRoles {
+@public workflow ListRoles {
     {Role? {}}
 }
 
-workflow ListUserRoles {
+@public workflow ListUserRoles {
     if (ListUserRoles.Role and ListUserRoles.User) {
         {UserRole {User? ListUserRoles.User, Role? ListUserRoles.Role}}
     }
@@ -112,11 +112,11 @@ workflow ListUserRoles {
     }
 }
 
-workflow ListPermissions {
+@public workflow ListPermissions {
     {Permission? {}}
 }
 
-workflow ListRolePermissions {
+@public workflow ListRolePermissions {
     if (ListRolePermissions.Role and ListRolePermissions.Permission) {
         {RolePermission {Role? ListRolePermissions.Role, Permission? ListRolePermissions.Permission}}
     }
@@ -131,24 +131,24 @@ workflow ListRolePermissions {
     }
 }
 
-workflow AssignUserToRole {
+@public workflow AssignUserToRole {
     {User {id? AssignUserToRole.userId}} @as [user];
     {Role {name? AssignUserToRole.roleName}} @as [role];
     {UserRole {User user, Role role}, @upsert}
 }
 
-workflow AssignUserToRoleByEmail {
+@public workflow AssignUserToRoleByEmail {
     {User {email? AssignUserToRoleByEmail.email}} @as [user];
     {Role {name? AssignUserToRoleByEmail.roleName}} @as [role];
     {UserRole {User user, Role role}, @upsert}
 }
 
-workflow FindUserRoles {
+@public workflow FindUserRoles {
   {User {id? FindUserRoles.userId},
    UserRole {Role? {}}}
 }
 
-workflow CreatePermission {
+@public workflow CreatePermission {
      {Permission {id CreatePermission.id,
                   resourceFqName CreatePermission.resourceFqName,
                   c CreatePermission.c,
@@ -159,13 +159,13 @@ workflow CreatePermission {
       @upsert}
 }
 
-workflow AddPermissionToRole {
+@public workflow AddPermissionToRole {
     {Role {name? AddPermissionToRole.roleName}} @as [role];
     {Permission {id? AddPermissionToRole.permissionId}} @as [perm];
     {RolePermission {Role role, Permission perm}, @upsert}
 }
 
-workflow FindRolePermissions {
+@public workflow FindRolePermissions {
     {Role {name? FindRolePermissions.role},
      RolePermission {Permission? {}}}
 }
@@ -180,8 +180,7 @@ entity Session {
   @rbac [(allow: [read, delete, update, create], where: auth.user = this.userId)]
 }
 
-
-workflow CreateSession {
+@public workflow CreateSession {
   {Session {id CreateSession.id, userId CreateSession.userId,
             authToken CreateSession.authToken,
             accessToken CreateSession.accessToken,
@@ -189,7 +188,7 @@ workflow CreateSession {
             isActive true}}
 }
 
-workflow UpdateSession {
+@public workflow UpdateSession {
   {Session {id? UpdateSession.id,
             authToken UpdateSession.authToken,
             accessToken UpdateSession.accessToken,
@@ -197,44 +196,44 @@ workflow UpdateSession {
             isActive true}, @upsert}
 }
 
-workflow FindSession {
+@public workflow FindSession {
   {Session {id? FindSession.id}} @as [session];
   session
 }
 
-workflow FindUserSession {
+@public workflow FindUserSession {
   {Session {userId? FindUserSession.userId}} @as [session];
   session
 }
 
-workflow RemoveSession {
+@public workflow RemoveSession {
   purge {Session {id? RemoveSession.id}}
 }
 
-workflow RemoveUserSession {
+@public workflow RemoveUserSession {
   {Session {userId? RemoveUserSession.id}} @as [session];
   purge {Session {id? session.id}}
 }
 
-workflow DeleteRole {
+@public workflow DeleteRole {
   purge {UserRole {Role? DeleteRole.name}}
   purge {Role {name? DeleteRole.name}}
 }
 
-workflow DeleteUserRole {
+@public workflow DeleteUserRole {
   purge {UserRole {User? DeleteUserRole.User, Role? DeleteUserRole.Role}}
 }
 
-workflow DeletePermission {
+@public workflow DeletePermission {
   purge {RolePermission {Permission? DeletePermission.id}}
   purge {Permission {id? DeletePermission.id}}
 }
 
-workflow DeleteRolePermission {
+@public workflow DeleteRolePermission {
   purge {RolePermission {Role? DeleteRolePermission.Role, Permission? DeleteRolePermission.Permission}}
 }
 
-workflow UpdateRoleAssignment {
+@public workflow UpdateRoleAssignment {
   {User {id? UpdateRoleAssignment.userId}} @as [user]
   {Role {name? UpdateRoleAssignment.roleName}} @as [role]
   if (user and role) {
@@ -248,7 +247,7 @@ workflow UpdateRoleAssignment {
   }
 }
 
-workflow UpdatePermissionAssignment {
+@public workflow UpdatePermissionAssignment {
   {Role {name? UpdatePermissionAssignment.roleName}} @as [role]
   {Permission {id? UpdatePermissionAssignment.permissionId}} @as [permission]
   if (role and permission) {
@@ -262,7 +261,7 @@ workflow UpdatePermissionAssignment {
   }
 }
 
-workflow UpdatePermission {
+@public workflow UpdatePermission {
   if (UpdatePermission.resourceFqName and UpdatePermission.c != undefined and UpdatePermission.r != undefined and UpdatePermission.u != undefined and UpdatePermission.d != undefined) {
     {Permission {id? UpdatePermission.id,
                 resourceFqName UpdatePermission.resourceFqName,
@@ -285,27 +284,27 @@ workflow UpdatePermission {
   }
 }
 
-workflow signup {
+@public workflow signup {
   await Auth.signUpUser(signup.firstName, signup.lastName, signup.email, signup.password, signup.userData)
 }
 
-workflow confirmSignup {
+@public workflow confirmSignup {
   await Auth.confirmSignupUser(confirmSignup.email, confirmSignup.confirmationCode)
 }
 
-workflow resendConfirmationCode {
+@public workflow resendConfirmationCode {
   await Auth.resendConfirmationCodeUser(resendConfirmationCode.email)
 }
 
-workflow login {
+@public workflow login {
   await Auth.loginUser(login.email, login.password)
 }
 
-workflow forgotPassword {
+@public workflow forgotPassword {
   await Auth.forgotPasswordUser(forgotPassword.email)
 }
 
-workflow confirmForgotPassword {
+@public workflow confirmForgotPassword {
   await Auth.confirmForgotPasswordUser(
     confirmForgotPassword.email,
     confirmForgotPassword.confirmationCode,
@@ -313,32 +312,32 @@ workflow confirmForgotPassword {
   )
 }
 
-workflow logout {
+@public workflow logout {
   await Auth.logoutUser()
 }
 
-workflow changePassword {
+@public workflow changePassword {
   await Auth.changePassword(changePassword.newPassword, changePassword.password)
 }
 
-workflow refreshToken {
+@public workflow refreshToken {
   await Auth.refreshUserToken(refreshToken.refreshToken)
 }
 
-workflow getUser {
+@public workflow getUser {
   await Auth.getUserInfo(getUser.userId)
 }
 
-workflow getUserByEmail {
+@public workflow getUserByEmail {
   await Auth.getUserInfoByEmail(getUserByEmail.email)
 }
 
-workflow inviteUser {
+@public workflow inviteUser {
   await Auth.inviteUser(inviteUser.email, inviteUser.firstName, inviteUser.lastName, inviteUser.userData)
 }
 
 
-workflow acceptInvitation {
+@public workflow acceptInvitation {
   await Auth.acceptInvitationUser(acceptInvitation.email, acceptInvitation.tempPassword, acceptInvitation.newPassword)
 }
 `;

package/src/runtime/modules/core.ts

@@ -61,7 +61,7 @@ workflow createSuspension {
      createdBy createSuspension.createdBy}}
 }
 
-workflow restartSuspension {
+@public workflow restartSuspension {
   await Core.restartSuspension(restartSuspension.id, restartSuspension.data)
 }
 `;

package/src/runtime/util.ts

@@ -3,6 +3,9 @@ import {
   AliasSpec,
   CatchSpec,
   ExtendsClause,
+  isLiteral,
+  MapEntry,
+  MapLiteral,
   MetaDefinition,
   PrePostTriggerDefinition,
   RbacSpecDefinition,
@@ -161,6 +164,10 @@ export function splitRefs(s: string): string[] {
   }
 }
 
+export function rootRef(s: string): string {
+  return splitRefs(s)[0];
+}
+
 export function runShellCommand(cmd: string, options?: any, continuation?: Function) {
   if (!isNodeEnv) {
     console.warn('Shell commands cannot be executed in non-Node.js environments');
@@ -535,3 +542,15 @@ export function trimQuotes(s: string): string {
   }
   return ss;
 }
+
+export function asStringLiteralsMap(mapLit: MapLiteral): Map<string, string> {
+  const result = new Map<string, string>();
+  mapLit.entries.forEach((me: MapEntry) => {
+    const k = me.key.str;
+    if (k && isLiteral(me.value)) {
+      const v = me.value.str || me.value.id || me.value.ref;
+      if (v) result.set(k, v);
+    }
+  });
+  return result;
+}

package/src/syntaxes/agentlang.monarch.ts

@@ -1,7 +1,7 @@
 // Monarch syntax highlighting for the agentlang language.
 export default {
     keywords: [
-        '@actions','@after','@as','@async','@before','@catch','@distinct','@enum','@expr','@from','@into','@meta','@oneof','@rbac','@ref','@then','@upsert','@with_unique','agent','allow','and','await','between','case','commitTransaction','contains','create','decision','delete','else','entity','error','event','extends','false','flow','for','if','import','in','like','module','not','not_found','onSubscription','or','purge','query','read','record','relationship','resolver','return','roles','rollbackTransaction','startTransaction','subscribe','true','update','upsert','where','workflow'
+        '@actions','@after','@as','@async','@before','@catch','@distinct','@enum','@expr','@from','@into','@meta','@oneof','@public','@rbac','@ref','@then','@upsert','@with_unique','agent','allow','and','await','between','case','commitTransaction','contains','create','decision','delete','directive','else','entity','error','event','extends','false','flow','for','glossaryEntry','if','import','in','like','module','not','not_found','onSubscription','or','purge','query','read','record','relationship','resolver','return','roles','rollbackTransaction','scenario','startTransaction','subscribe','true','update','upsert','where','workflow'
     ],
     operators: [
         '!=','*','+',',','-','-->','.','/',':',';','<','<=','<>','=','==','>','>=','?','@'