FIX: ForeignDocumentUUIDField initialize like a getter

FEAT: ForeignDocumentUUIDArrayField created and used

module/data/_module.mjs

@@ -1,5 +1,3 @@
-export { default as DhClass } from './item/class.mjs';
-export { default as DhSubclass } from './item/subclass.mjs';
 export { default as DhCombat } from './combat.mjs';
 export { default as DhCombatant } from './combatant.mjs';
 

module/data/fields/_module.mjs

@@ -1,2 +1,3 @@
 export { default as FormulaField } from './formulaField.mjs';
 export { default as ForeignDocumentUUIDField } from './foreignDocumentUUIDField.mjs';
+export { default as ForeignDocumentUUIDArrayField } from "./foreignDocumentUUIDArrayField.mjs";

module/data/fields/foreignDocumentUUIDArrayField.mjs

@@ -0,0 +1,21 @@
+import ForeignDocumentUUIDField from "./foreignDocumentUUIDField.mjs";
+/**
+ * A subclass of {@link foundry.data.fields.ArrayField} that defines an array of foreign document UUID references.
+ */
+export default class ForeignDocumentUUIDArrayField extends foundry.data.fields.ArrayField {
+  /**
+   * @param {foundry.data.types.DocumentUUIDFieldOptions} [fieldOption] - Options to configure each individual ForeignDocumentUUIDField.
+   * @param {foundry.data.types.ArrayFieldOptions} [options] - Options to configure the array behavior
+   * @param {foundry.data.types.DataFieldContext} [context] -  Optional context for schema processing
+   */
+  constructor(fieldOption = {}, options = {}, context = {}) {
+    super(new ForeignDocumentUUIDField(fieldOption), options, context);
+  }
+
+  /** @inheritdoc */
+  initialize(value, model, options = {}) {
+    const v = super.initialize(value, model, options);
+    return () => v.map(entry => typeof entry === 'function' ? entry() : entry);
+  }
+
+}

module/data/fields/foreignDocumentUUIDField.mjs

@@ -31,7 +31,7 @@ export default class ForeignDocumentUUIDField extends foundry.data.fields.Docume
                 console.error(error);
                 return value ?? null;
             }
-        })();
+        });
     }
 
     /**@override */

module/data/item/base.mjs

@@ -5,7 +5,6 @@
  * @property {string} type - The system type that this data model represents.
  * @property {boolean} hasDescription - Indicates whether items of this type have description field
  * @property {boolean} isQuantifiable - Indicates whether items of this type have quantity field
- * @property {Record<string,string>} embedded - Record of document names of pseudo-documents and the path to the collection
  */
 
 const fields = foundry.data.fields;
@@ -18,7 +17,6 @@ export default class BaseDataItem extends foundry.abstract.TypeDataModel {
       type: "base",
       hasDescription: false,
       isQuantifiable: false,
-      embedded: {},
     };
   }
 

module/data/item/class.mjs

@@ -1,5 +1,6 @@
 import BaseDataItem from './base.mjs';
 import ForeignDocumentUUIDField from '../fields/foreignDocumentUUIDField.mjs';
+import ForeignDocumentUUIDArrayField from '../fields/foreignDocumentUUIDArrayField.mjs';
 import ActionField from '../fields/actionField.mjs';
 
 export default class DHClass extends BaseDataItem {
@@ -18,23 +19,16 @@ export default class DHClass extends BaseDataItem {
         return {
             ...super.defineSchema(),
             domains: new fields.ArrayField(new fields.StringField(), { max: 2 }),
-            classItems: new fields.ArrayField(new ForeignDocumentUUIDField({ type: 'Item' })),
+            classItems: new ForeignDocumentUUIDArrayField({type: 'Item', required: false}),
+
             evasion: new fields.NumberField({ initial: 0, integer: true }),
             hopeFeatures: new foundry.data.fields.ArrayField(new ActionField()),
             classFeatures: new foundry.data.fields.ArrayField(new ActionField()),
-            subclasses: new fields.ArrayField(
+            subclasses: new ForeignDocumentUUIDArrayField({type: 'Item', required: false}),
-                new ForeignDocumentUUIDField({ type: 'Item', required: false, nullable: true, initial: undefined })
-            ),
             inventory: new fields.SchemaField({
-                take: new fields.ArrayField(
+                take: new ForeignDocumentUUIDArrayField({type: 'Item', required: false}),
-                    new ForeignDocumentUUIDField({ type: 'Item', required: false, nullable: true, initial: undefined })
+                choiceA: new ForeignDocumentUUIDArrayField({type: 'Item', required: false}),
-                ),
+                choiceB: new ForeignDocumentUUIDArrayField({type: 'Item', required: false}),
-                choiceA: new fields.ArrayField(
-                    new ForeignDocumentUUIDField({ type: 'Item', required: false, nullable: true, initial: undefined })
-                ),
-                choiceB: new fields.ArrayField(
-                    new ForeignDocumentUUIDField({ type: 'Item', required: false, nullable: true, initial: undefined })
-                )
             }),
             characterGuide: new fields.SchemaField({
                 suggestedTraits: new fields.SchemaField({

module/data/item/subclass.mjs

@@ -1,11 +1,11 @@
 import ActionField from '../fields/actionField.mjs';
-import ForeignDocumentUUIDField from '../fields/foreignDocumentUUIDField.mjs';
+import ForeignDocumentUUIDArrayField from '../fields/foreignDocumentUUIDArrayField.mjs';
 import BaseDataItem from './base.mjs';
 
 const featureSchema = () => {
     return new foundry.data.fields.SchemaField({
         name: new foundry.data.fields.StringField({ required: true }),
-        effects: new foundry.data.fields.ArrayField(new ForeignDocumentUUIDField({ type: 'ActiveEffect' })),
+        effects: new ForeignDocumentUUIDArrayField({type: 'Item', required: false}),
         actions: new foundry.data.fields.ArrayField(new ActionField())
     });
 };