oicana 0.10.0.rc.1-aarch64-linux-gnu → 0.10.0.rc.2-aarch64-linux-gnu

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b43092492df7813de668261663918ad4578339024489a0c7b201d63f3269fc16
-  data.tar.gz: 14986ca3a485d25c29bcbfd484de1c3b6d16041745bdfd9b74045914d05c64a0
+  metadata.gz: 504e0adcbb0c2bf49c29a8e9fc22315acdcac604f529fe35d150528238839197
+  data.tar.gz: 9d72ee4ce1459bc0cb3a5b1a2ea1b7e3311344f7a38afd51ae51b97a72dd24f3
 SHA512:
-  metadata.gz: 8fa5bb66ca5bafebf3e87471b25e4611799ad3a5cc655b1d2931788856284af80a4207473d2408404d4eb50d4f7895c06cc586a8f9a39ed012ba642c622b21be
-  data.tar.gz: 6cf66c1e0d2acab52b1a7de7233411b273b1e323aef27591a8449864f21512cb22745bfb9bb2a36fd33393f014fe6bf34082d48ffe526df33f1e7297a69513d4
+  metadata.gz: 24b389c7745af96671c59733c45c3153fe720f7fc584affa08c64fceff6c999b397cbc9af8cee7a7ed96428db2fd3136cf959834cbf3aa3ffb04dd2561a38c92
+  data.tar.gz: 77078a3440ae532a260584094c500d77bc4bee96fa90a7f36b09d6ccb79928e4a2025a6c3d515dcdfce8fdfceffc2805f34c7f18969c8db737723e4099e7f7e5

data/lib/oicana/native/liboicana_uniffi.so

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: data/lib/oicana/native/liboicana_uniffi.so
 size: 45952304 bytes
-sha256: 0c2af7bb71bf4cf881f667d3f2687e60dd3b1dc964b99a503ce8007b51daf02c
+sha256: ce0b529e7a9bdd3a7f60e772d07f00a78b24989da01d65961a61e672e93c7dc7

data/lib/oicana/oicana_uniffi.rb

@@ -146,11 +146,35 @@ end
     end
   end
 
+  # The Record type Diagnostic.
+
+  def self.check_lower_TypeDiagnostic(v)
+    RustBuffer.check_lower_TypeDiagnosticSeverity(v.severity)
+    
+    RustBuffer.check_lower_OptionalTypeSourceLocation(v.location)
+    RustBuffer.check_lower_Sequencestring(v.hints)
+    RustBuffer.check_lower_SequenceTypeTracePoint(v.trace)
+    
+  end
+
+  def self.alloc_from_TypeDiagnostic(v)
+    RustBuffer.allocWithBuilder do |builder|
+      builder.write_TypeDiagnostic(v)
+      return builder.finalize
+    end
+  end
+
+  def consumeIntoTypeDiagnostic
+    consumeWithStream do |stream|
+      return stream.readTypeDiagnostic
+    end
+  end
+
   # The Record type ExportOnceResult.
 
   def self.check_lower_TypeExportOnceResult(v)
     
-    RustBuffer.check_lower_Optionalstring(v.warnings)
+    RustBuffer.check_lower_SequenceTypeDiagnostic(v.warnings)
   end
 
   def self.alloc_from_TypeExportOnceResult(v)
@@ -226,6 +250,49 @@ end
     end
   end
 
