Merge branch 'includefiles' into feature/include

# Conflicts:
#	src/cli/index.ts
#	src/core/packager.ts

repopack.config.json

@@ -12,5 +12,6 @@
     "useGitignore": true,
     "useDefaultPatterns": true,
     "customPatterns": []
-  }
+  },
+  "includeFiles": []
 }

src/cli/index.ts

@@ -20,6 +20,7 @@ interface CliOptions extends OptionValues {
   topFilesLen?: number;
   outputShowLineNumbers?: boolean;
   style?: RepopackOutputStyle;
+  include?: string[];
 }
 
 async function executeAction(directory: string, rootDir: string, options: CliOptions) {
@@ -33,6 +34,7 @@ async function executeAction(directory: string, rootDir: string, options: CliOpt
   console.log(pc.dim(`\n📦 Repopack v${version}\n`));
 
   logger.setVerbose(options.verbose || false);
+  logger.trace('Loaded CLI options:', options);
 
   const fileConfig: RepopackConfigFile = await loadFileConfig(rootDir, options.config ?? null);
   logger.trace('Loaded file config:', fileConfig);
@@ -53,6 +55,9 @@ async function executeAction(directory: string, rootDir: string, options: CliOpt
   if (options.style) {
     cliConfig.output = { ...cliConfig.output, style: options.style.toLowerCase() as RepopackOutputStyle };
   }
+  if (options.include) {
+    cliConfig.include = options.include;
+  }
   logger.trace('CLI config:', cliConfig);
 
   const config: RepopackConfigMerged = mergeConfigs(fileConfig, cliConfig);
@@ -106,6 +111,7 @@ export async function run() {
       .arguments('[directory]')
       .option('-v, --version', 'show version information')
       .option('-o, --output <file>', 'specify the output file name')
+      .option('--include <files...>', 'space-separated list of files to include')
       .option('-i, --ignore <patterns>', 'additional ignore patterns (comma-separated)')
       .option('-c, --config <path>', 'path to a custom config file')
       .option('--top-files-len <number>', 'specify the number of top files to display', parseInt)

src/config/configLoader.ts

@@ -70,5 +70,10 @@ export function mergeConfigs(fileConfig: RepopackConfigFile, cliConfig: Repopack
         ...(cliConfig.ignore?.customPatterns || []),
       ],
     },
+    include: [
+      ...(defaultConfig.include || []),
+      ...(fileConfig.include || []),
+      ...(cliConfig.include || []),  
+    ],
   };
-}
+}

src/config/defaultConfig.ts

@@ -14,4 +14,5 @@ export const defaultConfig: RepopackConfigDefault = {
     useDefaultPatterns: true,
     customPatterns: [],
   },
-};
+  include: [],
+};

src/core/packager.ts

@@ -11,6 +11,8 @@ import {
 import { generateOutput as defaultGenerateOutput } from './outputGenerator.js';
 import { checkFileWithSecretLint, createSecretLintConfig } from '../utils/secretLintUtils.js';
 import { logger } from '../utils/logger.js';
+import { filterIncludedFiles } from '../utils/includeUtils.js';
+
 
 export interface Dependencies {
   getAllIgnorePatterns: typeof defaultGetAllIgnorePatterns;
@@ -42,9 +44,13 @@ export async function pack(
 
   // Get all file paths in the directory
   const allFilePaths = await getFilePaths(rootDir, '', ignoreFilter, config);
+  const filteredPaths = filterIncludedFiles(rootDir, allFilePaths, config.include);
+
+  // Use filteredPaths if not empty, otherwise use filePaths
+  const pathsToProcess = filteredPaths.length > 0 ? filteredPaths : allFilePaths;
 
   // Perform security check
-  const suspiciousFilesResults = await performSecurityCheck(allFilePaths, rootDir);
+  const suspiciousFilesResults = await performSecurityCheck(pathsToProcess, rootDir);
 
   // Filter out suspicious files
   const safeFilePaths = allFilePaths.filter(

src/types/index.ts

@@ -15,6 +15,7 @@ interface RepopackConfigBase {
     useDefaultPatterns?: boolean;
     customPatterns?: string[];
   };
+  include?: string[];
 }
 
 export type RepopackConfigDefault = RepopackConfigBase & {
@@ -32,6 +33,7 @@ export type RepopackConfigDefault = RepopackConfigBase & {
     useDefaultPatterns: boolean;
     customPatterns?: string[];
   };
+  include: string[];
 };
 
 export type RepopackConfigFile = RepopackConfigBase & {
@@ -49,6 +51,7 @@ export type RepopackConfigFile = RepopackConfigBase & {
     useDefaultPatterns?: boolean;
     customPatterns?: string[];
   };
+  include?: string[];
 };
 
 export type RepopackConfigCli = RepopackConfigBase & {
@@ -66,6 +69,7 @@ export type RepopackConfigCli = RepopackConfigBase & {
     useDefaultPatterns?: boolean;
     customPatterns?: string[];
   };
+  include?: string[];
 };
 
-export type RepopackConfigMerged = RepopackConfigDefault & RepopackConfigFile & RepopackConfigCli;
+export type RepopackConfigMerged = RepopackConfigDefault & RepopackConfigFile & RepopackConfigCli;

src/utils/includeUtils.ts

@@ -0,0 +1,29 @@
+import path from 'path';
+import { logger } from '../utils/logger.js';
+
+export function filterIncludedFiles(rootDir: string, filePaths: string[], include: string[]): string[] {
+  if (include.length === 0) {
+    return filePaths;
+  }
+
+  // Normalize paths to handle case insensitivity and different representations
+  const normalizePath = (p: string) => path.normalize(path.resolve(rootDir, p)).toLowerCase();
+
+  // Create a Set of normalized absolute paths for the included files
+  const includeSet = new Set(include.map(normalizePath));
+
+  // Map file paths to their normalized absolute paths and filter those that are in the include set
+  const filteredAbsolutePaths = filePaths
+    .map(filePath => path.resolve(rootDir, filePath))
+    .filter(absolutePath => includeSet.has(normalizePath(absolutePath)));
+
+  // Log any files in includeSet that are not found in filePaths
+  const absoluteFilePathsSet = new Set(filePaths.map(filePath => normalizePath(path.resolve(rootDir, filePath))));
+  const missingFiles = [...includeSet].filter(includedFile => !absoluteFilePathsSet.has(includedFile));
+  if (missingFiles.length > 0) {
+    logger.trace(`Included files not found: ${missingFiles.join(', ')}`);
+  }
+
+  // Convert filtered absolute paths back to relative paths
+  return filteredAbsolutePaths.map(filePath => path.relative(rootDir, filePath));
+}