foobara 0.0.54 → 0.0.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63d82a941eb5c4f5bb66363bf861fb5a31346ede04884d9653d73011b69ca0d0
-  data.tar.gz: f24d432c6aaafa2d19ebe123dc3b9c92c6939441873496189847c4aa64bec265
+  metadata.gz: 78bd1547b990baf3ef2d1210747e7c9ea2943a3136fd39d38f399f0a90f73aa6
+  data.tar.gz: b75e8291b79c05de501de15ed64c62df2ce26de2f7e13fcde95dd6c9cd445430
 SHA512:
-  metadata.gz: e761b11ffad8ffa40bc02c301d9b6fb83867a5983d3f050d149ddd321eed17fd4ac13b79b40c2d0b24a9d8957b6a577cea4c6d3a0da3fea507bb8a9978630268
-  data.tar.gz: bb2157cc0ccab23478dd3cd91b0d1d4f90349b4806077687e9864023e2b659f9f64e8895d0f57388a65a214a87c7b4a85cef684f21beb31312e9a011f71a3de0
+  metadata.gz: 3d49b8eef5f2823c475b2227e1f05c844327837ff8eb0545ca62b46aa2f122413d4d283d3e6fc7a8618e8469c98ab7bfb6b77f5a4fa7131743cffa0d398309a3
+  data.tar.gz: ca9194b01789d6ac289322a919b56ac9e9074a838524509d0759251d4c62839942b56aac0d6c59f3018d89a67fa68aa9421b5c28922b1c4c978e3060432aeb32

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [0.0.55] - 2025-02-01
+
+- Mark types as builtin directly and add builtin flag to manifest
+- Pass Request#inputs through to Describe and other commands
+- Fix bugs around what is considered a manifest entity/model
+
 ## [0.0.54] - 2025-01-31
 
 - Change interface of base_type_for_manifest

data/projects/builtin_types/lib/foobara/builtin_types.rb

@@ -12,6 +12,7 @@ module Foobara
       def add_builtin_type(type)
         @builtin_references = nil
         builtin_types << type
+        type.is_builtin = true
       end
 
       def builtin_references

data/projects/command_connectors/src/command_connector.rb

@@ -139,7 +139,8 @@ module Foobara
         command_class = find_builtin_command_class("Describe")
         full_command_name = command_class.full_command_name
 
-        inputs = { manifestable:, request: }
+        inputs = request.inputs.merge(manifestable:, request:)
+
         transformed_command_class = transformed_command_from_name(full_command_name) ||
                                     transform_command_class(command_class)
       when "describe_command"
@@ -154,7 +155,7 @@ module Foobara
         command_class = find_builtin_command_class("Describe")
         full_command_name = command_class.full_command_name
 
-        inputs = { manifestable: transformed_command_class, request: }
+        inputs = request.inputs.merge(manifestable: transformed_command_class, request:)
         transformed_command_class = transformed_command_from_name(full_command_name) ||
                                     transform_command_class(command_class)
       when "describe_type"
@@ -169,14 +170,14 @@ module Foobara
         command_class = find_builtin_command_class("Describe")
         full_command_name = command_class.full_command_name
 
-        inputs = { manifestable: type, request: }
+        inputs = request.inputs.merge(manifestable: type, request:)
         transformed_command_class = transformed_command_from_name(full_command_name) ||
                                     transform_command_class(command_class)
       when "manifest"
         command_class = find_builtin_command_class("Describe")
         full_command_name = command_class.full_command_name
 
-        inputs = { manifestable: self, request: }
+        inputs = request.inputs.merge(manifestable: self, request:)
         transformed_command_class = transformed_command_from_name(full_command_name) ||
                                     transform_command_class(command_class)
       when "ping"

data/projects/manifest/src/foobara/manifest/domain.rb

@@ -20,15 +20,15 @@ module Foobara
       end
 
       def detached_entities
-        @detached_entities ||= types.select(&:detached_entity?)
+        @detached_entities ||= models.select(&:detached_entity?)
       end
 
       def entities
-        @entities ||= types.select(&:entity?)
+        @entities ||= detached_entities.select(&:entity?)
       end
 
       def models
-        @models ||= types.select(&:model?)
+        @models ||= types.select(&:model?).reject(&:builtin?)
       end
 
       def global?

data/projects/manifest/src/foobara/manifest/type.rb

@@ -27,44 +27,15 @@ module Foobara
       end
 
       def entity?
-        type = base_type
-
-        while type
-          return true if type.reference.to_sym == :entity
-
-          type = type.base_type
-        end
-
-        false
+        !builtin? && extends_symbol?(:entity)
       end
 
       def detached_entity?
-        return false if reference == "entity"
-
-        type = base_type
-
-        while type
-          return true if type.reference.to_sym == :detached_entity
-
-          type = type.base_type
-        end
-
-        false
+        !builtin? && extends_symbol?(:detached_entity)
       end
 
       def model?
-        # TODO: hmmmm, should be false for :active_record
-        return false if %w[entity detached_entity].include?(reference)
-
-        type = base_type
-
-        while type
-          return true if type.reference.to_sym == :model
-
-          type = type.base_type
-        end
-
-        false
+        !builtin? && extends_symbol?(:model)
       end
 
       def base_type
@@ -102,6 +73,18 @@ module Foobara
       def builtin?
         BuiltinTypes.builtin_reference?(reference)
       end
+
+      def extends_symbol?(symbol)
+        type = base_type
+
+        while type
+          return true if type.reference.to_sym == symbol
+
+          type = type.base_type
+        end
+
+        false
+      end
     end
   end
 end

data/projects/types/src/type.rb

@@ -22,6 +22,7 @@ module Foobara
                     :structure_count,
                     :element_types,
                     :element_type,
+                    :is_builtin,
                     :raw_declaration_data,
                     :name,
                     :target_classes,
@@ -322,7 +323,8 @@ module Foobara
           target_classes: target_classes.map(&:name).sort,
           declaration_data:,
           types_depended_on: types.sort,
-          possible_errors: possible_errors_manifests
+          possible_errors: possible_errors_manifests,
+          builtin: builtin?
         ).merge(description:, base_type: base_type_for_manifest&.full_type_name&.to_sym)
 
         h.merge!(
@@ -340,6 +342,10 @@ module Foobara
         super.merge(h)
       end
 
+      def builtin?
+        is_builtin
+      end
+
       def base_type_for_manifest
         base_type
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foobara
 version: !ruby/object:Gem::Version
-  version: 0.0.54
+  version: 0.0.55
 platform: ruby
 authors:
 - Miles Georgi
 bindir: bin
 cert_chain: []
-date: 2025-01-31 00:00:00.000000000 Z
+date: 2025-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal