@getodk/web-forms 0.14.0 → 0.15.0

package/dist/index.js

@@ -10254,7 +10254,32 @@ const isISODateOrDateTimeLike = (eA) => ISO_DATE_OR_DATE_TIME_LIKE_PATTERN.test(
 ), nodeSet = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   itext
-}, Symbol.toStringTag, { value: "Module" })), jr$2 = new FunctionLibrary(JAVAROSA_NAMESPACE_URI, [...Object.values(nodeSet)]), booleanFromString = new BooleanFunction(
+}, Symbol.toStringTag, { value: "Module" })), choiceName = new StringFunction(
+  "choice-name",
+  [
+    { arityType: "required", typeHint: "string" },
+    { arityType: "required", typeHint: "string" }
+  ],
+  (eA, [tA, AA]) => {
+    const nA = tA.evaluate(eA).toString(), oA = AA.evaluate(eA).toString(), [rA] = eA.contextNodes, { domProvider: iA } = eA;
+    let aA;
+    rA && iA.isElement(rA) ? aA = eA.evaluator.evaluateNodes(oA, { contextNode: rA }) : aA = eA.evaluator.evaluateNodes(oA);
+    const lA = aA?.[0];
+    if (!lA)
+      return "";
+    if (!("getChoiceName" in lA))
+      throw new Error(
+        `Evaluating 'jr:choice-name' on element '${oA}' which has no possible choices.`
+      );
+    return lA.getChoiceName(nA) ?? "";
+  }
+), select$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  __proto__: null,
+  choiceName
+}, Symbol.toStringTag, { value: "Module" })), jr$2 = new FunctionLibrary(JAVAROSA_NAMESPACE_URI, [
+  ...Object.values(nodeSet),
+  ...Object.values(select$1)
+]), booleanFromString = new BooleanFunction(
   "boolean-from-string",
   [{ arityType: "required", typeHint: "string" }],
   (eA, [tA]) => {
@@ -14136,14 +14161,24 @@ var encHexExports = requireEncHex();
 const encHex = /* @__PURE__ */ getDefaultExportFromCjs(encHexExports), hex = /* @__PURE__ */ _mergeNamespaces({
   __proto__: null,
   default: encHex
-}, [encHexExports]), toStrings = (eA, tA) => tA.flatMap((AA) => {
+}, [encHexExports]), base64Decode$1 = (eA) => new TextDecoder().decode(Uint8Array.from(atob(eA), (tA) => tA.charCodeAt(0))), toStrings = (eA, tA) => tA.flatMap((AA) => {
   const nA = AA.evaluate(eA);
   switch (nA.type) {
     case "NODE":
       return [...nA].map((oA) => oA.toString());
   }
   return nA.toString();
-}), coalesce = new StringFunction(
+}), base64Decode = new StringFunction(
+  "base64-decode",
+  [{ arityType: "required", typeHint: "string" }],
+  (eA, [tA]) => {
+    try {
+      return base64Decode$1(tA.evaluate(eA).toString());
+    } catch {
+      return "";
+    }
+  }
+), coalesce = new StringFunction(
   "coalesce",
   [
     { arityType: "required", typeHint: "string" },
@@ -14207,6 +14242,18 @@ const encHex = /* @__PURE__ */ getDefaultExportFromCjs(encHexExports), hex = /*
     const nA = tA.evaluate(eA).toString();
     return toStrings(eA, AA).join(nA);
   }
+), pulldata = new StringFunction(
+  "pulldata",
+  [
+    { arityType: "required", typeHint: "string" },
+    { arityType: "required", typeHint: "string" },
+    { arityType: "required", typeHint: "string" },
+    { arityType: "required", typeHint: "string" }
+  ],
+  (eA, [tA, AA, nA, oA]) => {
+    const rA = tA.evaluate(eA).toString(), iA = AA.evaluate(eA).toString(), aA = nA.evaluate(eA).toString(), lA = oA.evaluate(eA).toString(), sA = `instance('${rA}')/root/item[${aA}='${lA}']/${iA}`;
+    return eA.evaluator.evaluateString(sA);
+  }
 ), regex = new BooleanFunction(
   "regex",
   [
@@ -14261,11 +14308,13 @@ const assertCrypto = (eA) => {
   }
 ), string = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
+  base64Decode,
   coalesce,
   concat,
   digest,
   endsWith,
   join,
+  pulldata,
   regex,
   substr,
   uuid
@@ -14720,15 +14769,21 @@ const hintLookup = new ScopedElementLookup(":scope > hint", "hint"), itemLookup
   // conceivable argument, because anything can be cast to a string in XPath
   // semantics.
   ANY_ARGUMENT_TYPE
-]), isTranslationExpression = (eA) => {
+]), findFunctionPrincipalExpressionNode = (eA) => {
   let tA;
   try {
     tA = expressionParser.parse(eA);
   } catch {
-    return !1;
+    return null;
   }
   const AA = findTypedPrincipalExpressionNode(["function_call"], tA.rootNode);
-  return AA == null ? !1 : isTranslationFunctionCall(AA);
+  return AA ?? null;
+}, getTranslationExpression = (eA) => {
+  const tA = findFunctionPrincipalExpressionNode(eA);
+  if (!tA || !isTranslationFunctionCall(tA))
+    return null;
+  const AA = tA.children.find((nA) => nA.type === "argument");
+  return AA ? AA.text : null;
 }, isCurrentFunctionCall = (eA) => isCallToLocalNamedFunction(eA, "current") && hasCallSignature(eA, []), isCurrentPath = (eA) => {
   const [tA] = eA.children, [AA] = tA.children;
   return AA.type === "function_call" && isCurrentFunctionCall(AA);
@@ -14803,14 +14858,8 @@ const hintLookup = new ScopedElementLookup(":scope > hint", "hint"), itemLookup
   string: "evaluateString"
 };
 class DependentExpression {
-  constructor(tA, AA, nA, oA = {}) {
-    this.resultType = AA, this.expression = nA, AA === "boolean" && isConstantTruthyExpression(nA) ? (this.constantTruthyExpression = nA, this.constantExpression = nA) : isConstantExpression(nA) ? (this.constantTruthyExpression = null, this.constantExpression = nA) : (this.constantTruthyExpression = null, this.constantExpression = null), this.evaluatorMethod = evaluatorMethodsByResultType[AA];
-    const {
-      semanticDependencies: rA = {
-        translations: !1
-      }
-    } = oA;
-    rA.translations && isTranslationExpression(nA) && (this.isTranslated = !0, tA.isTranslated = !0);
+  constructor(tA, AA) {
+    this.resultType = tA, this.expression = AA, tA === "boolean" && isConstantTruthyExpression(AA) ? (this.constantTruthyExpression = AA, this.constantExpression = AA) : isConstantExpression(AA) ? (this.constantTruthyExpression = null, this.constantExpression = AA) : (this.constantTruthyExpression = null, this.constantExpression = null), this.evaluatorMethod = evaluatorMethodsByResultType[tA];
   }
   isTranslated = !1;
   evaluatorMethod;
@@ -14831,27 +14880,25 @@ class TextChunkExpression extends DependentExpression {
   source;
   // Set for the literal source, blank otherwise
   stringValue;
-  constructor(tA, AA, nA, oA, rA = {}, iA = "") {
-    super(tA, AA, nA, {
-      semanticDependencies: {
-        translations: rA.isTranslated
-      },
-      ignoreContextReference: !0
-    }), this.source = oA, this.stringValue = iA;
+  resourceType;
+  constructor(tA, AA, nA, oA = "", rA = {}) {
+    super(tA, AA), this.resourceType = rA.type ?? null, this.source = nA, this.stringValue = oA;
   }
-  static fromLiteral(tA, AA) {
-    return new TextChunkExpression(tA, "string", "null", "literal", {}, AA);
+  static fromLiteral(tA) {
+    return new TextChunkExpression("string", "null", "literal", tA);
   }
-  static fromReference(tA, AA) {
-    return new TextChunkExpression(tA, "string", AA, "reference");
+  static fromReference(tA) {
+    return new TextChunkExpression("string", tA, "reference");
   }
-  static fromOutput(tA, AA) {
-    return isOutputElement(AA) ? new TextChunkExpression(tA, "string", AA.getAttribute("value"), "output") : null;
+  static fromOutput(tA) {
+    return isOutputElement(tA) ? new TextChunkExpression("string", tA.getAttribute("value"), "output") : null;
   }
-  static fromTranslation(tA, AA) {
-    return isTranslationExpression(AA) ? new TextChunkExpression(tA, "nodes", AA, "translation", {
-      isTranslated: !0
-    }) : null;
+  static fromResource(tA, AA) {
+    return new TextChunkExpression("string", "null", "literal", tA, { type: AA });
+  }
+  static fromTranslation(tA) {
+    const AA = getTranslationExpression(tA);
+    return AA ? new TextChunkExpression("nodes", AA, "translation") : null;
   }
 }
 const absolutePathNodeList = (eA) => {
@@ -15028,12 +15075,12 @@ class TextElementDefinition extends TextRangeDefinition {
   chunks;
   constructor(tA, AA, nA) {
     super(tA, AA, nA);
-    const oA = this, rA = parseNodesetReference(AA, nA, "ref");
-    if (rA == null)
-      this.chunks = Array.from(nA.childNodes).flatMap((iA) => isElementNode(iA) ? TextChunkExpression.fromOutput(oA, iA) ?? [] : isTextNode(iA) ? TextChunkExpression.fromLiteral(oA, iA.data) : []);
+    const oA = parseNodesetReference(AA, nA, "ref");
+    if (oA == null)
+      this.chunks = Array.from(nA.childNodes).flatMap((rA) => isElementNode(rA) ? TextChunkExpression.fromOutput(rA) ?? [] : isTextNode(rA) ? TextChunkExpression.fromLiteral(rA.data) : []);
     else {
-      const iA = TextChunkExpression.fromTranslation(oA, rA);
-      iA != null ? this.chunks = [iA] : this.chunks = [TextChunkExpression.fromReference(oA, rA)];
+      const rA = TextChunkExpression.fromTranslation(oA);
+      rA ? this.chunks = [rA] : this.chunks = [TextChunkExpression.fromReference(oA)];
     }
   }
 }
@@ -15201,13 +15248,13 @@ class RangeControlDefinition extends ControlDefinition {
   }
 }
 class ItemsetNodesetExpression extends DependentExpression {
-  constructor(tA, AA) {
-    super(tA.parent, "nodes", AA);
+  constructor(tA) {
+    super("nodes", tA);
   }
 }
 class ItemsetValueExpression extends DependentExpression {
   constructor(tA, AA) {
-    super(tA, "string", AA), this.itemset = tA;
+    super("string", AA), this.itemset = tA;
   }
 }
 class ItemsetLabelDefinition extends TextRangeDefinition {
@@ -15222,15 +15269,15 @@ class ItemsetLabelDefinition extends TextRangeDefinition {
     const oA = nA.getAttribute("ref");
     if (oA == null)
       throw new Error("<itemset><label> missing ref attribute");
-    const rA = TextChunkExpression.fromTranslation(this, oA);
-    rA != null ? this.chunks = [rA] : this.chunks = [TextChunkExpression.fromReference(this, oA)];
+    const rA = TextChunkExpression.fromTranslation(oA);
+    rA ? this.chunks = [rA] : this.chunks = [TextChunkExpression.fromReference(oA)];
   }
 }
 class ItemsetDefinition extends BodyElementDefinition {
   constructor(tA, AA, nA) {
     super(tA, AA, nA), this.parent = AA;
     const oA = parseNodesetReference(AA, nA, "nodeset");
-    this.nodes = new ItemsetNodesetExpression(this, oA), this.reference = oA;
+    this.nodes = new ItemsetNodesetExpression(oA), this.reference = oA;
     const rA = getValueElement(nA);
     if (rA == null)
       throw new Error("<itemset> has no <value>");
@@ -15841,7 +15888,36 @@ const parseNodeName = (eA) => ({
     ...tA,
     documentRoot: AA
   });
-}, assertItextTranslationsDefinitionEntry = ([
+}, JR_RESOURCE_URL_PROTOCOL = "jr:", 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}`);
+  }
+  static from(tA) {
+    return new this(tA);
+  }
+  static isJRResourceReference(tA) {
+    return tA?.startsWith(JR_RESOURCE_URL_PROTOCOL) ?? !1;
+  }
+  constructor(tA) {
+    super(tA);
+  }
+}
+const generateChunk = (eA) => {
+  if (isElementNode(eA))
+    return TextChunkExpression.fromOutput(eA);
+  if (isTextNode(eA)) {
+    const tA = eA.parentElement.getAttribute("form");
+    return isResourceType(tA) ? TextChunkExpression.fromResource(eA.data, tA) : TextChunkExpression.fromLiteral(eA.data);
+  }
+  return null;
+}, generateChunksForValues = (eA) => Array.from(eA.childNodes).map((tA) => generateChunk(tA)).filter((tA) => tA !== null), generateChunksForTranslation = (eA) => Array.from(eA.childNodes).flatMap(
+  (tA) => generateChunksForValues(tA)
+), generateChunksForLanguage = (eA) => new Map(
+  Array.from(eA.children).map((tA) => [tA.getAttribute("id"), generateChunksForTranslation(tA)])
+), generateItextChunks = (eA) => new Map(
+  eA.map((tA) => [tA.getAttribute("lang"), generateChunksForLanguage(tA)])
+), assertItextTranslationsDefinitionEntry = ([
   eA,
   tA
 ]) => {
@@ -15878,30 +15954,27 @@ const defaultBindComputationExpressions = {
   saveIncomplete: "boolean"
 };
 class BindComputationExpression extends DependentExpression {
-  constructor(tA, AA, nA) {
-    const oA = AA === "constraint";
-    let rA, iA;
-    if (nA == null) {
-      if (AA === "calculate")
+  constructor(tA, AA) {
+    let nA, oA;
+    if (AA == null) {
+      if (tA === "calculate")
         throw new Error("No default expression for calculate");
-      iA = defaultBindComputationExpressions[AA], rA = !0;
+      oA = defaultBindComputationExpressions[tA], nA = !0;
     } else
-      rA = !1, iA = nA;
-    super(tA, bindComputationResultTypes[AA], iA, {
-      ignoreContextReference: oA
-    }), this.computation = AA, this.isDefaultExpression = rA;
+      nA = !1, oA = AA;
+    super(bindComputationResultTypes[tA], oA), this.computation = tA, this.isDefaultExpression = nA;
   }
   static forComputation(tA, AA) {
     const nA = tA.bindElement.getAttribute(AA) ?? defaultBindComputationExpressions[AA];
-    return nA == null ? null : new this(tA, AA, nA);
+    return nA == null ? null : new this(AA, nA);
   }
   isDefaultExpression;
 }
 class MessageDefinition extends TextRangeDefinition {
   constructor(tA, AA, nA) {
     super(tA.form, tA, null), this.role = AA;
-    const oA = TextChunkExpression.fromTranslation(this, nA);
-    oA != null ? this.chunks = [oA] : this.chunks = [TextChunkExpression.fromLiteral(this, nA)];
+    const oA = TextChunkExpression.fromTranslation(nA);
+    oA ? this.chunks = [oA] : this.chunks = [TextChunkExpression.fromLiteral(nA)];
   }
   static from(tA, AA) {
     const nA = tA.bindElement.getAttributeNS(JAVAROSA_NAMESPACE_URI$1, AA);
@@ -19868,15 +19941,15 @@ class RepeatCountControlExpression extends DependentExpression {
   static from(tA, AA) {
     const { countExpression: nA, noAddRemoveExpression: oA } = tA;
     if (nA != null)
-      return new this(tA, nA);
+      return new this(nA);
     if (oA != null && isConstantTruthyExpression(oA)) {
       const rA = String(Math.max(AA, 1));
-      return new this(tA, rA);
+      return new this(rA);
     }
     return null;
   }
-  constructor(tA, AA) {
-    super(tA, "number", AA);
+  constructor(tA) {
+    super("number", tA);
   }
 }
 const isJRTemplateAttributeName = (eA) => eA.localName !== "template" ? !1 : (eA.namespaceURI?.href ?? eA.namespaceURI) === JAVAROSA_NAMESPACE_URI$1, isJRTemplateAttribute = (eA) => isJRTemplateAttributeName(eA.qualifiedName), isExplicitRepeatTemplateElement = (eA) => eA.attributes.some(isJRTemplateAttribute), cloneStaticAttributeOptions = (eA) => ({
@@ -20039,13 +20112,14 @@ class ModelDefinition {
     const AA = new SubmissionDefinition(tA.xformDOM);
     this.binds = ModelBindMap.fromModel(this), this.instance = parseStaticDocumentFromDOMSubtree(tA.xformDOM.primaryInstanceRoot, {
       nodesetPrefix: "/"
-    }), this.root = new RootDefinition(tA, this, AA, tA.body.classes), this.nodes = nodeDefinitionMap(this.root), this.itextTranslations = ItextTranslationsDefinition.from(tA.xformDOM);
+    }), this.root = new RootDefinition(tA, this, AA, tA.body.classes), this.nodes = nodeDefinitionMap(this.root), this.itextTranslations = ItextTranslationsDefinition.from(tA.xformDOM), this.itextChunks = generateItextChunks(tA.xformDOM.itextTranslationElements);
   }
   binds;
   root;
   nodes;
   instance;
   itextTranslations;
+  itextChunks;
   getNodeDefinition(tA) {
     const AA = this.nodes.get(tA);
     if (AA == null)
@@ -20062,6 +20136,9 @@ class ModelDefinition {
     const { form: tA, ...AA } = this;
     return AA;
   }
+  getTranslationChunks(tA, AA) {
+    return this.itextChunks.get(AA.language)?.get(tA) ?? [];
+  }
 }
 class XFormDefinition {
   constructor(tA) {
@@ -20078,21 +20155,6 @@ class XFormDefinition {
   body;
   model;
 }
-const JR_RESOURCE_URL_PROTOCOL = "jr:";
-class JRResourceURL extends URL {
-  static create(tA, AA) {
-    return new this(`jr://${tA}/${AA}`);
-  }
-  static from(tA) {
-    return new this(tA);
-  }
-  static isJRResourceReference(tA) {
-    return tA?.startsWith(JR_RESOURCE_URL_PROTOCOL) ?? !1;
-  }
-  constructor(tA) {
-    super(tA);
-  }
-}
 const assertSecondaryInstanceDefinition = ({ root: eA }) => {
   if (eA.getAttributeValue("id") == null)
     throw new Error();
@@ -22339,33 +22401,33 @@ class TextRange {
 }
 const createTextChunks = (eA, tA) => createMemo(() => {
   const AA = [], nA = {};
-  return tA.forEach((oA) => {
-    if (oA.source === "literal") {
-      AA.push(new TextChunk(eA, oA.source, oA.stringValue));
+  let oA;
+  if (tA.chunks[0]?.source === "translation") {
+    const rA = eA.evaluator.evaluateString(tA.chunks[0].toString(), {
+      contextNode: eA.contextNode
+    });
+    oA = tA.form.model.getTranslationChunks(
+      rA,
+      eA.getActiveLanguage()
+    );
+  } else
+    oA = tA.chunks;
+  return oA.forEach((rA) => {
+    if (rA.resourceType) {
+      nA[rA.resourceType] = JRResourceURL.from(
+        rA.stringValue
+      );
       return;
     }
-    const rA = createComputedExpression(eA, oA)();
-    if (typeof rA == "string") {
-      AA.push(new TextChunk(eA, oA.source, rA));
+    if (rA.source === "literal") {
+      AA.push(new TextChunk(eA, rA.source, rA.stringValue));
       return;
-    } else
-      rA.forEach((iA) => {
-        if (isEngineXPathElement(iA) && iA instanceof StaticElement) {
-          const aA = iA.getAttributeValue("form");
-          if (aA) {
-            if (["image", "video", "audio"].includes(aA)) {
-              const lA = iA.getXPathValue();
-              JRResourceURL.isJRResourceReference(lA) && (nA[aA] = JRResourceURL.from(lA));
-            }
-          } else {
-            const lA = iA.getXPathValue();
-            AA.push(new TextChunk(eA, oA.source, lA));
-          }
-        }
-      });
+    }
+    const iA = createComputedExpression(eA, rA)();
+    AA.push(new TextChunk(eA, rA.source, iA));
   }), { chunks: AA, mediaSources: nA };
 }), createTextRange = (eA, tA, AA) => eA.scope.runTask(() => {
-  const nA = createTextChunks(eA, AA.chunks);
+  const nA = createTextChunks(eA, AA);
   return createMemo(() => {
     const oA = nA();
     return new TextRange("form", tA, oA.chunks, oA.mediaSources);
@@ -22966,6 +23028,9 @@ let RankControl$1 = class extends ValueNode {
       throw new RankMissingValueError("There are missing options. Rank should have all options.");
     return this.setValueState(tA), this.root;
   }
+  getChoiceName(tA) {
+    return this.mapOptionsByValue().get(tA)?.label?.asString ?? null;
+  }
 };
 const insertAtIndex = (eA, tA, AA) => {
   const { length: nA } = eA;
@@ -23394,6 +23459,9 @@ class SelectControl extends ValueNode {
     const AA = this.mapOptionsByValue().keys(), nA = this.filterValues(AA, tA);
     return this.setValueState(nA), this.root;
   }
+  getChoiceName(tA) {
+    return this.mapOptionsByValue().get(tA)?.label?.asString ?? null;
+  }
 }
 class Subtree extends DescendantNode {
   childrenState;
@@ -42957,7 +43025,7 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
   },
   emits: ["submit", "submitChunked"],
   setup(eA, { emit: tA }) {
-    const AA = "v0.14.0", nA = eA, oA = (hA) => {
+    const AA = "v0.15.0", nA = eA, oA = (hA) => {
       const EA = async (BA) => {
         const bA = await BA;
         uA.value = updateSubmittedFormState(bA, hA);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getodk/web-forms",
-  "version": "0.14.0",
+  "version": "0.15.0",
   "license": "Apache-2.0",
   "description": "ODK Web Forms",
   "author": "getodk",
@@ -55,7 +55,7 @@
     "@faker-js/faker": "^9.9.0",
     "@fontsource/hanken-grotesk": "^5.2.6",
     "@fontsource/roboto": "^5.2.6",
-    "@getodk/xforms-engine": "0.12.0",
+    "@getodk/xforms-engine": "0.13.0",
     "@playwright/test": "^1.53.2",
     "@types/ramda": "^0.30.2",
     "@vitejs/plugin-vue": "^6.0.0",