tapioca 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffc5e922b8cd11f0667bfe31aa52ffc1087d954e0de34fbf97bcd54f65f522df
-  data.tar.gz: 25b67e05f26e1c6eb9e1e9723d1d6ed853986e658f389da74203349b99fca1c2
+  metadata.gz: f9b10c318332131210706b023ccbe3a63a5889153e3b365a9c454ee7311d2498
+  data.tar.gz: 6c5a5ef82c6a952b535f6f04b3c3127968bca4d8d101e321e13e8e5968ea3222
 SHA512:
-  metadata.gz: 1334f75cb44c365c0dd075e2aa52c65bd4b685634376a2b06db9de2c6d3d809997957568f6a14006ccb984cf845e267bf75c027906f20ee9546643e9f968462f
-  data.tar.gz: adad8cf61d2810cb823739616c77cbf4ac2d88a88d2fac60c84c837764cdd3940376815ee446b931e2ebe9ab41ac2b48daeb519db4892f680f9aeb2fa6888db4
+  metadata.gz: f1df6d85dd2924d25e3d6460749cc5a5ce75022bf999e663c813d6dd483e130b6a1c9873872f2412046d6d15f87effc125bc2f3941323f0ac3eca27a0bfa89a7
+  data.tar.gz: f6b81c3d32e1cec689ed022c17f57ada8655c0594c944c396d26a481e32dce029b77ed8f877063bfee138405019f6bb5408f2de3148d437a2b8db01a699063c5

data/lib/tapioca/cli.rb

@@ -44,8 +44,8 @@ module Tapioca
       end
       create_file(Config::DEFAULT_POSTREQUIRE, skip: true) do
         <<~CONTENT
-          # frozen_string_literal: true
           # typed: false
+          # frozen_string_literal: true
 
           # Add your extra requires here
         CONTENT

data/lib/tapioca/compilers/dsl/active_record_associations.rb

@@ -132,11 +132,7 @@ module Tapioca
         end
         def populate_single_assoc_getter_setter(klass, constant, association_name, reflection)
           association_class = type_for(constant, reflection)
-          association_type = if belongs_to_and_required?(constant, reflection)
-            association_class
-          else
-            "T.nilable(#{association_class})"
-          end
+          association_type = "T.nilable(#{association_class})"
 
           create_method(
             klass,
@@ -227,20 +223,6 @@ module Tapioca
           )
         end
 
