@appthreat/atom 2.1.13 → 2.1.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appthreat/atom",
-  "version": "2.1.13",
+  "version": "2.1.15",
   "description": "Create atom (⚛) representation for your application, packages and libraries",
   "exports": "./index.js",
   "type": "module",
@@ -9,8 +9,8 @@
     "lint": "eslint *.mjs *.js"
   },
   "dependencies": {
-    "@babel/parser": "^7.26.9",
-    "typescript": "^5.8.2",
+    "@babel/parser": "^7.27.0",
+    "typescript": "^5.8.3",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
@@ -20,7 +20,8 @@
     "atom": "index.js",
     "astgen": "astgen.js",
     "phpastgen": "phpastgen.js",
-    "rbastgen": "rbastgen.js"
+    "rbastgen": "rbastgen.js",
+    "scalasem": "scalasem.js"
   },
   "engines": {
     "node": ">=16.0.0"

package/phpastgen.js

@@ -20,11 +20,7 @@ function main(argvs) {
     return false;
   }
   const cwd = process.env.ATOM_CWD || process.cwd();
-  argvs.splice(
-    0,
-    1,
-    process.env.PHP_PARSER_BIN || join(PLUGINS_HOME, "bin", "php-parse")
-  );
+  argvs.splice(0, 1, PHP_PARSER_BIN);
   spawnSync(process.env.PHP_CMD || "php", argvs, {
     encoding: "utf-8",
     cwd,

package/plugins/autoload.php

@@ -14,10 +14,7 @@ if (PHP_VERSION_ID < 50600) {
             echo $err;
         }
     }
-    trigger_error(
-        $err,
-        E_USER_ERROR
-    );
+    throw new RuntimeException($err);
 }
 
 require_once __DIR__ . '/composer/autoload_real.php';

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.13-classpath.jar"
+declare -r app_classpath="$lib_dir/io.appthreat.atom-2.1.15-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.13-classpath.jar"
+set "APP_CLASSPATH=%APP_LIB_DIR%\io.appthreat.atom-2.1.15-classpath.jar"
 set "APP_MAIN_CLASS=io.appthreat.atom.Atom"
 set "SCRIPT_CONF_FILE=%APP_HOME%\conf\application.ini"
 

package/plugins/bin/bundler

@@ -11,4 +11,4 @@
 $:.unshift File.expand_path "../rubyastgen/bundle", __dir__
 
 require "bundler/setup"
-load File.expand_path "../../../../../../../../../opt/hostedtoolcache/Ruby/3.4.2/x64/lib/ruby/gems/3.4.0/gems/bundler-2.6.2/exe/bundler", __dir__
+load File.expand_path "../../../../../../../../../opt/hostedtoolcache/Ruby/3.4.3/x64/lib/ruby/gems/3.4.0/gems/bundler-2.6.7/exe/bundler", __dir__

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-d8b6ffa44317/exe/ruby_ast_gen", __dir__
+load File.expand_path "../rubyastgen/bundle/ruby/3.4.0/bundler/gems/ruby_ast_gen-d8b5c5740b5a/exe/ruby_ast_gen", __dir__

package/plugins/composer/InstalledVersions.php

@@ -26,6 +26,12 @@ use Composer\Semver\VersionParser;
  */
 class InstalledVersions
 {
+    /**
+     * @var string|null if set (by reflection by Composer), this should be set to the path where this class is being copied to
+     * @internal
+     */
+    private static $selfDir = null;
+
     /**
      * @var mixed[]|null
      * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
@@ -322,6 +328,18 @@ class InstalledVersions
         self::$installedIsLocalDir = false;
     }
 
+    /**
+     * @return string
+     */
+    private static function getSelfDir()
+    {
+        if (self::$selfDir === null) {
+            self::$selfDir = strtr(__DIR__, '\\', '/');
+        }
+
+        return self::$selfDir;
+    }
+
     /**
      * @return array[]
      * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
@@ -336,7 +354,7 @@ class InstalledVersions
         $copiedLocalDir = false;
 
         if (self::$canGetVendors) {
-            $selfDir = strtr(__DIR__, '\\', '/');
+            $selfDir = self::getSelfDir();
             foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
                 $vendorDir = strtr($vendorDir, '\\', '/');
                 if (isset(self::$installedByVendor[$vendorDir])) {

package/plugins/composer/installed.php

@@ -1,9 +1,9 @@
 <?php return array(
     'root' => array(
         'name' => '__root__',
-        'pretty_version' => 'v2.1.13',
-        'version' => '2.1.13.0',
-        'reference' => 'cbf0caab75d535ac02719b3c97e9978955da5721',
+        'pretty_version' => 'v2.1.15',
+        'version' => '2.1.15.0',
+        'reference' => 'f768af5b1b69aac34b37e58de2ddce2e659f8935',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -11,9 +11,9 @@
     ),
     'versions' => array(
         '__root__' => array(
-            'pretty_version' => 'v2.1.13',
-            'version' => '2.1.13.0',
-            'reference' => 'cbf0caab75d535ac02719b3c97e9978955da5721',
+            'pretty_version' => 'v2.1.15',
+            'version' => '2.1.15.0',
+            'reference' => 'f768af5b1b69aac34b37e58de2ddce2e659f8935',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),

package/plugins/rubyastgen/Gemfile

@@ -5,8 +5,8 @@ ruby ">=3.1.4"
 source "https://rubygems.org"
 
 group :frontend do
-    gem "ruby_ast_gen", github: 'appthreat/ruby_ast_gen', ref: 'v1.0.3'
-    gem "parser", "~> 3.3.7.1"
+    gem "ruby_ast_gen", github: 'appthreat/ruby_ast_gen', ref: 'v1.0.4'
+    gem "parser", "~> 3.3.8.0"
     gem "ostruct", "~> 0.6.1"
     gem "racc", "~> 1.8.1"
 end

package/plugins/rubyastgen/Gemfile.lock

@@ -1,16 +1,16 @@
 GIT
   remote: https://github.com/appthreat/ruby_ast_gen.git
-  revision: d8b6ffa44317c8cc4bb499e0dd1277295422a18f
-  ref: v1.0.3
+  revision: d8b5c5740b5a7cb587891dbf3dd2de86670064cd
+  ref: v1.0.4
   specs:
-    ruby_ast_gen (1.0.3)
+    ruby_ast_gen (1.0.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.2)
+    ast (2.4.3)
     ostruct (0.6.1)
-    parser (3.3.7.1)
+    parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
     racc (1.8.1)
@@ -23,12 +23,12 @@ PLATFORMS
 
 DEPENDENCIES
   ostruct (~> 0.6.1)
-  parser (~> 3.3.7.1)
+  parser (~> 3.3.8.0)
   racc (~> 1.8.1)
   ruby_ast_gen!
 
 RUBY VERSION
-   ruby 3.4.1p0
+   ruby 3.4.3p32
 
 BUNDLED WITH
-   2.6.2
+   2.6.7

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

@@ -34,9 +34,9 @@ else
     end
   end
 end
-$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/ast-2.4.2/lib")
+$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/ast-2.4.3/lib")
 $:.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.7.1/lib")
-$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/bundler/gems/ruby_ast_gen-d8b6ffa44317/lib")
+$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/parser-3.3.8.0/lib")
+$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/bundler/gems/ruby_ast_gen-d8b5c5740b5a/lib")

package/plugins/rubyastgen/bundle/ruby/3.4.0/bundler/gems/{ruby_ast_gen-d8b6ffa44317 → ruby_ast_gen-d8b5c5740b5a}/Gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "parser", "~> 3.3.7.1"
+gem "parser", "~> 3.3.8.0"
 gem "ostruct", "~> 0.6.1"
-gem "rake", "~> 13.2"
-gem "rspec", "~> 3.13"
+gem "rake", "~> 13.2.1"
+gem "rspec", "~> 3.13.0"

package/plugins/rubyastgen/bundle/ruby/3.4.0/bundler/gems/{ruby_ast_gen-d8b6ffa44317 → ruby_ast_gen-d8b5c5740b5a}/lib/ruby_ast_gen/version.rb

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

package/plugins/rubyastgen/bundle/ruby/3.4.0/bundler/gems/{ruby_ast_gen-d8b6ffa44317 → ruby_ast_gen-d8b5c5740b5a}/ruby_ast_gen.gemspec

@@ -1,16 +1,16 @@
 # -*- encoding: utf-8 -*-
-# stub: ruby_ast_gen 1.0.3 ruby lib
+# stub: ruby_ast_gen 1.0.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ruby_ast_gen".freeze
-  s.version = "1.0.3".freeze
+  s.version = "1.0.4".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-03-05"
+  s.date = "1980-01-02"
   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]
@@ -18,8 +18,8 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/appthreat/ruby_ast_gen".freeze
   s.licenses = ["MIT".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 3.1.4".freeze)
-  s.rubygems_version = "3.6.2".freeze
+  s.rubygems_version = "3.6.7".freeze
   s.summary = "A Ruby parser than dumps the AST as JSON output".freeze
 
-  s.installed_by_version = "3.6.2".freeze
+  s.installed_by_version = "3.6.7".freeze
 end

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

@@ -1,18 +1,18 @@
 current directory: /home/runner/work/atom/atom/wrapper/nodejs/plugins/rubyastgen/bundle/ruby/3.4.0/gems/racc-1.8.1/ext/racc/cparse
-/opt/hostedtoolcache/Ruby/3.4.2/x64/bin/ruby extconf.rb
+/opt/hostedtoolcache/Ruby/3.4.3/x64/bin/ruby extconf.rb
 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.20250305-2774-qrpo6g sitelibdir\=./.gem.20250305-2774-qrpo6g clean
+make DESTDIR\= sitearchdir\=./.gem.20250418-2951-tfllqw sitelibdir\=./.gem.20250418-2951-tfllqw 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.20250305-2774-qrpo6g sitelibdir\=./.gem.20250305-2774-qrpo6g
+make DESTDIR\= sitearchdir\=./.gem.20250418-2951-tfllqw sitelibdir\=./.gem.20250418-2951-tfllqw
 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.20250305-2774-qrpo6g sitelibdir\=./.gem.20250305-2774-qrpo6g install
-/usr/bin/install -c -m 0755 cparse.so ./.gem.20250305-2774-qrpo6g/racc
+make DESTDIR\= sitearchdir\=./.gem.20250418-2951-tfllqw sitelibdir\=./.gem.20250418-2951-tfllqw install
+/usr/bin/install -c -m 0755 cparse.so ./.gem.20250418-2951-tfllqw/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.20250305-2774-qrpo6g sitelibdir\=./.gem.20250305-2774-qrpo6g clean
+make DESTDIR\= sitearchdir\=./.gem.20250418-2951-tfllqw sitelibdir\=./.gem.20250418-2951-tfllqw clean

package/plugins/rubyastgen/bundle/ruby/3.4.0/gems/{ast-2.4.2 → ast-2.4.3}/lib/ast/node.rb

@@ -57,7 +57,7 @@ module AST
     alias to_a children
 
     # Returns the precomputed hash value for this node
-    # @return [Fixnum]
+    # @return [Integer]
     attr_reader :hash
 
     # Constructs a new instance of Node.

package/plugins/rubyastgen/bundle/ruby/3.4.0/gems/{ast-2.4.2 → ast-2.4.3}/lib/ast/processor.rb

@@ -6,7 +6,7 @@ module AST
   #
   # @deprecated Use {AST::Processor::Mixin} instead.
   class Processor
-    require 'ast/processor/mixin'
+    require_relative 'processor/mixin'
     include Mixin
   end
 end

package/plugins/rubyastgen/bundle/ruby/3.4.0/gems/{ast-2.4.2 → ast-2.4.3}/lib/ast/sexp.rb

@@ -3,8 +3,8 @@ module AST
   # to define deeply nested ASTs from Ruby code, for example, in
   # tests. It should be used like this:
   #
-  #     describe YourLanguage::AST do
-  #       include Sexp
+  #     describe YourLanguage do
+  #       include ::AST::Sexp
   #
   #       it "should correctly parse expressions" do
   #         YourLanguage.parse("1 + 2 * 3").should ==

package/plugins/rubyastgen/bundle/ruby/3.4.0/gems/{ast-2.4.2 → ast-2.4.3}/lib/ast.rb

@@ -11,7 +11,7 @@
 # additional recommendations and design patterns.
 #
 module AST
-  require 'ast/node'
-  require 'ast/processor'
-  require 'ast/sexp'
+  require_relative 'ast/node'
+  require_relative 'ast/processor'
+  require_relative 'ast/sexp'
 end

package/plugins/rubyastgen/bundle/ruby/3.4.0/gems/{parser-3.3.7.1 → parser-3.3.8.0}/lib/parser/base.rb

@@ -13,6 +13,9 @@ module Parser
   # @!attribute [r] static_env
   #  @return [Parser::StaticEnvironment]
   #
+  # @!attribute [r] version
+  #  @return [Integer]
+  #
   class Base < Racc::Parser
     ##
     # Parses a string of Ruby code and returns the AST. If the source

package/plugins/rubyastgen/bundle/ruby/3.4.0/gems/{parser-3.3.7.1 → parser-3.3.8.0}/lib/parser/builders/default.rb

@@ -524,10 +524,10 @@ module Parser
 
       label = value(key_t)
       value =
-        if label =~ /\A[[:lower:]]/
-          n(:ident, [ label.to_sym ], Source::Map::Variable.new(value_l))
-        else
+        if label =~ /\A[[:upper:]]/
           n(:const, [ nil, label.to_sym ], Source::Map::Constant.new(nil, value_l, value_l))
+        else
+          n(:ident, [ label.to_sym ], Source::Map::Variable.new(value_l))
         end
       pair_keyword(key_t, accessible(value))
     end
@@ -1120,15 +1120,19 @@ module Parser
     end
 
     def block(method_call, begin_t, args, body, end_t)
-      _receiver, _selector, *call_args = *method_call
-
       if method_call.type == :yield
         diagnostic :error, :block_given_to_yield, nil, method_call.loc.keyword, [loc(begin_t)]
       end
 
-      last_arg = call_args.last
+      if method_call.type == :super
+        *_args, last_arg = *method_call
+      else
+        _receiver, _selector, *_args, last_arg = *method_call
+      end
       if last_arg && (last_arg.type == :block_pass || last_arg.type == :forwarded_args)
-        diagnostic :error, :block_and_blockarg, nil, last_arg.loc.expression, [loc(begin_t)]
+        if (@parser.version == 33 && method_call.type != :super) || @parser.version != 33
+          diagnostic :error, :block_and_blockarg, nil, last_arg.loc.expression, [loc(begin_t)]
+        end
       end
 
       if args.type == :numargs
@@ -1192,6 +1196,10 @@ module Parser
     end
 
     def index_asgn(receiver, lbrack_t, indexes, rbrack_t)
+      if self.class.emit_kwargs
+        rewrite_hash_args_to_kwargs(indexes)
+      end
+
       if self.class.emit_index
         n(:indexasgn, [ receiver, *indexes ],
           index_map(receiver, lbrack_t, rbrack_t))
@@ -2263,7 +2271,12 @@ module Parser
         source
       end
 
-      Regexp.new(source, (Regexp::EXTENDED if options.children.include?(:x)))
+      begin
+        old_verbose, $VERBOSE = $VERBOSE, nil
+        Regexp.new(source, (Regexp::EXTENDED if options.children.include?(:x)))
+      ensure
+        $VERBOSE = old_verbose
+      end
     end
 
     def static_regexp_node(node)

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

@@ -93,7 +93,7 @@ module Parser
     CurrentRuby = Ruby30
 
   when /^3\.1\./
-    current_version = '3.1.6'
+    current_version = '3.1.7'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby31', current_version
     end
@@ -102,7 +102,7 @@ module Parser
     CurrentRuby = Ruby31
 
   when /^3\.2\./
-    current_version = '3.2.7'
+    current_version = '3.2.8'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby32', current_version
     end
@@ -111,7 +111,7 @@ module Parser
     CurrentRuby = Ruby32
 
   when /^3\.3\./
-    current_version = '3.3.7'
+    current_version = '3.3.8'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby33', current_version
     end
@@ -134,4 +134,13 @@ module Parser
     require_relative 'ruby33'
     CurrentRuby = Ruby33
   end
+  # @!parse
+  #  ##
+  #  # @api public
+  #  #
+  #  # Parser for the running version of Ruby. NOTE: Supports only Ruby <= 3.3. To parse Ruby 3.4+, please use the prism gem. You can also use them in conjunction to support multiple versions using a backwards-compatible AST.
+  #  #
+  #  # @see https://ruby.github.io/prism/rb/docs/ruby_api_md.html prism gem documentation
+  #  # @see https://github.com/whitequark/parser/blob/master/doc/PRISM_TRANSLATION.md Guide to using prism and parser together.
+  #  class ::Parser::CurrentRuby < ::Parser::Base; end
 end