Support required vs nullable

.github/workflows/release.yml

@@ -15,8 +15,7 @@ jobs:
 
       - name: Setup Extism
         run: |
-          curl -O https://raw.githubusercontent.com/extism/js-pdk/main/install.sh
-          bash install.sh
+          curl https://raw.githubusercontent.com/extism/js-pdk/main/install.sh | bash
 
       - name: Set up Node.js
         uses: actions/setup-node@v2

package.json

@@ -17,7 +17,7 @@
     "typescript": "^5.3.2"
   },
   "dependencies": {
-    "@dylibso/xtp-bindgen": "1.0.0-rc.8",
+    "@dylibso/xtp-bindgen": "1.0.0-rc.11",
     "ejs": "^3.1.10"
   }
 }

template/src/pdk.rs.ejs

@@ -65,6 +65,11 @@ pub extern "C" fn <%- ex.name %>() -> i32 {
 }
 
 pub mod types {
+    #[derive(serde::Serialize, serde::Deserialize, extism_pdk::FromBytes, extism_pdk::ToBytes)]
+    #[encoding(Json)]
+    #[serde(transparent)]
+    pub struct Base64(#[serde(with = "Base64Standard")] pub Vec<u8>);
+
     use super::*;
 <% Object.values(schema.schemas).forEach(schema => { %>
     <% if (schema.enum) { %>
@@ -85,9 +90,12 @@ pub struct <%- capitalize(schema.name) %> {
 		/// <%- formatCommentBlock(p.description, "/// ") %>
 		<% } -%>
     #[serde(rename = "<%- p.name %>")]
-    <% if (p.nullable) { %>#[serde(default)]<% } %>
-    <% if (p.type === "buffer") { %> #[serde(with = "Base64Standard")] <% } %>
-		<%- makePublic(camelToSnakeCase(p.name)) %>: <%- p.nullable ? `Option<${toRustType(p)}>` : toRustType(p) %>,
+    <% if (!p.required && p.nullable) { %> #[serde(skip_serializing_if = "Option::is_none")] <% } %>
+    <% if (p.type === "buffer") { %>
+		<%- makePublic(camelToSnakeCase(p.name)) %>: <%- p.nullable || !p.required ? `Option<Base64>` : Base64 %>,
+    <% } else { %>
+		<%- makePublic(camelToSnakeCase(p.name)) %>: <%- p.nullable || !p.required ? `Option<${toRustType(p)}>` : toRustType(p) %>,
+    <% } %>
 		<% }) %>
 
     <% if (schema.additionalProperties) { %>

tests/schemas/fruit.yaml

@@ -117,4 +117,8 @@ components:
         writeParams:
           "$ref": "#/components/schemas/WriteParams"
           nullable: true
+      required:
+        - aString
+        - aDate
+        - writeParams
       description: A complex json object