expressir 2.4.28 → 2.4.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45dd9d5d13614ca549340d534defb9a674a5fca35a9f3b16f5ef345b73e263eb
-  data.tar.gz: f5a14e8e4cb49ebebe7823d9015de7296459735b3f8ea06edc3494e072b0877f
+  metadata.gz: 422611b8889e4e8c78ca3a4c2482b3988dcda82d3035d813c462b7c77f3eac50
+  data.tar.gz: cd132662d82929629aa50ad7b7ad0dd238cd744af87e3ec0cda519b8ab949575
 SHA512:
-  metadata.gz: d46d905d2f0ca978c614cba3574a398fa38809f38296930115905b9e97cf1e223e8b0882c1c7431e026dc97015579f7e820f067173da4645ede0be33a00c6842
-  data.tar.gz: bc103128faa28cbaafdb27a61117431c9b17d77913b4dcc038db64638b815f19be7e90c4366ca45ef378196f360445296244cd40c435997038280d776de94dd1
+  metadata.gz: fad716d2795853e70bc21eda9dec8baf15406d6a9afe9cba82bd138f672d8c852876664cde22c9ef10331d4b514769195c11cd5e3d7e5fec0409bb3589777f7a
+  data.tar.gz: e23c2fd8555d20aac0972817f6af0e6b242602a4deca1df7e1e2dfcbee22200f771a4b12afd48340b2efa648bedaed9505244cc343eec7a7935578602092c435

data/.github/scripts/test_installed_gem.rb

@@ -26,4 +26,9 @@ sc = Expressir::Express::Parser.from_exp(src).schemas.first.subtype_constraints.
 abort "FAIL: subtype constraint ABSTRACT body (#462)" unless sc&.abstract == true
 puts "#462 form: ok"
 
+# The platform gems force-build the Rust compiled-set writer; a leg that
+# shipped a non-loadable expressir_core would otherwise pass this smoke.
+abort "FAIL: core_set_available is false" unless Expressir::Express::Parser.core_set_available?
+puts "compiled-set core: ok"
+
 puts "SMOKE OK"

data/.github/workflows/native-gems.yml

@@ -52,12 +52,14 @@ jobs:
           EXPRESSIR_CORE_FORCE: "1"
         with:
           platform: ${{ matrix.ruby-platform }}
-          # Dock images provision cross rubies for 3.2-3.4 only; a 4.0
-          # leg silently falls back to the dock's host toolchain and
-          # fails linking (or worse, links against the wrong ruby).
-          # Ruby 4.0 users on these platforms get the pure-Ruby parser
-          # fallback until the images ship 4.0 cross rubies.
-          ruby-versions: "3.2,3.3,3.4"
+          # Must include the dock image's HOST ruby (4.0): when the
+          # running ruby is absent from this list, rake-compiler adds an
+          # extra leg for it built from the host toolchain's RbConfig,
+          # and rb-sys correctly refuses to generate bindings against a
+          # different target_os. Current rb-sys-dock images ship cross
+          # rubies for 3.2-4.0 (parsanol-ruby's identical cross-gem
+          # setup builds a working x86_64-mingw-ucrt ruby-4.0.2 leg).
+          ruby-versions: "3.2,3.3,3.4,4.0"
 
       - uses: actions/upload-artifact@v4
         with:
@@ -170,19 +172,33 @@ jobs:
   release:
     name: Release gems to rubygems
     needs: [native, smoke-linux, smoke-linux-arm, smoke-macos-arm, smoke-macos-intel, smoke-windows, source]
-    if: startsWith(github.ref, 'refs/tags/v')
+    # workflow_dispatch lets a fix publish the already-tagged version when
+    # the tag's own run failed after the builds (reruns reuse the tag's
+    # workflow copy, so fixes cannot reach them any other way).
+    if: startsWith(github.ref, 'refs/tags/v') || github.event_name == 'workflow_dispatch'
     runs-on: ubuntu-22.04
