chordsketch 0.5.0 → 0.6.0

data/lib/chordsketch_uniffi.rb

@@ -14,7 +14,7 @@
 # helpers directly inline like we're doing here.
 
 require 'ffi'
-
+require 'set'
 
 module Chordsketch
   def self.uniffi_in_range(i, type_name, min, max)
@@ -36,21 +36,64 @@ def self.uniffi_bytes(v)
   v.to_str
 end
 
+# Callback return codes
+UNIFFI_CALLBACK_SUCCESS = 0
+UNIFFI_CALLBACK_ERROR = 1
+UNIFFI_CALLBACK_UNEXPECTED_ERROR = 2
+
+# Call a method on a callback interface object, catching and reporting errors
+# to Rust via the call_status.
+# If error_type is provided, known errors of that type are reported as UNIFFI_CALLBACK_ERROR;
+# all other errors are reported as UNIFFI_CALLBACK_UNEXPECTED_ERROR.
+def self.uniffi_trait_interface_call(call_status, make_call, write_return_value, error_type = nil, lower_error = nil)
+  begin
+    write_return_value.call make_call.call
+  rescue StandardError => e
+    buf = if !error_type.nil? && uniffi_is_error_type?(e, error_type)
+      call_status[:code] = UNIFFI_CALLBACK_ERROR
+      lower_error.call e
+    else
+      call_status[:code] = UNIFFI_CALLBACK_UNEXPECTED_ERROR
+      RustBuffer.alloc_from_string(e.inspect)
+    end
+
+    error_buf = call_status[:error_buf]
+    error_buf[:capacity] = buf[:capacity]
+    error_buf[:len] = buf[:len]
+    error_buf[:data] = buf[:data]
+  end
+end
+
+# Check if an exception is a variant of the given error type.
+# Error types in Ruby are either modules (non-flat enums) or classes (flat enums),
+# with variant classes as constant within them.
+def self.uniffi_is_error_type?(e, error_type)
+  # Object-as-error: error_type is a class itself (e.g. MyError < StandardError)
+  if error_type.is_a?(Class) && e.is_a?(error_type)
+    return true
+  end
+
+  # Enum error: error_type is a module with class constants for each variant
+  error_type.constants.any? do |c|
+    klass = error_type.const_get c
+    klass.is_a?(Class) && e.is_a?(klass)
+  end
+end
   class RustBuffer < FFI::Struct
   layout :capacity, :uint64,
          :len,      :uint64,
          :data,     :pointer
 
   def self.alloc(size)
-    return Chordsketch.rust_call(:ffi_chordsketch_ffi_rustbuffer_alloc, size)
+    return ::Chordsketch.rust_call(:ffi_chordsketch_ffi_rustbuffer_alloc, size)
   end
 
   def self.reserve(rbuf, additional)
-    return Chordsketch.rust_call(:ffi_chordsketch_ffi_rustbuffer_reserve, rbuf, additional)
+    return ::Chordsketch.rust_call(:ffi_chordsketch_ffi_rustbuffer_reserve, rbuf, additional)
   end
 
   def free
-    Chordsketch.rust_call(:ffi_chordsketch_ffi_rustbuffer_free, self)
+    ::Chordsketch.rust_call(:ffi_chordsketch_ffi_rustbuffer_free, self)
   end
 
   def capacity
@@ -98,14 +141,14 @@ end
     free
   end# The primitive String type.
 
-  def self.allocFromString(value)
+  def self.alloc_from_string(value)
     RustBuffer.allocWithBuilder do |builder|
       builder.write value.encode('utf-8')
       return builder.finalize
     end
   end
 
-  def consumeIntoString
+  def consume_into_string
     consumeWithStream do |stream|
       return stream.read(stream.remaining).force_encoding(Encoding::UTF_8)
     end
@@ -113,16 +156,16 @@ end
 
   # The primitive Bytes type.
 
-  def self.allocFromBytes(value)
+  def self.alloc_from_bytes(value)
     RustBuffer.allocWithBuilder do |builder|
-      builder.write_Bytes(value)
+      builder.write_bytes(value)
       return builder.finalize
     end
   end
 
-  def consumeIntoBytes
+  def consume_into_bytes
     consumeWithStream do |stream|
-      return stream.readBytes
+      return stream.read_bytes
     end
   end
 
@@ -140,9 +183,9 @@ end
     end
   end
 
-  def consumeIntoTypeChordDefine
+  def consume_into_TypeChordDefine
     consumeWithStream do |stream|
-      return stream.readTypeChordDefine
+      return stream.read_TypeChordDefine
     end
   end
 
@@ -160,9 +203,9 @@ end
     end
   end
 
-  def consumeIntoTypeConversionWithWarnings
+  def consume_into_TypeConversionWithWarnings
     consumeWithStream do |stream|
-      return stream.readTypeConversionWithWarnings
+      return stream.read_TypeConversionWithWarnings
     end
   end
 
@@ -180,9 +223,31 @@ end
     end
   end
 
-  def consumeIntoTypePdfRenderWithWarnings
+  def consume_into_TypePdfRenderWithWarnings
+    consumeWithStream do |stream|
+      return stream.read_TypePdfRenderWithWarnings
+    end
+  end
+
+  # The Record type StaffNote.
+
+  def self.check_lower_TypeStaffNote(v)
+    
+    
+    
+    
+  end
+
+  def self.alloc_from_TypeStaffNote(v)
+    RustBuffer.allocWithBuilder do |builder|
+      builder.write_TypeStaffNote(v)
+      return builder.finalize
+    end
+  end
+
+  def consume_into_TypeStaffNote
     consumeWithStream do |stream|
-      return stream.readTypePdfRenderWithWarnings
+      return stream.read_TypeStaffNote
     end
   end
 
@@ -200,9 +265,9 @@ end
     end
   end
 
-  def consumeIntoTypeTextRenderWithWarnings
+  def consume_into_TypeTextRenderWithWarnings
     consumeWithStream do |stream|
-      return stream.readTypeTextRenderWithWarnings
+      return stream.read_TypeTextRenderWithWarnings
     end
   end
 
@@ -221,18 +286,32 @@ end
     end
   end
 
-  def consumeIntoTypeValidationError
+  def consume_into_TypeValidationError
     consumeWithStream do |stream|
-      return stream.readTypeValidationError
+      return stream.read_TypeValidationError
+    end
+  end
+
+  # Error enum - generate alloc_from for callback error serialization
+  def self.alloc_from_TypeChordSketchError(v)
+    RustBuffer.allocWithBuilder do |builder|
+      builder.write_TypeChordSketchError(v)
+      return builder.finalize
     end
   end
 
+  # Enum used as error - generate consume_into_ for use as a return value
+  def consume_into_TypeChordSketchError
+    consumeWithStream do |stream|
+      return stream.read_TypeChordSketchError
+    end
+  end
   
 
   # The Optional<T> type for i8.
 
   def self.check_lower_Optionali8(v)
-    if not v.nil?
+    if !v.nil?
       
     end
   end
@@ -244,16 +323,16 @@ end
     end
   end
 
-  def consumeIntoOptionali8
+  def consume_into_Optionali8
     consumeWithStream do |stream|
-      return stream.readOptionali8
+      return stream.read_Optionali8
     end
   end
 
   # The Optional<T> type for string.
 
   def self.check_lower_Optionalstring(v)
-    if not v.nil?
+    if !v.nil?
       
     end
   end
@@ -265,9 +344,72 @@ end
     end
   end
 
-  def consumeIntoOptionalstring
+  def consume_into_Optionalstring
+    consumeWithStream do |stream|
+      return stream.read_Optionalstring
+    end
+  end
+
+  # The Optional<T> type for Sequenceu8.
+
+  def self.check_lower_OptionalSequenceu8(v)
+    if !v.nil?
+      RustBuffer.check_lower_Sequenceu8(v)
+    end
+  end
+
+  def self.alloc_from_OptionalSequenceu8(v)
+    RustBuffer.allocWithBuilder do |builder|
+      builder.write_OptionalSequenceu8(v)
+      return builder.finalize()
+    end
+  end
+
+  def consume_into_OptionalSequenceu8
+    consumeWithStream do |stream|
+      return stream.read_OptionalSequenceu8
+    end
+  end
+
+  # The Optional<T> type for SequenceTypeStaffNote.
+
+  def self.check_lower_OptionalSequenceTypeStaffNote(v)
+    if !v.nil?
+      RustBuffer.check_lower_SequenceTypeStaffNote(v)
+    end
+  end
+
+  def self.alloc_from_OptionalSequenceTypeStaffNote(v)
+    RustBuffer.allocWithBuilder do |builder|
+      builder.write_OptionalSequenceTypeStaffNote(v)
+      return builder.finalize()
+    end
+  end
+
+  def consume_into_OptionalSequenceTypeStaffNote
+    consumeWithStream do |stream|
+      return stream.read_OptionalSequenceTypeStaffNote
+    end
+  end
+
+  # The Sequence<T> type for u8.
+
+  def self.check_lower_Sequenceu8(v)
+    v.each do |item|
+      
+    end
+  end
+
+  def self.alloc_from_Sequenceu8(v)
+    RustBuffer.allocWithBuilder do |builder|
+      builder.write_Sequenceu8(v)
+      return builder.finalize()
+    end
+  end
+
+  def consume_into_Sequenceu8
     consumeWithStream do |stream|
