@appthreat/atom 1.7.5 → 1.8.1

package/astgen.js

@@ -98,6 +98,7 @@ const vueTemplateRegex = /(<template.*>)([\s\S]*)(<\/template>)/gi;
 const vueCommentRegex = /<!--[\s\S]*?-->/gi;
 const vueBindRegex = /(:\[)([\s\S]*?)(\])/gi;
 const vuePropRegex = /\s([.:@])([a-zA-Z]*?=)/gi;
+const vueOpenImgTag = /(<img)((?!>)[\s\S]+?)( [^/]>)/gi;
 
 /**
  * Convert a single vue file to AST
@@ -115,7 +116,10 @@ const toVueAst = (file) => {
       return grA.replaceAll(/\S/g, " ") + grB + grC.replaceAll(/\S/g, " ");
     })
     .replace(vuePropRegex, function (match, grA, grB) {
-      return " " + grA.replace(/[.:@]/g, " ") + grB;
+      return " " + grA.replace(/[.:@]/g, " ") + grB.replaceAll(".", "-");
+    })
+    .replace(vueOpenImgTag, function (match, grA, grB, grC) {
+      return grA + grB + grC.replace(" >", "/>");
     })
     .replace(vueTemplateRegex, function (match, grA, grB, grC) {
       return grA + grB.replaceAll("{{", "{ ").replaceAll("}}", " }") + grC;
@@ -256,7 +260,7 @@ const createJSAst = async (options) => {
  * Generate AST for .vue files
  */
 const createVueAst = async (options) => {
-  const srcFiles = getAllFiles(options.src, ".vue");
+  const srcFiles = await getAllFiles(options.src, ".vue");
   for (const file of srcFiles) {
     try {
       const ast = toVueAst(file);

package/index.js

@@ -19,6 +19,7 @@ const _version = selfPJson.version;
 export const LOG4J_CONFIG = join(dirName, "plugins", "log4j2.xml");
 export const ATOM_HOME = join(dirName, "plugins");
 export const APP_LIB_DIR = join(ATOM_HOME, "lib");
+export const PHP_PARSER_BIN = join(ATOM_HOME, "bin", "php-parse");
 const freeMemoryGB = Math.max(Math.floor(freemem() / 1024 / 1024 / 1024), 4);
 export const JVM_ARGS = "-XX:+UseG1GC -XX:+UseStringDeduplication";
 export const JAVA_OPTS = `${
@@ -66,7 +67,8 @@ export const executeAtom = (atomArgs) => {
     ]);
   const env = {
     ...process.env,
-    ATOM_HOME
+    ATOM_HOME,
+    PHP_PARSER_BIN
   };
   const cwd = process.env.ATOM_CWD || process.cwd();
   spawnSync(JAVACMD, args, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appthreat/atom",
-  "version": "1.7.5",
+  "version": "1.8.1",
   "description": "Create atom (⚛) representation for your application, packages and libraries",
   "exports": "./index.js",
   "type": "module",
@@ -18,7 +18,8 @@
   },
   "bin": {
     "atom": "./index.js",
-    "astgen": "./astgen.js"
+    "astgen": "./astgen.js",
+    "phpastgen": "./phpastgen.js"
   },
   "engines": {
     "node": ">=16.0.0"

package/phpastgen.js

@@ -0,0 +1,31 @@
+#!/usr/bin/env node
+
+import { dirname, join } from "node:path";
+import { spawnSync } from "node:child_process";
+import { fileURLToPath } from "node:url";
+import { detectPhp } from "./utils.mjs";
+
+let url = import.meta.url;
+if (!url.startsWith("file://")) {
+  url = new URL(`file://${import.meta.url}`).toString();
+}
+const dirName = import.meta ? dirname(fileURLToPath(url)) : __dirname;
+export const PLUGINS_HOME = join(dirName, "plugins");
+const PHP_PARSER_BIN =
+  process.env.PHP_PARSER_BIN || join(PLUGINS_HOME, "bin", "php-parse");
+
+function main(argvs) {
+  if (!detectPhp()) {
+    console.warn("PHP is not installed!");
+    return false;
+  }
+  const cwd = process.env.ATOM_CWD || process.cwd();
+  spawnSync(PHP_PARSER_BIN, argvs, {
+    encoding: "utf-8",
+    cwd,
+    stdio: "inherit",
+    stderr: "inherit",
+    timeout: process.env.ATOM_TIMEOUT || process.env.ASTGEN_TIMEOUT
+  });
+}
+main(process.argv.slice(2));

package/plugins/autoload.php

@@ -0,0 +1,25 @@
+<?php
+
+// autoload.php @generated by Composer
+
+if (PHP_VERSION_ID < 50600) {
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, $err);
+        } elseif (!headers_sent()) {
+            echo $err;
+        }
+    }
+    trigger_error(
+        $err,
+        E_USER_ERROR
+    );
+}
+
+require_once __DIR__ . '/composer/autoload_real.php';
+
+return ComposerAutoloaderInit9622dd827becd4430ae91af9e0a4face::getLoader();

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

