expressir 2.1.22 → 2.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fab262d4a8c290f1dc292ff8ea22e9f631356945fb76bed736594dad060078b0
-  data.tar.gz: 45e33a9920262038833f1f00113b12527eb9dc64a71d29d8e0b5f36bd89842ff
+  metadata.gz: b862b81010dd9fcdfe17e323db319206a7cae0ee23bbc2f5fa67f2425902c45f
+  data.tar.gz: 1e18551038a0e7a0577e7017ca6404c6e0a6424473b969f2ed8d18469ee516fb
 SHA512:
-  metadata.gz: 3bbc6a59dc02947a9c2ed5971900094ce183a4bbe0bdc4e3e762906d8d0675bc5c3ed145c37f17a406c406db783d4dcac1055938cdef2f54382bf1647bd57a61
-  data.tar.gz: ae2c40bc87334138a4ce2cbfdc04bf699da520f62483bf9a8760117ba00b7d45dde639e0c292b5cdb8a285c1d01bd59aef4f5bf70f976ded713c1d7fb4ec5a61
+  metadata.gz: eb30354610152c62957729f35389ce727a58e1867701bd22728333459ff291851befa809ba3c7165d6da658a85a31f88603d7a48492c1a6bd5845b2a6df10c68
+  data.tar.gz: eb5a9690942e44db8fd304c77efa967e57919b2b5b25149b65abb3c870b6adb5667b94fa8e87ec3d78aab59a5dbf1006350054e5728fbe17e8372a196444bc26

data/.rubocop.yml

@@ -1,14 +1,14 @@
-require:
-  - rubocop-performance
-
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
   - .rubocop_todo.yml
 
-Naming/VariableName:
-  Exclude:
-  - lib/expressir/express/visitor.rb
-Layout/LineLength:
-  Max: 160
+plugins:
+- rubocop-performance
+- rubocop-rake
+- rubocop-rspec
+
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
+  NewCops: enable
+  Exclude:
+    - 'vendor/**/*'

data/.rubocop_todo.yml

@@ -1,43 +1,17 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2025-06-07 07:39:56 UTC using RuboCop version 1.75.2.
+# on 2025-07-04 10:39:56 UTC using RuboCop version 1.77.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-# Configuration parameters: Severity, Include.
-# Include: **/*.gemspec
-Gemspec/RequiredRubyVersion:
-  Exclude:
-    - 'expressir.gemspec'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: special_inside_parentheses, consistent, align_braces
-Layout/FirstHashElementIndentation:
-  Exclude:
-    - 'spec/expressir/commands/coverage_ignore_files_spec.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
-# SupportedHashRocketStyles: key, separator, table
-# SupportedColonStyles: key, separator, table
-# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
-Layout/HashAlignment:
-  Exclude:
-    - 'spec/expressir/commands/coverage_ignore_files_spec.rb'
-
-# Offense count: 2
+# Offense count: 550
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
+# Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
-  Exclude:
-    - 'lib/expressir/express/parser.rb'
+  Enabled: false
 
 # Offense count: 1
 # Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches, IgnoreDuplicateElseBranch.
@@ -45,11 +19,6 @@ Lint/DuplicateBranch:
   Exclude:
     - 'lib/expressir/coverage.rb'
 
-# Offense count: 3
-Lint/ShadowingOuterLocalVariable:
-  Exclude:
-    - 'lib/expressir/express/visitor.rb'
-
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AutoCorrect, AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods, NotImplementedExceptions.
@@ -78,13 +47,13 @@ Metrics/AbcSize:
     - 'lib/expressir/model/declarations/schema.rb'
     - 'lib/expressir/model/model_element.rb'
 
-# Offense count: 2
-# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
+# Offense count: 1
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
 # AllowedMethods: refine
 Metrics/BlockLength:
-  Max: 143
+  Max: 46
 
-# Offense count: 57
+# Offense count: 56
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/CyclomaticComplexity:
   Exclude:
