tapioca 0.16.9 → 0.16.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2d6abd53e84e3b22cc6045597788c98d8f9571f486976baa8db4e5beb6ccd10
-  data.tar.gz: 5aa9162275489d2280f07419f74a4243c9ee813f922dd367e6260bae0fa37331
+  metadata.gz: 05e19aeab9d997df21ef0b042afe97b1fdcca0b7ce148ecb4f05b0d14b792294
+  data.tar.gz: '09a81f179ccc96606f97bfffe3b07a113315ace4adf5d312998f6caae674cd6e'
 SHA512:
-  metadata.gz: 4fd946bacca4a56fe9f9befaa65404393719cacedf4877ce2e8ba0d9d5ab150d9957bea7298783a04e456170086b035b06b42b0312bc2840e1465631259801a1
-  data.tar.gz: '0825b9451bed3958b7132008993675de624753d41d5b7b267b50e8b7cf2900f344e5c666ac7726686ebfe9c997592dec6c02b5b2e1d14b144cdbaf837daeac08'
+  metadata.gz: ec69dd3c33275760ebd701d92335da1d0afd7da6e8908887ef3622a836fad09d3e1752f2dedab1efc20fb805065968cea6ec7980cc0abd4561318529a45a6559
+  data.tar.gz: 1258bd043e9edb53e08afcc78fecdcbc5cc228d0a069beb31c4b2c3ef818d894d16751e2aa24f8e1a6c0b7eb144cc7cb47aba1aa834fa86a6502dc1bd9577649

data/lib/ruby_lsp/tapioca/addon.rb

@@ -1,7 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
-RubyLsp::Addon.depend_on_ruby_lsp!(">= 0.23.1", "< 0.24")
+RubyLsp::Addon.depend_on_ruby_lsp!(">= 0.23.10", "< 0.24")
 
 begin
   # The Tapioca add-on depends on the Rails add-on to add a runtime component to the runtime server. We can allow the
@@ -53,8 +53,11 @@ module RubyLsp
             workspace_path: @global_state.workspace_path,
           )
 
+          send_usage_telemetry("activated")
           run_gem_rbi_check
         rescue IncompatibleApiError
