Removed use of for (.. in ..).

See: https://eslint.org/docs/rules/guard-for-in
keystonejs · Mar 21, 2020 · bf449b7 · bf449b7
1 parent 7d71dcd
commit bf449b7
Showing 1 changed file with 21 additions and 22 deletions.
diff --git a/packages/images/src/service.js b/packages/images/src/service.js
@@ -116,21 +116,20 @@ export class ImageService {
 
       let transformedFilename = nodePath.join(this.transformsPath, `${id}${suffix}${format}`);
 
-      // If a cached copy of the transformed file exists, don't re-create it
-      if (await fs.exists(transformedFilename)) {
-        return res.sendFile(transformedFilename);
-      }
-
-      try {
-        const sharpImage = sharp(originalPath);
-        if (resizeOptions) {
-          await sharpImage.resize(resizeOptions);
+      if (!(await fs.exists(transformedFilename))) {
+        try {
+          const sharpImage = sharp(originalPath);
+          if (resizeOptions) {
+            await sharpImage.resize(resizeOptions);
+          }
+          await sharpImage.toFile(transformedFilename);
+        } catch (err) {
+          console.error(err);
+          return res.status(500).send({ error: 'Internal server error' });
         }
-        await sharpImage.toFile(transformedFilename);
-      } catch (err) {
-        console.error(err);
-        return res.status(500).send({ error: 'Internal server error' });
       }
+
+      return res.sendFile(transformedFilename);
     });
 
     this.app.get('/image/:id/meta', async (req, res) => {
@@ -149,18 +148,18 @@ export class ImageService {
     });
   }
   getSrc(id, { format, resize = {} }) {
-    let url = `${this.protocol}://${this.host}:${this.port}/image/${id}.${format}`;
-
+    const url = `${this.protocol}://${this.host}:${this.port}/image/${id}.${format}`;
     const searchParams = new URLSearchParams();
-    for (let key in resize) {
-      searchParams.set(key, resize[key]);
-    }
 
-    const stringifiedSearchParams = searchParams.toString();
-    if (stringifiedSearchParams) {
-      url += `?${stringifiedSearchParams}`;
+    for (const [param, value] of Object.entries(resize)) {
+      searchParams.set(param, value);
     }
-    return url;
+
+    const queryString = searchParams.toString();
+
+    return queryString
+      ? `${url}?${queryString}`
+      : url;
   }
   async uploadImage({ stream, originalname }) {
     const id = uuid();