@nodesecure/js-x-ray 8.1.1 → 9.0.0

package/README.md

@@ -161,7 +161,7 @@ $ yarn add @nodesecure/estree-ast-util
 ## Contributors ✨
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-18-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-20-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
@@ -194,6 +194,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/madina0801"><img src="https://avatars.githubusercontent.com/u/101329759?v=4?s=100" width="100px;" alt="Madina"/><br /><sub><b>Madina</b></sub></a><br /><a href="https://github.com/NodeSecure/js-x-ray/commits?author=madina0801" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/sairuss7"><img src="https://avatars.githubusercontent.com/u/87803528?v=4?s=100" width="100px;" alt="SairussDev"/><br /><sub><b>SairussDev</b></sub></a><br /><a href="https://github.com/NodeSecure/js-x-ray/commits?author=sairuss7" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/fless-lab"><img src="https://avatars.githubusercontent.com/u/71844440?v=4?s=100" width="100px;" alt="Abdou-Raouf ATARMLA"/><br /><sub><b>Abdou-Raouf ATARMLA</b></sub></a><br /><a href="https://github.com/NodeSecure/js-x-ray/commits?author=fless-lab" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://clementgombauld.netlify.app/"><img src="https://avatars.githubusercontent.com/u/91478082?v=4?s=100" width="100px;" alt="Clement Gombauld"/><br /><sub><b>Clement Gombauld</b></sub></a><br /><a href="https://github.com/NodeSecure/js-x-ray/commits?author=clemgbld" title="Code">💻</a> <a href="https://github.com/NodeSecure/js-x-ray/commits?author=clemgbld" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/intincrab"><img src="https://avatars.githubusercontent.com/u/93028153?v=4?s=100" width="100px;" alt="Ajāy "/><br /><sub><b>Ajāy </b></sub></a><br /><a href="https://github.com/NodeSecure/js-x-ray/commits?author=intincrab" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

package/package.json

@@ -1,9 +1,19 @@
 {
   "name": "@nodesecure/js-x-ray",
-  "version": "8.1.1",
+  "version": "9.0.0",
   "description": "JavaScript AST XRay analysis",
   "type": "module",
-  "exports": "./index.js",
+  "exports": {
+    ".": {
+      "import": "./index.js",
+      "types": "./index.d.ts"
+    },
+    "./warnings": {
+      "import": "./src/warnings.js",
+      "types": "./types/warnings.d.ts"
+    },
+    "./package.json": "./package.json"
+  },
   "engines": {
     "node": ">=20.0.0"
   },
@@ -11,7 +21,9 @@
     "lint": "eslint src workspaces test",
     "test-only": "glob -c \"node --test-reporter=spec --test\" \"./test/**/*.spec.js\"",
     "test": "c8 --all --src ./src -r html npm run test-only",
-    "check": "npm run lint && npm run test-only"
+    "check": "npm run lint && npm run test-only",
+    "ci:publish": "changeset publish",
+    "ci:version": "changeset version"
   },
   "repository": {
     "type": "git",
@@ -54,6 +66,8 @@
     "ts-pattern": "^5.0.6"
   },
   "devDependencies": {
+    "@changesets/changelog-github": "^0.5.1",
+    "@changesets/cli": "^2.29.4",
     "@openally/config.eslint": "^2.0.0",
     "@types/node": "^22.0.0",
     "c8": "^10.1.2",

package/src/AstAnalyser.js

@@ -75,10 +75,15 @@ export class AstAnalyser {
       finalize(source);
     }
 
+    // Add oneline-require flag if this is a one-line require expression
+    if (isOneLineExpressionExport(body)) {
+      source.flags.add("oneline-require");
+    }
+
     return {
       ...source.getResult(isMinified),
       dependencies: source.dependencies,
-      isOneLineRequire: isOneLineExpressionExport(body)
+      flags: source.flags
     };
   }
 
@@ -111,11 +116,16 @@ export class AstAnalyser {
         data.dependencies.delete(packageName);
       }
 
