@appthreat/atom 2.0.18 → 2.0.20

package/astgen.js

@@ -62,14 +62,13 @@ const babelSafeParserOptions = {
  */
 const getAllSrcJSAndTSFiles = (src) =>
   Promise.all([
-    getAllFiles(src, ".js"),
-    getAllFiles(src, ".jsx"),
-    getAllFiles(src, ".cjs"),
-    getAllFiles(src, ".mjs"),
-    getAllFiles(src, ".ts"),
-    getAllFiles(src, ".tsx"),
-    getAllFiles(src, ".vue"),
-    getAllFiles(src, ".svelte")
+    getAllFiles(
+      src,
+      undefined,
+      undefined,
+      undefined,
+      new RegExp("\\.(js|jsx|cjs|mjs|ts|tsx|vue|svelte)$")
+    )
   ]);
 
 /**
@@ -100,6 +99,15 @@ const vueBindRegex = /(:\[)([\s\S]*?)(\])/gi;
 const vuePropRegex = /\s([.:@])([a-zA-Z]*?=)/gi;
 const vueOpenImgTag = /(<img)((?!>)[\s\S]+?)( [^/]>)/gi;
 
+const TSC_FLAGS =
+  tsc.TypeFormatFlags.NoTruncation |
+  tsc.TypeFormatFlags.InTypeAlias |
+  tsc.TypeFormatFlags.WriteArrayAsGenericType |
+  tsc.TypeFormatFlags.GenerateNamesForShadowedTypeParams |
+  tsc.TypeFormatFlags.WriteTypeArgumentsOfSignature |
+  tsc.TypeFormatFlags.UseFullyQualifiedType |
+  tsc.TypeFormatFlags.NoTypeReduction;
+
 /**
  * Convert a single vue file to AST
  */
@@ -132,6 +140,10 @@ function createTsc(srcFiles) {
     const program = tsc.createProgram(srcFiles, {
       target: tsc.ScriptTarget.ES2020,
       module: tsc.ModuleKind.CommonJS,
+      allowImportingTsExtensions: false,
+      allowArbitraryExtensions: false,
+      allowSyntheticDefaultImports: true,
+      allowUmdGlobalAccess: true,
       allowJs: true,
       allowUnreachableCode: true,
       allowUnusedLabels: true,
@@ -150,10 +162,7 @@ function createTsc(srcFiles) {
 
     const safeTypeToString = (node) => {
       try {
-        return typeChecker.typeToString(
-          node,
-          tsc.TypeFormatFlags.NoTruncation | tsc.TypeFormatFlags.InTypeAlias
-        );
+        return typeChecker.typeToString(node, TSC_FLAGS);
       } catch (err) {
         return "any";
       }
@@ -161,11 +170,7 @@ function createTsc(srcFiles) {
 
     const safeTypeWithContextToString = (node, context) => {
       try {
-        return typeChecker.typeToString(
-          node,
-          context,
-          tsc.TypeFormatFlags.NoTruncation | tsc.TypeFormatFlags.InTypeAlias
-        );
+        return typeChecker.typeToString(node, context, TSC_FLAGS);
       } catch (err) {
         return "any";
       }
@@ -176,10 +181,18 @@ function createTsc(srcFiles) {
       if (
         tsc.isSetAccessor(node) ||
         tsc.isGetAccessor(node) ||
+        tsc.isGetAccessorDeclaration(node) ||
+        tsc.isCallSignatureDeclaration(node) ||
+        tsc.isIndexSignatureDeclaration(node) ||
+        tsc.isClassStaticBlockDeclaration(node) ||
         tsc.isConstructSignatureDeclaration(node) ||
         tsc.isMethodDeclaration(node) ||
         tsc.isFunctionDeclaration(node) ||
-        tsc.isConstructorDeclaration(node)
+        tsc.isConstructorDeclaration(node) ||
+        tsc.isTypeAliasDeclaration(node) ||
+        tsc.isEnumDeclaration(node) ||
+        tsc.isNamespaceExportDeclaration(node) ||
+        tsc.isImportEqualsDeclaration(node)
       ) {
         const signature = typeChecker.getSignatureFromDeclaration(node);
         const returnType = typeChecker.getReturnTypeOfSignature(signature);
@@ -204,8 +217,9 @@ function createTsc(srcFiles) {
           node
         );
       }
-      if (!["any", "unknown", "any[]", "unknown[]"].includes(typeStr))
+      if (!["any", "unknown", "any[]", "unknown[]"].includes(typeStr)) {
         seenTypes.set(node.getStart(), typeStr);
+      }
       tsc.forEachChild(node, addType);
     };
 
@@ -232,7 +246,6 @@ const createJSAst = async (options) => {
     if (options.tsTypes) {
       ts = createTsc(srcFiles);
     }
-
     for (const file of srcFiles) {
       try {
         const ast = fileToJsAst(file);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appthreat/atom",
-  "version": "2.0.18",
+  "version": "2.0.20",
   "description": "Create atom (⚛) representation for your application, packages and libraries",
   "exports": "./index.js",
   "type": "module",
@@ -10,16 +10,16 @@
   },
   "dependencies": {
     "@babel/parser": "^7.25.6",
-    "typescript": "^5.5.4",
+    "typescript": "^5.6.2",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
     "eslint": "8.57.0"
   },
   "bin": {
-    "atom": "./index.js",
-    "astgen": "./astgen.js",
-    "phpastgen": "./phpastgen.js"
+    "atom": "index.js",
+    "astgen": "astgen.js",
+    "phpastgen": "phpastgen.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.18-classpath.jar"
+declare -r app_classpath="$lib_dir/io.appthreat.atom-2.0.20-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.18-classpath.jar"
+set "APP_CLASSPATH=%APP_LIB_DIR%\io.appthreat.atom-2.0.20-classpath.jar"
 set "APP_MAIN_CLASS=io.appthreat.atom.Atom"
 set "SCRIPT_CONF_FILE=%APP_HOME%\conf\application.ini"
 

package/plugins/composer/installed.php

@@ -1,9 +1,9 @@
 <?php return array(
     'root' => array(
         'name' => '__root__',
-        'pretty_version' => 'v2.0.18',
-        'version' => '2.0.18.0',
-        'reference' => 'f4a60794cbc67cf3ab2bbcb29ccc05fcb3a79563',
+        'pretty_version' => 'v2.0.20',
+        'version' => '2.0.20.0',
+        'reference' => '7a3b78a0e37f84fa8ca069367cb665896b024ccc',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -11,9 +11,9 @@
     ),
     'versions' => array(
         '__root__' => array(
-            'pretty_version' => 'v2.0.18',
-            'version' => '2.0.18.0',
-            'reference' => 'f4a60794cbc67cf3ab2bbcb29ccc05fcb3a79563',
+            'pretty_version' => 'v2.0.20',
+            'version' => '2.0.20.0',
+            'reference' => '7a3b78a0e37f84fa8ca069367cb665896b024ccc',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),