Patterns 2d 3d (#1701)

* refactor

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* pattern2d and 3d

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* fix derive docs more

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* fixes

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* fix

Signed-off-by: Jess Frazelle <github@jessfraz.com>

---------

Signed-off-by: Jess Frazelle <github@jessfraz.com>

src/wasm-lib/derive-docs/tests/array.gen

@@ -55,7 +55,7 @@ impl crate::docs::StdLibFn for Show {
         Some(crate::docs::StdLibFnArg {
             name: "".to_string(),
             type_: "number".to_string(),
-            schema: f64::json_schema(&mut generator),
+            schema: <f64>::json_schema(&mut generator),
             required: true,
         })
     }
@@ -77,6 +77,6 @@ impl crate::docs::StdLibFn for Show {
     }
 }
 
-fn inner_show(#[doc = r" The args to do shit to."] args: [f64; 2]) -> Box<f64> {
+fn inner_show(#[doc = r" The args to do shit to."] args: [f64; 2]) -> Result<Box<f64>> {
     args
 }

src/wasm-lib/derive-docs/tests/box.gen

@@ -55,7 +55,7 @@ impl crate::docs::StdLibFn for Show {
         Some(crate::docs::StdLibFnArg {
             name: "".to_string(),
             type_: "number".to_string(),
-            schema: f64::json_schema(&mut generator),
+            schema: <f64>::json_schema(&mut generator),
             required: true,
         })
     }

src/wasm-lib/derive-docs/tests/lineTo.gen

@@ -63,7 +63,7 @@ impl crate::docs::StdLibFn for LineTo {
         Some(crate::docs::StdLibFnArg {
             name: "".to_string(),
             type_: "SketchGroup".to_string(),
-            schema: SketchGroup::json_schema(&mut generator),
+            schema: <SketchGroup>::json_schema(&mut generator),
             required: true,
         })
     }

src/wasm-lib/derive-docs/tests/min.gen

@@ -55,7 +55,7 @@ impl crate::docs::StdLibFn for Min {
         Some(crate::docs::StdLibFnArg {
             name: "".to_string(),
             type_: "number".to_string(),
-            schema: f64::json_schema(&mut generator),
+            schema: <f64>::json_schema(&mut generator),
             required: true,
         })
     }

src/wasm-lib/derive-docs/tests/option.gen

@@ -55,7 +55,7 @@ impl crate::docs::StdLibFn for Show {
         Some(crate::docs::StdLibFnArg {
             name: "".to_string(),
             type_: "number".to_string(),
-            schema: f64::json_schema(&mut generator),
+            schema: <f64>::json_schema(&mut generator),
             required: true,
         })
     }
@@ -77,6 +77,6 @@ impl crate::docs::StdLibFn for Show {
     }
 }
 