@@ -99,12 +68,12 @@ Metrics/CyclomaticComplexity:
     - 'lib/expressir/model/model_element.rb'
     - 'spec/support/model_element_helper.rb'
 
-# Offense count: 103
+# Offense count: 105
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 82
+  Max: 106
 
-# Offense count: 45
+# Offense count: 44
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/PerceivedComplexity:
   Exclude:
@@ -116,39 +85,68 @@ Metrics/PerceivedComplexity:
     - 'lib/expressir/model/declarations/schema.rb'
     - 'lib/expressir/model/model_element.rb'
 
-# Offense count: 1
-# Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros, UseSorbetSigs.
-# NamePrefix: is_, has_, have_, does_
-# ForbiddenPrefixes: is_, has_, have_, does_
-# AllowedMethods: is_a?
-# MethodDefinitionMacros: define_method, define_singleton_method
-Naming/PredicateName:
+# Offense count: 135
+# Configuration parameters: EnforcedStyle, AllowedIdentifiers, AllowedPatterns, ForbiddenIdentifiers, ForbiddenPatterns.
+# SupportedStyles: snake_case, camelCase
+Naming/VariableName:
   Exclude:
-    - 'spec/**/*'
-    - 'lib/expressir/coverage.rb'
+    - 'lib/expressir/express/visitor.rb'
 
 # Offense count: 5
 Performance/FixedSize:
   Exclude:
     - 'lib/expressir/express/formatter.rb'
 
-# Offense count: 1
-Style/MissingRespondToMissing:
+# Offense count: 6
+Performance/MapMethodChain:
   Exclude:
-    - 'lib/expressir/express/visitor.rb'
+    - 'lib/expressir/commands/coverage.rb'
+    - 'spec/expressir/commands/coverage_ignore_files_spec.rb'
+    - 'spec/expressir/coverage_spec.rb'
+
+# Offense count: 102
+# Configuration parameters: CountAsOne.
+RSpec/ExampleLength:
+  Max: 123
+
+# Offense count: 14
+# Configuration parameters: Max, AllowedIdentifiers, AllowedPatterns.
+RSpec/IndexedLet:
+  Exclude:
+    - 'spec/expressir/model/data_types/array_spec.rb'
+    - 'spec/expressir/model/data_types/bag_spec.rb'
+    - 'spec/expressir/model/data_types/binary_spec.rb'
+    - 'spec/expressir/model/data_types/real_spec.rb'
+    - 'spec/expressir/model/data_types/set_spec.rb'
+    - 'spec/expressir/model/data_types/string_spec.rb'
 
 # Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, diff_comma, no_comma
-Style/TrailingCommaInArrayLiteral:
+RSpec/IteratedExpectation:
   Exclude:
-    - 'spec/expressir/commands/coverage_ignore_files_spec.rb'
+    - 'spec/expressir/schema_manifest_spec.rb'
+
+# Offense count: 235
+RSpec/MultipleExpectations:
+  Max: 114
+
+# Offense count: 21
+# Configuration parameters: AllowSubject.
+RSpec/MultipleMemoizedHelpers:
+  Max: 13
+
+# Offense count: 5
+RSpec/PendingWithoutReason:
+  Exclude:
+    - 'spec/expressir/model/declarations/remark_item_spec.rb'
+    - 'spec/expressir/model/declarations/rule_spec.rb'
+    - 'spec/expressir/model/declarations/schema_spec.rb'
+
+# Offense count: 2
+RSpec/RepeatedExample:
+  Exclude:
+    - 'spec/expressir/model/data_types/logical_spec.rb'
 
 # Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, diff_comma, no_comma
-Style/TrailingCommaInHashLiteral:
+Style/MissingRespondToMissing:
   Exclude:
-    - 'spec/expressir/commands/coverage_ignore_files_spec.rb'
+    - 'lib/expressir/express/visitor.rb'

data/Gemfile

@@ -10,6 +10,6 @@ gem "rake"
 gem "rspec"
 gem "rubocop"
 gem "rubocop-performance"
-gem "rubocop-rake", require: false
-gem "rubocop-rspec", require: false
+gem "rubocop-rake"
+gem "rubocop-rspec"
 gem "yard"

data/README.adoc

@@ -178,17 +178,17 @@ expressir benchmark schemas/resources/action_schema/action_schema.exp --ips
 expressir benchmark schemas/resources/action_schema/action_schema.exp --format json
 ----
 
-==== Benchmark multiple files from YAML
+==== Benchmark multiple files from schema manifest
 
-Create a YAML file with a list of schema paths:
+Create a schema manifest YAML file with a list of schema paths:
 
 .schemas.yml
 [source, yaml]
 ----
 schemas:
-  - schemas/resources/action_schema/action_schema.exp
-  - schemas/resources/approval_schema/approval_schema.exp
-  - schemas/resources/date_time_schema/date_time_schema.exp
+  - path: schemas/resources/action_schema/action_schema.exp
+  - path: schemas/resources/approval_schema/approval_schema.exp
+  - path: schemas/resources/date_time_schema/date_time_schema.exp
 ----
 
 Then benchmark all schemas at once:
@@ -865,6 +865,203 @@ all_entities = Expressir::Coverage.find_entities(schema)
 puts "Found #{all_entities.size} entities in schema #{schema.id}"
 ----
 
+=== EXPRESS schema manifest
+
+==== General
+
+The EXPRESS schema manifest is a file format defined by ELF at
+https://www.expresslang.org/docs[EXPRESS schema manifest specification].
+
+Expressir provides a `SchemaManifest` class for managing collections of EXPRESS
+schema files. This is particularly useful when working with multiple related
+schemas or when you need to organize schema files in a structured way.
+
+The `SchemaManifest` class allows you to:
+
+* Load schema file lists from YAML manifest files
+* Manage schema metadata and paths
+* Programmatically create and manipulate schema collections
+* Save manifest configurations to files
+
+
+[example]
+.Example project structure with schema manifest:
+====
+[source]
+----
+project/
+├── schemas.yml   # Schema manifest
+└── schemas/
+    ├── core/
+    │   ├── action_schema.exp
+    │   └── approval_schema.exp
+    └── extensions/
+        └── date_time_schema.exp
+----
+
+.schemas.yml
+[source,yaml]
+----
+schemas:
+  - path: schemas/core/action_schema.exp
+    id: action_schema
+  - path: schemas/core/approval_schema.exp
+    id: approval_schema
+  - path: schemas/extensions/date_time_schema.exp
+    id: date_time_schema
+----
+====
+
+==== Creating a schema manifest
+
+===== From a YAML file
+
+Load an existing schema manifest from a YAML file:
+
+[source,ruby]
+----
+# Load manifest from file
+manifest = Expressir::SchemaManifest.from_file("schemas.yml")
+
+# Access schema entries
+manifest.schemas.each do |schema_entry|
+  puts "Schema path: #{schema_entry.path}"
+  puts "Schema ID: #{schema_entry.id}" if schema_entry.id
+end
+
+# Get all schema file paths
+schema_paths = manifest.schemas.map(&:path)
+----
+
+===== Programmatically
+
+Create a new schema manifest programmatically:
+
+[source,ruby]
+----
+# Create an empty manifest
+manifest = Expressir::SchemaManifest.new
+
+# Add schema entries
+manifest.schemas << Expressir::SchemaManifestEntry.new(
+  path: "schemas/action_schema.exp",
+  id: "action_schema"
+)
+
+manifest.schemas << Expressir::SchemaManifestEntry.new(
+  path: "schemas/approval_schema.exp"
+)
+
+# Set base path for the manifest
+manifest.base_path = "/path/to/schemas"
+----
+
+==== Schema manifest YAML format
+
+The schema manifest uses a structured YAML format:
+
+[source,yaml]
+----
+schemas:
+  - path: schemas/resources/action_schema/action_schema.exp
+    id: action_schema
+  - path: schemas/resources/approval_schema/approval_schema.exp
+    id: approval_schema
+  - path: schemas/resources/date_time_schema/date_time_schema.exp
+----
+
+===== Schema entry attributes
+
+Each schema entry in the manifest can have the following attributes:
+
+`path`:: (Required) The file path to the EXPRESS schema file
+`id`:: (Optional) A unique identifier for the schema
+`container_path`:: (Optional) Container path information
+
+
+==== Working with schema manifests
+
+===== Saving manifests
+
+Save a manifest to a file:
+
+[source,ruby]
+----
+# Save to a specific file
+manifest.to_file("output_schemas.yml")
+
+# Save to a path with automatic filename
+manifest.save_to_path("/path/to/output/")
+----
+
+===== Concatenating manifests
+
+Combine multiple manifests:
+
+[source,ruby]
+----
+manifest1 = Expressir::SchemaManifest.from_file("schemas1.yml")
+manifest2 = Expressir::SchemaManifest.from_file("schemas2.yml")
+
+# Concatenate manifests
+combined_manifest = manifest1.concat(manifest2)
+
+# Or use the + operator
+combined_manifest = manifest1 + manifest2
+----
+
+===== Using manifests with parsers
+
+Parse all schemas from a manifest:
+
+[source,ruby]
+----
+# Load manifest
+manifest = Expressir::SchemaManifest.from_file("schemas.yml")
+
+# Get schema file paths
+schema_paths = manifest.schemas.map(&:path)
+
+# Parse all schemas
+repository = Expressir::Express::Parser.from_files(schema_paths)
+
+# With progress tracking
+repository = Expressir::Express::Parser.from_files(schema_paths) do |filename, schemas, error|
+  if error
+    puts "Error loading #{filename}: #{error.message}"
+  else
+    puts "Successfully loaded #{schemas.length} schemas from #{filename}"
+  end
+end
+----
+
+==== Integration with CLI commands
+
+Schema manifests are supported by several CLI commands:
+
+===== Benchmarking with manifests
+
+[source,sh]
+----
+# Benchmark all schemas in a manifest
+expressir benchmark schemas.yml --verbose
+
+# Benchmark with caching
+expressir benchmark-cache schemas.yml --cache_path /tmp/cache.bin
+----
+
+===== Coverage analysis with manifests
+
+[source,sh]
+----
+# Analyze coverage for all schemas in manifest
+expressir coverage schemas.yml
+
+# With output format and exclusions
+expressir coverage schemas.yml --format json --exclude=TYPE:SELECT
+----
+
+
 
 == Contributing
 

