fix: --basedir flag fails if dir is not a subdir of a package

nonara · Aug 27, 2021 · 5912288 · 5912288
1 parent 0747fb0
commit 5912288
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/installer/lib/file-utils.ts b/src/installer/lib/file-utils.ts
@@ -77,9 +77,16 @@ export interface TSPackage {
 export function getTSPackage(basedir: string = process.cwd()): TSPackage {
   if (!fs.existsSync(basedir)) throw new PackageError(`${basedir} is not a valid directory`);
 
-  const possiblePackageDirs = [ basedir, path.dirname(resolve.sync(`typescript/package.json`, { basedir })) ];
+  const possiblePackageDirs = [ basedir, () => path.dirname(resolve.sync(`typescript/package.json`, { basedir })) ];
+
+  for (const d of possiblePackageDirs) {
+    let packageDir: string;
+    try {
+      packageDir = typeof d === 'function' ? d() : d;
+    } catch {
+      break;
+    }
 
-  for (const packageDir of possiblePackageDirs) {
     /* Parse package.json data */
     const packageFile = path.join(packageDir, 'package.json');
     if (!fs.existsSync(packageFile)) continue;