-fn inner_show(#[doc = r" The args to do shit to."] args: Option<f64>) -> Box<f64> {
+fn inner_show(#[doc = r" The args to do shit to."] args: Option<f64>) -> Result<Box<f64>> {
     args
 }

src/wasm-lib/derive-docs/tests/option_input_format.gen

@@ -55,7 +55,7 @@ impl crate::docs::StdLibFn for Import {
         Some(crate::docs::StdLibFnArg {
             name: "".to_string(),
             type_: "number".to_string(),
-            schema: f64::json_schema(&mut generator),
+            schema: <f64>::json_schema(&mut generator),
             required: true,
         })
     }
@@ -79,6 +79,6 @@ impl crate::docs::StdLibFn for Import {
 
 fn inner_import(
     #[doc = r" The args to do shit to."] args: Option<kittycad::types::InputFormat>,
-) -> Box<f64> {
+) -> Result<Box<f64>> {
     args
 }

src/wasm-lib/derive-docs/tests/return_vec_box_sketch_group.gen

@@ -0,0 +1,84 @@
+#[allow(non_camel_case_types, missing_docs)]
+#[doc = "Std lib function: import"]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, schemars :: JsonSchema, ts_rs :: TS)]
+#[ts(export)]
+pub(crate) struct Import {}
+
+#[allow(non_upper_case_globals, missing_docs)]
+#[doc = "Std lib function: import"]
+pub(crate) const Import: Import = Import {};
+fn boxed_import(
+    args: crate::std::Args,
+) -> std::pin::Pin<
+    Box<
+        dyn std::future::Future<
+            Output = anyhow::Result<crate::executor::MemoryItem, crate::errors::KclError>,
+        >,
+    >,
+> {
+    Box::pin(import(args))
+}
+
+impl crate::docs::StdLibFn for Import {
+    fn name(&self) -> String {
+        "import".to_string()
+    }
+
+    fn summary(&self) -> String {
+        "".to_string()
+    }
+
+    fn description(&self) -> String {
+        "".to_string()
+    }
+
+    fn tags(&self) -> Vec<String> {
+        vec![]
+    }
+
+    fn args(&self) -> Vec<crate::docs::StdLibFnArg> {
+        let mut settings = schemars::gen::SchemaSettings::openapi3();
+        settings.inline_subschemas = true;
+        let mut generator = schemars::gen::SchemaGenerator::new(settings);
+        vec![crate::docs::StdLibFnArg {
+            name: "args".to_string(),
+            type_: "kittycad::types::InputFormat".to_string(),
+            schema: <Option<kittycad::types::InputFormat>>::json_schema(&mut generator),
+            required: false,
+        }]
+    }
+
+    fn return_value(&self) -> Option<crate::docs::StdLibFnArg> {
+        let mut settings = schemars::gen::SchemaSettings::openapi3();
+        settings.inline_subschemas = true;
+        let mut generator = schemars::gen::SchemaGenerator::new(settings);
+        Some(crate::docs::StdLibFnArg {
+            name: "".to_string(),
+            type_: "[SketchGroup]".to_string(),
+            schema: <Vec<SketchGroup>>::json_schema(&mut generator),
+            required: true,
+        })
+    }
+
+    fn unpublished(&self) -> bool {
+        false
+    }
+
+    fn deprecated(&self) -> bool {
+        false
+    }
+
+    fn std_lib_fn(&self) -> crate::std::StdFn {
+        boxed_import
+    }
+
+    fn clone_box(&self) -> Box<dyn crate::docs::StdLibFn> {
+        Box::new(self.clone())
+    }
+}
+
+fn inner_import(
+    #[doc = r" The args to do shit to."] args: Option<kittycad::types::InputFormat>,
+) -> Result<Vec<Box<SketchGroup>>> {
+    args
+}

src/wasm-lib/derive-docs/tests/return_vec_sketch_group.gen

@@ -0,0 +1,84 @@
+#[allow(non_camel_case_types, missing_docs)]
+#[doc = "Std lib function: import"]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, schemars :: JsonSchema, ts_rs :: TS)]
+#[ts(export)]
+pub(crate) struct Import {}
+
+#[allow(non_upper_case_globals, missing_docs)]
+#[doc = "Std lib function: import"]
+pub(crate) const Import: Import = Import {};
+fn boxed_import(
+    args: crate::std::Args,
+) -> std::pin::Pin<
+    Box<
+        dyn std::future::Future<
+            Output = anyhow::Result<crate::executor::MemoryItem, crate::errors::KclError>,
+        >,
+    >,
+> {
+    Box::pin(import(args))
+}
+
+impl crate::docs::StdLibFn for Import {
+    fn name(&self) -> String {
+        "import".to_string()
+    }
+
+    fn summary(&self) -> String {
+        "".to_string()
+    }
+
+    fn description(&self) -> String {
+        "".to_string()
+    }
+
+    fn tags(&self) -> Vec<String> {
+        vec![]
+    }
+
+    fn args(&self) -> Vec<crate::docs::StdLibFnArg> {
+        let mut settings = schemars::gen::SchemaSettings::openapi3();
+        settings.inline_subschemas = true;
+        let mut generator = schemars::gen::SchemaGenerator::new(settings);
+        vec![crate::docs::StdLibFnArg {
+            name: "args".to_string(),
+            type_: "kittycad::types::InputFormat".to_string(),
+            schema: <Option<kittycad::types::InputFormat>>::json_schema(&mut generator),
+            required: false,
+        }]
+    }
+
+    fn return_value(&self) -> Option<crate::docs::StdLibFnArg> {
+        let mut settings = schemars::gen::SchemaSettings::openapi3();
+        settings.inline_subschemas = true;
+        let mut generator = schemars::gen::SchemaGenerator::new(settings);
+        Some(crate::docs::StdLibFnArg {
+            name: "".to_string(),
+            type_: "[SketchGroup]".to_string(),
+            schema: <Vec<SketchGroup>>::json_schema(&mut generator),
+            required: true,
+        })
+    }
+
+    fn unpublished(&self) -> bool {
+        false
+    }
+
+    fn deprecated(&self) -> bool {
+        false
+    }
+
+    fn std_lib_fn(&self) -> crate::std::StdFn {
+        boxed_import
+    }
+
+    fn clone_box(&self) -> Box<dyn crate::docs::StdLibFn> {
+        Box::new(self.clone())
+    }
+}
+
+fn inner_import(
+    #[doc = r" The args to do shit to."] args: Option<kittycad::types::InputFormat>,
+) -> Result<Vec<SketchGroup>> {
+    args
+}

src/wasm-lib/derive-docs/tests/show.gen

@@ -52,7 +52,12 @@ impl crate::docs::StdLibFn for Show {
         let mut settings = schemars::gen::SchemaSettings::openapi3();
         settings.inline_subschemas = true;
         let mut generator = schemars::gen::SchemaGenerator::new(settings);
-        None
+        Some(crate::docs::StdLibFnArg {
+            name: "".to_string(),
+            type_: "()".to_string(),
+            schema: <()>::json_schema(&mut generator),
+            required: true,
+        })
     }
 
     fn unpublished(&self) -> bool {