@appthreat/atom 2.1.4 → 2.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appthreat/atom",
-  "version": "2.1.4",
+  "version": "2.1.6",
   "description": "Create atom (⚛) representation for your application, packages and libraries",
   "exports": "./index.js",
   "type": "module",

package/plugins/bin/atom

@@ -360,7 +360,7 @@ declare -r lib_dir="$(realpath "${app_home}/../lib")"
 declare -a app_mainclass=('io.appthreat.atom.Atom')
 
 declare -r script_conf_file="${app_home}/../conf/application.ini"
-declare -r app_classpath="$lib_dir/io.appthreat.atom-2.1.4-classpath.jar"
+declare -r app_classpath="$lib_dir/io.appthreat.atom-2.1.6-classpath.jar"
 
 # java_cmd is overrode in process_args when -java-home is used
 declare java_cmd=$(get_java_cmd)

package/plugins/bin/atom.bat

@@ -40,7 +40,7 @@ rem "-J" is stripped, "-D" is left as is, and everything is appended to JAVA_OPT
 set _JAVA_PARAMS=
 set _APP_ARGS=
 
-set "APP_CLASSPATH=%APP_LIB_DIR%\io.appthreat.atom-2.1.4-classpath.jar"
+set "APP_CLASSPATH=%APP_LIB_DIR%\io.appthreat.atom-2.1.6-classpath.jar"
 set "APP_MAIN_CLASS=io.appthreat.atom.Atom"
 set "SCRIPT_CONF_FILE=%APP_HOME%\conf\application.ini"
 

package/plugins/bin/ruby_ast_gen

@@ -11,4 +11,4 @@
 $:.unshift File.expand_path "../rubyastgen/bundle", __dir__
 
 require "bundler/setup"
-load File.expand_path "../rubyastgen/bundle/ruby/3.4.0/bundler/gems/ruby_ast_gen-df21eaeb39f9/exe/ruby_ast_gen", __dir__
+load File.expand_path "../rubyastgen/bundle/ruby/3.4.0/bundler/gems/ruby_ast_gen-05140cf67b0c/exe/ruby_ast_gen", __dir__

package/plugins/composer/installed.php

