extract player tables

spacetimedb/src/game.rs

@@ -1,7 +1,7 @@
 use log::{info, trace};
 use spacetimedb::{ReducerContext, Table, reducer};
 
-use crate::tables::*;
+use crate::tables::{player::player, *};
 use jong_types::*;
 
 mod hand;

spacetimedb/src/game/hand.rs

@@ -1,6 +1,6 @@
 use spacetimedb::{ReducerContext, Table, ViewContext, reducer, view};
 
-use crate::tables::*;
+use crate::tables::{player::player, *};
 use jong_types::*;
 
 pub fn deal_hands(ctx: &ReducerContext, lobby_id: u32) {

spacetimedb/src/lib.rs

@@ -1,7 +1,7 @@
 use log::info;
 use spacetimedb::{ReducerContext, Table, reducer};
 
-use crate::tables::*;
+use crate::tables::{player::player, *};
 
 mod game;
 mod tables;

spacetimedb/src/tables.rs

@@ -1,44 +1,9 @@
-use spacetimedb::{Filter, Identity, SpacetimeType, client_visibility_filter, table};
+use spacetimedb::{Filter, SpacetimeType, client_visibility_filter, table};
 
 use jong_types::*;
 
-#[derive(Debug)]
+pub mod player;
-#[table(name = player, public)]
+pub use player::*;
-pub struct Player {
-    #[primary_key]
-    pub identity: Identity,
-
-    #[unique]
-    #[auto_inc]
-    pub id: u32,
-
-    pub name: Option<String>,
-
-    #[index(btree)]
-    pub lobby_id: u32,
-    pub hand_id: u32,
-    pub pond_id: u32,
-
-    pub ready: bool,
-}
-
-#[table(name = bot)]
-pub struct Bot {
-    #[primary_key]
-    #[auto_inc]
-    pub id: u32,
-
-    #[index(btree)]
-    pub lobby_id: u32,
-    pub hand_id: u32,
-    pub pond_id: u32,
-}
-
-#[derive(Debug, Clone, SpacetimeType)]
-pub enum PlayerOrBot {
-    Player { id: u32 },
-    Bot { id: u32 },
-}
 
 #[derive(Debug, Clone)]
 #[table(name = lobby, public)]
@@ -49,7 +14,7 @@ pub struct Lobby {
 
     #[unique]
     pub host_player_id: u32,
-    pub players: Vec<PlayerOrBot>,
+    pub players: Vec<player::PlayerOrBot>,
 
     pub game_state: GameState,
     pub turn_state: TurnState,
@@ -77,7 +42,7 @@ pub struct Hand {
     #[auto_inc]
     pub id: u32,
 
-    pub owner: PlayerOrBot,
+    pub owner: player::PlayerOrBot,
 
     pub sort: bool,
     pub tiles: Vec<Tile>,
@@ -89,7 +54,7 @@ pub struct Pond {
     #[auto_inc]
     pub id: u32,
 
-    pub owner: PlayerOrBot,
+    pub owner: player::PlayerOrBot,
 
     pub tiles: Vec<Tile>,
 }

spacetimedb/src/tables/player.rs

@@ -0,0 +1,40 @@
+use spacetimedb::Identity;
+use spacetimedb::{SpacetimeType, table};
+
+#[derive(Debug)]
+#[table(name = player, public)]
+pub struct Player {
+    #[primary_key]
+    pub identity: Identity,
+
+    #[unique]
+    #[auto_inc]
+    pub id: u32,
+
+    pub name: Option<String>,
+
+    #[index(btree)]
+    pub lobby_id: u32,
+    pub hand_id: u32,
+    pub pond_id: u32,
+
+    pub ready: bool,
+}
+
+#[table(name = bot)]
+pub struct Bot {
+    #[primary_key]
+    #[auto_inc]
+    pub id: u32,
+
+    #[index(btree)]
+    pub lobby_id: u32,
+    pub hand_id: u32,
+    pub pond_id: u32,
+}
+
+#[derive(Debug, Clone, SpacetimeType)]
+pub enum PlayerOrBot {
+    Player { id: u32 },
+    Bot { id: u32 },
+}