@cmssy/core 9.7.0 → 9.7.2

package/dist/index.cjs

@@ -789,14 +789,26 @@ function isResolvedRecord(value) {
 function isListShaped(field) {
   return field.relationMode === "all" || field.relationType === "hasMany" || field.multiple === true;
 }
-function normalizeRelationContent(content, schema) {
+function normalizeRelationContent(content, schema, resolved) {
   for (const [key, field] of Object.entries(schema)) {
     if (field.type !== "relation") continue;
     const value = content[key];
+    const fallback = resolved?.[key];
     if (isListShaped(field)) {
-      content[key] = Array.isArray(value) ? value.filter(isResolvedRecord) : [];
+      if (Array.isArray(value)) {
+        const records = value.filter(isResolvedRecord);
+        if (records.length > 0 || value.length === 0) {
+          content[key] = records;
+          continue;
+        }
+      }
+      content[key] = Array.isArray(fallback) ? fallback.filter(isResolvedRecord) : [];
     } else if (!isResolvedRecord(value)) {
-      delete content[key];
+      if (value != null && value !== "" && isResolvedRecord(fallback)) {
+        content[key] = fallback;
+      } else {
+        delete content[key];
+      }
     }
   }
 }

package/dist/index.d.cts

@@ -168,9 +168,11 @@ type BlockSchemaMap = Record<string, Record<string, FieldDefinition>>;
  * The editor canvas renders stored content without the server-side resolve, so
  * a relation field there holds raw ids - or the "" a freshly inserted block is
  * seeded with. A component is typed against resolved records, so anything that
- * is not one is coerced to the safe empty shape instead of reaching it.
+ * is not one falls back to the server-resolved value for that key (the admin
+ * hydrates the canvas with raw stored content, clobbering it), and only then
+ * to the safe empty shape.
  */
-declare function normalizeRelationContent(content: Record<string, unknown>, schema: Record<string, FieldDefinition>): void;
+declare function normalizeRelationContent(content: Record<string, unknown>, schema: Record<string, FieldDefinition>, resolved?: Record<string, unknown>): void;
 /**
  * Resolves every `fields.relation` value on the given block contents in place:
  * stored record ids become full records (one batched read for the whole page),

package/dist/index.d.ts

@@ -168,9 +168,11 @@ type BlockSchemaMap = Record<string, Record<string, FieldDefinition>>;
  * The editor canvas renders stored content without the server-side resolve, so
  * a relation field there holds raw ids - or the "" a freshly inserted block is
  * seeded with. A component is typed against resolved records, so anything that
- * is not one is coerced to the safe empty shape instead of reaching it.
+ * is not one falls back to the server-resolved value for that key (the admin
+ * hydrates the canvas with raw stored content, clobbering it), and only then
+ * to the safe empty shape.
  */
-declare function normalizeRelationContent(content: Record<string, unknown>, schema: Record<string, FieldDefinition>): void;
+declare function normalizeRelationContent(content: Record<string, unknown>, schema: Record<string, FieldDefinition>, resolved?: Record<string, unknown>): void;
 /**
  * Resolves every `fields.relation` value on the given block contents in place:
  * stored record ids become full records (one batched read for the whole page),

package/dist/index.js

@@ -787,14 +787,26 @@ function isResolvedRecord(value) {
 function isListShaped(field) {
   return field.relationMode === "all" || field.relationType === "hasMany" || field.multiple === true;
 }
-function normalizeRelationContent(content, schema) {
+function normalizeRelationContent(content, schema, resolved) {
   for (const [key, field] of Object.entries(schema)) {
     if (field.type !== "relation") continue;
     const value = content[key];
+    const fallback = resolved?.[key];
     if (isListShaped(field)) {
-      content[key] = Array.isArray(value) ? value.filter(isResolvedRecord) : [];
+      if (Array.isArray(value)) {
+        const records = value.filter(isResolvedRecord);
+        if (records.length > 0 || value.length === 0) {
+          content[key] = records;
+          continue;
+        }
+      }
+      content[key] = Array.isArray(fallback) ? fallback.filter(isResolvedRecord) : [];
     } else if (!isResolvedRecord(value)) {
-      delete content[key];
+      if (value != null && value !== "" && isResolvedRecord(fallback)) {
+        content[key] = fallback;
+      } else {
+        delete content[key];
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/core",
-  "version": "9.7.0",
+  "version": "9.7.2",
   "description": "Framework-agnostic cmssy client: content, commerce, config, editor protocol. No React, no Next.",
   "keywords": [
     "cmssy",