@appthreat/atom 0.10.1 → 0.12.0

package/astgen.js

@@ -1,85 +1,22 @@
 #!/usr/bin/env node
 
-const path = require("path");
-const yargs = require("yargs");
-const { hideBin } = require("yargs/helpers");
-const babelParser = require("@babel/parser");
-const tsc = require("typescript");
-const fs = require("fs");
+import { join, dirname } from "path";
+import yargs from "yargs";
+import { hideBin } from "yargs/helpers";
+import { parse } from "@babel/parser";
+import tsc from "typescript";
+import {
+  readFileSync,
+  mkdirSync,
+  writeFileSync,
+  accessSync,
+  constants,
+  existsSync
+} from "fs";
+import { getAllFiles } from "./utils.mjs";
 
 const ASTGEN_VERSION = "3.1.0";
 
-const IGNORE_DIRS = [
-  "node_modules",
-  "venv",
-  "docs",
-  "test",
-  "tests",
-  "e2e",
-  "e2e-beta",
-  "examples",
-  "cypress",
-  "jest-cache",
-  "eslint-rules",
-  "codemods",
-  "flow-typed",
-  "i18n",
-  "vendor",
-  "www",
-  "dist",
-  "build"
-];
-
-const IGNORE_FILE_PATTERN = new RegExp(
-  "(conf|test|spec|\\.d)\\.(js|ts|jsx|tsx)$",
-  "i"
-);
-
-const getAllFiles = (dir, extn, files, result, regex) => {
-  files = files || fs.readdirSync(dir);
-  result = result || [];
-  regex = regex || new RegExp(`\\${extn}$`);
-
-  for (let i = 0; i < files.length; i++) {
-    const file = files[i];
-    if (
-      file.startsWith(".") ||
-      file.startsWith("__") ||
-      IGNORE_FILE_PATTERN.test(file)
-    ) {
-      continue;
-    }
-    const fileWithDir = path.join(dir, file);
-    if (fs.statSync(fileWithDir).isDirectory()) {
-      // Ignore directories
-      const dirName = path.basename(fileWithDir);
-      if (
-        dirName.startsWith(".") ||
-        dirName.startsWith("__") ||
-        IGNORE_DIRS.includes(dirName.toLowerCase())
-      ) {
-        continue;
-      }
-      try {
-        result = getAllFiles(
-          fileWithDir,
-          extn,
-          fs.readdirSync(fileWithDir),
-          result,
-          regex
-        );
-      } catch (error) {
-        // ignore
-      }
-    } else {
-      if (regex.test(fileWithDir)) {
-        result.push(fileWithDir);
-      }
-    }
-  }
-  return result;
-};
-
 const babelParserOptions = {
   sourceType: "unambiguous",
   allowImportExportEverywhere: true,
@@ -138,15 +75,9 @@ const getAllSrcJSAndTSFiles = (src) =>
  */
 const fileToJsAst = (file) => {
   try {
-    return babelParser.parse(
-      fs.readFileSync(file, "utf-8"),
-      babelParserOptions
-    );
+    return parse(readFileSync(file, "utf-8"), babelParserOptions);
   } catch {
-    return babelParser.parse(
-      fs.readFileSync(file, "utf-8"),
-      babelSafeParserOptions
-    );
+    return parse(readFileSync(file, "utf-8"), babelSafeParserOptions);
   }
 };
 
@@ -155,9 +86,9 @@ const fileToJsAst = (file) => {
  */
 const codeToJsAst = (code) => {
   try {
-    return babelParser.parse(code, babelParserOptions);
+    return parse(code, babelParserOptions);
   } catch {
-    return babelParser.parse(code, babelSafeParserOptions);
+    return parse(code, babelSafeParserOptions);
   }
 };
 
@@ -171,7 +102,7 @@ const vuePropRegex = /\s([.:@])([a-zA-Z]*?=)/gi;
  * Convert a single vue file to AST
  */
 const toVueAst = (file) => {
-  const code = fs.readFileSync(file, "utf-8");
+  const code = readFileSync(file, "utf-8");
   const cleanedCode = code
     .replace(vueCommentRegex, function (match) {
       return match.replaceAll(/\S/g, " ");
@@ -358,25 +289,22 @@ const getCircularReplacer = () => {
  */
 const writeAstFile = (file, ast, options) => {
   const relativePath = file.replace(new RegExp("^" + options.src + "/"), "");
-  const outAstFile = path.join(options.output, relativePath + ".json");
+  const outAstFile = join(options.output, relativePath + ".json");
   const data = {
     fullName: file,
     relativeName: relativePath,
     ast: ast
   };
-  fs.mkdirSync(path.dirname(outAstFile), { recursive: true });
-  fs.writeFileSync(
-    outAstFile,
-    JSON.stringify(data, getCircularReplacer(), "  ")
-  );
+  mkdirSync(dirname(outAstFile), { recursive: true });
+  writeFileSync(outAstFile, JSON.stringify(data, getCircularReplacer(), "  "));
   console.log("Converted AST for", relativePath, "to", outAstFile);
 };
 
 const writeTypesFile = (file, seenTypes, options) => {
   const relativePath = file.replace(new RegExp("^" + options.src + "/"), "");
-  const outTypeFile = path.join(options.output, relativePath + ".typemap");
-  fs.mkdirSync(path.dirname(outTypeFile), { recursive: true });
-  fs.writeFileSync(
+  const outTypeFile = join(options.output, relativePath + ".typemap");
+  mkdirSync(dirname(outTypeFile), { recursive: true });
+  writeFileSync(
     outTypeFile,
     JSON.stringify(Object.fromEntries(seenTypes), undefined, "  ")
   );
@@ -386,14 +314,14 @@ const writeTypesFile = (file, seenTypes, options) => {
 const createXAst = async (options) => {
   const src_dir = options.src;
   try {
-    fs.accessSync(src_dir, fs.constants.R_OK);
+    accessSync(src_dir, constants.R_OK);
   } catch (err) {
     console.error(src_dir, "is invalid");
     process.exit(1);
   }
   if (
-    fs.existsSync(path.join(src_dir, "package.json")) ||
-    fs.existsSync(path.join(src_dir, "rush.json"))
+    existsSync(join(src_dir, "package.json")) ||
+    existsSync(join(src_dir, "rush.json"))
   ) {
     return await createJSAst(options);
   }
@@ -463,7 +391,7 @@ async function main(argvs) {
 
   try {
     if (args.output === "ast_out") {
-      args.output = path.join(args.src, args.output);
+      args.output = join(args.src, args.output);
     }
     await start(args);
   } catch (e) {

package/index.js

@@ -1,51 +1,75 @@
 #!/usr/bin/env node
 
-const os = require("os");
-const path = require("path");
-const { spawnSync } = require("child_process");
-const isWin = require("os").platform() === "win32";
-const LOG4J_CONFIG = path.join(__dirname, "plugins", "log4j2.xml");
-const ATOM_HOME = path.join(__dirname, "plugins", "atom-1.0.0");
-const APP_LIB_DIR = path.join(ATOM_HOME, "lib");
-const freeMemoryGB = Math.floor(os.freemem() / 1024 / 1024 / 1024);
+import { freemem, platform as _platform } from "node:os";
+import { dirname, join, delimiter } from "node:path";
+import { spawnSync } from "node:child_process";
+import { fileURLToPath } from "node:url";
+import { detectJava } from "./utils.mjs";
+
+const isWin = _platform() === "win32";
+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;
+
+const LOG4J_CONFIG = join(dirName, "plugins", "log4j2.xml");
+const ATOM_HOME = join(dirName, "plugins", "atom-1.0.0");
+const APP_LIB_DIR = join(ATOM_HOME, "lib");
+const freeMemoryGB = Math.floor(freemem() / 1024 / 1024 / 1024);
+const JVM_ARGS =
+  "-XX:+UseG1GC -XX:+ExplicitGCInvokesConcurrent -XX:+ParallelRefProcEnabled -XX:+UseStringDeduplication -XX:+UnlockExperimentalVMOptions -XX:G1NewSizePercent=20 -XX:+UnlockDiagnosticVMOptions -XX:G1SummarizeRSetStatsPeriod=1";
 const JAVA_OPTS = `${process.env.JAVA_OPTS || ""} -Xms${Math.round(
   Math.floor(freeMemoryGB / 2)
-)}G -Xmx${freeMemoryGB}G -XX:+UseG1GC -XX:+ExplicitGCInvokesConcurrent -XX:+ParallelRefProcEnabled -XX:+UseStringDeduplication -XX:+UnlockExperimentalVMOptions -XX:G1NewSizePercent=20 -XX:+UnlockDiagnosticVMOptions -XX:G1SummarizeRSetStatsPeriod=1`;
+)}G -Xmx${freeMemoryGB}G ${JVM_ARGS}`;
 const APP_MAIN_CLASS = "io.appthreat.atom.Atom";
-let APP_CLASSPATH = path.join(
-  APP_LIB_DIR,
-  "io.appthreat.atom-1.0.0-classpath.jar"
-);
+let APP_CLASSPATH = join(APP_LIB_DIR, "io.appthreat.atom-1.0.0-classpath.jar");
 let JAVACMD = "java";
 if (process.env.JAVA_HOME) {
-  JAVACMD = path.join(
-    process.env.JAVA_HOME,
-    "bin",
-    "java" + (isWin ? ".exe" : "")
-  );
+  JAVACMD = join(process.env.JAVA_HOME, "bin", "java" + (isWin ? ".exe" : ""));
 }
 
 const atomLibs = [APP_CLASSPATH];
 const argv = process.argv.slice(2);
-let args = JAVA_OPTS.trim()
-  .split(" ")
-  .concat([
-    "-cp",
-    atomLibs.join(path.delimiter),
-    `-Dlog4j.configurationFile=${LOG4J_CONFIG}`,
-    APP_MAIN_CLASS,
-    ...argv
-  ]);
-const env = {
-  ...process.env,
-  ATOM_HOME
+
+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) {
+      process.env.PATH =
+        process.env.PATH +
+        delimiter +
+        join(process.env.JAVA_HOME, "bin") +
+        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."
+      );
+      return false;
+    }
+  }
+  let args = JAVA_OPTS.trim()
+    .split(" ")
+    .concat([
+      "-cp",
+      atomLibs.join(delimiter),
+      `-Dlog4j.configurationFile=${LOG4J_CONFIG}`,
+      APP_MAIN_CLASS,
+      ...atomArgs
+    ]);
+  const env = {
+    ...process.env,
+    ATOM_HOME
+  };
+  const cwd = process.env.ATOM_CWD || process.cwd();
+  spawnSync(JAVACMD, args, {
+    encoding: "utf-8",
+    env,
+    cwd,
+    stdio: "inherit",
+    stderr: "inherit",
+    timeout: process.env.ATOM_TIMEOUT
+  });
 };
-const cwd = process.env.ATOM_CWD || process.cwd();
-spawnSync(JAVACMD, args, {
-  encoding: "utf-8",
-  env,
-  cwd,
-  stdio: "inherit",
-  stderr: "inherit",
-  timeout: undefined
-});
+executeAtom(argv);

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@appthreat/atom",
-  "version": "0.10.1",
+  "version": "0.12.0",
   "description": "Create atom (⚛) representation for your application, packages and libraries",
-  "main": "index.js",
+  "exports": "./index.js",
+  "type": "module",
   "scripts": {
-    "pretty": "prettier --write *.js --trailing-comma=none",
-    "lint": "eslint *.js"
+    "pretty": "prettier --write *.mjs *.js --trailing-comma=none",
+    "lint": "eslint *.mjs *.js"
   },
   "dependencies": {
     "@babel/parser": "^7.22.5",
@@ -42,6 +43,7 @@
   "homepage": "https://github.com/AppThreat/atom#readme",
   "files": [
     "*.js",
+    "*.mjs",
     "plugins/"
   ]
 }

package/utils.mjs

@@ -0,0 +1,84 @@
+import { join, basename } from "node:path";
+import { readdirSync, statSync } from "node:fs";
+import { spawnSync } from "node:child_process";
+
+const IGNORE_DIRS = [
+  "node_modules",
+  "venv",
+  "docs",
+  "test",
+  "tests",
+  "e2e",
+  "e2e-beta",
+  "examples",
+  "cypress",
+  "jest-cache",
+  "eslint-rules",
+  "codemods",
+  "flow-typed",
+  "i18n",
+  "vendor",
+  "www",
+  "dist",
+  "build"
+];
+
+const IGNORE_FILE_PATTERN = new RegExp(
+  "(conf|test|spec|\\.d)\\.(js|ts|jsx|tsx)$",
+  "i"
+);
+
+export const getAllFiles = (dir, extn, files, result, regex) => {
+  files = files || readdirSync(dir);
+  result = result || [];
+  regex = regex || new RegExp(`\\${extn}$`);
+
+  for (let i = 0; i < files.length; i++) {
+    const file = files[i];
+    if (
+      file.startsWith(".") ||
+      file.startsWith("__") ||
+      IGNORE_FILE_PATTERN.test(file)
+    ) {
+      continue;
+    }
+    const fileWithDir = join(dir, file);
+    if (statSync(fileWithDir).isDirectory()) {
+      // Ignore directories
+      const dirName = basename(fileWithDir);
+      if (
+        dirName.startsWith(".") ||
+        dirName.startsWith("__") ||
+        IGNORE_DIRS.includes(dirName.toLowerCase())
+      ) {
+        continue;
+      }
+      try {
+        result = getAllFiles(
+          fileWithDir,
+          extn,
+          readdirSync(fileWithDir),
+          result,
+          regex
+        );
+      } catch (error) {
+        // ignore
+      }
+    } else {
+      if (regex.test(fileWithDir)) {
+        result.push(fileWithDir);
+      }
+    }
+  }
+  return result;
+};
+
+export const detectJava = () => {
+  let result = spawnSync(process.env.JAVA_CMD || "java", ["-version"], {
+    encoding: "utf-8"
+  });
+  if (result.status !== 0 || result.error) {
+    return false;
+  }
+  return true;
+};

package/.eslintrc.js

@@ -1,15 +0,0 @@
-module.exports = {
-    "env": {
-        "node": true,
-        "commonjs": true,
-        "es2021": true
-    },
-    "extends": "eslint:recommended",
-    "overrides": [
-    ],
-    "parserOptions": {
-        "ecmaVersion": "latest"
-    },
-    "rules": {
-    }
-}