-      return stream.readOptionalstring
+      return stream.read_Sequenceu8
     end
   end
 
@@ -286,9 +428,9 @@ end
     end
   end
 
-  def consumeIntoSequencestring
+  def consume_into_Sequencestring
     consumeWithStream do |stream|
-      return stream.readSequencestring
+      return stream.read_Sequencestring
     end
   end
 
@@ -307,9 +449,30 @@ end
     end
   end
 
-  def consumeIntoSequenceTypeChordDefine
+  def consume_into_SequenceTypeChordDefine
+    consumeWithStream do |stream|
+      return stream.read_SequenceTypeChordDefine
+    end
+  end
+
+  # The Sequence<T> type for TypeStaffNote.
+
+  def self.check_lower_SequenceTypeStaffNote(v)
+    v.each do |item|
+      RustBuffer.check_lower_TypeStaffNote(item)
+    end
+  end
+
+  def self.alloc_from_SequenceTypeStaffNote(v)
+    RustBuffer.allocWithBuilder do |builder|
+      builder.write_SequenceTypeStaffNote(v)
+      return builder.finalize()
+    end
+  end
+
+  def consume_into_SequenceTypeStaffNote
     consumeWithStream do |stream|
-      return stream.readSequenceTypeChordDefine
+      return stream.read_SequenceTypeStaffNote
     end
   end
 
@@ -328,9 +491,9 @@ end
     end
   end
 
-  def consumeIntoSequenceTypeValidationError
+  def consume_into_SequenceTypeValidationError
     consumeWithStream do |stream|
-      return stream.readSequenceTypeValidationError
+      return stream.read_SequenceTypeValidationError
     end
   end
 
@@ -380,15 +543,19 @@ class RustBufferStream
     data
   end
 
-  def readI8
+  def read_u8
+    unpack_from 1, 'c'
+  end
+
+  def read_i8
     unpack_from 1, 'c'
   end
 
-  def readU32
+  def read_u32
     unpack_from 4, 'L>'
   end
 
-  def readString
+  def read_string
     size = unpack_from 4, 'l>'
 
     raise InternalError, 'Unexpected negative string length' if size.negative?
@@ -396,7 +563,7 @@ class RustBufferStream
     read(size).force_encoding(Encoding::UTF_8)
   end
 
-  def readBytes
+  def read_bytes
     size = unpack_from 4, 'l>'
 
     raise InternalError, 'Unexpected negative byte string length' if size.negative?
@@ -406,47 +573,58 @@ class RustBufferStream
 
   # The Record type ChordDefine.
 
-  def readTypeChordDefine
+  def read_TypeChordDefine
     ChordDefine.new(
-      name: readString,
-      raw: readString
+      name: read_string,
+      raw: read_string
     )
   end
 
   # The Record type ConversionWithWarnings.
 
-  def readTypeConversionWithWarnings
+  def read_TypeConversionWithWarnings
     ConversionWithWarnings.new(
-      output: readString,
-      warnings: readSequencestring
+      output: read_string,
+      warnings: read_Sequencestring
     )
   end
 
   # The Record type PdfRenderWithWarnings.
 
-  def readTypePdfRenderWithWarnings
+  def read_TypePdfRenderWithWarnings
     PdfRenderWithWarnings.new(
-      output: readBytes,
-      warnings: readSequencestring
+      output: read_bytes,
+      warnings: read_Sequencestring
+    )
+  end
+
+  # The Record type StaffNote.
+
+  def read_TypeStaffNote
+    StaffNote.new(
+      letter: read_string,
+      accidental: read_i8,
+      octave: read_i8,
+      midi: read_u8
     )
   end
 
   # The Record type TextRenderWithWarnings.
 
-  def readTypeTextRenderWithWarnings
+  def read_TypeTextRenderWithWarnings
     TextRenderWithWarnings.new(
-      output: readString,
-      warnings: readSequencestring
+      output: read_string,
+      warnings: read_Sequencestring
     )
   end
 
   # The Record type ValidationError.
 
-  def readTypeValidationError
+  def read_TypeValidationError
     ValidationError.new(
-      line: readU32,
-      column: readU32,
-      message: readString
+      line: read_u32,
+      column: read_u32,
+      message: read_string
     )
   end
 
@@ -456,7 +634,7 @@ class RustBufferStream
 
   # The Error type ChordSketchError
 
-  def readTypeChordSketchError
+  def read_TypeChordSketchError
     variant = unpack_from 4, 'l>'
     
     if variant == 1
@@ -464,12 +642,12 @@ class RustBufferStream
     end
     if variant == 2
         return ChordSketchError::InvalidConfig.new(
-            readString()
+            reason: read_string()
         )
     end
     if variant == 3
         return ChordSketchError::ConversionFailed.new(
-            readString()
+            reason: read_string()
         )
     end
 
@@ -477,37 +655,85 @@ class RustBufferStream
   end
   
 
+  
   # The Optional<T> type for i8.
 
-  def readOptionali8
+  def read_Optionali8
     flag = unpack_from 1, 'c'
 
     if flag == 0
       return nil
     elsif flag == 1
-      return readI8
+      return read_i8
     else
       raise InternalError, 'Unexpected flag byte for Optionali8'
     end
   end
 
+  
   # The Optional<T> type for string.
 
-  def readOptionalstring
+  def read_Optionalstring
     flag = unpack_from 1, 'c'
 
     if flag == 0
       return nil
     elsif flag == 1
-      return readString
+      return read_string
     else
       raise InternalError, 'Unexpected flag byte for Optionalstring'
     end
   end
 
+  
+  # The Optional<T> type for Sequenceu8.
+
+  def read_OptionalSequenceu8
+    flag = unpack_from 1, 'c'
+
+    if flag == 0
+      return nil
+    elsif flag == 1
+      return read_Sequenceu8
+    else
+      raise InternalError, 'Unexpected flag byte for OptionalSequenceu8'
+    end
+  end
+
+  
+  # The Optional<T> type for SequenceTypeStaffNote.
+
+  def read_OptionalSequenceTypeStaffNote
+    flag = unpack_from 1, 'c'
+
+    if flag == 0
+      return nil
+    elsif flag == 1
+      return read_SequenceTypeStaffNote
+    else
+      raise InternalError, 'Unexpected flag byte for OptionalSequenceTypeStaffNote'
+    end
+  end
+
+  # The Sequence<T> type for u8.
+
+  def read_Sequenceu8
+    count = unpack_from 4, 'l>'
+
+    raise InternalError, 'Unexpected negative sequence length' if count.negative?
+
+    items = []
+
+    count.times do
+      items.append read_u8
+    end
+
+    items
+  end
+
   # The Sequence<T> type for string.
 
-  def readSequencestring
+  def read_Sequencestring
     count = unpack_from 4, 'l>'
 
     raise InternalError, 'Unexpected negative sequence length' if count.negative?
@@ -515,7 +741,7 @@ class RustBufferStream
     items = []
 
     count.times do
-      items.append readString
+      items.append read_string
     end
 
     items
@@ -523,7 +749,23 @@ class RustBufferStream
 
   # The Sequence<T> type for TypeChordDefine.
 
-  def readSequenceTypeChordDefine
+  def read_SequenceTypeChordDefine
+    count = unpack_from 4, 'l>'
+
+    raise InternalError, 'Unexpected negative sequence length' if count.negative?
+
+    items = []
+
+    count.times do
+      items.append read_TypeChordDefine
+    end
+
+    items
+  end
+
+  # The Sequence<T> type for TypeStaffNote.
+
+  def read_SequenceTypeStaffNote
     count = unpack_from 4, 'l>'
 
     raise InternalError, 'Unexpected negative sequence length' if count.negative?
@@ -531,7 +773,7 @@ class RustBufferStream
     items = []
 
     count.times do
-      items.append readTypeChordDefine
+      items.append read_TypeStaffNote
     end
 
     items
@@ -539,7 +781,7 @@ class RustBufferStream
 
   # The Sequence<T> type for TypeValidationError.
 
-  def readSequenceTypeValidationError
+  def read_SequenceTypeValidationError
     count = unpack_from 4, 'l>'
 
     raise InternalError, 'Unexpected negative sequence length' if count.negative?
@@ -547,7 +789,7 @@ class RustBufferStream
     items = []
 
     count.times do
-      items.append readTypeValidationError
+      items.append read_TypeValidationError
     end
 
     items
@@ -599,24 +841,29 @@ class RustBufferBuilder
     end
   end
 
-  def write_I8(v)
-    v = Chordsketch::uniffi_in_range(v, "i8", -2**7, 2**7)
+  def write_u8(v)
+    v = ::Chordsketch::uniffi_in_range(v, "u8", 0, 2**8)
+    pack_into(1, 'c', v)
+  end
+
+  def write_i8(v)
+    v = ::Chordsketch::uniffi_in_range(v, "i8", -2**7, 2**7)
     pack_into(1, 'c', v)
   end
 
