feat(uniconfig-plugin-api-file): check error, use static import for fs (

#478) BREAKING CHANGE: fs is now required statically in uniconfig-plugin-api-file
qiwi · Sep 18, 2023 · bcdd30a · bcdd30a
1 parent 5c7bdc0
commit bcdd30a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/packages/uniconfig-plugin-api-file/package.json b/packages/uniconfig-plugin-api-file/package.json
@@ -6,7 +6,7 @@
   "types": "target/es5/index.d.ts",
   "scripts": {
     "clean": "rm -rf target",
-    "jest": "NODE_ENV=test BAZ=baz run -T jest -w 1 --config jest.config.json",
+    "jest": "NODE_ENV=test BAZ=baz jest -w 1 --config jest.config.json",
     "test": "yarn run jest",
     "build:es5": "mkdir -p target/es5 && run -T tsc -p tsconfig.build.json --target ES5 --outDir target/es5 -m CommonJS",
     "build:es6": "mkdir -p target/es6 && run -T tsc -p tsconfig.build.json --target ES6 --outDir target/es6",

diff --git a/packages/uniconfig-plugin-api-file/src/main/ts/index.ts b/packages/uniconfig-plugin-api-file/src/main/ts/index.ts
@@ -5,9 +5,10 @@ import {
   INamedPipe,
   IContext,
 } from '@qiwi/uniconfig-core'
+import {readFile, readFileSync, promises} from 'node:fs'
 
 export type IFsOpts = {
-  encoding: string,
+  encoding: BufferEncoding,
   flag?: string
 }
 
@@ -25,9 +26,13 @@ export const pipe: INamedPipe = {
     if (Array.isArray(target)) {
       for (const path of target) {
         try {
-          return require('fs').readFileSync(path, processOpts(opts))
+          return readFileSync(path, processOpts(opts))
+        }
+        catch (e: any) {
+          if (e.code !== 'ENOENT') {
+            throw e
+          }
         }
-        catch { /* noop */ }
       }
       throw new Error(`All targets are unreachable (${target})`)
     }
@@ -38,15 +43,19 @@ export const pipe: INamedPipe = {
       if (Array.isArray(target)) {
         for (const path of target) {
           try {
-            resolve(await require('fs/promises').readFile(path, processOpts(opts)))
+            resolve(await promises.readFile(path, processOpts(opts)))
             return
           }
-          catch (e) { /* noop */ }
+          catch (e: any) {
+            if (e.code !== 'ENOENT') {
+              throw e
+            }
+          }
         }
         reject(new Error(`All targets are unreachable (${target})`))
         return
       }
-      require('fs').readFile(target, processOpts(opts), (err: IAny | null, data: IAny) => {
+      readFile(target, processOpts(opts), (err: IAny | null, data: IAny) => {
         if (err) {
           reject(err)
         }