node-modules-tools 1.3.2 → 1.4.1

package/README.md

@@ -10,7 +10,7 @@
 
 <p align="center">
   <a href="https://cdn.jsdelivr.net/gh/antfu/static/sponsors.svg">
-    <img src='https://cdn.jsdelivr.net/gh/antfu/static/sponsors.svg'/>
+    <img src='https://cdn.jsdelivr.net/gh/antfu/static/sponsors.svg' alt='Sponsors' />
   </a>
 </p>
 

package/dist/constants.d.mts

@@ -1,3 +1,3 @@
-export { C as CLUSTER_DEP_DEV, d as CLUSTER_DEP_OPTIONAL, e as CLUSTER_DEP_PROD, i as PackageModuleTypes } from './shared/node-modules-tools.DH68osY8.mjs';
+export { C as CLUSTER_DEP_DEV, d as CLUSTER_DEP_OPTIONAL, e as CLUSTER_DEP_PROD, i as PackageModuleTypes } from './shared/node-modules-tools.BWZx79LE.mjs';
 import 'pkg-types';
 import 'publint';

package/dist/constants.d.ts

@@ -1,3 +1,3 @@
-export { C as CLUSTER_DEP_DEV, d as CLUSTER_DEP_OPTIONAL, e as CLUSTER_DEP_PROD, i as PackageModuleTypes } from './shared/node-modules-tools.DH68osY8.js';
+export { C as CLUSTER_DEP_DEV, d as CLUSTER_DEP_OPTIONAL, e as CLUSTER_DEP_PROD, i as PackageModuleTypes } from './shared/node-modules-tools.BWZx79LE.js';
 import 'pkg-types';
 import 'publint';

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import { AgentName } from 'package-manager-detector';
-import { P as PackageNodeRaw, a as PackageNodeBase, b as PackageNode, c as PackageModuleType } from './shared/node-modules-tools.DH68osY8.mjs';
-export { C as CLUSTER_DEP_DEV, d as CLUSTER_DEP_OPTIONAL, e as CLUSTER_DEP_PROD, F as FileCategory, N as NpmMeta, f as NpmMetaLatest, g as PackageInstallSizeInfo, h as PackageModuleTypeSimple, i as PackageModuleTypes } from './shared/node-modules-tools.DH68osY8.mjs';
+import { P as PackageNodeRaw, a as PackageNodeBase, b as PackageNode, c as PackageModuleType } from './shared/node-modules-tools.BWZx79LE.mjs';
+export { A as AuditLevelString, C as CLUSTER_DEP_DEV, d as CLUSTER_DEP_OPTIONAL, e as CLUSTER_DEP_PROD, F as FileCategory, N as NpmMeta, f as NpmMetaLatest, g as PackageInstallSizeInfo, h as PackageModuleTypeSimple, i as PackageModuleTypes } from './shared/node-modules-tools.BWZx79LE.mjs';
 import { PackageJson } from 'pkg-types';
 export { PackageJson } from 'pkg-types';
 export { NormalizedFunding, PackageNodeLike, ParsedFunding, ParsedLicense, constructPackageFilter, constructPackageFilters, normalizePkgAuthors, normalizePkgFundings, normalizePkgLicense, normalizePkgRepository, parseAuthor, parseFunding } from './utils.mjs';

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { AgentName } from 'package-manager-detector';
-import { P as PackageNodeRaw, a as PackageNodeBase, b as PackageNode, c as PackageModuleType } from './shared/node-modules-tools.DH68osY8.js';
-export { C as CLUSTER_DEP_DEV, d as CLUSTER_DEP_OPTIONAL, e as CLUSTER_DEP_PROD, F as FileCategory, N as NpmMeta, f as NpmMetaLatest, g as PackageInstallSizeInfo, h as PackageModuleTypeSimple, i as PackageModuleTypes } from './shared/node-modules-tools.DH68osY8.js';
+import { P as PackageNodeRaw, a as PackageNodeBase, b as PackageNode, c as PackageModuleType } from './shared/node-modules-tools.BWZx79LE.js';
+export { A as AuditLevelString, C as CLUSTER_DEP_DEV, d as CLUSTER_DEP_OPTIONAL, e as CLUSTER_DEP_PROD, F as FileCategory, N as NpmMeta, f as NpmMetaLatest, g as PackageInstallSizeInfo, h as PackageModuleTypeSimple, i as PackageModuleTypes } from './shared/node-modules-tools.BWZx79LE.js';
 import { PackageJson } from 'pkg-types';
 export { PackageJson } from 'pkg-types';
 export { NormalizedFunding, PackageNodeLike, ParsedFunding, ParsedLicense, constructPackageFilter, constructPackageFilters, normalizePkgAuthors, normalizePkgFundings, normalizePkgLicense, normalizePkgRepository, parseAuthor, parseFunding } from './utils.js';

