Fixed failing tests

app/imports/api/engine/computation/utility/cleanProp.testFn.js

@@ -1,9 +0,0 @@
-import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties';
-
-export default function cleanProp(prop) {
-  if (!prop.root) {
-    prop.root = { collection: 'creatures', id: 'testCreature' }
-  }
-  let schema = CreatureProperties.simpleSchema(prop);
-  return schema.clean(prop);
-}

app/imports/api/engine/computation/utility/cleanProp.testFn.ts

@@ -0,0 +1,11 @@
+import { SetRequired } from 'type-fest';
+import CreatureProperties, { CreatureProperty, CreaturePropertyTypes } from '/imports/api/creature/creatureProperties/CreatureProperties';
+import { cleanAndValidate } from '/imports/api/utility/TypedSimpleSchema';
+
+export default function cleanProp<T extends SetRequired<Partial<CreatureProperty>, 'type'>>(prop: T): CreaturePropertyTypes[T['type']] {
+  if (!prop.root) {
+    prop.root = { collection: 'creatures', id: 'testCreature' }
+  }
+  const schema = CreatureProperties.simpleSchema(prop);
+  return cleanAndValidate(schema, prop as Partial<CreatureProperty>) as CreaturePropertyTypes[T['type']];
+}

app/imports/api/engine/computation/utility/propsFromForest.testFn.ts

@@ -0,0 +1,57 @@
+import type { CreatureProperty } from '/imports/api/creature/creatureProperties/CreatureProperties';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties';
+import { applyNestedSetProperties } from '/imports/api/parenting/parentingFunctions';
+import { cleanAndValidate } from '/imports/api/utility/TypedSimpleSchema';
+
+export type ForestProp = Partial<CreatureProperty> & {
+  type: CreatureProperty['type'];
+  children?: ForestProp[];
+}
+
+/**
+ * Take a forest of props, which can have sub-props nested in children: [], and return a list of
+ * clean props with correct tree and ancestry data
+ * @param props 
+ * @returns 
+ */
+export default function propsFromForest(
+  props: ForestProp[],
+  creatureId = Random.id(),
+  parentId?: string,
+  recursionDepth = 0
+) {
+  const result: CreatureProperty[] = [];
+  props.forEach(prop => {
+    const children = prop.children;
+    // Check the property has a type
+    if (!prop.type) {
+      throw new Error('Type is required on every property, not found on doc: ' + JSON.stringify(prop, null, 2));
+    }
+    // Create the clean doc
+    const doc = {
+      ...prop,
+      left: result.length,
+      root: { id: creatureId, collection: 'creatures' },
+    };
+    if (parentId) {
+      doc.parentId = parentId;
+    }
+    if (!doc._id) {
+      doc._id = Random.id();
+    }
+    delete doc.children;
+    const creatureProp = cleanAndValidate(CreatureProperties.simpleSchema(doc), doc);
+
+    // Add the doc to the result and ancestry
+    result.push(creatureProp);
+    if (children) {
+      result.push(...propsFromForest(children, creatureId, doc._id, recursionDepth + 1));
+    }
+  });
+
+  // Apply the nested set properties on the top level
+  if (recursionDepth === 0) {
+    applyNestedSetProperties(result);
+  }
+  return result;
+}