expressir 2.4.4 → 2.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: faa2eff1343ffba0a34111f1b9c48f2ea65fc8585da64b15844e39cd413b067f
-  data.tar.gz: 34ad23a65dabd3806206cf741c4e19d468bad9f6c566b89c0af10c594e0ca99b
+  metadata.gz: 2b92ce4a74f26a9a05edb583616053db6229b64705bbde94435fa5e6e326e84b
+  data.tar.gz: 1d3fa87cf6305caf6c4dffe592be2927b4a7101c993bcd5a3fdcecdb8c595ab7
 SHA512:
-  metadata.gz: 05d55fe19517184f73d6f97815be45fef28a7c8d84360ee8a83288e2d0de63671f8fd5715bd4e14c0154cc731d3531871ebeccf83a52c41d6dc1f6dc412e433f
-  data.tar.gz: fc4a6d27fde05257a4b8023ed7507caecdbbb6f79a28f32085ce17c79d1f30428bae762d70b80906f3b6e1e8a46237e7fe5a6ab2d67f407b8fc5cf0c86bf8864
+  metadata.gz: 5b3a8686a796910f01abb565a00fdb995e4d5b14f159941eeddbdecdba1b5c4ec793b4c17e3231113e8342e1d62f91d9b778acb1d1b0c7398abc5780d60a32bc
+  data.tar.gz: a5df0468bd977b6ac6cca9abbddbd60b8c8cee60149f5584132b7e2d2bc62aabe9d586237fb04200ae1232cc23c06592150b1071cfae5dfd2de0eacc54579148

data/README.adoc

@@ -213,6 +213,7 @@ Commands:
   expressir clean PATH                         # Strip remarks and prettify EXPRESS schema at PATH
   expressir expand PATH                        # Concatenate the interface closure into one .exp
   expressir flatten PATH                       # Flatten the interface closure into an ISO 10303-11:1994 longform schema
+  expressir fix PATH                           # Rewrite self-schema-qualified references (#125)
   expressir format PATH                        # pretty print EXPRESS schema located at PATH
   expressir help [COMMAND]                     # Describe available commands or one specific command
   expressir validate load *PATH                # validate EXPRESS schema located at PATH
@@ -527,10 +528,18 @@ expressir expand schemas/resources/action_schema/action_schema.exp \
 |===
 | Option | Description
 | `--output PATH`, `-o PATH` | Write the artifact to PATH (defaults to stdout)
+| `--manifest PATH` | ELF schema manifest YAML defining where schemas live (primary
+  resolution mode)
+| `--stepmod DIR` | STEPmod checkout root — explicit opt-in to directory-convention
+  resolution as the fallback
 |===
 
 The closure is resolved by scanning `USE FROM` / `REFERENCE FROM` names in the
-root source and looking them up in the same directory.
+root source. Schema resolution order: `--manifest PATH` (an ELF schema
+manifest — explicit, layout-independent) first; `--stepmod DIR` (the STEPmod
+directory convention) as an explicit fallback; otherwise the file's own
+directory, with a failed lookup warning and pointing at the two explicit
+modes.
 
 === Flatten schema (SHTOLO longform)
 
@@ -551,8 +560,35 @@ expressir flatten schemas/resources/action_schema/action_schema.exp \
 | Option | Description
 | `--output PATH`, `-o PATH` | Write the longform schema to PATH (defaults to stdout)
 | `--longform_name ID` | Identifier for the resulting SCHEMA (default: `<root>_lf`)
+| `--extenders all|none` | `all` (default, the WG12 requirement): fold every extensible
+  SELECT/ENUMERATION extension in the closure into its base type — for
+  `EXTENSIBLE GENERIC_ENTITY SELECT` that means every entity the closure
+  carries. `none`: leave extensible types exactly as declared.
+| `--manifest PATH` | ELF schema manifest YAML defining where schemas live (primary
+  resolution mode)
+| `--stepmod DIR` | STEPmod checkout root — explicit opt-in to directory-convention
+  resolution as the fallback
 |===
 
+The longform output is verified against Express Engine: for
+`description_assignment`, `eengine --compare` of our longform against
+eengine's own reference artifact reports *No differences detected*
+(`spec/expressir/express/shtolo_eengine_oracle_differential_spec.rb`).
+
+=== Fix schema (self-schema references)
+
+The `fix` command rewrites string literals that qualify an item with the
+CURRENT schema's name — `'THIS_SCHEMA.ITEM'` inside THIS_SCHEMA is
+technically incorrect: the item usually comes from another schema,
+imported implicitly through a USEd supertype. Local items drop the
+prefix; foreign items gain their true defining schema
+(`'GEOMETRY_SCHEMA.B_SPLINE_SURFACE'`); unknown items are left untouched.
+
+[source, sh]
+----
+expressir fix schemas/aic_topologically_bounded_surface.exp   --output fixed.exp
+----
+
 === Validate schema
 
 The `validate load` command performs validation checks on EXPRESS schema files.