+  # The Record type SourceLocation.
+
+  def self.check_lower_TypeSourceLocation(v)
+    
+    
+    
+    
+    
+  end
+
+  def self.alloc_from_TypeSourceLocation(v)
+    RustBuffer.allocWithBuilder do |builder|
+      builder.write_TypeSourceLocation(v)
+      return builder.finalize
+    end
+  end
+
+  def consumeIntoTypeSourceLocation
+    consumeWithStream do |stream|
+      return stream.readTypeSourceLocation
+    end
+  end
+
+  # The Record type TracePoint.
+
+  def self.check_lower_TypeTracePoint(v)
+    
+    RustBuffer.check_lower_OptionalTypeSourceLocation(v.location)
+  end
+
+  def self.alloc_from_TypeTracePoint(v)
+    RustBuffer.allocWithBuilder do |builder|
+      builder.write_TypeTracePoint(v)
+      return builder.finalize
+    end
+  end
+
+  def consumeIntoTypeTracePoint
+    consumeWithStream do |stream|
+      return stream.readTypeTracePoint
+    end
+  end
+
   # The Record type ZipLimits.
 
   def self.check_lower_TypeZipLimits(v)
@@ -284,6 +351,25 @@ end
   end
   
 
+  # The Enum type DiagnosticSeverity.
+
+  def self.check_lower_TypeDiagnosticSeverity(v)
+  end
+
+  def self.alloc_from_TypeDiagnosticSeverity(v)
+    RustBuffer.allocWithBuilder do |builder|
+      builder.write_TypeDiagnosticSeverity(v)
+      return builder.finalize
+    end
+  end
+
+  def consumeIntoTypeDiagnosticSeverity
+    consumeWithStream do |stream|
+      return stream.readTypeDiagnosticSeverity
+    end
+  end
+  
+
   # The Enum type ExportFormat.
 
   def self.check_lower_TypeExportFormat(v)
@@ -378,6 +464,27 @@ end
     end
   end
 
+  # The Optional<T> type for TypeSourceLocation.
+
+  def self.check_lower_OptionalTypeSourceLocation(v)
+    if not v.nil?
+      RustBuffer.check_lower_TypeSourceLocation(v)
+    end
+  end
+
+  def self.alloc_from_OptionalTypeSourceLocation(v)
+    RustBuffer.allocWithBuilder do |builder|
+      builder.write_OptionalTypeSourceLocation(v)
+      return builder.finalize()
+    end
+  end
+
+  def consumeIntoOptionalTypeSourceLocation
+    consumeWithStream do |stream|
+      return stream.readOptionalTypeSourceLocation
+    end
+  end
+
   # The Optional<T> type for TypeZipLimits.
 
   def self.check_lower_OptionalTypeZipLimits(v)
@@ -441,6 +548,27 @@ end
     end
   end
 
+  # The Sequence<T> type for TypeDiagnostic.
+
+  def self.check_lower_SequenceTypeDiagnostic(v)
+    v.each do |item|
+      RustBuffer.check_lower_TypeDiagnostic(item)
+    end
+  end
+
+  def self.alloc_from_SequenceTypeDiagnostic(v)
+    RustBuffer.allocWithBuilder do |builder|
+      builder.write_SequenceTypeDiagnostic(v)
+      return builder.finalize()
+    end
+  end
+
+  def consumeIntoSequenceTypeDiagnostic
+    consumeWithStream do |stream|
+      return stream.readSequenceTypeDiagnostic
+    end
+  end
+
   # The Sequence<T> type for TypePageSize.
 
   def self.check_lower_SequenceTypePageSize(v)
@@ -483,6 +611,27 @@ end
     end
   end
 
+  # The Sequence<T> type for TypeTracePoint.
+
+  def self.check_lower_SequenceTypeTracePoint(v)
+    v.each do |item|
+      RustBuffer.check_lower_TypeTracePoint(item)
+    end
+  end
+
+  def self.alloc_from_SequenceTypeTracePoint(v)
+    RustBuffer.allocWithBuilder do |builder|
+      builder.write_SequenceTypeTracePoint(v)
+      return builder.finalize()
+    end
+  end
+
+  def consumeIntoSequenceTypeTracePoint
+    consumeWithStream do |stream|
+      return stream.readSequenceTypeTracePoint
+    end
+  end
+
   # The Map<T> type for string.
 
   def self.check_lower_MapStringString(v)
@@ -569,6 +718,10 @@ class RustBufferStream
     data
   end
 