package/plugins/bin/php-parse

@@ -0,0 +1,119 @@
+#!/usr/bin/env php
+<?php
+
+/**
+ * Proxy PHP file generated by Composer
+ *
+ * This file includes the referenced bin path (../nikic/php-parser/bin/php-parse)
+ * using a stream wrapper to prevent the shebang from being output on PHP<8
+ *
+ * @generated
+ */
+
+namespace Composer;
+
+$GLOBALS['_composer_bin_dir'] = __DIR__;
+$GLOBALS['_composer_autoload_path'] = __DIR__ . '/..'.'/autoload.php';
+
+if (PHP_VERSION_ID < 80000) {
+    if (!class_exists('Composer\BinProxyWrapper')) {
+        /**
+         * @internal
+         */
+        final class BinProxyWrapper
+        {
+            private $handle;
+            private $position;
+            private $realpath;
+
+            public function stream_open($path, $mode, $options, &$opened_path)
+            {
+                // get rid of phpvfscomposer:// prefix for __FILE__ & __DIR__ resolution
+                $opened_path = substr($path, 17);
+                $this->realpath = realpath($opened_path) ?: $opened_path;
+                $opened_path = $this->realpath;
+                $this->handle = fopen($this->realpath, $mode);
+                $this->position = 0;
+
+                return (bool) $this->handle;
+            }
+
+            public function stream_read($count)
+            {
+                $data = fread($this->handle, $count);
+
+                if ($this->position === 0) {
+                    $data = preg_replace('{^#!.*\r?\n}', '', $data);
+                }
+
+                $this->position += strlen($data);
+
+                return $data;
+            }
+
+            public function stream_cast($castAs)
+            {
+                return $this->handle;
+            }
+
+            public function stream_close()
+            {
+                fclose($this->handle);
+            }
+
+            public function stream_lock($operation)
+            {
+                return $operation ? flock($this->handle, $operation) : true;
+            }
+
+            public function stream_seek($offset, $whence)
+            {
+                if (0 === fseek($this->handle, $offset, $whence)) {
+                    $this->position = ftell($this->handle);
+                    return true;
+                }
+
+                return false;
+            }
+
+            public function stream_tell()
+            {
+                return $this->position;
+            }
+
+            public function stream_eof()
+            {
+                return feof($this->handle);
+            }
+
+            public function stream_stat()
+            {
+                return array();
+            }
+
+            public function stream_set_option($option, $arg1, $arg2)
+            {
+                return true;
+            }
+
+            public function url_stat($path, $flags)
+            {
+                $path = substr($path, 17);
+                if (file_exists($path)) {
+                    return stat($path);
+                }
+
+                return false;
+            }
+        }
+    }
+
+    if (
+        (function_exists('stream_get_wrappers') && in_array('phpvfscomposer', stream_get_wrappers(), true))
+        || (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper'))
+    ) {
+        return include("phpvfscomposer://" . __DIR__ . '/..'.'/nikic/php-parser/bin/php-parse');
+    }
+}
+
+return include __DIR__ . '/..'.'/nikic/php-parser/bin/php-parse';