expressir 2.4.30 → 2.4.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 422611b8889e4e8c78ca3a4c2482b3988dcda82d3035d813c462b7c77f3eac50
-  data.tar.gz: cd132662d82929629aa50ad7b7ad0dd238cd744af87e3ec0cda519b8ab949575
+  metadata.gz: 8c99980cc78fb445ea5c87f6b550c136c348e4b760b9fdabad8caf4a60a29884
+  data.tar.gz: 7effdd8da82e7a788dfedadfd54e13013febc24e90103542c1579052405e6e8d
 SHA512:
-  metadata.gz: fad716d2795853e70bc21eda9dec8baf15406d6a9afe9cba82bd138f672d8c852876664cde22c9ef10331d4b514769195c11cd5e3d7e5fec0409bb3589777f7a
-  data.tar.gz: e23c2fd8555d20aac0972817f6af0e6b242602a4deca1df7e1e2dfcbee22200f771a4b12afd48340b2efa648bedaed9505244cc343eec7a7935578602092c435
+  metadata.gz: ba219b7e2d9e4b740776308e31f3c14bdc0283c62e6400b83427b7f338a74acef3f5f8afad9ca1e57968204dc1d3e6c352c2f37bf5c7ea540daed395ceab783c
+  data.tar.gz: d9c2d5ad92afd32f7b38013e5f7c16795370c3d682e13fe60e4ee577602497e474b89dd3e475bed88f74a9f169053a51ac35bd66748909fa729400fdd78db346

data/.github/scripts/test_installed_gem.rb

@@ -5,8 +5,19 @@
 # active and the parser must handle the standard and #462 forms.
 require "expressir"
 
-abort "FAIL: NATIVE_AVAILABLE is false" unless Expressir::Express::Core::NATIVE_AVAILABLE
-puts "native binding: active"
+if Gem.win_platform? && !Expressir::Express::Core::NATIVE_AVAILABLE
+  # Interim expressir#487 guard: native is intentionally disabled on
+  # windows until the ancestor-walk fix (#499) merges and the guard
+  # reverts. The platform gem must still SHIP a loadable extension -
+  # that is this leg's contract while the guard stands.
+  gem_dir = Gem.loaded_specs["expressir"].gem_dir
+  shipped = Dir.glob(File.join(gem_dir, "**", "expressir_core.{so,dll}"))
+  abort "FAIL: expressir_core not shipped in the platform gem" if shipped.empty?
+  puts "native binding: deferred (windows guard, expressir#487)"
+else
+  abort "FAIL: NATIVE_AVAILABLE is false" unless Expressir::Express::Core::NATIVE_AVAILABLE
+  puts "native binding: active"
+end
 
 repo = Expressir::Express::Parser.from_exp(
   "SCHEMA smoke; ENTITY e; a : STRING; END_ENTITY; END_SCHEMA;",
@@ -28,7 +39,10 @@ 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"
+# Windows under the #487 guard runs the pure-Ruby fallback instead.
+unless Gem.win_platform? && !Expressir::Express::Core::NATIVE_AVAILABLE
+  abort "FAIL: core_set_available is false" unless Expressir::Express::Parser.core_set_available?
+  puts "compiled-set core: ok"
+end
 
 puts "SMOKE OK"

data/TODO.parity-ee/00-overview.md

@@ -64,7 +64,7 @@ interface/qualify notes; `00check.txt` — check design notes.
 | 12 | full check-p11 catalog port | planned |
 | 13 | population / Part 21 validation | planned |
 | 14 | SHTOLO completion (Annex G + corpus differential) | in progress |
-| 15 | Part 28 XML + SMRL index | planned |
+| 15 | Part 28 XML + SMRL index | done (SMRL index + express2xsd shipped, #276; reference-XSD diff harness escalated to 17) |
 | 16 | schema compare & patch | planned |
 | 17 | official test-case incorporation | standing structure |
 

data/TODO.suma-improvements/07-part28-xml.md

@@ -1,15 +1,12 @@
-# 07 — Part 28 XML: select mapping v2 (#276)
+# 07 — Part 28 XML: select mapping v2 (#276) — DONE
 
-## Goal
-Full ISO 10303-28 EXPRESS-to-XML beyond the v1 skeleton
-(lib/expressir/express/xsd.rb): proper SELECT mapping (currently
-xs:anyType), aggregate/optional fidelity, schema-level structure.
+Shipped: the ISO 10303-28 SELECT mapping lives in
+lib/expressir/express/xsd.rb (complexType + xs:choice, entity members
+as global-element refs, defined-type members by name+type, extensible-
+empty fallback to sequence) and is covered by spec/expressir/express/
+xsd_spec.rb. The CLI exposes both halves: `expressir xsd` and
+`expressir xml-index` (#503).
 
-## Steps
-- ISO 10303-28 mapping rules for SELECT types (union/member semantics)
-- apply on top of xsd.rb's element/complexType generation
-- validate generated XSDs against the ISO 10303-28 conformance examples
-
-## Acceptance
-- a select-typed attribute renders per the standard (not xs:anyType)
-- the v1 examples still generate unchanged except where v2 improves them
+Remaining escalation (moved to parity-ee 17 scope): validating the
+generated XSDs against the Part 28 reference corpus — the detached
+docs carry the standard text only, not the reference XSDs.

data/lib/expressir/cli.rb

@@ -111,6 +111,13 @@ module Expressir
       Expressir::Commands::Xsd.new(options).run(path)
     end
 
+    desc "xml-index DIR", "Write the SMRL index XML for every EXPRESS schema under DIR"
+    method_option :output, type: :string, aliases: "-o",
+                           desc: "Output file path (defaults to stdout)"
+    def xml_index(path)
+      Expressir::Commands::SmrlXmlIndex.new(options).run(path)
+    end
+
     desc "validate SUBCOMMAND", "EXPRESS schema validation commands"
     subcommand "validate", Expressir::Commands::Validate
 

data/lib/expressir/commands/parity_inputs.rb

@@ -113,7 +113,12 @@ module Expressir
       # Nearest ancestor directory NAMED `schemas`, or nil.
       def ancestor_schemas_dir(root_path)
         dir = File.dirname(File.expand_path(root_path))
-        until dir == "/"
+        # dirname reaches a fixed point at the filesystem root: "/" on
+        # POSIX, "D:/" (or a UNC root) on windows. Comparing against "/"
+        # alone spun forever on windows - every rake run since this
+        # shipped (e0f6651, 2026-09-24) burned the full 6h runner
+        # budget in the first expand example (#487).
+        until dir == "/" || dir == File.dirname(dir)
           return dir if File.basename(dir) == "schemas"
 
           dir = File.dirname(dir)

data/lib/expressir/commands/smrl_xml_index.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require "thor"
+
+module Expressir
+  module Commands
+    # `expressir xml-index` (#276): write the SMRL index XML for a
+    # repository — one <schema> element per schema, the data layer of
+    # the STEP Module Resource Library document set.
+    class SmrlXmlIndex < Base
+      def run(path)
+        repo = Expressir::Express::Parser.from_files(Dir.glob(File.join(path, "**", "*.exp")), skip_references: true)
+        raise Thor::Error, "no schemas under #{path}" if repo.schemas.empty?
+
+        xml = Expressir::Express::SmrlXml.format(repo)
+        if options[:output]
+          File.write(options[:output], xml)
+          say "written to #{options[:output]}"
+        else
+          $stdout.write(xml)
+        end
+      end
+    end
+  end
+end

data/lib/expressir/commands.rb

@@ -26,5 +26,6 @@ module Expressir
     autoload :Manifest, "#{__dir__}/commands/manifest"
     autoload :MappingValidate, "#{__dir__}/commands/mapping_validate"
     autoload :Xsd, "#{__dir__}/commands/xsd"
+    autoload :SmrlXmlIndex, "#{__dir__}/commands/smrl_xml_index"
   end
 end

data/lib/expressir/express/core.rb

@@ -8,14 +8,8 @@ module Expressir
     # 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 = !Gem.win_platform? && begin
+      NATIVE_AVAILABLE = begin
         require "expressir/expressir_core"
         true
       rescue LoadError

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

@@ -41,7 +41,13 @@ module Expressir
         # ("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])
+        # The whitespace/remark rules manage their own trivia end to end
+        # (they ARE the trivia surface for remarks); injection around
+        # them breaks consecutive remark lines on the Ruby engine
+        # ("-- X\n--\nSCHEMA ..." failed - the #487 windows follow-up,
+        # parsanol-ruby#195 family).
+        skip(:trivia, whitespace: :space,
+                      exempt: %i[simpleId digits spaces space embeddedRemark tailRemark])
 
         # Get cached parser instance (thread-safe)
         # Reusing the parser avoids the overhead of reinitializing all rule definitions
@@ -62,15 +68,6 @@ 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

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.30".freeze
+    VERSION = "2.4.32".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 2.4.30
+  version: 2.4.32
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-12 00:00:00.000000000 Z
+date: 2026-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys
@@ -460,6 +460,7 @@ files:
 - lib/expressir/commands/non_ascii_violation_collection.rb
 - lib/expressir/commands/package.rb
 - lib/expressir/commands/parity_inputs.rb
+- lib/expressir/commands/smrl_xml_index.rb
 - lib/expressir/commands/validate.rb
 - lib/expressir/commands/validate_ascii.rb
 - lib/expressir/commands/validate_load.rb