@xylabs/ts-scripts-yarn3 6.5.5 → 6.5.7

package/dist/xy/xy.mjs

@@ -667,20 +667,10 @@ function findFilesByGlob(cwd, pattern) {
 // src/actions/deplint/findFiles.ts
 function findFiles(path5) {
   const allSourceInclude = ["./src/**/*.{ts,tsx}"];
-  const allDistInclude = ["./dist/**/*.d.ts"];
-  const prodExcludeEndswith = [".spec.ts", ".stories.tsx"];
-  const prodExcludeIncludes = ["/spec/", "/stories/", "/scripts/"];
-  const allSourceFiles = allSourceInclude.flatMap((pattern) => findFilesByGlob(path5, pattern));
-  const allDistFiles = allDistInclude.flatMap((pattern) => findFilesByGlob(path5, pattern));
-  const prodSourceFiles = allSourceFiles.filter((file) => !prodExcludeEndswith.some((ext) => file.endsWith(ext)) && !prodExcludeIncludes.some((excl) => file.includes(excl)));
-  const prodDistFiles = allDistFiles.filter((file) => !prodExcludeEndswith.some((ext) => file.endsWith(ext)) && !prodExcludeIncludes.some((excl) => file.includes(excl)));
-  const devSourceFiles = allSourceFiles.filter((file) => !prodSourceFiles.includes(file));
-  return {
-    allSourceFiles,
-    prodSourceFiles,
-    devSourceFiles,
-    prodDistFiles
-  };
+  const allDistInclude = ["./dist/**/*.d.ts", "./dist/**/*.{mjs,js,cjs}"];
+  const srcFiles = allSourceInclude.flatMap((pattern) => findFilesByGlob(path5, pattern));
+  const distFiles = allDistInclude.flatMap((pattern) => findFilesByGlob(path5, pattern));
+  return { srcFiles, distFiles };
 }
 
 // src/actions/deplint/getDependenciesFromPackageJson.ts
@@ -707,21 +697,24 @@ import ts from "typescript";
 
 // src/actions/deplint/getBasePackageName.ts
 function getBasePackageName(importName) {
-  if (importName.startsWith("@")) {
-    const parts = importName.split("/");
-    return parts.length >= 2 ? `${parts[0]}/${parts[1]}` : importName;
+  const importNameScrubbed = importName.replaceAll('"', "").trim();
+  if (importNameScrubbed.startsWith("@")) {
+    const parts = importNameScrubbed.split("/");
+    return parts.length >= 2 ? `${parts[0]}/${parts[1]}` : importNameScrubbed;
   }
-  return importName.split("/")[0];
+  return importNameScrubbed.split("/")[0];
 }
 
 // src/actions/deplint/getImportsFromFile.ts
 function getImportsFromFile(filePath, importPaths, typeImportPaths) {
   const sourceCode = fs3.readFileSync(filePath, "utf8");
+  const isMjsFile = filePath.endsWith(".mjs");
   const sourceFile = ts.createSourceFile(
     path4.basename(filePath),
     sourceCode,
     ts.ScriptTarget.Latest,
-    true
+    true,
+    isMjsFile ? ts.ScriptKind.JS : void 0
   );
   const imports = [];
   const typeImports = [];
@@ -730,8 +723,8 @@ function getImportsFromFile(filePath, importPaths, typeImportPaths) {
     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 (typeof moduleSpecifier === "string") {
+        const trimmed = moduleSpecifier.replaceAll("'", "").replaceAll('"', "").trim();
         if (isTypeImport || isDeclarationFile) {
           typeImports.push(trimmed);
         } else {
@@ -752,11 +745,11 @@ function getImportsFromFile(filePath, importPaths, typeImportPaths) {
   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] = importPaths[imp] ?? [];
     importPaths[imp].push(filePath);
   }
   for (const imp of cleanedTypeImports) {
-    typeImportPaths[imp] = typeImportPaths[imp] || [];
+    typeImportPaths[imp] = typeImportPaths[imp] ?? [];
     typeImportPaths[imp].push(filePath);
   }
   return [cleanedImports, cleanedTypeImports];
@@ -767,117 +760,115 @@ var internalImportPrefixes = [".", "#", "node:"];
 var removeInternalImports = (imports) => {
   return imports.filter((imp) => !internalImportPrefixes.some((prefix) => imp.startsWith(prefix)));
 };
-function getExternalImportsFromFiles({
-  prodSourceFiles,
-  devSourceFiles,
-  prodDistFiles
-}) {
-  const prodImportPaths = {};
-  const prodTypeImportPaths = {};
-  const prodImportPairs = prodSourceFiles.map((path5) => getImportsFromFile(path5, prodImportPaths, prodTypeImportPaths));
-  const prodDistImportPairs = prodDistFiles.map((path5) => getImportsFromFile(path5, prodImportPaths, prodTypeImportPaths));
-  const prodImports = prodImportPairs.flatMap((pair) => pair[0]);
-  const prodDistImports = prodDistImportPairs.flatMap((pair) => pair[1]);
-  const devImportPaths = {};
-  const devTypeImportPaths = {};
-  const devImportPairs = devSourceFiles.map((path5) => getImportsFromFile(path5, devImportPaths, devTypeImportPaths));
-  const devImports = devImportPairs.flatMap((pair) => pair[0]);
-  const devTypeImports = devImportPairs.flatMap((pair) => pair[1]);
-  const externalProdImports = removeInternalImports(prodImports);
-  const externalProdTypeImports = removeInternalImports(prodDistImports);
-  const externalDevImports = removeInternalImports(devImports);
+function getExternalImportsFromFiles({ srcFiles, distFiles }) {
+  const srcImportPaths = {};
+  const distImportPaths = {};
+  for (const path5 of srcFiles) getImportsFromFile(path5, srcImportPaths, srcImportPaths).flat();
+  for (const path5 of distFiles) getImportsFromFile(path5, distImportPaths, distImportPaths).flat();
+  const srcImports = Object.keys(srcImportPaths);
+  const distImports = Object.keys(distImportPaths);
+  const externalSrcImports = removeInternalImports(srcImports);
+  const externalDistImports = removeInternalImports(distImports);
   return {
-    prodImports,
-    devImports,
-    prodImportPaths,
-    prodTypeImportPaths,
-    devImportPaths,
-    externalProdImports,
-    externalDevImports,
-    prodDistImports,
-    devTypeImports,
-    externalProdTypeImports
+    srcImports,
+    srcImportPaths,
+    externalSrcImports,
+    distImports,
+    distImportPaths,
+    externalDistImports
   };
 }
 
 // src/actions/deplint/checkPackage/getUnlistedDependencies.ts
 import chalk12 from "chalk";
-function getUnlistedDependencies({ name }, { dependencies, peerDependencies }, {
-  externalProdTypeImports,
-  prodTypeImportPaths,
-  externalProdImports,
-  prodImportPaths
-}) {
+function getUnlistedDependencies({ name, location }, { dependencies, peerDependencies }, { externalDistImports, distImportPaths }) {
   let unlistedDependencies = 0;
-  for (const imp of externalProdTypeImports) {
-    if (!dependencies.includes(imp) && !peerDependencies.includes(imp) && !dependencies.includes(`@types/${imp}`) && !peerDependencies.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) {
+  for (const imp of externalDistImports) {
     if (!dependencies.includes(imp) && !peerDependencies.includes(imp)) {
       unlistedDependencies++;
       console.log(`[${chalk12.blue(name)}] Missing dependency in package.json: ${chalk12.red(imp)}`);
-      console.log(`  ${prodImportPaths[imp].join("\n")}`);
-      console.log("");
+      console.log(`  ${distImportPaths[imp].join("\n ")}`);
     }
   }
+  if (unlistedDependencies > 0) {
+    const packageLocation = `${location}/package.json`;
+    console.log(`  ${chalk12.yellow(packageLocation)}
+`);
+  }
   return unlistedDependencies;
 }
 
 // src/actions/deplint/checkPackage/getUnlistedDevDependencies.ts
 import chalk13 from "chalk";
-function getUnlistedDevDependencies({ name }, {
+function getUnlistedDevDependencies({ name, location }, {
   devDependencies,
   dependencies,
   peerDependencies
-}, { devImportPaths, externalDevImports }) {
+}, {
+  srcImportPaths,
+  externalSrcImports,
+  distImports
+}) {
   let unlistedDevDependencies = 0;
-  for (const imp of externalDevImports) {
-    if (!devDependencies.includes(imp) && !dependencies.includes(imp) && !peerDependencies.includes(imp)) {
+  for (const imp of externalSrcImports) {
+    if (!distImports.includes(imp) && !dependencies.includes(imp) && !peerDependencies.includes(imp) && !devDependencies.includes(imp)) {
       unlistedDevDependencies++;
       console.log(`[${chalk13.blue(name)}] Missing devDependency in package.json: ${chalk13.red(imp)}`);
-      console.log(`  Found in: ${devImportPaths[imp].join(", ")}`);
+      console.log(`  ${srcImportPaths[imp].join("\n ")}`);
     }
   }
+  if (unlistedDevDependencies > 0) {
+    const packageLocation = `${location}/package.json`;
+    console.log(`  ${chalk13.yellow(packageLocation)}
+`);
+  }
   return unlistedDevDependencies;
 }
 
 // src/actions/deplint/checkPackage/getUnusedDependencies.ts
 import chalk14 from "chalk";
 function getUnusedDependencies({ name, location }, { dependencies }, {
-  externalProdImports,
-  externalProdTypeImports
+  externalDistImports,
+  externalSrcImports
 }) {
   let unusedDependencies = 0;
   for (const dep of dependencies) {
-    if (!externalProdImports.includes(dep) && !externalProdTypeImports.includes(dep)) {
+    if (!externalDistImports.includes(dep)) {
       unusedDependencies++;
-      console.log(`[${chalk14.blue(name)}] Unused dependency in package.json: ${chalk14.red(dep)}`);
-      console.log(`  ${location}/package.json
-`);
-      console.log("");
+      if (externalSrcImports.includes(dep)) {
+        console.log(`[${chalk14.blue(name)}] dependency should be devDependency in package.json: ${chalk14.red(dep)}`);
+      } else {
+        console.log(`[${chalk14.blue(name)}] Unused dependency in package.json: ${chalk14.red(dep)}`);
+      }
     }
   }
+  if (unusedDependencies > 0) {
+    const packageLocation = `${location}/package.json`;
+    console.log(`  ${chalk14.yellow(packageLocation)}
+`);
+  }
   return unusedDependencies;
 }
 
 // src/actions/deplint/checkPackage/getUnusedPeerDependencies.ts
 import chalk15 from "chalk";
-function getUnusedPeerDependencies({ name, location }, { peerDependencies }, { externalProdImports, externalProdTypeImports }) {
+function getUnusedPeerDependencies({ name, location }, { peerDependencies, dependencies }, { externalDistImports }) {
   let unusedDependencies = 0;
   for (const dep of peerDependencies) {
-    if (!externalProdImports.includes(dep) && !externalProdTypeImports.includes(dep)) {
+    if (!externalDistImports.includes(dep)) {
       unusedDependencies++;
-      console.log(`[${chalk15.blue(name)}] Unused peerDependency in package.json: ${chalk15.red(dep)}`);
-      console.log(`  ${location}/package.json
-`);
-      console.log("");
+      if (dependencies.includes(dep)) {
+        console.log(`[${chalk15.blue(name)}] Unused peerDependency [already a dependency] in package.json: ${chalk15.red(dep)}`);
+      } else {
+        console.log(`[${chalk15.blue(name)}] Unused peerDependency in package.json: ${chalk15.red(dep)}`);
+      }
     }
   }
+  if (unusedDependencies > 0) {
+    const packageLocation = `${location}/package.json`;
+    console.log(`  ${chalk15.yellow(packageLocation)}
+`);
+  }
   return unusedDependencies;
 }
 
@@ -889,26 +880,17 @@ function checkPackage({
   devDeps = false,
   peerDeps = false
 }) {
-  const {
-    prodSourceFiles,
-    devSourceFiles,
-    prodDistFiles
-  } = findFiles(location);
+  const { srcFiles, distFiles } = findFiles(location);
   const checkDeps = deps || !(deps || devDeps || peerDeps);
   const checkDevDeps = devDeps || !(deps || devDeps || peerDeps);
   const checkPeerDeps = peerDeps;
-  const sourceParams = getExternalImportsFromFiles({
-    prodSourceFiles,
-    devSourceFiles,
-    prodDistFiles
-  });
+  const sourceParams = getExternalImportsFromFiles({ srcFiles, distFiles });
   const packageParams = getDependenciesFromPackageJson(`${location}/package.json`);
   const unlistedDependencies = checkDeps ? getUnlistedDependencies({ name, location }, packageParams, sourceParams) : 0;
   const unusedDependencies = checkDeps ? getUnusedDependencies({ name, location }, packageParams, sourceParams) : 0;
-  const typesInDependencies = 0;
   const unlistedDevDependencies = checkDevDeps ? getUnlistedDevDependencies({ name, location }, packageParams, sourceParams) : 0;
   const unusedPeerDependencies = checkPeerDeps ? getUnusedPeerDependencies({ name, location }, packageParams, sourceParams) : 0;
-  const totalErrors = unlistedDependencies + unlistedDevDependencies + unusedDependencies + typesInDependencies + unusedPeerDependencies;
+  const totalErrors = unlistedDependencies + unlistedDevDependencies + unusedDependencies + unusedPeerDependencies;
   return totalErrors;
 }