@getodk/web-forms 0.20.0 → 0.21.0

package/dist/{MapBlock-E_zDeVjl.js → MapBlock-hHsfEFNE.js}

@@ -1,5 +1,5 @@
 import { defineComponent as Wn, ref as Me, computed as yt, watch as Tt, createBlock as it, openBlock as te, Transition as qu, withCtx as We, createElementBlock as _e, createCommentVNode as Ee, createElementVNode as N, normalizeClass as On, withDirectives as Ws, vModelText as Vs, createVNode as he, unref as Q, shallowRef as lt, toDisplayString as St, Fragment as ih, renderList as Ju, inject as Qu, onMounted as ed, onUnmounted as td, nextTick as nd, createTextVNode as id } from "vue";
-import { i as sd, a as Nl, b as rd, I as Be, t as xa, _ as Li, s as sh, c as Gt, S as ve, g as od, M as ad, d as ld, e as cd, f as hd, h as ud, p as dd, Q as fd, j as gd } from "./index-DKdvMAPh.js";
+import { i as sd, a as Nl, b as rd, I as Be, t as xa, _ as Li, s as sh, c as Gt, S as ve, g as od, M as ad, d as ld, e as cd, f as hd, h as ud, p as dd, Q as fd, j as gd } from "./index-DVK30Gxb.js";
 function rh(...i) {
   console.warn(...i);
 }
@@ -957,7 +957,7 @@ const ef = {
       _: 1
     }));
   }
-}), gf = /* @__PURE__ */ Li(ff, [["__scopeId", "data-v-f84ef48d"]]), _f = { key: 0 }, mf = { key: 1 }, pf = { key: 0 }, yf = { key: 1 }, xf = /* @__PURE__ */ Wn({
+}), gf = /* @__PURE__ */ Li(ff, [["__scopeId", "data-v-61c2293c"]]), _f = { key: 0 }, mf = { key: 1 }, pf = { key: 0 }, yf = { key: 1 }, xf = /* @__PURE__ */ Wn({
   __name: "MapConfirmDialog",
   props: {
     singleFeatureType: {},
@@ -30050,7 +30050,7 @@ const Yy = {
       })) : Ee("", !0)
     ], 2));
   }
-}), sx = /* @__PURE__ */ Li(ix, [["__scopeId", "data-v-50941833"]]), rx = { class: "dialog-field-container" }, ox = {
+}), sx = /* @__PURE__ */ Li(ix, [["__scopeId", "data-v-f68b8530"]]), rx = { class: "dialog-field-container" }, ox = {
   key: 0,
   class: "coords-error-message"
 }, ax = { class: "dialog-field-container" }, lx = {
@@ -30195,7 +30195,7 @@ const Yy = {
       _: 1
     }, 8, ["visible"]));
   }
-}), dx = /* @__PURE__ */ Li(ux, [["__scopeId", "data-v-2954fde8"]]), fx = { class: "map-block-component" }, gx = {
+}), dx = /* @__PURE__ */ Li(ux, [["__scopeId", "data-v-2b003337"]]), fx = { class: "map-block-component" }, gx = {
   key: 1,
   class: "map-overlay get-location-overlay"
 }, _x = { key: 0 }, mx = { key: 1 }, px = { class: "error-message" }, yx = /* @__PURE__ */ Wn({

package/dist/{index-DKdvMAPh.js → index-DVK30Gxb.js}

@@ -538,6 +538,10 @@ const odkThemePreset = t$G(Qr$1, {
       }
     },
     dialog: {
+      root: {
+        background: "var(--odk-base-background-color)",
+        borderRadius: "var(--odk-radius)"
+      },
       colorScheme: {
         light: {
           root: {
@@ -20197,26 +20201,12 @@ class Geotrace extends Geolocation {
     return nA.some((rA) => !rA.length) ? "" : nA.join(SEGMENT_SEPARATOR);
   }
 }
-class ValueTypeInvariantError extends ErrorProductionDesignPendingError {
-  constructor(tA, AA) {
-    super(`(${tA}) ${AA}`), this.valueType = tA;
-  }
-}
 const INT_BOUNDS = {
   MIN: -2147483648n,
   MAX: 2147483647n
-}, assertIntBounds = (eA) => {
-  if (eA == null)
-    return eA;
-  if (eA < INT_BOUNDS.MIN || eA > INT_BOUNDS.MAX)
-    throw new ValueTypeInvariantError(
-      "int",
-      `Unable to decode int value from ${String(eA)}: expected value to be between ${INT_BOUNDS.MIN} and ${INT_BOUNDS.MAX} (inclusive)`
-    );
-  return eA;
-}, boundedInt = (eA) => {
+}, assertIntBounds = (eA) => eA == null ? eA : eA < INT_BOUNDS.MIN || eA > INT_BOUNDS.MAX ? null : eA, boundedInt = (eA) => {
   const tA = BigInt(eA);
-  return assertIntBounds(tA), tA;
+  return assertIntBounds(tA);
 }, numberToInt = (eA) => Number.isFinite(eA) ? boundedInt(Math.trunc(eA)) : null, encodeInt = (eA) => {
   let tA;
   switch (typeof eA) {
@@ -20270,8 +20260,8 @@ const validateTimeString = (eA) => {
       return parseZonedDateTimeToString(tA);
     }
     return eA instanceof Xn$1.PlainTime ? eA.toString() : eA instanceof Xn$1.PlainDateTime ? eA.toPlainTime().toString() : eA instanceof Xn$1.ZonedDateTime ? parseZonedDateTimeToString(eA) : validateTimeString(eA) ?? "";
-  } catch (tA) {
-    return console.warn("Error parsing time value:", tA), "";
+  } catch {
+    return "";
   }
 };
 class TimeValueCodec extends ValueCodec {
@@ -20545,7 +20535,7 @@ class XFormDefinition {
   body;
   model;
 }
-const JR_RESOURCE_URL_PROTOCOL = "jr:", ALL_RESOURCE_TYPES = ["image", "audio", "video"], isResourceType = (eA) => ALL_RESOURCE_TYPES.includes(eA);
+const JR_RESOURCE_URL_PROTOCOL = "jr:", LAST_SAVED_INSTANCE_ID = "jr://instance/last-saved", ALL_RESOURCE_TYPES = ["image", "audio", "video"], isResourceType = (eA) => ALL_RESOURCE_TYPES.includes(eA);
 class JRResourceURL extends URL {
   static create(tA, AA) {
     return new this(`jr://${tA}/${AA}`);
@@ -20559,6 +20549,9 @@ class JRResourceURL extends URL {
   constructor(tA) {
     super(tA);
   }
+  isLastSavedInstance() {
+    return this.href === LAST_SAVED_INSTANCE_ID;
+  }
 }
 const assertSecondaryInstanceDefinition = ({ root: eA }) => {
   if (eA.getAttributeValue("id") == null)
@@ -21379,7 +21372,10 @@ class SecondaryInstancesDefinition extends Map {
           throw new ErrorProductionDesignPendingError(
             `Unexpected external secondary instance src attribute: ${aA}`
           );
-        const lA = JRResourceURL.from(aA), sA = await ExternalSecondaryInstanceResource.load(
+        const lA = JRResourceURL.from(aA);
+        if (lA.isLastSavedInstance())
+          return new BlankSecondaryInstanceSource(iA, lA, oA);
+        const sA = await ExternalSecondaryInstanceResource.load(
           iA,
           lA,
           AA
@@ -23018,6 +23014,12 @@ class DescendantNode extends InstanceNode {
   };
   isSelfRelevant;
   isRelevant = () => this.hasNonRelevantAncestor() ? !1 : this.isSelfRelevant();
+  hasRelevantBodyNodes = () => {
+    if (!this.isSelfRelevant())
+      return !1;
+    const tA = this.getChildren();
+    return tA?.length ? tA.filter((AA) => AA.nodeType !== "model-value").some((AA) => AA.getChildren()?.length ? AA.hasRelevantBodyNodes() : AA.isSelfRelevant()) : !1;
+  };
   isRequired;
   // XFormsXPathPrimaryInstanceDescendantNode
   /**
@@ -26132,7 +26134,7 @@ class Html extends MarkdownNode {
     super(), this.unsafeHtml = tA;
   }
 }
-const STYLE_PROPERTY_REGEX = /style\s*=\s*(?:'|")(.+)(?:'|")/i, HTML_TAG_MAP = {
+const LEADING_WHITESPACE_REGEX = /^\s+/, STYLE_PROPERTY_REGEX = /style\s*=\s*(?:'|")(.+)(?:'|")/i, HTML_TAG_MAP = {
   span: Span,
   div: Div,
   p: Paragraph,
@@ -26219,7 +26221,7 @@ function mdastToOdkMarkdown(eA) {
 }
 function escapeEditableChunks(eA) {
   return eA.map((tA, AA) => {
-    const nA = tA.asString;
+    const nA = tA.asString.replace(LEADING_WHITESPACE_REGEX, " ");
     if (nA && tA.source === "output") {
       const rA = `--ODK-OUTPUT-STRING-${AA}--`;
       return outputStrings.set(rA, nA), "`" + rA + "`";
@@ -26227,9 +26229,12 @@ function escapeEditableChunks(eA) {
     return nA ?? "";
   }).join("");
 }
+function isSingleOrderedList(eA) {
+  return eA.length === 1 && eA[0]?.role === "parent" && eA[0]?.elementName === "ol" && eA[0].children.length === 1;
+}
 function toOdkMarkdown(eA) {
   const tA = fromMarkdown(eA), AA = mdastToOdkMarkdown(tA.children);
-  return AA.length === 1 && AA[0]?.role === "parent" && AA[0]?.elementName === "p" ? AA[0].children : AA;
+  return isSingleOrderedList(AA) ? [new ChildMarkdownNode(eA)] : AA.length === 1 && AA[0]?.role === "parent" && AA[0]?.elementName === "p" ? AA[0].children : AA;
 }
 function format(eA) {
   const tA = escapeEditableChunks(eA), AA = toOdkMarkdown(tA);
@@ -26332,6 +26337,7 @@ class Group extends DescendantNode {
         label: createNodeLabel(this, nA),
         hint: null,
         children: rA.childIds,
+        hasRelevantBodyNodes: this.hasRelevantBodyNodes,
         attributes: this.attributeState.getAttributes,
         valueOptions: null,
         value: null
@@ -26657,14 +26663,10 @@ class RangeCodec extends ValueCodec {
   constructor(tA, AA) {
     const { valueType: nA, bounds: rA } = AA, { min: oA, max: iA } = rA, aA = (uA) => uA == null ? uA : typeof uA == "string" ? tA.decodeValue(uA) : uA, lA = (uA) => {
       const gA = aA(uA);
-      if (gA != null && (gA < oA || gA > iA))
-        throw new ValueTypeInvariantError(
-          nA,
-          `Expected value to be within bounds [${oA}, ${iA}]. Got: ${uA}`
-        );
-    }, sA = (uA) => (lA(uA), tA.encodeValue(uA)), cA = (uA) => {
+      return gA != null && gA >= oA && gA <= iA;
+    }, sA = (uA) => tA.encodeValue(lA(uA) ? uA : null), cA = (uA) => {
       const gA = tA.decodeValue(uA);
-      return lA(uA), gA;
+      return lA(gA) ? gA : null;
     };
     super(nA, sA, cA);
   }
@@ -26946,6 +26948,7 @@ class RepeatInstance extends DescendantNode {
         hint: null,
         attributes: this.attributeState.getAttributes,
         children: cA.childIds,
+        hasRelevantBodyNodes: this.hasRelevantBodyNodes,
         valueOptions: null,
         value: null
       },
@@ -27050,6 +27053,7 @@ class BaseRepeatRange extends DescendantNode {
         label: createNodeLabel(this, AA),
         hint: null,
         children: rA.childIds,
+        hasRelevantBodyNodes: this.hasRelevantBodyNodes,
         attributes: oA.getAttributes,
         valueOptions: null,
         value: null
@@ -27351,15 +27355,7 @@ const TRIGGER_INSTANCE_VALUES = {
     default:
       throw new UnreachableError$1(eA);
   }
-}, decodeTriggerValue = (eA) => {
-  if (eA === "OK")
-    return !0;
-  if (eA === "")
-    return !1;
-  if (eA.toLowerCase() === "ok")
-    return console.warn("Treating trigger value as case-insensitive:", eA), !0;
-  throw new ErrorProductionDesignPendingError(`Unexpected trigger value: ${eA}`);
-};
+}, decodeTriggerValue = (eA) => eA.toLowerCase() === "ok";
 class TriggerCodec extends ValueCodec {
   constructor() {
     super("string", encodeTriggerValue, decodeTriggerValue);
@@ -27797,6 +27793,7 @@ class Root extends DescendantNode {
         valueOptions: null,
         value: null,
         children: aA.childIds,
+        hasRelevantBodyNodes: this.hasRelevantBodyNodes,
         attributes: this.attributeState.getAttributes
       },
       this.instanceConfig
@@ -27836,6 +27833,7 @@ class PrimaryInstance extends InstanceNode {
   isReadonly = () => !1;
   hasNonRelevantAncestor = () => !1;
   isRelevant = () => !0;
+  hasRelevantBodyNodes = () => this.root.hasRelevantBodyNodes();
   geolocationProvider;
   // TranslationContext (support)
   setActiveLanguage;
@@ -31645,6 +31643,7 @@ const DOM_PURIFY_SETTINGS = {
   ALLOWED_TAGS: [
     "b",
     "br",
+    "div",
     "em",
     "i",
     "li",
@@ -32643,7 +32642,8 @@ const _hoisted_1$E = { key: 2 }, _hoisted_2$j = { key: 3 }, _hoisted_3$e = {
     const tA = eA, AA = computed(() => !!tA.node.currentState.children.find(
       (nA) => nA.nodeType === "select" && (nA.appearances.label || nA.appearances["list-nolabel"] || nA.appearances.list)
     ));
-    return (nA, rA) => (openBlock(), createBlock(FormPanel, {
+    return (nA, rA) => eA.node.currentState.hasRelevantBodyNodes ? (openBlock(), createBlock(FormPanel, {
+      key: 0,
       "title-formatted": eA.node.currentState.label?.formatted,
       "no-ui": !eA.node.currentState.label
     }, {
@@ -32657,9 +32657,9 @@ const _hoisted_1$E = { key: 2 }, _hoisted_2$j = { key: 3 }, _hoisted_3$e = {
         ], 2)
       ]),
       _: 1
-    }, 8, ["title-formatted", "no-ui"]));
+    }, 8, ["title-formatted", "no-ui"])) : createCommentVNode("", !0);
   }
-}), FormGroup = /* @__PURE__ */ _export_sfc(_sfc_main$M, [["__scopeId", "data-v-08d63395"]]), QUESTION_HAS_ERROR = /* @__PURE__ */ Symbol("formQuestionHasError"), SUBMIT_PRESSED = /* @__PURE__ */ Symbol("formSubmitPressed"), IS_FORM_EDIT_MODE = /* @__PURE__ */ Symbol("isFormEditMode"), FORM_OPTIONS = /* @__PURE__ */ Symbol("formOptions"), FORM_MEDIA_CACHE = /* @__PURE__ */ Symbol("formMediaAttachmentCache"), MODES = {
+}), FormGroup = /* @__PURE__ */ _export_sfc(_sfc_main$M, [["__scopeId", "data-v-d8e7700b"]]), QUESTION_HAS_ERROR = /* @__PURE__ */ Symbol("formQuestionHasError"), SUBMIT_PRESSED = /* @__PURE__ */ Symbol("formSubmitPressed"), IS_FORM_EDIT_MODE = /* @__PURE__ */ Symbol("isFormEditMode"), FORM_OPTIONS = /* @__PURE__ */ Symbol("formOptions"), FORM_MEDIA_CACHE = /* @__PURE__ */ Symbol("formMediaAttachmentCache"), MODES = {
   SELECT: "select",
   // Used in Select one from map question type
   LOCATION: "location",
@@ -33577,7 +33577,7 @@ const _hoisted_1$s = { class: "geo-dialog-header" }, _hoisted_2$f = { class: "ge
     }), sA = async () => {
       iA.value = rA.LOADING;
       try {
-        oA.value = (await import("./MapBlock-E_zDeVjl.js")).default, iA.value = rA.READY;
+        oA.value = (await import("./MapBlock-hHsfEFNE.js")).default, iA.value = rA.READY;
       } catch {
         iA.value = rA.ERROR;
       }
@@ -39215,7 +39215,7 @@ const MULTILINE_APPEARANCE_ROW_SIZE = 4, _sfc_main$r = /* @__PURE__ */ defineCom
       }, null, 8, ["message"])
     ], 64));
   }
-}), InputControl = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["__scopeId", "data-v-e1bc7014"]]);
+}), InputControl = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["__scopeId", "data-v-97842909"]]);
 class UnreachableError extends Error {
   constructor(tA, AA) {
     let nA = `Unreachable value: ${JSON.stringify(tA)}`;
@@ -41499,7 +41499,7 @@ const ft = [
       }, null, 8, ["message"])
     ], 64));
   }
-}), RankControl = /* @__PURE__ */ _export_sfc(_sfc_main$m, [["__scopeId", "data-v-9af308f8"]]), _sfc_main$l = /* @__PURE__ */ defineComponent({
+}), RankControl = /* @__PURE__ */ _export_sfc(_sfc_main$m, [["__scopeId", "data-v-d99b4e55"]]), _sfc_main$l = /* @__PURE__ */ defineComponent({
   __name: "ColumnarAppearance",
   props: {
     appearances: {}
@@ -44546,7 +44546,7 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
       ])
     ], 64));
   }
-}), TriggerControl = /* @__PURE__ */ _export_sfc(_sfc_main$9, [["__scopeId", "data-v-f0e8e0a4"]]), _sfc_main$8 = /* @__PURE__ */ defineComponent({
+}), TriggerControl = /* @__PURE__ */ _export_sfc(_sfc_main$9, [["__scopeId", "data-v-ee4ae996"]]), _sfc_main$8 = /* @__PURE__ */ defineComponent({
   __name: "UploadFileControl",
   props: {
     question: {}
@@ -44756,7 +44756,8 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
           }
         ];
     });
-    return (iA, aA) => (openBlock(), createBlock(FormPanel, {
+    return (iA, aA) => eA.instance.currentState.hasRelevantBodyNodes ? (openBlock(), createBlock(FormPanel, {
+      key: 0,
       title: nA.value.literal,
       "title-formatted": nA.value.formatted,
       "menu-items": oA.value,
@@ -44767,7 +44768,7 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
         createVNode(_sfc_main$1, { nodes: rA.value }, null, 8, ["nodes"])
       ]),
       _: 1
-    }, 8, ["title", "title-formatted", "menu-items", "label-number"]));
+    }, 8, ["title", "title-formatted", "menu-items", "label-number"])) : createCommentVNode("", !0);
   }
 }), _sfc_main$2 = /* @__PURE__ */ defineComponent({
   __name: "RepeatRange",
@@ -44777,13 +44778,13 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
   setup(eA) {
     const tA = eA, AA = computed(() => tA.node.currentState.label?.formatted);
     return (nA, rA) => (openBlock(), createElementBlock(Fragment, null, [
-      (openBlock(!0), createElementBlock(Fragment, null, renderList(eA.node.currentState.children, (oA, iA) => (openBlock(), createBlock(_sfc_main$3, {
+      eA.node.currentState.hasRelevantBodyNodes ? (openBlock(!0), createElementBlock(Fragment, { key: 0 }, renderList(eA.node.currentState.children, (oA, iA) => (openBlock(), createBlock(_sfc_main$3, {
         key: iA,
         instance: oA,
         "instance-index": iA
-      }, null, 8, ["instance", "instance-index"]))), 128)),
+      }, null, 8, ["instance", "instance-index"]))), 128)) : createCommentVNode("", !0),
       eA.node.nodeType === "repeat-range:uncontrolled" ? (openBlock(), createBlock(unref(script$D), {
-        key: 0,
+        key: 1,
         outlined: "",
         severity: "contrast",
         class: "button-add-instance",
@@ -44803,7 +44804,7 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
       })) : createCommentVNode("", !0)
     ], 64));
   }
-}), RepeatRange = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-599ac2b9"]]), _sfc_main$1 = /* @__PURE__ */ defineComponent({
+}), RepeatRange = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-feb1ea4b"]]), _sfc_main$1 = /* @__PURE__ */ defineComponent({
   __name: "QuestionList",
   props: {
     nodes: {}
@@ -45013,7 +45014,7 @@ const geolocationService = GeolocationService.getInstance(), _hoisted_1 = { clas
   },
   emits: ["submit", "submitChunked"],
   setup(eA, { emit: tA }) {
-    const AA = "v0.20.0", nA = eA, rA = (yA) => {
+    const AA = "v0.21.0", nA = eA, rA = (yA) => {
       const DA = async (mA) => {
         const wA = await mA, QA = {
           form: uA,