expressir 2.4.64 → 2.4.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e59a0ad2c89ffedec981b58cdfd5306091f4077b09f079cf3c4171fda74db78c
-  data.tar.gz: 19de4b36ecd8045df80e025c0f00592ceda95673fd80a15f2ee2745c39084587
+  metadata.gz: b99726a3a4b9e12cd568a109ae7b690649c13668449729b1b7fc528183efdc20
+  data.tar.gz: 6b39aa8bffd2204669c98627a204ec0a973202d34ef32509a245deb71995f819
 SHA512:
-  metadata.gz: ab2a3e695d4913149bb6f7d00717e562f139f43dd46d232fe63b958f11af74fb01520640d7896615789b785429128d235045da69afcb3bd4b74b238f2bd598ea
-  data.tar.gz: b42b3cdab3bda4ac9ce6fa9645d42a41436591036d85b60f7e18a03e2fdbe8752750a7df1bfd3ba3a9f8cea77a0fb76884362b2aadec968ff0f2d5ddcf54df96
+  metadata.gz: 617c1e1f3271128cd2c7eac0dd8f26f2a9c49964af7fdb1f3fe06f63592d5174c42861044b310aeee10db4a67a9b9495349520e3f742f374a6cdaa07dbf364e5
+  data.tar.gz: 8d423850c4c866f1c389c7f01eb9bc733e630e1f87ae8925a75fd14ffae4d6f56666e6d7f7b8577e89f85de7f1c76a43012aa57805e1e5a683fd1f790d5239d9

data/ext/expressir_core/Cargo.toml

@@ -13,7 +13,7 @@ magnus = { version = "0.9" }
 # Pinned core release (M1, TODO.parity-ee/19): the ext never floats
 # main — bump the tag per expressir release, alongside the validation
 # run that pins it.
-expressir-rs = { git = "https://github.com/lutaml/expressir-rs", tag = "v0.1.34" }
+expressir-rs = { git = "https://github.com/lutaml/expressir-rs", tag = "v0.1.35" }
 serde_json = "1.0"
 
 

data/lib/expressir/express/formatters/remark_item_formatter.rb

@@ -13,27 +13,23 @@ module Expressir
           # The tag form follows the owner: items in rule contexts
           # (WHERE/UNIQUE/IP) historically carry bare tags
           # (`--"unusual_placement" text`), WG12-style items carry the
-          # schema-relative path. node.path is rooted at the ExpFile,
-          # whose id is the file path — drop that leading segment
-          # (expressir#603).
+          # schema-relative path. A referable `__note:id` has no rule to
+          # anchor it in a bare tail tag (it would reattach to the
+          # schema), so it carries the path too (annotated-express#103).
           rule_context = node.parent.is_a?(Model::Declarations::WhereRule) ||
             node.parent.is_a?(Model::Declarations::UniqueRule) ||
             node.parent.is_a?(Model::Declarations::InformalPropositionRule)
-          if rule_context
-            tag = node.id.to_s
-          else
-            tag = node.path.to_s
-            root = node
-            root = root.parent while root.respond_to?(:parent) && root.parent
-            prefix = "#{root.id}." if root.respond_to?(:id) && root.id
-            tag = tag.delete_prefix(prefix) if prefix && tag.start_with?(prefix)
-          end
+          tag = if rule_context && !node.id.to_s.start_with?("__")
+                  node.id.to_s
+                else
+                  schema_relative_path(node)
+                end
 
           # Remark items are WG12 annotation blocks: the embedded form,
           # a block per remark, matching the source convention of the
           # annotated corpora (the conservation pairs are embedded, so
           # tail-form emission reads as phantom gains). Rule-context
-          # owners keep the historic bare-tag tail form.
+          # owners keep the historic tail form.
           if rule_context
             return node.remarks
                 .map { |remark| "--\"#{tag}\" #{remark}" }
@@ -48,6 +44,17 @@ module Expressir
             end
           end.join("\n")
         end
+
+        private
+
+        # node.path is rooted at the ExpFile, whose id is the file path
+        # or nil; drop that leading segment (expressir#603).
+        def schema_relative_path(node)
+          root = node
+          root = root.parent while root.respond_to?(:parent) && root.parent
+          prefix = root.respond_to?(:id) ? "#{root.id}." : ""
+          node.path.to_s.delete_prefix(prefix)
+        end
       end
     end
   end

data/lib/expressir/version.rb

@@ -3,6 +3,6 @@ module Expressir
   # autoload it (Ruby autoload only works for module/class constants, not
   # for string constants like `Expressir::VERSION`).
   module Version
-    VERSION = "2.4.64".freeze
+    VERSION = "2.4.65".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 2.4.64
+  version: 2.4.65
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-11-10 00:00:00.000000000 Z
+date: 2026-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys