expressir 2.4.14 → 2.4.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad3043a3dd1ac401e841249e3e081a7b3b6b3c3da99f6a9dbc136a127619ba49
-  data.tar.gz: '085e25b6e9b97d53fc5207aa651b37b080557626c6971b60029b98749ff4db82'
+  metadata.gz: ca7a970fe2d30edcb570639ddd4c178b2edf7bdee839844df7946fdb1e842d1b
+  data.tar.gz: a5a5b1c703de8027892d77792fbc957155101b8875fe1aa080feefec9d278ac7
 SHA512:
-  metadata.gz: e92cca737def4e8432f30b98162262f83df7d81c719c7a1dd916173f65ff788c1145843e46131bfe7da5ef97e76c00a155215f7c4893befe7748601711438d93
-  data.tar.gz: 88d3f1008222838323a843a1b9a7117bf1b09465fa453de4bfd21868137b16439a680165e527555099ae67884cb8a77c8a2068e92b113f34408444c314482583
+  metadata.gz: '0950891e9ddb51792aaf69c1c82af9224ae6126b5ff77dd481e48105b2e39215dd23a1d1c3e30d060be4ef2988132b4aec47cf306903dc9081a05e73c5e6f42d'
+  data.tar.gz: 976131ab90fedb6e659129ca1f0aa6a3e8a8d5df40cb00950dc8b6b237789dcc4d896df03c35532e3afac6483e2f3674983bb0bc092adbf0534ed355d155a507

data/TODO.parity-ee/18-mim-mapping.md

@@ -0,0 +1,47 @@
+# 18 — EXPRESS MIM mapping parser (expressir#88)
+
+## Goal
+
+Parse and validate MIM "reference path" mappings — the application ↔
+interpretation mapping every STEP module carries — into a typed model,
+with the mapping paths validated against the ARM/MIM schemas.
+
+## Sources
+
+- This checkout's canonical form: `schemas/modules/*/mapping.yaml` —
+  structured ae/aimelt/aa records whose values use the
+  `<<express:SCHEMA.ITEM,ITEM>>` link markup (the same markup
+  `Suma::LinkValidation` validates today). Generated upstream from
+  module.xml.
+- Upstream SMRL module.xml: `mapping`/`ae`/`aimelt` elements with
+  `reference_path` bodies — the ISO 10303-1x mapping methodology
+  grammar: entity chains `A -> B -> C`, qualifiers `[attr => val]`,
+  `=>` derived references, `->>` subtype traversal, `<>` select
+  member. Port the grammar from the Part 1x mapping annex text
+  (detached docs) + existing module corpus as the oracle.
+- eeng has no counterpart — this is an expressir-first capability.
+
+## Design
+
+1. `Expressir::Model::Mapping` — MappingDocument →
+   ApplicationElements (entity, aimelt, attributes) and
+   ReferencePath nodes (path-expression AST: steps, qualifiers,
+   subtype traversals).
+2. `mapping.yaml` reader (lutaml-model typed) — yaml → MappingDocument.
+3. Reference-path expression parser — parsanol grammar over the path
+   syntax; AST reuses Model::References where shapes coincide.
+4. Validation: every path resolves against the resolved ARM+MIM
+   repository (rides SchemaIndex / ItemGraph); unknown step = error
+   note (Checker id `check-mapping-path`).
+5. CLI: `expressir mapping validate DIR|FILE` over module dirs.
+
+## Acceptance
+
+- All module mapping.yaml files in the SMRL parse; path validation
+  reports zero unknown steps (or a classified, explained residue).
+- Round-trip: MappingDocument → yaml byte-stable.
+
+## Test cases
+
+- module corpus (603 modules); hand fixtures for each path grammar
+  production; invalid-path fixtures.

data/lib/expressir/commands/parity_inputs.rb

@@ -1,4 +1,5 @@
 require "find"
+require "thor"
 
 module Expressir
   module Commands
@@ -42,8 +43,9 @@ module Expressir
           end
         end
         unless missing.empty?
-          warn "expressir: schema(s) not found: #{missing.uniq.join(', ')}" \
-               "#{resolver_hint(manifest, stepmod)}"
+          raise Thor::Error,
+                "expressir: schema(s) not found: #{missing.uniq.join(', ')}" \
+                "#{resolver_hint(manifest, stepmod)}"
         end
         seen.values.compact.uniq
       end
