ruby_tree_sitter 0.20.8.2-x86_64-darwin-20 → 0.20.8.3-x86_64-darwin-20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b842a2305f9adfe075436d7fc21572e90ccf498419cf686f5a705110da630d1
-  data.tar.gz: 352cc3aa0d0d3ef67e60aeb023b633c400e9bb77f674695f729a5fc187cb2555
+  metadata.gz: cd1b320b75859a2c81f94f56f0e4bcc518ab9c478a053bb161053cce37855655
+  data.tar.gz: caa003466d910ef2e84d04cf31394979b5116b4adbb73b9767eadd1dae8e3701
 SHA512:
-  metadata.gz: e001b5024326bb8bbcf8083b27982cdd6aff01a3671c5fbb454f519d90899bc20ba4cf67a465e932904243efaeca51077445895f0ec489ced6767e059083af02
-  data.tar.gz: 6d4256ab4da4fe855c20bff4340f90869a7cfc414b3e2a30c6c1325c47159ef184fcb94f356dfd5792194e332b1fcada85991d8a2c3a57f502daae63693c7e5d
+  metadata.gz: 390ade41ebe8950def40d5c517d1b1b1a57d92bbeaeebc15eb415211f655a15898bbd6152897001f0a8c4e4aa6f12aaa0460ce8daf8cf4398fa69df45e7f84a9
+  data.tar.gz: fd43b39cecca804d0a180021c99e4203988e836dc1ebe97496c2ddf5eaaff5dd69668f0a76b2665bafbb9806b2ea13d7ee7ae5baf590e6423320f466ab0b8fad

data/ext/tree_sitter/extconf.rb

@@ -53,48 +53,6 @@ dir_include, dir_lib =
     repo.include_and_lib_dirs
   end
 
-# TREESITTER_SPEC = Bundler.load_gemspec('../../../../tree_sitter.gemspec')
-
-# # def version = TREESITTER_SPEC.version.gsub(/\A(\d+\.\d+\.\d+)(\.\d+)?\z/, '\1')
-
-# def version = '0.20.8'
-
-# LINUX_PLATFORM_REGEX = /linux/
-# DARWIN_PLATFORM_REGEX = /darwin/
-
-# def platform = RUBY_PLATFORM
-
-# def darwin?
-#   !!(platform =~ DARWIN_PLATFORM_REGEX)
-# end
-
-# def dll_ext
-#   darwin? ? 'dylib' : 'so'
-# end
-
-# def staging_path
-#   '../../stage/lib/tree_sitter'
-# end
-
-# def downloaded_dll_path
-#   "tree-sitter-#{version}"
-# end
-
-# def add_tree_sitter_dll_to_gem
-#   puts ">>>>>>>>>>>>> #{`pwd`}"
-#   path = "#{downloaded_dll_path}/libtree-sitter*.#{dll_ext}"
-#   files =
-#     Dir.glob(path)
-#        .map { |f| Pathname(f) }
-#        .filter { |f| !f.symlink? && f.file? }
-#   dll = files.first
-#   dst = Pathname(staging_path) / "libtree-sitter.#{dll_ext}"
-#   FileUtils.cp(dll, dst)
-#   TREESITTER_SPEC.files << dst
-# end
-
-# add_tree_sitter_dll_to_gem
-
 # ################################## #
 #          Generate Makefile         #
 # ################################## #

data/ext/tree_sitter/repo.rb

@@ -0,0 +1,121 @@
+# frozen_string_literal: true
+
+require_relative '../../lib/tree_sitter/version'
+
+module TreeSitter
+  # Fetches tree-sitter sources.
+  class Repo
+    attr_reader :exe, :src, :url, :version
+
+    def initialize
+      @version = TREESITTER_VERSION
+
+      # `tree-sitter-@version` is the name produced by tagged releases of sources
+      # by git, so we use it everywhere, including when cloning from git.
+      @src = Pathname.pwd / "tree-sitter-#{@version}"
+
+      @url = {
+        git: 'https://github.com/tree-sitter/tree-sitter',
+        tar: "https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v#{@version}.tar.gz",
+        zip: "https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v#{@version}.zip"
+      }
+
+      @exe = {}
+      %i[curl git tar wget zip].each do |cmd|
+        @exe[cmd] = find_executable(cmd.to_s)
+      end
+    end
+
+    def compile
+      # We need to clean because the same folder is used over and over
+      # by rake-compiler-dock
+      sh "cd #{src} && make clean && make"
+    end
+
+    def exe?(name)
+      @exe[name]
+    end
+
+    def extract?
+      !exe.filter { |k, v| %i[tar zip].include?(k) && v }.empty?
+    end
+
+    def download
+      # TODO: should we force re-download? Maybe with a flag?
+      return true if Dir.exist? src
+
+      res = false
+      %w[git curl wget].each do |cmd|
+        res =
+          if find_executable(cmd)
+            send("sources_from_#{cmd}")
+          else
+            false
+          end
+        break if res
+      end
+
+      res
+    end
+
+    def include_and_lib_dirs
+      [[src / 'lib' / 'include'], [src.to_s]]
+    end
+
+    def keep_static_lib
+      src
+        .children
+        .filter { |f| /\.(dylib|so)/ =~ f.basename.to_s }
+        .each(&:unlink)
+    end
+
+    def sh(cmd)
+      return if system(cmd)
+
+      abort <<~MSG
+
+        Failed to run: #{cmd}
+
+        exiting …
+
+      MSG
+    end
+
+    def sources_from_curl
+      return false if !exe?(:curl) || !extract?
+
+      if exe?(:tar)
+        sh "curl -L #{url[:tar]} -o tree-sitter-v#{version}.tar.gz"
+        sh "tar -xf tree-sitter-v#{version}.tar.gz"
+      elsif exe?(:zip)
+        sh "curl -L #{url[:zip]} -o tree-sitter-v#{version}.zip"
+        sh "unzip -q tree-sitter-v#{version}.zip"
+      end
+
+      true
+    end
+
+    def sources_from_git
+      return false if !exe?(:git)
+
+      sh "git clone #{url[:git]} #{src}"
+      sh "cd #{src} && git checkout tags/v#{version}"
+
+      true
+    end
+
+    def sources_from_wget
+      return false if !exe?(:wget) || !extract?
+
+      if exe?(:tar)
+        sh "wget #{url[:tar]} -O tree-sitter-v#{version}.tar.gz"
+        sh "tar -xf tree-sitter-v#{version}.tar.gz"
+      elsif exe?(:zip)
+        sh "wget #{url[:zip]} -O tree-sitter-v#{version}.zip"
+        sh "unzip -q tree-sitter-v#{version}.zip"
+      end
+
+      true
+    end
+  end
+end