@@ -597,6 +633,10 @@ expressir validate check schemas/resources/action_schema/action_schema.exp
 # Check all .exp files under a directory
 expressir validate check schemas/resources/
 
+# Resolve the closure through an ELF schema manifest (or --stepmod DIR)
+expressir validate check modules/description_assignment/mim.exp \
+  --manifest schemas-srl.yaml
+
 # Exit 1 when any :error note fires
 expressir validate check schemas/resources/action_schema/action_schema.exp
 ----

data/lib/expressir/express/adoc_hyperlink_formatter.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Expressir
+  module Express
+    # HyperlinkFormatter variant emitting AsciiDoc xref macros instead
+    # of the legacy stepmod +{{{<<express:...>>}}}+ markup: a reference
+    # to schema.item renders as +<<schema.item,item>>+, the anchor
+    # namespace schema document pages emit (expressir #255 / iso-10303
+    # #41). With +subs="+macros"+ source blocks the links go live.
+    module AdocHyperlinkFormatter
+      # @!visibility private
+      def self.included(mod)
+        unless mod.superclass <= Expressir::Express::Formatter
+          raise Error::FormatterMethodMissingError.new("AdocHyperlinkFormatter",
+                                                       "format_references_simple_reference")
+        end
+      end
+
+      def format_references_simple_reference(node)
+        return node.id unless node.base_path
+
+        parts = node.base_path.split(".")
+        return node.id if parts.size < 2
+
+        anchor = parts[-2, 2].join(".")
+        "<<#{anchor},#{node.id}>>"
+      end
+    end
+  end
+end

data/lib/expressir/express/adoc_source_formatter.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Expressir
+  module Express
+    # Pre-built Formatter subclass rendering the FULL schema with
+    # cross-references as AsciiDoc xref macros — the document-page
+    # counterpart of SourceFormatter (Schema#formatted_hyperlinked_adoc).
+    class AdocSourceFormatter < Formatter
+      include AdocHyperlinkFormatter
+    end
+  end
+end

data/lib/expressir/express.rb

@@ -10,6 +10,8 @@ module Expressir
 
     # Core classes (autoloaded for lazy loading)
     autoload :Cache, "#{__dir__}/express/cache"
+    autoload :AdocHyperlinkFormatter, "#{__dir__}/express/adoc_hyperlink_formatter"
+    autoload :AdocSourceFormatter, "#{__dir__}/express/adoc_source_formatter"
     autoload :Checker, "#{__dir__}/express/checker"
     autoload :Concatenator, "#{__dir__}/express/concatenator"
     autoload :Core, "#{__dir__}/express/core"

data/lib/expressir/model/declarations/schema.rb

@@ -59,6 +59,8 @@ module Expressir
         liquid do
           map :header, to: :header
           map :formatted, to: :formatted
+          map :formatted_hyperlinked, to: :formatted_hyperlinked
+          map :formatted_hyperlinked_adoc, to: :formatted_hyperlinked_adoc
           map :source, to: :source
           map :source_hyperlinked, to: :source_hyperlinked
           map :full_source, to: :full_source
@@ -111,6 +113,20 @@ module Expressir
           Expressir::Express::SchemaSourceFormatter.format(self)
         end
 
+        # FULL schema text with cross-references rendered as hyperlinks
+        # — what a schema document page renders (#255): every line of
+        # the schema, live links included.
+        def formatted_hyperlinked
+          @formatted_hyperlinked ||= Expressir::Express::SourceFormatter.format(self)
+        end
+
+        # FULL schema text with cross-references as AsciiDoc xref macros
+        # (+<<schema.item,item>>+) — drop-in for a schema document page
+        # rendered through a +subs="+macros"+ source block.
+        def formatted_hyperlinked_adoc
+          @formatted_hyperlinked_adoc ||= Expressir::Express::AdocSourceFormatter.format(self)
+        end
+
         private
 
         # @param [String] id

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.4".freeze
+    VERSION = "2.4.5".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.4.5
 platform: ruby
 authors:
 - Ribose Inc.
@@ -436,6 +436,8 @@ files:
 - lib/expressir/eengine/modified_object.rb
 - lib/expressir/errors.rb
 - lib/expressir/express.rb
+- lib/expressir/express/adoc_hyperlink_formatter.rb
+- lib/expressir/express/adoc_source_formatter.rb
 - lib/expressir/express/ast_key_converter.rb
 - lib/expressir/express/builder.rb
 - lib/expressir/express/builder_context.rb