lutaml-xsd 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab65095d3489bfa5198ceb55652108b864e7a5be7c71c11e4bf4e008c434cdf1
-  data.tar.gz: eeb2e432c1cceceec5bc5b88197ba86a12e07deb7402a49bdc9b054ee9e5f051
+  metadata.gz: 8f86df66b1872004805859211c3ece8ab95f01471382e5c44c828f0b4477f299
+  data.tar.gz: 35e1d8b3636c7717185a52cd5be3f7656153ea5f17231327c77ad3ea5c13299c
 SHA512:
-  metadata.gz: ae06973a7e5c075298b86870a414d398329f57d74fc6eba07f435a0af51002bfbda1ace3e9021fda1ccd586eadc0875c3c576150cd2bf30aad5aef1557852277
-  data.tar.gz: 34b409a1da1fb13fca086a57ad18aba81d0d3ebc6e4aaf0fcd9f4e1b7df2653240cd094dab9f64974f618d6fa4a208af0f7b739d804ccf16d4baa720ad7634c2
+  metadata.gz: 2fb32fab3985d140b465aee99a2076831156dca986cb961a1fdda2388e08a85de4c1bbb10ff7b88964063202d0abccb3a870d816cd545d731229170baff6d877
+  data.tar.gz: e8a6436f162216cec2a8cd641f72467eb6a0ab4c38aa2da42aec9b7606d970866e617fa5efcdc8939c31725b59c504ed5c5e074cebc657b37cb3abeda59e04aa

data/.gitignore

@@ -35,3 +35,4 @@ frontend/index.html
 examples/*/pkg/
 examples/*.html
 examples/archive-old/
+examples/02-urban-function/urban_function_docs.html

data/Gemfile

@@ -12,7 +12,6 @@ gem "liquid"
 gem "lutaml-model", github: "lutaml/lutaml-model", branch: "main"
 gem "nokogiri"
 gem "rake"
-gem "rng", github: "lutaml/rng", branch: "fix-include-define"
 gem "rspec"
 gem "rubocop"
 gem "rubocop-performance"

data/README.adoc

@@ -11,7 +11,8 @@ image:https://github.com/lutaml/lutaml-xsd/actions/workflows/rake.yml/badge.svg[
 Lutaml::Xsd is a Ruby gem designed to parse and manipulate XML Schema Definition
 (XSD) files. It provides a robust framework for handling XSD elements,
 attributes, complex types, and all other XSD constructs, allowing users to
-programmatically work with XML schemas.
+programmatically work with XML schemas. It also supports RELAX NG (RNG/RNC)
+schemas through automatic conversion to XSD.
 
 NOTE: For UML-to-XSD mapping and YAML documentation generation (including
 ShapeChange integration), see the
@@ -45,8 +46,16 @@ allowing you to shape and structure your data into useful forms.
   - Single-file mode
   - Entrypoint prioritization in sidebar
   - Schema detail views with elements/types/attributes tables
+  - Interactive group tree view with nested choices and sequences
+  - Inline complex type display for anonymous types within elements
   - Hash-based navigation with browser back/forward support
   - Dark mode with automatic theme detection
+* <<rng-rnc-support,RELAX NG (RNG/RNC) support>> - Convert and build from
+  RELAX NG schemas
+  - Automatic RNG/RNC to XSD conversion via `RngToXsdConverter`
+  - Build LXR packages directly from `.rng` and `.rnc` files
+  - Support for both XML syntax (`.rng`) and compact syntax (`.rnc`)
+  - Automatic include directive conversion
 * <<schema-validation,XSD schema validation>> with automatic version detection
   - Pre-parsing validation to ensure valid XSD schema documents
   - Automatic detection of XSD 1.0 vs 1.1 features
@@ -138,6 +147,8 @@ lutaml-xsd spa schemas.lxr --output docs.html \
 * Schema navigation with entrypoints prioritized
 * Element and type detail views
 * XML Instance Representation for each component
+* Inline complex type display for anonymous types within elements
+* Interactive group tree view showing nested choices, sequences, and sub-groups
 * Clickable cross-references throughout
 * xs3p-quality documentation
 
@@ -231,6 +242,88 @@ For comprehensive documentation on SPA generation, see:
 * link:docs/SPA_DEPLOYMENT.adoc[Deployment Guide] - Hosting and CI/CD integration
 * link:docs/SPA_ARCHITECTURE.adoc[Architecture Documentation] - Design and extension guide
 
+[[rng-rnc-support]]
+== RELAX NG (RNG/RNC) support
+
+=== General
+
+Lutaml::Xsd can convert RELAX NG schema files (`.rng` XML syntax and `.rnc`
+compact syntax) to XSD, allowing you to build LXR packages and generate
+documentation from RELAX NG schemas using the same tools and workflows.
+
+The `RngToXsdConverter` follows the same mapping logic as jing-trang's RNG-to-XSD
+conversion, handling define resolution, element classification, collision
+detection, and include directives.
+
+=== Building from RNG/RNC files
+
+Use `.rng` or `.rnc` files directly in your YAML configuration:
+
+[source,yaml]
+----
+# config.yml
+files:
+  - path/to/schema.rng
+----
+
+Or point to a compact syntax file:
+
+[source,yaml]
+----
+# config.yml
+files:
+  - path/to/schema.rnc
+----
+
+Then build the package as usual:
+
+[source,bash]
+----
+lutaml-xsd pkg build config.yml --output schema.lxr
+----
+
+During package creation, the RNG/RNC file is automatically converted to XSD.
+The generated `.xsd` file is written alongside the original source file (or to a
+temporary directory if the original location is not writable).
+
+=== Ruby API
+
+.Load and query an RNG schema programmatically
+[example]
+====
+[source,ruby]
+----
+require 'lutaml/xsd'
+
+# Load directly from an RNG or RNC file
+repo = Lutaml::Xsd::SchemaRepository.load_from_file('schema.rng')
+
+# Or use the converter directly
+require 'rng'
+grammar = Rng.parse(File.read('schema.rng'))
+xsd_schema = Lutaml::Xsd::RngToXsdConverter.new(grammar).convert
+
+# Serialize to XML
+puts xsd_schema.to_formatted_xml
+----
+====
+
+=== Conversion details
+
+The converter handles:
+
+* **Define resolution** — Named `<define>` blocks are resolved and expanded
+* **Include directives** — RNC `include "path"` and RNG `<include href="..."/>` are
+  converted to XSD `<include>` elements
+* **Collision detection** — Element name collisions from multiple defines are
+  detected and handled
+* **Pattern mapping** — RNG patterns (`<element>`, `<attribute>`, `<choice>`,
+  `<group>`, `<interleave>`, `<optional>`, `<zeroOrMore>`, `<oneOrMore>`,
+  `<data>`, `<value>`, `<list>`, `<text>`) are mapped to their XSD equivalents
+* **Attribute classification** — Patterns that resolve to attributes (including
+  those wrapped in `<optional>`) are correctly classified
+* **Namespace handling** — Target namespace is preserved from the source grammar
+
 [[schema-validation]]
 == XSD schema validation
 
@@ -839,13 +932,17 @@ lutaml-xsd xml validate-batch <directory/> --package <file.lxr>
 
 === BUILD commands (package creation)
 
-Create LXR packages from configurations.
+Create LXR packages from configurations. Supports XSD, RNG, and RNC input
+files.
 
 [source,bash]
 ----
-# Build from YAML config
+# Build from YAML config (XSD files)
 lutaml-xsd pkg build <config.yml>
 
+# Build from RNG/RNC files (automatically converted to XSD)
+lutaml-xsd pkg build <config.yml>  # config.yml can reference .rng/.rnc files
+
 # Interactive initialization
 lutaml-xsd build init <entrypoint.xsd>
 
@@ -1055,18 +1152,23 @@ and their relationships:
 
 === Data transformation flow
 
-The following diagram shows how XSD files are processed through the parsing
-pipeline:
+The following diagram shows how XSD and RNG/RNC files are processed through the
+parsing pipeline:
 
 [source]
 ----
-╔═══════════════════╗           ╔═══════════════════════╗
-║   XSD File(s)     ║           ║  Schema Mappings      ║
-║                   ║           ║  (Local redirects)    ║
-╚═════════┬═════════╝           ╚═══════════┬═══════════╝
-          │                                 │
-          └────────────┬────────────────────┘
-                       │
+╔═══════════════════╗   ╔═══════════════════╗   ╔═══════════════════════╗
+║   XSD File(s)     ║   ║  RNG/RNC File(s)  ║   ║  Schema Mappings      ║
+║                   ║   ║                   ║   ║  (Local redirects)    ║
+╚═════════╦═════════╝   ╚═════════╦═════════╝   ╚═══════════╦═══════════╝
+          ║                       ║                         ║
+          ║             ╔═════════╩════════════╗              ║
+          ║             ║ RngToXsdConverter    ║              ║
+          ║             ║ (RNG/RNC → XSD)     ║              ║
+          ║             ╚═════════╦════════════╝              ║
+          ║                       ║                         ║
+          ╚════════════╦══════════╩═══════════════════════════╝
+                       ║
                        ▼
               ┌────────────────┐
               │  XSD Parser    │
@@ -1453,6 +1555,8 @@ Syntax:
 ----
 files: <1>
   - path/to/schema.xsd
+  - path/to/schema.rng   # RELAX NG XML syntax
+  - path/to/schema.rnc   # RELAX NG Compact syntax
 
 schema_location_mappings: <2>
   - from: "http://schemas.example.com/schema.xsd"
@@ -1465,13 +1569,13 @@ namespace_mappings: <3>
   - prefix: "ex"
     uri: "http://example.com/namespace"
 ----
-<1> List of XSD file paths to include in the package (required)
+<1> List of schema file paths (`.xsd`, `.rng`, or `.rnc`) to include (required)
 <2> Schema location mappings for imports/includes (optional)
 <3> Namespace prefix mappings (optional)
 
 Where,
 
-`files`:: Array of XSD file paths to include in the package (required)
+`files`:: Array of schema file paths (`.xsd`, `.rng`, or `.rnc`) to include in the package (required). RNG/RNC files are automatically converted to XSD.
 `schema_location_mappings`:: Array of schema location redirections (optional)
 `namespace_mappings`:: Array of namespace prefix-to-URI mappings (optional)
 
@@ -1545,9 +1649,13 @@ NOTE: The `pkg build` command requires a YAML configuration file as input. Direc
 [example]
 [source,yaml]
 ----
-# minimal_config.yaml
+# minimal_config.yaml (XSD)
 files:
   - path/to/schema.xsd
+
+# minimal_config.yaml (RNG/RNC — automatically converted to XSD)
+files:
+  - path/to/schema.rng
 ----
 
 Then build the package:

data/docs/ARCHITECTURE.adoc

@@ -457,6 +457,33 @@ The [`Lutaml::Xsd::Glob`](lib/lutaml/xsd/glob.rb) class manages schema location
 
 This design allows offline development, schema version control, and consistent schema handling across environments.
 
+=== RNG to XSD Converter
+
+The [`Lutaml::Xsd::RngToXsdConverter`](lib/lutaml/xsd/rng_to_xsd_converter.rb) converts RELAX NG (`.rng` / `.rnc`) schemas to XSD.
+
+**Responsibilities:**
+
+* Convert `Rng::Grammar` objects to `Lutaml::Xsd::Schema` objects
+* Resolve named `<define>` blocks with cycle detection
+* Classify patterns as elements, attributes, or particles
+* Detect and handle element name collisions across defines
+* Convert include directives from RNC/RNG to XSD `<include>` elements
+* Map RNG patterns (`<element>`, `<attribute>`, `<choice>`, `<group>`, `<interleave>`, `<optional>`, `<zeroOrMore>`, `<oneOrMore>`, `<data>`, `<value>`, `<list>`, `<text>`) to XSD equivalents
+
+**Integration points:**
+
+* `SchemaRepository#parse_schema_file` — automatically invokes the converter for `.rng`/`.rnc` files
+* `SchemaRepository.from_file` — accepts `.rng` and `.rnc` paths
+
+**Conversion pipeline:**
+
+. Parse RNG/RNC file into `Rng::Grammar` object (via the `rng` gem)
+. `RngToXsdConverter#convert` maps the grammar to XSD constructs
+. Phase 0: Convert include directives
+. Phase 1: Convert all named defines (with caching and cycle guards)
+. Phase 2: Convert start elements and top-level elements
+. Result is a standard `Lutaml::Xsd::Schema` object usable by all downstream components
+
 === Schema Repository
 
 The [`Lutaml::Xsd::SchemaRepository`](lib/lutaml/xsd/schema_repository.rb) provides namespace-aware type resolution across multiple schemas.

data/docs/CHANGELOG.md

@@ -11,6 +11,37 @@ All notable changes to lutaml-xsd will be documented in this file.
 
 ## [Unreleased]
 
+## [1.1.3] - 2025-05-15
+
+### Added
+
+- RELAX NG (RNG/RNC) to XSD conversion via `Lutaml::Xsd::RngToXsdConverter`
+- Build LXR packages directly from `.rng` and `.rnc` files
+- `SchemaRepository.load_from_file` accepts `.rng` and `.rnc` schema files
+- Inline/anonymous complex type display in SPA documentation — complex types defined within elements are now surfaced with synthetic names
+- Group tree view in SPA — new `GroupTreeItem` component for interactive, nested rendering of groups with choices and sequences
+- Sequence and choice serialization in SPA — `xs:sequence` and `xs:choice` model groups are fully serialized with nesting support
+- Schema include display in SPA documentation
+
+### Fixed
+
+- SPA generation error when serializing SimpleContent types
+- Schema validation error handling
+
+## [1.1.2] - 2025-05-12
+
+- Refactor: eliminate `send()` calls in lutaml-xsd (22 → 0)
+- Refactor: eliminate `respond_to?` duck-typing in lutaml-xsd (371 → 1)
+- Fix: merge included schemas by namespace, refactor SchemaSerializer for DRY/security
+
+## [1.1.1] - 2025-05-09
+
+- Fix: merge included schemas by namespace, refactor SchemaSerializer for DRY/security
+
+## [1.1.0] - 2025-05-08
+
+- Fix: SVG diagram generation for XSD type definitions
+
 ## [0.1.0] - 2024-11-18
 
 - Initial release

data/docs/CLI.adoc

@@ -47,7 +47,9 @@ Package commands create, validate, and inspect LXR schema repository packages.
 
 === pkg build
 
-Build an LXR package from a YAML configuration file.
+Build an LXR package from a YAML configuration file. The `files` list in the
+configuration may reference `.xsd`, `.rng`, or `.rnc` files. RNG/RNC files are
+automatically converted to XSD during the build process.
 
 Syntax:
 
@@ -58,7 +60,9 @@ lutaml-xsd pkg build CONFIG_FILE [options]
 
 Where,
 
-`CONFIG_FILE`:: Path to YAML configuration file (required)
+`CONFIG_FILE`:: Path to YAML configuration file (required). The `files` list
+supports `.xsd`, `.rng` (RELAX NG XML syntax), and `.rnc` (RELAX NG Compact
+syntax) files.
 
 Options:
 
@@ -1483,6 +1487,31 @@ lutaml-xsd stats show pkg/urban.lxr
 ----
 ====
 
+=== Building from RELAX NG schemas
+
+.Building a package from RNG/RNC files
+[example]
+====
+[source,bash]
+----
+# 1. Create configuration file referencing .rng or .rnc files
+cat > rng_schemas.yml << 'EOF'
+files:
+  - schemas/isostandard.rnc
+  - schemas/biblio.rnc
+EOF
+
+# 2. Build package (RNG/RNC files are automatically converted to XSD)
+lutaml-xsd pkg build rng_schemas.yml \
+  --name "ISO Standard Schemas" \
+  --version "1.0" \
+  --output pkg/iso_schemas.lxr
+
+# 3. Query types as normal
+lutaml-xsd type list --from pkg/iso_schemas.lxr
+----
+====
+
 === Validating package integrity
 
 .Package validation workflow

data/docs/INDEX.adoc

@@ -15,10 +15,13 @@ basic usage to advanced technical topics.
 
 == What's new in lutaml-xsd
 
-Latest version: 1.0.4
+Latest version: 1.1.3
 
 Recent highlights:
 
+* 🎉 **RELAX NG Support** - Build packages from `.rng` and `.rnc` files with automatic XSD conversion
+* 🌳 **Interactive Group Tree** - Expandable tree view for groups with nested choices and sequences
+* 📝 **Inline Complex Types** - Anonymous complex types within elements displayed with synthetic names
 * 🎉 **LXR Packages** - Self-contained, portable schema repositories
 * ⚡ **Fast Type Index** - Pre-built indexes for instant lookups
 * 🔧 **Three Configuration Axes** - XSD mode, resolution mode, serialization

data/docs/LXR_PACKAGES.adoc

@@ -337,13 +337,13 @@ namespace_mappings: <3>
   - prefix: "ex"
     uri: "http://example.com/namespace"
 ----
-<1> List of XSD files to include (required)
+<1> List of schema files (`.xsd`, `.rng`, or `.rnc`) to include (required)
 <2> Schema location mappings for imports/includes (optional)
 <3> Namespace prefix mappings (optional)
 
 Where,
 
-`files`:: Array of XSD file paths to include in the package (required)
+`files`:: Array of schema file paths (`.xsd`, `.rng`, or `.rnc`) to include in the package (required). RNG/RNC files are automatically converted to XSD.
 `schema_location_mappings`:: Array of schema location redirections (optional)
 `namespace_mappings`:: Array of namespace prefix-to-URI mappings (optional)
 

data/docs/PACKAGE_CONFIGURATION.adoc

@@ -22,13 +22,15 @@ LXR packages are highly configurable through three independent axes, allowing yo
 
 ==== `files` (required for standalone packages)
 
-Array of XSD file paths to include in the package. Required when building a standalone package (not using `base_packages`).
+Array of schema file paths to include in the package. Supports `.xsd` (XML Schema), `.rng` (RELAX NG XML syntax), and `.rnc` (RELAX NG Compact syntax) files. RNG/RNC files are automatically converted to XSD during the build process. Required when building a standalone package (not using `base_packages`).
 
 [source,yaml]
 ----
 files:
   - path/to/schema.xsd
   - path/to/another.xsd
+  - path/to/schema.rng   # RELAX NG XML syntax
+  - path/to/schema.rnc   # RELAX NG Compact syntax
 ----
 
 ==== `output_package` (optional)

data/docs/QUICK_START.adoc

@@ -29,6 +29,8 @@ See link:INSTALLATION[Installation guide] for detailed instructions.
 
 Create a simple XSD file:
 
+Create a simple XSD file:
+
 .Creating example.xsd
 [example]
 ====
@@ -251,6 +253,56 @@ Package statistics:
 ----
 ====
 
+== Working with RELAX NG schemas
+
+Lutaml::Xsd supports building packages directly from RELAX NG schemas (`.rng`
+XML syntax and `.rnc` compact syntax). The schemas are automatically converted
+to XSD during the build process.
+
+=== Creating a package from an RNC file
+
+.Building from RELAX NG Compact syntax
+[example]
+====
+[source,bash]
+----
+# 1. Create minimal configuration
+cat > rng_config.yml << 'EOF'
+files:
+  - path/to/schema.rnc
+EOF
+
+# 2. Build package
+lutaml-xsd pkg build rng_config.yml \
+  --name "My RNG Schemas" \
+  --output my_rng_schemas.lxr
+
+# 3. Query types as normal
+lutaml-xsd type list --from my_rng_schemas.lxr
+----
+====
+
+=== Using the Ruby API with RNG files
+
+.Loading RNG files programmatically
+[example]
+====
+[source,ruby]
+----
+require 'lutaml/xsd'
+
+# Load directly from an RNG file
+repo = Lutaml::Xsd::SchemaRepository.load_from_file('schema.rng')
+
+# Or from an RNC file
+repo = Lutaml::Xsd::SchemaRepository.load_from_file('schema.rnc')
+
+# Query types exactly as with XSD packages
+result = repo.find_type('TypeName')
+puts result.qname if result.resolved?
+----
+====
+
 == Working with schema location mappings
 
 When schemas import other schemas, you need schema location mappings:

data/docs/RUBY_API.adoc

@@ -1333,6 +1333,93 @@ puts "Loaded #{stats[:total_types]} types"
 ----
 ====
 
+==== from_file()
+
+Load repository from a single schema file. Supports XSD (`.xsd`), RELAX NG
+XML syntax (`.rng`), and RELAX NG Compact syntax (`.rnc`) files. RNG/RNC files
+are automatically converted to XSD.
+
+Syntax:
+
+[source,ruby]
+----
+repo = Lutaml::Xsd::SchemaRepository.from_file(path) <1>
+----
+<1> Load repository from a schema file
+
+Where,
+
+`path`:: Path to a schema file (`.xsd`, `.rng`, or `.rnc`) (String) (required)
+
+Returns a new [`SchemaRepository`](lib/lutaml/xsd/schema_repository.rb:10) instance.
+
+.Loading from different schema formats
+[example]
+====
+[source,ruby]
+----
+# Load from XSD
+repo = Lutaml::Xsd::SchemaRepository.from_file('schema.xsd')
+
+# Load from RELAX NG XML syntax
+repo = Lutaml::Xsd::SchemaRepository.from_file('schema.rng')
+
+# Load from RELAX NG Compact syntax
+repo = Lutaml::Xsd::SchemaRepository.from_file('schema.rnc')
+
+# All formats produce the same type of repository object
+repo.parse.resolve
+result = repo.find_type('TypeName')
+----
+====
+
+==== RngToXsdConverter
+
+Convert a RELAX NG grammar to an XSD Schema object directly.
+
+Syntax:
+
+[source,ruby]
+----
+require 'rng'
+grammar = Rng.parse(rng_content)
+schema = Lutaml::Xsd::RngToXsdConverter.new(grammar, file_path: 'schema.rng').convert
+----
+
+Where,
+
+`grammar`:: A parsed `Rng::Grammar` object (required)
+`file_path`:: Original file path for include directive extraction (optional)
+
+Returns an [`Lutaml::Xsd::Schema`](lib/lutaml/xsd/schema.rb) object.
+
+.Converting RELAX NG to XSD
+[example]
+====
+[source,ruby]
+----
+require 'lutaml/xsd'
+require 'rng'
+
+# Parse an RNG file
+rng_content = File.read('schema.rng')
+grammar = Rng.parse(rng_content,
+  location: File.dirname('schema.rng'),
+  resolve_external: true)
+
+# Convert to XSD
+converter = Lutaml::Xsd::RngToXsdConverter.new(grammar, file_path: 'schema.rng')
+xsd_schema = converter.convert
+
+# Serialize the result
+puts xsd_schema.to_formatted_xml
+
+# Or parse an RNC file directly
+grammar = Rng.parse_file('schema.rnc')
+xsd_schema = Lutaml::Xsd::RngToXsdConverter.new(grammar, file_path: 'schema.rnc').convert
+----
+====
+
 ==== from_yaml_file()
 
 Load repository configuration from a YAML file.

data/docs/SPA_GUIDE.adoc

@@ -15,6 +15,8 @@ The SPA (Single Page Application) Documentation Generator creates modern, intera
 * **Dark mode support** - Automatic system preference detection with manual toggle
 * **Advanced search** - Real-time fuzzy matching across all schema components
 * **Type filtering** - Filter by element, complex type, simple type, attribute group, group
+* **Inline complex types** - Anonymous complex types within elements are displayed with synthetic names
+* **Interactive group tree view** - Expandable tree for groups with nested choices and sequences
 * **Zero dependencies** - Self-contained HTML, CSS, and JavaScript
 * **Offline-capable** - Works without internet connection (inlined mode)
 * **Accessibility** - WCAG 2.1 AA compliant
@@ -185,6 +187,27 @@ Click on any schema component to view:
 * **Structure** - Elements, attributes, restrictions
 * **Relationships** - Used by, extends, references
 
+=== Inline complex types
+
+Elements that define an anonymous `<xs:complexType>` inline (without a `name`
+attribute) are automatically surfaced in the documentation with a synthetic
+name derived from the element name (e.g., `Person_type` for an element named
+`Person`). These inline types appear alongside named complex types in the type
+listing and include all their elements, attributes, sequences, and choices.
+
+=== Group tree view
+
+Schema groups (`xs:group`) are rendered as expandable tree items that show
+nested structure:
+
+* **Groups** — Display name or reference, cardinality, and expandable content
+* **Choices** — Shown with `⟨choice⟩` labels and nested options
+* **Sequences** — Shown with their contained elements and sub-groups
+* **Recursive nesting** — Groups can contain choices containing sequences
+  containing groups, all navigable in the tree
+
+The tree supports arbitrary nesting depth and lazy expansion for large schemas.
+
 == Configuration
 
 === Overview

data/lib/lutaml/xsd/rng_to_xsd_converter.rb

@@ -219,6 +219,14 @@ module Lutaml
               if xsd_elem
                 @schema&.element(xsd_elem)
 
+                if xsd_elem&.complex_type&.mixed
+                  ct = xsd_elem.complex_type
+                  ct.name = "#{elem_name}_type"
+                  @schema&.complex_type(ct)
+                  xsd_elem.type = "#{elem_name}_type"
+                  xsd_elem.complex_type = nil
+                end
+
                 if name == elem_name
                   # Define result IS the element itself
                   result[:element] = xsd_elem
@@ -313,11 +321,23 @@ module Lutaml
       end
 
       # Check if a Ref resolves to an attribute group define
+      # Check if a ref name follows attribute group naming conventions.
+      # Used as a fallback when the define is not in @define_map (e.g., from
+      # unresolved include files where the Rng gem's IncludeProcessor fails).
+      def attribute_group_name?(name)
+        name.end_with?("Attributes", "Id")
+      end
+
       def ref_resolves_to_attribute_group?(ref)
         return false unless ref.is_a?(Rng::Ref) && ref.name
 
         define = @define_map[ref.name]
-        return false unless define
+        unless define
+          # Ref not in define map — likely from an unresolved include.
+          # Fall back to name convention: attribute groups in RELAX NG
+          # schemas consistently end with "Attributes" or "Id".
+          return attribute_group_name?(ref.name)
+        end
 
         patterns = get_all_patterns(define)
         # Unwrap single Group
@@ -618,8 +638,16 @@ module Lutaml
         attr_group_refs = []
 
         attributes.each do |a|
-          if a.is_a?(Rng::Ref)
+          case a
+          when Rng::Ref
             attr_group_refs << Lutaml::Xml::Schema::Xsd::AttributeGroup.new(ref: a.name)
+          when Rng::Optional, Rng::ZeroOrMore, Rng::OneOrMore
+            # Unwrap occurrence wrappers to reach the inner attribute pattern
+            inner = get_all_patterns(a).find { |p| p.is_a?(Rng::Attribute) }
+            if inner
+              converted = convert_attribute_pattern(inner)
+              xsd_attrs << converted if converted
+            end
           else
             converted = convert_attribute_pattern(a)
             xsd_attrs << converted if converted
@@ -679,6 +707,13 @@ module Lutaml
         attributes.each do |a|
           if a.is_a?(Rng::Ref)
             xsd_attr_group_refs << Lutaml::Xml::Schema::Xsd::AttributeGroup.new(ref: a.name)
+          elsif a.is_a?(Rng::Optional) || a.is_a?(Rng::ZeroOrMore) || a.is_a?(Rng::OneOrMore)
+            # Unwrap occurrence wrappers to reach the inner attribute pattern
+            inner = get_all_patterns(a).find { |p| p.is_a?(Rng::Attribute) }
+            if inner
+              converted = convert_attribute_pattern(inner)
+              xsd_attrs << converted if converted
+            end
           else
             converted = convert_attribute_pattern(a)
             xsd_attrs << converted if converted
@@ -970,6 +1005,14 @@ module Lutaml
           end
         end
 
+        if !has_mixed &&
+            data_child.nil? &&
+            attribute_children.any? &&
+            particle_children.any?
+
+          has_mixed = true
+        end
+
         xsd_elem = Lutaml::Xml::Schema::Xsd::Element.new(name: name)
 
         # Add documentation if present

data/lib/lutaml/xsd/schema_repository_package.rb

@@ -96,7 +96,7 @@ module Lutaml
                   entry.get_input_stream.read,
                   permitted_classes: [Time, Date, Symbol],
                 )
-              when %r{^schemas/.+\.xsd$}, %r{^schemas/.+\.xml$}, %r{^schemas/.+\.xs$}
+              when %r{^schemas/.+\.xsd$}, %r{^schemas/.+\.rng$}, %r{^schemas/.+\.rnc$}
                 schema_entries << entry.name
               end
             end

data/lib/lutaml/xsd/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Xsd
-    VERSION = "1.1.3"
+    VERSION = "1.1.4"
   end
 end

data/lutaml-xsd.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "lutaml-model", "~> 0.8.0"
   spec.add_dependency "moxml"
   spec.add_dependency "paint", "~> 2.3"
-  spec.add_dependency "rng", "~> 0.3"
+  spec.add_dependency "rng", "~> 0.3.5"
   spec.add_dependency "rubyzip", "~> 2.3"
   spec.add_dependency "table_tennis", "~> 0.0.7"
   spec.add_dependency "thor", "~> 1.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-xsd
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-05-14 00:00:00.000000000 Z
+date: 2026-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement