suma 0.1.23 → 0.1.25

data/lib/suma/express_schema.rb

@@ -6,19 +6,20 @@ require "expressir"
 
 module Suma
   class ExpressSchema
-    attr_accessor :path, :id, :parsed, :output_path
+    attr_accessor :path, :id, :parsed, :output_path, :is_standalone_file
 
-    def initialize(id:, path:, output_path:)
+    def initialize(id:, path:, output_path:, is_standalone_file: false)
       @path = Pathname.new(path).expand_path
       @id = id
       @output_path = output_path
+      @is_standalone_file = is_standalone_file
     end
 
     def type
-      case @path.to_s
-      when %r{.*/resources/.*}
+      path_str = @path.to_s
+      if path_str.include?("/resources/")
         "resources"
-      when %r{.*/modules/.*}
+      elsif path_str.include?("/modules/")
         "modules"
       else
         "unknown_type"
@@ -39,7 +40,23 @@ module Suma
     end
 
     def filename_plain
-      File.join(@output_path, type, id, File.basename(@path))
+      ensure_id_loaded
+      build_output_filename
+    end
+
+    def ensure_id_loaded
+      parsed unless @id
+    end
+
+    def build_output_filename
+      if @is_standalone_file
+        # For standalone files, output directly to output_path
+        File.join(@output_path, "#{@id}.exp")
+      else
+        # For manifest schemas, preserve directory structure
+        # Note: @output_path already contains the category (resources/modules)
+        File.join(@output_path, @id, File.basename(@path))
+      end
     end
 
     def save_exp(with_annotations: false)

data/lib/suma/processor.rb

@@ -15,12 +15,15 @@ module Suma
       def run(metanorma_yaml_path:, schemas_all_path:, compile:,
 output_directory: "_site")
         Utils.log "Current directory: #{Dir.getwd}, writing #{schemas_all_path}..."
+
+        # Generate EXPRESS Schema Manifest by traversing Metanorma Site Manifest
+        # This uses Expressir::SchemaManifest for all manifest operations
         collection_config = export_schema_config(metanorma_yaml_path,
                                                  schemas_all_path)
 
         unless compile
           Utils.log "No compile option set. Skipping schema compilation."
-          nil
+          return nil
         end
 
         Utils.log "Compiling schema collection..."
@@ -33,6 +36,18 @@ output_directory: "_site")
 
       private
 
+      # Generates EXPRESS Schema Manifest from Metanorma Site Manifest structure.
+      #
+      # This method:
+      # 1. Reads the Metanorma site manifest to discover collection files
+      # 2. Traverses collection manifests to find individual schemas.yaml files
+      # 3. Uses Expressir::SchemaManifest to aggregate and manage schema entries
+      # 4. Saves the unified schema manifest using Expressir's to_file method
+      #
+      # @param metanorma_yaml_path [String] Path to Metanorma site manifest
+      # @param schemas_all_path [String] Output path for unified schema manifest
+      # @return [CollectionConfig] The loaded collection configuration
+      # rubocop:disable Metrics/MethodLength
       def export_schema_config(metanorma_yaml_path, schemas_all_path)
         # This reads the metanorma.yml file
         site_config = Suma::SiteConfig::Config.from_file(metanorma_yaml_path)
@@ -43,13 +58,17 @@ output_directory: "_site")
         collection_config.path = collection_config_path
         collection_config.manifest.expand_schemas_only("schema_docs")
 
+        # Recursively traverse collection manifests to build unified schema manifest
+        # Uses Expressir::SchemaManifest methods (concat, to_file) for operations
         exported_schema_config = collection_config.manifest.export_schema_config(schemas_all_path)
         exported_schema_config.path = schemas_all_path
 
+        # Save using Expressir's SchemaManifest#to_file method
         exported_schema_config.to_file
 
         collection_config
       end
+      # rubocop:enable Metrics/MethodLength
 
       def compile_schema(schemas_all_path, collection_config)
         # now get rid of the source documents for schema sources

data/lib/suma/schema_collection.rb

@@ -9,8 +9,8 @@ require_relative "utils"
 
 module Suma
   class SchemaCollection
-    attr_accessor :config, :schemas, :docs, :output_path_docs, :output_path_schemas,
-                  :manifest
+    attr_accessor :config, :schemas, :docs, :output_path_docs,
+                  :output_path_schemas, :manifest
 
     def initialize(config: nil, config_yaml: nil, output_path_docs: nil,
                    output_path_schemas: nil, manifest: nil)