package/dist/index.mjs

@@ -106,96 +106,81 @@ function populateRawResult(input) {
   return result;
 }
 
-function analyzePackageModuleType(pkgJson) {
-  if (pkgJson.name?.startsWith("@types/"))
-    return "dts";
-  const { exports: exports$1, main, type } = pkgJson;
-  let cjs;
-  let esm;
-  let fauxEsm;
-  if (pkgJson.module) {
-    fauxEsm = true;
-  }
-  if (exports$1) {
-    analyzeThing(exports$1, `${pkgJson.name}#exports`);
+function analyzeExports(exports$1, depth = 0) {
+  const result = {
+    hasImport: false,
+    hasRequire: false,
+    hasModule: false
+  };
+  if (depth > 10)
+    return result;
+  if (exports$1 == null)
+    return result;
+  if (typeof exports$1 === "string") {
+    if (exports$1.endsWith(".mjs") || exports$1.endsWith(".mts"))
+      result.hasImport = true;
+    else if (exports$1.endsWith(".cjs") || exports$1.endsWith(".cts"))
+      result.hasRequire = true;
+    return result;
   }
-  if (esm && type === "commonjs") {
-    cjs = true;
+  if (Array.isArray(exports$1)) {
+    for (const item of exports$1)
+      mergeAnalysis(result, analyzeExports(item, depth + 1));
+    return result;
   }
-  if (cjs && type === "module") {
-    esm = true;
+  if (typeof exports$1 === "object") {
+    for (const [key, value] of Object.entries(exports$1)) {
+      if (key === "import")
+        result.hasImport = true;
+      else if (key === "require")
+        result.hasRequire = true;
+      else if (key === "module")
+        result.hasModule = true;
+      mergeAnalysis(result, analyzeExports(value, depth + 1));
+    }
   }
-  if (cjs === void 0 && esm === void 0) {
-    if (type === "module" || main && /\.mjs$/.test(main)) {
-      esm = true;
-    } else if (main) {
-      cjs = true;
+  return result;
+}
+function mergeAnalysis(target, source) {
+  target.hasImport = target.hasImport || source.hasImport;
+  target.hasRequire = target.hasRequire || source.hasRequire;
+  target.hasModule = target.hasModule || source.hasModule;
+}
+function analyzePackageModuleType(pkgJson) {
+  if (pkgJson.name?.startsWith("@types/"))
+    return "dts";
+  const hasExports = pkgJson.exports != null;
+  const hasModule = !!pkgJson.module;
+  const hasMain = !!pkgJson.main;
+  const isTypeModule = pkgJson.type === "module";
+  if (hasExports && pkgJson.exports) {
+    const exportInfo = analyzeExports(pkgJson.exports);
+    if (exportInfo.hasImport && exportInfo.hasRequire)
+      return "dual";
+    if (exportInfo.hasImport || exportInfo.hasModule) {
+      if (hasMain && !isTypeModule)
+        return "dual";
+      return "esm";
+    }
+    if (exportInfo.hasRequire) {
+      if (hasModule)
+        return "dual";
+      return "cjs";
     }
   }
-  if (esm && cjs)
-    return "dual";
-  if (esm)
-    return "esm";
-  if (fauxEsm)
+  if (hasModule && hasMain) {
+    const mainIsCJS = pkgJson.main?.endsWith(".cjs") || pkgJson.main?.endsWith(".js") && !isTypeModule;
+    return mainIsCJS ? "faux" : "esm";
+  }
+  if (hasModule)
     return "faux";
-  if (!esm && !cjs && !pkgJson.main && !pkgJson.exports && pkgJson.types)
+  if (isTypeModule || hasMain && pkgJson.main?.endsWith(".mjs"))
+    return "esm";
+  if (hasMain)
+    return "cjs";
+  if (pkgJson.types || pkgJson.typings)
     return "dts";
   return "cjs";
-  function analyzeThing(value, path) {
-    if (value && typeof value === "object") {
-      if (Array.isArray(value)) {
-        const values = (
-          /** @type {Array<unknown>} */
-          value
-        );
-        let index = -1;
-        while (++index < values.length) {
-          analyzeThing(values[index], `${path}[${index}]`);
-        }
-      } else {
-        const record = (
-          /** @type {Record<string, unknown>} */
-          value
-        );
-        let dots = false;
-        for (const [key, subvalue] of Object.entries(record)) {
-          if (key.charAt(0) !== ".")
-            break;
-          analyzeThing(subvalue, `${path}["${key}"]`);
-          dots = true;
-        }
-        if (dots)
-          return;
-        let explicit = false;
-        const conditionImport = Boolean("import" in record && record.import);
-        const conditionRequire = Boolean("require" in record && record.require);
-        const conditionDefault = Boolean("default" in record && record.default);
-        if (conditionImport || conditionRequire) {
-          explicit = true;
-        }
-        if (conditionImport || conditionRequire && conditionDefault) {
-          esm = true;
-        }
-        if (conditionRequire || conditionImport && conditionDefault) {
-          cjs = true;
-        }
-        const defaults = record.node || record.default;
-        if (typeof defaults === "string" && !explicit) {
-          if (/\.mjs$/.test(defaults))
-            esm = true;
-          if (/\.cjs$/.test(defaults))
-            cjs = true;
-        }
-      }
-    } else if (typeof value === "string") {
-      if (/\.mjs$/.test(value))
-        esm = true;
-      if (/\.cjs$/.test(value))
-        cjs = true;
-    } else if (value === null) ; else {
-      console.error("unknown:", [value], path);
-    }
-  }
 }
 
 async function getPackageInstallSize(pkg) {

package/dist/shared/{node-modules-tools.DH68osY8.d.mts → node-modules-tools.BWZx79LE.d.mts}

@@ -63,10 +63,16 @@ interface PackageNode extends PackageNodeBase {
         publint?: Message[] | null;
     };
 }
+type AuditLevelString = 'low' | 'moderate' | 'high' | 'critical';
 interface NpmMeta {
     publishedAt: number;
     deprecated?: string;
     provenance?: 'trustedPublisher' | boolean;
+    vulnerability?: {
+        level: AuditLevelString;
+        title: string;
+        url?: string;
+    };
 }
 /**
  * Npm meta of the latest version of a certain package
@@ -92,4 +98,4 @@ declare const CLUSTER_DEP_DEV = "dep:dev";
 declare const CLUSTER_DEP_OPTIONAL = "dep:optional";
 
 export { CLUSTER_DEP_DEV as C, CLUSTER_DEP_OPTIONAL as d, CLUSTER_DEP_PROD as e, PackageModuleTypes as i };
-export type { FileCategory as F, NpmMeta as N, PackageNodeRaw as P, PackageNodeBase as a, PackageNode as b, PackageModuleType as c, NpmMetaLatest as f, PackageInstallSizeInfo as g, PackageModuleTypeSimple as h };
+export type { AuditLevelString as A, FileCategory as F, NpmMeta as N, PackageNodeRaw as P, PackageNodeBase as a, PackageNode as b, PackageModuleType as c, NpmMetaLatest as f, PackageInstallSizeInfo as g, PackageModuleTypeSimple as h };

package/dist/shared/{node-modules-tools.DH68osY8.d.ts → node-modules-tools.BWZx79LE.d.ts}

@@ -63,10 +63,16 @@ interface PackageNode extends PackageNodeBase {
         publint?: Message[] | null;
     };
 }
+type AuditLevelString = 'low' | 'moderate' | 'high' | 'critical';
 interface NpmMeta {
     publishedAt: number;
     deprecated?: string;
     provenance?: 'trustedPublisher' | boolean;
+    vulnerability?: {
+        level: AuditLevelString;
+        title: string;
+        url?: string;
+    };
 }
 /**
  * Npm meta of the latest version of a certain package
@@ -92,4 +98,4 @@ declare const CLUSTER_DEP_DEV = "dep:dev";
 declare const CLUSTER_DEP_OPTIONAL = "dep:optional";
 
 export { CLUSTER_DEP_DEV as C, CLUSTER_DEP_OPTIONAL as d, CLUSTER_DEP_PROD as e, PackageModuleTypes as i };
-export type { FileCategory as F, NpmMeta as N, PackageNodeRaw as P, PackageNodeBase as a, PackageNode as b, PackageModuleType as c, NpmMetaLatest as f, PackageInstallSizeInfo as g, PackageModuleTypeSimple as h };
+export type { AuditLevelString as A, FileCategory as F, NpmMeta as N, PackageNodeRaw as P, PackageNodeBase as a, PackageNode as b, PackageModuleType as c, NpmMetaLatest as f, PackageInstallSizeInfo as g, PackageModuleTypeSimple as h };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "node-modules-tools",
   "type": "module",
-  "version": "1.3.2",
+  "version": "1.4.1",
   "description": "Tools for inspecting node_modules",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -32,12 +32,12 @@
     "package-manager-detector": "^1.6.0",
     "pathe": "^2.0.3",
     "pkg-types": "^2.3.0",
-    "publint": "^0.3.17",
+    "publint": "^0.3.18",
     "semver": "^7.7.4",
     "tinyexec": "^1.0.2"
   },
   "devDependencies": {
-    "@pnpm/list": "^1000.2.5",
+    "@pnpm/list": "^1000.3.2",
     "@pnpm/types": "^1001.3.0",
     "@types/js-yaml": "^4.0.9",
     "@types/stream-json": "^1.7.8",