expressir 2.4.0 → 2.4.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-07-09 00:00:00.000000000 Z
+date: 2026-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -176,14 +176,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: table_tennis
   requirement: !ruby/object:Gem::Requirement
@@ -212,6 +212,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: yeptris
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.1
 description: Expressir ("EXPRESS in Ruby") is a Ruby parser for EXPRESS and a set
   of tools for accessing EXPRESS data models.
 email:
@@ -237,6 +251,37 @@ files:
 - Gemfile
 - README.adoc
 - Rakefile
+- TODO.bugs/01-stale-transformer-autoload.md
+- TODO.bugs/02-parser-class-instance-vars.md
+- TODO.bugs/03-builder-mutable-state.md
+- TODO.bugs/04-formatter-public-send-dispatch.md
+- TODO.bugs/05-anonymous-formatter-subclass.md
+- TODO.bugs/06-collection-registry-single-source.md
+- TODO.bugs/07-require-relative-cleanup.md
+- TODO.bugs/08-require-expressir-in-commands.md
+- TODO.bugs/09-parser-split.md
+- TODO.bugs/10-to-s-override.md
+- TODO.bugs/11-parser-class-variables.md
+- TODO.bugs/12-marker-modules-vs-registry.md
+- TODO.bugs/13-string-literal-scanner-limitation.md
+- TODO.bugs/14-model-formatting-leak.md
+- TODO.bugs/15-expression-children-macro.md
+- TODO.bugs/16-pretty-formatter-duplication.md
+- TODO.bugs/17-snake-case-cache-mutable-constant.md
+- TODO.bugs/18-const-get-private-constants.md
+- TODO.bugs/19-format-methods-public.md
+- TODO.bugs/20-coverage-nested-entities-dedup.md
+- TODO.bugs/21-operator-tokens-secondary-dispatch.md
+- TODO.bugs/22-builder-fast-path-wrappers.md
+- TODO.bugs/23-coverage-inverse-maps.md
+- TODO.bugs/24-streaming-builder-complexity.md
+- TODO.bugs/25-debug-puts-in-production.md
+- TODO.bugs/26-generic-entity-children-misplaced.md
+- TODO.bugs/27-package-build-god-method.md
+- TODO.bugs/28-package-god-class.md
+- TODO.bugs/29-validate-ascii-god-class.md
+- TODO.bugs/30-unicode-map-extraction.md
+- TODO.bugs/README.md
 - benchmark/srl_benchmark.rb
 - benchmark/srl_native_benchmark.rb
 - benchmark/srl_ruby_benchmark.rb
@@ -291,6 +336,7 @@ files:
 - docs/_references/index.adoc
 - docs/_tutorials/creating-ler-package.adoc
 - docs/_tutorials/documentation-coverage.adoc
+- docs/_tutorials/formatting-schemas.adoc
 - docs/_tutorials/index.adoc
 - docs/_tutorials/liquid-templates.adoc
 - docs/_tutorials/parsing-your-first-schema.adoc
@@ -331,8 +377,11 @@ files:
 - lib/expressir/commands/changes_validate.rb
 - lib/expressir/commands/clean.rb
 - lib/expressir/commands/coverage.rb
+- lib/expressir/commands/file_violations.rb
 - lib/expressir/commands/format.rb
 - lib/expressir/commands/manifest.rb
+- lib/expressir/commands/non_ascii_character.rb
+- lib/expressir/commands/non_ascii_violation_collection.rb
 - lib/expressir/commands/package.rb
 - lib/expressir/commands/validate.rb
 - lib/expressir/commands/validate_ascii.rb
@@ -349,6 +398,7 @@ files:
 - lib/expressir/errors.rb
 - lib/expressir/express.rb
 - lib/expressir/express/builder.rb
+- lib/expressir/express/builder_context.rb
 - lib/expressir/express/builder_registry.rb
 - lib/expressir/express/builders.rb
 - lib/expressir/express/builders/attribute_decl_builder.rb
@@ -397,17 +447,23 @@ files:
 - lib/expressir/express/formatters/remark_item_formatter.rb
 - lib/expressir/express/formatters/statements_formatter.rb
 - lib/expressir/express/formatters/supertype_expressions_formatter.rb
+- lib/expressir/express/grammar.rb
+- lib/expressir/express/grammar/parser.rb
 - lib/expressir/express/hyperlink_formatter.rb
 - lib/expressir/express/line_map.rb
 - lib/expressir/express/model_visitor.rb
+- lib/expressir/express/node_position_index.rb
 - lib/expressir/express/parser.rb
 - lib/expressir/express/pretty_formatter.rb
 - lib/expressir/express/remark_attacher.rb
 - lib/expressir/express/remark_scanner.rb
 - lib/expressir/express/resolve_references_model_visitor.rb
+- lib/expressir/express/schema_block_scanner.rb
 - lib/expressir/express/schema_head_formatter.rb
+- lib/expressir/express/schema_source_formatter.rb
+- lib/expressir/express/scope_resolver.rb
+- lib/expressir/express/source_formatter.rb
 - lib/expressir/express/streaming_builder.rb
-- lib/expressir/express/transformer/remark_handling.rb
 - lib/expressir/liquid.rb
 - lib/expressir/manifest.rb
 - lib/expressir/manifest/resolver.rb
@@ -485,7 +541,9 @@ files:
 - lib/expressir/model/references/group_reference.rb
 - lib/expressir/model/references/index_reference.rb
 - lib/expressir/model/references/simple_reference.rb