data/bin/rspec

@@ -15,7 +15,8 @@ ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
 bundle_binstub = File.expand_path("bundle", __dir__)
 
 if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
+  if File.read(bundle_binstub,
+               300).include?("This file was generated by Bundler")
     load(bundle_binstub)
   else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.

data/docs/liquid_drops.adoc

@@ -249,7 +249,7 @@ Attributes:
 `attributes`:: Array of AttributeDrop objects
 `unique_rules`:: Array of UniqueRuleDrop objects
 `where_rules`:: Array of WhereRuleDrop objects
-`informal_propositions`:: Array of RemarkItemDrop objects
+`informal_propositions`:: Array of InformalPropositionRule objects
 
 ==== FunctionDrop
 

data/expressir.gemspec

@@ -31,8 +31,6 @@ Gem::Specification.new do |spec|
     end
   end
 
-  spec.test_files = `git ls-files -- {spec}/*`.split("\n")
-
   spec.add_dependency "base64"
   spec.add_dependency "benchmark-ips"
   spec.add_dependency "csv"

data/lib/expressir/benchmark.rb

@@ -146,7 +146,8 @@ module Expressir
 
         # Measure cache reading time
         cache_read_time = ::Benchmark.measure do
-          results[:cached_repository] = Expressir::Express::Cache.from_file(cache_path)
+          results[:cached_repository] =
+            Expressir::Express::Cache.from_file(cache_path)
         end
         results[:cache_read_time] = cache_read_time.real
 
