polystore 0.15.2 → 0.15.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "polystore",
-  "version": "0.15.2",
+  "version": "0.15.4",
   "description": "A small compatibility layer for many popular KV stores like localStorage, Redis, FileSystem, etc.",
   "homepage": "https://polystore.dev/",
   "repository": "https://github.com/franciscop/polystore.git",
@@ -8,6 +8,7 @@
   "funding": "https://www.paypal.me/franciscopresencia/19",
   "author": "Francisco Presencia <public@francisco.io> (https://francisco.io/)",
   "type": "module",
+  "sideEffects": false,
   "main": "src/index.js",
   "types": "src/index.d.ts",
   "files": [

package/src/clients/file.js

@@ -2,34 +2,25 @@
 export default class File {
   // Check if this is the right class for the given client
   static test(client) {
-    if (
+    if (client instanceof URL) client = client.href;
+    return (
       typeof client === "string" &&
-      client.startsWith("file:") &&
+      client.startsWith("file://") &&
       client.includes(".")
-    )
-      return true;
-    return (
-      client instanceof URL &&
-      client.protocol === "file:" &&
-      client.pathname.includes(".")
     );
   }
 
   constructor(file) {
-    this.file =
-      typeof file === "string" ? file.slice("file://".length) : file.pathname;
+    if (file instanceof URL) file = file.href;
+    this.file = file.replace(/^file:\/\//, "");
 
     // Run this once on launch; import the FS module and reset the file
     this.promise = (async () => {
-      const [fsp, path] = await Promise.all([
-        import("node:fs/promises"),
-        import("node:path"),
-      ]);
-
       // We want to make sure the file already exists, so attempt to
       // create the folders and the file (but not OVERWRITE it, that's why the x flag)
       // It fails if it already exists, hence the catch case
-      const folder = path.dirname(this.file);
+      const fsp = await import("node:fs/promises");
+      const folder = this.file.split("/").slice(0, -1).join("/");
       await fsp.mkdir(folder, { recursive: true }).catch(() => {});
       await fsp.writeFile(this.file, "{}", { flag: "wx" }).catch((err) => {
         if (err.code !== "EEXIST") throw err;
@@ -39,24 +30,23 @@ export default class File {
   }
 
   // Internal
-  async #read() {
+  #read = async () => {
     const fsp = await this.promise;
-    const text = await fsp.readFile(this.file, "utf8");
-    if (!text) return {};
-    return JSON.parse(text);
-  }
+    const data = await fsp.readFile(this.file, "utf8");
+    return JSON.parse(data || "{}");
+  };
 
-  async #write(data) {
+  #write = async (data) => {
     const fsp = await this.promise;
-    await fsp.writeFile(this.file, JSON.stringify(data, null, 2));
-  }
+    fsp.writeFile(this.file, JSON.stringify(data, null, 2));
+  };
 
-  async get(key) {
+  get = async (key) => {
     const data = await this.#read();
     return data[key] ?? null;
-  }
+  };
 
-  async set(key, value) {
+  set = async (key, value) => {
     const data = await this.#read();
     if (value === null) {
       delete data[key];
@@ -65,7 +55,7 @@ export default class File {
     }
     await this.#write(data);
     return key;
-  }
+  };
 
   async *iterate(prefix = "") {
     const data = await this.#read();
@@ -75,10 +65,9 @@ export default class File {
     }
   }
 
-  async clear(prefix = "") {
-    if (!prefix) {
-      return this.#write({});
-    }
+  // Bulk updates are worth creating a custom method here
+  clear = async (prefix = "") => {
+    if (!prefix) return this.#write({});
 
     const data = await this.#read();
     for (let key in data) {
@@ -87,5 +76,5 @@ export default class File {
       }
     }
     await this.#write(data);
-  }
+  };
 }

package/src/index.js

@@ -1,5 +1,5 @@
 import clients from "./clients/index.js";
-import { createId, isClass, parse, unix } from "./utils.js";
+import { createId, parse, unix } from "./utils.js";
 
 class Store {
   PREFIX = "";
@@ -25,10 +25,15 @@ class Store {
       }
     }
 
-    // A raw one, we just receive the single instance to use directly
-    if (isClass(store)) {
+    // We get passed a class
+    if (
+      typeof store === "function" &&
+      /^class\s/.test(Function.prototype.toString.call(store))
+    ) {
       return new store();
     }
+
+    // A raw one, we just receive the single instance to use directly
     return store;
   }
 

package/src/utils.js

@@ -41,13 +41,6 @@ export function createId() {
   return id;
 }
 
-export function isClass(func) {
-  return (
-    typeof func === "function" &&
-    /^class\s/.test(Function.prototype.toString.call(func))
-  );
-}
-
 export function unix(expires) {
   const now = new Date().getTime();
   return expires === null ? null : now + expires * 1000;