* Add Rust side artifacts for startSketchOn face or plane * Add Rust-generated artifacts to ExecOutcome * Add output of artifact commands * Add new output files * Wire the artifact commands to the artifact graph creation * Fix to use real PartialEq implemented in modeling commands * Fix modeling commands with zero fields to work * Fix missing artifactCommands field in errors * Change artifact graph to be built from artifact commands * Wire up ExecState artifacts, but not using them yet Co-authored-by: Kurt Hutten <k.hutten@protonmail.ch> * Remove unneeded local var * Fix test to fail with a helpful error message when command isn't found * Rename and deprecate orderedCommands * Update comment about borrowing * Move ArtifactCommand tracking to the EngineManager trait * Update artifact commands since tracking in the engine * Upgrade kittycad-modeling-cmds from 0.2.85 to 0.2.86 * Remove unneeded JsonSchema derive to speed up build * Fix to not fail on floating point differences in CI * Update artifact commands output since truncating floating point numbers * Fix to ensure artifact commands get cleared after a clear scene * Update artifact commands snapshot after clearing them on clear scene * Remove all remnants of OrderedCommands * Update output for new simulation tests --------- Co-authored-by: Kurt Hutten <k.hutten@protonmail.ch>
240 lines
7.9 KiB
Plaintext
240 lines
7.9 KiB
Plaintext
#[cfg(test)]
|
|
mod test_examples_my_func {
|
|
#[tokio::test(flavor = "multi_thread")]
|
|
async fn test_mock_example_my_func0() -> miette::Result<()> {
|
|
let program =
|
|
crate::Program::parse_no_errs("This is another code block.\nyes sirrr.\nmyFunc")
|
|
.unwrap();
|
|
let ctx = crate::ExecutorContext {
|
|
engine: std::sync::Arc::new(Box::new(
|
|
crate::engine::conn_mock::EngineConnection::new()
|
|
.await
|
|
.unwrap(),
|
|
)),
|
|
fs: std::sync::Arc::new(crate::fs::FileManager::new()),
|
|
stdlib: std::sync::Arc::new(crate::std::StdLib::new()),
|
|
settings: Default::default(),
|
|
context_type: crate::execution::ContextType::Mock,
|
|
};
|
|
if let Err(e) = ctx.run(program.into(), &mut crate::ExecState::new()).await {
|
|
return Err(miette::Report::new(crate::errors::Report {
|
|
error: e,
|
|
filename: format!("{}{}", "my_func", 0usize),
|
|
kcl_source: "This is another code block.\nyes sirrr.\nmyFunc".to_string(),
|
|
}));
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 5)]
|
|
async fn kcl_test_example_my_func0() -> miette::Result<()> {
|
|
let code = "This is another code block.\nyes sirrr.\nmyFunc";
|
|
let result = match crate::test_server::execute_and_snapshot(
|
|
code,
|
|
crate::settings::types::UnitLength::Mm,
|
|
None,
|
|
)
|
|
.await
|
|
{
|
|
Err(crate::errors::ExecError::Kcl(e)) => {
|
|
return Err(miette::Report::new(crate::errors::Report {
|
|
error: e.error,
|
|
filename: format!("{}{}", "my_func", 0usize),
|
|
kcl_source: "This is another code block.\nyes sirrr.\nmyFunc".to_string(),
|
|
}));
|
|
}
|
|
Err(other_err) => panic!("{}", other_err),
|
|
Ok(img) => img,
|
|
};
|
|
twenty_twenty::assert_image(
|
|
&format!("tests/outputs/{}.png", "serial_test_example_my_func0"),
|
|
&result,
|
|
0.99,
|
|
);
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread")]
|
|
async fn test_mock_example_my_func1() -> miette::Result<()> {
|
|
let program =
|
|
crate::Program::parse_no_errs("This is code.\nIt does other shit.\nmyFunc").unwrap();
|
|
let ctx = crate::ExecutorContext {
|
|
engine: std::sync::Arc::new(Box::new(
|
|
crate::engine::conn_mock::EngineConnection::new()
|
|
.await
|
|
.unwrap(),
|
|
)),
|
|
fs: std::sync::Arc::new(crate::fs::FileManager::new()),
|
|
stdlib: std::sync::Arc::new(crate::std::StdLib::new()),
|
|
settings: Default::default(),
|
|
context_type: crate::execution::ContextType::Mock,
|
|
};
|
|
if let Err(e) = ctx.run(program.into(), &mut crate::ExecState::new()).await {
|
|
return Err(miette::Report::new(crate::errors::Report {
|
|
error: e,
|
|
filename: format!("{}{}", "my_func", 1usize),
|
|
kcl_source: "This is code.\nIt does other shit.\nmyFunc".to_string(),
|
|
}));
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 5)]
|
|
async fn kcl_test_example_my_func1() -> miette::Result<()> {
|
|
let code = "This is code.\nIt does other shit.\nmyFunc";
|
|
let result = match crate::test_server::execute_and_snapshot(
|
|
code,
|
|
crate::settings::types::UnitLength::Mm,
|
|
None,
|
|
)
|
|
.await
|
|
{
|
|
Err(crate::errors::ExecError::Kcl(e)) => {
|
|
return Err(miette::Report::new(crate::errors::Report {
|
|
error: e.error,
|
|
filename: format!("{}{}", "my_func", 1usize),
|
|
kcl_source: "This is code.\nIt does other shit.\nmyFunc".to_string(),
|
|
}));
|
|
}
|
|
Err(other_err) => panic!("{}", other_err),
|
|
Ok(img) => img,
|
|
};
|
|
twenty_twenty::assert_image(
|
|
&format!("tests/outputs/{}.png", "serial_test_example_my_func1"),
|
|
&result,
|
|
0.99,
|
|
);
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
#[allow(non_camel_case_types, missing_docs)]
|
|
#[doc = "Std lib function: myFunc\nThis is some function.\nIt does shit."]
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, schemars :: JsonSchema, ts_rs :: TS)]
|
|
#[ts(export)]
|
|
pub(crate) struct MyFunc {}
|
|
|
|
#[allow(non_upper_case_globals, missing_docs)]
|
|
#[doc = "Std lib function: myFunc\nThis is some function.\nIt does shit."]
|
|
pub(crate) const MyFunc: MyFunc = MyFunc {};
|
|
fn boxed_my_func(
|
|
exec_state: &mut crate::ExecState,
|
|
args: crate::std::Args,
|
|
) -> std::pin::Pin<
|
|
Box<
|
|
dyn std::future::Future<
|
|
Output = anyhow::Result<crate::execution::KclValue, crate::errors::KclError>,
|
|
> + Send
|
|
+ '_,
|
|
>,
|
|
> {
|
|
Box::pin(my_func(exec_state, args))
|
|
}
|
|
|
|
impl crate::docs::StdLibFn for MyFunc {
|
|
fn name(&self) -> String {
|
|
"myFunc".to_string()
|
|
}
|
|
|
|
fn summary(&self) -> String {
|
|
"This is some function.".to_string()
|
|
}
|
|
|
|
fn description(&self) -> String {
|
|
"It does shit.".to_string()
|
|
}
|
|
|
|
fn tags(&self) -> Vec<String> {
|
|
vec![]
|
|
}
|
|
|
|
fn keyword_arguments(&self) -> bool {
|
|
false
|
|
}
|
|
|
|
fn args(&self, inline_subschemas: bool) -> Vec<crate::docs::StdLibFnArg> {
|
|
let mut settings = schemars::gen::SchemaSettings::openapi3();
|
|
settings.inline_subschemas = inline_subschemas;
|
|
let mut generator = schemars::gen::SchemaGenerator::new(settings);
|
|
vec![crate::docs::StdLibFnArg {
|
|
name: "args".to_string(),
|
|
type_: "kittycad::types::InputFormat".to_string(),
|
|
schema: generator.root_schema_for::<Option<kittycad::types::InputFormat>>(),
|
|
required: false,
|
|
label_required: true,
|
|
description: String::new().to_string(),
|
|
}]
|
|
}
|
|
|
|
fn return_value(&self, inline_subschemas: bool) -> Option<crate::docs::StdLibFnArg> {
|
|
let mut settings = schemars::gen::SchemaSettings::openapi3();
|
|
settings.inline_subschemas = inline_subschemas;
|
|
let mut generator = schemars::gen::SchemaGenerator::new(settings);
|
|
let schema = generator.root_schema_for::<Vec<Sketch>>();
|
|
Some(crate::docs::StdLibFnArg {
|
|
name: "".to_string(),
|
|
type_: "[Sketch]".to_string(),
|
|
schema,
|
|
required: true,
|
|
label_required: true,
|
|
description: String::new(),
|
|
})
|
|
}
|
|
|
|
fn unpublished(&self) -> bool {
|
|
false
|
|
}
|
|
|
|
fn deprecated(&self) -> bool {
|
|
false
|
|
}
|
|
|
|
fn feature_tree_operation(&self) -> bool {
|
|
false
|
|
}
|
|
|
|
fn examples(&self) -> Vec<String> {
|
|
let code_blocks = vec![
|
|
"This is another code block.\nyes sirrr.\nmyFunc",
|
|
"This is code.\nIt does other shit.\nmyFunc",
|
|
];
|
|
code_blocks
|
|
.iter()
|
|
.map(|cb| {
|
|
let program = crate::Program::parse_no_errs(cb).unwrap();
|
|
let mut options: crate::parsing::ast::types::FormatOptions = Default::default();
|
|
options.insert_final_newline = false;
|
|
program.ast.recast(&options, 0)
|
|
})
|
|
.collect::<Vec<String>>()
|
|
}
|
|
|
|
fn std_lib_fn(&self) -> crate::std::StdFn {
|
|
boxed_my_func
|
|
}
|
|
|
|
fn clone_box(&self) -> Box<dyn crate::docs::StdLibFn> {
|
|
Box::new(self.clone())
|
|
}
|
|
}
|
|
|
|
#[doc = r" This is some function."]
|
|
#[doc = r" It does shit."]
|
|
#[doc = r""]
|
|
#[doc = r" This is code."]
|
|
#[doc = r" It does other shit."]
|
|
#[doc = r" myFunc"]
|
|
#[doc = r""]
|
|
#[doc = r" ```"]
|
|
#[doc = r" This is another code block."]
|
|
#[doc = r" yes sirrr."]
|
|
#[doc = r" myFunc"]
|
|
#[doc = r" ```"]
|
|
fn inner_my_func(
|
|
#[doc = r" The args to do shit to."] args: Option<kittycad::types::InputFormat>,
|
|
) -> Result<Vec<Box<Sketch>>> {
|
|
args
|
|
}
|