@@ -59,15 +61,18 @@ module Expressir
         end
       end
 
-      # Schema-name → path index from the ELF schema manifest.
+      # Schema-name → path index from the ELF schema manifest. An
+      # explicitly given manifest that cannot be loaded is fatal (#455):
+      # when the root has no interface dependencies the lookup would
+      # never consult the index, so a typo'd --manifest would exit 0.
       def manifest_index(manifest_path)
         manifest = Expressir::SchemaManifest.from_file(manifest_path)
         manifest.schemas.to_h do |entry|
           [entry.id.downcase, entry.path]
         end
       rescue StandardError => e
-        warn "expressir: could not load schema manifest #{manifest_path}: #{e.message}"
-        nil
+        raise Thor::Error,
+              "expressir: could not load schema manifest #{manifest_path}: #{e.message}"
       end
 
       # Schema-name → path index over a STEPmod checkout root (the
@@ -90,14 +95,43 @@ module Expressir
         return manifest_index(manifest) if manifest
         return stepmod_index(stepmod) if stepmod
 
-        same_dir_index(root_path)
+        # Default: the file's own directory plus, when the root sits
+        # inside a STEPmod checkout, its enclosing `schemas/` tree —
+        # the layout wg12-step modules live in. Same-directory
+        # declarations win over tree hits for the same schema name:
+        # the file next to the root is the intentional one (#455).
+        index = same_dir_index(root_path)
+        ancestor = ancestor_schemas_dir(root_path)
+        if ancestor
+          tree = stepmod_index(File.dirname(ancestor))
+          tree.update(index)
+          index = tree
+        end
+        index
+      end
+
+      # Nearest ancestor directory NAMED `schemas`, or nil.
+      def ancestor_schemas_dir(root_path)
+        dir = File.dirname(File.expand_path(root_path))
+        until dir == "/"
+          return dir if File.basename(dir) == "schemas"
+
+          dir = File.dirname(dir)
+        end
+        nil
       end
 
       def same_dir_index(root_path)
         dir = File.dirname(File.expand_path(root_path))
-        Dir.glob(File.join(dir, "*.exp")).to_h do |p|
-          [File.basename(p, ".exp").downcase, p]
+        h = {}
+        Dir.glob(File.join(dir, "*.exp")).each do |path|
+          # index by DECLARED schema name first (a file named arm.exp
+          # may declare schema m_arm), basename as fallback
+          declared = File.read(path)[/\bSCHEMA\s+(\w+)/i, 1]
+          h[declared.downcase] = path if declared
+          h[File.basename(path, ".exp").downcase] ||= path
         end
+        h
       end
 
       # Interface names declared by +source+. Remark text is stripped

data/lib/expressir/express/checker.rb

@@ -290,7 +290,7 @@ module Expressir
         end
       end
 
-      def each_reference(node, &)
+      def each_reference(node, &block)
         case node
         when Model::References::SimpleReference then yield node
         when Model::ModelElement
@@ -299,8 +299,8 @@ module Expressir
 
             value = node.public_send(attr)
             case value
-            when Array then value.each { |item| each_reference(item, &) }
-            when Model::ModelElement then each_reference(value, &)
+            when Array then value.each { |item| each_reference(item, &block) }
+            when Model::ModelElement then each_reference(value, &block)
             end
           end
         end
@@ -407,7 +407,7 @@ module Expressir
         end
       end
 
-      def each_string(node, &)
+      def each_string(node, &block)
         case node
         when Model::Literals::String then yield node, node.value
         when Model::ModelElement
@@ -416,8 +416,8 @@ module Expressir
 
             value = node.public_send(attr)
             case value
-            when Array then value.each { |item| each_string(item, &) }
-            when Model::ModelElement then each_string(value, &)
+            when Array then value.each { |item| each_string(item, &block) }
+            when Model::ModelElement then each_string(value, &block)
             end
           end
         end

data/lib/expressir/express/shtolo.rb

@@ -351,13 +351,17 @@ module Expressir
         end
       end
 
