@c4a/extract 0.6.17 → 0.6.19

package/bin/c4a-extract-code.js

@@ -13748,8 +13748,8 @@ import { promisify } from "node:util";
 var execFileAsync = promisify(execFile);
 var isScanExcludedDir = (name) => SCAN_EXCLUDED_DIRS.has(name) || name.startsWith(".") && name !== "." || name.endsWith(".egg-info");
 var DEFAULT_EXCLUDED_FILE_PATTERNS = [
-  /\.test\.ts$/i,
-  /\.spec\.ts$/i,
+  /\.test\.tsx?$/i,
+  /\.spec\.tsx?$/i,
   /\.d\.ts$/i
 ];
 var SUPPORTED_EXTENSIONS = new Set([".ts", ".tsx"]);
@@ -13904,11 +13904,7 @@ var countFileLines = async (filePath) => {
   const contents = await readFile(filePath, "utf-8");
   if (contents === "")
     return 0;
-  const lines = contents.split(/\r\n|\r|\n/);
-  if (lines[lines.length - 1] === "") {
-    lines.pop();
-  }
-  return lines.length;
+  return contents.split(/\r\n|\r|\n/).filter((line) => line.trim().length > 0).length;
 };
 var MANIFEST_FILES = [
   "package.json",
@@ -14054,13 +14050,19 @@ var findSubModuleDirs = async (rootDir, excludeDirs, gitFiles, pathFilter2) => {
 var buildModule = async (repoRoot, moduleDir, moduleName, childModuleDirs, ref, pathFilter2, gitFiles) => {
   const excludes = childModuleDirs.size > 0 ? childModuleDirs : undefined;
   const moduleFiles = gitFiles !== undefined && gitFiles !== null && gitFiles.size > 0 ? filterGitSourceFiles(resolve(moduleDir), gitFiles, excludes, pathFilter2) : await scanSourceFiles(moduleDir, excludes, ref, pathFilter2);
+  const broadPathFilter = pathFilter2 === undefined ? undefined : { ...pathFilter2, code: { ...pathFilter2.code, exclude: [] } };
+  const allMatchedFiles = broadPathFilter === undefined ? moduleFiles : gitFiles !== undefined && gitFiles !== null && gitFiles.size > 0 ? filterGitSourceFiles(resolve(moduleDir), gitFiles, excludes, broadPathFilter) : await scanSourceFiles(moduleDir, excludes, ref, broadPathFilter);
+  const included = new Set(moduleFiles);
+  const excludedModuleFiles = allMatchedFiles.filter((file) => !included.has(file));
   const modulePath = toPosixPath(relative(repoRoot, moduleDir)) || ".";
   const totalLines = await Promise.all(moduleFiles.map((file) => countFileLines(join(moduleDir, file))));
   const files = modulePath === "." ? moduleFiles : moduleFiles.map((file) => toPosixPath(join(modulePath, file)));
+  const excludedFiles = modulePath === "." ? excludedModuleFiles : excludedModuleFiles.map((file) => toPosixPath(join(modulePath, file)));
   return {
     name: moduleName,
     path: modulePath,
     files,
+    ...excludedFiles.length === 0 ? {} : { excludedFiles },
     fileCount: files.length,
     totalLines: totalLines.reduce((sum, value) => sum + value, 0)
   };

package/index.js

@@ -14355,8 +14355,8 @@ import { promisify } from "node:util";
 var execFileAsync = promisify(execFile);
 var isScanExcludedDir = (name) => SCAN_EXCLUDED_DIRS.has(name) || name.startsWith(".") && name !== "." || name.endsWith(".egg-info");
 var DEFAULT_EXCLUDED_FILE_PATTERNS = [
-  /\.test\.ts$/i,
-  /\.spec\.ts$/i,
+  /\.test\.tsx?$/i,
+  /\.spec\.tsx?$/i,
   /\.d\.ts$/i
 ];
 var SUPPORTED_EXTENSIONS = new Set([".ts", ".tsx"]);
@@ -14511,11 +14511,7 @@ var countFileLines = async (filePath) => {
   const contents = await readFile(filePath, "utf-8");
   if (contents === "")
     return 0;
-  const lines = contents.split(/\r\n|\r|\n/);
-  if (lines[lines.length - 1] === "") {
-    lines.pop();
-  }
-  return lines.length;
+  return contents.split(/\r\n|\r|\n/).filter((line) => line.trim().length > 0).length;
 };
 var MANIFEST_FILES = [
   "package.json",
@@ -14661,13 +14657,19 @@ var findSubModuleDirs = async (rootDir, excludeDirs, gitFiles, pathFilter2) => {
 var buildModule = async (repoRoot, moduleDir, moduleName, childModuleDirs, ref, pathFilter2, gitFiles) => {
   const excludes = childModuleDirs.size > 0 ? childModuleDirs : undefined;
   const moduleFiles = gitFiles !== undefined && gitFiles !== null && gitFiles.size > 0 ? filterGitSourceFiles(resolve(moduleDir), gitFiles, excludes, pathFilter2) : await scanSourceFiles(moduleDir, excludes, ref, pathFilter2);
+  const broadPathFilter = pathFilter2 === undefined ? undefined : { ...pathFilter2, code: { ...pathFilter2.code, exclude: [] } };
+  const allMatchedFiles = broadPathFilter === undefined ? moduleFiles : gitFiles !== undefined && gitFiles !== null && gitFiles.size > 0 ? filterGitSourceFiles(resolve(moduleDir), gitFiles, excludes, broadPathFilter) : await scanSourceFiles(moduleDir, excludes, ref, broadPathFilter);
+  const included = new Set(moduleFiles);
+  const excludedModuleFiles = allMatchedFiles.filter((file) => !included.has(file));
   const modulePath = toPosixPath(relative(repoRoot, moduleDir)) || ".";
   const totalLines = await Promise.all(moduleFiles.map((file) => countFileLines(join(moduleDir, file))));
   const files = modulePath === "." ? moduleFiles : moduleFiles.map((file) => toPosixPath(join(modulePath, file)));
+  const excludedFiles = modulePath === "." ? excludedModuleFiles : excludedModuleFiles.map((file) => toPosixPath(join(modulePath, file)));
   return {
     name: moduleName,
     path: modulePath,
     files,
+    ...excludedFiles.length === 0 ? {} : { excludedFiles },
     fileCount: files.length,
     totalLines: totalLines.reduce((sum, value) => sum + value, 0)
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@c4a/extract",
-  "version": "0.6.17",
+  "version": "0.6.19",
   "type": "module",
   "description": "Language-plugin framework and repository runner for Context code evidence",
   "license": "MIT",