chore: use try catch instead of existsSync

vuejs · Jun 16, 2023 · d275a54 · d275a54
1 parent c01c880
commit d275a54
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 30 deletions.
diff --git a/packages/typescript-vue-plugin/src/index.ts b/packages/typescript-vue-plugin/src/index.ts
@@ -71,24 +71,37 @@ const init: ts.server.PluginModuleFactory = (modules) => {
  size: stats.size,
  };
  }
- } catch { }
+ }
+ catch {
+ return undefined;
+ }
  }
  },
  readFile(uri, encoding) {
  if (uri.startsWith('file://')) {
- return fs.readFileSync(uriToFileName(uri), { encoding: encoding as 'utf-8' ?? 'utf-8' });
+ try {
+ return fs.readFileSync(uriToFileName(uri), { encoding: encoding as 'utf-8' ?? 'utf-8' });
+ }
+ catch {
+ return undefined;
+ }
  }
  },
  readDirectory(uri) {
  if (uri.startsWith('file://')) {
- const dirName = uriToFileName(uri);
- const files = fs.existsSync(dirName) ? fs.readdirSync(dirName, { withFileTypes: true }) : [];
- return files.map<[string, FileType]>(file => {
- return [file.name, file.isFile() ? 1 satisfies FileType.File
- : file.isDirectory() ? 2 satisfies FileType.Directory
- : file.isSymbolicLink() ? 64 satisfies FileType.SymbolicLink
- : 0 satisfies FileType.Unknown];
- });
+ try {
+ const dirName = uriToFileName(uri);
+ const files = fs.readdirSync(dirName, { withFileTypes: true });
+ return files.map<[string, FileType]>(file => {
+ return [file.name, file.isFile() ? 1 satisfies FileType.File
+ : file.isDirectory() ? 2 satisfies FileType.Directory
+ : file.isSymbolicLink() ? 64 satisfies FileType.SymbolicLink
+ : 0 satisfies FileType.Unknown];
+ });
+ }
+ catch {
+ return [];
+ }
  }
  return [];
  },

diff --git a/packages/vue-language-service/tests/utils/createTester.ts b/packages/vue-language-service/tests/utils/createTester.ts
@@ -68,24 +68,37 @@ function createTester(root: string) {
  size: stats.size,
  };
  }
- } catch { }
+ }
+ catch {
+ return undefined;
+ }
  }
  },
  readFile(uri, encoding) {
  if (uri.startsWith('file://')) {
- return fs.readFileSync(uriToFileName(uri), { encoding: encoding as 'utf-8' ?? 'utf-8' });
+ try {
+ return fs.readFileSync(uriToFileName(uri), { encoding: encoding as 'utf-8' ?? 'utf-8' });
+ }
+ catch {
+ return undefined;
+ }
  }
  },
  readDirectory(uri) {
  if (uri.startsWith('file://')) {
- const dirName = uriToFileName(uri);
- const files = fs.existsSync(dirName) ? fs.readdirSync(dirName, { withFileTypes: true }) : [];
- return files.map<[string, FileType]>(file => {
- return [file.name, file.isFile() ? FileType.File
- : file.isDirectory() ? FileType.Directory
- : file.isSymbolicLink() ? FileType.SymbolicLink
- : FileType.Unknown];
- });
+ try {
+ const dirName = uriToFileName(uri);
+ const files = fs.readdirSync(dirName, { withFileTypes: true });
+ return files.map<[string, FileType]>(file => {
+ return [file.name, file.isFile() ? FileType.File
+ : file.isDirectory() ? FileType.Directory
+ : file.isSymbolicLink() ? FileType.SymbolicLink
+ : FileType.Unknown];
+ });
+ }
+ catch {
+ return [];
+ }
  }
  return [];
  },

diff --git a/packages/vue-tsc/src/index.ts b/packages/vue-tsc/src/index.ts
@@ -94,24 +94,37 @@ export function createProgram(options: ts.CreateProgramOptions) {
  size: stats.size,
  };
  }
- } catch { }
+ }
+ catch {
+ return undefined;
+ }
  }
  },
  readFile(uri, encoding) {
  if (uri.startsWith('file://')) {
- return fs.readFileSync(uriToFileName(uri), { encoding: encoding as 'utf-8' ?? 'utf-8' });
+ try {
+ return fs.readFileSync(uriToFileName(uri), { encoding: encoding as 'utf-8' ?? 'utf-8' });
+ }
+ catch {
+ return undefined;
+ }
  }
  },
  readDirectory(uri) {
  if (uri.startsWith('file://')) {
- const dirName = uriToFileName(uri);
- const files = fs.existsSync(dirName) ? fs.readdirSync(dirName, { withFileTypes: true }) : [];
- return files.map<[string, FileType]>(file => {
- return [file.name, file.isFile() ? 1 satisfies FileType.File
- : file.isDirectory() ? 2 satisfies FileType.Directory
- : file.isSymbolicLink() ? 64 satisfies FileType.SymbolicLink
- : 0 satisfies FileType.Unknown];
- });
+ try {
+ const dirName = uriToFileName(uri);
+ const files = fs.readdirSync(dirName, { withFileTypes: true });
+ return files.map<[string, FileType]>(file => {
+ return [file.name, file.isFile() ? 1 satisfies FileType.File
+ : file.isDirectory() ? 2 satisfies FileType.Directory
+ : file.isSymbolicLink() ? 64 satisfies FileType.SymbolicLink
+ : 0 satisfies FileType.Unknown];
+ });
+ }
+ catch {
+ return [];
+ }
  }
  return [];
  },