-    environment: release
+    # No environment: the rubygems.org trusted publisher for native-gems.yml
+    # is registered without one; an environment claim would fail the match.
+    permissions:
+      id-token: write
     steps:
       - uses: actions/download-artifact@v4
         with:
           path: pkg/
           pattern: cross-gem-*
           merge-multiple: true
+      - uses: actions/download-artifact@v4
+        with:
+          path: pkg/
+          name: source-gem
+      # OIDC trusted publishing - the repo has no rubygems API-key secret;
+      # release.yml publishes through the same exchange.
+      - uses: rubygems/configure-rubygems-credentials@v2.1.0
       - name: Push to rubygems
-        env:
-          GEM_HOST_API_KEY: ${{ secrets.LUTAML_CI_RUBYGEMS_API_KEY }}
         run: |
           for gem in pkg/expressir-*.gem; do
-            gem push "$gem"
+            # Idempotent: a gem already on rubygems (e.g. the source gem
+            # shipped by release.yml ahead of the platform run) is a skip,
+            # not a failure.
+            gem push "$gem" || echo "::warning::$(basename "$gem") already published or rejected; continuing"
           done

data/expressir.gemspec

@@ -24,6 +24,11 @@ Gem::Specification.new do |spec|
   spec.metadata["rubygems_mfa_required"] = "true"
 
   spec.required_ruby_version = Gem::Requirement.new(">= 3.2.0")
+  # Source gem builds on the ruby platform; declaring it keeps
+  # rake-compiler's `gem` task from rebuilding the extension for the
+  # host ruby during cross builds (rb-sys then sees a windows
+  # CARGO_BUILD_TARGET with linux headers and refuses).
+  spec.platform = Gem::Platform::RUBY
 
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject do |f|
@@ -37,18 +42,18 @@ Gem::Specification.new do |spec|
   spec.extensions = ["ext/expressir_core/extconf.rb"]
   spec.add_dependency "rb_sys", "~> 0.9.130"
 
-  spec.add_dependency "base64"
+  spec.add_dependency "base64", ">= 0.1.0"
   spec.add_dependency "benchmark"
   spec.add_dependency "benchmark-ips"
   spec.add_dependency "csv"
-  spec.add_dependency "liquid"
+  spec.add_dependency "liquid", "~> 5"
   spec.add_dependency "lutaml-model", "~> 0.8.76"
   spec.add_dependency "moxml"
-  spec.add_dependency "nokogiri"
+  spec.add_dependency "nokogiri", "~> 1.19"
   spec.add_dependency "paint"
-  spec.add_dependency "parsanol", "~> 1.3.9", ">= 1.3.9"
+  spec.add_dependency "parsanol", "~> 1.3.9", ">= 1.3.89"
   spec.add_dependency "ruby-progressbar", "~> 1.11"
-  spec.add_dependency "rubyzip"
+  spec.add_dependency "rubyzip", "~> 3.7"
   spec.add_dependency "table_tennis"
   spec.add_dependency "thor", "~> 1.0"
   # Native YAML/JSON engine (lutaml-model opt-in by bundle contents)

data/lib/expressir/commands.rb

@@ -21,7 +21,7 @@ module Expressir
     autoload :Changes, "#{__dir__}/commands/changes"
     autoload :ChangesValidate, "#{__dir__}/commands/changes_validate"
     autoload :ChangesImportEengine, "#{__dir__}/commands/changes_import_eengine"
-    autoload :Version, "#{__dir__}/commands/version"
+    autoload :Version, "#{__dir__}/commands/version_command"
     autoload :Package, "#{__dir__}/commands/package"
     autoload :Manifest, "#{__dir__}/commands/manifest"
     autoload :MappingValidate, "#{__dir__}/commands/mapping_validate"

data/lib/expressir/express/core.rb

@@ -7,16 +7,34 @@ module Expressir
     # Ruby bridge to the expressir-core Rust crate (parse + model
     # extraction). Available when the native extension is built;
     # callers fall back to the pure-Ruby parser otherwise.
