@revisium/schema-toolkit-ui 0.6.1 → 0.6.2

package/dist/index.cjs

@@ -6920,6 +6920,88 @@ const SYSTEM_FIELD_IDS = new Set([
 	"schemaHash"
 ]);
 
+//#endregion
+//#region src/table-editor/TableEditor/model/SchemaContext.ts
+const DATA_FIELD = "data";
+function stripDataFieldPrefix(field) {
+	const prefix = `${DATA_FIELD}.`;
+	if (field.startsWith(prefix)) return field.slice(prefix.length);
+	if (field === DATA_FIELD) return "";
+	return field;
+}
+const SYSTEM_REF_SCHEMAS = {
+	[_revisium_schema_toolkit.SystemSchemaIds.File]: _revisium_schema_toolkit.fileSchema,
+	[_revisium_schema_toolkit.SystemSchemaIds.RowId]: _revisium_schema_toolkit.rowIdSchema,
+	[_revisium_schema_toolkit.SystemSchemaIds.RowCreatedAt]: _revisium_schema_toolkit.rowCreatedAtSchema,
+	[_revisium_schema_toolkit.SystemSchemaIds.RowCreatedId]: _revisium_schema_toolkit.rowCreatedIdSchema,
+	[_revisium_schema_toolkit.SystemSchemaIds.RowVersionId]: _revisium_schema_toolkit.rowVersionIdSchema,
+	[_revisium_schema_toolkit.SystemSchemaIds.RowPublishedAt]: _revisium_schema_toolkit.rowPublishedAtSchema,
+	[_revisium_schema_toolkit.SystemSchemaIds.RowUpdatedAt]: _revisium_schema_toolkit.rowUpdatedAtSchema,
+	[_revisium_schema_toolkit.SystemSchemaIds.RowHash]: _revisium_schema_toolkit.rowHashSchema,
+	[_revisium_schema_toolkit.SystemSchemaIds.RowSchemaHash]: _revisium_schema_toolkit.rowSchemaHashSchema
+};
+function wrapDataSchema(dataSchema) {
+	return {
+		type: "object",
+		properties: { [DATA_FIELD]: dataSchema },
+		additionalProperties: false,
+		required: [DATA_FIELD]
+	};
+}
+function buildRowSchema(wrappedDataSchema) {
+	const systemProperties = {};
+	for (const sf of SYSTEM_FIELDS) systemProperties[sf.id] = { $ref: sf.ref };
+	return {
+		type: "object",
+		properties: {
+			...systemProperties,
+			...wrappedDataSchema.properties
+		},
+		additionalProperties: false,
+		required: [...Object.keys(systemProperties), ...wrappedDataSchema.required]
+	};
+}
+var SchemaContext = class {
+	_allColumns = [];
+	_dataSchema = null;
+	_wrappedDataSchema = null;
+	_fullRefSchemas = {};
+	_rootNode = null;
+	get allColumns() {
+		return this._allColumns;
+	}
+	get sortableFields() {
+		return this._allColumns.filter((col) => !col.isDeprecated && col.fieldType !== FilterFieldType.File);
+	}
+	get filterableFields() {
+		return this.sortableFields;
+	}
+	get dataSchema() {
+		return this._dataSchema;
+	}
+	get wrappedDataSchema() {
+		return this._wrappedDataSchema;
+	}
+	get fullRefSchemas() {
+		return this._fullRefSchemas;
+	}
+	get rootNode() {
+		return this._rootNode;
+	}
+	init(dataSchema, refSchemas) {
+		this._dataSchema = dataSchema;
+		this._fullRefSchemas = {
+			...SYSTEM_REF_SCHEMAS,
+			...refSchemas
+		};
+		const wrapped = wrapDataSchema(dataSchema);
+		this._wrappedDataSchema = wrapped;
+		const rowSchema = buildRowSchema(wrapped);
+		this._rootNode = new _revisium_schema_toolkit.SchemaParser().parse(rowSchema, this._fullRefSchemas);
+		this._allColumns = extractColumns(this._rootNode);
+	}
+};
+
 //#endregion
 //#region src/table-editor/Columns/model/extractColumns.ts
 const NODE_TYPE_TO_FIELD_TYPE = {
@@ -6963,15 +7045,20 @@ function resolveRefColumn(child, fieldPath) {
 	const refValue = child.ref();
 	if (!refValue) return null;
 	const systemDef = SYSTEM_FIELD_BY_REF.get(refValue);
-	if (systemDef) return {
-		field: systemDef.id,
-		label: systemDef.label,
-		fieldType: systemDef.fieldType,
-		isSystem: true,
-		systemFieldId: systemDef.id,
-		isDeprecated: child.metadata().deprecated ?? false,
-		hasFormula: child.hasFormula()
-	};
+	if (systemDef) {
+		const isDeprecated = child.metadata().deprecated ?? false;
+		const hasFormula = child.hasFormula();
+		return {
+			field: systemDef.id,
+			label: systemDef.label,
+			fieldType: systemDef.fieldType,
+			isSystem: true,
+			systemFieldId: systemDef.id,
+			isDeprecated,
+			hasFormula,
+			isSortable: !isDeprecated && !hasFormula
+		};
+	}
 	if (refValue === _revisium_schema_toolkit.SystemSchemaIds.File) return resolveFileRefColumns(child, fieldPath);
 	return null;
 }
@@ -6984,14 +7071,22 @@ function resolveFileRefColumns(child, fieldPath) {
 	}
 	return result;
 }
