@appthreat/atom 2.0.9 → 2.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appthreat/atom",
-  "version": "2.0.9",
+  "version": "2.0.11",
   "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.24.0",
-    "typescript": "^5.4.2",
+    "@babel/parser": "^7.24.4",
+    "typescript": "^5.4.5",
     "yargs": "^17.7.2"
   },
   "devDependencies": {

package/plugins/bin/atom

@@ -154,7 +154,7 @@ addResidual () {
   residual_args+=( "$1" )
 }
 addDebugger () {
-  addJava "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$1"
+  addJava "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:$1"
 }
 
 require_arg () {
@@ -357,10 +357,10 @@ declare -r real_script_path="$(realpath "$0")"
 declare -r app_home="$(realpath "$(dirname "$real_script_path")")"
 # TODO - Check whether this is ok in cygwin...
 declare -r lib_dir="$(realpath "${app_home}/../lib")"
-declare -a app_mainclass=(io.appthreat.atom.Atom)
+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.9-classpath.jar"
+declare -r app_classpath="$lib_dir/io.appthreat.atom-2.0.11-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.9-classpath.jar"
+set "APP_CLASSPATH=%APP_LIB_DIR%\io.appthreat.atom-2.0.11-classpath.jar"
 set "APP_MAIN_CLASS=io.appthreat.atom.Atom"
 set "SCRIPT_CONF_FILE=%APP_HOME%\conf\application.ini"
 
@@ -59,6 +59,11 @@ if defined BUNDLED_JVM (
 
 if "%_JAVACMD%"=="" set _JAVACMD=java
 
+rem if configuration files exist, prepend their contents to the script arguments so it can be processed by this runner
+call :parse_config "%SCRIPT_CONF_FILE%" SCRIPT_CONF_ARGS
+
+call :process_args %SCRIPT_CONF_ARGS% %%*
+
 rem Detect if this java is ok to use.
 for /F %%j in ('"%_JAVACMD%" -version  2^>^&1') do (
   if %%~j==java set JAVAINSTALLED=1
@@ -88,11 +93,6 @@ if "%JAVAOK%"=="false" (
   exit /B 1
 )
 
-rem if configuration files exist, prepend their contents to the script arguments so it can be processed by this runner
-call :parse_config "%SCRIPT_CONF_FILE%" SCRIPT_CONF_ARGS
-
-call :process_args %SCRIPT_CONF_ARGS% %%*
-
 set _JAVA_OPTS=!_JAVA_OPTS! !_JAVA_PARAMS!
 
 if defined CUSTOM_MAIN_CLASS (
@@ -137,23 +137,36 @@ exit /B 0
 rem Processes incoming arguments and places them in appropriate global variables
 :process_args
   :param_loop
-  call set _PARAM1=%%1
-  set "_TEST_PARAM=%~1"
+  shift
+  call set _PARAM1=%%0
+  set "_TEST_PARAM=%~0"
 
   if ["!_PARAM1!"]==[""] goto param_afterloop
 
+  if "!_TEST_PARAM!"=="-main" (
+    call set CUSTOM_MAIN_CLASS=%%1
+    shift
+    goto param_loop
+  )
 
-  rem ignore arguments that do not start with '-'
-  if "%_TEST_PARAM:~0,1%"=="-" goto param_java_check
-  set _APP_ARGS=!_APP_ARGS! !_PARAM1!
-  shift
-  goto param_loop
+  if "!_TEST_PARAM!"=="-java-home" (
+    set "JAVA_HOME=%~1"
+    set "_JAVACMD=%~1\bin\java.exe"
+    shift
+    goto param_loop
+  )
 
-  :param_java_check
   if "!_TEST_PARAM:~0,2!"=="-J" (
     rem strip -J prefix
-    set _JAVA_PARAMS=!_JAVA_PARAMS! !_TEST_PARAM:~2!
-    shift
+    call set _TEST_PARAM=!_TEST_PARAM:~2!
+    if not "!_TEST_PARAM:~0,5!" == "-XX:+" if not "!_TEST_PARAM:~0,5!" == "-XX:-" if "!_TEST_PARAM:~0,3!" == "-XX" (
+      rem special handling for -J-XX since '=' gets parsed away
+      for /F "delims== tokens=1,*" %%G in ("!_TEST_PARAM!") DO (
+        call set _TEST_PARAM=!_TEST_PARAM!=%%1
+        shift
+      )
+    )
+    set _JAVA_PARAMS=!_JAVA_PARAMS! !_TEST_PARAM!
     goto param_loop
   )
 
@@ -162,22 +175,18 @@ rem Processes incoming arguments and places them in appropriate global variables
     for /F "delims== tokens=1,*" %%G in ("!_TEST_PARAM!") DO (
       if not ["%%H"] == [""] (
         set _JAVA_PARAMS=!_JAVA_PARAMS! !_PARAM1!
-      ) else if [%2] neq [] (
+      ) else if [%1] neq [] (
         rem it was a normal property: -Dprop=42 or -Drop="42"
-        call set _PARAM1=%%1=%%2
+        call set _PARAM1=%%0=%%1
         set _JAVA_PARAMS=!_JAVA_PARAMS! !_PARAM1!
         shift
       )
     )
-  ) else (
-    if "!_TEST_PARAM!"=="-main" (
-      call set CUSTOM_MAIN_CLASS=%%2
-      shift
-    ) else (
-      set _APP_ARGS=!_APP_ARGS! !_PARAM1!
-    )
+    goto param_loop
   )
-  shift
+
+  set _APP_ARGS=!_APP_ARGS! !_PARAM1!
+
   goto param_loop
   :param_afterloop
 

package/plugins/composer/installed.php

@@ -1,9 +1,9 @@
 <?php return array(
     'root' => array(
         'name' => '__root__',
-        'pretty_version' => 'v2.0.9',
-        'version' => '2.0.9.0',
-        'reference' => 'ed925a43aa72f1319a0e65d4c08bd895d5e02308',
+        'pretty_version' => 'v2.0.11',
+        'version' => '2.0.11.0',
+        'reference' => 'b9117f7f42bdcf2a71d1c29fe5c1cb64217d8930',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -11,9 +11,9 @@
     ),
     'versions' => array(
         '__root__' => array(
-            'pretty_version' => 'v2.0.9',
-            'version' => '2.0.9.0',
-            'reference' => 'ed925a43aa72f1319a0e65d4c08bd895d5e02308',
+            'pretty_version' => 'v2.0.11',
+            'version' => '2.0.11.0',
+            'reference' => 'b9117f7f42bdcf2a71d1c29fe5c1cb64217d8930',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),