+- lib/expressir/model/remark_format.rb
 - lib/expressir/model/remark_info.rb
+- lib/expressir/model/remark_placement.rb
 - lib/expressir/model/repository.rb
 - lib/expressir/model/repository_validator.rb
 - lib/expressir/model/search_engine.rb

data/lib/expressir/express/transformer/remark_handling.rb

@@ -1,194 +0,0 @@
-# frozen_string_literal: true
-
-require "parsanol"
-
-module Expressir
-  module Express
-    # Handles remark extraction and attachment for the Transformer.
-    # Works with the AST directly, without needing Ctx objects.
-    module RemarkHandling
-      extend self
-
-      # Extract all remarks from the AST with their tags and source positions.
-      # @param ast [Hash] The AST from Parsanol parser
-      # @param source [String] The original source code
-      # @return [Array<Hash>] Array of remark info hashes
-      def extract_remarks(ast, source)
-        remarks = []
-
-        # Extract embedded remarks (*...*)
-        extract_embedded_remarks(ast, source, remarks)
-
-        # Extract tail remarks (--...)
-        extract_tail_remarks(ast, source, remarks)
-
-        remarks
-      end
-
-      # Attach remarks to model elements based on their tagged paths.
-      # @param model [Model::ModelElement] The root model element
-      # @param remarks [Array<Hash>] The extracted remarks
-      def attach_remarks(model, remarks)
-        # Group remarks by their tag
-        tagged_remarks, untagged_remarks = remarks.partition { |r| r[:tag] }
-
-        # Process tagged remarks
-        tagged_remarks.each do |remark|
-          target = find_by_path(model, remark[:tag])
-          if target
-            add_remark(target, remark[:text])
-          end
-        end
-
-        # Process untagged remarks (attach based on position)
-        attach_untagged_remarks(model, untagged_remarks)
-      end
-
-      private
-
-      def extract_embedded_remarks(ast, source, remarks, depth = 0)
-        return if depth > 50 # Prevent infinite recursion
-
-        case ast
-        when Hash
-          ast.each do |key, value|
-            if key == :embeddedRemark
-              extract_single_embedded_remark(value, source, remarks)
-            else
-              extract_embedded_remarks(value, source, remarks, depth + 1)
-            end
-          end
-        when Array
-          ast.each do |item|
-            extract_embedded_remarks(item, source, remarks, depth + 1)
-          end
-        end
-      end
-
-      def extract_single_embedded_remark(data, source, remarks)
-        return unless data
-
-        # Find the slice to get position
-        slice = find_slice(data)
-        return unless slice
-
-        # Extract content from the source
-        content = source[slice.offset...(slice.offset + slice.length)]
-        return unless content
-
-        # Remove (* and *) delimiters
-        if content =~ /^\(\*(.*?)\*\)$/m
-          inner_content = $1.strip
-          tag, text = parse_tagged_content(inner_content)
-
-          remarks << {
-            position: slice.offset,
-            tag: tag,
-            text: text,
-            format: :embedded,
-          }
-        end
-      end
-
-      def extract_tail_remarks(ast, source, remarks, depth = 0)
-        return if depth > 50
-
-        case ast
-        when Hash
-          ast.each do |key, value|
-            if key == :tailRemark
-              extract_single_tail_remark(value, source, remarks)
-            else
-              extract_tail_remarks(value, source, remarks, depth + 1)
-            end
-          end
-        when Array
-          ast.each do |item|
-            extract_tail_remarks(item, source, remarks, depth + 1)
-          end
-        end
-      end
-
-      def extract_single_tail_remark(data, source, remarks)
-        return unless data
-
-        # Find the slice to get position
-        slice = find_slice(data)
-        return unless slice
-
-        # Extract content from the source
-        content = source[slice.offset...(slice.offset + slice.length)]
-        return unless content
-
-        # Remove -- prefix and any trailing newline
-        if content =~ /^--\s*(.*?)(?:\n|$)/m
-          remark_text = $1.strip
-          tag, text = parse_tagged_content(remark_text)
-
-          remarks << {
-            position: slice.offset,
-            tag: tag,
-            text: text,
-            format: :tail,
-          }
-        end
-      end
-
-      def find_slice(data, depth = 0)
-        return nil if depth > 10
-
-        case data
-        when Hash
-          data.each_value do |value|
-            return value if value.is_a?(Parsanol::Slice)
-
-            result = find_slice(value, depth + 1)
-            return result if result
-          end
-        when Array
-          data.each do |item|
-            result = find_slice(item, depth + 1)
-            return result if result
-          end
-        end
-        nil
-      end
-
-      def parse_tagged_content(content)
-        if content =~ /^"([^"]+)"\s*(.*)$/m
-          [$1, $2.strip]
-        else
-          [nil, content.strip]
-        end
-      end
-
-      def find_by_path(model, path)
-        return nil unless path
-        return nil unless model.is_a?(Model::ModelElement)
-
-        # Handle paths with colons (like "wr:WR1" for where rules)
-        normalized_path = path.gsub(":", ".")
-
-        begin
-          model.find(normalized_path)
-        rescue StandardError
-          nil
-        end
-      end
-
-      def add_remark(node, text)
-        return unless node
-        return unless node.is_a?(Model::ModelElement)
-
-        node.remarks ||= []
-        node.remarks << text
-      end
-
-      def attach_untagged_remarks(model, remarks)
-        # For untagged remarks, we need to find nearby nodes
-        # This is more complex and may require source position tracking
-        # For now, skip untagged remarks as they are less common
-      end
-    end
-  end
-end