ree 1.0.42 → 1.0.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74fdedebcc116bb5764720b16d3baa21c017a6a64a815a9df5c9c249dab901be
-  data.tar.gz: d752901505d14e4964aaaf606773e84f1464a8028f87d1d4d0a7bd6bb3bf3853
+  metadata.gz: 8c43c3e1b979b49169f1b33067b14987b9871eea52b4925d31d952c7112dc05b
+  data.tar.gz: fc4d2351614b71835912930c7e971d587ae83d397277438bcfbc057dfdcf6d00
 SHA512:
-  metadata.gz: 2f4c932846abc13daff98dca10dc79082f1837b232b09720ad24c9898dfc96ce3f245cafbe597dc42ecebae6e8da419a5977b84de932c644d09b7adf5e3799a4
-  data.tar.gz: 1ad6fc938f287e24822b7d86dabbe6ca361e8d3ba9e0d2f6bb8f72dd1031fc8f056c97feb5946a67d2e54e289c53516220328eb4e8cafbfa244069cfd77f2900
+  metadata.gz: db2e4e9846094f89f07dc3ac2ea2ff2a37f1ecccb245a5708d58dcc0274aa32d31f395e05e54d26fa7243b2004715e4e86a654b2fc842405d577a254622b5380
+  data.tar.gz: 2d39527fb3b6abd0b355794e8b485c154b04ba74d5acba2f3f2c1a751b08243a0bc20b219670668eb2c97095779c9d60f441c9a5988861efbcaf6bbf1b2d9e7e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree (1.0.42)
+    ree (1.0.44)
       commander (~> 5.0.0)
 
 GEM

data/exe/ree

@@ -89,7 +89,6 @@ class ReeCliRunner
         Ree::CLI::GeneratePackageSchema.run(
           package_name: options_with_defaults[:package_name],
           project_path: options_with_defaults[:project_path],
-          include_objects: false,
           silence: false
         )
       end
@@ -118,7 +117,6 @@ class ReeCliRunner
       c.description = 'generates Package.schema.json for specific package'
       c.summary     = '> ' + c.description
       c.example     'ree gen.package_json PACKAGE_NAME', ''
-      c.option      '--skip_objects', String, 'Skip generation of object schemas'
       c.option      '--silence', String, 'Silence all logs'
       c.option      '--project_path [ROOT_PROJECT_DIR]', String, 'Root project dir path'
       c.action do |args, options|
@@ -132,7 +130,6 @@ class ReeCliRunner
         default_options = {
           package_name: package_name,
           project_path: options_hash[:project_path] || File.expand_path(Dir.pwd),
-          include_objects: !options_hash.has_key?(:skip_objects),
           silence: options_hash.has_key?(:silence)
         }
 

data/lib/ree/cli/generate_package_schema.rb

@@ -4,7 +4,7 @@ module Ree
   module CLI
     class GeneratePackageSchema
       class << self
-        def run(package_name:, project_path:, include_objects: false, silence: false)
+        def run(package_name:, project_path:, silence: false)
           ENV['REE_SKIP_ENV_VARS_CHECK'] = 'true'
 
           path = Ree.locate_packages_schema(project_path)
@@ -31,21 +31,6 @@ module Ree
           package = facade.get_package(package_name)
           schema_path = Ree::PathHelper.abs_package_schema_path(package)
 
-          if include_objects
-            schemas_path = Ree::PathHelper.abs_package_schemas_dir(package)
-
-            FileUtils.rm_rf(schemas_path)
-            FileUtils.mkdir_p(schemas_path)
-
-            package.objects.each do |object|
-              Ree.write_object_schema(package.name, object.name)
-
-              path = Ree::PathHelper.abs_object_schema_path(object)
-
-              puts("  #{object.name}: #{path}") if !silence
-            end
-          end
-
           puts("output: #{schema_path}") if !silence
           puts("done") if !silence
         end

data/lib/ree/cli/spec_runner.rb

@@ -107,7 +107,7 @@ module Ree
       def project_packages(packages)
         packages.reject(&:gem?)
       end
-      
+
       def non_existent_packages
         @package_names ? @package_names - packages.map(&:name) : []
       end
@@ -148,7 +148,7 @@ module Ree
 
         unless acc.include?(package.name)
           acc << package.name
-          
+
           package.deps.map(&:name).each do |pack|
             next if !packages_set.include?(pack)
             recursively_find_children_packages(pack, acc)

