@cratis/scene.engine 4.16.0 → 4.18.0

package/editing/iconDiagnostics.ts

@@ -86,5 +86,11 @@ export function iconProblemsOfProperty(catalog: EffectiveIconCatalog, descriptor
         return iconProblemsOfItems(catalog, descriptor.item, items, severity, { ...context, path: descriptor.path });
     }
 
+    if (descriptor.valueType === PropertyValueType.Object && descriptor.properties !== undefined && value !== null && typeof value === 'object' && !Array.isArray(value)) {
+        const record = value as Record<string, unknown>;
+        return descriptor.properties.flatMap((field) =>
+            iconProblemsOfProperty(catalog, { ...field, path: `${descriptor.path}.${field.path}` }, record[field.path], severity, context));
+    }
+
     return [];
 }

package/editing/validateValue.ts

@@ -72,6 +72,9 @@ export function validateValue(descriptor: PropertyDescriptor, value: unknown): s
         case PropertyValueType.Collection:
             return validateCollection(descriptor, value);
 
+        case PropertyValueType.Object:
+            return validateObject(descriptor, value);
+
         case PropertyValueType.Json:
             return isJsonValue(value) ? undefined : 'expected a JSON value';
 
@@ -119,6 +122,14 @@ function isJsonValue(value: unknown, parents = new Set<object>()): boolean {
     return valid;
 }
 
+function validateObject(descriptor: PropertyDescriptor, value: unknown): string | undefined {
+    if (descriptor.properties === undefined) return isRecord(value) || Array.isArray(value) ? undefined : 'expected a structured value';
+    if (!isRecord(value)) return 'expected a structured value';
+
+    const problem = validateFields(descriptor.properties, value, 'this object').at(0);
+    return problem ? `${problem.field} ${problem.problem}` : undefined;
+}
+
 function validateCollection(descriptor: PropertyDescriptor, value: unknown): string | undefined {
     if (!Array.isArray(value)) return 'expected a list';
     const constraints = descriptor.constraints ?? {};
@@ -155,13 +166,16 @@ export interface ItemFieldProblem {
  * @returns Every field that is unknown or has an unacceptable value.
  */
 export function validateItemValues(itemDescriptor: CollectionItemDescriptor | undefined, values: Record<string, unknown>): ItemFieldProblem[] {
-    const fields = itemDescriptor?.properties ?? [];
+    return validateFields(itemDescriptor?.properties ?? [], values, 'this collection\'s items');
+}
+
+function validateFields(fields: PropertyDescriptor[], values: Record<string, unknown>, owner: string): ItemFieldProblem[] {
     const problems: ItemFieldProblem[] = [];
 
     for (const [field, fieldValue] of Object.entries(values)) {
         const fieldDescriptor = fields.find(candidate => candidate.path === field);
         if (!fieldDescriptor) {
-            problems.push({ field, problem: 'is not a field of this collection\'s items' });
+            problems.push({ field, problem: `is not a field of ${owner}` });
             continue;
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cratis/scene.engine",
-    "version": "4.16.0",
+    "version": "4.18.0",
     "description": "The Scene runtime: walks a Scene element tree and drives whichever renderer is plugged in. Does not know React, or any other rendering platform, exists.",
     "keywords": [
         "cratis",
@@ -48,9 +48,9 @@
         "up": "yarn g:up"
     },
     "dependencies": {
-        "@cratis/scene.model": "4.16.0"
+        "@cratis/scene.model": "4.18.0"
     },
     "devDependencies": {
-        "@cratis/scene.model": "4.16.0"
+        "@cratis/scene.model": "4.18.0"
     }
 }