@xylabs/ts-scripts-yarn3 6.4.2 → 6.4.4

package/dist/bin/xy.mjs

@@ -683,7 +683,7 @@ function getBasePackageName(importName) {
   }
   return importName.split("/")[0];
 }
-function getImportsFromFile(filePath, importPaths) {
+function getImportsFromFile(filePath, importPaths, typeImportPaths) {
   const sourceCode = fs2.readFileSync(filePath, "utf8");
   const sourceFile = ts.createSourceFile(
     path3.basename(filePath),
@@ -692,24 +692,41 @@ function getImportsFromFile(filePath, importPaths) {
     true
   );
   const imports = [];
+  const typeImports = [];
   function visit(node) {
     if (ts.isImportDeclaration(node) || ts.isExportDeclaration(node)) {
       const moduleSpecifier = node.moduleSpecifier?.getFullText();
+      const isTypeImport = ts.isImportDeclaration(node) ? node.importClause?.isTypeOnly ?? false : false;
       if (moduleSpecifier) {
         const trimmed = moduleSpecifier.split("'").at(1) ?? moduleSpecifier;
+        if (isTypeImport) {
+          typeImports.push(trimmed);
+        } else {
+          imports.push(trimmed);
+        }
+      }
+    } else if (ts.isCallExpression(node) && node.expression.kind === ts.SyntaxKind.ImportKeyword) {
+      const [arg] = node.arguments;
+      if (ts.isStringLiteral(arg)) {
+        const trimmed = arg.text;
         imports.push(trimmed);
       }
     }
     ts.forEachChild(node, visit);
   }
   visit(sourceFile);
-  const importsStartsWithExcludes = [".", "#", "node:", "@types/"];
+  const importsStartsWithExcludes = [".", "#", "node:"];
   const cleanedImports = imports.filter((imp) => !importsStartsWithExcludes.some((exc) => imp.startsWith(exc))).map(getBasePackageName);
+  const cleanedTypeImports = typeImports.filter((imp) => !importsStartsWithExcludes.some((exc) => imp.startsWith(exc))).map(getBasePackageName);
   for (const imp of cleanedImports) {
     importPaths[imp] = importPaths[imp] || [];
     importPaths[imp].push(filePath);
   }
-  return cleanedImports;
+  for (const imp of cleanedTypeImports) {
+    typeImportPaths[imp] = typeImportPaths[imp] || [];
+    typeImportPaths[imp].push(filePath);
+  }
+  return [cleanedImports, cleanedTypeImports];
 }
 function findFilesByGlob(cwd, pattern) {
   return globSync(pattern, { cwd, absolute: true });
@@ -729,18 +746,29 @@ function findFiles(path4) {
 }
 function getExternalImportsFromFiles({ prodSourceFiles, devSourceFiles }) {
   const prodImportPaths = {};
-  const prodImports = prodSourceFiles.flatMap((path4) => getImportsFromFile(path4, prodImportPaths));
+  const prodTypeImportPaths = {};
+  const prodImportPairs = prodSourceFiles.map((path4) => getImportsFromFile(path4, prodImportPaths, prodTypeImportPaths));
+  const prodImports = prodImportPairs.flatMap((pair) => pair[0]);
+  const prodTypeImports = prodImportPairs.flatMap((pair) => pair[1]);
   const devImportPaths = {};
-  const devImports = devSourceFiles.flatMap((path4) => getImportsFromFile(path4, devImportPaths));
+  const devTypeImportPaths = {};
+  const devImportPairs = devSourceFiles.map((path4) => getImportsFromFile(path4, devImportPaths, devTypeImportPaths));
+  const devImports = devImportPairs.flatMap((pair) => pair[0]);
+  const devTypeImports = devImportPairs.flatMap((pair) => pair[1]);
   const externalProdImports = prodImports.filter((imp) => !imp.startsWith(".") && !imp.startsWith("#") && !imp.startsWith("node:"));
+  const externalProdTypeImports = prodTypeImports.filter((imp) => !imp.startsWith(".") && !imp.startsWith("#") && !imp.startsWith("node:"));
   const externalDevImports = devImports.filter((imp) => !imp.startsWith(".") && !imp.startsWith("#") && !imp.startsWith("node:"));
   return {
     prodImports,
     devImports,
     prodImportPaths,
+    prodTypeImportPaths,
     devImportPaths,
     externalProdImports,
-    externalDevImports
+    externalDevImports,
+    prodTypeImports,
+    devTypeImports,
+    externalProdTypeImports
   };
 }
 function check({
@@ -751,7 +779,9 @@ function check({
 }) {
   const { prodSourceFiles, devSourceFiles } = findFiles(location);
   const {
+    prodTypeImportPaths,
     prodImportPaths,
+    externalProdTypeImports,
     devImportPaths,
     externalProdImports,
     externalDevImports
@@ -764,6 +794,15 @@ function check({
   let unlistedDependencies = 0;
   let unlistedDevDependencies = 0;
   let unusedDependencies = 0;
+  let typesInDependencies = 0;
+  for (const imp of externalProdTypeImports) {
+    if (!dependencies.includes(imp) && !peerDependencies.includes(imp) && !devDependencies.includes(imp) && !devDependencies.includes(`@types/${imp}`)) {
+      unlistedDependencies++;
+      console.log(`[${chalk12.blue(name)}] Missing dependency in package.json: ${chalk12.red(imp)}`);
+      console.log(`  ${prodTypeImportPaths[imp].join("\n")}`);
+      console.log("");
+    }
+  }
   for (const imp of externalProdImports) {
     if (!dependencies.includes(imp) && !peerDependencies.includes(imp)) {
       unlistedDependencies++;
@@ -773,6 +812,13 @@ function check({
     }
   }
   for (const dep of dependencies) {
+    if (dep.startsWith("@types/")) {
+      typesInDependencies++;
+      console.log(`[${chalk12.blue(name)}] @types in dependencies in package.json: ${chalk12.red(dep)}`);
+      console.log(`  ${location}/package.json
+`);
+      console.log("");
+    }
     if (!externalProdImports.includes(dep)) {
       unusedDependencies++;
       console.log(`[${chalk12.blue(name)}] Unused dependency in package.json: ${chalk12.red(dep)}`);
@@ -801,7 +847,7 @@ function check({
       }
     }
   }
-  const totalErrors = unlistedDependencies + unlistedDevDependencies + unusedDependencies;
+  const totalErrors = unlistedDependencies + unlistedDevDependencies + unusedDependencies + typesInDependencies;
   return totalErrors;
 }
 var deplint = ({ pkg }) => {