+  def readU32
+    unpack_from 4, 'L>'
+  end
+
   def readU64
     unpack_from 8, 'Q>'
   end
@@ -629,12 +782,25 @@ class RustBufferStream
     )
   end
 
+  # The Record type Diagnostic.
+
+  def readTypeDiagnostic
+    Diagnostic.new(
+      severity: readTypeDiagnosticSeverity,
+      message: readString,
+      location: readOptionalTypeSourceLocation,
+      hints: readSequencestring,
+      trace: readSequenceTypeTracePoint,
+      formatted: readString
+    )
+  end
+
   # The Record type ExportOnceResult.
 
   def readTypeExportOnceResult
     ExportOnceResult.new(
       bytes: readBytes,
-      warnings: readOptionalstring
+      warnings: readSequenceTypeDiagnostic
     )
   end
 
@@ -665,6 +831,27 @@ class RustBufferStream
     )
   end
 
+  # The Record type SourceLocation.
+
+  def readTypeSourceLocation
+    SourceLocation.new(
+      file: readString,
+      line: readU32,
+      column: readU32,
+      end_line: readU32,
+      end_column: readU32
+    )
+  end
+
+  # The Record type TracePoint.
+
+  def readTypeTracePoint
+    TracePoint.new(
+      message: readString,
+      location: readOptionalTypeSourceLocation
+    )
+  end
+
   # The Record type ZipLimits.
 
   def readTypeZipLimits
@@ -714,6 +901,25 @@ class RustBufferStream
 
   
   
+  # The Enum type DiagnosticSeverity.
+
+  def readTypeDiagnosticSeverity
+    variant = unpack_from 4, 'l>'
+    
+    if variant == 1
+      return DiagnosticSeverity::ERROR
+    end
+    if variant == 2
+      return DiagnosticSeverity::WARNING
+    end
+
+    raise InternalError, 'Unexpected variant tag for TypeDiagnosticSeverity'
+  end
+
+  
+
+  
+  
   # The Enum type ExportFormat.
 
   def readTypeExportFormat
@@ -828,6 +1034,20 @@ class RustBufferStream
     end
   end
 
+  # The Optional<T> type for TypeSourceLocation.
+
+  def readOptionalTypeSourceLocation
+    flag = unpack_from 1, 'c'
+
+    if flag == 0
+      return nil
+    elsif flag == 1
+      return readTypeSourceLocation
+    else
+      raise InternalError, 'Unexpected flag byte for OptionalTypeSourceLocation'
+    end
+  end
+
   # The Optional<T> type for TypeZipLimits.
 
   def readOptionalTypeZipLimits
@@ -874,6 +1094,22 @@ class RustBufferStream
     items
   end
 
+  # The Sequence<T> type for TypeDiagnostic.
+
+  def readSequenceTypeDiagnostic
+    count = unpack_from 4, 'l>'
+
+    raise InternalError, 'Unexpected negative sequence length' if count.negative?
+
+    items = []
+
+    count.times do
+      items.append readTypeDiagnostic
+    end
+
+    items
+  end
+
   # The Sequence<T> type for TypePageSize.
 
   def readSequenceTypePageSize
@@ -906,6 +1142,22 @@ class RustBufferStream
     items
   end
 
+  # The Sequence<T> type for TypeTracePoint.
+
+  def readSequenceTypeTracePoint
+    count = unpack_from 4, 'l>'
+
+    raise InternalError, 'Unexpected negative sequence length' if count.negative?
+
+    items = []
+
+    count.times do
+      items.append readTypeTracePoint
+    end
+
+    items
+  end
+
   # The Map<T> type for string.
 
   def readMapStringString
@@ -978,6 +1230,11 @@ class RustBufferBuilder
     end
   end
 
+  def write_U32(v)
+    v = OicanaUniffi::uniffi_in_range(v, "u32", 0, 2**32)
+    pack_into(4, 'L>', v)
+  end
+
   def write_U64(v)
     v = OicanaUniffi::uniffi_in_range(v, "u64", 0, 2**64)
     pack_into(8, 'Q>', v)
