@riducms/admin 0.4.0 → 0.6.0

package/package.json

@@ -21,11 +21,11 @@
 		"@iconify/json": "^2.2.509",
 		"@internationalized/date": "^3.12.3",
 		"@lezer/highlight": "^1.2.3",
-		"@riducms/plugin": "0.4.0",
-		"@riducms/protocol": "0.4.0",
-		"@riducms/sdk": "0.4.0",
-		"@riducms/translations": "0.4.0",
-		"@riducms/ui": "0.4.0",
+		"@riducms/plugin": "0.6.0",
+		"@riducms/protocol": "0.6.0",
+		"@riducms/sdk": "0.6.0",
+		"@riducms/translations": "0.6.0",
+		"@riducms/ui": "0.6.0",
 		"@twinkleplop/bash": "0.1.5",
 		"@twinkleplop/go": "0.1.5",
 		"@twinkleplop/typescript": "0.1.5",
@@ -35,7 +35,7 @@
 	"description": "Framework-owned Svelte 5 authoring application embedded by Ridu servers.",
 	"devDependencies": {
 		"@hvniel/lexical-svelte": "^0.1.1",
-		"@riducms/build": "0.4.0",
+		"@riducms/build": "0.6.0",
 		"svelte": "^5.57.0"
 	},
 	"exports": {
@@ -74,5 +74,5 @@
 		"test:unit": "bun test tests"
 	},
 	"type": "module",
-	"version": "0.4.0"
+	"version": "0.6.0"
 }

package/src/core/forms/form-schema.ts

@@ -66,6 +66,16 @@ export function submissionFormValues(
 	return submissionRecord(fields, input, "", include);
 }
 
