support Script.module.lua properly

src/main.rs

@@ -3,6 +3,7 @@ use clap::{Args,Parser,Subcommand};
 use anyhow::Result as AResult;
 use futures::StreamExt;
 use rbx_dom_weak::types::Ref;
+use tokio::io::AsyncReadExt;
 
 type AssetID=u64;
 type AssetIDFileMap=Vec<(AssetID,std::path::PathBuf)>;
@@ -167,7 +168,7 @@ async fn main()->AResult<()>{
 			input_folder:cli.input.unwrap(),
 			output_file:cli.output.unwrap(),
 			template:None,
-		}),
+		}).await,
 		Commands::Decompile=>decompile(DecompileConfig{
 			style:decompile_style.unwrap(),
 			input_file:cli.input.unwrap(),
@@ -1084,6 +1085,259 @@ async fn download_and_decompile_history_into_git(config:DownloadAndDecompileHist
 	Ok(())
 }
 
+//holy smokes what am I doing lmao
+//This giant machine is supposed to search for files according to style rules
+//e.g. ScriptName.server.lua or init.lua
+//Obviously I got carried away
+//I could use an enum!
+//I could use a struct!
+//I could use a trait!
+//I could use an error!
+//I could use a match!
+//I could use a function!
+//eventually:
+#[derive(Debug)]
+enum QueryResolveError{
+	NotFound,//0 results
+	Ambiguous,//>1 results
+	JoinError(tokio::task::JoinError),
+	IO(std::io::Error),
+}
+impl std::fmt::Display for QueryResolveError{
+	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
+		write!(f,"{self:?}")
+	}
+}
+impl std::error::Error for QueryResolveError{}
+
+async fn get_file_async(mut path:std::path::PathBuf,file_name:impl AsRef<std::path::Path>)->Result<tokio::fs::File,QueryResolveError>{
+	path.push(file_name);
+	match tokio::fs::File::open(path).await{
+		Ok(file)=>Ok(file),
+		Err(e)=>match e.kind(){
+			std::io::ErrorKind::NotFound=>Err(QueryResolveError::NotFound),
+			_=>Err(QueryResolveError::IO(e)),
+		},
+	}
+}
+type QueryHintResult=Result<FileHint,QueryResolveError>;
+type QueryResultHandle=tokio::task::JoinHandle<Result<tokio::fs::File,QueryResolveError>>;
+trait Query{
+	async fn resolve(self)->QueryHintResult;
+}
+struct QuerySingle(QueryResultHandle);
+impl QuerySingle{
+	fn rox(search_path:&std::path::PathBuf,search_name:&str)->Self{
+		Self(tokio::spawn(get_file_async(search_path.clone(),format!("{}.lua",search_name))))
+	}
+}
+impl Query for QuerySingle{
+	async fn resolve(self)->QueryHintResult{
+		match self.0.await{
+			Ok(Ok(file))=>Ok(FileHint{file,hint:ScriptHint::Undetermined}),
+			Ok(Err(e))=>Err(e),
+			Err(e)=>Err(QueryResolveError::JoinError(e)),
+		}
+	}
+}
+struct QueryTriple{
+	module:QuerySingle,
+	server:QuerySingle,
+	client:QuerySingle,
+}
+impl QueryTriple{
+	fn rox_rojo(search_path:&std::path::PathBuf,search_name:&str,search_module:bool)->Self{
+		//this should be implemented as constructors of Triplet and Quadruplet to fully support Trey's suggestion
+		let module_name=if search_module{
+			format!("{}.module.lua",search_name)
+		}else{
+			format!("{}.lua",search_name)
+		};
+		Self{
+			module:QuerySingle(tokio::spawn(get_file_async(search_path.clone(),module_name))),
+			server:QuerySingle(tokio::spawn(get_file_async(search_path.clone(),format!("{}.server.lua",search_name)))),
+			client:QuerySingle(tokio::spawn(get_file_async(search_path.clone(),format!("{}.client.lua",search_name)))),
+		}
+	}
+	fn rojo(search_path:&std::path::PathBuf,search_name:&str)->Self{
+		QueryTriple::rox_rojo(search_path,"init",false)
+	}
+}
+//these functions can be achieved with macros, but I have not learned that yet
+fn mega_double_join(query_pair:(QueryHintResult,QueryHintResult))->QueryHintResult{
+	match query_pair{
+		//unambiguously locate file
+		(Ok(f),Err(QueryResolveError::NotFound))
+		|(Err(QueryResolveError::NotFound),Ok(f))=>Ok(f),
+		//multiple files located
+		(Ok(_),Err(QueryResolveError::NotFound))
+		|(Err(QueryResolveError::NotFound),Ok(_))
+		|(Ok(_),Ok(_))=>Err(QueryResolveError::Ambiguous),
+		//no files located
+		(Err(QueryResolveError::NotFound),Err(QueryResolveError::NotFound))=>Err(QueryResolveError::NotFound),
+		//other error
+		(Err(e),_)
+		|(_,Err(e))=>Err(e),
+	}
+}
+fn mega_triple_join(query_triplet:(QueryHintResult,QueryHintResult,QueryHintResult))->QueryHintResult{
+	match query_triplet{
+		//unambiguously locate file
+		(Ok(f),Err(QueryResolveError::NotFound),Err(QueryResolveError::NotFound))
+		|(Err(QueryResolveError::NotFound),Ok(f),Err(QueryResolveError::NotFound))
+		|(Err(QueryResolveError::NotFound),Err(QueryResolveError::NotFound),Ok(f))=>Ok(f),
+		//multiple files located
+		(Ok(_),Ok(_),Err(QueryResolveError::NotFound))
+		|(Ok(_),Err(QueryResolveError::NotFound),Ok(_))
+		|(Err(QueryResolveError::NotFound),Ok(_),Ok(_))
+		|(Ok(_),Ok(_),Ok(_))=>Err(QueryResolveError::Ambiguous),
+		//no files located
+		(Err(QueryResolveError::NotFound),Err(QueryResolveError::NotFound),Err(QueryResolveError::NotFound))=>Err(QueryResolveError::NotFound),
+		//other error
+		(Err(e),_,_)
+		|(_,Err(e),_)
+		|(_,_,Err(e))=>Err(e),
+	}
+}
+//LETS GOOOOOOOOOOOOOOOO
+fn mega_quadruple_join(query_quad:(QueryHintResult,QueryHintResult,QueryHintResult,QueryHintResult))->QueryHintResult{
+	match query_quad{
+		//unambiguously locate file
+		(Ok(f),Err(QueryResolveError::NotFound),Err(QueryResolveError::NotFound),Err(QueryResolveError::NotFound))
+		|(Err(QueryResolveError::NotFound),Ok(f),Err(QueryResolveError::NotFound),Err(QueryResolveError::NotFound))
+		|(Err(QueryResolveError::NotFound),Err(QueryResolveError::NotFound),Ok(f),Err(QueryResolveError::NotFound))
+		|(Err(QueryResolveError::NotFound),Err(QueryResolveError::NotFound),Err(QueryResolveError::NotFound),Ok(f))=>Ok(f),
+		//multiple files located
+		(Ok(_),Ok(_),Ok(_),Err(QueryResolveError::NotFound))
+		|(Ok(_),Ok(_),Err(QueryResolveError::NotFound),Ok(_))
+		|(Ok(_),Ok(_),Err(QueryResolveError::NotFound),Err(QueryResolveError::NotFound))
+		|(Ok(_),Err(QueryResolveError::NotFound),Ok(_),Ok(_))
+		|(Ok(_),Err(QueryResolveError::NotFound),Ok(_),Err(QueryResolveError::NotFound))
+		|(Ok(_),Err(QueryResolveError::NotFound),Err(QueryResolveError::NotFound),Ok(_))
+		|(Err(QueryResolveError::NotFound),Ok(_),Ok(_),Ok(_))
+		|(Err(QueryResolveError::NotFound),Ok(_),Ok(_),Err(QueryResolveError::NotFound))
+		|(Err(QueryResolveError::NotFound),Ok(_),Err(QueryResolveError::NotFound),Ok(_))
+		|(Err(QueryResolveError::NotFound),Err(QueryResolveError::NotFound),Ok(_),Ok(_))
+		|(Ok(_),Ok(_),Ok(_),Ok(_))=>Err(QueryResolveError::Ambiguous),
+		//no files located
+		(Err(QueryResolveError::NotFound),Err(QueryResolveError::NotFound),Err(QueryResolveError::NotFound),Err(QueryResolveError::NotFound))=>Err(QueryResolveError::NotFound),
+		//other error
+		(Err(e),_,_,_)
+		|(_,Err(e),_,_)
+		|(_,_,Err(e),_)
+		|(_,_,_,Err(e))=>Err(e),
+	}
+}
+impl Query for QueryTriple{
+	async fn resolve(self)->QueryHintResult{
+		let (module,server,client)=tokio::join!(self.module.0,self.server.0,self.client.0);
+		mega_triple_join((
+			module.map_err(|e|QueryResolveError::JoinError(e))?.map(|file|FileHint{file,hint:ScriptHint::ModuleScript}),
+			server.map_err(|e|QueryResolveError::JoinError(e))?.map(|file|FileHint{file,hint:ScriptHint::Script}),
+			client.map_err(|e|QueryResolveError::JoinError(e))?.map(|file|FileHint{file,hint:ScriptHint::LocalScript}),
+		))
+	}
+}
+struct QueryQuad{
+	module_implicit:QuerySingle,
+	module_explicit:QuerySingle,
+	server:QuerySingle,
+	client:QuerySingle,
+}
+impl QueryQuad{
+	fn rox_rojo(search_path:&std::path::PathBuf,search_name:&str)->Self{
+		let fill=QueryTriple::rox_rojo(search_path,search_name,true);
+		Self{
+			module_implicit:QuerySingle::rox(search_path,search_name),//Script.lua
+			module_explicit:fill.module,//Script.module.lua
+			server:fill.server,
+			client:fill.client,
+		}
+	}
+}
+impl Query for QueryQuad{
+	async fn resolve(self)->QueryHintResult{
+		let (module_implicit,module_explicit,server,client)=tokio::join!(self.module_implicit.0,self.module_explicit.0,self.server.0,self.client.0);
+		mega_quadruple_join((
+			module_implicit.map_err(|e|QueryResolveError::JoinError(e))?.map(|file|FileHint{file,hint:ScriptHint::ModuleScript}),
+			module_explicit.map_err(|e|QueryResolveError::JoinError(e))?.map(|file|FileHint{file,hint:ScriptHint::ModuleScript}),
+			server.map_err(|e|QueryResolveError::JoinError(e))?.map(|file|FileHint{file,hint:ScriptHint::Script}),
+			client.map_err(|e|QueryResolveError::JoinError(e))?.map(|file|FileHint{file,hint:ScriptHint::LocalScript}),
+		))
+	}
+}
+
+async fn discern_node(search_path:&std::path::PathBuf,search_name:&str,style:Option<DecompileStyle>)->AResult<Option<CompileNode>>{
+	let mut contents_folder=search_path.clone();
+	contents_folder.push(search_name);
+	//folder
+	Ok(if let Ok(dir)=tokio::fs::read_dir(contents_folder.as_path()).await{
+		//scan inside the folder for an object to define the class of the folder
+		let script_query=async {match style{
+			Some(DecompileStyle::Rox)=>QuerySingle::rox(&contents_folder,search_name).resolve().await,
+			Some(DecompileStyle::RoxRojo)=>QueryQuad::rox_rojo(&contents_folder,search_name).resolve().await,
+			Some(DecompileStyle::Rojo)=>QueryTriple::rojo(&contents_folder,search_name).resolve().await,
+			//try all three and complain if there is ambiguity
+			None=>mega_triple_join(tokio::join!(
+				QuerySingle::rox(&contents_folder,search_name).resolve(),
+				//true=search for module here to avoid ambiguity with QuerySingle::rox results
+				QueryTriple::rox_rojo(&contents_folder,search_name,true).resolve(),
+				QueryTriple::rojo(&contents_folder,search_name).resolve(),
+			))
+		}};
+		//model files are rox & rox-rojo only, so it's a lot less work...
+		let model_query=get_file_async(contents_folder.clone(),format!("{}.rbxmx",search_name));
+		//model? script? both?
+		Some(match tokio::join!(script_query,model_query){
+			(Ok(FileHint{mut file,hint}),Err(QueryResolveError::NotFound))=>{
+				//read entire file
+				let mut buf=String::new();
+				file.read_to_string(&mut buf).await?;
+				//regex script according to Properties lines at the top
+				todo!("unimplemented");
+				//script
+				CompileNode{
+					class:CompileClass::Script(buf),
+					folder:Some(dir),
+				}
+			},
+			(Err(QueryResolveError::NotFound),Ok(mut file))=>{
+				//read entire file
+				let mut buf=Vec::new();
+				file.read_to_end(&mut buf).await?;
+				//model
+				CompileNode{
+					class:CompileClass::Model(buf),
+					folder:Some(dir),
+				}
+			},
+			(Ok(_),Ok(_))=>Err(QueryResolveError::Ambiguous)?,
+			//neither
+			(Err(QueryResolveError::NotFound),Err(QueryResolveError::NotFound))=>CompileNode{
+				class:CompileClass::Folder,
+				folder:Some(dir),
+			},
+			//other error
+			(Err(e),_)
+			|(_,Err(e))=>Err(e)?
+		})
+	}else{
+		//a folder of this name does not exist
+		None
+	})
+}
+
+enum ScriptHint{
+	Script,
+	LocalScript,
+	ModuleScript,
+	Undetermined,
+}
+struct FileHint{
+	file:tokio::fs::File,
+	hint:ScriptHint,
+}
+
 enum CompileClass{
 	Folder,
 	Script(String),
@@ -1109,7 +1363,7 @@ struct CompileConfig{
 	template:Option<std::path::PathBuf>,
 }
 
-fn compile(config:CompileConfig)->AResult<()>{
+async fn compile(config:CompileConfig)->AResult<()>{
 	//basically decompile in reverse order
 	//load template dom
 	let input={
@@ -1118,6 +1372,7 @@ fn compile(config:CompileConfig)->AResult<()>{
 			template_path.push("template.rbxlx");
 			template_path
 		});
+		//mr dom doesn't like tokio files
 		std::io::BufReader::new(std::fs::File::open(template_path)?)
 	};
 	let mut dom=load_dom(input)?;
@@ -1131,31 +1386,13 @@ fn compile(config:CompileConfig)->AResult<()>{
 			CompileStackInstruction::Referent(item_ref)=>{
 				let item=dom.get_by_ref(item_ref).ok_or(anyhow::Error::msg("null child ref"))?;
 				//check if item exists in folder or subfolder of same name
-				let what=||async{
-					//figure out something clever for this
-
-					let mut what=CompileNode{
-						class:CompileClass::Folder,
-						folder:None,
-					};
-					let mut contents_folder=folder.clone();
-					contents_folder.push(item.name.as_str());
-					//folder
-					if let Ok(dir)=tokio::fs::read_dir(contents_folder.as_path()).await{
-						what.folder=Some(dir);
-					}else{
-						contents_folder.pop();
-					}
-					//tokio::join!(a,b,c);
-					//rox
-					let mut rox_path=contents_folder.clone();
-					rox_path.push(format!("{}.lua",item.name.as_str()));
-					if let Ok(file)=tokio::fs::File::open(rox_path).await{
-						//CompileClass::ModuleScript
-					}
-					//rox-rojo
-					//rojo
-				};
+				todo!("this is totally unnecessary,
+					only the folder needs to exist to determine if traversal should continue");
+				if let Some(obj)=discern_node(&folder,item.name.as_str(),None).await?{
+					//cool
+				}else{
+					//determine if this is ok
+				}
 				//push child objects onto dom
 				//push dom children objects onto stack
 				stack.push(CompileStackInstruction::PopFolder);