@@ -1028,11 +1285,22 @@ class RustBufferBuilder
     self.write_String(v.metadata)
   end
 
+  # The Record type Diagnostic.
+
+  def write_TypeDiagnostic(v)
+    self.write_TypeDiagnosticSeverity(v.severity)
+    self.write_String(v.message)
+    self.write_OptionalTypeSourceLocation(v.location)
+    self.write_Sequencestring(v.hints)
+    self.write_SequenceTypeTracePoint(v.trace)
+    self.write_String(v.formatted)
+  end
+
   # The Record type ExportOnceResult.
 
   def write_TypeExportOnceResult(v)
     self.write_Bytes(v.bytes)
-    self.write_Optionalstring(v.warnings)
+    self.write_SequenceTypeDiagnostic(v.warnings)
   end
 
   # The Record type PageRange.
@@ -1056,6 +1324,23 @@ class RustBufferBuilder
     self.write_Optionalstring(v.path)
   end
 
+  # The Record type SourceLocation.
+
+  def write_TypeSourceLocation(v)
+    self.write_String(v.file)
+    self.write_U32(v.line)
+    self.write_U32(v.column)
+    self.write_U32(v.end_line)
+    self.write_U32(v.end_column)
+  end
+
+  # The Record type TracePoint.
+
+  def write_TypeTracePoint(v)
+    self.write_String(v.message)
+    self.write_OptionalTypeSourceLocation(v.location)
+  end
+
   # The Record type ZipLimits.
 
   def write_TypeZipLimits(v)
@@ -1077,6 +1362,13 @@ class RustBufferBuilder
  end
    
 
+  # The Enum type DiagnosticSeverity.
+
+  def write_TypeDiagnosticSeverity(v)
+    pack_into(4, 'l>', v)
+ end
+   
+
   # The Enum type ExportFormat.
 
   def write_TypeExportFormat(v)
@@ -1128,6 +1420,17 @@ class RustBufferBuilder
     end
   end
 
+  # The Optional<T> type for TypeSourceLocation.
+
+  def write_OptionalTypeSourceLocation(v)
+    if v.nil?
+      pack_into(1, 'c', 0)
+    else
+      pack_into(1, 'c', 1)
+      self.write_TypeSourceLocation(v)
+    end
+  end
+
   # The Optional<T> type for TypeZipLimits.
 
   def write_OptionalTypeZipLimits(v)
@@ -1159,6 +1462,16 @@ class RustBufferBuilder
     end
   end
 
+  # The Sequence<T> type for TypeDiagnostic.
+
+  def write_SequenceTypeDiagnostic(items)
+    pack_into(4, 'l>', items.size)
+
+    items.each do |item|
+      self.write_TypeDiagnostic(item)
+    end
+  end
+
   # The Sequence<T> type for TypePageSize.
 
   def write_SequenceTypePageSize(items)
@@ -1179,6 +1492,16 @@ class RustBufferBuilder
     end
   end
 
+  # The Sequence<T> type for TypeTracePoint.
+
+  def write_SequenceTypeTracePoint(items)
+    pack_into(4, 'l>', items.size)
+
+    items.each do |item|
+      self.write_TypeTracePoint(item)
+    end
+  end
+
   # The Map<T> type for string.
 
   def write_MapStringString(items)
@@ -1259,6 +1582,7 @@ end
 
 
 
