feat(extract): adds more granularity to dependency types

.c8rc.json

@@ -1,7 +1,7 @@
 {
   "checkCoverage": true,
   "statements": 99.89,
-  "branches": 98.76,
+  "branches": 98.75,
   "functions": 100,
   "lines": 99.89,
   "exclude": [

src/extract/ast-extractors/extract-amd-deps.mjs

@@ -14,9 +14,10 @@ function extractRegularAMDDependencies(pNode, pDependencies) {
               moduleSystem: "amd",
               dynamic: false,
               exoticallyRequired: false,
+              dependencyTypes: ["amd-define"],
             });
           }
-        })
+        }),
       );
   }
 }
@@ -30,24 +31,24 @@ function extractCommonJSWrappers(pNode, pDependencies, pExoticRequireStrings) {
           pArgument.params.some(
             (pParameter) =>
               pParameter.name === "require" ||
-              pExoticRequireStrings.includes(pParameter.name)
-          )
+              pExoticRequireStrings.includes(pParameter.name),
+          ),
       )
       .forEach((pFunction) =>
         extractCommonJSDependencies(
           pFunction.body,
           pDependencies,
           "amd",
-          pExoticRequireStrings
-        )
+          pExoticRequireStrings,
+        ),
       );
   }
 }
 
 export default function extractAMDDependencies(
   pAST,
   pDependencies,
-  pExoticRequireStrings
+  pExoticRequireStrings,
 ) {
   walk_simple(
     pAST,
@@ -67,6 +68,6 @@ export default function extractAMDDependencies(
       },
     },
     // see https://github.com/acornjs/acorn/issues/746
-    walk_base
+    walk_base,
   );
 }

src/extract/ast-extractors/extract-cjs-deps.mjs

@@ -13,10 +13,17 @@ function pryStringsFromArguments(pArguments) {
   return lReturnValue;
 }
 
+function getRequireTypes(pModuleSystem) {
+  return pModuleSystem === "amd" ? ["amd-require"] : ["require"];
+}
+function getExoticRequireTypes(pModuleSystem) {
+  return pModuleSystem === "amd" ? ["amd-exotic-require"] : ["exotic-require"];
+}
+
 function pushRequireCallsToDependencies(
   pDependencies,
   pModuleSystem,
-  pRequireStrings
+  pRequireStrings,
 ) {
   return (pNode) => {
     for (let lName of pRequireStrings) {
@@ -28,8 +35,15 @@ function pushRequireCallsToDependencies(
             moduleSystem: pModuleSystem,
             dynamic: false,
             ...(lName === "require"
-              ? { exoticallyRequired: false }
-              : { exoticallyRequired: true, exoticRequire: lName }),
+              ? {
+                  exoticallyRequired: false,
+                  dependencyTypes: getRequireTypes(pModuleSystem),
+                }
+              : {
+                  exoticallyRequired: true,
+                  exoticRequire: lName,
+                  dependencyTypes: getExoticRequireTypes(pModuleSystem),
+                }),
           });
         }
       }
@@ -41,7 +55,7 @@ export default function extractCommonJSDependencies(
   pAST,
   pDependencies,
   pModuleSystem,
-  pExoticRequireStrings
+  pExoticRequireStrings,
 ) {
   // var/const lalala = require('./lalala');
   // require('./lalala');
@@ -58,10 +72,10 @@ export default function extractCommonJSDependencies(
       CallExpression: pushRequireCallsToDependencies(
         pDependencies,
         pModuleSystem,
-        lRequireStrings
+        lRequireStrings,
       ),
     },
     // see https://github.com/acornjs/acorn/issues/746
-    walk_base
+    walk_base,
   );
 }

src/extract/ast-extractors/extract-es6-deps.mjs