data/lib/ree/core/package_loader.rb

@@ -35,9 +35,8 @@ class Ree::PackageLoader
   private
 
   def recursively_load_package(name, loaded_packages)
+    @loaded_packages[name] = true
     package = @packages_store.get(name)
-    return package if @loaded_packages[name]
-    @loaded_packages[name] = package
 
     if !package
       raise Ree::Error.new(
@@ -90,6 +89,7 @@ class Ree::PackageLoader
     end
 
     package.set_schema_loaded
-    package
+
+    @loaded_packages[name] = package
   end
 end

data/lib/ree/dsl/build_package_dsl.rb

@@ -127,7 +127,7 @@ class Ree::BuildPackageDsl
     name = Ree::StringUtils.underscore(list[0]).to_sym
 
     if !Ree.irb_mode? && name != name_from_path
-      raise Ree::Error.new("Package module '#{module_name}' does not correspond to package name 'name'. Fix file name or module name.")
+      raise Ree::Error.new("Package module '#{module_name}' does not correspond to package name '#{name}'. Fix file name or module name.")
     end
 
     package = @packages_facade.get_package(name, false)

data/lib/ree/dsl/domain_error.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Ree::DomainError < StandardError
+end

data/lib/ree/facades/packages_facade.rb

@@ -113,31 +113,6 @@ class Ree::PackagesFacade
     end
   end
 
-  # @param [Symbol] package_name
-  # @param [Symbol] object_name
-  # @return [String]
-  def write_object_schema(package_name, object_name)
-    Ree.logger.debug("write_object_schema(package_name: #{package_name}, object_name: #{object_name})")
-    object = get_object(package_name, object_name)
-
-    if !object || (object && !object&.schema_rpath)
-      raise Ree::Error.new("Object :#{object_name} schema path not found")
-    end
-
-    schema_path = Ree::PathHelper.abs_object_schema_path(object)
-
-    if !File.exist?(schema_path)
-      only_dir_path = schema_path.split('/')[0..-2]
-      FileUtils.mkdir_p(File.join(only_dir_path))
-    end
-
-    schema = Ree::ObjectSchemaBuilder.new.call(object)
-    json = JSON.pretty_generate(schema)
-    File.write(schema_path, json, mode: 'w')
-
-    json
-  end
-
   # @param [Symbol] package_name
   # @return nil
   def load_package_entry(package_name)
@@ -232,6 +207,13 @@ class Ree::PackagesFacade
     @packages_store
   end
 
+  # @param [Symbol] package_name
+  # @return [Bool]
+  def has_package?(package_name)
+    check_arg(package_name, :package_name, Symbol)
+    !!@packages_store.get(package_name)
+  end
+
   # @param [Symbol] package_name
   # @return [Ree::Package]
   def get_package(package_name, raise_if_missing = true)

data/lib/ree/link_dsl.rb

@@ -50,29 +50,18 @@ module Ree::LinkDSL
         raise Ree::Error.new("target should be one of [:object, :class, :both]", :invalid_dsl_usage)
       end
 
-      package_name = Ree::StringUtils.underscore(self.name.split('::').first).to_sym
-      link_package_name = from.nil? ? package_name : from
+      packages = Ree.container.packages_facade
+      link_package_name = get_link_package_name(from, object_name)
       link_object_name = object_name
       link_as = as ? as : object_name
 
-      _check_package_dependency_added(link_package_name, package_name)
-
       if import
-        Ree::LinkImportBuilder
-          .new(Ree.container.packages_facade)
-          .build(
-            self,
-            link_package_name,
-            link_object_name,
-            import
-          )
+        Ree::LinkImportBuilder.new(packages).build(
+          self, link_package_name, link_object_name, import
+        )
       end
 
-      obj = Ree
-        .container
-        .packages_facade
-        .load_package_object(link_package_name, link_object_name)
-
+      obj = packages.load_package_object(link_package_name, link_object_name)
       target ||= obj.target
 
       if target == :both
@@ -133,12 +122,9 @@ module Ree::LinkDSL
 
       list = path.split('/')
       package_name = File.basename(list[0], ".*").to_sym
-      current_package_name = Ree::StringUtils.underscore(self.name.split('::').first).to_sym
-
-      _check_package_dependency_added(package_name, current_package_name)
-
-      Ree.container.packages_facade.load_package_entry(package_name)
-      package = Ree.container.packages_facade.get_package(package_name)
+      packages = Ree.container.packages_facade
+      packages.load_package_entry(package_name)
+      package = packages.get_package(package_name)
 
       file_path = File.join(
         Ree::PathHelper.abs_package_dir(package),
@@ -153,7 +139,7 @@ module Ree::LinkDSL
         end
       end
 
-      Ree.container.packages_facade.load_file(file_path, package.name)
+      packages.load_file(file_path, package.name)
 
       const_list = path.split('/').map { |_| Ree::StringUtils.camelize(_) }
       const_short = [const_list[0], const_list.last].join("::")
@@ -168,13 +154,9 @@ module Ree::LinkDSL
       end
 
       if import_proc
-        Ree::LinkImportBuilder
-          .new(Ree.container.packages_facade)
-          .build_for_const(
-            self,
-            file_const,
-            import_proc
-          )
+        Ree::LinkImportBuilder.new(packages).build_for_const(
+          self, file_const, import_proc
+        )
       end
 
       nil
@@ -182,33 +164,24 @@ module Ree::LinkDSL
 
     def _raise_error(text, code = :invalid_dsl_usage)
       msg = <<~DOC
-        object: :#{@object.name}
-        path: #{Ree::PathHelper.abs_object_path(@object)}
+        class: :#{self}
         error: #{text}
       DOC
 
       raise Ree::Error.new(msg, code)
     end
 
-    def _check_package_dependency_added(package_name, current_package_name)
-      return if package_name == current_package_name
-
-      facade = Ree.container.packages_facade
-      facade.load_package_entry(package_name)
-      facade.load_package_entry(current_package_name)
+    def get_link_package_name(from, object_name)
+      return from if from
 
-      current_package = facade.get_package(current_package_name)
+      package_name = Ree::StringUtils.underscore(self.name.split('::').first).to_sym
+      result = Ree.container.packages_facade.has_package?(package_name) ? package_name : nil
 
-      dep_package = current_package.deps.detect do |d|
-        d.name == package_name
+      if result.nil?
+        raise Ree::Error.new("package is not provided for link :#{object_name}", :invalid_dsl_usage)
       end
 
-      if dep_package.nil?
-        raise Ree::Error.new(
-          "Package :#{package_name} is not added as dependency for :#{current_package_name} package\npackage path: #{File.join(Ree.root_dir, current_package.entry_rpath || "")}\nclass:#{self.name}",
-          :invalid_dsl_usage
-        )
-      end
+      result
     end
   end
 end

data/lib/ree/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ree
-  VERSION = "1.0.42"
+  VERSION = "1.0.44"
 end

data/lib/ree.rb

@@ -11,6 +11,7 @@ module Ree
   autoload :CLI, 'ree/cli'
   autoload :Container, 'ree/container'
   autoload :Contracts, 'ree/contracts'
+  autoload :DomainError, 'ree/dsl/domain_error'
   autoload :Error, 'ree/error'
   autoload :ErrorDsl, 'ree/dsl/error_dsl'
   autoload :FnDSL, 'ree/fn_dsl'
@@ -26,7 +27,6 @@ module Ree
   autoload :ObjectError, 'ree/core/object_error'
   autoload :ObjectLink, 'ree/core/object_link'
   autoload :ObjectSchema, 'ree/core/object_schema'
-  autoload :ObjectSchemaBuilder, 'ree/core/object_schema_builder'
   autoload :Package, 'ree/core/package'
   autoload :PackageDep, 'ree/core/package_dep'
   autoload :BuildPackageDsl, 'ree/dsl/build_package_dsl'
@@ -229,12 +229,6 @@ module Ree
       @root_dir || (raise Ree::Error.new(ROOT_DIR_MESSAGE, :invalid_root_dir))
     end
 
-    def write_object_schema(package_name, object_name)
-      check_arg(package_name, :package_name, Symbol)
-      check_arg(object_name, :object_name, Symbol)
-      container.packages_facade.write_object_schema(package_name, object_name)
-    end
-
     def generate_schemas_for_all_packages(silence = false)
       Ree.logger.debug("generate_schemas_for_all_packages") if !silence
       facade = container.packages_facade
@@ -249,16 +243,6 @@ module Ree
 
         facade.load_entire_package(package.name)
         facade.write_package_schema(package.name)
-
-        schemas_path = Ree::PathHelper.abs_package_schemas_dir(package)
-
-        FileUtils.rm_rf(schemas_path)
-        FileUtils.mkdir_p(schemas_path)
-
-        package.objects.each do |object|
-          next if !object.schema_rpath
-          write_object_schema(package.name, object.name)
-        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree
 version: !ruby/object:Gem::Version
-  version: 1.0.42
+  version: 1.0.44
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-30 00:00:00.000000000 Z
+date: 2024-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -124,7 +124,6 @@ files:
 - lib/ree/core/object_error.rb
 - lib/ree/core/object_link.rb
 - lib/ree/core/object_schema.rb
-- lib/ree/core/object_schema_builder.rb
 - lib/ree/core/package.rb
 - lib/ree/core/package_dep.rb
 - lib/ree/core/package_env_var.rb
@@ -140,6 +139,7 @@ files:
 - lib/ree/core/packages_store.rb
 - lib/ree/core/path_helper.rb
 - lib/ree/dsl/build_package_dsl.rb
+- lib/ree/dsl/domain_error.rb
 - lib/ree/dsl/error_dsl.rb
 - lib/ree/dsl/import_dsl.rb
 - lib/ree/dsl/link_import_builder.rb

data/lib/ree/core/object_schema_builder.rb

@@ -1,102 +0,0 @@
-# frozen_string_literal: true
-
-class Ree::ObjectSchemaBuilder
-  Schema = Ree::ObjectSchema
-
-  # @param [Ree::Object] object
-  # @return [Hash]
-  def call(object)
-    Ree.logger.debug("generating object schema for '#{object.name}' package")
-
-    if !object.loaded?
-      raise Ree::Error.new("object `#{object.name}` from package `#{object.package_name}` is not loaded", :invalid_schema)
-    end
-
-    data = {
-      Schema::SCHEMA_TYPE => Schema::OBJECT,
-      Schema::SCHEMA_VERSION => Schema::SCHEMA_VERSION_NUMBER,
-      Schema::NAME => object.name,
-      Schema::PATH => object.rpath,
-      Schema::MOUNT_AS => object.mount_as,
-      Schema::CLASS => object.klass.name,
-      Schema::FACTORY => object.factory,
-      Schema::METHODS => map_object_methods(object),
-      Schema::LINKS => object.links.sort_by(&:object_name).map { |link|
-        {
-          Schema::Links::TARGET => link.object_name,
-          Schema::Links::PACKAGE_NAME => link.package_name,
-          Schema::Links::AS => link.as,
-          Schema::Links::IMPORTS => link.constants
-        }
-      }
-    }
-
-    data
-  end
-
-  private
-
-  Arg = Ree::Contracts::CalledArgsValidator::Arg
-
-  def map_object_methods(object)
-    if !object.fn?
-      return []
-    end
-
-    klass = object.klass
-
-    method_decorator = Ree::Contracts.get_method_decorator(
-      klass, :call, scope: :instance
-    )
-
-    begin
-      if method_decorator.nil?
-        parameters = klass.instance_method(:call).parameters
-
-        args = parameters.inject({}) do |res, param|
-          res[param.last] = Arg.new(
-            param.last, param.first, nil, nil
-          )
-
-          res
-        end
-      else
-        parameters = method_decorator.args.params
-        args = method_decorator.args.get_args
-      end
-    rescue NameError
-      raise Ree::Error.new("method call is not defined for #{klass}")
-    end
-
-    arg_list = parameters.map do |param|
-      arg = args[param.last]
-      validator = arg.validator
-      arg_type = arg.type
-
-      type = if validator
-        validator.to_s
-      else
-        if arg_type == :block
-          "Block"
-        else
-          "Any"
-        end
-      end
-
-      {
-        Schema::Methods::Args::ARG => arg.name,
-        Schema::Methods::Args::ARG_TYPE => arg.type,
-        Schema::Methods::Args::TYPE => type
-      }
-    end
-
-    [
-      {
-        Schema::Methods::DOC => method_decorator&.doc || "",
-        Schema::Methods::THROWS => method_decorator&.errors&.map { _1.name } || [],
-        Schema::Methods::RETURN => method_decorator&.contract_definition&.return_contract || "Any",
-        Schema::Methods::ARGS => arg_list
-      }
-    ]
-  end
-end