intable 0.0.75 → 0.0.77

package/dist/index.d.ts

@@ -1,5 +1,4 @@
 import { type JSX, type Component, type Owner } from 'solid-js';
-import type { AndOrNode } from './components/AndOr';
 import 'virtual:uno.css';
 import './style.scss';
 import './plugins/CellSelectionPlugin';
@@ -13,7 +12,7 @@ import './plugins/ResizePlugin';
 import './plugins/DragPlugin';
 import './plugins/RowGroupPlugin';
 import './plugins/ExpandPlugin';
-import { type SortKey } from './plugins/SortPlugin';
+import './plugins/SortPlugin';
 import './plugins/CellMergePlugin';
 import './plugins/TreePlugin';
 import './plugins/HeaderGroup';
@@ -25,6 +24,7 @@ import './plugins/TooltipPlugin';
 import './plugins/KeyEachPlugin';
 import './plugins/PaginationPlugin';
 import './plugins/BranchGraphPlugin';
+import './plugins/RequestPlugin';
 import './plugins/OrmPlugin';
 import './plugins/ExpressPlugin';
 export declare const Ctx: import("solid-js").Context<{
@@ -81,15 +81,6 @@ export interface TableProps {
         x?: number | string;
     };
     newRow?: (i: number) => any;
-    request?: (params: {
-        page?: number;
-        pageSize?: number;
-        filters?: AndOrNode[];
-        sorts?: SortKey[];
-    }) => Promise<{
-        data: any[];
-        total?: number;
-    }>;
     Scroll?: Component<any>;
     Table?: Component<any>;
     Thead?: Component<any>;

package/dist/index.js

@@ -26,11 +26,12 @@ import { TooltipPlugin } from "./plugins/TooltipPlugin.js";
 import { KeyEachPlugin } from "./plugins/KeyEachPlugin.js";
 import { PaginationPlugin } from "./plugins/PaginationPlugin.js";
 import { BranchGraphPlugin } from "./plugins/BranchGraphPlugin.js";
+import { RequestPlugin } from "./plugins/RequestPlugin.js";
 import { OrmPlugin } from "./plugins/OrmPlugin.js";
 import { ExpressPlugin } from "./plugins/ExpressPlugin.js";
 import loading_bold_default from "./loading-bold.js";
 import { className, createComponent, effect, insert, memo, mergeProps, spread, template, use } from "solid-js/web";
-import { $PROXY, For, batch, createComputed, createContext, createEffect, createMemo, createRenderEffect, createResource, createSignal, getOwner, mapArray, mergeProps as mergeProps$1, onCleanup, onMount, runWithOwner, untrack, useContext } from "solid-js";
+import { $PROXY, For, batch, createComputed, createContext, createEffect, createMemo, createRenderEffect, createSignal, getOwner, mapArray, mergeProps as mergeProps$1, onCleanup, onMount, runWithOwner, useContext } from "solid-js";
 import { createMutable } from "solid-js/store";
 import { combineProps } from "@solid-primitives/props";
 import { createLazyMemo } from "@solid-primitives/memo";
@@ -448,30 +449,7 @@ const defaultsPlugins = [
 	KeyEachPlugin,
 	PaginationPlugin,
 	BranchGraphPlugin,
-	{
-		name: "request",
-		priority: -Infinity,
-		store: (g) => ({}),
-		rewriteProps: {
-			request: ({ request: g }, { store: G }) => g && (Promise.resolve().then(() => {
-				untrack(() => G._req ??= runWithOwner(G.owner, () => createResource(() => JSON.stringify({
-					filters: G.props.filter?.value,
-					sorts: G.props.sort?.value,
-					page: G.props.pagination?.value,
-					pageSize: G.props.pagination?.pageSize
-				}), (g) => G.props.request(JSON.parse(g)), { initialValue: {
-					data: [],
-					total: 0
-				} })));
-			}), g),
-			data: ({ data: g = [] }, { store: G }) => G.props.request ? G._req?.[0]()?.data ?? [] : g,
-			loading: ({ loading: g }, { store: G }) => G.props.request ? g || G._req?.[0].loading : g,
-			pagination: ({ pagination: g }, { store: G }) => ({
-				...g,
-				total: G.props.request ? G._req?.[0]()?.total : g?.total
-			})
-		}
-	},
+	RequestPlugin,
 	OrmPlugin,
 	ExpressPlugin
 ];

package/dist/plugins/RequestPlugin.d.ts

@@ -0,0 +1,32 @@
+import { type Setter } from 'solid-js';
+import { type Plugin } from '..';
+import type { AndOrNode } from '../components/AndOr';
+import type { SortKey } from './SortPlugin';
+declare module '..' {
+    interface TableProps {
+        request?: (params: {
+            page?: number;
+            pageSize?: number;
+            filters?: AndOrNode[];
+            sorts?: SortKey[];
+        }) => Promise<{
+            data: any[];
+            total: number;
+        }>;
+    }
+    interface TableColumn {
+    }
+    interface TableStore {
+        request?: {
+            data: {
+                data: any[];
+                total: number;
+            };
+            loading: boolean;
+            error: any;
+            mutate: Setter<any>;
+            refresh: () => void;
+        };
+    }
+}
+export declare const RequestPlugin: Plugin;

package/dist/plugins/RequestPlugin.js

@@ -0,0 +1,44 @@
+import { createResource, runWithOwner, untrack } from "solid-js";
+import { createAsyncMemo, createDebouncedMemo } from "@solid-primitives/memo";
+const RequestPlugin = {
+	name: "request",
+	priority: -Infinity,
+	store: (e) => ({}),
+	rewriteProps: {
+		request: ({ request: a }, { store: o }) => a ? (untrack(() => {
+			let i = runWithOwner(o.owner, () => createResource(createDebouncedMemo(createAsyncMemo(async () => JSON.stringify({
+				filters: o.props.filter?.value,
+				sorts: o.props.sort?.value,
+				page: o.props.pagination?.value,
+				pageSize: o.props.pagination?.pageSize
+			})), 300), (e) => o.props.request(JSON.parse(e)), { initialValue: {
+				data: [],
+				total: 0
+			} }));
+			o.request = {
+				get data() {
+					return i[0]();
+				},
+				get loading() {
+					return i[0].loading ?? !1;
+				},
+				get error() {
+					return i[0].error;
+				},
+				get mutate() {
+					return i[1].mutate;
+				},
+				get refresh() {
+					return i[1].refetch;
+				}
+			};
+		}), a) : (untrack(() => o.request = void 0), a),
+		data: ({ data: e = [] }, { store: r }) => r.request ? r.request.data?.data ?? [] : e,
+		loading: ({ loading: e }, { store: r }) => r.request ? e || r.request.loading : e,
+		pagination: ({ pagination: e }, { store: r }) => ({
+			...e,
+			total: r.request ? r.request.data.total : e?.total
+		})
+	}
+};
+export { RequestPlugin };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intable",
-  "version": "0.0.75",
+  "version": "0.0.77",
   "license": "MIT",
   "type": "module",
   "files": [