+    #
+    # Windows is excluded along with parsanol's native engine
+    # (Grammar::Parser.native_available?): the core embeds the
+    # parsanol-rs parse stack, whose x64-mingw build deadlocks the
+    # same way at first parse (expressir#487) - the compiled
+    # extension is present, so the gate is explicit rather than a
+    # LoadError consequence.
     module Core
-      NATIVE_AVAILABLE = begin
+      NATIVE_AVAILABLE = !Gem.win_platform? && begin
         require "expressir/expressir_core"
         true
       rescue LoadError
         begin
-          require_relative "../../../ext/expressir_core/expressir_core"
+          # Platform gems carry the fat-binary layout
+          # (lib/expressir/<major.minor>/expressir_core.so); rubygems
+          # does not resolve versioned dirs under a nested require path,
+          # so the version segment is explicit - same contract as
+          # parsanol's loader.
+          ruby_version = RUBY_VERSION.split(".").take(2).join(".")
+          require "expressir/#{ruby_version}/expressir_core"
           true
         rescue LoadError
-          false
+          begin
+            require_relative "../../../ext/expressir_core/expressir_core"
+            true
+          rescue LoadError
+            false
+          end
         end
       end
 

data/lib/expressir/express/grammar/parser.rb

@@ -27,6 +27,22 @@ module Expressir
         # Files above this use parse_fresh which has no packrat cache
         LARGE_FILE_THRESHOLD = 1024 * 1024 # 1 MB
 
+        # Whitespace rides the engine's injected trivia (parsanol-ruby
+        # #180's source-preserving mode, 1.3.82+): each unit records
+        # verbatim under :space and attaches to the next Named capture.
+        # Remarks stay OUT of the skip rule — they are product data,
+        # captured by the tailRemark/embeddedRemark rules and attached
+        # by RemarkScanner; tail remarks attach backward, the engine's
+        # next-capture channel is the wrong direction for them.
+        rule(:trivia) { match[" \r\n\t\f"].repeat(1) }
+        # exempt (parsanol#195, shipped 1.3.89): token rules whose bodies
+        # manage their own internals — injection before a char-class tail
+        # repetition absorbs the following token across whitespace
+        # ("RULE r FOR" parsed as one simpleId). simpleId additionally
+        # matches as a single quantified Re, which needs no exemption;
+        # the two mechanisms agree and stay for defense in depth.
+        skip(:trivia, whitespace: :space, exempt: %i[simpleId digits])
+
         # Get cached parser instance (thread-safe)
         # Reusing the parser avoids the overhead of reinitializing all rule definitions
         def self.cached_parser
@@ -46,6 +62,15 @@ module Expressir
 
         # Check if native parsing is available
         def self.native_available?
+          # parsanol 1.3.54+ x64-mingw builds deadlock inside the native
+          # parse at runtime: the library loads (early examples run) but
+          # the first parse never returns (expressir#487 — every windows
+          # rake run since 2026-09-29 hit the 6h limit; the control at
+          # green-era leptris/moxml/yeptris still hangs, parsanol 1.3.53
+          # was green). The pure-Ruby engine is correct, so windows falls
+          # back to it until parsanol fixes the mingw build.
+          return false if Gem.win_platform?
+
           return @native_available unless @native_available.nil?
 
           @native_available = begin
@@ -604,7 +629,13 @@ module Expressir
           (unaryOp >> simpleFactorExpression).as(:simpleFactorUnaryExpression)
         end
         rule(:simpleId) do
-          anyKeyword.absent? >> cts((match["a-zA-Z_"] >> match["a-zA-Z0-9_"].repeat).as(:str)).as(:simpleId)
+          # One quantified Re, not lead >> tail-repeat: under skip
+          # injection the DSL interleaves trivia before the tail
+          # repetition, so a two-atom ident would absorb the following
+          # whitespace-separated identifier ("RULE r FOR (e)" parses
+          # "r FOR" as one simpleId). A quantified Re consumes the
+          # whole identifier in a single step — parsanol GH-69.
+          anyKeyword.absent? >> cts(match("[a-zA-Z_][a-zA-Z0-9_]*").as(:str)).as(:simpleId)
         end
         rule(:simpleStringLiteral) do
           cts((str("'") >> (str("'").absent? >> any).repeat >> str("'")).as(:str)).as(:simpleStringLiteral)

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.28".freeze
+    VERSION = "2.4.30".freeze
   end
 end