-  def write_U32(v)
-    v = Chordsketch::uniffi_in_range(v, "u32", 0, 2**32)
+  def write_u32(v)
+    v = ::Chordsketch::uniffi_in_range(v, "u32", 0, 2**32)
     pack_into(4, 'L>', v)
   end
 
-  def write_String(v)
-    v = Chordsketch::uniffi_utf8(v)
+  def write_string(v)
+    v = ::Chordsketch::uniffi_utf8(v)
     pack_into 4, 'l>', v.bytes.size
     write v
   end
 
-  def write_Bytes(v)
-    v = Chordsketch::uniffi_bytes(v)
+  def write_bytes(v)
+    v = ::Chordsketch::uniffi_bytes(v)
     pack_into 4, 'l>', v.bytes.size
     write v
   end
@@ -624,39 +871,66 @@ class RustBufferBuilder
   # The Record type ChordDefine.
 
   def write_TypeChordDefine(v)
-    self.write_String(v.name)
-    self.write_String(v.raw)
+    self.write_string(v.name)
+    self.write_string(v.raw)
   end
 
   # The Record type ConversionWithWarnings.
 
   def write_TypeConversionWithWarnings(v)
-    self.write_String(v.output)
+    self.write_string(v.output)
     self.write_Sequencestring(v.warnings)
   end
 
   # The Record type PdfRenderWithWarnings.
 
   def write_TypePdfRenderWithWarnings(v)
-    self.write_Bytes(v.output)
+    self.write_bytes(v.output)
     self.write_Sequencestring(v.warnings)
   end
 
+  # The Record type StaffNote.
+
+  def write_TypeStaffNote(v)
+    self.write_string(v.letter)
+    self.write_i8(v.accidental)
+    self.write_i8(v.octave)
+    self.write_u8(v.midi)
+  end
+
   # The Record type TextRenderWithWarnings.
 
   def write_TypeTextRenderWithWarnings(v)
-    self.write_String(v.output)
+    self.write_string(v.output)
     self.write_Sequencestring(v.warnings)
   end
 
   # The Record type ValidationError.
 
   def write_TypeValidationError(v)
-    self.write_U32(v.line)
-    self.write_U32(v.column)
-    self.write_String(v.message)
+    self.write_u32(v.line)
+    self.write_u32(v.column)
+    self.write_string(v.message)
   end
 
+  # The Error type ChordSketchError - write for callback error returns.
+
+  def write_TypeChordSketchError(v)
+    if v.is_a?(ChordSketchError::NoSongsFound)
+      pack_into 4, 'l>', 1
+      return
+    end
+    if v.is_a?(ChordSketchError::InvalidConfig)
+      pack_into 4, 'l>', 2
+        self.write_string(v.reason)
+      return
+    end
+    if v.is_a?(ChordSketchError::ConversionFailed)
+      pack_into 4, 'l>', 3
+        self.write_string(v.reason)
+      return
+    end
+  end
   
 
   # The Optional<T> type for i8.
@@ -666,7 +940,7 @@ class RustBufferBuilder
       pack_into(1, 'c', 0)
     else
       pack_into(1, 'c', 1)
-      self.write_I8(v)
+      self.write_i8(v)
     end
   end
 
@@ -677,7 +951,39 @@ class RustBufferBuilder
       pack_into(1, 'c', 0)
     else
       pack_into(1, 'c', 1)
-      self.write_String(v)
+      self.write_string(v)
+    end
+  end
+
+  # The Optional<T> type for Sequenceu8.
+
+  def write_OptionalSequenceu8(v)
+    if v.nil?
+      pack_into(1, 'c', 0)
+    else
+      pack_into(1, 'c', 1)
+      self.write_Sequenceu8(v)
+    end
+  end
+
+  # The Optional<T> type for SequenceTypeStaffNote.
+
+  def write_OptionalSequenceTypeStaffNote(v)
+    if v.nil?
+      pack_into(1, 'c', 0)
+    else
+      pack_into(1, 'c', 1)
+      self.write_SequenceTypeStaffNote(v)
+    end
+  end
+
+  # The Sequence<T> type for u8.
+
+  def write_Sequenceu8(items)
+    pack_into(4, 'l>', items.size)
+
+    items.each do |item|
+      self.write_u8(item)
     end
   end
 
@@ -687,7 +993,7 @@ class RustBufferBuilder
     pack_into(4, 'l>', items.size)
 
     items.each do |item|
-      self.write_String(item)
+      self.write_string(item)
     end
   end
 
@@ -701,6 +1007,16 @@ class RustBufferBuilder
     end
   end
 
+  # The Sequence<T> type for TypeStaffNote.
+
+  def write_SequenceTypeStaffNote(items)
+    pack_into(4, 'l>', items.size)
+
+    items.each do |item|
+      self.write_TypeStaffNote(item)
+    end
+  end
+
   # The Sequence<T> type for TypeValidationError.
 
   def write_SequenceTypeValidationError(items)
@@ -761,37 +1077,48 @@ CALL_PANIC = 2
 module ChordSketchError
   class NoSongsFound < StandardError
     def initialize()
+        
         super()
-      end
+    end
+    
 
     def to_s
-     "#{self.class.name}()"
+        "#{self.class.name}()"
+
     end
   end
   class InvalidConfig < StandardError
-    def initialize(reason)
+    def initialize(reason:)
+        
         @reason = reason
+        
         super()
-      end
+    end
+    
 
     attr_reader :reason
     
 
     def to_s
-     "#{self.class.name}(reason=#{@reason.inspect})"
+        "#{self.class.name}(reason=#{@reason.inspect})"
+
     end
   end
   class ConversionFailed < StandardError
-    def initialize(reason)
+    def initialize(reason:)
+        
         @reason = reason
+        
         super()
-      end
+    end
+    
 
     attr_reader :reason
     
 
     def to_s
-     "#{self.class.name}(reason=#{@reason.inspect})"
+        "#{self.class.name}(reason=#{@reason.inspect})"
+
     end
   end
 
@@ -800,9 +1127,7 @@ end
 
 # Map error modules to the RustBuffer method name that reads them
 ERROR_MODULE_TO_READER_METHOD = {
-
-  ChordSketchError => :readTypeChordSketchError,
-
+ChordSketchError => :read_TypeChordSketchError,
 }
 
 private_constant :ERROR_MODULE_TO_READER_METHOD, :CALL_SUCCESS, :CALL_ERROR, :CALL_PANIC,
@@ -810,7 +1135,8 @@ private_constant :ERROR_MODULE_TO_READER_METHOD, :CALL_SUCCESS, :CALL_ERROR, :CA
 
 def self.consume_buffer_into_error(error_module, rust_buffer)
   rust_buffer.consumeWithStream do |stream|
-    reader_method = ERROR_MODULE_TO_READER_METHOD[error_module]
+    reader_method = ERROR_MODULE_TO_READER_METHOD[error_module] ||
+                    ERROR_MODULE_TO_READER_METHOD[error_module.name&.split('::')&.last]
     return stream.send(reader_method)
   end
 end
@@ -852,7 +1178,7 @@ def self.rust_call_with_error(error_module, fn_name, *args)
     # with the message.  But if that code panics, then it just sends back
     # an empty buffer.
     if status.error_buf.len > 0
-      raise InternalError, status.error_buf.consumeIntoString()
+      raise InternalError, status.error_buf.consume_into_string
     else
       raise InternalError, "Rust panic"
     end
@@ -872,150 +1198,602 @@ module UniFFILib
   ffi_lib Chordsketch::NATIVE_LIB_PATH
   
 
-  attach_function :uniffi_chordsketch_ffi_fn_func_chord_diagram_svg,
-    [RustBuffer.by_value, RustBuffer.by_value, RustCallStatus.by_ref],
-    RustBuffer.by_value
-  attach_function :uniffi_chordsketch_ffi_fn_func_chord_diagram_svg_with_defines,
-    [RustBuffer.by_value, RustBuffer.by_value, RustBuffer.by_value, RustCallStatus.by_ref],
-    RustBuffer.by_value
-  attach_function :uniffi_chordsketch_ffi_fn_func_convert_chordpro_to_irealb,
-    [RustBuffer.by_value, RustCallStatus.by_ref],
-    RustBuffer.by_value
-  attach_function :uniffi_chordsketch_ffi_fn_func_convert_irealb_to_chordpro_text,
-    [RustBuffer.by_value, RustCallStatus.by_ref],
-    RustBuffer.by_value
-  attach_function :uniffi_chordsketch_ffi_fn_func_parse_and_render_html,
-    [RustBuffer.by_value, RustBuffer.by_value, RustBuffer.by_value, RustCallStatus.by_ref],
-    RustBuffer.by_value
-  attach_function :uniffi_chordsketch_ffi_fn_func_parse_and_render_html_body,
-    [RustBuffer.by_value, RustBuffer.by_value, RustBuffer.by_value, RustCallStatus.by_ref],
-    RustBuffer.by_value
-  attach_function :uniffi_chordsketch_ffi_fn_func_parse_and_render_html_body_with_warnings,
-    [RustBuffer.by_value, RustBuffer.by_value, RustBuffer.by_value, RustCallStatus.by_ref],
-    RustBuffer.by_value
-  attach_function :uniffi_chordsketch_ffi_fn_func_parse_and_render_html_with_warnings,
-    [RustBuffer.by_value, RustBuffer.by_value, RustBuffer.by_value, RustCallStatus.by_ref],
-    RustBuffer.by_value
-  attach_function :uniffi_chordsketch_ffi_fn_func_parse_and_render_pdf,
-    [RustBuffer.by_value, RustBuffer.by_value, RustBuffer.by_value, RustCallStatus.by_ref],
-    RustBuffer.by_value
-  attach_function :uniffi_chordsketch_ffi_fn_func_parse_and_render_pdf_with_warnings,
-    [RustBuffer.by_value, RustBuffer.by_value, RustBuffer.by_value, RustCallStatus.by_ref],
-    RustBuffer.by_value
-  attach_function :uniffi_chordsketch_ffi_fn_func_parse_and_render_text,
-    [RustBuffer.by_value, RustBuffer.by_value, RustBuffer.by_value, RustCallStatus.by_ref],
-    RustBuffer.by_value
-  attach_function :uniffi_chordsketch_ffi_fn_func_parse_and_render_text_with_warnings,
-    [RustBuffer.by_value, RustBuffer.by_value, RustBuffer.by_value, RustCallStatus.by_ref],
-    RustBuffer.by_value
-  attach_function :uniffi_chordsketch_ffi_fn_func_parse_irealb,
-    [RustBuffer.by_value, RustCallStatus.by_ref],
-    RustBuffer.by_value
-  attach_function :uniffi_chordsketch_ffi_fn_func_render_html_css,
-    [RustCallStatus.by_ref],
-    RustBuffer.by_value
-  attach_function :uniffi_chordsketch_ffi_fn_func_render_html_css_with_config_json,
-    [RustBuffer.by_value, RustCallStatus.by_ref],
-    RustBuffer.by_value
-  attach_function :uniffi_chordsketch_ffi_fn_func_render_ireal_pdf,
-    [RustBuffer.by_value, RustCallStatus.by_ref],
-    RustBuffer.by_value
-  attach_function :uniffi_chordsketch_ffi_fn_func_render_ireal_png,
-    [RustBuffer.by_value, RustCallStatus.by_ref],
-    RustBuffer.by_value
-  attach_function :uniffi_chordsketch_ffi_fn_func_render_ireal_svg,
-    [RustBuffer.by_value, RustCallStatus.by_ref],
-    RustBuffer.by_value
-  attach_function :uniffi_chordsketch_ffi_fn_func_serialize_irealb,
-    [RustBuffer.by_value, RustCallStatus.by_ref],
-    RustBuffer.by_value
+  # Define FFI callback types and structs (vtables, etc.)
+  
+  callback :RustFutureContinuationCallback,
+    [:uint64, :int8, ],
+    :void
+  
+  callback :ForeignFutureDroppedCallback,
+    [:uint64, ],
+    :void
+  
+  callback :CallbackInterfaceFree,
+    [:uint64, ],
+    :void
+  
+  callback :CallbackInterfaceClone,
+    [:uint64, ],
+    :uint64
+  
+  class ForeignFutureDroppedCallbackStruct < FFI::Struct
+    layout(
+      :handle, :uint64,
+      :free, :ForeignFutureDroppedCallback
+    )
+  end
+  
+  class ForeignFutureResultU8 < FFI::Struct
+    layout(
+      :return_value, :uint8,
+      :call_status, RustCallStatus
+    )
+  end
+  
+  callback :ForeignFutureCompleteU8,
+    [:uint64, ForeignFutureResultU8.by_value, ],
+    :void
+  
+  class ForeignFutureResultI8 < FFI::Struct
+    layout(
+      :return_value, :int8,
+      :call_status, RustCallStatus
+    )
+  end
+  
+  callback :ForeignFutureCompleteI8,
+    [:uint64, ForeignFutureResultI8.by_value, ],
+    :void
+  
+  class ForeignFutureResultU16 < FFI::Struct
+    layout(
+      :return_value, :uint16,
+      :call_status, RustCallStatus
+    )
+  end
+  
+  callback :ForeignFutureCompleteU16,
+    [:uint64, ForeignFutureResultU16.by_value, ],
+    :void
+  
+  class ForeignFutureResultI16 < FFI::Struct
+    layout(
+      :return_value, :int16,
+      :call_status, RustCallStatus
+    )
+  end
+  
+  callback :ForeignFutureCompleteI16,
+    [:uint64, ForeignFutureResultI16.by_value, ],
+    :void
+  
+  class ForeignFutureResultU32 < FFI::Struct
+    layout(
+      :return_value, :uint32,
+      :call_status, RustCallStatus
+    )
+  end
+  
+  callback :ForeignFutureCompleteU32,
+    [:uint64, ForeignFutureResultU32.by_value, ],
+    :void
+  
+  class ForeignFutureResultI32 < FFI::Struct
+    layout(
+      :return_value, :int32,
+      :call_status, RustCallStatus
+    )
+  end
+  
+  callback :ForeignFutureCompleteI32,
+    [:uint64, ForeignFutureResultI32.by_value, ],
+    :void
+  
+  class ForeignFutureResultU64 < FFI::Struct
+    layout(
+      :return_value, :uint64,
+      :call_status, RustCallStatus
+    )
+  end
+  
+  callback :ForeignFutureCompleteU64,
+    [:uint64, ForeignFutureResultU64.by_value, ],
+    :void
+  
+  class ForeignFutureResultI64 < FFI::Struct
+    layout(
+      :return_value, :int64,
+      :call_status, RustCallStatus
+    )
+  end
+  
+  callback :ForeignFutureCompleteI64,
+    [:uint64, ForeignFutureResultI64.by_value, ],
+    :void
+  
+  class ForeignFutureResultF32 < FFI::Struct
+    layout(
+      :return_value, :float,
+      :call_status, RustCallStatus
+    )
+  end
+  
+  callback :ForeignFutureCompleteF32,
+    [:uint64, ForeignFutureResultF32.by_value, ],
+    :void
+  
+  class ForeignFutureResultF64 < FFI::Struct
+    layout(
+      :return_value, :double,
+      :call_status, RustCallStatus
+    )
+  end
+  
+  callback :ForeignFutureCompleteF64,
+    [:uint64, ForeignFutureResultF64.by_value, ],
+    :void
+  
+  class ForeignFutureResultRustBuffer < FFI::Struct
+    layout(
+      :return_value, RustBuffer.by_value,
+      :call_status, RustCallStatus
+    )
+  end
+  
+  callback :ForeignFutureCompleteRustBuffer,
+    [:uint64, ForeignFutureResultRustBuffer.by_value, ],
+    :void
+  
+  class ForeignFutureResultVoid < FFI::Struct
+    layout(
+      :call_status, RustCallStatus
+    )
+  end
+  
+  callback :ForeignFutureCompleteVoid,
+    [:uint64, ForeignFutureResultVoid.by_value, ],
+    :void
+  
+  attach_function :uniffi_chordsketch_ffi_fn_func_chord_diagram_svg,
+    [RustBuffer.by_value, RustBuffer.by_value, RustCallStatus.by_ref],
+    RustBuffer.by_value
+  
+  attach_function :uniffi_chordsketch_ffi_fn_func_chord_diagram_svg_with_defines,
+    [RustBuffer.by_value, RustBuffer.by_value, RustBuffer.by_value, RustCallStatus.by_ref],
+    RustBuffer.by_value
+  
+  attach_function :uniffi_chordsketch_ffi_fn_func_chord_diagram_svg_with_defines_orientation,
+    [RustBuffer.by_value, RustBuffer.by_value, RustBuffer.by_value, RustBuffer.by_value, RustCallStatus.by_ref],
+    RustBuffer.by_value
+  
+  attach_function :uniffi_chordsketch_ffi_fn_func_chord_diagram_svg_with_orientation,
+    [RustBuffer.by_value, RustBuffer.by_value, RustBuffer.by_value, RustCallStatus.by_ref],
+    RustBuffer.by_value
+  
+  attach_function :uniffi_chordsketch_ffi_fn_func_chord_pitches,
+    [RustBuffer.by_value, RustCallStatus.by_ref],
+    RustBuffer.by_value
+  
+  attach_function :uniffi_chordsketch_ffi_fn_func_chord_staff_notes,
+    [RustBuffer.by_value, RustCallStatus.by_ref],
+    RustBuffer.by_value
+  
+  attach_function :uniffi_chordsketch_ffi_fn_func_convert_chordpro_to_irealb,
+    [RustBuffer.by_value, RustCallStatus.by_ref],
+    RustBuffer.by_value
+  
+  attach_function :uniffi_chordsketch_ffi_fn_func_convert_irealb_to_chordpro_text,
+    [RustBuffer.by_value, RustCallStatus.by_ref],
+    RustBuffer.by_value
+  
+  attach_function :uniffi_chordsketch_ffi_fn_func_diagram_pitches,
+    [RustBuffer.by_value, RustBuffer.by_value, RustBuffer.by_value, RustCallStatus.by_ref],
+    RustBuffer.by_value
+  
+  attach_function :uniffi_chordsketch_ffi_fn_func_key_scale_pitches,
+    [RustBuffer.by_value, RustCallStatus.by_ref],
+    RustBuffer.by_value
+  
+  attach_function :uniffi_chordsketch_ffi_fn_func_key_tonic_triad,
+    [RustBuffer.by_value, RustCallStatus.by_ref],
+    RustBuffer.by_value
+  
+  attach_function :uniffi_chordsketch_ffi_fn_func_parse_and_render_html,
+    [RustBuffer.by_value, RustBuffer.by_value, RustBuffer.by_value, RustCallStatus.by_ref],
+    RustBuffer.by_value
+  
+  attach_function :uniffi_chordsketch_ffi_fn_func_parse_and_render_html_body,
+    [RustBuffer.by_value, RustBuffer.by_value, RustBuffer.by_value, RustCallStatus.by_ref],
+    RustBuffer.by_value
+  
+  attach_function :uniffi_chordsketch_ffi_fn_func_parse_and_render_html_body_with_warnings,
+    [RustBuffer.by_value, RustBuffer.by_value, RustBuffer.by_value, RustCallStatus.by_ref],
+    RustBuffer.by_value
+  
+  attach_function :uniffi_chordsketch_ffi_fn_func_parse_and_render_html_with_warnings,
+    [RustBuffer.by_value, RustBuffer.by_value, RustBuffer.by_value, RustCallStatus.by_ref],
+    RustBuffer.by_value
+  
+  attach_function :uniffi_chordsketch_ffi_fn_func_parse_and_render_pdf,
+    [RustBuffer.by_value, RustBuffer.by_value, RustBuffer.by_value, RustCallStatus.by_ref],
+    RustBuffer.by_value
+  
+  attach_function :uniffi_chordsketch_ffi_fn_func_parse_and_render_pdf_with_warnings,
+    [RustBuffer.by_value, RustBuffer.by_value, RustBuffer.by_value, RustCallStatus.by_ref],
+    RustBuffer.by_value
+  
+  attach_function :uniffi_chordsketch_ffi_fn_func_parse_and_render_text,
+    [RustBuffer.by_value, RustBuffer.by_value, RustBuffer.by_value, RustCallStatus.by_ref],
+    RustBuffer.by_value
+  
+  attach_function :uniffi_chordsketch_ffi_fn_func_parse_and_render_text_with_warnings,
+    [RustBuffer.by_value, RustBuffer.by_value, RustBuffer.by_value, RustCallStatus.by_ref],
+    RustBuffer.by_value
+  
+  attach_function :uniffi_chordsketch_ffi_fn_func_parse_irealb,
+    [RustBuffer.by_value, RustCallStatus.by_ref],
+    RustBuffer.by_value
+  
+  attach_function :uniffi_chordsketch_ffi_fn_func_render_html_css,
+    [RustCallStatus.by_ref],
+    RustBuffer.by_value
+  
+  attach_function :uniffi_chordsketch_ffi_fn_func_render_html_css_with_config_json,
+    [RustBuffer.by_value, RustCallStatus.by_ref],
+    RustBuffer.by_value
+  
+  attach_function :uniffi_chordsketch_ffi_fn_func_render_ireal_pdf,
+    [RustBuffer.by_value, RustCallStatus.by_ref],
+    RustBuffer.by_value
+  
+  attach_function :uniffi_chordsketch_ffi_fn_func_render_ireal_png,
+    [RustBuffer.by_value, RustCallStatus.by_ref],
+    RustBuffer.by_value
+  
+  attach_function :uniffi_chordsketch_ffi_fn_func_render_ireal_svg,
+    [RustBuffer.by_value, RustCallStatus.by_ref],
+    RustBuffer.by_value
+  
+  attach_function :uniffi_chordsketch_ffi_fn_func_serialize_irealb,
+    [RustBuffer.by_value, RustCallStatus.by_ref],
+    RustBuffer.by_value
+  
   attach_function :uniffi_chordsketch_ffi_fn_func_validate,
     [RustBuffer.by_value, RustCallStatus.by_ref],
     RustBuffer.by_value