+/** Project an update onto caller edits, retaining row membership and stable identities. */
+export function changedFormValues(
+	fields: readonly SchemaField[],
+	input: FormValues,
+	original: FormValues,
+	isInherited?: (path: string) => boolean
+): FormValues {
+	return submissionRecord(fields, input, "", () => true, original, isInherited);
+}
+
 /** Initialize a new record, retaining supplied values and container metadata. */
 export function initialFormValues(
 	fields: readonly SchemaField[],
@@ -100,9 +110,12 @@ function submissionRecord(
 	fields: readonly SchemaField[],
 	input: unknown,
 	prefix: string,
-	include: (path: string, canonicalPath: string) => boolean
+	include: (path: string, canonicalPath: string) => boolean,
+	original?: unknown,
+	isInherited?: (path: string) => boolean
 ): FormValues {
 	const values = isRecord(input) ? input : {};
+	const before = isRecord(original) ? original : {};
 	const submitted: FormValues = {};
 	for (const field of fields) {
 		const path = joinFormPath(prefix, field.name);
@@ -113,23 +126,47 @@ function submissionRecord(
 		)
 			continue;
 		const value = values[field.name];
-		if (field.type === "group") {
-			submitted[field.name] = submissionRecord(field.nested?.fields ?? [], value, path, include);
-		} else if (field.type === "array" && Array.isArray(value)) {
-			submitted[field.name] = value.map((row, index) =>
-				submissionRecord(field.nested?.fields ?? [], row, `${path}.${index}`, include)
+		const displayedPrevious = before[field.name];
+		if (Object.hasOwn(before, field.name) && deepEqual(value, displayedPrevious)) continue;
+		// An edited fallback establishes a new locale value, without retained children to merge.
+		const previous = isInherited?.(path) === true ? undefined : displayedPrevious;
+
+		if (field.type === "group" && isRecord(value)) {
+			submitted[field.name] = submissionRecord(
+				field.nested?.fields ?? [],
+				value,
+				path,
+				include,
+				previous,
+				isInherited
 			);
-		} else if (field.type === "blocks" && Array.isArray(value)) {
+		} else if ((field.type === "array" || field.type === "blocks") && Array.isArray(value)) {
+			const previousRows = new Map(
+				(Array.isArray(previous) ? previous : []).flatMap((row) =>
+					isRecord(row) && typeof row._key === "string" ? [[row._key, row] as const] : []
+				)
+			);
+			const blocks = resolveBlockTypes(field.blocks);
 			submitted[field.name] = value.map((row, index) => {
-				if (!isRecord(row) || typeof row.blockType !== "string") return cloneFormValue(row);
-				const block = resolveBlockTypes(field.blocks).find(
-					(candidate) => candidate.slug === row.blockType
+				if (!isRecord(row)) return cloneFormValue(row);
+				const children =
+					field.type === "array"
+						? (field.nested?.fields ?? [])
+						: blocks.find((block) => block.slug === row.blockType)?.fields;
+				if (children === undefined) return cloneFormValue(row);
+
+				const prior = typeof row._key === "string" ? previousRows.get(row._key) : undefined;
+				return submissionRecord(
+					children,
+					row,
+					`${path}.${index}`,
+					include,
+					field.type === "blocks" && prior?.blockType !== row.blockType ? undefined : prior,
+					isInherited
 				);
-				return block === undefined
-					? cloneFormValue(row)
-					: submissionRecord(block.fields, row, `${path}.${index}`, include);
 			});
 		} else if (field.type === "plugin" && field.plugin?.embeddedTrees !== undefined) {
+			const priorOccurrences = embeddedOccurrences(field, previous, path).occurrences;
 			submitted[field.name] = transformEmbeddedPayloads(
 				field,
 				cloneFormValue(value),
@@ -139,7 +176,17 @@ function submissionRecord(
 						occurrence.block.fields,
 						occurrence.payload,
 						occurrence.path,
-						include
+						include,
+						occurrence.identity === undefined
+							? undefined
+							: priorOccurrences.find(
+									(prior) =>
+										prior.tree.key === occurrence.tree.key &&
+										prior.case.tagValue === occurrence.case.tagValue &&
+										prior.block.slug === occurrence.block.slug &&
+										prior.identity === occurrence.identity
+								)?.payload,
+						isInherited
 					),
 					[occurrence.case.discriminator]: occurrence.block.slug,
 					...(occurrence.identity === undefined

package/src/features/documents/document-controller.svelte.ts

@@ -11,7 +11,11 @@ import {
 	saveFormDraft,
 	takeFormDraft,
 } from "@admin/core/forms/form-draft-recovery";
-import { documentFormValues, initialFormValues } from "@admin/core/forms/form-schema";
+import {
+	changedFormValues,
+	documentFormValues,
+	initialFormValues,
+} from "@admin/core/forms/form-schema";
 import { invalidFieldLabels } from "@admin/core/forms/form-validation";
 import type { NotificationCenter } from "@admin/core/notifications/notification-center.svelte";
 import { samePreparedCreateValues } from "@admin/core/bootstrap/admin-bootstrap";
@@ -501,6 +505,10 @@ export class DocumentController {
 		const wasCreating = this.creating;
 		try {
 			const saved = await this.form.submit(this.validationFields, this.creating, async (values) => {
+				if (!wasCreating)
+					values = changedFormValues(this.validationFields, values, this.form.original, (path) =>
+						this.form.isInherited(path)
+					);
 				if (this.globalResource) {
 					if (publishingChanges) {
 						return this.options.runtime.client.publishGlobalChanges(collectionSlug, values, {

package/src/features/reference-browser/reference-browser-workflow.svelte.ts

@@ -7,7 +7,11 @@ import { RiduError } from "@riducms/sdk";
 
 import type { AdminDocument } from "@admin/core/api/admin-client";
 import { FormController, FormValidationError } from "@admin/core/forms/form-controller.svelte";
-import { documentFormValues, initialFormValues } from "@admin/core/forms/form-schema";
+import {
+	changedFormValues,
+	documentFormValues,
+	initialFormValues,
+} from "@admin/core/forms/form-schema";
 import { invalidFieldLabels } from "@admin/core/forms/form-validation";
 import type { NotificationCenter } from "@admin/core/notifications/notification-center.svelte";
 import type { AdminRuntime } from "@admin/core/runtime/admin-runtime.svelte";
@@ -450,6 +454,9 @@ export class ReferenceBrowserWorkflow {
 			const saved = await this.form.submit(this.validationFields, this.creating, async (values) => {
 				if (this.options.readOnly) throw new Error("This field is read-only.");
 				if (this.editorDocument !== undefined) {
+					values = changedFormValues(this.validationFields, values, this.form.original, (path) =>
+						this.form.isInherited(path)
+					);
 					if (this.collection.capabilities.upload) {
 						return this.options.runtime.client.updateUpload(
 							this.collection.slug,