+      // Add is-minified flag if the file is minified and not a one-line require
+      if (!data.flags.has("oneline-require") && isMin) {
+        data.flags.add("is-minified");
+      }
+
       return {
         ok: true,
         dependencies: data.dependencies,
         warnings: data.warnings,
-        isMinified: !data.isOneLineRequire && isMin
+        flags: data.flags
       };
     }
     catch (error) {
@@ -157,11 +167,16 @@ export class AstAnalyser {
         data.dependencies.delete(packageName);
       }
 
+      // Add is-minified flag if the file is minified and not a one-line require
+      if (!data.flags.has("oneline-require") && isMin) {
+        data.flags.add("is-minified");
+      }
+
       return {
         ok: true,
         dependencies: data.dependencies,
         warnings: data.warnings,
-        isMinified: !data.isOneLineRequire && isMin
+        flags: data.flags
       };
     }
     catch (error) {

package/src/EntryFilesAnalyser.js

@@ -19,7 +19,8 @@ export class EntryFilesAnalyser {
     const {
       astAnalyzer = new AstAnalyser(),
       loadExtensions,
-      rootPath = null
+      rootPath = null,
+      ignoreENOENT = false
     } = options;
 
     this.astAnalyzer = astAnalyzer;
@@ -30,6 +31,7 @@ export class EntryFilesAnalyser {
     this.allowedExtensions = new Set(rawAllowedExtensions);
     this.#rootPath = options.rootPath === null ?
       null : fileURLToPathExtended(rootPath);
+    this.ignoreENOENT = ignoreENOENT;
   }
 
   async* analyse(
@@ -43,6 +45,10 @@ export class EntryFilesAnalyser {
         fileURLToPathExtended(entryFile)
       );
 
+      if (this.ignoreENOENT && !await this.#fileExists(normalizedEntryFile)) {
+        return;
+      }
+
       yield* this.#analyseFile(
         normalizedEntryFile,
         this.#getRelativeFilePath(normalizedEntryFile),

package/src/ProbeRunner.js

@@ -12,6 +12,7 @@ import isWeakCrypto from "./probes/isWeakCrypto.js";
 import isBinaryExpression from "./probes/isBinaryExpression.js";
 import isArrayExpression from "./probes/isArrayExpression.js";
 import isESMExport from "./probes/isESMExport.js";
+import isFetch from "./probes/isFetch.js";
 
 // Import Internal Dependencies
 import { SourceFile } from "./SourceFile.js";
@@ -39,6 +40,7 @@ export class ProbeRunner {
    * @type {Probe[]}
    */
   static Defaults = [
+    isFetch,
     isRequire,
     isESMExport,
     isUnsafeCallee,

package/src/SourceFile.js

@@ -19,6 +19,8 @@ export class SourceFile {
   dependencies = new Map();
   encodedLiterals = new Map();
   warnings = [];
+  /** @type {Set<string>} */
+  flags = new Set();
 
   constructor(sourceCodeString, probesOptions = {}) {
     this.tracer = new VariableTracer()

package/src/probes/isFetch.js

@@ -0,0 +1,19 @@
+// Import Third-party Dependencies
+import { getCallExpressionIdentifier } from "@nodesecure/estree-ast-utils";
+
+function validateNode(node) {
+  const id = getCallExpressionIdentifier(node);
+
+  return [id === "fetch"];
+}
+
+function main(_node, { sourceFile }) {
+  sourceFile.flags.add("fetch");
+}
+
+export default {
+  name: "isFetch",
+  validateNode,
+  main,
+  breakOnMatch: false
+};

package/src/probes/isLiteral.js

@@ -15,7 +15,7 @@ const kNodeDeps = new Set(builtinModules);
 const kShadyLinkRegExps = [
   kMapRegexIps.regexIPv4,
   kMapRegexIps.regexIPv6,
-  /(http[s]?:\/\/bit\.ly.*)$/,
+  /(http[s]?:\/\/(bit\.ly|ipinfo\.io|httpbin\.org).*)$/,
   /(http[s]?:\/\/.*\.(link|xyz|tk|ml|ga|cf|gq|pw|top|club|mw|bd|ke|am|sbs|date|quest|cd|bid|cd|ws|icu|cam|uno|email|stream))$/
 ];
 /**

package/src/warnings.js

@@ -1,5 +1,6 @@
 // Import Internal Dependencies
-import * as utils from "./utils/index.js";
+import { toArrayLocation } from "./utils/toArrayLocation.js";
+import { notNullOrUndefined } from "./utils/notNullOrUndefined.js";
 
 export const warnings = Object.freeze({
   "parsing-error": {
@@ -58,16 +59,16 @@ export function generateWarning(kind, options) {
 
   if (kind === "encoded-literal") {
     return Object.assign(
-      { kind, value, location: [utils.toArrayLocation(location)], source },
+      { kind, value, location: [toArrayLocation(location)], source },
       warnings[kind]
     );
   }
 
-  const result = { kind, location: utils.toArrayLocation(location), source };
-  if (utils.notNullOrUndefined(file)) {
+  const result = { kind, location: toArrayLocation(location), source };
+  if (notNullOrUndefined(file)) {
     result.file = file;
   }
-  if (utils.notNullOrUndefined(value)) {
+  if (notNullOrUndefined(value)) {
     result.value = value;
   }
 

package/types/api.d.ts

@@ -24,10 +24,16 @@ export {
   Report,
   ReportOnFile,
 
+  SourceFlags,
   SourceLocation,
   Dependency
 }
 
+type SourceFlags =
+  | "fetch"
+  | "oneline-require"
+  | "is-minified";
+
 interface SourceLocation {
   start: {
     line: number;
@@ -89,16 +95,16 @@ interface Probe {
 interface Report {
   dependencies: Map<string, Dependency>;
   warnings: Warning[];
+  flags: Set<SourceFlags>;
   idsLengthAvg: number;
   stringScore: number;
-  isOneLineRequire: boolean;
 }
 
 type ReportOnFile = {
   ok: true,
   warnings: Warning[];
   dependencies: Map<string, Dependency>;
-  isMinified: boolean;
+  flags: Set<SourceFlags>;
 } | {
   ok: false,
   warnings: Warning[];
@@ -125,6 +131,8 @@ declare class AstAnalyser {
 }
 
 declare class SourceFile {
+  flags: Set<SourceFlags>;
+
   constructor(source: string, options: any);
   addDependency(
     name: string,
@@ -145,6 +153,7 @@ interface EntryFilesAnalyserOptions {
   astAnalyzer?: AstAnalyser;
   loadExtensions?: (defaults: string[]) => string[];
   rootPath?: string | URL;
+  ignoreENOENT?: boolean;
 }
 
 declare class EntryFilesAnalyser {