@@ -18,7 +18,9 @@ module Suma
       @docs = {}
       @schema_name_to_docs = {}
       @output_path_docs = Pathname.new(output_path_docs || Dir.pwd).expand_path
-      @output_path_schemas = Pathname.new(output_path_schemas || Dir.pwd).expand_path
+      @output_path_schemas = Pathname.new(
+        output_path_schemas || Dir.pwd,
+      ).expand_path
       @config = config
       @config ||= config_yaml && Expressir::SchemaManifest.from_file(config_yaml)
       @manifest = manifest
@@ -69,7 +71,7 @@ module Suma
 
       # Use SchemaExporter for schema export
       exporter = SchemaExporter.new(
-        config: @config,
+        schemas: @config.schemas,
         output_path: @output_path_schemas,
         options: { annotations: false },
       )

data/lib/suma/schema_exporter.rb

@@ -2,16 +2,17 @@
 
 require_relative "express_schema"
 require_relative "utils"
+require_relative "export_standalone_schema"
 require "fileutils"
 
 module Suma
   # SchemaExporter exports EXPRESS schemas from a manifest
   # with configurable options for annotations and ZIP packaging
   class SchemaExporter
-    attr_reader :config, :output_path, :options
+    attr_reader :schemas, :output_path, :options
 
-    def initialize(config:, output_path:, options: {})
-      @config = config
+    def initialize(schemas:, output_path:, options: {})
+      @schemas = schemas
       @output_path = Pathname.new(output_path).expand_path
       @options = default_options.merge(options)
     end
@@ -19,7 +20,6 @@ module Suma
     def export
       Utils.log "Exporting schemas to: #{output_path}"
 
-      schemas = config.schemas
       export_to_directory(schemas)
       create_zip_archive if options[:create_zip]
 
@@ -43,22 +43,37 @@ module Suma
     end
 
     def export_single_schema(schema)
-      category = categorize_schema(schema)
-      schema_output_path = output_path.join(category).to_s
+      # Check if this is a standalone EXPRESS file
+      # (not from a manifest structure)
+      is_standalone_file = schema.is_a?(ExportStandaloneSchema)
+      schema_output_path = determine_output_path(schema, is_standalone_file)
 
       express_schema = ExpressSchema.new(
         id: schema.id,
         path: schema.path.to_s,
         output_path: schema_output_path,
+        is_standalone_file: is_standalone_file,
       )
 
       express_schema.save_exp(with_annotations: options[:annotations])
     end
 
+    def determine_output_path(schema, is_standalone_file)
+      if is_standalone_file
+        # For standalone files, output directly to the root
+        output_path.to_s
+      else
+        # For manifest schemas, preserve directory structure
+        category = categorize_schema(schema)
+        output_path.join(category).to_s
+      end
+    end
+
     # rubocop:disable Metrics/MethodLength
     def categorize_schema(schema)
       path = schema.path.to_s
 
+      # Check if this is from a manifest structure or a standalone EXPRESS file
       case path
       when %r{/resources/}
         "resources"
@@ -69,7 +84,8 @@ module Suma
       when %r{/core_model/}
         "core_model"
       else
-        "other"
+        # standalone EXPRESS file not from a manifest structure
+        "standalone"
       end
     end
     # rubocop:enable Metrics/MethodLength

data/lib/suma/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Suma
-  VERSION = "0.1.23"
+  VERSION = "0.1.25"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: suma
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.25
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-10-06 00:00:00.000000000 Z
+date: 2025-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: expressir
@@ -162,6 +162,7 @@ files:
 - lib/suma.rb
 - lib/suma/cli.rb
 - lib/suma/cli/build.rb
+- lib/suma/cli/compare.rb
 - lib/suma/cli/convert_jsdai.rb
 - lib/suma/cli/export.rb
 - lib/suma/cli/extract_terms.rb
@@ -172,6 +173,10 @@ files:
 - lib/suma/cli/validate_links.rb
 - lib/suma/collection_config.rb
 - lib/suma/collection_manifest.rb
+- lib/suma/eengine/errors.rb
+- lib/suma/eengine/wrapper.rb
+- lib/suma/eengine_converter.rb
+- lib/suma/export_standalone_schema.rb
 - lib/suma/express_schema.rb
 - lib/suma/jsdai.rb
 - lib/suma/jsdai/figure.rb