@xylabs/ts-scripts-yarn3 6.5.14 → 6.5.16

package/dist/bin/xy.mjs

@@ -765,29 +765,47 @@ var removeInternalImports = (imports) => {
 function getExternalImportsFromFiles({ srcFiles, distFiles }) {
   const srcImportPaths = {};
   const distImportPaths = {};
+  const distTypeImportPaths = {};
   for (const path5 of srcFiles) getImportsFromFile(path5, srcImportPaths, srcImportPaths).flat();
-  for (const path5 of distFiles) getImportsFromFile(path5, distImportPaths, distImportPaths).flat();
+  const distTypeFiles = distFiles.filter((file) => file.endsWith(".d.ts") || file.endsWith(".d.cts") || file.endsWith(".d.mts"));
+  const distCodeFiles = distFiles.filter((file) => !(file.endsWith(".d.ts") || file.endsWith(".d.cts") || file.endsWith(".d.mts")));
+  for (const path5 of distCodeFiles) getImportsFromFile(path5, distImportPaths, distImportPaths).flat();
+  for (const path5 of distTypeFiles) getImportsFromFile(path5, distTypeImportPaths, distTypeImportPaths).flat();
   const srcImports = Object.keys(srcImportPaths);
   const distImports = Object.keys(distImportPaths);
+  const distTypeImports = Object.keys(distTypeImportPaths);
   const externalSrcImports = removeInternalImports(srcImports);
   const externalDistImports = removeInternalImports(distImports);
+  const externalDistTypeImports = removeInternalImports(distTypeImports);
   return {
     srcImports,
     srcImportPaths,
     externalSrcImports,
     distImports,
     distImportPaths,
-    externalDistImports
+    externalDistImports,
+    externalDistTypeImports
   };
 }
 
 // src/actions/deplint/checkPackage/getUnlistedDependencies.ts
 import { builtinModules } from "module";
 import chalk12 from "chalk";
-function getUnlistedDependencies({ name, location }, { dependencies, peerDependencies }, { externalDistImports, distImportPaths }) {
+function getUnlistedDependencies({ name, location }, { dependencies, peerDependencies }, {
+  externalDistImports,
+  externalDistTypeImports,
+  distImportPaths
+}) {
   let unlistedDependencies = 0;
   for (const imp of externalDistImports) {
-    if (!dependencies.includes(imp) && !peerDependencies.includes(imp) && !builtinModules.includes(imp)) {
+    if (!dependencies.includes(imp) && !dependencies.includes(`@types/${imp}`) && !peerDependencies.includes(imp) && !peerDependencies.includes(`@types/${imp}`) && !builtinModules.includes(imp) && !builtinModules.includes(`@types/${imp}`)) {
+      unlistedDependencies++;
+      console.log(`[${chalk12.blue(name)}] Missing dependency in package.json: ${chalk12.red(imp)}`);
+      console.log(`  ${distImportPaths[imp].join("\n ")}`);
+    }
+  }
+  for (const imp of externalDistTypeImports) {
+    if (!dependencies.includes(imp) && dependencies.includes(`@types/${imp}`) && !peerDependencies.includes(imp) && peerDependencies.includes(`@types/${imp}`) && !builtinModules.includes(imp) && builtinModules.includes(`@types/${imp}`)) {
       unlistedDependencies++;
       console.log(`[${chalk12.blue(name)}] Missing dependency in package.json: ${chalk12.red(imp)}`);
       console.log(`  ${distImportPaths[imp].join("\n ")}`);
@@ -815,7 +833,7 @@ function getUnlistedDevDependencies({ name, location }, {
 }) {
   let unlistedDevDependencies = 0;
   for (const imp of externalSrcImports) {
-    if (!distImports.includes(imp) && !dependencies.includes(imp) && !peerDependencies.includes(imp) && !devDependencies.includes(imp) && !builtinModules2.includes(imp)) {
+    if (!distImports.includes(imp) && !dependencies.includes(imp) && !dependencies.includes(`@types/${imp}`) && !peerDependencies.includes(imp) && !peerDependencies.includes(`@types/${imp}`) && !devDependencies.includes(imp) && !devDependencies.includes(`@types/${imp}`) && !builtinModules2.includes(imp)) {
       unlistedDevDependencies++;
       console.log(`[${chalk13.blue(name)}] Missing devDependency in package.json: ${chalk13.red(imp)}`);
       console.log(`  ${srcImportPaths[imp].join("\n ")}`);
@@ -837,7 +855,7 @@ function getUnusedDependencies({ name, location }, { dependencies }, {
 }) {
   let unusedDependencies = 0;
   for (const dep of dependencies) {
-    if (!externalDistImports.includes(dep)) {
+    if (!externalDistImports.includes(dep) && !externalDistImports.includes(`@types/${dep}`)) {
       unusedDependencies++;
       if (externalSrcImports.includes(dep)) {
         console.log(`[${chalk14.blue(name)}] dependency should be devDependency in package.json: ${chalk14.red(dep)}`);