+          send_usage_telemetry("incompatible_api_error")
+
           # The requested version for the Rails add-on no longer matches. We need to upgrade and fix the breaking
           # changes
           @outgoing_queue << Notification.window_log_message(
@@ -75,12 +78,12 @@ module RubyLsp
 
       sig { override.returns(String) }
       def version
-        "0.1.1"
+        "0.1.3"
       end
 
       sig { params(changes: T::Array[{ uri: String, type: Integer }]).void }
       def workspace_did_change_watched_files(changes)
-        return unless T.must(@global_state).enabled_feature?(:tapiocaAddon)
+        return unless @global_state&.enabled_feature?(:tapiocaAddon)
         return unless @rails_runner_client.connected?
 
         has_route_change = T.let(false, T::Boolean)
@@ -89,11 +92,10 @@ module RubyLsp
 
         constants = changes.flat_map do |change|
           path = URI(change[:uri]).to_standardized_path
-          next if path.end_with?("_test.rb", "_spec.rb")
           next unless file_updated?(change, path)
 
-          if File.fnmatch?("**/tapioca/**/compilers/**/*.rb", path, File::FNM_PATHNAME)
-            needs_compiler_reload = true
+          if File.fnmatch("**/fixtures/**/*.yml{,.erb}", path, File::FNM_PATHNAME | File::FNM_EXTGLOB)
+            has_fixtures_change = true
             next
           end
 
@@ -102,9 +104,10 @@ module RubyLsp
             next
           end
 
-          # NOTE: We only get notification for fixtures if ruby-lsp-rails is v0.3.31 or higher
-          if File.fnmatch("**/fixtures/**/*.yml{,.erb}", path, File::FNM_PATHNAME | File::FNM_EXTGLOB)
-            has_fixtures_change = true
+          next if File.fnmatch?("**/{test,spec,features}/**/*", path, File::FNM_PATHNAME | File::FNM_EXTGLOB)
+
+          if File.fnmatch?("**/tapioca/**/compilers/**/*.rb", path, File::FNM_PATHNAME)
+            needs_compiler_reload = true
             next
           end
 
@@ -124,19 +127,22 @@ module RubyLsp
           @rails_runner_client.delegate_notification(
             server_addon_name: "Tapioca",
             request_name: "reload_workspace_compilers",
-            workspace_path: T.must(@global_state).workspace_path,
+            workspace_path: @global_state.workspace_path,
           )
         end
 
         if has_route_change
+          send_usage_telemetry("route_dsl")
           @rails_runner_client.delegate_notification(server_addon_name: "Tapioca", request_name: "route_dsl")
         end
 
         if has_fixtures_change
+          send_usage_telemetry("fixtures_dsl")
           @rails_runner_client.delegate_notification(server_addon_name: "Tapioca", request_name: "fixtures_dsl")
         end
 
         if constants.any?
+          send_usage_telemetry("dsl")
           @rails_runner_client.delegate_notification(
             server_addon_name: "Tapioca",
             request_name: "dsl",
@@ -147,6 +153,25 @@ module RubyLsp
 
       private
 
+      sig { params(feature_name: String).void }
+      def send_usage_telemetry(feature_name)
+        return unless @outgoing_queue && @global_state
+
+        # Telemetry is not captured by default even if events are produced by the server
+        # See https://github.com/Shopify/ruby-lsp/tree/main/vscode#telemetry
+        @outgoing_queue << Notification.telemetry({
+          eventName: "tapioca_addon.feature_usage",
+          type: "data",
+          data: {
+            type: "counter",
+            attributes: {
+              label: feature_name,
+              machineId: @global_state.telemetry_machine_id,
+            },
+          },
+        })
+      end
+
       sig { params(change: T::Hash[Symbol, T.untyped], path: String).returns(T::Boolean) }
       def file_updated?(change, path)
         case change[:type]

data/lib/ruby_lsp/tapioca/server_addon.rb

@@ -62,11 +62,13 @@ module RubyLsp
       def dsl(constants, *args)
         load("tapioca/cli.rb") # Reload the CLI to reset thor defaults between requests
 
+        ::Tapioca::Cli.addon_mode!
+
         # Order here is important to avoid having Thor confuse arguments. Do not put an array argument at the end before
         # the list of constants
         arguments = ["dsl"]
         arguments.concat(args)
-        arguments.push("--lsp_addon", "--workers=1")
+        arguments.push("--workers=1")
         arguments.concat(constants)
 
         ::Tapioca::Cli.start(arguments)

data/lib/tapioca/cli.rb

@@ -143,11 +143,6 @@ module Tapioca
       type: :hash,
       desc: "Options to pass to the DSL compilers",
       default: {}
-    option :lsp_addon,
-      type: :boolean,
-      desc: "Generate DSL RBIs from the LSP add-on. Internal to Tapioca and not intended for end-users",
-      default: false,
-      hide: true
     def dsl(*constant_or_paths)
       set_environment(options)
 
@@ -170,7 +165,7 @@ module Tapioca
         app_root: options[:app_root],
         halt_upon_load_error: options[:halt_upon_load_error],
         compiler_options: options[:compiler_options],
-        lsp_addon: options[:lsp_addon],
+        lsp_addon: self.class.addon_mode,
       }
 
       command = if options[:verify]
@@ -379,9 +374,22 @@ module Tapioca
     end
 
     no_commands do
+      @addon_mode = false
+
       class << self
+        extend T::Sig
+
+        # Indicates that we are running from the LSP, set using the `addon_mode!` method
+        attr_reader :addon_mode
+
+        sig { void }
+        def addon_mode!
+          @addon_mode = true
+        end
+
+        sig { returns(T::Boolean) }
         def exit_on_failure?
-          true
+          !@addon_mode
         end
       end
     end

data/lib/tapioca/commands/abstract_dsl.rb

@@ -131,15 +131,22 @@ module Tapioca
 
       sig { returns(Tapioca::Dsl::Pipeline) }
       def create_pipeline
+        error_handler = if @lsp_addon
+          ->(error) {
+            say(error)
+          }
+        else
+          ->(error) {
+            say_error(error, :bold, :red)
+          }
+        end
         Tapioca::Dsl::Pipeline.new(
           requested_constants:
             constantize(@requested_constants) + constantize(constants_from_requested_paths, ignore_missing: true),
           requested_paths: @requested_paths,
           requested_compilers: constantize_compilers(@only),
           excluded_compilers: constantize_compilers(@exclude),
-          error_handler: ->(error) {
-            say_error(error, :bold, :red)
-          },
+          error_handler: error_handler,
           skipped_constants: constantize(@skip_constant, ignore_missing: true),
           number_of_workers: @number_of_workers,
           compiler_options: @compiler_options,

data/lib/tapioca/dsl/pipeline.rb

@@ -78,6 +78,7 @@ module Tapioca
             No classes/modules can be matched for RBI generation.
             Please check that the requested classes/modules include processable DSL methods.
           ERROR
+          raise Thor::Error, ""
         end
 
         if defined?(::ActiveRecord::Base) && constants_to_process.any? { |c| ::ActiveRecord::Base > c }
@@ -94,8 +95,12 @@ module Tapioca
           blk.call(constant, rbi)
         end
 
-        errors.each do |msg|
-          report_error(msg)
+        if errors.any?
+          errors.each do |msg|
+            report_error(msg)
+          end
+
+          raise Thor::Error, ""
         end
 
         result.compact
@@ -216,11 +221,10 @@ module Tapioca
         file
       end
 
-      sig { params(error: String).returns(T.noreturn) }
+      sig { params(error: String).void }
       def report_error(error)
         handler = error_handler
         handler.call(error)
-        exit(1)
       end
 
       sig { void }

data/lib/tapioca/gem/listeners/subconstants.rb

@@ -14,11 +14,10 @@ module Tapioca
         sig { override.params(event: ScopeNodeAdded).void }
         def on_scope(event)
           symbol = event.symbol
-          return if @pipeline.symbol_in_payload?(symbol) && event.node.empty?
+          constant = event.constant
 
           prefix = symbol == "Object" ? "" : symbol
 
-          constant = event.constant
           constants_of(constant).sort.uniq.map do |constant_name|
             name = "#{prefix}::#{constant_name}"
             subconstant = constantize(name)

data/lib/tapioca/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapioca
 version: !ruby/object:Gem::Version
-  version: 0.16.9
+  version: 0.16.11
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -10,7 +10,7 @@ authors:
 - Peter Zhu
 bindir: exe
 cert_chain: []
-date: 2025-02-04 00:00:00.000000000 Z
+date: 2025-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark