intable 0.0.79 → 0.0.81

package/dist/plugins/FilterPlugin.js

@@ -4,38 +4,38 @@ import { useControlled } from "../hooks/useControlled.js";
 import { normalizeType } from "../components/AndOrFields.js";
 import { Filter, firstRule, isRuleNode } from "../components/Filter.js";
 import { createComponent, memo } from "solid-js/web";
-import { Show, mergeProps as mergeProps$1 } from "solid-js";
+import { Show, mergeProps as mergeProps$1, runWithOwner, untrack } from "solid-js";
 import { keyBy } from "es-toolkit";
 function isBlank(e) {
 	return e == null || String(e).trim() === "";
 }
 function toNum(e) {
-	let m = Number(e);
-	return Number.isNaN(m) ? null : m;
+	let g = Number(e);
+	return Number.isNaN(g) ? null : g;
 }
 function toDateTs(e) {
 	if (isBlank(e)) return null;
-	let m = new Date(String(e)).getTime();
-	return Number.isNaN(m) ? null : m;
+	let g = new Date(String(e)).getTime();
+	return Number.isNaN(g) ? null : g;
 }
 function toBool(e) {
 	if (typeof e == "boolean") return e;
 	if (typeof e == "number") return e !== 0;
-	let m = String(e ?? "").trim().toLowerCase();
+	let g = String(e ?? "").trim().toLowerCase();
 	return [
 		"1",
 		"true",
 		"yes",
 		"y",
 		"on"
-	].includes(m) ? !0 : [
+	].includes(g) ? !0 : [
 		"0",
 		"false",
 		"no",
 		"n",
 		"off",
 		""
-	].includes(m) ? !1 : !!e;
+	].includes(g) ? !1 : !!e;
 }
 function toList(e) {
 	return Array.isArray(e) ? e : e == null || String(e).trim() === "" ? [] : String(e).split(",").map((e) => e.trim()).filter(Boolean);
@@ -43,8 +43,8 @@ function toList(e) {
 function toPair(e) {
 	if (Array.isArray(e)) return [e[0], e[1]];
 	if (e == null || String(e).trim() === "") return [void 0, void 0];
-	let m = String(e).split(",").map((e) => e.trim());
-	return [m[0], m[1]];
+	let g = String(e).split(",").map((e) => e.trim());
+	return [g[0], g[1]];
 }
 function hasActiveRule(e) {
 	return !!e.op;
@@ -52,109 +52,109 @@ function hasActiveRule(e) {
 function hasActiveTree(e) {
 	return e ? isRuleNode(e) ? hasActiveRule(e) : (e.children ?? []).some(hasActiveTree) : !1;
 }
-function matchFilter(e, m, h) {
-	let g = m.op;
-	if (g === "blank") return isBlank(e);
-	if (g === "noblank") return !isBlank(e);
-	if (g === "true") return toBool(e);
-	if (g === "false") return !toBool(e);
-	let _ = m.value;
-	if (h === "number") {
-		let m = toNum(e), h = toNum(_), v = toList(_).map(toNum).filter((e) => e != null), [y, b] = toPair(_), x = toNum(y), S = toNum(b);
-		if (m == null) return !1;
-		if (g === "eq") return m === h;
-		if (g === "ne") return m !== h;
-		if (g === "in") return v.includes(m);
-		if (g === "not_in") return !v.includes(m);
-		if (g === "between") return x != null && S != null && m >= Math.min(x, S) && m <= Math.max(x, S);
-		if (g === "not_between") return x != null && S != null && (m < Math.min(x, S) || m > Math.max(x, S));
-		if (h == null) return !1;
-		if (g === "lt") return m < h;
-		if (g === "gt") return m > h;
-		if (g === "lte") return m <= h;
-		if (g === "gte") return m >= h;
+function matchFilter(e, g, _) {
+	let v = g.op;
+	if (v === "blank") return isBlank(e);
+	if (v === "noblank") return !isBlank(e);
+	if (v === "true") return toBool(e);
+	if (v === "false") return !toBool(e);
+	let y = g.value;
+	if (_ === "number") {
+		let g = toNum(e), _ = toNum(y), b = toList(y).map(toNum).filter((e) => e != null), [x, S] = toPair(y), C = toNum(x), w = toNum(S);
+		if (g == null) return !1;
+		if (v === "eq") return g === _;
+		if (v === "ne") return g !== _;
+		if (v === "in") return b.includes(g);
+		if (v === "not_in") return !b.includes(g);
+		if (v === "between") return C != null && w != null && g >= Math.min(C, w) && g <= Math.max(C, w);
+		if (v === "not_between") return C != null && w != null && (g < Math.min(C, w) || g > Math.max(C, w));
+		if (_ == null) return !1;
+		if (v === "lt") return g < _;
+		if (v === "gt") return g > _;
+		if (v === "lte") return g <= _;
+		if (v === "gte") return g >= _;
 	}
-	if (h === "date") {
-		let m = toDateTs(e), h = toDateTs(_), v = toList(_).map(toDateTs).filter((e) => e != null), [y, b] = toPair(_), x = toDateTs(y), S = toDateTs(b);
-		if (m == null) return !1;
-		if (g === "eq") return m === h;
-		if (g === "ne") return m !== h;
-		if (g === "in") return v.includes(m);
-		if (g === "not_in") return !v.includes(m);
-		if (g === "between") return x != null && S != null && m >= Math.min(x, S) && m <= Math.max(x, S);
-		if (g === "not_between") return x != null && S != null && (m < Math.min(x, S) || m > Math.max(x, S));
-		if (h == null) return !1;
-		if (g === "lt") return m < h;
-		if (g === "gt") return m > h;
-		if (g === "lte") return m <= h;
-		if (g === "gte") return m >= h;
+	if (_ === "date") {
+		let g = toDateTs(e), _ = toDateTs(y), b = toList(y).map(toDateTs).filter((e) => e != null), [x, S] = toPair(y), C = toDateTs(x), w = toDateTs(S);
+		if (g == null) return !1;
+		if (v === "eq") return g === _;
+		if (v === "ne") return g !== _;
+		if (v === "in") return b.includes(g);
+		if (v === "not_in") return !b.includes(g);
+		if (v === "between") return C != null && w != null && g >= Math.min(C, w) && g <= Math.max(C, w);
+		if (v === "not_between") return C != null && w != null && (g < Math.min(C, w) || g > Math.max(C, w));
+		if (_ == null) return !1;
+		if (v === "lt") return g < _;
+		if (v === "gt") return g > _;
+		if (v === "lte") return g <= _;
+		if (v === "gte") return g >= _;
 	}
-	let v = String(e ?? "").toLowerCase(), y = String(_ ?? "").toLowerCase(), b = toList(_).map((e) => String(e).toLowerCase()), [x, S] = toPair(_), C = String(x ?? "").toLowerCase(), w = String(S ?? "").toLowerCase();
-	return g === "eq" ? v === y : g === "ne" ? v !== y : g === "in" ? b.includes(v) : g === "not_in" ? !b.includes(v) : g === "between" ? C !== "" && w !== "" && v >= (C < w ? C : w) && v <= (C < w ? w : C) : g === "not_between" ? C !== "" && w !== "" && (v < (C < w ? C : w) || v > (C < w ? w : C)) : g === "startwith" ? v.startsWith(y) : g === "endwith" ? v.endsWith(y) : v.includes(y);
+	let b = String(e ?? "").toLowerCase(), x = String(y ?? "").toLowerCase(), S = toList(y).map((e) => String(e).toLowerCase()), [C, w] = toPair(y), T = String(C ?? "").toLowerCase(), E = String(w ?? "").toLowerCase();
+	return v === "eq" ? b === x : v === "ne" ? b !== x : v === "in" ? S.includes(b) : v === "not_in" ? !S.includes(b) : v === "between" ? T !== "" && E !== "" && b >= (T < E ? T : E) && b <= (T < E ? E : T) : v === "not_between" ? T !== "" && E !== "" && (b < (T < E ? T : E) || b > (T < E ? E : T)) : v === "startwith" ? b.startsWith(x) : v === "endwith" ? b.endsWith(x) : b.includes(x);
 }
-function evaluateFilterTree(e, m, h) {
-	if (isRuleNode(m)) return hasActiveRule(m) ? matchFilter(e[m.field], m, h(m)) : !0;
-	let g = (m.children ?? []).filter(hasActiveTree);
-	return g.length ? m.op === "or" ? g.some((m) => evaluateFilterTree(e, m, h)) : g.every((m) => evaluateFilterTree(e, m, h)) : !0;
+function evaluateFilterTree(e, g, _) {
+	if (isRuleNode(g)) return hasActiveRule(g) ? matchFilter(e[g.field], g, _(g)) : !0;
+	let v = (g.children ?? []).filter(hasActiveTree);
+	return v.length ? g.op === "or" ? v.some((g) => evaluateFilterTree(e, g, _)) : v.every((g) => evaluateFilterTree(e, g, _)) : !0;
 }
-function passesFilters(e, m, h) {
-	let g = keyBy(h, (e) => e.id);
+function passesFilters(e, g, _) {
+	let v = keyBy(_, (e) => e.id);
 	return evaluateFilterTree(e, {
 		op: "and",
-		children: m
-	}, (e) => normalizeType(g[e.field]));
+		children: g
+	}, (e) => normalizeType(v[e.field]));
 }
 const FilterPlugin = {
 	name: "filter",
 	rewriteProps: {
-		filter: ({ filter: e }, { store: m }) => (e = mergeProps$1({
+		filter: ({ filter: e }, { store: g }) => (e = mergeProps$1({
 			autoMatch: !0,
 			initialValue: [],
 			...e
-		}, e), m.filter ??= useControlled(e, m.owner), m.filter.$setOpt(e), m.filter),
-		newRow: ({ newRow: e }, { store: h }) => function(...g) {
-			let _ = e(...g), { columns: v } = h.props;
-			return v.forEach((e) => {
-				if (e[h.internal] || !e.filterable) return;
-				let g = h.props.filter.value.find((m) => isRuleNode(m) && m.field === e.id);
-				g && isRuleNode(g) && (_[e.id] = {
-					ne: `not ${g.value}`,
-					between: toArr(g.value)[0],
+		}, e), untrack(() => g.filter ??= runWithOwner(g.owner, () => useControlled(e))), g.filter.$setOpt(e), g.filter),
+		newRow: ({ newRow: e }, { store: _ }) => function(...v) {
+			let y = e(...v), { columns: b } = _.props;
+			return b.forEach((e) => {
+				if (e[_.internal] || !e.filterable) return;
+				let v = _.props.filter.value.find((g) => isRuleNode(g) && g.field === e.id);
+				v && isRuleNode(v) && (y[e.id] = {
+					ne: `not ${v.value}`,
+					between: toArr(v.value)[0],
 					not_between: NaN,
-					in: toArr(g.value)[0],
+					in: toArr(v.value)[0],
 					not_in: "",
-					lt: g.value - 1,
-					gt: g.value + 1,
+					lt: v.value - 1,
+					gt: v.value + 1,
 					blank: "",
 					noblank: "default",
 					true: !0,
 					false: !1
-				}[g.op] ?? g.value);
-			}), _;
+				}[v.op] ?? v.value);
+			}), y;
 		},
-		data: ({ data: e }, { store: m }) => {
+		data: ({ data: e }, { store: g }) => {
 			if (!e) return e;
-			let { columns: h } = m.props, g = m.props.filter;
-			return !g.autoMatch || !g.value.some(hasActiveTree) ? e : e.filter((e) => passesFilters(e, g.value, h));
+			let { columns: _ } = g.props, v = g.props.filter;
+			return !v.autoMatch || !v.value.some(hasActiveTree) ? e : e.filter((e) => passesFilters(e, v.value, _));
 		},
-		Th: ({ Th: m }, { store: g }) => (_) => {
-			let b = () => !!_.col.filterable && !_.col[g.internal];
-			return createComponent(m, mergeProps$2(_, { get children() {
-				return [memo(() => _.children), createComponent(Show, {
+		Th: ({ Th: g }, { store: v }) => (y) => {
+			let S = () => !!y.col.filterable && !y.col[v.internal];
+			return createComponent(g, mergeProps$2(y, { get children() {
+				return [memo(() => y.children), createComponent(Show, {
 					get when() {
-						return b();
+						return S();
 					},
 					get children() {
 						return createComponent(Filter, {
 							get col() {
-								return _.col;
+								return y.col;
 							},
 							get tree() {
-								return findret(g.props.filter.value, (e) => firstRule(e)?.field === _.col.id ? e : null);
+								return findret(v.props.filter.value, (e) => firstRule(e)?.field === y.col.id ? e : null);
 							},
 							setTree: (e) => {
-								let m = [...g.props.filter.value], h = m.findIndex((e) => firstRule(e)?.field == _.col.id);
-								e ? h > -1 ? m[h] = e : m.push(e) : h > -1 && m.splice(h, 1), g.props.filter?.onChange?.(m);
+								let g = [...v.props.filter.value], _ = g.findIndex((e) => firstRule(e)?.field == y.col.id);
+								e ? _ > -1 ? g[_] = e : g.push(e) : _ > -1 && g.splice(_, 1), v.props.filter?.onChange?.(g);
 							}
 						});
 					}

package/dist/plugins/OrmPlugin.js

@@ -157,7 +157,7 @@ var createEditor = (e) => (y) => createRoot((b) => {
 		get valueObject() {
 			return !T();
 		},
-		class: "min-h-full outline-1.5 outline-offset--1.5 outline-[--c-primary] bg-[--table-bg] py-1",
+		class: "min-h-full outline-1.5 outline-offset--1.5 outline-[--in-c-primary] bg-[--in-table-bg] py-1",
 		border: !1,
 		get multiple() {
 			return w();

package/dist/plugins/RenderPlugin/components.js

@@ -140,7 +140,7 @@ const Checkbox = (e) => {
 	let C = () => {
 		let S = Number(e.value) || 0;
 		return S <= 1 ? Math.round(S * 100) : Math.min(100, Math.max(0, Math.round(S)));
-	}, w = () => "var(--c-primary)";
+	}, w = () => "var(--in-c-primary)";
 	return S = combineProps({ get class() {
 		return "in-progress flex items-center h-full w-full";
 	} }, S), (() => {

package/dist/plugins/RenderPlugin/index.d.ts

@@ -1,4 +1,3 @@
-import { type JSX } from 'solid-js';
 import { type Plugin, type TDProps } from '../..';
 declare module '../../index' {
     interface TableProps {
@@ -19,7 +18,7 @@ declare module '../../index' {
         };
     }
 }
-export type Render = (props: TDProps) => JSX.Element | any;
+export type Render = (props: TDProps) => any;
 export declare const RenderPlugin: Plugin;
 export { text2colorMap } from './components';
 export declare const renders: Record<string, Render>;

package/dist/plugins/SortPlugin.js

@@ -1,29 +1,29 @@
 import { mergeProps as mergeProps$2 } from "../mergeProps2.js";
 import { useControlled } from "../hooks/useControlled.js";
 import { createComponent, insert, memo, template } from "solid-js/web";
-import { Show, mergeProps as mergeProps$1 } from "solid-js";
+import { Show, mergeProps as mergeProps$1, runWithOwner, untrack } from "solid-js";
 import { combineProps } from "@solid-primitives/props";
-var _tmpl$ = /* @__PURE__ */ template("<svg viewBox=\"0 0 24 24\"fill=none stroke=currentColor stroke-width=2 class=\"w-3.5 h-3.5 opacity-50 shrink-0 flex-none ml-1\"><path stroke-linecap=round stroke-linejoin=round d=\"M8 9l4-4 4 4M16 15l-4 4-4-4\">"), _tmpl$2 = /* @__PURE__ */ template("<svg viewBox=\"0 0 24 24\"fill=none stroke=currentColor stroke-width=2.5 class=\"w-3.5 h-3.5 shrink-0 flex-none ml-1\"style=color:var(--c-primary,#6366f1)><path stroke-linecap=round stroke-linejoin=round d=\"M5 15l7-7 7 7\">"), _tmpl$3 = /* @__PURE__ */ template("<svg viewBox=\"0 0 24 24\"fill=none stroke=currentColor stroke-width=2.5 class=\"w-3.5 h-3.5 shrink-0 flex-none ml-1\"style=color:var(--c-primary,#6366f1)><path stroke-linecap=round stroke-linejoin=round d=\"M19 9l-7 7-7-7\">"), _tmpl$4 = /* @__PURE__ */ template("<div class=\"flex items-center w-full\">");
-function compareValues(e, c) {
-	if (e == null && c == null) return 0;
+var _tmpl$ = /* @__PURE__ */ template("<svg viewBox=\"0 0 24 24\"fill=none stroke=currentColor stroke-width=2 class=\"w-3.5 h-3.5 opacity-50 shrink-0 flex-none ml-1\"><path stroke-linecap=round stroke-linejoin=round d=\"M8 9l4-4 4 4M16 15l-4 4-4-4\">"), _tmpl$2 = /* @__PURE__ */ template("<svg viewBox=\"0 0 24 24\"fill=none stroke=currentColor stroke-width=2.5 class=\"w-3.5 h-3.5 shrink-0 flex-none ml-1\"style=color:var(--in-c-primary,#6366f1)><path stroke-linecap=round stroke-linejoin=round d=\"M5 15l7-7 7 7\">"), _tmpl$3 = /* @__PURE__ */ template("<svg viewBox=\"0 0 24 24\"fill=none stroke=currentColor stroke-width=2.5 class=\"w-3.5 h-3.5 shrink-0 flex-none ml-1\"style=color:var(--in-c-primary,#6366f1)><path stroke-linecap=round stroke-linejoin=round d=\"M19 9l-7 7-7-7\">"), _tmpl$4 = /* @__PURE__ */ template("<div class=\"flex items-center w-full\">");
+function compareValues(e, u) {
+	if (e == null && u == null) return 0;
 	if (e == null) return -1;
-	if (c == null) return 1;
-	let l = Number(e), u = Number(c);
-	if (!Number.isNaN(l) && !Number.isNaN(u)) return l - u;
-	if (typeof e == "string" && typeof c == "string") {
-		let l = Date.parse(e), u = Date.parse(c);
-		if (!Number.isNaN(l) && !Number.isNaN(u) && l !== u) return l - u;
+	if (u == null) return 1;
+	let d = Number(e), f = Number(u);
+	if (!Number.isNaN(d) && !Number.isNaN(f)) return d - f;
+	if (typeof e == "string" && typeof u == "string") {
+		let d = Date.parse(e), f = Date.parse(u);
+		if (!Number.isNaN(d) && !Number.isNaN(f) && d !== f) return d - f;
 	}
-	return typeof e == "boolean" && typeof c == "boolean" ? Number(e) - Number(c) : String(e).localeCompare(String(c), void 0, {
+	return typeof e == "boolean" && typeof u == "boolean" ? Number(e) - Number(u) : String(e).localeCompare(String(u), void 0, {
 		numeric: !0,
 		sensitivity: "base"
 	});
 }
-function applySort(e, c, l) {
-	return c.length ? [...e].sort((e, u) => {
-		for (let { field: d, order: f } of c) {
-			let c = l[d], p = c?.sortComparator ? c.sortComparator(e[d], u[d]) : compareValues(e[d], u[d]);
-			if (p !== 0) return f === "asc" ? p : -p;
+function applySort(e, u, d) {
+	return u.length ? [...e].sort((e, f) => {
+		for (let { field: p, order: m } of u) {
+			let u = d[p], h = u?.sortComparator ? u.sortComparator(e[p], f[p]) : compareValues(e[p], f[p]);
+			if (h !== 0) return m === "asc" ? h : -h;
 		}
 		return 0;
 	}) : e;
@@ -33,56 +33,56 @@ const SortPlugin = [{
 	name: "sort",
 	priority: -1,
 	rewriteProps: {
-		sort: ({ sort: e }, { store: l }) => (e = mergeProps$1({
+		sort: ({ sort: e }, { store: d }) => (e = mergeProps$1({
 			multiple: !1,
 			autoSort: !0,
 			initialValue: []
-		}, e), l.sort ??= useControlled(e, l.owner), l.sort.$setOpt(e), l.sort),
-		data: ({ data: e }, { store: c }) => {
-			let l = c.props.sort;
-			if (!l.value?.length || !l.autoSort) return e;
-			let u = Object.fromEntries(c.props.columns.map((e) => [e.id, e]));
-			return applySort(e, l.value, u);
+		}, e), untrack(() => d.sort ??= runWithOwner(d.owner, () => useControlled(e))), d.sort.$setOpt(e), d.sort),
+		data: ({ data: e }, { store: u }) => {
+			let d = u.props.sort;
+			if (!d.value?.length || !d.autoSort) return e;
+			let f = Object.fromEntries(u.props.columns.map((e) => [e.id, e]));
+			return applySort(e, d.value, f);
 		}
 	}
 }, {
 	name: "sort-th",
-	rewriteProps: { Th: ({ Th: c }, { store: f }) => (m) => {
-		let h = mergeProps$2(() => f.props.sort), g = () => !!m.col.sortable && !m.col[f.internal], _ = () => g() ? h.value.find((e) => e.field === m.col.id) : void 0, v = combineProps(m, {
+	rewriteProps: { Th: ({ Th: u }, { store: m }) => (g) => {
+		let _ = mergeProps$2(() => m.props.sort), v = () => !!g.col.sortable && !g.col[m.internal], y = () => v() ? _.value.find((e) => e.field === g.col.id) : void 0, b = combineProps(g, {
 			get class() {
-				return g() ? "cursor-pointer select-none" : "";
+				return v() ? "cursor-pointer select-none" : "";
 			},
 			onClick: () => {
-				if (!g()) return;
-				let e = m.col.id, c = _(), l = c ? c.order === "asc" ? "desc" : null : "asc", u = h.multiple, d = [...h.value];
-				if (u) if (l === null) d = h.value.filter((c) => c.field !== e);
-				else if (c) {
-					let c = h.value.findIndex((c) => c.field === e);
-					d[c] = h.value[c] = {
+				if (!v()) return;
+				let e = g.col.id, u = y(), d = u ? u.order === "asc" ? "desc" : null : "asc", f = _.multiple, p = [..._.value];
+				if (f) if (d === null) p = _.value.filter((u) => u.field !== e);
+				else if (u) {
+					let u = _.value.findIndex((u) => u.field === e);
+					p[u] = _.value[u] = {
 						field: e,
-						order: l
+						order: d
 					};
-				} else d = [...h.value, {
+				} else p = [..._.value, {
 					field: e,
 					order: "asc"
 				}];
-				else d = l ? [{
+				else p = d ? [{
 					field: e,
-					order: l
+					order: d
 				}] : [];
-				h.onChange([...d]);
+				_.onChange([...p]);
 			}
 		});
-		return createComponent(c, mergeProps$2(v, { get children() {
+		return createComponent(u, mergeProps$2(b, { get children() {
 			var e = _tmpl$4();
-			return insert(e, () => m.children, null), insert(e, createComponent(Show, {
+			return insert(e, () => g.children, null), insert(e, createComponent(Show, {
 				get when() {
-					return g();
+					return v();
 				},
 				get children() {
 					return createComponent(Show, {
 						get when() {
-							return _();
+							return y();
 						},
 						get fallback() {
 							return createComponent(IconUnsorted, {});