+  
   attach_function :uniffi_chordsketch_ffi_fn_func_version,
     [RustCallStatus.by_ref],
     RustBuffer.by_value
+  
   attach_function :ffi_chordsketch_ffi_rustbuffer_alloc,
     [:uint64, RustCallStatus.by_ref],
     RustBuffer.by_value
+  
   attach_function :ffi_chordsketch_ffi_rustbuffer_from_bytes,
     [ForeignBytes, RustCallStatus.by_ref],
     RustBuffer.by_value
+  
   attach_function :ffi_chordsketch_ffi_rustbuffer_free,
     [RustBuffer.by_value, RustCallStatus.by_ref],
     :void
+  
   attach_function :ffi_chordsketch_ffi_rustbuffer_reserve,
     [RustBuffer.by_value, :uint64, RustCallStatus.by_ref],
     RustBuffer.by_value
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_poll_u8,
+    [:uint64, :RustFutureContinuationCallback, :uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_cancel_u8,
+    [:uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_free_u8,
+    [:uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_complete_u8,
+    [:uint64, RustCallStatus.by_ref],
+    :uint8
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_poll_i8,
+    [:uint64, :RustFutureContinuationCallback, :uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_cancel_i8,
+    [:uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_free_i8,
+    [:uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_complete_i8,
+    [:uint64, RustCallStatus.by_ref],
+    :int8
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_poll_u16,
+    [:uint64, :RustFutureContinuationCallback, :uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_cancel_u16,
+    [:uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_free_u16,
+    [:uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_complete_u16,
+    [:uint64, RustCallStatus.by_ref],
+    :uint16
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_poll_i16,
+    [:uint64, :RustFutureContinuationCallback, :uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_cancel_i16,
+    [:uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_free_i16,
+    [:uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_complete_i16,
+    [:uint64, RustCallStatus.by_ref],
+    :int16
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_poll_u32,
+    [:uint64, :RustFutureContinuationCallback, :uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_cancel_u32,
+    [:uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_free_u32,
+    [:uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_complete_u32,
+    [:uint64, RustCallStatus.by_ref],
+    :uint32
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_poll_i32,
+    [:uint64, :RustFutureContinuationCallback, :uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_cancel_i32,
+    [:uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_free_i32,
+    [:uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_complete_i32,
+    [:uint64, RustCallStatus.by_ref],
+    :int32
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_poll_u64,
+    [:uint64, :RustFutureContinuationCallback, :uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_cancel_u64,
+    [:uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_free_u64,
+    [:uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_complete_u64,
+    [:uint64, RustCallStatus.by_ref],
+    :uint64
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_poll_i64,
+    [:uint64, :RustFutureContinuationCallback, :uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_cancel_i64,
+    [:uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_free_i64,
+    [:uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_complete_i64,
+    [:uint64, RustCallStatus.by_ref],
+    :int64
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_poll_f32,
+    [:uint64, :RustFutureContinuationCallback, :uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_cancel_f32,
+    [:uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_free_f32,
+    [:uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_complete_f32,
+    [:uint64, RustCallStatus.by_ref],
+    :float
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_poll_f64,
+    [:uint64, :RustFutureContinuationCallback, :uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_cancel_f64,
+    [:uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_free_f64,
+    [:uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_complete_f64,
+    [:uint64, RustCallStatus.by_ref],
+    :double
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_poll_rust_buffer,
+    [:uint64, :RustFutureContinuationCallback, :uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_cancel_rust_buffer,
+    [:uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_free_rust_buffer,
+    [:uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_complete_rust_buffer,
+    [:uint64, RustCallStatus.by_ref],
+    RustBuffer.by_value
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_poll_void,
+    [:uint64, :RustFutureContinuationCallback, :uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_cancel_void,
+    [:uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_free_void,
+    [:uint64, ],
+    :void
+  
+  attach_function :ffi_chordsketch_ffi_rust_future_complete_void,
+    [:uint64, RustCallStatus.by_ref],
+    :void
+  
   attach_function :uniffi_chordsketch_ffi_checksum_func_chord_diagram_svg,
-    [RustCallStatus.by_ref],
+    [],
     :uint16
+  
   attach_function :uniffi_chordsketch_ffi_checksum_func_chord_diagram_svg_with_defines,
-    [RustCallStatus.by_ref],
+    [],
+    :uint16
+  
+  attach_function :uniffi_chordsketch_ffi_checksum_func_chord_diagram_svg_with_defines_orientation,
+    [],
     :uint16
+  
+  attach_function :uniffi_chordsketch_ffi_checksum_func_chord_diagram_svg_with_orientation,
+    [],
+    :uint16
+  
+  attach_function :uniffi_chordsketch_ffi_checksum_func_chord_pitches,
+    [],
+    :uint16
+  
+  attach_function :uniffi_chordsketch_ffi_checksum_func_chord_staff_notes,
+    [],
+    :uint16
+  
   attach_function :uniffi_chordsketch_ffi_checksum_func_convert_chordpro_to_irealb,
-    [RustCallStatus.by_ref],
+    [],
     :uint16
+  
   attach_function :uniffi_chordsketch_ffi_checksum_func_convert_irealb_to_chordpro_text,
-    [RustCallStatus.by_ref],
+    [],
+    :uint16
+  
+  attach_function :uniffi_chordsketch_ffi_checksum_func_diagram_pitches,
+    [],
+    :uint16
+  
+  attach_function :uniffi_chordsketch_ffi_checksum_func_key_scale_pitches,
+    [],
+    :uint16
+  
+  attach_function :uniffi_chordsketch_ffi_checksum_func_key_tonic_triad,
+    [],
     :uint16
+  
   attach_function :uniffi_chordsketch_ffi_checksum_func_parse_and_render_html,
-    [RustCallStatus.by_ref],
+    [],
     :uint16
+  
   attach_function :uniffi_chordsketch_ffi_checksum_func_parse_and_render_html_body,
-    [RustCallStatus.by_ref],
+    [],
     :uint16
+  
   attach_function :uniffi_chordsketch_ffi_checksum_func_parse_and_render_html_body_with_warnings,
-    [RustCallStatus.by_ref],
+    [],
     :uint16
+  
   attach_function :uniffi_chordsketch_ffi_checksum_func_parse_and_render_html_with_warnings,
-    [RustCallStatus.by_ref],
+    [],
     :uint16
+  
   attach_function :uniffi_chordsketch_ffi_checksum_func_parse_and_render_pdf,
-    [RustCallStatus.by_ref],
+    [],
     :uint16
+  
   attach_function :uniffi_chordsketch_ffi_checksum_func_parse_and_render_pdf_with_warnings,
-    [RustCallStatus.by_ref],
+    [],
     :uint16
+  
   attach_function :uniffi_chordsketch_ffi_checksum_func_parse_and_render_text,
-    [RustCallStatus.by_ref],
+    [],
     :uint16
+  
   attach_function :uniffi_chordsketch_ffi_checksum_func_parse_and_render_text_with_warnings,
-    [RustCallStatus.by_ref],
+    [],
     :uint16
+  
   attach_function :uniffi_chordsketch_ffi_checksum_func_parse_irealb,
-    [RustCallStatus.by_ref],
+    [],
     :uint16
+  
   attach_function :uniffi_chordsketch_ffi_checksum_func_render_html_css,
-    [RustCallStatus.by_ref],
+    [],
     :uint16
+  
   attach_function :uniffi_chordsketch_ffi_checksum_func_render_html_css_with_config_json,
-    [RustCallStatus.by_ref],
+    [],
     :uint16
+  
   attach_function :uniffi_chordsketch_ffi_checksum_func_render_ireal_pdf,
-    [RustCallStatus.by_ref],
+    [],
     :uint16
+  
   attach_function :uniffi_chordsketch_ffi_checksum_func_render_ireal_png,
-    [RustCallStatus.by_ref],
+    [],
     :uint16
+  
   attach_function :uniffi_chordsketch_ffi_checksum_func_render_ireal_svg,
-    [RustCallStatus.by_ref],
+    [],
     :uint16
+  
   attach_function :uniffi_chordsketch_ffi_checksum_func_serialize_irealb,
-    [RustCallStatus.by_ref],
+    [],
     :uint16
+  
   attach_function :uniffi_chordsketch_ffi_checksum_func_validate,
-    [RustCallStatus.by_ref],
+    [],
     :uint16
+  
   attach_function :uniffi_chordsketch_ffi_checksum_func_version,
-    [RustCallStatus.by_ref],
+    [],
     :uint16
+  
   attach_function :ffi_chordsketch_ffi_uniffi_contract_version,
-    [RustCallStatus.by_ref],
+    [],
     :uint32
   
 end
 
+  # Custom type definitions.
+
   # Public interface members begin here.
 
   
@@ -1039,6 +1817,7 @@ class ChordDefine
 
     true
   end
+  
 end
   
   # Record type ConversionWithWarnings
@@ -1060,6 +1839,7 @@ class ConversionWithWarnings
 
     true
   end
+  
 end
   
   # Record type PdfRenderWithWarnings
@@ -1081,6 +1861,37 @@ class PdfRenderWithWarnings
 
     true
   end
+  
+end
+  
+  # Record type StaffNote
+class StaffNote
+  attr_reader :letter, :accidental, :octave, :midi
+
+  def initialize(letter:, accidental:, octave:, midi:)
+    @letter = letter
+    @accidental = accidental
+    @octave = octave
+    @midi = midi
+  end
+
+  def ==(other)
+    if @letter != other.letter
+      return false
+    end
+    if @accidental != other.accidental
+      return false
+    end
+    if @octave != other.octave
+      return false
+    end
+    if @midi != other.midi
+      return false
+    end
+
+    true
+  end
+  
 end
   
   # Record type TextRenderWithWarnings
@@ -1102,6 +1913,7 @@ class TextRenderWithWarnings
 
     true
   end
+  
 end
   
   # Record type ValidationError
@@ -1127,6 +1939,7 @@ class ValidationError
 
     true
   end
+  
 end
   
 
@@ -1134,14 +1947,14 @@ end
   
 
 def self.chord_diagram_svg(chord, instrument)
-    chord = Chordsketch::uniffi_utf8(chord)
+    chord = ::Chordsketch::uniffi_utf8(chord)
     
     
-    instrument = Chordsketch::uniffi_utf8(instrument)
+    instrument = ::Chordsketch::uniffi_utf8(instrument)
     
     
-  result = Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_chord_diagram_svg,RustBuffer.allocFromString(chord),RustBuffer.allocFromString(instrument))
-  return result.consumeIntoOptionalstring
+  result = ::Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_chord_diagram_svg,RustBuffer.alloc_from_string(chord),RustBuffer.alloc_from_string(instrument))
+  return result.consume_into_Optionalstring
 end
 
 
@@ -1149,17 +1962,80 @@ end
   
 
 def self.chord_diagram_svg_with_defines(chord, instrument, defines)
-    chord = Chordsketch::uniffi_utf8(chord)
+    chord = ::Chordsketch::uniffi_utf8(chord)
+    
+    
+    instrument = ::Chordsketch::uniffi_utf8(instrument)
+    
+    
+    defines = defines
+    RustBuffer.check_lower_SequenceTypeChordDefine(defines)
+    
+  result = ::Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_chord_diagram_svg_with_defines,RustBuffer.alloc_from_string(chord),RustBuffer.alloc_from_string(instrument),RustBuffer.alloc_from_SequenceTypeChordDefine(defines))
+  return result.consume_into_Optionalstring
+end
+
+
+  
+  
+
+def self.chord_diagram_svg_with_defines_orientation(chord, instrument, defines, orientation)
+    chord = ::Chordsketch::uniffi_utf8(chord)
     
     
-    instrument = Chordsketch::uniffi_utf8(instrument)
+    instrument = ::Chordsketch::uniffi_utf8(instrument)
     
     
     defines = defines
     RustBuffer.check_lower_SequenceTypeChordDefine(defines)
     
-  result = Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_chord_diagram_svg_with_defines,RustBuffer.allocFromString(chord),RustBuffer.allocFromString(instrument),RustBuffer.alloc_from_SequenceTypeChordDefine(defines))
-  return result.consumeIntoOptionalstring
+    orientation = (orientation ? ::Chordsketch::uniffi_utf8(orientation) : nil)
+    RustBuffer.check_lower_Optionalstring(orientation)
+    
+  result = ::Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_chord_diagram_svg_with_defines_orientation,RustBuffer.alloc_from_string(chord),RustBuffer.alloc_from_string(instrument),RustBuffer.alloc_from_SequenceTypeChordDefine(defines),RustBuffer.alloc_from_Optionalstring(orientation))
+  return result.consume_into_Optionalstring
+end
+
+
+  
+  
+
+def self.chord_diagram_svg_with_orientation(chord, instrument, orientation)
+    chord = ::Chordsketch::uniffi_utf8(chord)
+    
+    
+    instrument = ::Chordsketch::uniffi_utf8(instrument)
+    
+    
+    orientation = (orientation ? ::Chordsketch::uniffi_utf8(orientation) : nil)
+    RustBuffer.check_lower_Optionalstring(orientation)
+    
+  result = ::Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_chord_diagram_svg_with_orientation,RustBuffer.alloc_from_string(chord),RustBuffer.alloc_from_string(instrument),RustBuffer.alloc_from_Optionalstring(orientation))
+  return result.consume_into_Optionalstring
+end
+
+
+  
+  
+
+def self.chord_pitches(chord)
+    chord = ::Chordsketch::uniffi_utf8(chord)
+    
+    
+  result = ::Chordsketch.rust_call(:uniffi_chordsketch_ffi_fn_func_chord_pitches,RustBuffer.alloc_from_string(chord))
+  return result.consume_into_OptionalSequenceu8
+end
+
+
+  
+  
+
+def self.chord_staff_notes(chord)
+    chord = ::Chordsketch::uniffi_utf8(chord)
+    
+    
+  result = ::Chordsketch.rust_call(:uniffi_chordsketch_ffi_fn_func_chord_staff_notes,RustBuffer.alloc_from_string(chord))
+  return result.consume_into_OptionalSequenceTypeStaffNote
 end
 
 
@@ -1167,11 +2043,11 @@ end
   
 
 def self.convert_chordpro_to_irealb(input)
-    input = Chordsketch::uniffi_utf8(input)
+    input = ::Chordsketch::uniffi_utf8(input)
     
     
-  result = Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_convert_chordpro_to_irealb,RustBuffer.allocFromString(input))
-  return result.consumeIntoTypeConversionWithWarnings
+  result = ::Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_convert_chordpro_to_irealb,RustBuffer.alloc_from_string(input))
+  return result.consume_into_TypeConversionWithWarnings
 end
 
 
@@ -1179,11 +2055,53 @@ end
   
 
 def self.convert_irealb_to_chordpro_text(input)
-    input = Chordsketch::uniffi_utf8(input)
+    input = ::Chordsketch::uniffi_utf8(input)
     
     
-  result = Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_convert_irealb_to_chordpro_text,RustBuffer.allocFromString(input))
-  return result.consumeIntoTypeConversionWithWarnings
+  result = ::Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_convert_irealb_to_chordpro_text,RustBuffer.alloc_from_string(input))
+  return result.consume_into_TypeConversionWithWarnings
+end
+
+
+  
+  
+
+def self.diagram_pitches(chord, instrument, defines)
+    chord = ::Chordsketch::uniffi_utf8(chord)
+    
+    
+    instrument = ::Chordsketch::uniffi_utf8(instrument)
+    
+    
+    defines = defines
+    RustBuffer.check_lower_SequenceTypeChordDefine(defines)
+    
+  result = ::Chordsketch.rust_call(:uniffi_chordsketch_ffi_fn_func_diagram_pitches,RustBuffer.alloc_from_string(chord),RustBuffer.alloc_from_string(instrument),RustBuffer.alloc_from_SequenceTypeChordDefine(defines))
+  return result.consume_into_OptionalSequenceu8
+end
+
+
+  
+  
+
+def self.key_scale_pitches(key)
+    key = ::Chordsketch::uniffi_utf8(key)
+    
+    
+  result = ::Chordsketch.rust_call(:uniffi_chordsketch_ffi_fn_func_key_scale_pitches,RustBuffer.alloc_from_string(key))
+  return result.consume_into_OptionalSequenceu8
+end
+
+
+  
+  
+
+def self.key_tonic_triad(key)
+    key = ::Chordsketch::uniffi_utf8(key)
+    
+    
+  result = ::Chordsketch.rust_call(:uniffi_chordsketch_ffi_fn_func_key_tonic_triad,RustBuffer.alloc_from_string(key))
+  return result.consume_into_OptionalSequenceu8
 end
 
 
@@ -1191,17 +2109,17 @@ end
   
 
 def self.parse_and_render_html(input, config_json, transpose)
-    input = Chordsketch::uniffi_utf8(input)
+    input = ::Chordsketch::uniffi_utf8(input)
     
     
-    config_json = (config_json ? Chordsketch::uniffi_utf8(config_json) : nil)
+    config_json = (config_json ? ::Chordsketch::uniffi_utf8(config_json) : nil)
     RustBuffer.check_lower_Optionalstring(config_json)
     
-    transpose = (transpose ? Chordsketch::uniffi_in_range(transpose, "i8", -2**7, 2**7) : nil)
+    transpose = (transpose ? ::Chordsketch::uniffi_in_range(transpose, "i8", -2**7, 2**7) : nil)
     RustBuffer.check_lower_Optionali8(transpose)
     
-  result = Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_parse_and_render_html,RustBuffer.allocFromString(input),RustBuffer.alloc_from_Optionalstring(config_json),RustBuffer.alloc_from_Optionali8(transpose))
-  return result.consumeIntoString
+  result = ::Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_parse_and_render_html,RustBuffer.alloc_from_string(input),RustBuffer.alloc_from_Optionalstring(config_json),RustBuffer.alloc_from_Optionali8(transpose))
+  return result.consume_into_string
 end
 
 
@@ -1209,17 +2127,17 @@ end
   
 
 def self.parse_and_render_html_body(input, config_json, transpose)
-    input = Chordsketch::uniffi_utf8(input)
+    input = ::Chordsketch::uniffi_utf8(input)
     
     
-    config_json = (config_json ? Chordsketch::uniffi_utf8(config_json) : nil)
+    config_json = (config_json ? ::Chordsketch::uniffi_utf8(config_json) : nil)
     RustBuffer.check_lower_Optionalstring(config_json)
     
-    transpose = (transpose ? Chordsketch::uniffi_in_range(transpose, "i8", -2**7, 2**7) : nil)
+    transpose = (transpose ? ::Chordsketch::uniffi_in_range(transpose, "i8", -2**7, 2**7) : nil)
     RustBuffer.check_lower_Optionali8(transpose)
     
-  result = Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_parse_and_render_html_body,RustBuffer.allocFromString(input),RustBuffer.alloc_from_Optionalstring(config_json),RustBuffer.alloc_from_Optionali8(transpose))
-  return result.consumeIntoString
+  result = ::Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_parse_and_render_html_body,RustBuffer.alloc_from_string(input),RustBuffer.alloc_from_Optionalstring(config_json),RustBuffer.alloc_from_Optionali8(transpose))
+  return result.consume_into_string
 end
 
 
@@ -1227,17 +2145,17 @@ end
   
 
 def self.parse_and_render_html_body_with_warnings(input, config_json, transpose)
-    input = Chordsketch::uniffi_utf8(input)
+    input = ::Chordsketch::uniffi_utf8(input)
     
     
-    config_json = (config_json ? Chordsketch::uniffi_utf8(config_json) : nil)
+    config_json = (config_json ? ::Chordsketch::uniffi_utf8(config_json) : nil)
     RustBuffer.check_lower_Optionalstring(config_json)
     
-    transpose = (transpose ? Chordsketch::uniffi_in_range(transpose, "i8", -2**7, 2**7) : nil)
+    transpose = (transpose ? ::Chordsketch::uniffi_in_range(transpose, "i8", -2**7, 2**7) : nil)
     RustBuffer.check_lower_Optionali8(transpose)
     
-  result = Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_parse_and_render_html_body_with_warnings,RustBuffer.allocFromString(input),RustBuffer.alloc_from_Optionalstring(config_json),RustBuffer.alloc_from_Optionali8(transpose))
-  return result.consumeIntoTypeTextRenderWithWarnings
+  result = ::Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_parse_and_render_html_body_with_warnings,RustBuffer.alloc_from_string(input),RustBuffer.alloc_from_Optionalstring(config_json),RustBuffer.alloc_from_Optionali8(transpose))
+  return result.consume_into_TypeTextRenderWithWarnings
 end
 
 
@@ -1245,17 +2163,17 @@ end
   
 
 def self.parse_and_render_html_with_warnings(input, config_json, transpose)
-    input = Chordsketch::uniffi_utf8(input)
+    input = ::Chordsketch::uniffi_utf8(input)
     
     
-    config_json = (config_json ? Chordsketch::uniffi_utf8(config_json) : nil)
+    config_json = (config_json ? ::Chordsketch::uniffi_utf8(config_json) : nil)
     RustBuffer.check_lower_Optionalstring(config_json)
     
-    transpose = (transpose ? Chordsketch::uniffi_in_range(transpose, "i8", -2**7, 2**7) : nil)
+    transpose = (transpose ? ::Chordsketch::uniffi_in_range(transpose, "i8", -2**7, 2**7) : nil)
     RustBuffer.check_lower_Optionali8(transpose)
     
-  result = Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_parse_and_render_html_with_warnings,RustBuffer.allocFromString(input),RustBuffer.alloc_from_Optionalstring(config_json),RustBuffer.alloc_from_Optionali8(transpose))
-  return result.consumeIntoTypeTextRenderWithWarnings
+  result = ::Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_parse_and_render_html_with_warnings,RustBuffer.alloc_from_string(input),RustBuffer.alloc_from_Optionalstring(config_json),RustBuffer.alloc_from_Optionali8(transpose))
+  return result.consume_into_TypeTextRenderWithWarnings
 end
 
 
@@ -1263,17 +2181,17 @@ end
   
 
 def self.parse_and_render_pdf(input, config_json, transpose)
-    input = Chordsketch::uniffi_utf8(input)
+    input = ::Chordsketch::uniffi_utf8(input)
     
     
-    config_json = (config_json ? Chordsketch::uniffi_utf8(config_json) : nil)
+    config_json = (config_json ? ::Chordsketch::uniffi_utf8(config_json) : nil)
     RustBuffer.check_lower_Optionalstring(config_json)
     
-    transpose = (transpose ? Chordsketch::uniffi_in_range(transpose, "i8", -2**7, 2**7) : nil)
+    transpose = (transpose ? ::Chordsketch::uniffi_in_range(transpose, "i8", -2**7, 2**7) : nil)
     RustBuffer.check_lower_Optionali8(transpose)
     
-  result = Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_parse_and_render_pdf,RustBuffer.allocFromString(input),RustBuffer.alloc_from_Optionalstring(config_json),RustBuffer.alloc_from_Optionali8(transpose))
-  return result.consumeIntoBytes
+  result = ::Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_parse_and_render_pdf,RustBuffer.alloc_from_string(input),RustBuffer.alloc_from_Optionalstring(config_json),RustBuffer.alloc_from_Optionali8(transpose))
+  return result.consume_into_bytes
 end
 
 
@@ -1281,17 +2199,17 @@ end
   
 
 def self.parse_and_render_pdf_with_warnings(input, config_json, transpose)
-    input = Chordsketch::uniffi_utf8(input)
+    input = ::Chordsketch::uniffi_utf8(input)
     
     
-    config_json = (config_json ? Chordsketch::uniffi_utf8(config_json) : nil)
+    config_json = (config_json ? ::Chordsketch::uniffi_utf8(config_json) : nil)
     RustBuffer.check_lower_Optionalstring(config_json)
     
-    transpose = (transpose ? Chordsketch::uniffi_in_range(transpose, "i8", -2**7, 2**7) : nil)
+    transpose = (transpose ? ::Chordsketch::uniffi_in_range(transpose, "i8", -2**7, 2**7) : nil)
     RustBuffer.check_lower_Optionali8(transpose)
     
-  result = Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_parse_and_render_pdf_with_warnings,RustBuffer.allocFromString(input),RustBuffer.alloc_from_Optionalstring(config_json),RustBuffer.alloc_from_Optionali8(transpose))
-  return result.consumeIntoTypePdfRenderWithWarnings
+  result = ::Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_parse_and_render_pdf_with_warnings,RustBuffer.alloc_from_string(input),RustBuffer.alloc_from_Optionalstring(config_json),RustBuffer.alloc_from_Optionali8(transpose))
+  return result.consume_into_TypePdfRenderWithWarnings
 end
 
 
@@ -1299,17 +2217,17 @@ end
   
 
 def self.parse_and_render_text(input, config_json, transpose)
-    input = Chordsketch::uniffi_utf8(input)
+    input = ::Chordsketch::uniffi_utf8(input)
     
     
-    config_json = (config_json ? Chordsketch::uniffi_utf8(config_json) : nil)
+    config_json = (config_json ? ::Chordsketch::uniffi_utf8(config_json) : nil)
     RustBuffer.check_lower_Optionalstring(config_json)
     
-    transpose = (transpose ? Chordsketch::uniffi_in_range(transpose, "i8", -2**7, 2**7) : nil)
+    transpose = (transpose ? ::Chordsketch::uniffi_in_range(transpose, "i8", -2**7, 2**7) : nil)
     RustBuffer.check_lower_Optionali8(transpose)
     
-  result = Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_parse_and_render_text,RustBuffer.allocFromString(input),RustBuffer.alloc_from_Optionalstring(config_json),RustBuffer.alloc_from_Optionali8(transpose))
-  return result.consumeIntoString
+  result = ::Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_parse_and_render_text,RustBuffer.alloc_from_string(input),RustBuffer.alloc_from_Optionalstring(config_json),RustBuffer.alloc_from_Optionali8(transpose))
+  return result.consume_into_string
 end
 
 
@@ -1317,17 +2235,17 @@ end
   
 
 def self.parse_and_render_text_with_warnings(input, config_json, transpose)
-    input = Chordsketch::uniffi_utf8(input)
+    input = ::Chordsketch::uniffi_utf8(input)
     
     
-    config_json = (config_json ? Chordsketch::uniffi_utf8(config_json) : nil)
+    config_json = (config_json ? ::Chordsketch::uniffi_utf8(config_json) : nil)
     RustBuffer.check_lower_Optionalstring(config_json)
     
-    transpose = (transpose ? Chordsketch::uniffi_in_range(transpose, "i8", -2**7, 2**7) : nil)
+    transpose = (transpose ? ::Chordsketch::uniffi_in_range(transpose, "i8", -2**7, 2**7) : nil)
     RustBuffer.check_lower_Optionali8(transpose)
     
-  result = Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_parse_and_render_text_with_warnings,RustBuffer.allocFromString(input),RustBuffer.alloc_from_Optionalstring(config_json),RustBuffer.alloc_from_Optionali8(transpose))
-  return result.consumeIntoTypeTextRenderWithWarnings
+  result = ::Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_parse_and_render_text_with_warnings,RustBuffer.alloc_from_string(input),RustBuffer.alloc_from_Optionalstring(config_json),RustBuffer.alloc_from_Optionali8(transpose))
+  return result.consume_into_TypeTextRenderWithWarnings
 end
 
 
@@ -1335,11 +2253,11 @@ end
   
 
 def self.parse_irealb(input)
-    input = Chordsketch::uniffi_utf8(input)
+    input = ::Chordsketch::uniffi_utf8(input)
     
     
-  result = Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_parse_irealb,RustBuffer.allocFromString(input))
-  return result.consumeIntoString
+  result = ::Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_parse_irealb,RustBuffer.alloc_from_string(input))
+  return result.consume_into_string
 end
 
 
@@ -1347,8 +2265,8 @@ end
   
 
 def self.render_html_css()
-  result = Chordsketch.rust_call(:uniffi_chordsketch_ffi_fn_func_render_html_css,)
-  return result.consumeIntoString
+  result = ::Chordsketch.rust_call(:uniffi_chordsketch_ffi_fn_func_render_html_css,)
+  return result.consume_into_string
 end
 
 
@@ -1356,11 +2274,11 @@ end
   
 
 def self.render_html_css_with_config_json(config_json)
-    config_json = (config_json ? Chordsketch::uniffi_utf8(config_json) : nil)
+    config_json = (config_json ? ::Chordsketch::uniffi_utf8(config_json) : nil)
     RustBuffer.check_lower_Optionalstring(config_json)
     
-  result = Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_render_html_css_with_config_json,RustBuffer.alloc_from_Optionalstring(config_json))
-  return result.consumeIntoString
+  result = ::Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_render_html_css_with_config_json,RustBuffer.alloc_from_Optionalstring(config_json))
+  return result.consume_into_string
 end
 
 
@@ -1368,11 +2286,11 @@ end
   
 
 def self.render_ireal_pdf(input)
-    input = Chordsketch::uniffi_utf8(input)
+    input = ::Chordsketch::uniffi_utf8(input)
     
     
-  result = Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_render_ireal_pdf,RustBuffer.allocFromString(input))
-  return result.consumeIntoBytes
+  result = ::Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_render_ireal_pdf,RustBuffer.alloc_from_string(input))
+  return result.consume_into_bytes
 end
 
 
@@ -1380,11 +2298,11 @@ end
   
 
 def self.render_ireal_png(input)
-    input = Chordsketch::uniffi_utf8(input)
+    input = ::Chordsketch::uniffi_utf8(input)
     
     
-  result = Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_render_ireal_png,RustBuffer.allocFromString(input))
-  return result.consumeIntoBytes
+  result = ::Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_render_ireal_png,RustBuffer.alloc_from_string(input))
+  return result.consume_into_bytes
 end
 
 
@@ -1392,11 +2310,11 @@ end
   
 
 def self.render_ireal_svg(input)
-    input = Chordsketch::uniffi_utf8(input)
+    input = ::Chordsketch::uniffi_utf8(input)
     
     
-  result = Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_render_ireal_svg,RustBuffer.allocFromString(input))
-  return result.consumeIntoString
+  result = ::Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_render_ireal_svg,RustBuffer.alloc_from_string(input))
+  return result.consume_into_string
 end
 
 
