@kisaragi-hiu/cached-fetch 0.1.2 → 0.2.0

package/index.d.ts

@@ -10,10 +10,11 @@ key: string,
 /**
  * A fetcher function, called when the value isn't cached.
  *
- * Should return a Promise<{ text: () => string | Promise<string> }>. This is
- * usually a Response, but ProcessOutput from the zx library also fits
- * this signature.
+ * This can return a string or a Promise<string>.
+ *
+ * This can also return a Promise<{ text: () => string | Promise<string> }>.
+ * This means a Response or zx's ProcessOutput can be used directly.
  */
-fetcher: () => Promise<{
+fetcher: () => string | Promise<string> | Promise<{
     text: () => string | Promise<string>;
 }>): Promise<string>;

package/index.js

@@ -14,16 +14,22 @@ key,
 /**
  * A fetcher function, called when the value isn't cached.
  *
- * Should return a Promise<{ text: () => string | Promise<string> }>. This is
- * usually a Response, but ProcessOutput from the zx library also fits
- * this signature.
+ * This can return a string or a Promise<string>.
+ *
+ * This can also return a Promise<{ text: () => string | Promise<string> }>.
+ * This means a Response or zx's ProcessOutput can be used directly.
  */
 fetcher) {
     const cacheFile = join(tmpdir(), key);
     const cacheHit = existsSync(cacheFile);
-    const text = cacheHit
-        ? readFileSync(cacheFile, { encoding: "utf-8" })
-        : await (await fetcher()).text();
+    let text;
+    if (cacheHit) {
+        text = readFileSync(cacheFile, { encoding: "utf-8" });
+    }
+    else {
+        const result = await fetcher();
+        text = typeof result === "string" ? result : await result.text();
+    }
     if (!cacheHit) {
         mkdirSync(dirname(cacheFile), { recursive: true });
         writeFileSync(cacheFile, text, { encoding: "utf-8" });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kisaragi-hiu/cached-fetch",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "description": "A cache in OS tmpdir useful for fetch()",
   "type": "module",
   "repository": {