data/lib/tree_sitter/node.rb

@@ -142,7 +142,12 @@ module TreeSitter
     # uses         named_child                   | field_name_for_child
     #              child_by_field_name           |   via each_node
     #              ------------------------------+----------------------
-    def fetch(*keys)
+    # @param all [Boolean] If `true`, return an array of nodes for all the
+    # demanded keys, putting `nil` for missing ones.  If `false`, return the
+    # same array after calling `compact`. Defaults to `false`.
+    #
+    # See {#fetch_all}.
+    def fetch(*keys, all: false, **_kwargs)
       dict = {}
       keys.each.with_index do |k, i|
         dict[k.to_s] = i
@@ -151,13 +156,25 @@ module TreeSitter
       res = {}
       each_field do |f, c|
         if dict.key?(f)
-          res[dict[f]] = c
+          res[f] = c
           dict.delete(f)
         end
         break if dict.empty?
       end
 
-      res.sort.map { |_, v| v }
+      res = keys.uniq.map { |k| res[k.to_s] }
+      res = res.compact if !all
+      res
+    end
+
+    # Access all named children of a node, returning `nil` for missing ones.
+    #
+    # Equivalent to `fetch(…, all: true)`.
+    #
+    # See {#fetch}.
+    def fetch_all(*keys, **kwargs)
+      kwargs[:all] = true
+      fetch(*keys, **kwargs)
     end
   end
 end

data/lib/tree_sitter/version.rb

@@ -2,5 +2,5 @@
 
 module TreeSitter
   TREESITTER_VERSION = '0.20.8'
-  VERSION = "#{TREESITTER_VERSION}.2".freeze
+  VERSION = "#{TREESITTER_VERSION}.3".freeze
 end

data/test/tree_sitter/node_test.rb

@@ -352,4 +352,60 @@ describe 'fetch' do
     assert_equal 1, m.length
     assert_equal method, m.first
   end
+
+  it 'should return an empty array when asked for non-existent fields' do
+    b = @child.fetch(:a)
+    assert_empty b
+
+    b = @child.fetch(:b, :focus)
+    assert_empty b
+  end
+
+  it 'should return an array of `nil` values when asked for non-existent fields with `all: true`' do
+    b = @child.fetch(:d, all: true)
+    refute_empty b
+    assert b.all?(&:nil?)
+
+    b = @child.fetch(:e, :f, all: true)
+    refute_empty b
+    assert b.all?(&:nil?)
+  end
+
+  it 'should return values, even if `nil`, for all keys when `all: true`' do
+    method = @child.child(0)
+    arguments = @child.child(1)
+
+    m, a, f = @child.fetch(:method, :arguments, :fake, all: true)
+
+    assert_equal method, m
+    assert_equal arguments, a
+    assert_nil f
+  end
+end
+
+describe 'fetch_all' do
+  before do
+    @child = root.child(0).child(4)
+  end
+
+  it 'should return an array of `nil` values when asked for non-existent fields' do
+    b = @child.fetch_all(:d)
+    refute_empty b
+    assert b.all?(&:nil?)
+
+    b = @child.fetch_all(:e, :f)
+    refute_empty b
+    assert b.all?(&:nil?)
+  end
+
+  it 'should return values, even if `nil`, for all keys' do
+    method = @child.child(0)
+    arguments = @child.child(1)
+
+    m, a, f = @child.fetch_all(:method, :arguments, :fake)
+
+    assert_equal method, m
+    assert_equal arguments, a
+    assert_nil f
+  end
 end

data/tree_sitter.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
 
   spec.extensions    = %(ext/tree_sitter/extconf.rb)
   spec.files         = %w[LICENSE README.md tree_sitter.gemspec]
-  spec.files        += Dir.glob('ext/**/*.[ch]')
+  spec.files        += Dir.glob('ext/**/*.{c,h,rb}')
   spec.files        += Dir.glob('lib/**/*.rb')
   spec.test_files    = Dir.glob('test/**/*')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_tree_sitter
 version: !ruby/object:Gem::Version
-  version: 0.20.8.2
+  version: 0.20.8.3
 platform: x86_64-darwin-20
 authors:
 - Firas al-Khalil
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-08 00:00:00.000000000 Z
+date: 2023-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -135,6 +135,7 @@ files:
 - ext/tree_sitter/query_match.c
 - ext/tree_sitter/query_predicate_step.c
 - ext/tree_sitter/range.c
+- ext/tree_sitter/repo.rb
 - ext/tree_sitter/symbol_type.c
 - ext/tree_sitter/tree.c
 - ext/tree_sitter/tree_cursor.c