json buffer serialization

.github/workflows/test.yml

@@ -90,7 +90,7 @@ jobs:
           echo "Running xtp plugin init"
           xtp plugin init --schema-file schema.yaml --template ../template-bundle --path exampleplugin --name exampleplugin --feature stub-with-code-samples
           echo "Running xtp plugin build"
-          script -q -c "xtp plugin build --path exampleplugin" /dev/stdout
+          xtp plugin build --path exampleplugin
           echo "Running xtp plugin test"
           xtp plugin test exampleplugin/dist/plugin.wasm --with test.wasm --mock-host mock.wasm
 

package.json

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

src/index.ts

@@ -57,7 +57,7 @@ function toCSharpType(property: Property): string {
       if (property.format === "double") {
         return "Double";
       }
-      return "long";
+      return "Int64";
     case "integer":
       return "Int32";
     case "boolean":

template/Host.cs.ejs

@@ -1,10 +1,14 @@
 namespace <%- project.name %>;
+
+using Extism;
+
 using System;
 using System.Runtime.InteropServices;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Text.Json.Nodes;
-using Extism;
+using System.Buffers.Text;
+using System.Buffers;
 
 public class Host
 {
@@ -135,6 +139,9 @@ public class Host
         {
             <% Object.values(s.properties).forEach(p => { %>
             [JsonPropertyName("<%- p.name %>")]
+            <% if (p.type === 'buffer') { %>
+            [JsonConverter(typeof(Base64JsonConverter))]
+            <% } %>
             public <%- toCSharpType(p) %> <%- toPascalCase(p.name) %> { get; set; }
             <% }) %>
         }
@@ -152,6 +159,27 @@ public partial class PdkJsonContext : JsonSerializerContext
     {
         var options = new JsonSerializerOptions();
         options.Converters.Add(new JsonStringEnumConverter());
+        options.Converters.Add(new Base64JsonConverter());
+
         return options;
     }
 }
+
+public class Base64JsonConverter : JsonConverter<byte[]>
+{
+    public override byte[] Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (reader.TokenType != JsonTokenType.String)
+        {
+            throw new JsonException("Expected string value for Base64 encoded data.");
+        }
+
+        string base64String = reader.GetString();
+        return Convert.FromBase64String(base64String);
+    }
+
+    public override void Write(Utf8JsonWriter writer, byte[] value, JsonSerializerOptions options)
+    {
+        writer.WriteStringValue(Convert.ToBase64String(value));
+    }
+}

template/xtp.toml.ejs

@@ -1,14 +1,14 @@
 app_id = "<%- project.appId %>"
 
 # This is where 'xtp plugin push' expects to find the DLL file after the build script has run.
-bin = "dist/Plugin.wasm"
+bin = "dist/plugin.wasm"
 extension_point_id = "<%- project.extensionPointId %>"
 # This is the 'binding' name used for the plugin.
 name = "<%- project.name %>"
 
 [scripts]
 # xtp plugin build runs this script to generate the DLL file
-build = "mkdir dist 2>nul && dotnet publish -c Release && cp bin/Release/wasi-wasm/AppBundle/<%-project.name%>.wasm dist/plugin.wasm"
+build = "dotnet publish -c Release && cp bin/Release/wasi-wasm/AppBundle/<%-project.name%>.wasm dist/plugin.wasm"
 
 # xtp plugin init runs this script to format the code
 format = "dotnet format && mv Plugin.csproj <%-project.name%>.csproj 2>nul"

tests/schemas/fruit.yaml

@@ -62,7 +62,6 @@ imports:
       description: the raw byte values at key
   kv_write:
     description: kvwrite
-    contentType: application/json
     input:
       contentType: application/json
       "$ref": "#/components/schemas/WriteParams"
@@ -92,8 +91,6 @@ components:
       - inky
       - clyde
       description: A set of all the enemies of pac-man
-    AnonymousObject:
-      type: object
     ComplexObject:
       properties:
         ghost:
@@ -120,6 +117,6 @@ components:
           "$ref": "#/components/schemas/WriteParams"
           nullable: true
         anon:
-          "$ref": "#/components/schemas/AnonymousObject"
+          type: object
           nullable: true
-      description: A complex json object
+      description: A complex json object