Oct 24, 2023 · Oct 24, 2023
diff --git a/packages/cargo-pgml-components/Cargo.lock b/packages/cargo-pgml-components/Cargo.lock
diff --git a/packages/cargo-pgml-components/Cargo.toml b/packages/cargo-pgml-components/Cargo.toml
 [package]
 name = "cargo-pgml-components"
 version = "0.1.19"
 version = "0.1.20"
 edition = "2021"
 authors = ["PostgresML <team@postgresml.org>"]
 license = "MIT"
 toml = "0.7"
 serde = { version = "1", features = ["derive"] }
 file-lock = "2"
 serde_json = "1"

 [dev-dependencies]
 assert_cmd = "2"
diff --git a/packages/cargo-pgml-components/src/frontend/javascript.rs b/packages/cargo-pgml-components/src/frontend/javascript.rs
 //! Javascript bundling.

 use glob::glob;
 use std::collections::HashSet;
 use std::collections::{HashMap,HashSet};
 use std::fs::{copy, read_to_string, remove_file, File};
 use std::io::Write;
 use std::path::PathBuf;
 use std::path::{Path,PathBuf};
 use std::process::{exit, Command};

 use convert_case::{Case, Casing};
 use serde::{Deserialize, Serialize};

 use crate::config::Config;
 use crate::frontend::tools::execute_with_nvm;
 /// JS compiler
 static JS_COMPILER: &'static str = "rollup";

 #[derive(Serialize, Deserialize, Debug)]
 struct Packages {
    dependencies: HashMap<String, String>,
 }

 /// Delete old bundles we may have created.
 fn cleanup_old_bundles() {
    // Clean up old bundles
    cleanup_old_bundles();
    assemble_modules(config.clone());

    let package_json = Path::new("package.json");

    let packages: Packages = if package_json.is_file() {
        let packages = unwrap_or_exit!(read_to_string(package_json));
        unwrap_or_exit!(serde_json::from_str(&packages))
    } else {
        warn("package.json not found, can't validate rollup output");
        serde_json::from_str(r#"{"dependencies": {}}"#).unwrap()
    };

    let mut command = Command::new(JS_COMPILER);

    command

    // Bundle JavaScript.
    info("bundling javascript with rollup");
    unwrap_or_exit!(execute_with_nvm(&mut command));
    let output = unwrap_or_exit!(execute_with_nvm(&mut command));

    let lines = output.split("\n");
    for line in lines {
        for (package, _version) in &packages.dependencies {
            if line.contains(package) {
                error(&format!("unresolved import: {}", package));
                exit(1);
            }
        }
    }

    info(&format!("written {}", JS_FILE));

diff --git a/packages/cargo-pgml-components/src/util.rs b/packages/cargo-pgml-components/src/util.rs
        info!("{}", stdout);
    }

    Ok(stdout)
    Ok(stdout.clone() + &stderr)
 }

 pub fn write_to_file(path: &Path, content: &str) -> std::io::Result<()> {
Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		[package]
		name = "cargo-pgml-components"
		version = "0.1.19"
		version = "0.1.20"
		edition = "2021"
		authors = ["PostgresML <team@postgresml.org>"]
		license = "MIT"
Expand All		@@ -22,6 +22,7 @@ regex = "1"
		toml = "0.7"
		serde = { version = "1", features = ["derive"] }
		file-lock = "2"
		serde_json = "1"

		[dev-dependencies]
		assert_cmd = "2"
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,13 +1,14 @@
		//! Javascript bundling.

		use glob::glob;
		use std::collections::HashSet;
		use std::collections::{HashMap,HashSet};
		use std::fs::{copy, read_to_string, remove_file, File};
		use std::io::Write;
		use std::path::PathBuf;
		use std::path::{Path,PathBuf};
		use std::process::{exit, Command};

		use convert_case::{Case, Casing};
		use serde::{Deserialize, Serialize};

		use crate::config::Config;
		use crate::frontend::tools::execute_with_nvm;
Expand All		@@ -32,6 +33,11 @@ static OLD_BUNLDES_GLOB: &'static str = "static/js/..js";
		/// JS compiler
		static JS_COMPILER: &'static str = "rollup";

		#[derive(Serialize, Deserialize, Debug)]
		struct Packages {
		dependencies: HashMap<String, String>,
		}

		/// Delete old bundles we may have created.
		fn cleanup_old_bundles() {
		// Clean up old bundles
Expand DownExpand Up		@@ -146,6 +152,16 @@ pub fn bundle(config: Config, minify: bool) {
		cleanup_old_bundles();
		assemble_modules(config.clone());

		let package_json = Path::new("package.json");

		let packages: Packages = if package_json.is_file() {
		let packages = unwrap_or_exit!(read_to_string(package_json));
		unwrap_or_exit!(serde_json::from_str(&packages))
		} else {
		warn("package.json not found, can't validate rollup output");
		serde_json::from_str(r#"{"dependencies": {}}"#).unwrap()
		};

		let mut command = Command::new(JS_COMPILER);

		command
Expand All		@@ -163,7 +179,17 @@ pub fn bundle(config: Config, minify: bool) {

		// Bundle JavaScript.
		info("bundling javascript with rollup");
		unwrap_or_exit!(execute_with_nvm(&mut command));
		let output = unwrap_or_exit!(execute_with_nvm(&mut command));

		let lines = output.split("\n");
		for line in lines {
		for (package, _version) in &packages.dependencies {
		if line.contains(package) {
		error(&format!("unresolved import: {}", package));
		exit(1);
		}
		}
		}

		info(&format!("written {}", JS_FILE));

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -69,7 +69,7 @@ pub fn execute_command(command: &mut Command) -> std::io::Result<String> {
		info!("{}", stdout);
		}

		Ok(stdout)
		Ok(stdout.clone() + &stderr)
		}

		pub fn write_to_file(path: &Path, content: &str) -> std::io::Result<()> {
Expand Down