parsanol 1.3.62 → 1.3.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc7df8984ab8f887379dc43d351e628656048cf4fd2a4bdd359b0b8b45341ce0
-  data.tar.gz: 38f9a43f7d4bf61621ef843d672f66883d5eee7abbe9af596b065499f89dcb12
+  metadata.gz: f7ad59a2f852639eec49d8aaf0cfce4be63d8e13a20941b7db8f325244445e47
+  data.tar.gz: b4f7021d4c4dd9f30df4eddf64b2109da9005291b4d39edadd5075e54c6600c0
 SHA512:
-  metadata.gz: 60c1f94221c0f97ebd61f27f6e409667630b0fd013aeabebab44cbb4918a8f22e951878ffce3f9d40b8a48d7a7bf4f4fb99c160efe11fdefe682beac63c48dca
-  data.tar.gz: b3fa201e5e2290698c3532eee6ba251a88547c4627348c791c08406b849ad651136ab65281ffa2f72b9629999b4af261679379f8f5e3d014ad82670ba0360349
+  metadata.gz: d5fe08eb23fa452e06432cb8b72cb101b257b854fb33ae71455fd8c2a0d81356704f66fd11af330392783aa6c6a5b4730df1884718459c5d4acfe3abc74b8b48
+  data.tar.gz: b2d8251fc66c8d47085bf6338457975b6f29e707a173c8e107d5755137bd850ead86c6d130b6410b29e4155e87ae4c67cac3739278f0ddd4a7826fc94ffba53e

data/lib/parsanol/parg/artifact.rb

@@ -28,8 +28,13 @@ module Parsanol
         unless envelope["shape"] == SUPPORTED_SHAPE
           raise ArtifactError,
                 "unsupported artifact shape #{envelope['shape'].inspect} " \
-                "(this runtime implements #{SUPPORTED_SHAPE.inspect})"
+                "(this runtime implements #{SUPPORTED_SHAPE.inspect}; the " \
+                "contract is docs/PARSANOL-SHAPE-v2.md in parsanol-rs — " \
+                "a shape bump requires a new engine family, artifacts " \
+                "declaring #{SUPPORTED_SHAPE.inspect} parse identically forever)"
         end
+        bindings = envelope["bindings"]
+        validate_bindings!(bindings) unless bindings.nil?
         @envelope = envelope
         @path = path
         @tables_dir = tables_dir
@@ -139,15 +144,27 @@ module Parsanol
 
       # Structured parse diagnostics (PN 2): {offset, message} for the
       # deepest failure of the most recent parse attempt on this entry.
+      # Structured parse diagnostics — the flat v1 wire format every
+      # backend agrees on (parsanol-rs#145): offset, the expected-symbol
+      # list, and a message, fetched out-of-band so success paths pay
+      # nothing. Full cause trees stay a Ruby-side diagnostic.
       def parse_with_diagnostics(entry_name, input, mode: :native)
         shape = parse(entry_name, input, mode: mode)
-        { "ok" => true, "offset" => nil, "message" => nil, "shape" => shape }
+        { "ok" => true, "offset" => nil, "expected" => [],
+          "message" => nil, "shape" => shape }
       rescue Parsanol::ParseFailed => e
         cause = deepest_cause(e.parse_failure_cause)
         { "ok" => false, "offset" => cause&.position,
+          "expected" => expected_labels_for(cause),
           "message" => cause&.message || e.message, "shape" => nil }
       end
 
+      def expected_labels_for(cause)
+        return [] unless cause.respond_to?(:expected)
+
+        Array(cause.expected)
+      end
+
       def deepest_cause(cause)
         return cause if cause.nil? || cause.children.empty?
 
@@ -169,7 +186,7 @@ module Parsanol
 
         file = declared
         path = File.join(@tables_dir.to_s, file)
-        raw = path.end_with?(".json") ? JSON.parse(PARG.read_utf8(path)) : YAML.safe_load_file(path, aliases: true)
+        raw = path.end_with?(".json") ? JSON.parse(PARG.read_utf8(path)) : YAML.safe_load(PARG.read_utf8(path), aliases: true)
         rows = case raw
                when Hash
                  raw.map { |key, value| { "name" => key.to_s }.merge(value.to_h.transform_keys(&:to_s)) }
@@ -179,6 +196,39 @@ module Parsanol
         @table_cache[name] = rows
       end
 
+      # The envelope's optional grammar-to-model bindings section
+      # (envelope v2, parsanol-rs#143): capture name -> model attribute
+      # paths, type casts, cardinality, and preprocessing step refs,
+      # declared once and consumed identically by every tier's binder.
+      # Phase 1 validates the section's shape and exposes it as data.
+      def bindings
+        envelope["bindings"]
+      end
+
+      BINDINGS_ALLOWED_KEYS = %w[captures entries version].freeze
+
+      def validate_bindings!(bindings)
+        unless bindings.is_a?(Hash)
+          raise ArtifactError, "bindings section must be a map (got #{bindings.class})"
+        end
+
+        unknown = bindings.keys - BINDINGS_ALLOWED_KEYS
+        unless unknown.empty?
+          raise ArtifactError, "bindings section has unknown keys: #{unknown.inspect}"
+        end
+
+        (bindings["captures"] || {}).each do |name, spec|
+          unless spec.is_a?(Hash) && spec["path"].is_a?(String)
+            raise ArtifactError,
+                  "bindings capture #{name.inspect} must declare a string :path"
+          end
+        end
+      rescue ArtifactError
+        raise
+      rescue StandardError => e
+        raise ArtifactError, "malformed bindings section: #{e.class}: #{e.message}"
+      end
+
       def compiler
         @compiler ||= begin
           document = Parser.new(envelope.fetch("source")).parse

data/lib/parsanol/parg/compiler.rb

@@ -40,9 +40,13 @@ module Parsanol
         end
       end
 
-      def initialize(document, tables_dir)
+      def initialize(document, tables_dir, bindings: nil)
         @document = document
         @tables_dir = tables_dir
+        # Envelope v2 (parsanol-rs#143): grammar-to-model bindings bake
+        # into the checksummed envelope so every tier consumes one
+        # declaration. Data pass-through in phase 1.
+        @bindings = bindings
         @atom_cache = {}
         @first_cache = {}.compare_by_identity
         @ref_stack = []
@@ -396,6 +400,7 @@ module Parsanol
           [name, entry_envelope(rule)]
         end
         envelope = {
+          "bindings" => @bindings,
           "version" => @document.version,
           "grammar" => @document.grammar_name,
           "shape" => "parsanol-tree/v2",

data/lib/parsanol/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Parsanol
-  VERSION = "1.3.62"
+  VERSION = "1.3.63"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parsanol
 version: !ruby/object:Gem::Version
-  version: 1.3.62
+  version: 1.3.63
 platform: ruby
 authors:
 - Ribose Inc.