+
 # Map error modules to the RustBuffer method name that reads them
 ERROR_MODULE_TO_READER_METHOD = {
 
@@ -1267,6 +1591,7 @@ ERROR_MODULE_TO_READER_METHOD = {
 
 
 
+
 }
 
 private_constant :ERROR_MODULE_TO_READER_METHOD, :CALL_SUCCESS, :CALL_ERROR, :CALL_PANIC,
@@ -1509,6 +1834,17 @@ end
   
   
 
+class DiagnosticSeverity
+  ERROR = 1
+  WARNING = 2
+  
+end
+
+
+  
+  
+  
+
 class ExportFormat
   def initialize
     raise RuntimeError, 'ExportFormat cannot be instantiated directly'
@@ -1652,6 +1988,43 @@ class BlobInput
   end
 end
   
+  # Record type Diagnostic
+class Diagnostic
+  attr_reader :severity, :message, :location, :hints, :trace, :formatted
+
+  def initialize(severity:, message:, location:, hints:, trace:, formatted:)
+    @severity = severity
+    @message = message
+    @location = location
+    @hints = hints
+    @trace = trace
+    @formatted = formatted
+  end
+
+  def ==(other)
+    if @severity != other.severity
+      return false
+    end
+    if @message != other.message
+      return false
+    end
+    if @location != other.location
+      return false
+    end
+    if @hints != other.hints
+      return false
+    end
+    if @trace != other.trace
+      return false
+    end
+    if @formatted != other.formatted
+      return false
+    end
+
+    true
+  end
+end
+  
   # Record type ExportOnceResult
 class ExportOnceResult
   attr_reader :bytes, :warnings
@@ -1736,6 +2109,60 @@ class RegisteredFont
   end
 end
   
+  # Record type SourceLocation
+class SourceLocation
+  attr_reader :file, :line, :column, :end_line, :end_column
+
+  def initialize(file:, line:, column:, end_line:, end_column:)
+    @file = file
+    @line = line
+    @column = column
+    @end_line = end_line
+    @end_column = end_column
+  end
+
+  def ==(other)
+    if @file != other.file
+      return false
+    end
+    if @line != other.line
+      return false
+    end
+    if @column != other.column
+      return false
+    end
+    if @end_line != other.end_line
+      return false
+    end
+    if @end_column != other.end_column
+      return false
+    end
+
+    true
+  end
+end
+  
+  # Record type TracePoint
+class TracePoint
+  attr_reader :message, :location
+
+  def initialize(message:, location:)
+    @message = message
+    @location = location
+  end
+
+  def ==(other)
+    if @message != other.message
+      return false
+    end
+    if @location != other.location
+      return false
+    end
+
+    true
+  end
+end
+  
   # Record type ZipLimits
 class ZipLimits
   attr_reader :max_entries, :max_total_decompressed_bytes
@@ -1929,7 +2356,7 @@ end
   end
   def warnings()
     result = OicanaUniffi.rust_call(:uniffi_oicana_uniffi_fn_method_compileddocument_warnings,uniffi_clone_handle(),)
-    return result.consumeIntoOptionalstring
+    return result.consumeIntoSequenceTypeDiagnostic
   end
   
 end
@@ -2028,7 +2455,7 @@ end
   end
   def warnings()
     result = OicanaUniffi.rust_call(:uniffi_oicana_uniffi_fn_method_template_warnings,uniffi_clone_handle(),)
-    return result.consumeIntoOptionalstring
+    return result.consumeIntoSequenceTypeDiagnostic
   end
   
 end

data/lib/oicana/template.rb

@@ -57,7 +57,7 @@ module Oicana
   #     pdf = template.export_pdf(json_inputs: { "invoice" => { "number" => "2026-001" } })
   #   end
   class Template
-    # Warnings of the warm-up compilation, or nil.
+    # Diagnostic values for the warnings of the warm-up compilation.
     attr_reader :warnings
 
     # Load a packed template and compile it once to warm up its caches.
@@ -69,7 +69,7 @@ module Oicana
         OicanaUniffi::Template.new(template.b, Convert.json_inputs(json_inputs), Convert.blob_inputs(blob_inputs),
                                    Convert.mode(mode), Convert.limits(limits))
       end
-      @warnings = object.warnings
+      @warnings = Convert.diagnostics(object.warnings)
       @handle = NativeHandle.new(object, :uniffi_oicana_uniffi_fn_free_template, "template")
     end
 
@@ -96,7 +96,7 @@ module Oicana
                                  Convert.mode(mode), Convert.format(format, pixels_per_pt), Convert.pages(pages),
                                  Convert.limits(limits))
       end
