@updog/data-editor 0.1.90 → 0.1.91

package/index.d.ts

@@ -524,6 +524,8 @@ declare var export_default = {
         showSampleValues: "Show example values from {{column}}",
         unmatchedWarning:
           "Unmatched columns won't be imported. Match this column to keep the data. You can transform columns after importing.",
+        unmatchedWarningWithRowHook:
+          "The import can read this column without a match. If you match it, the import may still change the values.",
       },
       sheetPreview: {
         cancel: "Cancel processing",
@@ -953,6 +955,11 @@ type DataEditorColumn = {
     editor?: CellEditor;
     /** Adds a filter control for this column in the sidebar Filters panel. */
     filter?: ColumnFilter;
+    /**
+     * Whether this column is offered as a target on the column-matching step.
+     * Set false for fields your `onRowImport` callback fills. @default true
+     */
+    mappable?: boolean;
     /**
      * Whether this column can be pinned to the left (right in RTL) via the
      * header context menu. @default true

package/index.js

@@ -494,7 +494,8 @@ var vi = {
 				sampleValues: "Example values",
 				sampleValuesEmpty: "No values in this column",
 				showSampleValues: "Show example values from {{column}}",
-				unmatchedWarning: "Unmatched columns won't be imported. Match this column to keep the data. You can transform columns after importing."
+				unmatchedWarning: "Unmatched columns won't be imported. Match this column to keep the data. You can transform columns after importing.",
+				unmatchedWarningWithRowHook: "The import can read this column without a match. If you match it, the import may still change the values."
 			},
 			sheetPreview: {
 				cancel: "Cancel processing",
@@ -11466,7 +11467,9 @@ var Dh = (e, t, n) => {
 	if (!e) return "";
 	if (t.length === 0) return "[updog] primaryKey is empty, so imported rows are appended instead of merged.";
 	let r = gc(t, n.map((e) => e.id));
-	return r.length === 0 ? "" : `[updog] primaryKey names ${r.map((e) => `"${e}"`).join(", ")}, which no column declares. Imported rows are appended instead of merged.`;
+	if (r.length > 0) return `[updog] primaryKey names ${r.map((e) => `"${e}"`).join(", ")}, which no column declares. Imported rows are appended instead of merged.`;
+	let i = t.filter((e) => n.some((t) => t.id === e && t.mappable === !1));
+	return i.length === 0 ? "" : `[updog] primaryKey names ${i.map((e) => `"${e}"`).join(", ")}, which is not mappable (mappable: false). It never receives a match, so imported rows are appended instead of merged.`;
 };
 function Oh({ columns: e, primaryKey: t, loadData: n, onComplete: r, variant: i, showUploader: a, setShowUploader: o, storeRef: s, enableDeleteRow: c, enableAddRow: l, enableAddSource: u, blockSubmitOnError: d, importFormats: f, exportFormats: p, rowHeight: h, headerHeight: _, readonly: v, enableCreateColumn: y, onColumnMatch: b, onValueMatch: x, onRowImport: w, context: T, synonyms: E, sampleData: D, chat: O, remoteSources: k, customFormats: A, onUnstructuredFile: j, onError: M, errorHandler: N }) {
 	let P = vh(N ?? new lc(M)), { t: F, locale: I } = q();
@@ -24573,7 +24576,10 @@ var ED = (e, t) => {
 	seqByWorkbook = /* @__PURE__ */ new Map();
 	_state = tO;
 	constructor(e, t) {
-		this.deps = e, this.notify = t;
+		this.deps = {
+			...e,
+			columns: e.columns.filter((e) => e.mappable !== !1)
+		}, this.notify = t;
 	}
 	get state() {
 		return this._state;
@@ -26822,95 +26828,96 @@ var Fk = (t) => {
 		allMatched: n === e.headers.length
 	};
 }, dA = {}, fA = {}, pA = [], mA = () => {
-	let { columns: e, enableCreateColumn: t } = Q(), { t: n } = q(), r = nE(), i = pE(r, fE), a = pE(r, iE), o = i ? a.find((e) => e.id === i.workbookId) ?? null : null, { byWorkbook: s, pendingColumns: c, autoMatched: l, isMatching: u } = pE(r, aE), d = o ? s[o.id] ?? dA : dA, f = o?.id ?? null, p = m((e, t) => {
-		f !== null && r.updateColumnMapping(f, e, t);
-	}, [r, f]), h = m((e) => {
-		r.setPendingColumns(e);
-	}, [r]), g = b(() => o ? uA(o, d) : null, [o, d]), _ = (i?.total ?? 0) > 1, v = g?.headers ?? pA, [y, C] = S(null), { value: w, setTrue: E, setFalse: D } = nc(!1), [O, k] = S({}), A = x(null), j = m((e) => O[e] ?? !0, [O]), M = m((e, t) => {
-		k((n) => ({
+	let { columns: e, enableCreateColumn: t, onRowImport: n } = Q(), r = b(() => e.filter((e) => e.mappable !== !1), [e]), { t: i } = q(), a = nE(), o = pE(a, fE), s = pE(a, iE), c = o ? s.find((e) => e.id === o.workbookId) ?? null : null, { byWorkbook: l, pendingColumns: u, autoMatched: d, isMatching: f } = pE(a, aE), p = c ? l[c.id] ?? dA : dA, h = c?.id ?? null, g = m((e, t) => {
+		h !== null && a.updateColumnMapping(h, e, t);
+	}, [a, h]), _ = m((e) => {
+		a.setPendingColumns(e);
+	}, [a]), v = b(() => c ? uA(c, p) : null, [c, p]), y = (o?.total ?? 0) > 1, C = v?.headers ?? pA, [w, E] = S(null), { value: D, setTrue: O, setFalse: k } = nc(!1), [A, j] = S({}), M = x(null), N = m((e) => A[e] ?? !0, [A]), P = m((e, t) => {
+		j((n) => ({
 			...n,
 			[e]: t
 		}));
-	}, []), N = m((e, t) => {
+	}, []), F = m((e, t) => {
 		if (t === "action:create") {
-			A.current = e, C({ title: e }), E();
+			M.current = e, E({ title: e }), O();
 			return;
 		}
-		p(e, t);
-	}, [p, E]), P = m((e) => {
-		if (A.current === null) return;
+		g(e, t);
+	}, [g, O]), I = m((e) => {
+		if (M.current === null) return;
 		let t = crypto.randomUUID(), n = `${oc}${e.title}-${t}`;
-		h((t) => [...t, {
+		_((t) => [...t, {
 			...e,
 			id: n,
 			size: 150
-		}]), p(A.current, n), A.current = null, D();
+		}]), g(M.current, n), M.current = null, k();
 	}, [
-		p,
-		h,
-		D
-	]), F = m(() => {
-		A.current = null, D();
-	}, [D]), I = b(() => [...e.map((e) => e.title), ...c.map((e) => e.title)], [e, c]), L = f ? l[f] ?? fA : fA, R = b(() => {
-		let r = {
-			text: n("dataEditor.uploader.matchColumns.bestMatch"),
+		g,
+		_,
+		k
+	]), L = m(() => {
+		M.current = null, k();
+	}, [k]), R = b(() => [...e.map((e) => e.title), ...u.map((e) => e.title)], [e, u]), z = h ? d[h] ?? fA : fA, B = b(() => {
+		let e = {
+			text: i("dataEditor.uploader.matchColumns.bestMatch"),
 			color: "green"
-		}, i = {
-			text: n("dataEditor.uploader.matchColumns.newColumnTag"),
+		}, n = {
+			text: i("dataEditor.uploader.matchColumns.newColumnTag"),
 			color: "blue"
-		}, a = n("dataEditor.uploader.matchColumns.createColumn");
-		return Object.fromEntries(v.map((n) => {
-			let o = L[n], s = e.map((e) => ({
-				id: e.id,
-				text: e.title,
-				...e.id === o && { tag: r }
+		}, a = i("dataEditor.uploader.matchColumns.createColumn");
+		return Object.fromEntries(C.map((i) => {
+			let o = z[i], s = r.map((t) => ({
+				id: t.id,
+				text: t.title,
+				...t.id === o && { tag: e }
 			}));
-			for (let e of c) s.push({
+			for (let e of u) s.push({
 				id: e.id,
 				text: e.title,
-				tag: i
+				tag: n
 			});
 			return t && s.push({
-				id: `${n}_d`,
+				id: `${i}_d`,
 				type: "divider"
 			}, {
 				id: YE,
 				text: a,
 				icon: /* @__PURE__ */ T(Te, { size: "1rem" })
-			}), [n, s];
+			}), [i, s];
 		}));
 	}, [
-		v,
-		e,
-		c,
-		n,
+		C,
+		r,
+		u,
+		i,
 		t,
-		L
-	]), z = n("dataEditor.uploader.matchColumns.selectColumnPlaceholder"), B = m((e, t) => o ? RD(o, e, t) : [], [o]), V = m((e) => ({
-		mappedValue: d[e],
-		options: R[e],
-		autoMatchId: L[e]
+		z
+	]), V = i("dataEditor.uploader.matchColumns.selectColumnPlaceholder"), ee = m((e, t) => c ? RD(c, e, t) : [], [c]), te = m((e) => ({
+		mappedValue: p[e],
+		options: B[e],
+		autoMatchId: z[e]
 	}), [
-		d,
-		R,
-		L
+		p,
+		B,
+		z
 	]);
 	return {
-		view: g,
-		isMultiWorkbook: _,
-		isMatching: f ? u[f] ?? !1 : !1,
-		isShowMatched: j,
-		setShowMatched: M,
-		placeholder: z,
-		existingNames: I,
-		createModalValues: y,
-		createModalOpen: w,
-		getRowData: V,
-		getSampleValues: B,
-		onSelectChange: N,
-		onClear: p,
-		submitCreate: P,
-		closeCreate: F
+		view: v,
+		isMultiWorkbook: y,
+		hasRowHook: !!n,
+		isMatching: h ? f[h] ?? !1 : !1,
+		isShowMatched: N,
+		setShowMatched: P,
+		placeholder: V,
+		existingNames: R,
+		createModalValues: w,
+		createModalOpen: D,
+		getRowData: te,
+		getSampleValues: ee,
+		onSelectChange: F,
+		onClear: g,
+		submitCreate: I,
+		closeCreate: L
 	};
 }, hA = l(null);
 function gA({ children: e }) {
@@ -27065,28 +27072,28 @@ var _A = () => {
 			})]
 		})
 	});
-}, CA = f(({ csvHeader: e, mappedValue: t, options: n, autoMatchId: r, placeholder: i, isMatching: a, getSampleValues: o, onSelectChange: s, onClear: c }) => {
-	let { t: l } = q(), u = _(), d = !t, f = t?.startsWith("__dynamic__:") && !!r && !a, p = d && !a, h = m((t) => {
-		s(e, t);
-	}, [e, s]), g = m(() => {
-		c(e, void 0);
-	}, [e, c]);
+}, CA = f(({ csvHeader: e, mappedValue: t, options: n, autoMatchId: r, placeholder: i, isMatching: a, hasRowHook: o, getSampleValues: s, onSelectChange: c, onClear: l }) => {
+	let { t: u } = q(), d = _(), f = !t, p = t?.startsWith("__dynamic__:") && !!r && !a, h = f && !a, g = m((t) => {
+		c(e, t);
+	}, [e, c]), v = m(() => {
+		l(e, void 0);
+	}, [e, l]);
 	return /* @__PURE__ */ E("div", {
 		className: "updog__column-matching__row",
 		children: [
 			/* @__PURE__ */ T("div", {
 				className: "updog__column-matching__column",
 				children: /* @__PURE__ */ T(SA, {
-					labelId: u,
+					labelId: d,
 					csvHeader: e,
-					getSampleValues: o
+					getSampleValues: s
 				})
 			}),
 			/* @__PURE__ */ T("div", {
 				className: "updog__column-matching__arrow-container",
 				children: /* @__PURE__ */ T(M, {
 					size: "1.25rem",
-					className: O("updog__column-matching__arrow", "rtl-mirror", d || a ? "updog__column-matching__arrow--unmatched" : "updog__column-matching__arrow--matched")
+					className: O("updog__column-matching__arrow", "rtl-mirror", f || a ? "updog__column-matching__arrow--unmatched" : "updog__column-matching__arrow--matched")
 				})
 			}),
 			/* @__PURE__ */ T("div", {
@@ -27095,30 +27102,30 @@ var _A = () => {
 					width: "100%",
 					height: "2.5rem"
 				}) : /* @__PURE__ */ T(Ts, {
-					ariaLabelledby: u,
+					ariaLabelledby: d,
 					options: n,
 					value: t,
-					onChange: h,
-					onClear: g,
+					onChange: g,
+					onClear: v,
 					placeholder: i
 				})
 			}),
 			/* @__PURE__ */ E("div", {
 				className: "updog__column-matching__action",
-				children: [f && /* @__PURE__ */ T(Za, {
+				children: [p && /* @__PURE__ */ T(Za, {
 					content: /* @__PURE__ */ T(J, {
 						size: "sm",
-						children: l("dataEditor.uploader.matchColumns.createColumnWarning")
+						children: u("dataEditor.uploader.matchColumns.createColumnWarning")
 					}),
 					placement: "bottom-end",
 					children: /* @__PURE__ */ T(k, {
 						size: "1.25rem",
 						className: "updog__column-matching__action-icon"
 					})
-				}), p && /* @__PURE__ */ T(Za, {
+				}), h && /* @__PURE__ */ T(Za, {
 					content: /* @__PURE__ */ T(J, {
 						size: "sm",
-						children: l("dataEditor.uploader.matchColumns.unmatchedWarning")
+						children: u(o ? "dataEditor.uploader.matchColumns.unmatchedWarningWithRowHook" : "dataEditor.uploader.matchColumns.unmatchedWarning")
 					}),
 					placement: "bottom-end",
 					children: /* @__PURE__ */ T(he, {
@@ -27130,34 +27137,35 @@ var _A = () => {
 		]
 	});
 }), wA = ({ view: e }) => {
-	let { isMatching: t, isShowMatched: n, placeholder: r, getRowData: i, getSampleValues: a, onSelectChange: o, onClear: s } = _A(), { t: c } = q(), l = n(e.workbookId), u = e.headers.map((e) => ({
+	let { isMatching: t, isShowMatched: n, hasRowHook: r, placeholder: i, getRowData: a, getSampleValues: o, onSelectChange: s, onClear: c } = _A(), { t: l } = q(), u = n(e.workbookId), d = e.headers.map((e) => ({
 		csvHeader: e,
-		...i(e)
-	})).filter((e) => l || !e.mappedValue);
-	return u.length === 0 ? /* @__PURE__ */ T("div", {
+		...a(e)
+	})).filter((e) => u || !e.mappedValue);
+	return d.length === 0 ? /* @__PURE__ */ T("div", {
 		className: "updog__column-matching__content",
 		children: /* @__PURE__ */ T("div", {
 			className: "updog__column-matching__empty",
 			children: /* @__PURE__ */ T(J, {
 				size: "sm",
 				color: "secondary",
-				children: c("dataEditor.uploader.matchColumns.allMatched")
+				children: l("dataEditor.uploader.matchColumns.allMatched")
 			})
 		})
 	}) : /* @__PURE__ */ T("div", {
 		className: "updog__column-matching__content",
 		children: /* @__PURE__ */ T("div", {
 			className: "updog__column-matching__content-inner",
-			children: u.map(({ csvHeader: e, mappedValue: n, options: i, autoMatchId: c }) => /* @__PURE__ */ T(CA, {
+			children: d.map(({ csvHeader: e, mappedValue: n, options: a, autoMatchId: l }) => /* @__PURE__ */ T(CA, {
 				csvHeader: e,
 				mappedValue: n,
-				options: i,
-				autoMatchId: c,
-				placeholder: r,
+				options: a,
+				autoMatchId: l,
+				placeholder: i,
 				isMatching: t,
-				getSampleValues: a,
-				onSelectChange: o,
-				onClear: s
+				hasRowHook: r,
+				getSampleValues: o,
+				onSelectChange: s,
+				onClear: c
 			}, e))
 		})
 	});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@updog/data-editor",
-  "version": "0.1.90",
+  "version": "0.1.91",
   "description": "Client-side CSV importer and spreadsheet editor for React. Import CSV, Excel, JSON, TSV, and XML, match columns, validate, and edit 1M+ rows entirely in the browser.",
   "author": "Mikhail Kutateladze <admin@updog.tech>",
   "homepage": "https://updog.tech",