-        sig do
-          params(
-            constant: T.class_of(ActiveRecord::Base),
-            reflection: ReflectionType
-          ).returns(T::Boolean)
-        end
-        def belongs_to_and_required?(constant, reflection)
-          return false unless constant.table_exists?
-          return false unless reflection.belongs_to?
-          column_definition = constant.columns_hash[reflection.foreign_key.to_s]
-
-          !column_definition.nil? && !column_definition.null
-        end
-
         sig do
           params(
             constant: T.class_of(ActiveRecord::Base),

data/lib/tapioca/compilers/dsl/active_record_columns.rb

@@ -196,25 +196,25 @@ module Tapioca
             klass,
             "#{attribute_name}_before_last_save",
             methods_to_add,
-            return_type: getter_type
+            return_type: as_nilable_type(getter_type)
           )
           add_method(
             klass,
             "#{attribute_name}_change_to_be_saved",
             methods_to_add,
-            return_type: "[#{getter_type}, #{getter_type}]"
+            return_type: "T.nilable([#{getter_type}, #{getter_type}])"
           )
           add_method(
             klass,
             "#{attribute_name}_in_database",
             methods_to_add,
-            return_type: getter_type
+            return_type: as_nilable_type(getter_type)
           )
           add_method(
             klass,
             "saved_change_to_#{attribute_name}",
             methods_to_add,
-            return_type: "[#{getter_type}, #{getter_type}]"
+            return_type: "T.nilable([#{getter_type}, #{getter_type}])"
           )
           add_method(
             klass,
@@ -235,7 +235,7 @@ module Tapioca
             klass,
             "#{attribute_name}_change",
             methods_to_add,
-            return_type: "[#{getter_type}, #{getter_type}]"
+            return_type: "T.nilable([#{getter_type}, #{getter_type}])"
           )
           add_method(
             klass,
@@ -252,13 +252,13 @@ module Tapioca
             klass,
             "#{attribute_name}_was",
             methods_to_add,
-            return_type: getter_type
+            return_type: as_nilable_type(getter_type)
           )
           add_method(
             klass,
             "#{attribute_name}_previous_change",
             methods_to_add,
-            return_type: "[#{getter_type}, #{getter_type}]"
+            return_type: "T.nilable([#{getter_type}, #{getter_type}])"
           )
           add_method(
             klass,
@@ -270,7 +270,7 @@ module Tapioca
             klass,
             "#{attribute_name}_previously_was",
             methods_to_add,
-            return_type: getter_type
+            return_type: as_nilable_type(getter_type)
           )
           add_method(
             klass,
@@ -381,6 +381,12 @@ module Tapioca
 
           arg_type.to_s
         end
+
+        sig { params(type: String).returns(String) }
+        def as_nilable_type(type)
+          return type if type.start_with?("T.nilable(")
+          "T.nilable(#{type})"
+        end
       end
     end
   end

data/lib/tapioca/compilers/requires_compiler.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 # typed: strict
 
-require_relative '../sorbet_config_parser'
+require 'spoom'
 
 module Tapioca
   module Compilers
@@ -15,7 +15,7 @@ module Tapioca
 
       sig { returns(String) }
       def compile
-        config = SorbetConfig.parse_file(@sorbet_path)
+        config = Spoom::Sorbet::Config.parse_file(@sorbet_path)
         files = collect_files(config)
         files.flat_map do |file|
           collect_requires(file).reject do |req|
@@ -28,7 +28,7 @@ module Tapioca
 
       private
 
-      sig { params(config: SorbetConfig).returns(T::Array[String]) }
+      sig { params(config: Spoom::Sorbet::Config).returns(T::Array[String]) }
       def collect_files(config)
         config.paths.flat_map do |path|
           path = (Pathname.new(@sorbet_path) / "../.." / path).cleanpath
@@ -49,7 +49,7 @@ module Tapioca
         end.compact
       end
 
-      sig { params(config: SorbetConfig, file: String).returns(T::Boolean) }
+      sig { params(config: Spoom::Sorbet::Config, file: String).returns(T::Boolean) }
       def file_ignored_by_sorbet?(config, file)
         config.ignore.any? do |path|
           Regexp.new(Regexp.escape(path)) =~ file

data/lib/tapioca/compilers/symbol_table/symbol_generator.rb

@@ -565,7 +565,7 @@ module Tapioca
           params << [signature.block_name, signature.block_type] if signature.block_name
 
           params = params.compact.map { |name, type| "#{name}: #{type}" }.join(", ")
-          returns = signature.return_type.to_s
+          returns = type_of(signature.return_type)
 
           type_parameters = (params + returns).scan(TYPE_PARAMETER_MATCHER).flatten.uniq.map { |p| ":#{p}" }.join(", ")
           type_parameters = ".type_parameters(#{type_parameters})" unless type_parameters.empty?
@@ -784,6 +784,11 @@ module Tapioca
           nil
         end
 
+        sig { params(constant: Module).returns(String) }
+        def type_of(constant)
+          constant.to_s.gsub(/\bAttachedClass\b/, "T.attached_class")
+        end
+
         sig { params(constant: Module, other: BasicObject).returns(T::Boolean).checked(:never) }
         def are_equal?(constant, other)
           BasicObject.instance_method(:equal?).bind(constant).call(other)

data/lib/tapioca/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Tapioca
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapioca
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-19 00:00:00.000000000 Z
+date: 2020-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -69,6 +69,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: spoom
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -127,7 +141,6 @@ files:
 - lib/tapioca/gemfile.rb
 - lib/tapioca/generator.rb
 - lib/tapioca/loader.rb
-- lib/tapioca/sorbet_config_parser.rb
 - lib/tapioca/version.rb
 homepage: https://github.com/Shopify/tapioca
 licenses:

data/lib/tapioca/sorbet_config_parser.rb

@@ -1,77 +0,0 @@
-# typed: strict
-# frozen_string_literal: true
-
-module Tapioca
-  class SorbetConfig
-    extend T::Sig
-
-    sig { returns(T::Array[String]) }
-    attr_reader :paths, :ignore
-
-    sig { void }
-    def initialize
-      @paths = T.let([], T::Array[String])
-      @ignore = T.let([], T::Array[String])
-    end
-
-    class << self
-      extend T::Sig
-
-      sig { params(sorbet_config_path: String).returns(SorbetConfig) }
-      def parse_file(sorbet_config_path)
-        parse_string(File.read(sorbet_config_path))
-      end
-
-      sig { params(sorbet_config: String).returns(SorbetConfig) }
-      def parse_string(sorbet_config)
-        config = SorbetConfig.new
-        ignore = T.let(false, T::Boolean)
-        skip = T.let(false, T::Boolean)
-        sorbet_config.each_line do |line|
-          line = line.strip
-          case line
-          when /^--ignore$/
-            ignore = true
-            next
-          when /^--ignore=/
-            config.ignore << parse_option(line)
-            next
-          when /^--file$/
-            next
-          when /^--file=/
-            config.paths << parse_option(line)
-            next
-          when /^--dir$/
-            next
-          when /^--dir=/
-            config.paths << parse_option(line)
-            next
-          when /^--.*=/
-            next
-          when /^--/
-            skip = true
-          when /^-.*=?/
-            next
-          else
-            if ignore
-              config.ignore << line
-              ignore = false
-            elsif skip
-              skip = false
-            else
-              config.paths << line
-            end
-          end
-        end
-        config
-      end
-
-      private
-
-      sig { params(line: String).returns(String) }
-      def parse_option(line)
-        T.must(line.split("=").last).strip
-      end
-    end
-  end
-end