Merge branch 'main' into pdl-263

Author: mandel

pdl-live-react/src-tauri/src/cli/setup.rs renamed to pdl-live-react/src-tauri/src/cli.rs

@@ -3,12 +3,12 @@ use ::std::path::Path;
 use tauri_plugin_cli::CliExt;
 use urlencoding::encode;
 
-use crate::cli::run;
 use crate::compile;
-use crate::gui::setup as gui_setup;
+use crate::gui::new_window;
+use crate::pdl::run::run_pdl_program;
 
 #[cfg(desktop)]
-pub fn cli(app: &mut tauri::App) -> Result<bool, Box<dyn ::std::error::Error>> {
+pub fn setup(app: &mut tauri::App) -> Result<bool, Box<dyn ::std::error::Error>> {
     app.handle().plugin(tauri_plugin_cli::init())?;
 
     // `matches` here is a Struct with { args, subcommand }.
@@ -49,7 +49,7 @@ pub fn cli(app: &mut tauri::App) -> Result<bool, Box<dyn ::std::error::Error>> {
                 _ => Err(Box::from("Unsupported compile command")),
             }
         }
-        "run" => run::run_pdl_program(
+        "run" => run_pdl_program(
             subcommand_args
                 .get("source")
                 .and_then(|a| a.value.as_str())
@@ -59,19 +59,14 @@ pub fn cli(app: &mut tauri::App) -> Result<bool, Box<dyn ::std::error::Error>> {
             subcommand_args.get("stream").and_then(|a| a.value.as_str()),
         )
         .and_then(|()| Ok(true)),
-        "view" => gui_setup(
+        "view" => new_window(
             app.handle().clone(),
-            subcommand_args
-                .get("trace")
-                .and_then(|a| {
-                    Some(
-                        Path::new("#/local")
-                            .join(encode(&a.value.as_str().expect("trace arg is string")).as_ref())
-                            .display()
-                            .to_string(),
-                    )
-                })
-                .expect("valid positional trace arg"),
+            subcommand_args.get("trace").and_then(|a| {
+                Some(
+                    Path::new("#/local")
+                        .join(encode(&a.value.as_str().expect("trace arg is string")).as_ref()),
+                )
+            }),
         )
         .and_then(|()| Ok(false)),
         _ => Err(Box::from("Unsupported command")),

pdl-live-react/src-tauri/src/cli/mod.rs

@@ -11,9 +11,9 @@ use serde::Deserialize;
 use serde_json::{from_reader, json, to_string, Value};
 use tempfile::Builder;
 
-use crate::interpreter::ast::{PdlBaseType, PdlBlock, PdlOptionalType, PdlParser, PdlType};
-use crate::interpreter::pip::pip_install_if_needed;
-use crate::interpreter::requirements::BEEAI_FRAMEWORK;
+use crate::pdl::ast::{PdlBaseType, PdlBlock, PdlOptionalType, PdlParser, PdlType};
+use crate::pdl::pip::pip_install_if_needed;
+use crate::pdl::requirements::BEEAI_FRAMEWORK;
 
 macro_rules! zip {
     ($x: expr) => ($x);

pdl-live-react/src-tauri/src/compile/beeai.rs

@@ -1,10 +1,18 @@
+use ::std::path::PathBuf;
 use tauri::WebviewWindowBuilder;
 
-pub fn setup(app: tauri::AppHandle, path: String) -> Result<(), Box<dyn ::std::error::Error>> {
-    WebviewWindowBuilder::new(&app, "main", tauri::WebviewUrl::App(path.into()))
-        .title("Prompt Declaration Language")
-        .zoom_hotkeys_enabled(true)
-        .inner_size(1400.0, 1050.0)
-        .build()?;
+pub fn new_window(
+    app: tauri::AppHandle,
+    path: Option<PathBuf>,
+) -> Result<(), Box<dyn ::std::error::Error>> {
+    WebviewWindowBuilder::new(
+        &app,
+        "main",
+        tauri::WebviewUrl::App(path.unwrap_or("".into())),
+    )
+    .title("Prompt Declaration Language")
+    .zoom_hotkeys_enabled(true)
+    .inner_size(1400.0, 1050.0)
+    .build()?;
     Ok(())
 }

pdl-live-react/src-tauri/src/gui.rs

@@ -5,17 +5,18 @@ mod cli;
 mod commands;
 mod compile;
 mod gui;
-mod interpreter;
+mod pdl;
+mod util;
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
     tauri::Builder::default()
         .setup(|app| {
             // Default to GUI if the app was opened with no CLI args.
             if args_os().count() <= 1 {
-                gui::setup(app.handle().clone(), "".to_owned())
+                gui::new_window(app.handle().clone(), None)
             } else {
-                match cli::setup::cli(app) {
+                match cli::setup(app) {
                     Ok(true) => ::std::process::exit(0), // success with CLI
                     Ok(false) => Ok(()), // instead, open GUI (fallthrough to the logic below)
                     Err(s) => {

pdl-live-react/src-tauri/src/lib.rs

@@ -3,4 +3,4 @@ pub mod extract;
 pub mod pip;
 pub mod pull;
 pub mod requirements;
-pub mod shasum;
+pub mod run;

pdl-live-react/src-tauri/src/interpreter/ast.rs renamed to pdl-live-react/src-tauri/src/pdl/ast.rs

@@ -4,7 +4,7 @@ use ::std::path::PathBuf;
 use dirs::cache_dir;
 use duct::cmd;
 
-use crate::interpreter::shasum;
+use crate::util::shasum;
 
 #[cfg(desktop)]
 pub async fn pip_install_if_needed(

pdl-live-react/src-tauri/src/interpreter/extract.rs renamed to pdl-live-react/src-tauri/src/pdl/extract.rs

@@ -4,7 +4,7 @@ use duct::cmd;
 use rayon::prelude::*;
 use yaml_rust2::{Yaml, YamlLoader};
 
-use crate::interpreter::extract;
+use crate::pdl::extract;
 
 /// Read the given filesystem path and produce a potentially multi-document Yaml
 fn from_path(path: &str) -> Result<Vec<Yaml>, Error> {