@appthreat/atom 2.0.25 → 2.1.1

package/index.js

@@ -43,15 +43,13 @@ export const executeAtom = (atomArgs) => {
   if (!detectJava()) {
     // If we couldn't detect java but there is a JAVA_HOME defined then
     // try fixing the PATH manually. Usually required for windows users
-    if (process.env.JAVA_HOME) {
+    const atomJavaHome = process.env.ATOM_JAVA_HOME || process.env.JAVA_HOME;
+    if (atomJavaHome) {
       process.env.PATH =
-        process.env.PATH +
-        delimiter +
-        join(process.env.JAVA_HOME, "bin") +
-        delimiter;
+        join(atomJavaHome, "bin") + delimiter + process.env.PATH + delimiter;
     } else {
       console.warn(
-        "A Java JDK is not installed or can't be found. Please install JDK version 17 or higher before running atom."
+        "A Java JDK is not installed or can't be found. Please install JDK version 21 or higher before running atom."
       );
       return false;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appthreat/atom",
-  "version": "2.0.25",
+  "version": "2.1.1",
   "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.2",
-    "typescript": "^5.6.3",
+    "@babel/parser": "^7.26.3",
+    "typescript": "^5.7.2",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
@@ -19,7 +19,8 @@
   "bin": {
     "atom": "index.js",
     "astgen": "astgen.js",
-    "phpastgen": "phpastgen.js"
+    "phpastgen": "phpastgen.js",
+    "rbastgen": "rbastgen.js"
   },
   "engines": {
     "node": ">=16.0.0"

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

package/plugins/bin/bundler

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'bundler' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+$:.unshift File.expand_path "../rubyastgen/bundle", __dir__
+
+require "bundler/setup"
+load File.expand_path "../../../../../../../../../opt/hostedtoolcache/Ruby/3.4.1/x64/lib/ruby/gems/3.4.0/gems/bundler-2.6.2/exe/bundler", __dir__

package/plugins/bin/ruby_ast_gen

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'ruby_ast_gen' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+$:.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-1c6e88faec50/exe/ruby_ast_gen", __dir__

package/plugins/composer/InstalledVersions.php

@@ -322,6 +322,7 @@ class InstalledVersions
         }
 
         $installed = array();
+        $copiedLocalDir = false;
 
         if (self::$canGetVendors) {
             foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
@@ -330,9 +331,11 @@ class InstalledVersions
                 } elseif (is_file($vendorDir.'/composer/installed.php')) {
                     /** @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[]}>} $required */
                     $required = require $vendorDir.'/composer/installed.php';
-                    $installed[] = self::$installedByVendor[$vendorDir] = $required;
-                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
-                        self::$installed = $installed[count($installed) - 1];
+                    self::$installedByVendor[$vendorDir] = $required;
+                    $installed[] = $required;
+                    if (strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
+                        self::$installed = $required;
+                        $copiedLocalDir = true;
                     }
                 }
             }
@@ -350,7 +353,7 @@ class InstalledVersions
             }
         }
 
-        if (self::$installed !== array()) {
+        if (self::$installed !== array() && !$copiedLocalDir) {
             $installed[] = self::$installed;
         }
 

package/plugins/composer/installed.php

@@ -1,9 +1,9 @@
 <?php return array(
     'root' => array(
         'name' => '__root__',
-        'pretty_version' => 'v2.0.25',
-        'version' => '2.0.25.0',
-        'reference' => '7d61e9d7f78c801dac384a0120b8f3edd3cc99a9',
+        'pretty_version' => 'v2.1.1',
+        'version' => '2.1.1.0',
+        'reference' => 'b69d333c11ef856bb6ac75d8d4d0b470e9adca58',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -11,9 +11,9 @@
     ),
     'versions' => array(
         '__root__' => array(
-            'pretty_version' => 'v2.0.25',
-            'version' => '2.0.25.0',
-            'reference' => '7d61e9d7f78c801dac384a0120b8f3edd3cc99a9',
+            'pretty_version' => 'v2.1.1',
+            'version' => '2.1.1.0',
+            'reference' => 'b69d333c11ef856bb6ac75d8d4d0b470e9adca58',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),

package/plugins/rubyastgen/.bundle/config

@@ -0,0 +1,5 @@
+---
+BUNDLE_BIN: "../bin"
+BUNDLE_PATH: "bundle"
+BUNDLE_DISABLE_SHARED_GEMS: "1"
+BUNDLE_CACHE_ALL: "false"

package/plugins/rubyastgen/Gemfile

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+ruby ">=3.4.1"
+
+source "https://rubygems.org"
+
+group :frontend do
+    gem "ruby_ast_gen", github: 'joernio/ruby_ast_gen', ref: 'v0.34.0'
+    gem "parser"
+    gem "ostruct"
+end

package/plugins/rubyastgen/Gemfile.lock

@@ -0,0 +1,31 @@
+GIT
+  remote: https://github.com/joernio/ruby_ast_gen.git
+  revision: 1c6e88faec50a986d319e7fbcfe297ec01c48e5a
+  ref: v0.34.0
+  specs:
+    ruby_ast_gen (0.34.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.2)
+    ostruct (0.6.1)
+    parser (3.3.6.0)
+      ast (~> 2.4.1)
+      racc
+    racc (1.8.1)
+
+PLATFORMS
+  ruby
+  x86_64-darwin-23
+
+DEPENDENCIES
+  ostruct
+  parser
+  ruby_ast_gen!
+
+RUBY VERSION
+   ruby 3.4.1p0
+
+BUNDLED WITH
+   2.6.2

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

@@ -0,0 +1,42 @@
+require 'rbconfig'
+module Kernel
+  remove_method(:gem) if private_method_defined?(:gem)
+
+  def gem(*)
+  end
+
+  private :gem
+end
+unless defined?(Gem)
+  module Gem
+    def self.ruby_api_version
+      RbConfig::CONFIG["ruby_version"]
+    end
+
+    def self.extension_api_version
+      if 'no' == RbConfig::CONFIG['ENABLE_SHARED']
+        "#{ruby_api_version}-static"
+      else
+        ruby_api_version
+      end
+    end
+  end
+end
+if Gem.respond_to?(:discover_gems_on_require=)
+  Gem.discover_gems_on_require = false
+else
+  [::Kernel.singleton_class, ::Kernel].each do |k|
+    if k.private_method_defined?(:gem_original_require)
+      private_require = k.private_method_defined?(:require)
+      k.send(:remove_method, :require)
+      k.send(:define_method, :require, k.instance_method(:gem_original_require))
+      k.send(:private, :require) if private_require
+    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/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-1c6e88faec50/lib")

package/plugins/rubyastgen/bundle/ruby/3.4.0/bin/racc

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'racc' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+Gem.use_gemdeps
+
+version = ">= 0.a"
+
+str = ARGV.first
+if str
+  str = str.b[/\A_(.*)_\z/, 1]
+  if str and Gem::Version.correct?(str)
+    version = str
+    ARGV.shift
+  end
+end
+
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('racc', 'racc', version)
+else
+gem "racc", version
+load Gem.bin_path("racc", "racc", version)
+end

package/plugins/rubyastgen/bundle/ruby/3.4.0/bin/ruby-parse

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'parser' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+Gem.use_gemdeps
+
+version = ">= 0.a"
+
+str = ARGV.first
+if str
+  str = str.b[/\A_(.*)_\z/, 1]
+  if str and Gem::Version.correct?(str)
+    version = str
+    ARGV.shift
+  end
+end
+
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('parser', 'ruby-parse', version)
+else
+gem "parser", version
+load Gem.bin_path("parser", "ruby-parse", version)
+end

package/plugins/rubyastgen/bundle/ruby/3.4.0/bin/ruby-rewrite

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'parser' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+Gem.use_gemdeps
+
+version = ">= 0.a"
+
+str = ARGV.first
+if str
+  str = str.b[/\A_(.*)_\z/, 1]
+  if str and Gem::Version.correct?(str)
+    version = str
+    ARGV.shift
+  end
+end
+
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('parser', 'ruby-rewrite', version)
+else
+gem "parser", version
+load Gem.bin_path("parser", "ruby-rewrite", version)
+end

package/plugins/rubyastgen/bundle/ruby/3.4.0/bin/ruby_ast_gen

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'ruby_ast_gen' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+Gem.use_gemdeps
+
+version = ">= 0.a"
+
+str = ARGV.first
+if str
+  str = str.b[/\A_(.*)_\z/, 1]
+  if str and Gem::Version.correct?(str)
+    version = str
+    ARGV.shift
+  end
+end
+
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('ruby_ast_gen', 'ruby_ast_gen', version)
+else
+gem "ruby_ast_gen", version
+load Gem.bin_path("ruby_ast_gen", "ruby_ast_gen", version)
+end

package/plugins/rubyastgen/bundle/ruby/3.4.0/bundler/gems/ruby_ast_gen-1c6e88faec50/.rspec

@@ -0,0 +1,3 @@
+--format documentation
+--color
+--require spec_helper

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

@@ -0,0 +1,13 @@
+# 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"