-      ExportOnceResult.new(document: result.bytes, warnings: result.warnings)
+      ExportOnceResult.new(document: result.bytes, warnings: Convert.diagnostics(result.warnings))
     end
 
     # Compile the template into a CompiledDocument whose pages can be exported repeatedly.
@@ -168,13 +168,13 @@ module Oicana
   class CompiledDocument
     # PageSize of every page, in document order.
     attr_reader :pages
-    # Warnings of the compilation, or nil.
+    # Diagnostic values for the warnings of the compilation.
     attr_reader :warnings
 
     # @api private
     def initialize(object)
       @pages = object.pages.map { |page| PageSize.new(width: page.width, height: page.height) }.freeze
-      @warnings = object.warnings
+      @warnings = Convert.diagnostics(object.warnings)
       @handle = NativeHandle.new(object, :uniffi_oicana_uniffi_fn_free_compileddocument, "document")
     end
 

data/lib/oicana/types.rb

@@ -24,9 +24,30 @@ module Oicana
   # A font face registered by the host. path is nil for fonts registered from memory.
   RegisteredFont = Data.define(:family, :path)
 
-  # The result of Template.export_once. warnings is nil when there are none.
+  # The result of Template.export_once. warnings is an Array of Diagnostic values.
   ExportOnceResult = Data.define(:document, :warnings)
 
+  # A compilation diagnostic, like a warning, with its location in the template.
+  #
+  # severity is :error or :warning. location is a SourceLocation, or nil if the
+  # diagnostic does not point into a file. hints is an Array of Strings and trace an
+  # Array of TracePoint values, innermost first. formatted is the diagnostic formatted
+  # for humans, with source excerpts and the configured diagnostic color.
+  Diagnostic = Data.define(:severity, :message, :location, :hints, :trace, :formatted) do
+    def to_s
+      formatted
+    end
+  end
+
+  # A range in a file of the template. Lines and columns are 1-based, columns count
+  # characters, and end_column is exclusive. file is the path in the template, like
+  # "/main.typ"; files of packages are prefixed with the package.
+  SourceLocation = Data.define(:file, :line, :column, :end_line, :end_column)
+
+  # A step in the function calls leading to a Diagnostic. location is nil if the step
+  # does not point into a file.
+  TracePoint = Data.define(:message, :location)
+
   # A template's manifest.
   Manifest = Data.define(:package, :oicana)
 
@@ -155,5 +176,27 @@ module Oicana
     def blob_fallback(fallback)
       fallback && BlobFallback.new(file: fallback.fetch("file"), meta: fallback["meta"])
     end
+
+    def diagnostics(diagnostics)
+      diagnostics.map do |diagnostic|
+        Diagnostic.new(
+          severity: diagnostic.severity == OicanaUniffi::DiagnosticSeverity::ERROR ? :error : :warning,
+          message: diagnostic.message,
+          location: location(diagnostic.location),
+          hints: diagnostic.hints.freeze,
+          trace: diagnostic.trace.map { |point| trace_point(point) }.freeze,
+          formatted: diagnostic.formatted
+        )
+      end.freeze
+    end
+
+    def trace_point(point)
+      TracePoint.new(message: point.message, location: location(point.location))
+    end
+
+    def location(location)
+      location && SourceLocation.new(file: location.file, line: location.line, column: location.column,
+                                     end_line: location.end_line, end_column: location.end_column)
+    end
   end
 end

data/lib/oicana/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Oicana
-  VERSION = "0.10.0.rc.1"
+  VERSION = "0.10.0.rc.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oicana
 version: !ruby/object:Gem::Version
-  version: 0.10.0.rc.1
+  version: 0.10.0.rc.2
 platform: aarch64-linux-gnu
 authors:
 - Oicana