floppy-disk 2.15.1 → 2.16.0-beta.1

package/esm/{utils/fetcher.js → fetcher.js}

@@ -1,4 +1,4 @@
-import { createError, getValue, identityFn } from '.';
+import { createError, getValue, identityFn } from './utils';
 const encodeParams = (params) => Object.entries(params)
     .filter(([, value]) => value !== undefined && value !== null)
     .map((kv) => kv.map(encodeURIComponent).join('='))

package/esm/index.d.ts

@@ -1,4 +1,8 @@
-export { hashStoreKey } from './utils';
-export * from './utils/fetcher';
-export * from './vanilla';
-export * from './react';
+export * from './store';
+export * from './fetcher';
+export * from './react/create-store';
+export * from './react/create-stores';
+export * from './react/create-query';
+export * from './react/create-bi-direction-query';
+export * from './react/create-mutation';
+export * from './react/with-context';

package/esm/index.js

@@ -1,4 +1,8 @@
-export { hashStoreKey } from './utils';
-export * from './utils/fetcher';
-export * from './vanilla';
-export * from './react';
+export * from './store';
+export * from './fetcher';
+export * from './react/create-store';
+export * from './react/create-stores';
+export * from './react/create-query';
+export * from './react/create-bi-direction-query';
+export * from './react/create-mutation';
+export * from './react/with-context';

package/esm/react/create-mutation.d.ts

