intable 0.0.72 → 0.0.74

package/dist/plugins/ExpressPlugin.js

@@ -8,7 +8,7 @@ const ExpressPlugin = {
 			let n = i.props.columns[e];
 			if (!(!n.valueGetter && !n.valueSetter)) for (let r = 0; r < i.props.data.length; r++) {
 				let a = i.props.data[r];
-				n.id in a || Object.defineProperty(a, n.id, {
+				n.id && Object.defineProperty(a, n.id, {
 					get: () => n.valueGetter?.({
 						col: n,
 						data: a,

package/dist/plugins/OrmPlugin.js

@@ -19,15 +19,12 @@ const OrmPlugin = {
 		let x = createMutable({});
 		return createComputed(() => {
 			let e = y.props.columns?.filter((e) => (e.type == "fk" || e.type == "fks") && e.foreignField);
-			if (e.length) for (let b of e) for (let e of y.props.data) {
-				if (b.foreignField in e) continue;
-				Object.defineProperty(e, b.foreignField, {
-					get: () => get(x, [b.id, e[y.props.rowKey]]),
-					set: (S) => untrack(() => set(x, [b.id, e[y.props.rowKey]], S)),
-					enumerable: !0,
-					configurable: !0
-				});
-			}
+			if (e.length) for (let b of e) for (let e of y.props.data) Object.defineProperty(e, b.foreignField, {
+				get: () => get(x, [b.id, e[y.props.rowKey]]),
+				set: (S) => untrack(() => set(x, [b.id, e[y.props.rowKey]], S)),
+				enumerable: !0,
+				configurable: !0
+			});
 		}), createComponent(e, b);
 	} }
 };
@@ -211,18 +208,18 @@ const fetchDataByKeys = (() => {
 	};
 	return async (e, x) => {
 		if (!x.request || (e = e.filter((e) => !isEmpty(e)), !e.length)) return [];
-		let [S, C] = b(x), w = e.filter((e) => !S[e]), T = w.filter((e) => !C[e]);
-		if (T.length) {
+		let [S, C] = b(x), w = e.filter((e) => !S[e]).filter((e) => !C[e]);
+		if (w.length) {
 			let e = x.request({ filters: [{
 				field: x.rowKey,
 				op: "in",
-				value: T
+				value: w
 			}] });
-			T.forEach((y, b) => {
+			w.forEach((y, b) => {
 				C[y] = e.then((e) => S[y] = e.data[b]).finally(() => delete C[y]);
-			}), await Promise.all(w.map((e) => C[e]));
+			});
 		}
-		return e.map((e) => S[e]);
+		return await Promise.all(e.map((e) => C[e])), e.map((e) => S[e]);
 	};
 })();
 delegateEvents(["click"]);

package/package.json

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