@@ -1,9 +1,9 @@
 <?php return array(
     'root' => array(
         'name' => '__root__',
-        'pretty_version' => 'v2.1.4',
-        'version' => '2.1.4.0',
-        'reference' => '72bce6caec8b1ee2049d10ffa25937b1af8f6b1e',
+        'pretty_version' => 'v2.1.6',
+        'version' => '2.1.6.0',
+        'reference' => 'd87917dacdfa35d39c13462cf604def54cd6ec0d',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -11,9 +11,9 @@
     ),
     'versions' => array(
         '__root__' => array(
-            'pretty_version' => 'v2.1.4',
-            'version' => '2.1.4.0',
-            'reference' => '72bce6caec8b1ee2049d10ffa25937b1af8f6b1e',
+            'pretty_version' => 'v2.1.6',
+            'version' => '2.1.6.0',
+            'reference' => 'd87917dacdfa35d39c13462cf604def54cd6ec0d',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),

package/plugins/rubyastgen/Gemfile

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-ruby ">=3.4.1"
+ruby ">=3.1.4"
 
 source "https://rubygems.org"
 
 group :frontend do
-    gem "ruby_ast_gen", github: 'appthreat/ruby_ast_gen', ref: 'v0.34.1'
-    gem "parser"
-    gem "ostruct"
+    gem "ruby_ast_gen", github: 'appthreat/ruby_ast_gen', ref: 'v1.0.0'
+    gem "parser", "~> 3.3.7.0"
+    gem "ostruct", "~> 0.6.1"
 end

package/plugins/rubyastgen/Gemfile.lock

@@ -1,28 +1,29 @@
 GIT
   remote: https://github.com/appthreat/ruby_ast_gen.git
-  revision: df21eaeb39f962c41946ec4391ff20080e4d8218
-  ref: v0.34.1
+  revision: 05140cf67b0c70df3cf726c7cc4706d484c8d8cc
+  ref: v1.0.0
   specs:
-    ruby_ast_gen (0.34.0)
+    ruby_ast_gen (1.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
     ostruct (0.6.1)
-    parser (3.3.6.0)
+    parser (3.3.7.0)
       ast (~> 2.4.1)
       racc
     racc (1.8.1)
 
 PLATFORMS
+  arm64-darwin-24
   ruby
   x64-mingw-ucrt
   x86_64-darwin-23
 
 DEPENDENCIES
-  ostruct
-  parser
+  ostruct (~> 0.6.1)
+  parser (~> 3.3.7.0)
   ruby_ast_gen!
 
 RUBY VERSION

package/plugins/rubyastgen/bundle/bundler/setup.rb

@@ -38,5 +38,5 @@ $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/ostruct-0.6.1/lib")
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/x86_64-linux/#{Gem.extension_api_version}/racc-1.8.1")
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/racc-1.8.1/lib")
-$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/parser-3.3.6.0/lib")
-$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/bundler/gems/ruby_ast_gen-df21eaeb39f9/lib")
+$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/parser-3.3.7.0/lib")
+$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/bundler/gems/ruby_ast_gen-05140cf67b0c/lib")

package/plugins/rubyastgen/bundle/ruby/3.4.0/bundler/gems/ruby_ast_gen-05140cf67b0c/.github/workflows/pr.yaml

@@ -0,0 +1,31 @@
+name: Pull Request Testing
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  test:
+    runs-on: ubuntu-24.04
+    env:
+      BUNDLE_JOBS: 4
+      BUNDLE_RETRY: 3
+      CI: true
+      TRUFFLERUBYOPT: "--engine.Mode=latency"
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["3.1.6", "3.2.6", "3.3.7", "3.4.1", "jruby-9.4"]
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true 
+      - name: Run the default task
+        run: bundle exec rake

package/plugins/rubyastgen/bundle/ruby/3.4.0/bundler/gems/ruby_ast_gen-05140cf67b0c/Gemfile

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gemspec
+
+gem "parser", "~> 3.3.7.0"
+gem "ostruct", "~> 0.6.1"
+gem "rake", "~> 13.2"
+gem "rspec", "~> 3.13"

package/plugins/rubyastgen/bundle/ruby/3.4.0/bundler/gems/{ruby_ast_gen-df21eaeb39f9 → ruby_ast_gen-05140cf67b0c}/lib/ruby_ast_gen/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyAstGen
-  VERSION = "0.34.0"
+  VERSION = "1.0.0"
 end

package/plugins/rubyastgen/bundle/ruby/3.4.0/bundler/gems/{ruby_ast_gen-df21eaeb39f9 → ruby_ast_gen-05140cf67b0c}/ruby_ast_gen.gemspec

@@ -1,23 +1,23 @@
 # -*- encoding: utf-8 -*-
-# stub: ruby_ast_gen 0.34.0 ruby lib
+# stub: ruby_ast_gen 1.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ruby_ast_gen".freeze
-  s.version = "0.34.0".freeze
+  s.version = "1.0.0".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.metadata = { "homepage_uri" => "https://github.com/appthreat/ruby_ast_gen" } if s.respond_to? :metadata=
   s.require_paths = ["lib".freeze]
   s.authors = ["David Baker Effendi".freeze, "Andrei Dreyer".freeze, "Team AppThreat".freeze]
   s.bindir = "exe".freeze
-  s.date = "2025-01-15"
+  s.date = "2025-01-17"
   s.description = "A Ruby parser than dumps the AST as JSON output for atom `rubysrc2cpg` frontend".freeze
   s.email = ["dave@whirlylabs.com".freeze, "andrei@whirlylabs.com".freeze, "hello@appthreat.com".freeze]
   s.executables = ["ruby_ast_gen".freeze]
   s.files = ["Gemfile".freeze, "exe/ruby_ast_gen".freeze, "lib/ruby_ast_gen".freeze, "lib/ruby_ast_gen.rb".freeze, "lib/ruby_ast_gen/node_handling.rb".freeze, "lib/ruby_ast_gen/version.rb".freeze, "ruby_ast_gen.gemspec".freeze, "sig/ruby_ast_gen.rbs".freeze]
   s.homepage = "https://github.com/appthreat/ruby_ast_gen".freeze
   s.licenses = ["MIT".freeze]
-  s.required_ruby_version = Gem::Requirement.new(">= 3.4.1".freeze)
+  s.required_ruby_version = Gem::Requirement.new(">= 3.1.4".freeze)
   s.rubygems_version = "3.6.2".freeze
   s.summary = "A Ruby parser than dumps the AST as JSON output".freeze
 

package/plugins/rubyastgen/bundle/ruby/3.4.0/extensions/x86_64-linux/3.4.0/racc-1.8.1/gem_make.out

@@ -3,16 +3,16 @@ current directory: /home/runner/work/atom/atom/wrapper/nodejs/plugins/rubyastgen
 creating Makefile
 
 current directory: /home/runner/work/atom/atom/wrapper/nodejs/plugins/rubyastgen/bundle/ruby/3.4.0/gems/racc-1.8.1/ext/racc/cparse
-make DESTDIR\= sitearchdir\=./.gem.20250115-2721-jppxt7 sitelibdir\=./.gem.20250115-2721-jppxt7 clean
+make DESTDIR\= sitearchdir\=./.gem.20250117-2744-6zqt9h sitelibdir\=./.gem.20250117-2744-6zqt9h clean
 
 current directory: /home/runner/work/atom/atom/wrapper/nodejs/plugins/rubyastgen/bundle/ruby/3.4.0/gems/racc-1.8.1/ext/racc/cparse
-make DESTDIR\= sitearchdir\=./.gem.20250115-2721-jppxt7 sitelibdir\=./.gem.20250115-2721-jppxt7
+make DESTDIR\= sitearchdir\=./.gem.20250117-2744-6zqt9h sitelibdir\=./.gem.20250117-2744-6zqt9h
 compiling cparse.c
 linking shared-object racc/cparse.so
 
 current directory: /home/runner/work/atom/atom/wrapper/nodejs/plugins/rubyastgen/bundle/ruby/3.4.0/gems/racc-1.8.1/ext/racc/cparse
-make DESTDIR\= sitearchdir\=./.gem.20250115-2721-jppxt7 sitelibdir\=./.gem.20250115-2721-jppxt7 install
-/usr/bin/install -c -m 0755 cparse.so ./.gem.20250115-2721-jppxt7/racc
+make DESTDIR\= sitearchdir\=./.gem.20250117-2744-6zqt9h sitelibdir\=./.gem.20250117-2744-6zqt9h install
+/usr/bin/install -c -m 0755 cparse.so ./.gem.20250117-2744-6zqt9h/racc
 
 current directory: /home/runner/work/atom/atom/wrapper/nodejs/plugins/rubyastgen/bundle/ruby/3.4.0/gems/racc-1.8.1/ext/racc/cparse
-make DESTDIR\= sitearchdir\=./.gem.20250115-2721-jppxt7 sitelibdir\=./.gem.20250115-2721-jppxt7 clean
+make DESTDIR\= sitearchdir\=./.gem.20250117-2744-6zqt9h sitelibdir\=./.gem.20250117-2744-6zqt9h clean

package/plugins/rubyastgen/bundle/ruby/3.4.0/gems/{parser-3.3.6.0 → parser-3.3.7.0}/lib/parser/context.rb

@@ -24,6 +24,7 @@ module Parser
       in_class
       in_block
       in_lambda
+      cant_return
     ]
 
     def initialize
@@ -38,6 +39,7 @@ module Parser
       @in_class = false
       @in_block = false
       @in_lambda = false
+      @cant_return = false
     end
 
     attr_accessor(*FLAGS)

package/plugins/rubyastgen/bundle/ruby/3.4.0/gems/{parser-3.3.6.0 → parser-3.3.7.0}/lib/parser/current.rb

@@ -111,7 +111,7 @@ module Parser
     CurrentRuby = Ruby32
 
   when /^3\.3\./
-    current_version = '3.3.6'
+    current_version = '3.3.7'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby33', current_version
     end

package/plugins/rubyastgen/bundle/ruby/3.4.0/gems/{parser-3.3.6.0 → parser-3.3.7.0}/lib/parser/ruby34.rb

@@ -8788,6 +8788,7 @@ def _reduce_64(val, _values, result)
 
                       result = [ val[0], @context.dup ]
                       @context.in_def = true
+                      @context.cant_return = false
 
     result
 end
@@ -10209,6 +10210,7 @@ end
 
 def _reduce_344(val, _values, result)
                       @context.in_class = true
+                      @context.cant_return = true
                       local_push
 
     result
@@ -10226,6 +10228,7 @@ def _reduce_345(val, _values, result)
 
                       local_pop
                       @context.in_class = ctx.in_class
+                      @context.cant_return = ctx.cant_return
 
     result
 end
@@ -10233,6 +10236,7 @@ end
 def _reduce_346(val, _values, result)
                       @context.in_def = false
                       @context.in_class = false
+                      @context.cant_return = true
                       local_push
 
     result
@@ -10246,12 +10250,14 @@ def _reduce_347(val, _values, result)
                       local_pop
                       @context.in_def = ctx.in_def
                       @context.in_class = ctx.in_class
+                      @context.cant_return = ctx.cant_return
 
     result
 end
 
 def _reduce_348(val, _values, result)
                       @context.in_class = true
+                      @context.cant_return = true
                       local_push
 
     result
@@ -10267,6 +10273,7 @@ def _reduce_349(val, _values, result)
 
                       local_pop
                       @context.in_class = ctx.in_class
+                      @context.cant_return = ctx.cant_return
 
     result
 end
@@ -10341,7 +10348,7 @@ def _reduce_359(val, _values, result)
 end
 
 def _reduce_360(val, _values, result)
-                      if @context.in_class && !@context.in_def && !(context.in_block || context.in_lambda)
+                      if @context.cant_return && !(context.in_block || context.in_lambda)
                         diagnostic :error, :invalid_return, nil, val[0]
                       end
 

package/plugins/rubyastgen/bundle/ruby/3.4.0/gems/{parser-3.3.6.0 → parser-3.3.7.0}/lib/parser/runner.rb

@@ -242,7 +242,12 @@ module Parser
 
     def process_files
       @files.each do |filename|
-        source = File.read(filename).force_encoding(@parser.default_encoding)
+        source = begin
+          File.read(filename).force_encoding(@parser.default_encoding)
+        rescue Errno::EISDIR
+          # Will happen for a folder called `foo.rb`. Just catch this here, it's cheaper than checking every file.
+          next
+        end
 
         buffer = Parser::Source::Buffer.new(filename)
 

package/plugins/rubyastgen/bundle/ruby/3.4.0/gems/{parser-3.3.6.0 → parser-3.3.7.0}/lib/parser/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Parser
-  VERSION = '3.3.6.0'
+  VERSION = '3.3.7.0'
 end

package/plugins/rubyastgen/bundle/ruby/3.4.0/specifications/{parser-3.3.6.0.gemspec → parser-3.3.7.0.gemspec}

@@ -1,15 +1,15 @@
 # -*- encoding: utf-8 -*-
-# stub: parser 3.3.6.0 ruby lib
+# stub: parser 3.3.7.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "parser".freeze
-  s.version = "3.3.6.0".freeze
+  s.version = "3.3.7.0".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
-  s.metadata = { "bug_tracker_uri" => "https://github.com/whitequark/parser/issues", "changelog_uri" => "https://github.com/whitequark/parser/blob/v3.3.6.0/CHANGELOG.md", "documentation_uri" => "https://www.rubydoc.info/gems/parser/3.3.6.0", "source_code_uri" => "https://github.com/whitequark/parser/tree/v3.3.6.0" } if s.respond_to? :metadata=
+  s.metadata = { "bug_tracker_uri" => "https://github.com/whitequark/parser/issues", "changelog_uri" => "https://github.com/whitequark/parser/blob/v3.3.7.0/CHANGELOG.md", "documentation_uri" => "https://www.rubydoc.info/gems/parser/3.3.7.0", "source_code_uri" => "https://github.com/whitequark/parser/tree/v3.3.7.0" } if s.respond_to? :metadata=
   s.require_paths = ["lib".freeze]
   s.authors = ["whitequark".freeze]
-  s.date = "2024-11-05"
+  s.date = "2025-01-16"
   s.description = "A Ruby parser written in pure Ruby.".freeze
   s.email = ["whitequark@whitequark.org".freeze]
   s.executables = ["ruby-parse".freeze, "ruby-rewrite".freeze]

package/plugins/rubyastgen/bundle/ruby/3.4.0/bundler/gems/ruby_ast_gen-df21eaeb39f9/.github/workflows/pr.yaml

@@ -1,21 +0,0 @@
-name: Pull Request Testing
-on:
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.1.4
-          bundler-cache: true 
-
-      - name: Run the default task
-        run: bundle exec rake

package/plugins/rubyastgen/bundle/ruby/3.4.0/bundler/gems/ruby_ast_gen-df21eaeb39f9/.github/workflows/release.yml

@@ -1,84 +0,0 @@
-name: Build and Release Vendored Gemfile
-
-on:
-  push:
-    branches:
-      - 'main'
-
-jobs:
-  release:
-    if: github.repository_owner == 'joernio'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Get next release version (dry run)
-        id: taggerDryRun
-        uses: anothrNick/github-tag-action@1.61.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          WITH_V: true
-          DRY_RUN: true
-
-      - name: Show next version
-        env:
-          CURR_TAG: ${{ steps.taggerDryRun.outputs.tag }}"
-          NEW_TAG: ${{ steps.taggerDryRun.outputs.new_tag }}
-        run: |
-          echo "The next tag version will be: $NEW_TAG"
-          echo "The current tag is: $CURR_TAG"
-          ./update_version.rb $NEW_TAG
-
-      - name: Set up JDK
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: '21'
-
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.1.4
-          bundler-cache: false
-
-      - name: Set up JRuby
-        run: |
-          curl 'https://repo1.maven.org/maven2/org/jruby/jruby-complete/9.4.8.0/jruby-complete-9.4.8.0.jar' \
-            --output jruby.jar
-
-      - name: Install dependencies and build release
-        run: |
-          mkdir -p ${PWD}/vendor/bundle/jruby/3.1.0
-          export GEM_HOME=${PWD}/vendor/bundle/jruby/3.1.0
-          export GEM_PATH=${PWD}/vendor/bundle/jruby/3.1.0
-          export PATH=$GEM_HOME/bin:$PATH
-          
-          java -jar jruby.jar -S gem install bundler -v 2.5.21 --install-dir ${GEM_HOME}
-          java -jar jruby.jar -S bundle install
-
-          find vendor/bundle/jruby/3.1.0 -mindepth 1 -maxdepth 1 -type \
-            d ! -name "gems" ! -name "bin" ! -name "specifications" \
-            -exec rm -rf {} +
-          zip -r ruby_ast_gen_${{ steps.taggerDryRun.outputs.new_tag }}.zip \
-            lib exe vendor Gemfile ruby_ast_gen.gemspec
-
-      - name: Add and commit updated files holding version information
-        uses: stefanzweifel/git-auto-commit-action@v5
-        with:
-          file_pattern: |
-            lib/ruby_ast_gen/version.rb
-            Gemfile.lock
-          commit_message: Update VERSION file
-
-      - name: Upload vendored distribution to GitHub Release
-        uses: softprops/action-gh-release@v2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GITHUB_TOKEN_PERMISSIONS: "read:packages, write:packages"
-        with:
-          tag_name: ${{ steps.taggerDryRun.outputs.new_tag }}
-          files: |
-            ruby_ast_gen_*.zip

package/plugins/rubyastgen/bundle/ruby/3.4.0/bundler/gems/ruby_ast_gen-df21eaeb39f9/Gemfile

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-
-gemspec
-
-gem "parser", "~> 3.3"
-
-gem "ostruct", "~> 0.6.0"
-
-gem "rake", "~> 13.0"
-
-gem "rspec", "~> 3.0"