feat(lua): updated methods

Author: alemidev

src/ffi/lua/buffer.rs

@@ -3,7 +3,7 @@ use mlua::prelude::*;
 
 use super::ext::a_sync::a_sync;
 
-super::ext::impl_lua_serde! { CodempTextChange CodempBufferUpdate }
+super::ext::impl_lua_serde! { CodempTextChange CodempBufferUpdate CodempBufferNode }
 
 impl LuaUserData for CodempBufferController {
 	fn add_methods<M: LuaUserDataMethods<Self>>(methods: &mut M) {

src/ffi/lua/client.rs

@@ -25,7 +25,10 @@ impl LuaUserData for CodempClient {
 
 		methods.add_method(
 			"attach_workspace",
-			|_, this, (ws,): (String,)| a_sync! { this => this.attach_workspace(ws).await? },
+			|_, this, (ws,): (String,)| {
+				let ws_id = super::ext::lua_parse_uuid(&ws, 1, "ws")?;
+				a_sync! { this => this.attach_workspace(ws_id).await? }
+			},
 		);
 
 		methods.add_method(
@@ -53,11 +56,13 @@ impl LuaUserData for CodempClient {
 		);
 
 		methods.add_method("leave_workspace", |_, this, (ws,): (String,)| {
-			Ok(this.leave_workspace(&ws))
+			let ws_id = super::ext::lua_parse_uuid(&ws, 1, "ws")?;
+			Ok(this.leave_workspace(ws_id))
 		});
 
 		methods.add_method("get_workspace", |_, this, (ws,): (String,)| {
-			Ok(this.get_workspace(&ws))
+			let ws_id = super::ext::lua_parse_uuid(&ws, 1, "ws")?;
+			Ok(this.get_workspace(ws_id))
 		});
 	}
 }

src/ffi/lua/ext/callback.rs

@@ -123,14 +123,18 @@ callback_args! {
 	CursorController: CodempCursorController,
 	BufferController: CodempBufferController,
 	Workspace: CodempWorkspace,
+	WorkspaceInfo: CodempWorkspaceInfo,
+	VecWorkspaceInfo: Vec<CodempWorkspaceInfo>,
 	Event: CodempEvent,
 	MaybeEvent: Option<CodempEvent>,
 	Cursor: CodempCursor,
 	MaybeCursor: Option<CodempCursor>,
 	Selection: CodempSelection,
+	VecSelection: Vec<CodempSelection>,
 	MaybeSelection: Option<CodempSelection>,
 	TextChange: CodempTextChange,
 	MaybeTextChange: Option<CodempTextChange>,
 	BufferUpdate: CodempBufferUpdate,
 	MaybeBufferUpdate: Option<CodempBufferUpdate>,
+	BufferNode: CodempBufferNode,
 }

src/ffi/lua/ext/mod.rs

@@ -5,6 +5,23 @@ pub mod log;
 pub(crate) use a_sync::tokio;
 pub(crate) use callback::callback;
 
+pub(crate) fn lua_parse_uuid(uuid: &str, pos: usize, name: &str) -> mlua::Result<uuid::Uuid> {
+	use std::str::FromStr;
+	match uuid::Uuid::from_str(uuid) {
+		Ok(x) => Ok(x),
+		Err(e) => Err(mlua::Error::BadArgument {
+			pos,
+			name: Some(name.to_string()),
+			to: Some("Uuid::from_str".to_string()),
+			cause: std::sync::Arc::new(mlua::Error::FromLuaConversionError {
+				from: "string",
+				to: "Uuid".to_string(),
+				message: Some(e.to_string()),
+			}),
+		}),
+	}
+}
+
 macro_rules! impl_lua_serde {
 	($($t:ty)*) => {
 		$(
@@ -24,3 +41,4 @@ macro_rules! impl_lua_serde {
 }
 
 pub(crate) use impl_lua_serde;
+

src/ffi/lua/workspace.rs

@@ -3,7 +3,7 @@ use mlua::prelude::*;
 
 use super::ext::a_sync::a_sync;
 
-super::ext::impl_lua_serde! { CodempEvent }
+super::ext::impl_lua_serde! { CodempEvent CodempWorkspaceInfo }
 
 impl LuaUserData for CodempWorkspace {
 	fn add_methods<M: LuaUserDataMethods<Self>>(methods: &mut M) {
@@ -12,7 +12,7 @@ impl LuaUserData for CodempWorkspace {
 		});
 		methods.add_method(
 			"create_buffer",
-			|_, this, (name,): (String,)| a_sync! { this => this.create_buffer(&name).await? },
+			|_, this, (name, ephemeral): (String, bool)| a_sync! { this => this.create_buffer(&name, ephemeral).await? },
 		);
 
 		methods.add_method(
@@ -34,25 +34,25 @@ impl LuaUserData for CodempWorkspace {
 		});
 
 		methods.add_method(
-			"fetch_buffers",
-			|_, this, ()| a_sync! { this => this.fetch_buffers().await? },
+			"list_buffers",
+			|_, this, (filter,): (String,)| a_sync! { this => this.list_buffers(filter).await? },
 		);
 		methods.add_method(
-			"fetch_users",
-			|_, this, ()| a_sync! { this => this.fetch_users().await? },
+			"list_users",
+			|_, this, ()| a_sync! { this => this.list_users().await? },
 		);
 
 		methods.add_method("search_buffers", |_, this, (filter,): (Option<String>,)| {
 			Ok(this.search_buffers(filter.as_deref()))
 		});
 
-		methods.add_method("fetch_buffer_users", |_, this, (path,): (String,)| {
+		methods.add_method("list_buffer_users", |_, this, (path,): (String,)| {
 			a_sync! {
-				this => this.fetch_buffer_users(&path).await?
+				this => this.list_buffer_users(&path).await?
 			}
 		});
 
-		methods.add_method("id", |_, this, ()| Ok(this.id()));
+		methods.add_method("id", |_, this, ()| Ok(this.id().to_string()));
 		methods.add_method("cursor", |_, this, ()| Ok(this.cursor()));
 		methods.add_method("active_buffers", |_, this, ()| Ok(this.active_buffers()));
 		methods.add_method("user_list", |_, this, ()| Ok(this.user_list()));