@@ -12,39 +12,53 @@ function pushImportNodeValue(pDependencies) {
         moduleSystem: "es6",
         dynamic: true,
         exoticallyRequired: false,
+        dependencyTypes: ["dynamic-import"],
       });
     } else if (estreeHelpers.isPlaceholderlessTemplateLiteral(pNode.source)) {
       pDependencies.push({
         module: pNode.source.quasis[0].value.cooked,
         moduleSystem: "es6",
         dynamic: true,
         exoticallyRequired: false,
+        dependencyTypes: ["dynamic-import"],
       });
     }
   };
 }
 
 export default function extractES6Dependencies(pAST, pDependencies) {
-  function pushSourceValue(pNode) {
+  function pushImportSourceValue(pNode) {
     if (pNode.source && pNode.source.value) {
       pDependencies.push({
         module: pNode.source.value,
         moduleSystem: "es6",
         dynamic: false,
         exoticallyRequired: false,
+        dependencyTypes: ["import"],
+      });
+    }
+  }
+  function pushExportSourceValue(pNode) {
+    if (pNode.source && pNode.source.value) {
+      pDependencies.push({
+        module: pNode.source.value,
+        moduleSystem: "es6",
+        dynamic: false,
+        exoticallyRequired: false,
+        dependencyTypes: ["export"],
       });
     }
   }
 
   walk_simple(
     pAST,
     {
-      ImportDeclaration: pushSourceValue,
+      ImportDeclaration: pushImportSourceValue,
       ImportExpression: pushImportNodeValue(pDependencies),
-      ExportAllDeclaration: pushSourceValue,
-      ExportNamedDeclaration: pushSourceValue,
+      ExportAllDeclaration: pushExportSourceValue,
+      ExportNamedDeclaration: pushExportSourceValue,
     },
     // see https://github.com/acornjs/acorn/issues/746
-    walk_base
+    walk_base,
   );
 }

src/extract/ast-extractors/extract-typescript-deps.mjs

@@ -1,3 +1,4 @@
+/* eslint-disable max-lines */
 /* eslint-disable no-inline-comments */
 import tryImport from "semver-try-require";
 import meta from "#meta.js";
@@ -43,28 +44,50 @@ function isTypeOnlyExport(pStatement) {
  */
 
 /**
- * Get all import and export statements from the top level AST node
+ * Get all import statements from the top level AST node
  *
  * @param {import("typescript").Node} pAST - the (top-level in this case) AST node
  * @returns {{module: string; moduleSystem: string; exoticallyRequired: boolean; dependencyTypes?: string[];}[]} -
- *                                  all import and export statements in the
- *                                  (top level) AST node
+ *                                  all import statements in the (top level) AST node
+ */
+function extractImports(pAST) {
+  return pAST.statements
+    .filter(
+      (pStatement) =>
+        typescript.SyntaxKind[pStatement.kind] === "ImportDeclaration" &&
+        Boolean(pStatement.moduleSpecifier),
+    )
+    .map((pStatement) => ({
+      module: pStatement.moduleSpecifier.text,
+      moduleSystem: "es6",
+      exoticallyRequired: false,
+      ...(isTypeOnlyImport(pStatement)
+        ? { dependencyTypes: ["type-only", "import"] }
+        : { dependencyTypes: ["import"] }),
+    }));
+}
+
+/**
+ * Get all export statements from the top level AST node
+ *
+ * @param {import("typescript").Node} pAST - the (top-level in this case) AST node
+ * @returns {{module: string; moduleSystem: string; exoticallyRequired: boolean; dependencyTypes?: string[];}[]} -
+ *                                  all export statements in the (top level) AST node
  */
-function extractImportsAndExports(pAST) {
+function extractExports(pAST) {
   return pAST.statements
     .filter(
       (pStatement) =>
-        (typescript.SyntaxKind[pStatement.kind] === "ImportDeclaration" ||
-          typescript.SyntaxKind[pStatement.kind] === "ExportDeclaration") &&
+        typescript.SyntaxKind[pStatement.kind] === "ExportDeclaration" &&
         Boolean(pStatement.moduleSpecifier),
     )
     .map((pStatement) => ({
       module: pStatement.moduleSpecifier.text,
       moduleSystem: "es6",
       exoticallyRequired: false,
-      ...(isTypeOnlyImport(pStatement) || isTypeOnlyExport(pStatement)
-        ? { dependencyTypes: ["type-only"] }
-        : {}),
+      ...(isTypeOnlyExport(pStatement)
+        ? { dependencyTypes: ["type-only", "export"] }
+        : { dependencyTypes: ["export"] }),
     }));
 }
 
@@ -92,6 +115,7 @@ function extractImportEquals(pAST) {
       module: pStatement.moduleReference.expression.text,
       moduleSystem: "cjs",
       exoticallyRequired: false,
+      dependencyTypes: ["import-equals"],
     }));
 }
 
@@ -108,19 +132,31 @@ function extractTripleSlashDirectives(pAST) {
       module: pReference.fileName,
       moduleSystem: "tsd",
       exoticallyRequired: false,
+      dependencyTypes: [
+        "triple-slash-directive",
+        "triple-slash-file-reference",
+      ],
     }))
     .concat(
       pAST.typeReferenceDirectives.map((pReference) => ({
         module: pReference.fileName,
         moduleSystem: "tsd",
         exoticallyRequired: false,
+        dependencyTypes: [
+          "triple-slash-directive",
+          "triple-slash-type-reference",
+        ],
       })),
     )
     .concat(
       pAST.amdDependencies.map((pReference) => ({
         module: pReference.path,
         moduleSystem: "tsd",
         exoticallyRequired: false,
+        dependencyTypes: [
+          "triple-slash-directive",
+          "triple-slash-amd-dependency",
+        ],
       })),
     );
 }
@@ -224,6 +260,7 @@ function walk(pResult, pExoticRequireStrings) {
         module: pASTNode.arguments[0].text,
         moduleSystem: "cjs",
         exoticallyRequired: false,
+        dependencyTypes: ["require"],
       });
     }
 
@@ -235,6 +272,7 @@ function walk(pResult, pExoticRequireStrings) {
           moduleSystem: "cjs",
           exoticallyRequired: true,
           exoticRequire: pExoticRequireString,
+          dependencyTypes: ["exotic-require"],
         });
       }
     });
@@ -246,6 +284,7 @@ function walk(pResult, pExoticRequireStrings) {
         moduleSystem: "es6",
         dynamic: true,
         exoticallyRequired: false,
+        dependencyTypes: ["dynamic-import"],
       });
     }
 
@@ -256,6 +295,7 @@ function walk(pResult, pExoticRequireStrings) {
         module: pASTNode.argument.literal.text,
         moduleSystem: "es6",
         exoticallyRequired: false,
+        dependencyTypes: ["type-import"],
       });
     }
     typescript.forEachChild(pASTNode, walk(pResult, pExoticRequireStrings));
@@ -287,7 +327,8 @@ export default function extractTypeScriptDependencies(
   pExoticRequireStrings,
 ) {
   return Boolean(typescript)
-    ? extractImportsAndExports(pTypeScriptAST)
+    ? extractImports(pTypeScriptAST)
+        .concat(extractExports(pTypeScriptAST))
         .concat(extractImportEquals(pTypeScriptAST))
         .concat(extractTripleSlashDirectives(pTypeScriptAST))
         .concat(