+function stripDataPrefix(fieldPath) {
+	if (fieldPath === DATA_FIELD) return DATA_FIELD;
+	if (fieldPath.startsWith(`${DATA_FIELD}.`)) return fieldPath.slice(DATA_FIELD.length + 1);
+	return fieldPath;
+}
 function createColumn(fieldPath, child, fieldType) {
+	const isDeprecated = child.metadata().deprecated ?? false;
+	const hasFormula = child.hasFormula();
 	return {
 		field: fieldPath,
-		label: fieldPath,
+		label: stripDataPrefix(fieldPath),
 		fieldType,
 		isSystem: false,
-		isDeprecated: child.metadata().deprecated ?? false,
-		hasFormula: child.hasFormula()
+		isDeprecated,
+		hasFormula,
+		isSortable: !isDeprecated && !hasFormula && fieldType !== FilterFieldType.File
 	};
 }
 
@@ -7078,6 +7173,10 @@ var ColumnsModel = class {
 		const visible = this._visibleFieldSet;
 		return this._allColumns.filter((col) => !visible.has(col.field) && !col.isSystem);
 	}
+	get availableFieldsToInsert() {
+		const visible = this._visibleFieldSet;
+		return this._allColumns.filter((col) => !visible.has(col.field));
+	}
 	get availableSystemFieldsToAdd() {
 		const visible = this._visibleFieldSet;
 		return this._allColumns.filter((col) => !visible.has(col.field) && col.isSystem);
@@ -7458,11 +7557,9 @@ var ColumnsModel = class {
 		return this._pinnedColumns.get(neighbor) === pin;
 	}
 	_toViewField(field) {
-		if (this._columnLookup.get(field)?.isSystem) return field;
-		return `data.${field}`;
+		return field;
 	}
 	_fromViewField(viewField) {
-		if (viewField.startsWith("data.")) return viewField.slice(5);
 		return viewField;
 	}
 	_resolveWidthUntracked(field) {
@@ -7981,7 +8078,7 @@ function buildConditionClause(condition) {
 			searchType: condition.searchType || "plain"
 		} };
 		return { data: {
-			path: condition.field,
+			path: stripDataFieldPrefix(condition.field),
 			search: condition.value,
 			searchLanguage: condition.searchLanguage || "simple",
 			searchType: condition.searchType || "plain"
@@ -7990,7 +8087,7 @@ function buildConditionClause(condition) {
 	const opClause = buildOperatorClause(condition.operator, condition.value, condition.fieldType);
 	if (SYSTEM_FIELD_IDS.has(condition.field)) return { [condition.field]: opClause };
 	return { data: {
-		path: condition.field,
+		path: stripDataFieldPrefix(condition.field),
 		...opClause
 	} };
 }
@@ -9316,22 +9413,18 @@ var SortModel = class {
 		if (firstAvailable) this.addSort(firstAvailable.field);
 	}
 	serializeToViewSorts() {
-		const lookup = this._fieldLookup;
-		return this.sorts.map((sort) => {
-			return {
-				field: lookup.get(sort.field)?.isSystem ? sort.field : `data.${sort.field}`,
-				direction: sort.direction
-			};
-		});
+		return this.sorts.map((sort) => ({
+			field: sort.field,
+			direction: sort.direction
+		}));
 	}
 	applyViewSorts(viewSorts) {
 		const lookup = this._fieldLookup;
 		const sorts = [];
 		for (const vs of viewSorts) {
-			const field = vs.field.startsWith("data.") ? vs.field.slice(5) : vs.field;
 			const direction = vs.direction === "desc" ? "desc" : "asc";
-			if (lookup.has(field)) sorts.push({
-				field,
+			if (lookup.has(vs.field)) sorts.push({
+				field: vs.field,
 				direction
 			});
 		}
@@ -12188,8 +12281,8 @@ const InsertColumnSubmenu = ({ label, valuePrefix, availableFields, onSelect })
 //#region src/table-editor/Table/ui/Header/ColumnHeaderMenu.tsx
 const ColumnHeaderMenu = (0, mobx_react_lite.observer)(({ column, columnsModel, sortModel, filterModel, onCopyPath, onClose }) => {
 	const canRemove = columnsModel.canRemoveColumn;
-	const availableFields = columnsModel.availableFieldsToAdd;
-	const hasAvailableFields = availableFields.length > 0;
+	const insertableFields = columnsModel.availableFieldsToInsert;
+	const hasInsertableFields = insertableFields.length > 0;
 	const canMove = columnsModel.canMoveLeft(column.field) || columnsModel.canMoveRight(column.field);
 	const isPinned = columnsModel.isPinned(column.field);
 	const canPinLeft = columnsModel.canPinLeft(column.field);
@@ -12227,11 +12320,11 @@ const ColumnHeaderMenu = (0, mobx_react_lite.observer)(({ column, columnsModel,
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_chakra_ui_react.Menu.Content, {
 		minW: "180px",
 		children: [
-			sortModel && !column.hasFormula && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(SortSubmenu, {
+			sortModel && column.isSortable && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(SortSubmenu, {
 				field: column.field,
 				sortModel
 			}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Menu.Separator, {})] }),
-			filterModel && !column.hasFormula && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_chakra_ui_react.Menu.Item, {
+			filterModel && column.isSortable && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_chakra_ui_react.Menu.Item, {
 				value: "add-filter",
 				onClick: handleAddFilter,
 				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(react_icons_lu.LuFilter, {}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Text, { children: "Add filter" })]
@@ -12257,17 +12350,17 @@ const ColumnHeaderMenu = (0, mobx_react_lite.observer)(({ column, columnsModel,
 				}),
 				(canPinLeft || canPinRight) && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Menu.Separator, {})
 			] }),
-			hasAvailableFields && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
+			hasInsertableFields && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
 				/* @__PURE__ */ (0, react_jsx_runtime.jsx)(InsertColumnSubmenu, {
 					label: "Insert before",
 					valuePrefix: "before",
-					availableFields,
+					availableFields: insertableFields,
 					onSelect: handleInsertBefore
 				}),
 				/* @__PURE__ */ (0, react_jsx_runtime.jsx)(InsertColumnSubmenu, {
 					label: "Insert after",
 					valuePrefix: "after",
-					availableFields,
+					availableFields: insertableFields,
 					onSelect: handleInsertAfter
 				}),
 				/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Menu.Separator, {})
@@ -12385,11 +12478,11 @@ const ColumnHeader = (0, mobx_react_lite.observer)(({ column, columnsModel, sort
 							field: column.field,
 							columnsModel
 						}),
-						filterModel && !column.hasFormula && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(FilterIndicator, {
+						filterModel && column.isSortable && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(FilterIndicator, {
 							field: column.field,
 							filterModel
 						}),
-						sortModel && !column.hasFormula && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(SortIndicator, {
+						sortModel && column.isSortable && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(SortIndicator, {
 							field: column.field,
 							sortModel
 						})
@@ -13505,67 +13598,6 @@ var ViewSettingsBadgeModel = class {
 	}
 };
 
-//#endregion
-//#region src/table-editor/TableEditor/model/SchemaContext.ts
-const SYSTEM_REF_SCHEMAS = {
-	[_revisium_schema_toolkit.SystemSchemaIds.File]: _revisium_schema_toolkit.fileSchema,
-	[_revisium_schema_toolkit.SystemSchemaIds.RowId]: _revisium_schema_toolkit.rowIdSchema,
-	[_revisium_schema_toolkit.SystemSchemaIds.RowCreatedAt]: _revisium_schema_toolkit.rowCreatedAtSchema,
-	[_revisium_schema_toolkit.SystemSchemaIds.RowCreatedId]: _revisium_schema_toolkit.rowCreatedIdSchema,
-	[_revisium_schema_toolkit.SystemSchemaIds.RowVersionId]: _revisium_schema_toolkit.rowVersionIdSchema,
-	[_revisium_schema_toolkit.SystemSchemaIds.RowPublishedAt]: _revisium_schema_toolkit.rowPublishedAtSchema,
-	[_revisium_schema_toolkit.SystemSchemaIds.RowUpdatedAt]: _revisium_schema_toolkit.rowUpdatedAtSchema,
-	[_revisium_schema_toolkit.SystemSchemaIds.RowHash]: _revisium_schema_toolkit.rowHashSchema,
-	[_revisium_schema_toolkit.SystemSchemaIds.RowSchemaHash]: _revisium_schema_toolkit.rowSchemaHashSchema
-};
-function buildRowSchema(dataSchema) {
-	const systemProperties = {};
-	for (const sf of SYSTEM_FIELDS) systemProperties[sf.id] = { $ref: sf.ref };
-	return {
-		type: "object",
-		properties: {
-			...systemProperties,
-			...dataSchema.properties
-		},
-		additionalProperties: false,
-		required: [...Object.keys(systemProperties), ...dataSchema.required ?? []]
-	};
-}
-var SchemaContext = class {
-	_allColumns = [];
-	_dataSchema = null;
-	_fullRefSchemas = {};
-	_rootNode = null;
-	get allColumns() {
-		return this._allColumns;
-	}
-	get sortableFields() {
-		return this._allColumns.filter((col) => !col.isDeprecated && col.fieldType !== FilterFieldType.File);
-	}
-	get filterableFields() {
-		return this.sortableFields;
-	}
-	get dataSchema() {
-		return this._dataSchema;
-	}
-	get fullRefSchemas() {
-		return this._fullRefSchemas;
-	}
-	get rootNode() {
-		return this._rootNode;
-	}
-	init(dataSchema, refSchemas) {
-		this._dataSchema = dataSchema;
-		this._fullRefSchemas = {
-			...SYSTEM_REF_SCHEMAS,
-			...refSchemas
-		};
-		const rowSchema = buildRowSchema(dataSchema);
-		this._rootNode = new _revisium_schema_toolkit.SchemaParser().parse(rowSchema, this._fullRefSchemas);
-		this._allColumns = extractColumns(this._rootNode);
-	}
-};
-
 //#endregion
 //#region src/table-editor/TableEditor/model/TableEditorCore.ts
 const DEFAULT_PAGE_SIZE = 50;
@@ -13712,7 +13744,10 @@ var TableEditorCore = class {
 	_buildQuery(after = null) {
 		return {
 			where: this.filters.hasActiveFilters ? this.filters.buildCurrentWhereClause() : null,
-			orderBy: this.sorts.serializeToViewSorts(),
+			orderBy: this.sorts.serializeToViewSorts().map((s) => ({
+				field: stripDataFieldPrefix(s.field),
+				direction: s.direction
+			})),
 			search: this.search.debouncedQuery,
 			first: this._pageSize,
 			after
@@ -13747,14 +13782,14 @@ var TableEditorCore = class {
 		this._updateNavigationContext();
 	}
 	_createRowVMs(rawRows) {
-		const dataSchema = this._schemaContext.dataSchema;
-		if (!dataSchema) return [];
+		const wrappedSchema = this._schemaContext.wrappedDataSchema;
+		if (!wrappedSchema) return [];
 		const tableModel = (0, _revisium_schema_toolkit.createTableModel)({
 			tableId: this._tableId,
-			schema: dataSchema,
+			schema: wrappedSchema,
 			rows: rawRows.map((r) => ({
 				rowId: r.rowId,
-				data: r.data
+				data: { data: r.data }
 			})),
 			refSchemas: this._schemaContext.fullRefSchemas
 		});
@@ -13768,10 +13803,14 @@ var TableEditorCore = class {
 			id: rawRow.rowId
 		};
 	}
+	_toPatchField(field) {
+		return stripDataFieldPrefix(field);
+	}
 	async _commitCell(rowId, field, value, previousValue) {
+		const patchField = this._toPatchField(field);
 		const result = (await this._dataSource.patchCells([{
 			rowId,
-			field,
+			field: patchField,
 			value
 		}]))[0];
 		if (result && !result.ok) (0, mobx.runInAction)(() => {
@@ -13851,7 +13890,7 @@ var MockDataSource = class {
 	static createRow(rowId, data, systemFields) {
 		const row = {
 			rowId,
-			data: { ...data }
+			data: data && typeof data === "object" && !Array.isArray(data) ? { ...data } : data
 		};
 		if (systemFields) row.systemFields = systemFields;
 		return row;
@@ -13870,16 +13909,23 @@ var MockDataSource = class {
 		let rows = [...this._allRows];
 		if (query.search) {
 			const lower = query.search.toLowerCase();
-			rows = rows.filter((row) => Object.values(row.data).some((val) => typeof val === "string" && val.toLowerCase().includes(lower)));
+			rows = rows.filter((row) => {
+				const data = row.data;
+				if (data && typeof data === "object") return Object.values(data).some((val) => typeof val === "string" && val.toLowerCase().includes(lower));
+				if (typeof data === "string") return data.toLowerCase().includes(lower);
+				return false;
+			});
 		}
 		if (query.orderBy.length > 0) {
 			const firstOrder = query.orderBy[0];
 			if (firstOrder) {
-				const field = firstOrder.field.startsWith("data.") ? firstOrder.field.slice(5) : firstOrder.field;
+				const field = firstOrder.field;
 				const dir = firstOrder.direction === "desc" ? -1 : 1;
 				rows.sort((a, b) => {
-					const aVal = a.data[field];
-					const bVal = b.data[field];
+					const aData = a.data;
+					const bData = b.data;
+					const aVal = aData?.[field];
+					const bVal = bData?.[field];
 					if (aVal === bVal) return 0;
 					if (aVal == null) return 1;
 					if (bVal == null) return -1;
@@ -13915,7 +13961,7 @@ var MockDataSource = class {
 				error: "Mock failure"
 			};
 			const row = this._allRows.find((r) => r.rowId === patch.rowId);
-			if (row) row.data[patch.field] = patch.value;
+			if (row?.data && typeof row.data === "object" && !Array.isArray(row.data)) row.data[patch.field] = patch.value;
 			return {
 				rowId: patch.rowId,
 				field: patch.field,