Revert, 4.8.12

Author: caseywebdev

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cogs",
-  "version": "4.8.11",
+  "version": "4.8.12",
   "type": "module",
   "author": "Casey Foster <c@sey.me>",
   "description": "The fast file transform pipeline.",

src/bust-cache.js

@@ -5,10 +5,12 @@ import fileHasDependency from './file-has-dependency.js';
 export default ({ config, path }) =>
   Promise.all(
     _.map(config, async ({ cache }) => {
-      delete cache[path];
+      const { buffers, files } = cache;
+      delete buffers[path];
+      delete files[path];
       await Promise.all(
-        _.map(cache, async (file, key) => {
-          if (fileHasDependency({ file: await file, path })) delete cache[key];
+        _.map(files, async (file, key) => {
+          if (fileHasDependency({ file: await file, path })) delete files[key];
         })
       );
     })

src/get-file.js

@@ -1,25 +1,34 @@
 import { promises as fs } from 'fs';
 
-import _ from 'underscore';
-
 import applyTransformers from './apply-transformers.js';
 
-export default async ({ env: { cache, transformers }, path }) =>
-  (cache[path] ??= (async () => {
-    const file = {
-      buffer: await fs.readFile(path),
-      builds: [],
-      links: [],
-      path,
-      requires: [path]
-    };
-
-    const transformed = await applyTransformers({ file, transformers });
+const getOrSet = async (cache, key, fn) => {
+  try {
+    return await (cache[key] ??= fn());
+  } catch (er) {
+    delete cache[key];
+    throw er;
+  }
+};
 
-    if (_.isEqual(file, transformed)) delete cache[path];
+const readFile = ({ cache, path }) =>
+  getOrSet(cache.buffers, path, () => fs.readFile(path));
 
-    return transformed;
-  })()).catch(er => {
-    delete cache[path];
-    throw er;
+export default ({ env: { cache, transformers }, path }) =>
+  getOrSet(cache.files, path, async () => {
+    try {
+      return await applyTransformers({
+        file: {
+          buffer: await readFile({ cache, path }),
+          builds: [],
+          links: [],
+          path,
+          requires: [path]
+        },
+        transformers
+      });
+    } catch (er) {
+      er.message += `\n  ${path}`;
+      throw er;
+    }
   });

src/normalize-config.js

@@ -12,6 +12,8 @@ const asyncMapObj = async (obj, fn) =>
   );
 
 export default async config => {
+  const buffers = {};
+
   config = await asyncMapObj(
     config,
     async ({ builds, transformers, manifestPath, requires }, name) => ({
@@ -21,7 +23,7 @@ export default async config => {
           toArray(target.transformers).map(normalizeTransformer)
         )
       })),
-      cache: {},
+      cache: { buffers, files: {} },
       manifestPath,
       name,
       requires: toArray(requires),