@superutils/store 0.1.15 → 0.1.18

package/dist/index.js

@@ -1,8 +1,8 @@
 // src/createObjectStore.ts
-import { objToMap, isObj } from "@superutils/core";
+import { objToMap, isObj as isObj2 } from "@superutils/core";
 
 // src/createStore.ts
-import { isFn as isFn2 } from "@superutils/core";
+import { isFn as isFn2, isObj } from "@superutils/core";
 
 // src/Store.ts
 import {
@@ -47,9 +47,15 @@ var _Store = class _Store {
       forceUpdateCache: void 0
     };
     this.type = "map";
-    this.clear = () => this.setAll(/* @__PURE__ */ new Map(), true);
+    this.clear = () => {
+      var _a, _b;
+      (_b = (_a = this.validate) == null ? void 0 : _a.clear) == null ? void 0 : _b.call(this, [], "clear");
+      return this.setAll(/* @__PURE__ */ new Map(), true);
+    };
     this.delete = (keys) => {
+      var _a, _b;
       if (!isArr(keys)) keys = [keys];
+      (_b = (_a = this.validate) == null ? void 0 : _a.delete) == null ? void 0 : _b.call(this, [keys], "delete");
       const data = this.getAll();
       for (const k of keys) data.delete(k);
       this.setAll(data, true);
@@ -79,7 +85,7 @@ var _Store = class _Store {
     this.handleSubjectChange = (data) => {
       var _a;
       if (!isMap(data)) return this.subject$.next(/* @__PURE__ */ new Map());
-      this.write(data);
+      fallbackIfFails(this.write, [data], null);
       fallbackIfFails(
         (_a = this.onChange) == null ? void 0 : _a.bind(this),
         [data],
@@ -90,16 +96,26 @@ var _Store = class _Store {
     this.init = (initialValue, checkStorage = true) => {
       var _a;
       if (this.initialized) return false;
-      this.initialized = true;
-      if (checkStorage && this.name && !this.storage)
-        throw new Error(_Store.messages.invalidOptionsStorage);
-      let isEmpty = !!this.cacheDisabled;
+      if (this.name && checkStorage) {
+        Object.defineProperty(this, "storage", {
+          value: fallbackIfFails(
+            () => {
+              var _a2;
+              return (_a2 = this.storage) != null ? _a2 : globalThis.localStorage;
+            },
+            [],
+            void 0
+          )
+        });
+        if (!this.storage)
+          throw new Error(_Store.messages.invalidStorageOptions);
+      }
+      Object.defineProperty(this, "initialized", { value: true });
       let firstValue = initialValue;
       if (!!(initialValue == null ? void 0 : initialValue.size) || !this.cacheDisabled) {
         const dataStr = this.name ? (_a = this.storage) == null ? void 0 : _a.getItem(this.name) : null;
         const existingValue = this.read(dataStr != null ? dataStr : null);
         if (isDefined(dataStr)) firstValue = existingValue;
-        isEmpty = this.cacheDisabled || existingValue.size === 0;
       }
       (firstValue == null ? void 0 : firstValue.size) && this.subject$.next(firstValue);
       this.unsubscribe();
@@ -108,7 +124,8 @@ var _Store = class _Store {
           this.handleForceUpdateCache
         );
       }
-      this.subscriptions.subject = this.subject$.pipe(skip(isEmpty ? 0 : 1)).subscribe(
+      const skipNum = this.subject$ instanceof BehaviorSubject && (firstValue == null ? void 0 : firstValue.size) && firstValue !== initialValue ? 1 : 0;
+      this.subscriptions.subject = this.subject$.pipe(skip(skipNum)).subscribe(
         !this.cacheDisabled && this.delay > 0 ? deferred(this.handleSubjectChange, this.delay, {
           thisArg: this,
           ...this.delayOptions
@@ -144,12 +161,17 @@ var _Store = class _Store {
     };
     this.search = (...args) => search(this.getAll(), ...args);
     this.set = (key, value) => {
+      var _a, _b;
       const data = this.getAll();
-      data.set(key, isFn(value) ? value(data.get(key)) : value);
+      const _value = isFn(value) ? value(data.get(key)) : value;
+      (_b = (_a = this.validate) == null ? void 0 : _a.set) == null ? void 0 : _b.call(this, [key, _value], "set");
+      data.set(key, _value);
       return this.setAll(data, true);
     };
     this.setAll = (data, replace = false) => {
+      var _a, _b;
       if (!isMap(data)) return this;
+      (_b = (_a = this.validate) == null ? void 0 : _a.setAll) == null ? void 0 : _b.call(this, [data, replace], "setAll");
       data = replace ? data : mapJoin(this.getAll(), data);
       this.subject$.next(new Map(data));
       return this;
@@ -204,17 +226,20 @@ var _Store = class _Store {
       var _a, _b;
       (_a = this.subscriptions.forceUpdateCache) == null ? void 0 : _a.unsubscribe();
       (_b = this.subscriptions.subject) == null ? void 0 : _b.unsubscribe();
-      this.subscriptions = {};
+      this.subscriptions = {
+        forceUpdateCache: void 0,
+        subject: void 0
+      };
     };
     this.values = () => getValues(this.getAll());
     this.write = (data) => {
-      var _a;
+      var _a, _b, _c;
+      this.init();
+      data != null ? data : data = (_a = this.subject$) == null ? void 0 : _a.value;
+      if (!isMap(data) || !this.name || !this.storage) return false;
+      (_c = (_b = this.validate) == null ? void 0 : _b.write) == null ? void 0 : _c.call(this, [data], "write");
       try {
-        !this.initialized && this.init();
-        data != null ? data : data = (_a = this.subject$) == null ? void 0 : _a.value;
-        if (!isMap(data)) return false;
         const jsonStr = this.toString(data);
-        if (!this.name || !this.storage) return false;
         this.storage.setItem(this.name, jsonStr);
         return true;
       } catch (err) {
@@ -222,6 +247,7 @@ var _Store = class _Store {
         return false;
       }
     };
+    this.name = `${name != null ? name : ""}`.trim() || null;
     const {
       cacheDisabled = false,
       delay,
@@ -232,25 +258,30 @@ var _Store = class _Store {
       parse,
       spaces,
       storage = fallbackIfFails(
-        () => globalThis.localStorage,
+        () => !name ? void 0 : globalThis.localStorage,
         [],
         void 0
       ),
-      stringify
+      stringify,
+      validate = {}
     } = options != null ? options : {};
-    this.name = `${name != null ? name : ""}`.trim() || null;
-    if (this.name && !storage && !(options == null ? void 0 : options.checkStorageOnInit))
-      throw new Error(_Store.messages.invalidOptionsStorage);
+    if (this.name && !storage && storage !== null)
+      throw new Error(_Store.messages.invalidStorageOptions);
     this.cacheDisabled = !!storage && cacheDisabled;
     this.delay = delay === 0 || isPositiveNumber(delay) ? delay : 300;
     this.delayOptions = delayOptions;
     this.onError = onError;
     this.onChange = onChange;
     this.parse = parse == null ? void 0 : parse.bind(this);
+    this.spaces = spaces;
     this.storage = storage;
     this.stringify = stringify == null ? void 0 : stringify.bind(this);
-    this.spaces = spaces;
     this.subject$ = this.cacheDisabled ? new Subject() : new BehaviorSubject(/* @__PURE__ */ new Map());
+    const _validate = { ...validate };
+    for (const [key, value] of Object.entries(_validate)) {
+      _validate[key] = value;
+    }
+    this.validate = _validate;
     isMap(initialValue) && initialValue.size && this.init(initialValue, false);
   }
   get size() {
@@ -259,7 +290,8 @@ var _Store = class _Store {
 };
 _Store.messages = Object.seal({
   invalidJsonEntries: "Invalid JSON format. Parsed value must be a 2D array representing key-value pairs.",
-  invalidOptionsStorage: "options.storage: LocalStorage instance or equivalent required"
+  invalidStorageOptions: "options.storage: LocalStorage instance or equivalent required. For NodeJS, use `node-localstorage` NPM module.",
+  validationError: "Validation failed. Action: "
 });
 /**
  * Trigger forced update of cached data from storage.
@@ -278,6 +310,10 @@ var Store_default = Store;
 
 // src/createStore.ts
 function createStore(name, options) {
+  if (isObj(name)) {
+    options = name;
+    name = null;
+  }
   const store = new Store_default(name, options);
   Object.defineProperty(store, "context", {
     configurable: false,
@@ -291,13 +327,17 @@ var createStore_default = createStore;
 
 // src/createObjectStore.ts
 function createObjectStore(name, options) {
+  if (isObj2(name)) {
+    options = name;
+    name = null;
+  }
   const store = createStore_default(name, {
     parse: (str) => objToMap(JSON.parse(str != null ? str : "{}")),
     stringify: function(data) {
       return JSON.stringify(this.toObject(data));
     },
     ...options,
-    initialValue: !isObj(options == null ? void 0 : options.initialValue, true) ? options == null ? void 0 : options.initialValue : objToMap(options.initialValue)
+    initialValue: !isObj2(options == null ? void 0 : options.initialValue, true) ? options == null ? void 0 : options.initialValue : objToMap(options.initialValue)
   });
   store.type = "object";
   return store;

package/package.json

@@ -2,7 +2,7 @@
 	"author": "Toufiqur Rahaman Chowdhury",
 	"description": "Generic, reactive, persistent and fully-typed Map-like data store with advanced search, filtering, and sorting capabilities.",
 	"dependencies": {
-		"@superutils/core": "^1.2.19",
+		"@superutils/core": "^1.2.21",
 		"rxjs": "^7.8.2"
 	},
 	"exports": {
@@ -45,6 +45,6 @@
 	"sideEffects": false,
 	"type": "module",
 	"types": "./dist/index.d.ts",
-	"version": "0.1.15",
-	"gitHead": "cd4a22d77abb8c5cf30845facb2f1afc43d0397f"
+	"version": "0.1.18",
+	"gitHead": "54a29f73ae09335819d591df271d9f57c92da457"
 }