@appthreat/atom 2.2.1 → 2.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appthreat/atom",
-  "version": "2.2.1",
+  "version": "2.2.3",
   "description": "Create atom (⚛) representation for your application, packages and libraries",
   "exports": "./index.js",
   "type": "module",
@@ -9,8 +9,8 @@
     "lint": "eslint *.mjs *.js"
   },
   "dependencies": {
-    "@appthreat/atom-common": "workspace:packages/atom-common",
-    "@appthreat/atom-parsetools": "workspace:packages/atom-parsetools"
+    "@appthreat/atom-common": "*",
+    "@appthreat/atom-parsetools": "*"
   },
   "devDependencies": {
     "eslint": "8.57.0"

package/packages/atom-parsetools/phpastgen.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 
+import { existsSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { spawnSync } from "node:child_process";
 import { fileURLToPath } from "node:url";
@@ -11,9 +12,23 @@ if (!url.startsWith("file://")) {
 }
 const dirName = import.meta ? dirname(fileURLToPath(url)) : __dirname;
 export const PLUGINS_HOME = join(dirName, "plugins");
-const PHP_PARSER_BIN =
+export const PARENT_NODE_PLUGINS_HOME = join(
+  dirName,
+  "..",
+  "..",
+  "node_modules",
+  "@appthreat",
+  "atom-parsetools",
+  "plugins"
+);
+let PHP_PARSER_BIN =
   process.env.PHP_PARSER_BIN || join(PLUGINS_HOME, "bin", "php-parse");
-
+if (
+  !existsSync(PHP_PARSER_BIN) &&
+  existsSync(join(PARENT_NODE_PLUGINS_HOME, "bin", "php-parse"))
+) {
+  PHP_PARSER_BIN = join(PARENT_NODE_PLUGINS_HOME, "bin", "php-parse");
+}
 function main(argvs) {
   if (!detectPhp()) {
     console.warn("PHP is not installed!");

package/packages/atom-parsetools/rbastgen.js

@@ -12,8 +12,23 @@ if (!url.startsWith("file://")) {
 }
 const dirName = import.meta ? dirname(fileURLToPath(url)) : __dirname;
 export const PLUGINS_HOME = join(dirName, "plugins");
-const RUBY_ASTGEN_BIN =
+export const PARENT_NODE_PLUGINS_HOME = join(
+  dirName,
+  "..",
+  "..",
+  "node_modules",
+  "@appthreat",
+  "atom-parsetools",
+  "plugins"
+);
+let RUBY_ASTGEN_BIN =
   process.env.RUBY_ASTGEN_BIN || join(PLUGINS_HOME, "bin", "ruby_ast_gen");
+if (
+  !existsSync(RUBY_ASTGEN_BIN) &&
+  existsSync(join(PARENT_NODE_PLUGINS_HOME, "bin", "ruby_ast_gen"))
+) {
+  RUBY_ASTGEN_BIN = join(PARENT_NODE_PLUGINS_HOME, "bin", "ruby_ast_gen");
+}
 // Ruby version needed
 const RUBY_VERSION_NEEDED = "3.4.3";
 function main(argvs) {

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