data/rakelib/native.rake

@@ -7,43 +7,16 @@
 # artifact in lib/expressir/, which core.rb's first require finds.
 begin
   require "rb_sys/extensiontask"
-  require "rb_sys/toolchain_info"
 
   gemspec = Gem::Specification.load("expressir.gemspec")
 
   RbSys::ExtensionTask.new("expressir_core", gemspec) do |ext|
     ext.lib_dir = "lib/expressir"
-
-    ext.cross_compiling do |spec|
-      next if spec.platform == Gem::Platform::RUBY
-
-      plat = spec.platform.to_s
-      triple = begin
-        RbSys::ToolchainInfo::DATA.fetch(plat).fetch("rust-target")
-      rescue KeyError
-        { "arm-linux-musl" => "arm-unknown-linux-musleabihf" }.fetch(plat)
-      end
-
-      # rb-sys's cargo build already ran for the cross target; stage the
-      # artifact from the tree (rake-compiler stages callback-added files).
-      # rb_sys uses a per-package target dir unless the crate is a
-      # workspace member (then the root target/ holds artifacts) — glob
-      # both layouts.
-      art = Dir["target/#{triple}/release/expressir_core.{so,dylib,dll}",
-                "target/#{triple}/release/libexpressir_core.{so,dylib}",
-                "ext/expressir_core/target/#{triple}/release/expressir_core.{so,dylib,dll}",
-                "ext/expressir_core/target/#{triple}/release/libexpressir_core.{so,dylib}"].first
-      raise "binding artifact not found for #{plat} (#{triple})" unless art
-
-      # core.rb requires "expressir/expressir_core", so the staged file
-      # must sit at the canonical Ruby extension path/name — cargo's
-      # lib- prefixed or .dll/.dylib-suffixed names are renamed to
-      # expressir_core.so (Ruby's require accepts .so on every target:
-      # DLEXT on linux/windows, DLEXT2 on darwin).
-      dest = "lib/expressir/expressir_core.so"
-      cp art, dest
-      spec.files << dest
-    end
+    # rb-sys stages the cross-built artifact itself; a manual cp into
+    # lib_dir here would claim the file rake-compiler's own
+    # copy:expressir_core:<host-platform> task owns, and the cross gem's
+    # dependency chain would then force a host-ruby build (rb-sys
+    # refuses windows bindings from linux headers).
   end
 rescue LoadError
   # rake-compiler/rb_sys not installed (consumer checkouts); the native

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 2.4.28
+  version: 2.4.30
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-09-30 00:00:00.000000000 Z
+date: 2026-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: benchmark
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: liquid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: lutaml-model
   requirement: !ruby/object:Gem::Requirement
@@ -126,16 +126,16 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.19'
 - !ruby/object:Gem::Dependency
   name: paint
   requirement: !ruby/object:Gem::Requirement
@@ -159,7 +159,7 @@ dependencies:
         version: 1.3.9
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.9
+        version: 1.3.89
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -169,7 +169,7 @@ dependencies:
         version: 1.3.9
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.9
+        version: 1.3.89
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -188,16 +188,16 @@ dependencies:
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: table_tennis
   requirement: !ruby/object:Gem::Requirement
@@ -463,7 +463,7 @@ files:
 - lib/expressir/commands/validate.rb
 - lib/expressir/commands/validate_ascii.rb
 - lib/expressir/commands/validate_load.rb
-- lib/expressir/commands/version.rb
+- lib/expressir/commands/version_command.rb
 - lib/expressir/commands/xsd.rb
 - lib/expressir/config.rb
 - lib/expressir/coverage.rb