@@ -287,8 +288,10 @@ module Expressir
           }
           puts JSON.generate(result)
         when "csv"
-          headers = ["Files", "Schemas", "Objects", "Total Time (s)", "Avg Time (s)", "Objects/s"]
-          values = [count, schema_count, total_objects, total_time.round(4), avg_time.round(4), objects_per_second]
+          headers = ["Files", "Schemas", "Objects", "Total Time (s)",
+                     "Avg Time (s)", "Objects/s"]
+          values = [count, schema_count, total_objects, total_time.round(4),
+                    avg_time.round(4), objects_per_second]
 
           puts headers.join(",")
           puts values.join(",")

data/lib/expressir/cli.rb

@@ -24,26 +24,33 @@ module Expressir
     end
 
     desc "clean PATH", "Strip remarks and prettify EXPRESS schema at PATH"
-    method_option :output, type: :string, desc: "Output file path (defaults to stdout)"
+    method_option :output, type: :string,
+                           desc: "Output file path (defaults to stdout)"
     def clean(path)
       Commands::Clean.new(options).run(path)
     end
 
-    desc "benchmark FILE_OR_YAML", "Benchmark schema loading performance for a file or list of files from YAML"
-    method_option :ips, type: :boolean, desc: "Use benchmark-ips for detailed statistics"
+    desc "benchmark FILE_OR_YAML",
+         "Benchmark schema loading performance for a file or list of files from YAML"
+    method_option :ips, type: :boolean,
+                        desc: "Use benchmark-ips for detailed statistics"
     method_option :verbose, type: :boolean, desc: "Show verbose output"
     method_option :save, type: :boolean, desc: "Save benchmark results to file"
-    method_option :format, type: :string, desc: "Output format (json, csv, default)"
+    method_option :format, type: :string,
+                           desc: "Output format (json, csv, default)"
     def benchmark(path)
       Commands::Benchmark.new(options).run(path)
     end
 
     desc "benchmark-cache FILE_OR_YAML", "Benchmark schema loading with caching"
-    method_option :ips, type: :boolean, desc: "Use benchmark-ips for detailed statistics"
+    method_option :ips, type: :boolean,
+                        desc: "Use benchmark-ips for detailed statistics"
     method_option :verbose, type: :boolean, desc: "Show verbose output"
     method_option :save, type: :boolean, desc: "Save benchmark results to file"
-    method_option :format, type: :string, desc: "Output format (json, csv, default)"
-    method_option :cache_path, type: :string, desc: "Path to store the cache file"
+    method_option :format, type: :string,
+                           desc: "Output format (json, csv, default)"
+    method_option :cache_path, type: :string,
+                               desc: "Path to store the cache file"
     def benchmark_cache(path)
       Commands::BenchmarkCache.new(options).run(path)
     end
@@ -53,11 +60,16 @@ module Expressir
       Commands::Validate.new(options).run(paths)
     end
 
-    desc "coverage *PATH", "List EXPRESS entities and check documentation coverage"
-    method_option :format, type: :string, desc: "Output format (text, json, yaml)", default: "text"
-    method_option :exclude, type: :string, desc: "Comma-separated list of EXPRESS entity types to skip from coverage (e.g., TYPE,CONSTANT,TYPE:SELECT)"
-    method_option :output, type: :string, desc: "Output file path for JSON/YAML formats (defaults to coverage_report.json/yaml)"
-    method_option :ignore_files, type: :string, desc: "Path to YAML file containing array of files to ignore from overall coverage calculation"
+    desc "coverage *PATH",
+         "List EXPRESS entities and check documentation coverage"
+    method_option :format, type: :string,
+                           desc: "Output format (text, json, yaml)", default: "text"
+    method_option :exclude, type: :string,
+                            desc: "Comma-separated list of EXPRESS entity types to skip from coverage (e.g., TYPE,CONSTANT,TYPE:SELECT)"
+    method_option :output, type: :string,
+                           desc: "Output file path for JSON/YAML formats (defaults to coverage_report.json/yaml)"
+    method_option :ignore_files, type: :string,
+                                 desc: "Path to YAML file containing array of files to ignore from overall coverage calculation"
     def coverage(*paths)
       Commands::Coverage.new(options).run(paths)
     end

