Minor code refactor

11ty · May 11, 2024 · 9df2d34 · 9df2d34
1 parent e21c418
commit 9df2d34
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/img.js b/img.js
@@ -18,10 +18,6 @@ const Util = require("./src/util.js");
 
 const debug = require("debug")("Eleventy:Image");
 
-const KEYS = {
-  requested: "requested"
-};
-
 const GLOBAL_OPTIONS = {
   widths: ["auto"],
   formats: ["webp", "jpeg"], // "png", "svg", "avif"
@@ -545,7 +541,7 @@ class Image {
     let fullStats = this.getFullStats(metadata);
     for(let outputFormat in fullStats) {
       for(let stat of fullStats[outputFormat]) {
-        if(this.options.useCache && diskCache.isCached(stat.outputPath, input, this.options.generatedVia !== KEYS.requested)){
+        if(this.options.useCache && diskCache.isCached(stat.outputPath, input, !Util.isRequested(this.options.generatedVia))) {
           // Cached images already exist in output
           let contents;
           if(this.options.dryRun) {
@@ -756,7 +752,7 @@ function logProcessedMessage(eleventyConfig, src, opts) {
 }
 
 function setupLogger(eleventyConfig, opts) {
-  if(typeof eleventyConfig?.logger?.logWithOptions !== "function" || opts.generatedVia === KEYS.requested) {
+  if(typeof eleventyConfig?.logger?.logWithOptions !== "function" || Util.isRequested(opts.generatedVia)) {
     return;
   }
 
@@ -811,7 +807,7 @@ function queueImage(src, opts) {
   if(resolvedOptions.useCache) {
     // we don’t know the output format yet, but this hash is just for the in memory cache
     key = img.getInMemoryCacheKey();
-    let cached = memCache.get(key, !opts.transformOnRequest && opts.generatedVia !== KEYS.requested);
+    let cached = memCache.get(key, !opts.transformOnRequest && !Util.isRequested(opts.generatedVia));
     if(cached) {
       return cached;
     }
@@ -884,7 +880,6 @@ module.exports.statsSync = Image.statsSync;
 module.exports.statsByDimensionsSync = Image.statsByDimensionsSync;
 module.exports.getFormats = Image.getFormatsArray;
 module.exports.getWidths = Image.getValidWidths;
-module.exports.keys = KEYS;
 
 module.exports.getHash = function getHash(src, options) {
   let img = new Image(src, options);

diff --git a/src/on-request-during-serve-plugin.js b/src/on-request-during-serve-plugin.js
@@ -2,7 +2,6 @@ const fs = require("fs");
 const { TemplatePath } = require("@11ty/eleventy-utils");
 
 const eleventyImage = require("../img.js");
-const KEYS = eleventyImage.keys;
 const Util = require("./util.js");
 
 const debug = require("debug")("Eleventy:Image");
@@ -46,7 +45,7 @@ function eleventyImageOnRequestDuringServePlugin(eleventyConfig, options = {}) {
           },
 
           transformOnRequest: false, // use the built images so we don’t go in a loop
-          generatedVia: KEYS.requested
+          generatedVia: Util.KEYS.requested,
         });
 
         if(eleventyConfig) {

diff --git a/src/util.js b/src/util.js
@@ -2,6 +2,10 @@ const path = require("path");
 const { URL } = require("url");
 
 class Util {
+  static KEYS = {
+    requested: "requested"
+  };
+
   /*
    * Does not mutate, returns new Object.
    */
@@ -43,6 +47,10 @@ class Util {
     // if the image src is absolute, make it relative to the input/content directory.
     return path.join(input, src);
   }
+
+  static isRequested(generatedVia) {
+    return generatedVia === this.KEYS.requested;
+  }
 }
 
 // Temporary alias for changes made in https://github.com/11ty/eleventy-img/pull/138