-      # Every identifier a call site names, across the artifact's
-      # surviving declarations: FunctionCall for functions and
-      # ProcedureCall statements for procedures. (A zero-argument
-      # function reference written bare is not represented as a
-      # FunctionCall by the parser and is counted via any SimpleReference
-      # miss — accepted v1 blind spot, see tranche notes.)
+      # Every identifier a call site or reference names, across the
+      # artifact's surviving declarations: FunctionCall for functions,
+      # ProcedureCall statements for procedures, and ANY SimpleReference
+      # naming a schema function/procedure — a zero-argument function
+      # used bare (`v < limit_value`) parses as a plain reference, not
+      # a FunctionCall, and dropping it would leave the longform with a
+      # dangling call. Over-retaining is safe: prune only decides what
+      # may be dropped.
       def called_ids(schema)
+        invocable = (schema.functions.to_a + schema.procedures.to_a)
+          .map { |d| d.id.safe_downcase }
         called = {}
         each_node(schema) do |node|
           id = nil
@@ -366,8 +370,10 @@ module Expressir
             id = node.function.is_a?(String) ? node.function : node.function&.id
           when Expressir::Model::Statements::ProcedureCall
             id = node.procedure.is_a?(String) ? node.procedure : node.procedure&.id
+          when Model::References::SimpleReference
+            id = node.id
           end
-          called[id.safe_downcase] = true if id
+          called[id.safe_downcase] = true if id && invocable.include?(id.safe_downcase)
         end
         called
       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.14".freeze
+    VERSION = "2.4.16".freeze
   end
 end

data/rakelib/oracle.rake

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require "digest"
+require "fileutils"
+
+ORACLE_TAG = "eeng-5.2.8"
+ORACLE_BASE =
+  "https://github.com/expresslang/eengine-releases/releases/download/#{ORACLE_TAG}".freeze
+# Release-asset naming convention for the pinned tag: platform prefix
+# and CPU tag used by expresslang/eengine-releases.
+ORACLE_ASSET_NAMES = {
+  %w[darwin arm64] => "mac-arm64",
+  %w[darwin x86_64] => "mac-x86-64",
+  %w[linux x86_64] => "lnx-x86-64",
+  %w[linux arm64] => "lnx-arm64",
+  %w[mingw x86_64] => "win-x86-64",
+}.freeze
+
+namespace :oracle do
+  desc "Fetch the eengine oracle (#{ORACLE_TAG}) into tmp/oracle/eengine " \
+       "for the SHTOLO corpus differential"
+  task :fetch do
+    platform = [Gem::Platform.local.os, Gem::Platform.local.cpu]
+    tag = ORACLE_ASSET_NAMES[platform]
+    abort "no #{ORACLE_TAG} asset for #{platform.join('-')}" unless tag
+
+    version = ORACLE_TAG.delete_prefix("eeng-")
+    asset = "eengine-#{version}-#{tag}-sbcl#{'.exe' if platform.first == 'mingw'}"
+    target = File.expand_path("../tmp/oracle/eengine", __dir__)
+    digest = "#{target}.sha256"
+
+    if File.executable?(target)
+      expected = File.read(digest).strip.split(/\s+/).first if File.exist?(digest)
+      if expected && Digest::SHA256.file(target).hexdigest == expected
+        warn "oracle already present: #{target}"
+        exit 0
+      end
+      warn "cached oracle is missing or corrupt; refetching"
+      rm_f target
+    end
+
+    dir = File.dirname(target)
+    mkdir_p dir
+    download = File.join(dir, "#{asset}.part")
+    sh "curl", "-fSL", "-o", download, "#{ORACLE_BASE}/#{asset}"
+    sha = Digest::SHA256.file(download).hexdigest
+    mv download, target
+    chmod 0o755, target
+    File.write(digest, "#{sha}  eengine\n")
+    puts "oracle ready: #{target} (#{sha})"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 2.4.14
+  version: 2.4.16
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-09-23 00:00:00.000000000 Z
+date: 2026-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -318,6 +318,7 @@ files:
 - TODO.parity-ee/15-part28-xml.md
 - TODO.parity-ee/16-compare-patch.md
 - TODO.parity-ee/17-official-tests.md
+- TODO.parity-ee/18-mim-mapping.md
 - TODO.parity-ee/19-architecture.md
 - TODO.parity-ee/parity-matrix.md
 - benchmark/srl_benchmark.rb
@@ -639,6 +640,7 @@ files:
 - lib/expressir/schema_manifest_entry.rb
 - lib/expressir/version.rb
 - lib/tasks/verify_remarks.rake
+- rakelib/oracle.rake
 - rakelib/verify_remarks.rake
 homepage: https://github.com/lutaml/expressir
 licenses: