@getodk/xforms-engine 0.10.0 → 0.11.0

package/dist/index.js

@@ -424,37 +424,17 @@ const formResourceMetadata = (resource) => {
       rawData: null
     };
   }
-  return {
-    description: "Raw string data",
-    rawData: resource
-  };
+  return;
 };
 class LoadFormFailureError extends AggregateError {
   constructor(resource, errors) {
-    const { description, rawData } = formResourceMetadata(resource);
-    const messageLines = [
-      `Failed to load form resource: ${description}`,
-      "\n",
-      ...errors.map((error) => {
-        const aggregatedMessage = error.message;
-        if (aggregatedMessage == null) {
-          return "- Unknown error";
-        }
-        return `- ${aggregatedMessage}`;
-      })
-    ];
-    if (rawData != null) {
-      messageLines.push("\n- - -\n", "Raw resource data:", rawData);
-    }
-    const message = messageLines.join("\n");
+    const metadata = formResourceMetadata(resource);
+    const errorMessages = errors.map((error) => error.message || "Unknown error").join("\n");
+    const message = metadata?.description ? `Form source: ${metadata.description}
+${errorMessages}` : errorMessages;
     super(errors, message);
     const [head, ...tail] = errors;
-    if (head != null && tail.length === 0) {
-      const { stack } = head;
-      if (typeof stack === "string") {
-        this.stack = stack;
-      }
-    }
+    this.stack = typeof head?.stack === "string" && !tail.length ? head.stack : "No error trace available.";
   }
 }
 
@@ -27484,7 +27464,8 @@ const getWrappedInstanceRootElement = (xml) => {
   return root;
 };
 const parseInstanceXML = (model, instanceXML) => {
-  const wrappedXML = wrapInstanceXML(model, instanceXML);
+  const cleanedXML = instanceXML.replace(/<\?xml\s+[^?]*\?>\s*/, "");
+  const wrappedXML = wrapInstanceXML(model, cleanedXML);
   const root = getWrappedInstanceRootElement(wrappedXML);
   return parseStaticDocumentFromDOMSubtree(root);
 };