@getodk/xforms-engine 0.15.0 → 0.16.0

package/dist/solid.js

@@ -19301,6 +19301,12 @@ class XFormDOM {
         contextNode: model
       }
     );
+    const setValues = evaluator.evaluateNodes(
+      "./xf:setvalue[@event]",
+      {
+        contextNode: model
+      }
+    );
     const instances = evaluator.evaluateNodes("./xf:instance", {
       contextNode: model
     });
@@ -19336,6 +19342,7 @@ class XFormDOM {
     this.title = title;
     this.model = model;
     this.binds = binds;
+    this.setValues = setValues;
     this.primaryInstance = primaryInstance;
     this.primaryInstanceRoot = primaryInstanceRoot;
     this.itextTranslationElements = itextTranslationElements;
@@ -19353,6 +19360,7 @@ class XFormDOM {
   title;
   model;
   binds;
+  setValues;
   primaryInstance;
   primaryInstanceRoot;
   itextTranslationElements;
@@ -20193,6 +20201,27 @@ class ControlDefinition extends BodyElementDefinition {
   }
 }
 
+const parseToInteger = (value) => {
+  if (value === null) {
+    return null;
+  }
+  const parsed = Number(value);
+  if (typeof value !== "string" || value.trim() === "" || !Number.isInteger(parsed)) {
+    throw new Error(`Expected an integer, but got: ${value}`);
+  }
+  return parsed;
+};
+const parseToFloat = (value) => {
+  if (value === null) {
+    return null;
+  }
+  const parsed = Number(value);
+  if (typeof value !== "string" || value.trim() === "" || Number.isNaN(parsed)) {
+    throw new Error(`Expected a float, but got: ${value}`);
+  }
+  return parsed;
+};
+
 const inputAppearanceParser = new TokenListParser([
   "multiline",
   "numbers",
@@ -20226,27 +20255,6 @@ const inputAppearanceParser = new TokenListParser([
   "masked"
 ]);
 
-const parseToInteger = (value) => {
-  if (value === null) {
-    return null;
-  }
-  const parsed = Number(value);
-  if (typeof value !== "string" || value.trim() === "" || !Number.isInteger(parsed)) {
-    throw new Error(`Expected an integer, but got: ${value}`);
-  }
-  return parsed;
-};
-const parseToFloat = (value) => {
-  if (value === null) {
-    return null;
-  }
-  const parsed = Number(value);
-  if (typeof value !== "string" || value.trim() === "" || Number.isNaN(parsed)) {
-    throw new Error(`Expected a float, but got: ${value}`);
-  }
-  return parsed;
-};
-
 class InputControlDefinition extends ControlDefinition {
   static isCompatible(localName) {
     return localName === "input";
@@ -20623,8 +20631,8 @@ class GroupElementDefinition extends BodyElementDefinition {
       const childName = child.localName;
       return childName !== "label";
     });
-    this.children = this.body.getChildElementDefinitions(form, this, element, childElements);
     this.reference = parseNodesetReference(parent, element, "ref");
+    this.children = this.body.getChildElementDefinitions(form, this, element, childElements);
     this.appearances = structureElementAppearanceParser.parseFrom(element, "appearance");
     this.label = LabelDefinition.forGroup(form, this);
   }
@@ -21230,6 +21238,105 @@ class ItextTranslationsDefinition extends Map {
   }
 }
 
+class ActionComputationExpression extends DependentExpression {
+  constructor(resultType, expression) {
+    super(resultType, expression);
+  }
+}
+
+const XFORM_EVENT = {
+  odkInstanceLoad: "odk-instance-load",
+  odkInstanceFirstLoad: "odk-instance-first-load",
+  odkNewRepeat: "odk-new-repeat",
+  xformsRevalidate: "xforms-revalidate",
+  xformsValueChanged: "xforms-value-changed"
+};
+
+class ActionDefinition {
+  constructor(model, element, source) {
+    this.element = element;
+    const ref = ActionDefinition.getRef(model, element);
+    if (!ref) {
+      throw new Error(
+        'Invalid setvalue element - you must define either "ref" or "bind" attribute'
+      );
+    }
+    this.ref = ref;
+    this.events = ActionDefinition.getEvents(element);
+    const value = ActionDefinition.getValue(element);
+    this.computation = new ActionComputationExpression("string", value);
+    this.source = source;
+  }
+  static getRef(model, setValueElement) {
+    if (setValueElement.hasAttribute("ref")) {
+      return setValueElement.getAttribute("ref") ?? null;
+    }
+    if (setValueElement.hasAttribute("bind")) {
+      const bindId = setValueElement.getAttribute("bind");
+      const bindDefinition = Array.from(model.binds.values()).find((definition) => {
+        return definition.bindElement.getAttribute("id") === bindId;
+      });
+      return bindDefinition?.nodeset ?? null;
+    }
+    return null;
+  }
+  static getValue(element) {
+    if (element.hasAttribute("value")) {
+      return element.getAttribute("value") || "''";
+    }
+    if (element.firstChild && isTextNode(element.firstChild)) {
+      return `'${element.firstChild.nodeValue}'`;
+    }
+    return "''";
+  }
+  static isKnownEvent = (event) => {
+    return Object.values(XFORM_EVENT).includes(event);
+  };
+  static getEvents(element) {
+    const events = element.getAttribute("event")?.split(" ") ?? [];
+    const unknownEvents = events.filter((event) => !this.isKnownEvent(event));
+    if (unknownEvents.length) {
+      throw new Error(
+        `An action was registered for unsupported events: ${unknownEvents.join(", ")}`
+      );
+    }
+    return events;
+  }
+  ref;
+  events;
+  computation;
+  source;
+}
+
+const REPEAT_REGEX = /(\[[^\]]*\])/gm;
+class ModelActionMap extends Map {
+  static fromModel(model) {
+    return new this(model);
+  }
+  static getKey(ref) {
+    return ref.replace(REPEAT_REGEX, "");
+  }
+  constructor(model) {
+    super(
+      model.form.xformDOM.setValues.map((setValueElement) => {
+        const action = new ActionDefinition(model, setValueElement);
+        if (action.events.includes(XFORM_EVENT.odkNewRepeat)) {
+          throw new Error('Model contains "setvalue" element with "odk-new-repeat" event');
+        }
+        const key = ModelActionMap.getKey(action.ref);
+        return [key, action];
+      })
+    );
+  }
+  get(ref) {
+    return super.get(ModelActionMap.getKey(ref));
+  }
+  add(action) {
+    const key = ModelActionMap.getKey(action.ref);
+    this.set(key, action);
+  }
+}
+
 const defaultBindComputationExpressions = {
   calculate: null,
   constraint: "true()",
@@ -21295,6 +21402,7 @@ class MessageDefinition extends TextRangeDefinition {
   chunks;
 }
 
+const PRELOAD_UID_EXPRESSION = 'concat("uuid:", uuid())';
 const getPreloadInput = (bindElement) => {
   const type = bindElement.getAttributeNS(JAVAROSA_NAMESPACE_URI$1, "preload");
   if (type == null) {
@@ -21319,9 +21427,38 @@ class BindPreloadDefinition {
   }
   type;
   parameter;
+  event;
+  getValue(context) {
+    if (this.type === "uid") {
+      return context.evaluator.evaluateString(PRELOAD_UID_EXPRESSION);
+    }
+    if (this.type === "timestamp") {
+      return context.evaluator.evaluateString("now()");
+    }
+    if (this.type === "date") {
+      return context.evaluator.evaluateString("today()");
+    }
+    if (this.type === "property") {
+      const properties = context.instanceConfig.preloadProperties;
+      if (this.parameter === "deviceid") {
+        return properties.deviceID;
+      }
+      if (this.parameter === "email") {
+        return properties.email;
+      }
+      if (this.parameter === "phonenumber") {
+        return properties.phoneNumber;
+      }
+      if (this.parameter === "username") {
+        return properties.username;
+      }
+    }
+    return;
+  }
   constructor(input) {
     this.type = input.type;
     this.parameter = input.parameter;
+    this.event = this.type === "timestamp" && this.parameter === "end" ? XFORM_EVENT.xformsRevalidate : XFORM_EVENT.odkInstanceFirstLoad;
   }
 }
 
@@ -21468,10 +21605,7 @@ class BindDefinition extends DependencyContext {
   // TODO: it is unclear whether this will need to be supported.
   // https://github.com/getodk/collect/issues/3758 mentions deprecation.
   saveIncomplete;
-  // TODO: these are deferred until prioritized
-  // readonly preload: string | null;
-  // readonly preloadParams: string | null;
-  // readonly 'max-pixels': string | null;
+  // TODO: deferred until prioritized: readonly 'max-pixels': string | null;
   _parentBind;
   get parentBind() {
     let bind = this._parentBind;
@@ -21637,8 +21771,14 @@ const serializeParentElementXML = (qualifiedName, children, attributes, namespac
     namespaceDeclarations
   );
 };
-const serializeLeafElementXML = (qualifiedName, xmlValue, namespaceDeclarations) => {
-  return serializeElementXML(qualifiedName, xmlValue.normalize(), "", namespaceDeclarations);
+const serializeLeafElementXML = (qualifiedName, xmlValue, attributes, namespaceDeclarations) => {
+  const serializedAttributes = attributes?.map((attribute) => attribute.instanceState.instanceXML).join("") ?? "";
+  return serializeElementXML(
+    qualifiedName,
+    xmlValue.normalize(),
+    serializedAttributes,
+    namespaceDeclarations
+  );
 };
 
 class NamespaceDeclaration {
@@ -21868,11 +22008,12 @@ class NodeDefinition {
 }
 
 class AttributeDefinition extends NodeDefinition {
-  constructor(root, bind, template) {
+  constructor(model, bind, template) {
     super(bind);
+    this.model = model;
     this.template = template;
     const { value } = template;
-    this.root = root;
+    this.root = model.root;
     this.value = value;
     this.qualifiedName = template.qualifiedName;
     this.namespaceDeclarations = new NamespaceDeclarationMap(this);
@@ -21907,7 +22048,7 @@ class AttributeDefinitionMap extends Map {
     const nonNamespaceAttributes = instanceNode.attributes.filter(isNonNamespaceAttribute);
     const definitions = nonNamespaceAttributes.map((attribute) => {
       const bind = model.binds.getOrCreateBindDefinition(attribute.nodeset);
-      return new AttributeDefinition(model.root, bind, attribute);
+      return new AttributeDefinition(model, bind, attribute);
     });
     return new this(definitions);
   }
@@ -21959,22 +22100,24 @@ class GroupDefinition extends DescendentNodeDefinition {
 }
 
 class LeafNodeDefinition extends DescendentNodeDefinition {
-  constructor(parent, bind, bodyElement, template) {
+  constructor(model, parent, bind, bodyElement, template) {
     if (bodyElement != null && bodyElement.category !== "control") {
       throw new Error(`Unexpected body element for nodeset ${bind.nodeset}`);
     }
     super(parent, bind, bodyElement);
+    this.model = model;
     this.template = template;
     this.valueType = bind.type.resolved;
     this.qualifiedName = template.qualifiedName;
     this.namespaceDeclarations = new NamespaceDeclarationMap(this);
+    this.attributes = AttributeDefinitionMap.from(model, template);
   }
   type = "leaf-node";
   valueType;
   namespaceDeclarations;
   qualifiedName;
   children = null;
-  attributes = null;
+  attributes;
   toJSON() {
     const { bind, bodyElement, parent, root, ...rest } = this;
     return rest;
@@ -21985,13 +22128,13 @@ const isNoteBindDefinition = (bind) => {
   return bind.readonly.isConstantTruthyExpression();
 };
 class NoteNodeDefinition extends LeafNodeDefinition {
-  constructor(parent, bind, bodyElement, noteTextDefinition, template) {
-    super(parent, bind, bodyElement, template);
+  constructor(model, parent, bind, bodyElement, noteTextDefinition, template) {
+    super(model, parent, bind, bodyElement, template);
     this.bind = bind;
     this.bodyElement = bodyElement;
     this.noteTextDefinition = noteTextDefinition;
   }
-  static from(parent, bind, bodyElement, node) {
+  static from(model, parent, bind, bodyElement, node) {
     if (!isNoteBindDefinition(bind) || bodyElement?.type !== "input") {
       return null;
     }
@@ -22000,7 +22143,7 @@ class NoteNodeDefinition extends LeafNodeDefinition {
     if (noteTextDefinition == null) {
       return null;
     }
-    return new this(parent, bind, bodyElement, noteTextDefinition, node);
+    return new this(model, parent, bind, bodyElement, noteTextDefinition, node);
   }
 }
 
@@ -26211,15 +26354,15 @@ class RangeNodeBoundsDefinition {
   }
 }
 class RangeNodeDefinition extends LeafNodeDefinition {
-  constructor(parent, bind, bodyElement, node) {
-    super(parent, bind, bodyElement, node);
+  constructor(model, parent, bind, bodyElement, node) {
+    super(model, parent, bind, bodyElement, node);
     this.bind = bind;
     this.bodyElement = bodyElement;
     this.bounds = RangeNodeBoundsDefinition.from(bodyElement.bounds, bind);
   }
-  static from(parent, bind, bodyElement, node) {
+  static from(model, parent, bind, bodyElement, node) {
     assertRangeBindDefinition(bind);
-    return new this(parent, bind, bodyElement, node);
+    return new this(model, parent, bind, bodyElement, node);
   }
   bounds;
 }
@@ -26355,6 +26498,18 @@ class RootDefinition extends NodeDefinition {
   attributes;
   children;
   isTranslated = false;
+  mapActions(bodyElement) {
+    const source = bodyElement.reference;
+    if (!source) {
+      return;
+    }
+    for (const child of bodyElement.element.children) {
+      if (child.nodeName === "setvalue") {
+        const action = new ActionDefinition(this.model, child, source);
+        this.model.actions.add(action);
+      }
+    }
+  }
   buildSubtree(parent, node) {
     const { form, model } = this;
     const { body } = form;
@@ -26377,6 +26532,9 @@ class RootDefinition extends NodeDefinition {
       const bind = binds.getOrCreateBindDefinition(nodeset);
       const bodyElement = body.getBodyElement(nodeset);
       const [firstChild, ...restChildren] = children;
+      if (bodyElement) {
+        this.mapActions(bodyElement);
+      }
       if (bodyElement?.type === "repeat") {
         return RepeatDefinition.from(model, parent, bind, bodyElement, children);
       }
@@ -26386,9 +26544,9 @@ class RootDefinition extends NodeDefinition {
       const element = firstChild;
       if (element.isLeafElement()) {
         if (bodyElement?.type === "range") {
-          return RangeNodeDefinition.from(parent, bind, bodyElement, element);
+          return RangeNodeDefinition.from(model, parent, bind, bodyElement, element);
         }
-        return NoteNodeDefinition.from(parent, bind, bodyElement, element) ?? new LeafNodeDefinition(parent, bind, bodyElement, element);
+        return NoteNodeDefinition.from(model, parent, bind, bodyElement, element) ?? new LeafNodeDefinition(model, parent, bind, bodyElement, element);
       }
       return new GroupDefinition(model, parent, bind, bodyElement, element);
     });
@@ -26436,6 +26594,7 @@ class ModelDefinition {
     this.form = form;
     const submission = new SubmissionDefinition(form.xformDOM);
     this.binds = ModelBindMap.fromModel(this);
+    this.actions = ModelActionMap.fromModel(this);
     this.instance = parseStaticDocumentFromDOMSubtree(form.xformDOM.primaryInstanceRoot, {
       nodesetPrefix: "/"
     });
@@ -26443,13 +26602,16 @@ class ModelDefinition {
     this.nodes = nodeDefinitionMap(this.root);
     this.itextTranslations = ItextTranslationsDefinition.from(form.xformDOM);
     this.itextChunks = generateItextChunks(form.xformDOM.itextTranslationElements);
+    this.xformsRevalidateListeners = /* @__PURE__ */ new Map();
   }
   binds;
+  actions;
   root;
   nodes;
   instance;
   itextTranslations;
   itextChunks;
+  xformsRevalidateListeners;
   getNodeDefinition(nodeset) {
     const definition = this.nodes.get(nodeset);
     if (definition == null) {
@@ -26464,14 +26626,20 @@ class ModelDefinition {
     }
     return definition;
   }
-  toJSON() {
-    const { form, ...rest } = this;
-    return rest;
+  registerXformsRevalidateListener(ref, listener) {
+    this.xformsRevalidateListeners.set(ref, listener);
+  }
+  triggerXformsRevalidateListeners() {
+    this.xformsRevalidateListeners.forEach((listener) => listener());
   }
   getTranslationChunks(itextId, activeLanguage) {
     const languageMap = this.itextChunks.get(activeLanguage.language);
     return languageMap?.get(itextId) ?? [];
   }
+  toJSON() {
+    const { form, ...rest } = this;
+    return rest;
+  }
 }
 
 class XFormDefinition {
@@ -28535,6 +28703,7 @@ const chunkedInstancePayload = (validation, submissionMeta, instanceFile, attach
   };
 };
 const prepareInstancePayload = (instanceRoot, options) => {
+  instanceRoot.root.parent.model.triggerXformsRevalidateListeners();
   const validation = validateInstance(instanceRoot);
   const submissionMeta = instanceRoot.definition.submission;
   const instanceFile = new InstanceFile(instanceRoot);
@@ -28963,17 +29132,21 @@ const createComputedExpression = (context, dependentExpression, options = {}) =>
   });
 };
 
-const isInstanceFirstLoad$1 = (context) => {
+const REPEAT_INDEX_REGEX = /([^[]*)(\[[0-9]+\])/g;
+const isInstanceFirstLoad = (context) => {
   return context.rootDocument.initializationMode === "create";
 };
-const isEditInitialLoad$1 = (context) => {
+const isAddingRepeatChild = (context) => {
+  return context.rootDocument.isAttached();
+};
+const isEditInitialLoad = (context) => {
   return context.rootDocument.initializationMode === "edit";
 };
-const getInitialValue$1 = (context) => {
+const getInitialValue = (context) => {
   const sourceNode = context.instanceNode ?? context.definition.template;
   return context.decodeInstanceValue(sourceNode.value);
 };
-const createRelevantValueState$1 = (context, baseValueState) => {
+const createRelevantValueState = (context, baseValueState) => {
   return context.scope.runTask(() => {
     const [getRelevantValue, setValue] = baseValueState;
     const getValue = createMemo(() => {
@@ -28985,7 +29158,7 @@ const createRelevantValueState$1 = (context, baseValueState) => {
     return [getValue, setValue];
   });
 };
-const guardDownstreamReadonlyWrites$1 = (context, baseState) => {
+const guardDownstreamReadonlyWrites = (context, baseState) => {
   const { readonly } = context.definition.bind;
   if (readonly.isDefaultExpression) {
     return baseState;
@@ -29000,88 +29173,161 @@ const guardDownstreamReadonlyWrites$1 = (context, baseState) => {
   };
   return [getValue, setValue];
 };
-const PRELOAD_UID_EXPRESSION$1 = 'concat("uuid:", uuid())';
-const shouldPreloadUID$1 = (context) => {
-  return isInstanceFirstLoad$1(context) || isEditInitialLoad$1(context);
+const isLoading = (context) => {
+  return isInstanceFirstLoad(context) || isEditInitialLoad(context);
+};
+const setValueIfPreloadDefined = (context, setValue, preload) => {
+  const value = preload.getValue(context);
+  if (value) {
+    setValue(value);
+  }
+};
+const postloadValue = (context, setValue, preload) => {
+  const ref = context.contextReference();
+  context.definition.model.registerXformsRevalidateListener(ref, () => {
+    setValueIfPreloadDefined(context, setValue, preload);
+  });
 };
-const setPreloadUIDValue$1 = (context, valueState) => {
+const preloadValue = (context, setValue) => {
   const { preload } = context.definition.bind;
-  if (preload?.type !== "uid" || !shouldPreloadUID$1(context)) {
+  if (!preload) {
     return;
   }
-  const preloadUIDValue = context.evaluator.evaluateString(PRELOAD_UID_EXPRESSION$1, {
+  if (preload.event === XFORM_EVENT.xformsRevalidate) {
+    postloadValue(context, setValue, preload);
+    return;
+  }
+  if (isLoading(context)) {
+    setValueIfPreloadDefined(context, setValue, preload);
+  }
+};
+const referencesCurrentNode = (context, ref) => {
+  const nodes = context.evaluator.evaluateNodes(ref, {
     contextNode: context.contextNode
   });
-  const [, setValue] = valueState;
-  setValue(preloadUIDValue);
+  if (nodes.length > 1) {
+    throw new Error(
+      "You are trying to target a repeated field. Currently you may only target a field in a specific repeat instance. XPath nodeset has more than one node."
+    );
+  }
+  return nodes.includes(context.contextNode);
 };
-const createCalculation$1 = (context, setRelevantValue, calculateDefinition) => {
-  context.scope.runTask(() => {
-    const calculate = createComputedExpression(context, calculateDefinition, {
-      defaultValue: ""
-    });
-    createComputed(() => {
-      if (context.isAttached() && context.isRelevant()) {
-        const calculated = calculate();
-        const value = context.decodeInstanceValue(calculated);
-        setRelevantValue(value);
+const bindToRepeatInstance = (context, action) => {
+  let source = action.source;
+  let ref = action.ref;
+  if (source) {
+    const contextRef = context.contextReference();
+    for (const part of contextRef.matchAll(REPEAT_INDEX_REGEX)) {
+      const unbound = part[1] + "/";
+      if (source.includes(unbound)) {
+        const bound = part[0] + "/";
+        source = source.replace(unbound, bound);
+        ref = ref.replace(unbound, bound);
       }
-    });
+    }
+  }
+  return { source, ref };
+};
+const createCalculation = (context, setRelevantValue, computation) => {
+  const calculate = createComputedExpression(context, computation);
+  createComputed(() => {
+    if (context.isAttached() && context.isRelevant()) {
+      const calculated = calculate();
+      const value = context.decodeInstanceValue(calculated);
+      setRelevantValue(value);
+    }
+  });
+};
+const createValueChangedCalculation = (context, setRelevantValue, action) => {
+  const { source, ref } = bindToRepeatInstance(context, action);
+  if (!source) {
+    return;
+  }
+  let previous = "";
+  const sourceElementExpression = new ActionComputationExpression("string", source);
+  const calculateValueSource = createComputedExpression(context, sourceElementExpression);
+  createComputed(() => {
+    if (context.isAttached() && context.isRelevant()) {
+      const valueSource = calculateValueSource();
+      if (previous !== valueSource) {
+        if (referencesCurrentNode(context, ref)) {
+          const calc = context.evaluator.evaluateString(action.computation.expression, context);
+          const value = context.decodeInstanceValue(calc);
+          setRelevantValue(value);
+        }
+      }
+      previous = valueSource;
+    }
   });
 };
-const createAttributeValueState = (context) => {
+const registerAction = (context, setValue, action) => {
+  if (action.events.includes(XFORM_EVENT.odkInstanceFirstLoad)) {
+    if (isInstanceFirstLoad(context)) {
+      createCalculation(context, setValue, action.computation);
+    }
+  }
+  if (action.events.includes(XFORM_EVENT.odkInstanceLoad)) {
+    if (!isAddingRepeatChild(context)) {
+      createCalculation(context, setValue, action.computation);
+    }
+  }
+  if (action.events.includes(XFORM_EVENT.odkNewRepeat)) {
+    if (isAddingRepeatChild(context)) {
+      createCalculation(context, setValue, action.computation);
+    }
+  }
+  if (action.events.includes(XFORM_EVENT.xformsValueChanged)) {
+    createValueChangedCalculation(context, setValue, action);
+  }
+};
+const createInstanceValueState = (context) => {
   return context.scope.runTask(() => {
-    const initialValue = getInitialValue$1(context);
+    const initialValue = getInitialValue(context);
     const baseValueState = createSignal(initialValue);
-    const relevantValueState = createRelevantValueState$1(context, baseValueState);
-    setPreloadUIDValue$1(context, relevantValueState);
+    const relevantValueState = createRelevantValueState(context, baseValueState);
+    const [, setValue] = relevantValueState;
+    preloadValue(context, setValue);
     const { calculate } = context.definition.bind;
     if (calculate != null) {
-      const [, setValue] = relevantValueState;
-      createCalculation$1(context, setValue, calculate);
+      createCalculation(context, setValue, calculate);
     }
-    return guardDownstreamReadonlyWrites$1(context, relevantValueState);
+    const action = context.definition.model.actions.get(context.contextReference());
+    if (action) {
+      registerAction(context, setValue, action);
+    }
+    return guardDownstreamReadonlyWrites(context, relevantValueState);
   });
 };
 
-class Attribute extends InstanceNode {
-  constructor(parent, definition, instanceNode) {
-    const codec = getSharedValueCodec("string");
-    super(parent.instanceConfig, parent, instanceNode, definition, {
-      scope: parent.scope,
-      computeReference: () => "@" + this.definition.qualifiedName.getPrefixedName()
-    });
+class Attribute {
+  constructor(owner, definition, instanceNode) {
+    this.owner = owner;
+    this.definition = definition;
     this.instanceNode = instanceNode;
-    this.root = parent.root;
-    this.getActiveLanguage = parent.getActiveLanguage;
+    const codec = getSharedValueCodec("string");
+    this.contextNode = owner;
+    this.scope = owner.scope;
+    this.rootDocument = owner.rootDocument;
+    this.root = owner.root;
+    this.instanceConfig = owner.instanceConfig;
+    this.getActiveLanguage = owner.getActiveLanguage;
     this.validationState = { violations: [] };
     this.valueType = "string";
-    this.evaluator = parent.evaluator;
+    this.evaluator = owner.evaluator;
     this.decodeInstanceValue = codec.decodeInstanceValue;
-    const instanceValueState = createAttributeValueState(this);
+    const instanceValueState = createInstanceValueState(this);
     const valueState = codec.createRuntimeValueState(instanceValueState);
     const [getInstanceValue] = instanceValueState;
     const [, setValueState] = valueState;
     this.getInstanceValue = getInstanceValue;
     this.setValueState = setValueState;
-    this.getXPathValue = () => {
-      return this.getInstanceValue();
-    };
     this.valueState = valueState;
     const state = createSharedNodeState(
-      this.scope,
+      owner.scope,
       {
-        reference: this.contextReference,
-        readonly: this.isReadonly,
-        relevant: this.isRelevant,
-        required: () => false,
-        label: null,
-        hint: null,
-        children: null,
-        valueOptions: null,
         value: this.valueState,
         instanceValue: this.getInstanceValue,
-        attributes: null
+        relevant: this.owner.isRelevant
       },
       this.instanceConfig
     );
@@ -29106,23 +29352,30 @@ class Attribute extends InstanceNode {
   setValueState;
   evaluator;
   getActiveLanguage;
+  contextNode;
+  scope;
+  rootDocument;
+  instanceConfig;
   root;
   isRelevant = () => {
-    return this.parent.isRelevant();
+    return this.owner.isRelevant();
   };
   isAttached = () => {
-    return this.parent.isAttached();
+    return this.owner.isAttached();
   };
   isReadonly = () => {
     return true;
   };
   hasReadonlyAncestor = () => {
-    const { parent } = this;
-    return parent.hasReadonlyAncestor() || parent.isReadonly();
+    const { owner } = this;
+    return owner.hasReadonlyAncestor() || owner.isReadonly();
   };
   hasNonRelevantAncestor = () => {
-    const { parent } = this;
-    return parent.hasNonRelevantAncestor() || !parent.isRelevant();
+    const { owner } = this;
+    return owner.hasNonRelevantAncestor() || !owner.isRelevant();
+  };
+  contextReference = () => {
+    return this.owner.contextReference() + "/@" + this.definition.qualifiedName.getPrefixedName();
   };
   setValue(value) {
     this.setValueState(value);
@@ -29131,11 +29384,17 @@ class Attribute extends InstanceNode {
   getChildren() {
     return [];
   }
+  getXPathChildNodes() {
+    return [];
+  }
+  getXPathValue() {
+    return "";
+  }
 }
 
-function buildAttributes(parent) {
-  return Array.from(parent.definition.attributes.values()).map((attributeDefinition) => {
-    return new Attribute(parent, attributeDefinition, attributeDefinition.template);
+function buildAttributes(owner) {
+  return Array.from(owner.definition.attributes.values()).map((attributeDefinition) => {
+    return new Attribute(owner, attributeDefinition, attributeDefinition.template);
   });
 }
 
@@ -29239,11 +29498,6 @@ class DescendantNode extends InstanceNode {
             return true;
           }
         }
-        for (const attr of parent.getAttributes()) {
-          if (attr === self) {
-            return true;
-          }
-        }
         return false;
       });
     });
@@ -39633,7 +39887,6 @@ const createNodeLabel = (context, definition) => {
 
 class Group extends DescendantNode {
   childrenState;
-  attributeState;
   [XPathNodeKindKey] = "element";
   // InstanceNode
   state;
@@ -39651,7 +39904,6 @@ class Group extends DescendantNode {
     const childrenState = createChildrenState(this);
     const attributeState = createAttributeState(this.scope);
     this.childrenState = childrenState;
-    this.attributeState = attributeState;
     const state = createSharedNodeState(
       this.scope,
       {
@@ -39683,9 +39935,6 @@ class Group extends DescendantNode {
   getChildren() {
     return this.childrenState.getChildren();
   }
-  getAttributes() {
-    return this.attributeState.getAttributes();
-  }
 }
 
 const createFieldHint = (context, definition) => {
@@ -39704,92 +39953,12 @@ const createValueNodeInstanceState = (node) => {
         return "";
       }
       const xmlValue = escapeXMLText(node.currentState.instanceValue);
-      return serializeLeafElementXML(qualifiedName, xmlValue);
+      const attributes = node.currentState.attributes;
+      return serializeLeafElementXML(qualifiedName, xmlValue, attributes);
     }
   };
 };
 
-const isInstanceFirstLoad = (context) => {
-  return context.rootDocument.initializationMode === "create";
-};
-const isEditInitialLoad = (context) => {
-  return context.rootDocument.initializationMode === "edit";
-};
-const getInitialValue = (context) => {
-  const sourceNode = context.instanceNode ?? context.definition.template;
-  return context.decodeInstanceValue(sourceNode.value);
-};
-const createRelevantValueState = (context, baseValueState) => {
-  return context.scope.runTask(() => {
-    const [getRelevantValue, setValue] = baseValueState;
-    const getValue = createMemo(() => {
-      if (context.isRelevant()) {
-        return getRelevantValue();
-      }
-      return "";
-    });
-    return [getValue, setValue];
-  });
-};
-const guardDownstreamReadonlyWrites = (context, baseState) => {
-  const { readonly } = context.definition.bind;
-  if (readonly.isDefaultExpression) {
-    return baseState;
-  }
-  const [getValue, baseSetValue] = baseState;
-  const setValue = (value) => {
-    if (context.isReadonly()) {
-      const reference = untrack(() => context.contextReference());
-      throw new Error(`Cannot write to readonly field: ${reference}`);
-    }
-    return baseSetValue(value);
-  };
-  return [getValue, setValue];
-};
-const PRELOAD_UID_EXPRESSION = 'concat("uuid:", uuid())';
-const shouldPreloadUID = (context) => {
-  return isInstanceFirstLoad(context) || isEditInitialLoad(context);
-};
-const setPreloadUIDValue = (context, valueState) => {
-  const { preload } = context.definition.bind;
-  if (preload?.type !== "uid" || !shouldPreloadUID(context)) {
-    return;
-  }
-  const preloadUIDValue = context.evaluator.evaluateString(PRELOAD_UID_EXPRESSION, {
-    contextNode: context.contextNode
-  });
-  const [, setValue] = valueState;
-  setValue(preloadUIDValue);
-};
-const createCalculation = (context, setRelevantValue, calculateDefinition) => {
-  context.scope.runTask(() => {
-    const calculate = createComputedExpression(context, calculateDefinition, {
-      defaultValue: ""
-    });
-    createComputed(() => {
-      if (context.isAttached() && context.isRelevant()) {
-        const calculated = calculate();
-        const value = context.decodeInstanceValue(calculated);
-        setRelevantValue(value);
-      }
-    });
-  });
-};
-const createInstanceValueState = (context) => {
-  return context.scope.runTask(() => {
-    const initialValue = getInitialValue(context);
-    const baseValueState = createSignal(initialValue);
-    const relevantValueState = createRelevantValueState(context, baseValueState);
-    setPreloadUIDValue(context, relevantValueState);
-    const { calculate } = context.definition.bind;
-    if (calculate != null) {
-      const [, setValue] = relevantValueState;
-      createCalculation(context, setValue, calculate);
-    }
-    return guardDownstreamReadonlyWrites(context, relevantValueState);
-  });
-};
-
 const engineViolationMessage = (context, role) => {
   const messageText = VALIDATION_TEXT[role];
   const chunk = new TextChunk(context, "literal", messageText);
@@ -39979,6 +40148,7 @@ class InputControl extends ValueNode {
     super(parent, instanceNode, definition, codec);
     this.appearances = definition.bodyElement.appearances;
     this.nodeOptions = nodeOptionsFactoryByType[definition.valueType](definition.bodyElement);
+    const attributeState = createAttributeState(this.scope);
     const state = createSharedNodeState(
       this.scope,
       {
@@ -39989,13 +40159,14 @@ class InputControl extends ValueNode {
         label: createNodeLabel(this, definition),
         hint: createFieldHint(this, definition),
         children: null,
-        attributes: null,
+        attributes: attributeState.getAttributes,
         valueOptions: null,
         value: this.valueState,
         instanceValue: this.getInstanceValue
       },
       this.instanceConfig
     );
+    attributeState.setAttributes(buildAttributes(this));
     this.state = state;
     this.engineState = state.engineState;
     this.currentState = state.currentState;
@@ -40023,6 +40194,7 @@ class ModelValue extends ValueNode {
   constructor(parent, instanceNode, definition) {
     const codec = getSharedValueCodec(definition.valueType);
     super(parent, instanceNode, definition, codec);
+    const attributeState = createAttributeState(this.scope);
     const state = createSharedNodeState(
       this.scope,
       {
@@ -40033,13 +40205,14 @@ class ModelValue extends ValueNode {
         label: null,
         hint: null,
         children: null,
-        attributes: null,
+        attributes: attributeState.getAttributes,
         valueOptions: null,
         value: this.valueState,
         instanceValue: this.getInstanceValue
       },
       this.instanceConfig
     );
+    attributeState.setAttributes(buildAttributes(this));
     this.state = state;
     this.engineState = state.engineState;
     this.currentState = state.currentState;
@@ -40131,6 +40304,7 @@ class Note extends ValueNode {
     this.appearances = definition.bodyElement.appearances;
     const isReadonly = createNoteReadonlyThunk(this, definition);
     const noteTextComputation = createNoteText(this, definition.noteTextDefinition);
+    const attributeState = createAttributeState(this.scope);
     let noteText;
     let label;
     let hint;
@@ -40161,13 +40335,14 @@ class Note extends ValueNode {
         hint,
         noteText,
         children: null,
-        attributes: null,
+        attributes: attributeState.getAttributes,
         valueOptions: null,
         value: this.valueState,
         instanceValue: this.getInstanceValue
       },
       this.instanceConfig
     );
+    attributeState.setAttributes(buildAttributes(this));
     this.state = state;
     this.engineState = state.engineState;
     this.currentState = state.currentState;
@@ -40231,6 +40406,7 @@ class RangeControl extends ValueNode {
     const codec = new RangeCodec(baseCodec, definition);
     super(parent, instanceNode, definition, codec);
     this.appearances = definition.bodyElement.appearances;
+    const attributeState = createAttributeState(this.scope);
     const state = createSharedNodeState(
       this.scope,
       {
@@ -40241,13 +40417,14 @@ class RangeControl extends ValueNode {
         label: createNodeLabel(this, definition),
         hint: createFieldHint(this, definition),
         children: null,
-        attributes: null,
+        attributes: attributeState.getAttributes,
         valueOptions: null,
         value: this.valueState,
         instanceValue: this.getInstanceValue
       },
       this.instanceConfig
     );
+    attributeState.setAttributes(buildAttributes(this));
     this.state = state;
     this.engineState = state.engineState;
     this.currentState = state.currentState;
@@ -40465,6 +40642,7 @@ class RankControl extends ValueNode {
     this.mapOptionsByValue = mapOptionsByValue;
     const baseValueState = this.valueState;
     const [baseGetValue, setValue] = baseValueState;
+    const attributeState = createAttributeState(this.scope);
     const getValue = this.scope.runTask(() => {
       return createMemo(() => {
         const options = valueOptions();
@@ -40499,13 +40677,14 @@ class RankControl extends ValueNode {
         label: createNodeLabel(this, definition),
         hint: createFieldHint(this, definition),
         children: null,
-        attributes: null,
+        attributes: attributeState.getAttributes,
         valueOptions,
         value: valueState,
         instanceValue: this.getInstanceValue
       },
       this.instanceConfig
     );
+    attributeState.setAttributes(buildAttributes(this));
     this.state = state;
     this.engineState = state.engineState;
     this.currentState = state.currentState;
@@ -40594,7 +40773,6 @@ class RepeatInstance extends DescendantNode {
     const childrenState = createChildrenState(this);
     const attributeState = createAttributeState(this.scope);
     this.childrenState = childrenState;
-    this.attributeState = attributeState;
     this.currentIndex = currentIndex;
     const state = createSharedNodeState(
       this.scope,
@@ -40629,7 +40807,6 @@ class RepeatInstance extends DescendantNode {
     this.instanceState = createTemplatedNodeInstanceState(this);
   }
   childrenState;
-  attributeState;
   currentIndex;
   [XPathNodeKindKey] = "element";
   // InstanceNode
@@ -40664,9 +40841,6 @@ class RepeatInstance extends DescendantNode {
   getChildren() {
     return this.childrenState.getChildren();
   }
-  getAttributes() {
-    return this.attributeState.getAttributes();
-  }
 }
 
 class BaseRepeatRange extends DescendantNode {
@@ -41002,6 +41176,7 @@ class SelectControl extends ValueNode {
     super(parent, instanceNode, definition, codec);
     this.appearances = definition.bodyElement.appearances;
     this.selectType = definition.bodyElement.type;
+    const attributeState = createAttributeState(this.scope);
     const valueOptions = createItemCollection(this);
     const isSelectWithImages = this.scope.runTask(() => {
       return createMemo(() => valueOptions().some((item) => !!item.label.imageSource));
@@ -41038,7 +41213,7 @@ class SelectControl extends ValueNode {
         label: createNodeLabel(this, definition),
         hint: createFieldHint(this, definition),
         children: null,
-        attributes: null,
+        attributes: attributeState.getAttributes,
         valueOptions,
         value: valueState,
         instanceValue: this.getInstanceValue,
@@ -41046,6 +41221,7 @@ class SelectControl extends ValueNode {
       },
       this.instanceConfig
     );
+    attributeState.setAttributes(buildAttributes(this));
     this.state = state;
     this.engineState = state.engineState;
     this.currentState = state.currentState;
@@ -41164,6 +41340,7 @@ class TriggerControl extends ValueNode {
   constructor(parent, instanceNode, definition) {
     super(parent, instanceNode, definition, codec);
     this.appearances = definition.bodyElement.appearances;
+    const attributeState = createAttributeState(this.scope);
     const state = createSharedNodeState(
       this.scope,
       {
@@ -41174,13 +41351,14 @@ class TriggerControl extends ValueNode {
         label: createNodeLabel(this, definition),
         hint: createFieldHint(this, definition),
         children: null,
-        attributes: null,
+        attributes: attributeState.getAttributes,
         valueOptions: null,
         value: this.valueState,
         instanceValue: this.getInstanceValue
       },
       this.instanceConfig
     );
+    attributeState.setAttributes(buildAttributes(this));
     this.state = state;
     this.engineState = state.engineState;
     this.currentState = state.currentState;
@@ -41374,7 +41552,6 @@ class UploadControl extends DescendantNode {
     const instanceAttachment = createInstanceAttachment(this);
     this.instanceAttachment = instanceAttachment;
     const attributeState = createAttributeState(this.scope);
-    this.attributeState = attributeState;
     this.decodeInstanceValue = instanceAttachment.decodeInstanceValue;
     this.getXPathValue = instanceAttachment.getInstanceValue;
     const state = createSharedNodeState(
@@ -41406,7 +41583,6 @@ class UploadControl extends DescendantNode {
   }
   validation;
   instanceAttachment;
-  attributeState;
   // XFormsXPathElement
   [XPathNodeKindKey] = "element";
   getXPathValue;
@@ -41441,9 +41617,6 @@ class UploadControl extends DescendantNode {
     this.instanceAttachment.setValue(value);
     return this.root;
   }
-  getAttributes() {
-    return this.attributeState.getAttributes();
-  }
 }
 
 const META_LOCAL_NAME = "meta";
@@ -41529,7 +41702,7 @@ const buildMetaValueElement = (group, localName, value) => {
 const buildDeprecatedIDDefinition = (group, instanceNode) => {
   const nodeset = instanceNode.nodeset;
   const bind = group.model.binds.getOrCreateBindDefinition(nodeset);
-  return new LeafNodeDefinition(group.parent.definition, bind, null, instanceNode);
+  return new LeafNodeDefinition(group.model, group.parent.definition, bind, null, instanceNode);
 };
 const buildDeprecatedID = (group, value) => {
   const instanceNode = buildMetaValueElement(group, DEPRECATED_ID_LOCAL_NAME, value);
@@ -41725,7 +41898,6 @@ const buildChildren = (parent) => {
 
 class Root extends DescendantNode {
   childrenState;
-  attributeState;
   // XFormsXPathElement
   [XPathNodeKindKey] = "element";
   // DescendantNode
@@ -41759,7 +41931,6 @@ class Root extends DescendantNode {
     const childrenState = createChildrenState(this);
     const attributeState = createAttributeState(this.scope);
     this.childrenState = childrenState;
-    this.attributeState = attributeState;
     this.languages = parent.languages;
     const state = createSharedNodeState(
       this.scope,
@@ -41793,9 +41964,6 @@ class Root extends DescendantNode {
   getChildren() {
     return this.childrenState.getChildren();
   }
-  getAttributes() {
-    return this.attributeState.getAttributes();
-  }
   // RootNode
   setLanguage(language) {
     this.rootDocument.setLanguage(language);
@@ -41840,7 +42008,6 @@ class PrimaryInstance extends InstanceNode {
   isAttached;
   evaluator;
   contextNode = this;
-  attributeState;
   constructor(options) {
     const { mode, initialState, scope, model, secondaryInstances, config } = options;
     const { instance: modelInstance } = model;
@@ -41873,7 +42040,6 @@ class PrimaryInstance extends InstanceNode {
     const childrenState = createChildrenState(this);
     const attributeState = createAttributeState(this.scope);
     this.getChildren = childrenState.getChildren;
-    this.attributeState = attributeState;
     const stateSpec = {
       activeLanguage: getActiveLanguage,
       reference: PRIMARY_INSTANCE_REFERENCE,
@@ -41943,9 +42109,6 @@ class PrimaryInstance extends InstanceNode {
     });
     return Promise.resolve(result);
   }
-  getAttributes() {
-    return this.attributeState.getAttributes();
-  }
 }
 
 class FormInstance {
@@ -41954,7 +42117,8 @@ class FormInstance {
     const { mode, initialState, instanceConfig } = options;
     const config = {
       clientStateFactory: instanceConfig.stateFactory ?? identity,
-      computeAttachmentName: instanceConfig.instanceAttachments?.fileNameFactory ?? (() => null)
+      computeAttachmentName: instanceConfig.instanceAttachments?.fileNameFactory ?? (() => null),
+      preloadProperties: instanceConfig.preloadProperties ?? {}
     };
     const primaryInstanceOptions = {
       ...options.instanceOptions,