@@ -1404,11 +2322,11 @@ end
   
 
 def self.serialize_irealb(input)
-    input = Chordsketch::uniffi_utf8(input)
+    input = ::Chordsketch::uniffi_utf8(input)
     
     
-  result = Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_serialize_irealb,RustBuffer.allocFromString(input))
-  return result.consumeIntoString
+  result = ::Chordsketch.rust_call_with_error(ChordSketchError,:uniffi_chordsketch_ffi_fn_func_serialize_irealb,RustBuffer.alloc_from_string(input))
+  return result.consume_into_string
 end
 
 
@@ -1416,11 +2334,11 @@ end
   
 
 def self.validate(input)
-    input = Chordsketch::uniffi_utf8(input)
+    input = ::Chordsketch::uniffi_utf8(input)
     
     
-  result = Chordsketch.rust_call(:uniffi_chordsketch_ffi_fn_func_validate,RustBuffer.allocFromString(input))
-  return result.consumeIntoSequenceTypeValidationError
+  result = ::Chordsketch.rust_call(:uniffi_chordsketch_ffi_fn_func_validate,RustBuffer.alloc_from_string(input))
+  return result.consume_into_SequenceTypeValidationError
 end
 
 
@@ -1428,13 +2346,15 @@ end
   
 
 def self.version()
-  result = Chordsketch.rust_call(:uniffi_chordsketch_ffi_fn_func_version,)
-  return result.consumeIntoString
+  result = ::Chordsketch.rust_call(:uniffi_chordsketch_ffi_fn_func_version,)
+  return result.consume_into_string
 end
 
 
   
 
   
+
+  
 end