@@ -1,4 +1,4 @@
-import { InitStoreOptions } from '../vanilla';
+import { InitStoreOptions } from '../store';
 import { UseStore } from './create-store';
 export type MutationState<TVar, TResponse = any, TError = unknown> = {
     /**

package/esm/react/create-store.d.ts

@@ -1,4 +1,4 @@
-import { InitStoreOptions, SelectDeps, SetStoreData, StoreData, StoreInitializer, Subscribers } from '../vanilla';
+import { InitStoreOptions, SelectDeps, SetStoreData, StoreData, StoreInitializer, Subscribers } from '../store';
 export type WatchProps<T, K extends SelectDeps<T> | keyof T = SelectDeps<T>> = {
     selectDeps?: K;
     render: (state: K extends keyof T ? T[K] : T) => any;

package/esm/react/create-store.js

@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { initStore, } from '../vanilla';
+import { initStore, } from '../store';
 /**
  * @see https://floppy-disk.vercel.app/docs/api#createstore
  */

package/esm/react/create-stores.d.ts

@@ -1,5 +1,5 @@
+import { InitStoreOptions, InitStoreReturn, SelectDeps, SetStoreData, StoreData, Subscribers } from '../store';
 import { Maybe } from '../utils';
-import { InitStoreOptions, InitStoreReturn, SelectDeps, SetStoreData, StoreData, Subscribers } from '../vanilla';
 import { WatchProps } from './create-store';
 export type StoreKey = Record<string, any> | undefined;
 export type StoresInitializer<TKey extends StoreKey = StoreKey, T extends StoreData = StoreData> = T | ((api: {
@@ -70,6 +70,7 @@ export type CreateStoresOptions<TKey extends StoreKey = StoreKey, T extends Stor
     defaultDeps?: SelectDeps<T>;
     hashKeyFn?: (obj: TKey) => string;
 };
+export declare const hashStoreKey: (value?: any) => string;
 /**
  * @see https://floppy-disk.vercel.app/docs/api#createstores
  */

package/esm/react/create-stores.js

@@ -1,6 +1,32 @@
 import { useEffect, useMemo, useRef, useState } from 'react';
-import { getValue, hashStoreKey, noop } from '../utils';
-import { initStore, } from '../vanilla';
+import { initStore, } from '../store';
+import { getValue, noop } from '../utils';
+const hasObjectPrototype = (value) => {
+    return Object.prototype.toString.call(value) === '[object Object]';
+};
+const isPlainObject = (value) => {
+    if (!hasObjectPrototype(value))
+        return false;
+    const ctor = value.constructor;
+    if (typeof ctor === 'undefined')
+        return true;
+    const prot = ctor.prototype;
+    if (!hasObjectPrototype(prot))
+        return false;
+    if (!prot.hasOwnProperty('isPrototypeOf'))
+        return false;
+    return true;
+};
+export const hashStoreKey = (value) => 
+// Copied from: https://github.com/TanStack/query/blob/main/packages/query-core/src/utils.ts
+JSON.stringify(value, (_, val) => isPlainObject(val)
+    ? Object.keys(val)
+        .sort()
+        .reduce((result, key) => {
+        result[key] = val[key];
+        return result;
+    }, {})
+    : val);
 /**
  * @see https://floppy-disk.vercel.app/docs/api#createstores
  */

package/esm/{vanilla.d.ts → store.d.ts}

@@ -9,7 +9,7 @@ export type StoreInitializer<T> = T | ((api: {
 }) => T);
 export type StoreEvent<T> = (state: T) => void;
 export type InitStoreOptions<T> = {
-    intercept?: (nextState: T, prevState: T) => Maybe<Partial<T>>;
+    intercept?: (nextState: T, prevState: T) => void | Maybe<Partial<T>>;
     onFirstSubscribe?: StoreEvent<T>;
     onSubscribe?: StoreEvent<T>;
     onUnsubscribe?: StoreEvent<T>;

package/esm/{utils/index.d.ts → utils.d.ts}

@@ -1,8 +1,24 @@
+export type Maybe<T> = T | null | undefined;
+/**
+ * Check if this runs on browser.
+ */
+export declare const isClient: boolean;
 export declare const noop: () => void;
 export declare const identityFn: <T>(value: T) => T;
+/**
+ * Check if a value is not undefined and not null.
+ *
+ * ```ts
+ * const hasValue = (value: any) => value !== undefined && value !== null;
+ * ```
+ */
 export declare const hasValue: (value: any) => boolean;
-export declare const hashStoreKey: (obj?: any) => string;
+/**
+ * If the value is a function, it will invoke the function.\
+ * If the value is not a function, it will just return it.
+ */
 export declare const getValue: <T, P extends any[]>(valueOrComputeValueFn: T | ((...params: P) => T), ...params: P) => T;
-export type Maybe<T> = T | null | undefined;
-export declare const isClient: boolean;
+/**
+ * Create an Error instance with custom props.
+ */
 export declare const createError: (message: string, props: Record<string, any>) => Error & Record<string, any>;

package/esm/{utils/index.js → utils.js}

@@ -1,14 +1,30 @@
+/**
+ * Check if this runs on browser.
+ */
+export const isClient = typeof window !== 'undefined' && !('Deno' in window);
 export const noop = () => { };
 export const identityFn = (value) => value;
+/**
+ * Check if a value is not undefined and not null.
+ *
+ * ```ts
+ * const hasValue = (value: any) => value !== undefined && value !== null;
+ * ```
+ */
 export const hasValue = (value) => value !== undefined && value !== null;
-export const hashStoreKey = (obj) => JSON.stringify(obj, Object.keys(obj).sort());
+/**
+ * If the value is a function, it will invoke the function.\
+ * If the value is not a function, it will just return it.
+ */
 export const getValue = (valueOrComputeValueFn, ...params) => {
     if (typeof valueOrComputeValueFn === 'function') {
         return valueOrComputeValueFn(...params);
     }
     return valueOrComputeValueFn;
 };
-export const isClient = typeof window !== 'undefined' && !('Deno' in window);
+/**
+ * Create an Error instance with custom props.
+ */
 export const createError = (message, props) => {
     const error = Object.assign(new Error(message), props);
     return error;

package/lib/{utils/fetcher.js → fetcher.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetcher = void 0;
-const _1 = require(".");
+const utils_1 = require("./utils");
 const encodeParams = (params) => Object.entries(params)
     .filter(([, value]) => value !== undefined && value !== null)
     .map((kv) => kv.map(encodeURIComponent).join('='))
@@ -18,7 +18,7 @@ const encodeParams = (params) => Object.entries(params)
  * @returns A function to fetch data
  */
 const fetcher = (options) => async (...args) => {
-    const { url, query, params, payload, headers, interceptRequest = _1.identityFn, interceptResponse, ...rest } = (0, _1.getValue)(options, ...args);
+    const { url, query, params, payload, headers, interceptRequest = utils_1.identityFn, interceptResponse, ...rest } = (0, utils_1.getValue)(options, ...args);
     let autoOptions = {};
     let searchParams = params;
     if (query) {
@@ -53,7 +53,7 @@ const fetcher = (options) => async (...args) => {
         let resJson = await res.json();
         if (query) {
             if (resJson.errors) {
-                throw (0, _1.createError)('Error GraphQL response', {
+                throw (0, utils_1.createError)('Error GraphQL response', {
                     status: res.status,
                     statusText: res.statusText,
                     response: resJson.errors,
@@ -69,7 +69,7 @@ const fetcher = (options) => async (...args) => {
                     return finalResponse;
                 }
                 catch (error) {
-                    throw (0, _1.createError)('Error intercept response', {
+                    throw (0, utils_1.createError)('Error intercept response', {
                         status: res.status,
                         statusText: res.statusText,
                         response: resJson,
@@ -80,7 +80,7 @@ const fetcher = (options) => async (...args) => {
             }
             return resJson;
         }
-        throw (0, _1.createError)('Fetch error', {
+        throw (0, utils_1.createError)('Fetch error', {
             status: res.status,
             statusText: res.statusText,
             response: resJson,
@@ -88,7 +88,7 @@ const fetcher = (options) => async (...args) => {
         });
     }
     const resText = await res.text().catch(() => undefined);
-    throw (0, _1.createError)('Response type is not a JSON', {
+    throw (0, utils_1.createError)('Response type is not a JSON', {
         status: res.status,
         statusText: res.statusText,
         response: resText,

package/lib/index.d.ts

@@ -1,4 +1,8 @@
-export { hashStoreKey } from './utils';
-export * from './utils/fetcher';
-export * from './vanilla';
-export * from './react';
+export * from './store';
+export * from './fetcher';
+export * from './react/create-store';
+export * from './react/create-stores';
+export * from './react/create-query';
+export * from './react/create-bi-direction-query';
+export * from './react/create-mutation';
+export * from './react/with-context';

package/lib/index.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hashStoreKey = void 0;
 const tslib_1 = require("tslib");
-var utils_1 = require("./utils");
-Object.defineProperty(exports, "hashStoreKey", { enumerable: true, get: function () { return utils_1.hashStoreKey; } });
-tslib_1.__exportStar(require("./utils/fetcher"), exports);
-tslib_1.__exportStar(require("./vanilla"), exports);
-tslib_1.__exportStar(require("./react"), exports);
+tslib_1.__exportStar(require("./store"), exports);
+tslib_1.__exportStar(require("./fetcher"), exports);
+tslib_1.__exportStar(require("./react/create-store"), exports);
+tslib_1.__exportStar(require("./react/create-stores"), exports);
+tslib_1.__exportStar(require("./react/create-query"), exports);
+tslib_1.__exportStar(require("./react/create-bi-direction-query"), exports);
+tslib_1.__exportStar(require("./react/create-mutation"), exports);
+tslib_1.__exportStar(require("./react/with-context"), exports);

package/lib/react/create-mutation.d.ts

@@ -1,4 +1,4 @@
-import { InitStoreOptions } from '../vanilla';
+import { InitStoreOptions } from '../store';
 import { UseStore } from './create-store';
 export type MutationState<TVar, TResponse = any, TError = unknown> = {
     /**

package/lib/react/create-store.d.ts

@@ -1,4 +1,4 @@
-import { InitStoreOptions, SelectDeps, SetStoreData, StoreData, StoreInitializer, Subscribers } from '../vanilla';
+import { InitStoreOptions, SelectDeps, SetStoreData, StoreData, StoreInitializer, Subscribers } from '../store';
 export type WatchProps<T, K extends SelectDeps<T> | keyof T = SelectDeps<T>> = {
     selectDeps?: K;
     render: (state: K extends keyof T ? T[K] : T) => any;

package/lib/react/create-store.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createStore = void 0;
 const react_1 = require("react");
-const vanilla_1 = require("../vanilla");
+const store_1 = require("../store");
 /**
  * @see https://floppy-disk.vercel.app/docs/api#createstore
  */
 const createStore = (initializer, options = {}) => {
-    const { get, set, subscribe, getSubscribers } = (0, vanilla_1.initStore)(initializer, options);
+    const { get, set, subscribe, getSubscribers } = (0, store_1.initStore)(initializer, options);
     const { defaultDeps } = options;
     /**
      * **IMPORTANT NOTE:** `selectDeps` function must not be changed after initialization.

package/lib/react/create-stores.d.ts

@@ -1,5 +1,5 @@
+import { InitStoreOptions, InitStoreReturn, SelectDeps, SetStoreData, StoreData, Subscribers } from '../store';
 import { Maybe } from '../utils';
-import { InitStoreOptions, InitStoreReturn, SelectDeps, SetStoreData, StoreData, Subscribers } from '../vanilla';
 import { WatchProps } from './create-store';
 export type StoreKey = Record<string, any> | undefined;
 export type StoresInitializer<TKey extends StoreKey = StoreKey, T extends StoreData = StoreData> = T | ((api: {
@@ -70,6 +70,7 @@ export type CreateStoresOptions<TKey extends StoreKey = StoreKey, T extends Stor
     defaultDeps?: SelectDeps<T>;
     hashKeyFn?: (obj: TKey) => string;
 };
+export declare const hashStoreKey: (value?: any) => string;
 /**
  * @see https://floppy-disk.vercel.app/docs/api#createstores
  */

package/lib/react/create-stores.js

@@ -1,20 +1,47 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createStores = void 0;
+exports.createStores = exports.hashStoreKey = void 0;
 const react_1 = require("react");
+const store_1 = require("../store");
 const utils_1 = require("../utils");
-const vanilla_1 = require("../vanilla");
+const hasObjectPrototype = (value) => {
+    return Object.prototype.toString.call(value) === '[object Object]';
+};
+const isPlainObject = (value) => {
+    if (!hasObjectPrototype(value))
+        return false;
+    const ctor = value.constructor;
+    if (typeof ctor === 'undefined')
+        return true;
+    const prot = ctor.prototype;
+    if (!hasObjectPrototype(prot))
+        return false;
+    if (!prot.hasOwnProperty('isPrototypeOf'))
+        return false;
+    return true;
+};
+const hashStoreKey = (value) => 
+// Copied from: https://github.com/TanStack/query/blob/main/packages/query-core/src/utils.ts
+JSON.stringify(value, (_, val) => isPlainObject(val)
+    ? Object.keys(val)
+        .sort()
+        .reduce((result, key) => {
+        result[key] = val[key];
+        return result;
+    }, {})
+    : val);
+exports.hashStoreKey = hashStoreKey;
 /**
  * @see https://floppy-disk.vercel.app/docs/api#createstores
  */
 const createStores = (initializer, options = {}) => {
-    const { onBeforeChangeKey = utils_1.noop, onStoreInitialized = utils_1.noop, defaultDeps, hashKeyFn = utils_1.hashStoreKey, } = options;
+    const { onBeforeChangeKey = utils_1.noop, onStoreInitialized = utils_1.noop, defaultDeps, hashKeyFn = exports.hashStoreKey, } = options;
     const stores = new Map();
     const getStore = (_key) => {
         const key = _key || {};
         const keyHash = hashKeyFn(key);
         if (!stores.has(keyHash)) {
-            stores.set(keyHash, (0, vanilla_1.initStore)((api) => (0, utils_1.getValue)(initializer, { key, keyHash, ...api }), options));
+            stores.set(keyHash, (0, store_1.initStore)((api) => (0, utils_1.getValue)(initializer, { key, keyHash, ...api }), options));
             onStoreInitialized(key, keyHash);
         }
         return stores.get(keyHash);

package/lib/{vanilla.d.ts → store.d.ts}

@@ -9,7 +9,7 @@ export type StoreInitializer<T> = T | ((api: {
 }) => T);
 export type StoreEvent<T> = (state: T) => void;
 export type InitStoreOptions<T> = {
-    intercept?: (nextState: T, prevState: T) => Maybe<Partial<T>>;
+    intercept?: (nextState: T, prevState: T) => void | Maybe<Partial<T>>;
     onFirstSubscribe?: StoreEvent<T>;
     onSubscribe?: StoreEvent<T>;
     onUnsubscribe?: StoreEvent<T>;

package/lib/{utils/index.d.ts → utils.d.ts}

@@ -1,8 +1,24 @@
+export type Maybe<T> = T | null | undefined;
+/**
+ * Check if this runs on browser.
+ */
+export declare const isClient: boolean;
 export declare const noop: () => void;
 export declare const identityFn: <T>(value: T) => T;
+/**
+ * Check if a value is not undefined and not null.
+ *
+ * ```ts
+ * const hasValue = (value: any) => value !== undefined && value !== null;
+ * ```
+ */
 export declare const hasValue: (value: any) => boolean;
-export declare const hashStoreKey: (obj?: any) => string;
+/**
+ * If the value is a function, it will invoke the function.\
+ * If the value is not a function, it will just return it.
+ */
 export declare const getValue: <T, P extends any[]>(valueOrComputeValueFn: T | ((...params: P) => T), ...params: P) => T;
-export type Maybe<T> = T | null | undefined;
-export declare const isClient: boolean;
+/**
+ * Create an Error instance with custom props.
+ */
 export declare const createError: (message: string, props: Record<string, any>) => Error & Record<string, any>;

package/lib/{utils/index.js → utils.js}

@@ -1,14 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createError = exports.isClient = exports.getValue = exports.hashStoreKey = exports.hasValue = exports.identityFn = exports.noop = void 0;
+exports.createError = exports.getValue = exports.hasValue = exports.identityFn = exports.noop = exports.isClient = void 0;
+/**
+ * Check if this runs on browser.
+ */
+exports.isClient = typeof window !== 'undefined' && !('Deno' in window);
 const noop = () => { };
 exports.noop = noop;
 const identityFn = (value) => value;
 exports.identityFn = identityFn;
+/**
+ * Check if a value is not undefined and not null.
+ *
+ * ```ts
+ * const hasValue = (value: any) => value !== undefined && value !== null;
+ * ```
+ */
 const hasValue = (value) => value !== undefined && value !== null;
 exports.hasValue = hasValue;
-const hashStoreKey = (obj) => JSON.stringify(obj, Object.keys(obj).sort());
-exports.hashStoreKey = hashStoreKey;
+/**
+ * If the value is a function, it will invoke the function.\
+ * If the value is not a function, it will just return it.
+ */
 const getValue = (valueOrComputeValueFn, ...params) => {
     if (typeof valueOrComputeValueFn === 'function') {
         return valueOrComputeValueFn(...params);
@@ -16,7 +29,9 @@ const getValue = (valueOrComputeValueFn, ...params) => {
     return valueOrComputeValueFn;
 };
 exports.getValue = getValue;
-exports.isClient = typeof window !== 'undefined' && !('Deno' in window);
+/**
+ * Create an Error instance with custom props.
+ */
 const createError = (message, props) => {
     const error = Object.assign(new Error(message), props);
     return error;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "floppy-disk",
-  "version": "2.15.1",
+  "version": "2.16.0-beta.1",
   "description": "FloppyDisk - lightweight, simple, and powerful state management library",
   "keywords": [
     "state",
@@ -25,39 +25,43 @@
   "sideEffects": false,
   "files": [
     "lib/",
-    "esm/"
+    "esm/",
+    "utils/"
   ],
-  "main": "lib/index.js",
-  "module": "esm/index.js",
-  "types": "lib/index.d.ts",
-  "typings": "lib/index.d.ts",
+  "main": "./lib/index.js",
+  "module": "./esm/index.js",
+  "types": "./lib/index.d.ts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "types": "./lib/index.d.ts",
       "import": {
         "types": "./esm/index.d.ts",
         "default": "./esm/index.js"
       },
-      "module": "./esm/index.js",
-      "default": "./lib/index.js"
+      "module": {
+        "types": "./esm/index.d.ts",
+        "default": "./esm/index.js"
+      },
+      "default": {
+        "types": "./lib/index.d.ts",
+        "default": "./lib/index.js"
+      }
+    },
+    "./utils": {
+      "import": {
+        "types": "./esm/utils.d.ts",
+        "default": "./esm/utils.js"
+      },
+      "module": {
+        "types": "./esm/utils.d.ts",
+        "default": "./esm/utils.js"
+      },
+      "default": {
+        "types": "./lib/utils.d.ts",
+        "default": "./lib/utils.js"
+      }
     }
   },
-  "scripts": {
-    "prepare": "husky install",
-    "build:cjs": "tsc -p tsconfig.prod.json",
-    "build:es": "tsc -p tsconfig.prod.json -m esNext --outDir esm",
-    "build": "yarn clean && yarn build:cjs && yarn build:es",
-    "prebuild": "ts-node ./scripts/preact.ts",
-    "clean": "rimraf lib esm",
-    "format": "prettier --check .",
-    "format:fix": "prettier --write .",
-    "lint": "eslint .",
-    "lint:fix": "eslint . --fix",
-    "lint:types": "tsc --noEmit",
-    "test": "jest --silent",
-    "semantic-release": "semantic-release"
-  },
   "release": {
     "branches": [
       "main",

package/utils/package.json

@@ -0,0 +1,6 @@
+{
+  "sideEffects": false,
+  "main": "../lib/utils.js",
+  "module": "../esm/utils.js",
+  "types": "../lib/utils.d.ts"
+}

package/esm/react/index.d.ts

@@ -1,6 +0,0 @@
-export * from './create-store';
-export * from './create-stores';
-export * from './create-query';
-export * from './create-bi-direction-query';
-export * from './create-mutation';
-export * from './with-context';

package/esm/react/index.js

@@ -1,6 +0,0 @@
-export * from './create-store';
-export * from './create-stores';
-export * from './create-query';
-export * from './create-bi-direction-query';
-export * from './create-mutation';
-export * from './with-context';

package/lib/react/index.d.ts

@@ -1,6 +0,0 @@
-export * from './create-store';
-export * from './create-stores';
-export * from './create-query';
-export * from './create-bi-direction-query';
-export * from './create-mutation';
-export * from './with-context';

package/lib/react/index.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./create-store"), exports);
-tslib_1.__exportStar(require("./create-stores"), exports);
-tslib_1.__exportStar(require("./create-query"), exports);
-tslib_1.__exportStar(require("./create-bi-direction-query"), exports);
-tslib_1.__exportStar(require("./create-mutation"), exports);
-tslib_1.__exportStar(require("./with-context"), exports);