@nodesecure/js-x-ray 6.0.0 → 6.0.1

package/index.js

@@ -15,7 +15,8 @@ import { warnings } from "./src/warnings.js";
 const kMeriyahDefaultOptions = {
   next: true,
   loc: true,
-  raw: true
+  raw: true,
+  jsx: true
 };
 
 export function runASTAnalysis(str, options = Object.create(null)) {
@@ -97,7 +98,10 @@ function parseScriptExtended(strToAnalyze, isEcmaScriptModule) {
     return body;
   }
   catch (error) {
-    if (error.name === "SyntaxError" && error.description.includes("The import keyword")) {
+    if (error.name === "SyntaxError" && (
+      error.description.includes("The import keyword") ||
+      error.description.includes("The export keyword")
+    )) {
       const { body } = meriyah.parseScript(strToAnalyze, {
         ...kMeriyahDefaultOptions, module: true
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nodesecure/js-x-ray",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "description": "JavaScript AST XRay analysis",
   "type": "module",
   "exports": "./index.js",
@@ -39,7 +39,7 @@
   },
   "homepage": "https://github.com/NodeSecure/js-x-ray#readme",
   "dependencies": {
-    "@nodesecure/estree-ast-utils": "^1.3.0",
+    "@nodesecure/estree-ast-utils": "^1.3.1",
     "@nodesecure/sec-literal": "^1.2.0",
     "estree-walker": "^3.0.1",
     "is-minified-code": "^2.0.0",

package/src/obfuscators/freejsobfuscator.js

@@ -1,9 +1,9 @@
-// Import Third-party Dependencies
-import { Utils } from "@nodesecure/sec-literal";
-
-export function verify(analysis, prefix) {
-  const pValue = Object.keys(prefix).pop();
-  const regexStr = `^${Utils.escapeRegExp(pValue)}[a-zA-Z]{1,2}[0-9]{0,2}$`;
-
-  return analysis.identifiersName.every(({ name }) => new RegExp(regexStr).test(name));
-}
+// Import Third-party Dependencies
+import { Utils } from "@nodesecure/sec-literal";
+
+export function verify(analysis, prefix) {
+  const pValue = Object.keys(prefix).pop();
+  const regexStr = `^${Utils.escapeRegExp(pValue)}[a-zA-Z]{1,2}[0-9]{0,2}$`;
+
+  return analysis.identifiersName.every(({ name }) => new RegExp(regexStr).test(name));
+}

package/src/obfuscators/index.js

@@ -25,8 +25,12 @@ export function isObfuscatedCode(analysis) {
   }
   else {
     // TODO: also implement Dictionnary checkup
+    const identifiers = analysis.identifiersName
+      .map((value) => value?.name ?? null)
+      .filter((name) => typeof name === "string");
+
     const { prefix, oneTimeOccurence } = Patterns.commonHexadecimalPrefix(
-      analysis.identifiersName.map((value) => value.name)
+      identifiers
     );
     const uPrefixNames = new Set(Object.keys(prefix));
 

package/src/probes/isAssignmentExpression.js

@@ -1,29 +1,29 @@
-// Import Third-party Dependencies
-import { getVariableDeclarationIdentifiers } from "@nodesecure/estree-ast-utils";
-
-/**
- * @description Search for AssignmentExpression (Not to be confused with AssignmentPattern).
- *
- * @see https://github.com/estree/estree/blob/master/es5.md#assignmentexpression
- * @example
- * (foo = 5)
- */
-function validateNode(node) {
-  return [
-    node.type === "AssignmentExpression"
-  ];
-}
-
-function main(node, options) {
-  const { analysis } = options;
-
-  analysis.idtypes.assignExpr++;
-  for (const { name } of getVariableDeclarationIdentifiers(node.left)) {
-    analysis.identifiersName.push({ name, type: "assignExpr" });
-  }
-}
-
-export default {
-  name: "isAssignmentExpression",
-  validateNode, main, breakOnMatch: false
-};
+// Import Third-party Dependencies
+import { getVariableDeclarationIdentifiers } from "@nodesecure/estree-ast-utils";
+
+/**
+ * @description Search for AssignmentExpression (Not to be confused with AssignmentPattern).
+ *
+ * @see https://github.com/estree/estree/blob/master/es5.md#assignmentexpression
+ * @example
+ * (foo = 5)
+ */
+function validateNode(node) {
+  return [
+    node.type === "AssignmentExpression"
+  ];
+}
+
+function main(node, options) {
+  const { analysis } = options;
+
+  analysis.idtypes.assignExpr++;
+  for (const { name } of getVariableDeclarationIdentifiers(node.left)) {
+    analysis.identifiersName.push({ name, type: "assignExpr" });
+  }
+}
+
+export default {
+  name: "isAssignmentExpression",
+  validateNode, main, breakOnMatch: false
+};