data/lib/expressir/commands/benchmark.rb

@@ -5,7 +5,7 @@ module Expressir
         configure_benchmarking
 
         if [".yml", ".yaml"].include?(File.extname(path).downcase)
-          benchmark_from_yaml(path)
+          benchmark_from_manifest(path)
         else
           benchmark_file(path)
         end
@@ -36,24 +36,15 @@ module Expressir
         end
       end
 
-      def benchmark_from_yaml(yaml_path)
-        say "Express Schema Loading Benchmark from YAML"
+      def benchmark_from_manifest(manifest_path)
+        say "Express Schema Loading Benchmark from Manifest"
         say "--------------------------------"
 
-        # Load schema list from YAML
-        schema_list = YAML.load_file(yaml_path)
-        if schema_list.is_a?(Hash) && schema_list["schemas"]
-          # Handle format: { "schemas": ["path1", "path2", ...] }
-          schema_files = schema_list["schemas"]
-        elsif schema_list.is_a?(Array)
-          # Handle format: ["path1", "path2", ...]
-          schema_files = schema_list
-        else
-          say "Invalid YAML format. Expected an array of schema paths or a hash with a 'schemas' key."
-          return
-        end
+        # Load schema manifest
+        manifest = Expressir::SchemaManifest.from_file(manifest_path)
+        schema_files = manifest.schemas.map(&:path)
 
-        say "YAML File: #{yaml_path}"
+        say "Manifest File: #{manifest_path}"
         say "Number of schemas in list: #{schema_files.size}"
         say "--------------------------------"
 

data/lib/expressir/commands/benchmark_cache.rb

@@ -8,7 +8,7 @@ module Expressir
         cache_path = options[:cache_path] || generate_temp_cache_path
 
         if [".yml", ".yaml"].include?(File.extname(path).downcase)
-          benchmark_cache_from_yaml(path, cache_path)
+          benchmark_cache_from_manifest(path, cache_path)
         else
           benchmark_cache_file(path, cache_path)
         end
@@ -32,7 +32,8 @@ module Expressir
         say "--------------------------------"
 
         # Benchmark with caching
-        results = Expressir::Benchmark.measure_with_cache(path, cache_path) do |file|
+        results = Expressir::Benchmark.measure_with_cache(path,
+                                                          cache_path) do |file|
           Expressir::Express::Parser.from_file(file)
         end
 
@@ -44,24 +45,15 @@ module Expressir
         end
       end
 
-      def benchmark_cache_from_yaml(yaml_path, cache_path)
-        say "Express Schema Loading Benchmark with Caching from YAML"
+      def benchmark_cache_from_manifest(manifest_path, cache_path)
+        say "Express Schema Loading Benchmark with Caching from Manifest"
         say "--------------------------------"
 
-        # Load schema list from YAML
-        schema_list = YAML.load_file(yaml_path)
-        if schema_list.is_a?(Hash) && schema_list["schemas"]
-          # Handle format: { "schemas": ["path1", "path2", ...] }
-          schema_files = schema_list["schemas"]
-        elsif schema_list.is_a?(Array)
-          # Handle format: ["path1", "path2", ...]
-          schema_files = schema_list
-        else
-          say "Invalid YAML format. Expected an array of schema paths or a hash with a 'schemas' key."
-          return
-        end
+        # Load schema manifest
+        manifest = Expressir::SchemaManifest.from_file(manifest_path)
+        schema_files = manifest.schemas.map(&:path)
 
-        say "YAML File: #{yaml_path}"
+        say "Manifest File: #{manifest_path}"
         say "Number of schemas in list: #{schema_files.size}"
         say "Cache: #{cache_path}"
         say "--------------------------------"