Merge pull request #110 from Araxeus/new-config-flag

Author: Araxeus

README.md

@@ -300,7 +300,7 @@ Commands:
   help [command]                              display help for command
 
 Options:
-  -d, --folder [folder]                     Folder containing the config file
+  -c, --config [file/folder path]             Config file path / Folder containing the config file
   -v, --version                               output the current version
   -h, --help                                  display help for command
 ```

cli.ts

@@ -180,7 +180,7 @@ program
     .name('vendor')
     .hook('preAction', async () => {
         setRunOptions({
-            configFolder: program.getOptionValue('folder') as
+            configLocation: program.getOptionValue('config') as
                 | string
                 | undefined,
         });
@@ -193,7 +193,10 @@ program
     .addCommand(installCmd)
     .addCommand(uninstallCmd)
     .addCommand(loginCmd)
-    .option('-d, --folder [folder]', 'Folder containing the config file')
+    .option(
+        '-c, --config [file/folder path]',
+        'Config file path / Folder containing the config file',
+    )
     .version(
         (await getPackageJson()).version || 'unknown',
         '-v, --version',

lib/config.ts

@@ -20,7 +20,7 @@ const defaultConfig = {
 
 const runOptions = {
     prMode: false,
-    configFolder: '',
+    configLocation: '',
 };
 export function getRunOptions(): typeof runOptions {
     return runOptions;
@@ -29,18 +29,18 @@ export function setRunOptions(flags: Partial<typeof runOptions>) {
     Object.assign(runOptions, flags);
 }
 
-// function to get the configuration
-
 async function findFirstFile(folderPath: string, files: string[]) {
+    const getFile = async (file: string) => ({
+        data: await readFile(file, 'utf-8'),
+        path: file,
+    });
+    const isAlreadyFilepath = files.find(f => folderPath.endsWith(f));
+    if (isAlreadyFilepath && existsSync(folderPath)) {
+        return getFile(folderPath);
+    }
     for (const file of files) {
         const filePath = path.join(folderPath, file);
-
-        if (existsSync(filePath)) {
-            return {
-                data: await readFile(filePath, 'utf-8'),
-                path: filePath,
-            };
-        }
+        if (existsSync(filePath)) return getFile(filePath);
     }
 
     return null;
@@ -92,7 +92,7 @@ export async function getConfig(): Promise<VendorsOptions> {
     if (res) return res;
 
     const folderPath = await realpath(
-        runOptions.configFolder ||
+        runOptions.configLocation ||
             process.env.INIT_CWD ||
             process.env.PWD ||
             process.cwd(),