ochre-sdk 1.0.78 → 1.1.0

package/dist/fetchers/set/property-values.mjs

@@ -1,11 +1,12 @@
-import { BELONGS_TO_COLLECTION_UUID, DEFAULT_LANGUAGES, XML_PARSER_OPTIONS } from "../../constants.mjs";
-import { NOT_SUPPLEMENTAL_PREDICATE, createSchemaValidationError, getErrorOutput, stringLiteral } from "../../utilities.mjs";
+import { DEFAULT_LANGUAGES } from "../../constants.mjs";
+import { getErrorOutput } from "../../errors.mjs";
+import { requestOchre } from "../request.mjs";
 import { MultilingualString } from "../../parsers/multilingual.mjs";
 import { setPropertyValuesParametersSchema } from "../../schemas.mjs";
 import { parseXMLContent } from "../../parsers/string.mjs";
-import { buildBelongsToCollectionQueryExpression, buildQueryPlan } from "../../query.mjs";
+import { stringLiteral } from "../../xquery.mjs";
+import { compileSetItemsQuery, getItemFilterQueries, getPropertyFacetSelectors } from "../../query.mjs";
 import * as v from "valibot";
-import { XMLParser } from "fast-xml-parser";
 //#region src/fetchers/set/property-values.ts
 function getLabelContentLanguages(content) {
 	const languages = [];
@@ -22,12 +23,16 @@ function parsePropertyValueLabel(content, text) {
 	if (parsedText == null) return null;
 	return MultilingualString.fromObject({ [DEFAULT_LANGUAGES[0]]: parsedText });
 }
-function parsePropertyValueBooleanContent(rawValue) {
-	if (rawValue === "" || rawValue == null) return null;
-	return rawValue.toLocaleLowerCase("en-US") === "true";
-}
+/**
+* The prefix OCHRE puts on every `dataType` attribute
+*
+* Kept as a constant because the facet XQuery has to strip the same prefix
+* server-side: it compares `@dataType` against the unprefixed names, so a
+* prefixed value falls through every typed branch.
+*/
+const XML_SCHEMA_TYPE_PREFIX = "xs:";
 function normalizePropertyValueDataType(dataType) {
-	const normalizedDataType = dataType.startsWith("xs:") ? dataType.slice(3) : dataType;
+	const normalizedDataType = dataType.startsWith(XML_SCHEMA_TYPE_PREFIX) ? dataType.slice(3) : dataType;
 	switch (normalizedDataType) {
 		case "IDREF":
 		case "boolean":
@@ -68,42 +73,26 @@ const propertyValueLabelContentSchema = v.object({
 	lang: v.string(),
 	string: v.array(propertyValueLabelStringSchema)
 });
-function getPropertyFacetSelectorsFromQueries(queries) {
-	if (queries == null) return [];
-	const propertyFacetSelectors = /* @__PURE__ */ new Map();
-	const pendingQueries = [queries];
-	while (pendingQueries.length > 0) {
-		const query = pendingQueries.shift();
-		if (query == null) continue;
-		if ("target" in query) {
-			if (query.target !== "property") continue;
-			if (query.propertyVariable != null) {
-				const relation = query.propertyRelation ?? null;
-				propertyFacetSelectors.set(`${query.propertyVariable}|${relation}`, {
-					uuid: query.propertyVariable,
-					relation
-				});
-			}
-			continue;
+/**
+* Give the canonical value the type its `dataType` implies
+*
+* Which value a facet stands for is decided once, server-side, by
+* `local:value-content`, and travels back as `canonicalValue`. This only gives
+* that string a TypeScript type: re-deriving it here from `rawValue`, `uuid`
+* and the label is what let the facet key and the facet content disagree.
+*/
+function typePropertyValueContent(dataType, canonicalValue) {
+	if (canonicalValue == null || canonicalValue === "") return null;
+	switch (dataType) {
+		case "integer":
+		case "decimal":
+		case "time": {
+			const numericContent = Number(canonicalValue);
+			return Number.isNaN(numericContent) ? null : numericContent;
 		}
-		pendingQueries.push(..."and" in query ? query.and : query.or);
-	}
-	return propertyFacetSelectors.values().toArray();
-}
-function getItemFilterQueriesFromPropertyValueQueries(queries) {
-	if (queries == null) return null;
-	if ("target" in queries) {
-		if (queries.target !== "property" || queries.dataType === "date" || queries.dataType === "dateTime") return queries;
-		return "value" in queries && queries.value != null ? queries : null;
-	}
-	const filteredChildren = [];
-	const childQueries = "and" in queries ? queries.and : queries.or;
-	for (const childQuery of childQueries) {
-		const filteredChildQuery = getItemFilterQueriesFromPropertyValueQueries(childQuery);
-		if (filteredChildQuery != null) filteredChildren.push(filteredChildQuery);
+		case "boolean": return canonicalValue === "true";
+		default: return canonicalValue;
 	}
-	if (filteredChildren.length <= 1) return filteredChildren[0] ?? null;
-	return "and" in queries ? { and: filteredChildren } : { or: filteredChildren };
 }
 /**
 * Schema for a single property value query item in the OCHRE API response
@@ -115,44 +104,22 @@ const propertyValueQueryItemSchema = v.pipe(v.object({
 	count: countSchema,
 	globalCount: v.nullish(countSchema),
 	dataType: v.optional(v.string(), "string"),
+	canonicalValue: v.optional(v.string()),
 	rawValue: v.optional(v.string()),
 	payload: v.optional(v.string()),
 	content: v.optional(v.array(propertyValueLabelContentSchema))
 }), v.transform((value) => {
 	const dataType = normalizePropertyValueDataType(value.dataType);
-	const label = parsePropertyValueLabel(value.content, value.payload);
-	const returnValue = {
+	return {
 		uuid: value.uuid !== "" ? value.uuid : null,
 		scope: value.scope,
 		variableUuid: value.variableUuid != null && value.variableUuid !== "" ? value.variableUuid : null,
 		count: value.count,
 		globalCount: value.globalCount ?? null,
 		dataType,
-		content: null,
-		label
+		content: typePropertyValueContent(dataType, value.canonicalValue),
+		label: parsePropertyValueLabel(value.content, value.payload)
 	};
-	switch (dataType) {
-		case "IDREF":
-			returnValue.content = value.uuid !== "" ? value.uuid : null;
-			break;
-		case "integer":
-		case "decimal":
-		case "time":
-			if (value.rawValue != null && value.rawValue !== "") {
-				const numericContent = Number(value.rawValue);
-				returnValue.content = Number.isNaN(numericContent) ? null : numericContent;
-			}
-			break;
-		case "boolean":
-			returnValue.content = parsePropertyValueBooleanContent(value.rawValue);
-			break;
-		default: {
-			const labelText = label?.getText() ?? null;
-			returnValue.content = value.rawValue != null && value.rawValue !== "" ? value.rawValue : labelText;
-			break;
-		}
-	}
-	return returnValue;
 }));
 const attributeValueQueryItemSchema = v.pipe(v.object({
 	attributeType: v.picklist(["bibliographies", "periods"]),
@@ -187,20 +154,9 @@ const responseSchema = v.object({ result: v.object({ ochre: v.object({
 */
 function buildXQuery(parameters) {
 	const { setScopeUuids, belongsToCollectionScopeUuids, queries, propertyFacetSelectors, attributes, isLimitedToLeafPropertyValues } = parameters;
-	const setScopeDeclaration = `declare variable $setScopeUuids := (${setScopeUuids.map((uuid) => stringLiteral(uuid)).join(", ")});`;
-	const compiledQueryPlan = buildQueryPlan({
-		queries: getItemFilterQueriesFromPropertyValueQueries(queries),
-		baseItemsExpression: "doc()/ochre/set[@uuid = $setScopeUuids]/items/*",
-		scopeQueryExpression: buildBelongsToCollectionQueryExpression(belongsToCollectionScopeUuids, BELONGS_TO_COLLECTION_UUID)
-	});
 	const valueFilter = isLimitedToLeafPropertyValues ? "[not(@i)]" : "";
-	const queryBlocks = [];
 	const returnedSequences = [];
-	const xqueryDeclarations = [
-		"xquery version \"1.0-ml\";",
-		"declare namespace map = \"http://marklogic.com/xdmp/map\";",
-		setScopeDeclaration,
-		`declare function local:increment-count($counts, $key) {
+	const xqueryDeclarations = ["declare namespace map = \"http://marklogic.com/xdmp/map\";", `declare function local:increment-count($counts, $key) {
   let $current := map:get($counts, $key)
   return map:put(
     $counts,
@@ -209,6 +165,12 @@ function buildXQuery(parameters) {
   )
 };
 
+declare function local:normalize-data-type($data-type) {
+  if (starts-with($data-type, ${stringLiteral(XML_SCHEMA_TYPE_PREFIX)}))
+  then substring($data-type, 4)
+  else $data-type
+};
+
 declare function local:value-display-text($v) {
   if ($v/content)
   then string-join($v/content[@xml:lang="eng"]//text(), "")
@@ -257,6 +219,7 @@ declare function local:put-property-detail(
   $value-uuid,
   $raw-value,
   $data-type,
+  $canonical-value,
   $display,
   $label-content
 ) {
@@ -274,7 +237,7 @@ declare function local:put-property-detail(
       map:put(
         $details,
         $key,
-        <propertyValue scope="{$scope}" variableUuid="{$variable-uuid}" uuid="{$value-uuid}" rawValue="{$raw-value}" dataType="{$data-type}">{
+        <propertyValue scope="{$scope}" variableUuid="{$variable-uuid}" uuid="{$value-uuid}" rawValue="{$raw-value}" dataType="{$data-type}" canonicalValue="{$canonical-value}">{
           if (exists($label-content)) then $label-content else $display
         }</propertyValue>
       )
@@ -291,6 +254,7 @@ declare function local:add-property-facet(
   $value-uuid,
   $raw-value,
   $data-type,
+  $canonical-value,
   $display,
   $label-content
 ) {
@@ -298,7 +262,7 @@ declare function local:add-property-facet(
   else (
     map:put($seen, $key, true()),
     local:increment-count($counts, $key),
-    local:put-property-detail($details, $key, $scope, $variable-uuid, $value-uuid, $raw-value, $data-type, $display, $label-content)
+    local:put-property-detail($details, $key, $scope, $variable-uuid, $value-uuid, $raw-value, $data-type, $canonical-value, $display, $label-content)
   )
 };
 
@@ -308,31 +272,32 @@ declare function local:add-attribute-facet($counts, $seen, $key) {
     map:put($seen, $key, true()),
     local:increment-count($counts, $key)
   )
-};`
-	];
-	if (compiledQueryPlan.prolog !== "") xqueryDeclarations.push(compiledQueryPlan.prolog);
-	if (propertyFacetSelectors.length > 0) {
-		const facetPropertyPredicates = [];
-		for (const selector of propertyFacetSelectors) {
-			const uuidPredicate = `label/@uuid = ${stringLiteral(selector.uuid)}`;
-			facetPropertyPredicates.push(selector.relation == null ? uuidPredicate : `(${uuidPredicate} and label/@relation = ${stringLiteral(selector.relation)})`);
-		}
-		const facetPropertyPredicate = facetPropertyPredicates.length === 1 ? facetPropertyPredicates[0] ?? "false()" : `(${facetPropertyPredicates.join(" or ")})`;
-		queryBlocks.push(`let $global-property-counts := map:map()
+};`];
+	function buildQueryBlocks(context) {
+		const { items, notSupplemental } = context;
+		const queryBlocks = [];
+		if (propertyFacetSelectors.length > 0) {
+			const facetPropertyPredicates = [];
+			for (const selector of propertyFacetSelectors) {
+				const uuidPredicate = `label/@uuid = ${stringLiteral(selector.uuid)}`;
+				facetPropertyPredicates.push(selector.relation == null ? uuidPredicate : `(${uuidPredicate} and label/@relation = ${stringLiteral(selector.relation)})`);
+			}
+			const facetPropertyPredicate = facetPropertyPredicates.length === 1 ? facetPropertyPredicates[0] ?? "false()" : `(${facetPropertyPredicates.join(" or ")})`;
+			queryBlocks.push(`let $global-property-counts := map:map()
 let $variable-property-counts := map:map()
 let $variable-property-details := map:map()
 let $variable-property-global-keys := map:map()
 let $_property-aggregation := xdmp:eager(
-  for $item in $items
+  for $item in ${items}
   let $global-seen := map:map()
   let $variable-seen := map:map()
   return
-    for $p in $item/properties/property[${facetPropertyPredicate}]${NOT_SUPPLEMENTAL_PREDICATE}
+    for $p in $item/properties/property[${facetPropertyPredicate}]${notSupplemental}
     let $variable-uuid := string($p/label/@uuid)
-    for $v in $p/value${valueFilter}${NOT_SUPPLEMENTAL_PREDICATE}
+    for $v in $p/value${valueFilter}${notSupplemental}
     let $value-uuid := string($v/@uuid)
     let $raw-value := string($v/@rawValue)
-    let $data-type := string($v/@dataType)
+    let $data-type := local:normalize-data-type(string($v/@dataType))
     let $display := local:value-display-text($v)
     let $label-content := local:value-label-content($v)
     let $content := local:value-content($data-type, $raw-value, $value-uuid, $display)
@@ -343,7 +308,7 @@ let $_property-aggregation := xdmp:eager(
     where $content != ""
     return (
       local:add-attribute-facet($global-property-counts, $global-seen, $global-key),
-      local:add-property-facet($variable-property-counts, $variable-property-details, $variable-seen, $variable-key, "variable", $variable-uuid, $value-uuid, $output-raw-value, $data-type, $display, $label-content),
+      local:add-property-facet($variable-property-counts, $variable-property-details, $variable-seen, $variable-key, "variable", $variable-uuid, $value-uuid, $output-raw-value, $data-type, $content, $display, $label-content),
       map:put($variable-property-global-keys, $variable-key, $global-key)
     )
 )
@@ -354,19 +319,19 @@ let $property-values :=
     for $key in map:keys($variable-property-counts)
     let $detail := map:get($variable-property-details, $key)
     let $global-key := map:get($variable-property-global-keys, $key)
-    return <propertyValue scope="variable" variableUuid="{string($detail/@variableUuid)}" uuid="{string($detail/@uuid)}" rawValue="{string($detail/@rawValue)}" dataType="{string($detail/@dataType)}" count="{map:get($variable-property-counts, $key)}" globalCount="{map:get($global-property-counts, $global-key)}">{
+    return <propertyValue scope="variable" variableUuid="{string($detail/@variableUuid)}" uuid="{string($detail/@uuid)}" rawValue="{string($detail/@rawValue)}" dataType="{string($detail/@dataType)}" canonicalValue="{string($detail/@canonicalValue)}" count="{map:get($variable-property-counts, $key)}" globalCount="{map:get($global-property-counts, $global-key)}">{
       $detail/node()
     }</propertyValue>
   )`);
-		returnedSequences.push("$property-values");
-	}
-	if (attributes.bibliographies) {
-		queryBlocks.push(`let $bibliography-counts := map:map()
+			returnedSequences.push("$property-values");
+		}
+		if (attributes.bibliographies) {
+			queryBlocks.push(`let $bibliography-counts := map:map()
 let $_bibliography-aggregation := xdmp:eager(
-  for $item in $items
+  for $item in ${items}
   let $seen := map:map()
   return
-    for $bibliography in $item/bibliographies/bibliography${NOT_SUPPLEMENTAL_PREDICATE}
+    for $bibliography in $item/bibliographies/bibliography${notSupplemental}
     let $label := string-join($bibliography/identification/label/content[@xml:lang="eng"]//text(), "")
     where string-length($label) gt 0
     return local:add-attribute-facet($bibliography-counts, $seen, $label)
@@ -378,15 +343,15 @@ let $bibliography-values :=
     for $label in map:keys($bibliography-counts)
     return <attributeValue attributeType="bibliographies" count="{map:get($bibliography-counts, $label)}" content="{$label}" />
   )`);
-		returnedSequences.push("$bibliography-values");
-	}
-	if (attributes.periods) {
-		queryBlocks.push(`let $period-counts := map:map()
+			returnedSequences.push("$bibliography-values");
+		}
+		if (attributes.periods) {
+			queryBlocks.push(`let $period-counts := map:map()
 let $_period-aggregation := xdmp:eager(
-  for $item in $items
+  for $item in ${items}
   let $seen := map:map()
   return
-    for $period in $item/periods/period${NOT_SUPPLEMENTAL_PREDICATE}
+    for $period in $item/periods/period${notSupplemental}
     let $label := string-join($period/identification/label/content[@xml:lang="eng"]//text(), "")
     where string-length($label) gt 0
     return local:add-attribute-facet($period-counts, $seen, $label)
@@ -398,16 +363,21 @@ let $period-values :=
     for $label in map:keys($period-counts)
     return <attributeValue attributeType="periods" count="{map:get($period-counts, $label)}" content="{$label}" />
   )`);
-		returnedSequences.push("$period-values");
+			returnedSequences.push("$period-values");
+		}
+		return queryBlocks;
 	}
-	return `${xqueryDeclarations.join("\n\n")}
-
-<ochre>{
-${compiledQueryPlan.itemsClause}
-${queryBlocks.join("\n\n")}
+	return compileSetItemsQuery({
+		setScopeUuids,
+		belongsToCollectionScopeUuids,
+		queries: getItemFilterQueries(queries),
+		declarations: xqueryDeclarations,
+		body: (context) => {
+			return `${buildQueryBlocks(context).join("\n\n")}
 
-return (${returnedSequences.join(", ")})
-}</ochre>`;
+return (${returnedSequences.join(", ")})`;
+		}
+	});
 }
 function collectPropertyValues(parsedPropertyValues) {
 	const propertyValuesByPropertyVariableUuid = {};
@@ -476,7 +446,7 @@ function collectAttributeValues(parsedAttributeValues) {
 async function fetchSetPropertyValues(parameters, options) {
 	try {
 		const { setScopeUuids, belongsToCollectionScopeUuids, queries, attributes, isLimitedToLeafPropertyValues } = v.parse(setPropertyValuesParametersSchema, parameters);
-		const propertyFacetSelectors = getPropertyFacetSelectorsFromQueries(queries);
+		const propertyFacetSelectors = getPropertyFacetSelectors(queries);
 		if (propertyFacetSelectors.length === 0 && !attributes.bibliographies && !attributes.periods) return {
 			propertyValues: [],
 			propertyValuesByPropertyVariableUuid: {},
@@ -495,16 +465,12 @@ async function fetchSetPropertyValues(parameters, options) {
 			attributes,
 			isLimitedToLeafPropertyValues
 		});
-		const response = await (options?.fetch ?? fetch)("https://ochre.lib.uchicago.edu/ochre/v2/ochre.php?xquery&xsl=none&lang=\"*\"", {
-			method: "POST",
-			body: xquery,
-			headers: { "Content-Type": "application/xquery" }
+		const output = await requestOchre({
+			xquery,
+			schema: responseSchema,
+			label: "OCHRE Set property values",
+			options
 		});
-		if (!response.ok) throw new Error(`OCHRE API responded with status: ${response.status}`, { cause: response.statusText });
-		const dataRaw = await response.text();
-		const data = new XMLParser(XML_PARSER_OPTIONS).parse(dataRaw);
-		const { success, issues, output } = v.safeParse(responseSchema, data);
-		if (!success) throw createSchemaValidationError("Failed to parse OCHRE Set property values", issues);
 		const parsedPropertyValues = [output.result.ochre.propertyValue ?? []].flat();
 		const parsedAttributeValues = [output.result.ochre.attributeValue ?? []].flat();
 		const { propertyValuesByPropertyVariableUuid, flattenedPropertyValues } = collectPropertyValues(parsedPropertyValues);

package/dist/fetchers/website-metadata.mjs

@@ -1,14 +1,26 @@
-import { XML_PARSER_OPTIONS } from "../constants.mjs";
-import { SUPPLEMENTAL_XQUERY_PROLOG, createSchemaValidationError, getErrorOutput, omitSupplemental, stringLiteral } from "../utilities.mjs";
-import { iso639_3Schema } from "../schemas.mjs";
-import { restoreXMLMetadata } from "../xml/metadata.mjs";
+import { getErrorOutput } from "../errors.mjs";
+import { requestOchre } from "./request.mjs";
 import { parseStringLike } from "../parsers/helpers.mjs";
-import { parseIdentification, parseMetadataLanguages, parseSimplifiedProperties, resolveLanguages } from "../parsers/index.mjs";
+import { parseMetadataLanguages, parseRequestedLanguages, resolveLanguages } from "../parsers/languages.mjs";
+import { parseIdentification, parseSimplifiedProperties } from "../parsers/index.mjs";
 import { XMLWebsiteData } from "../xml/schemas.mjs";
+import { compileOchreQuery, stringLiteral } from "../xquery.mjs";
 import { websitePresentationReader } from "../parsers/website/reader.mjs";
-import * as v from "valibot";
-import { XMLParser } from "fast-xml-parser";
+import { WEBSITE_WALK_DECLARATIONS } from "../parsers/website/walk.mjs";
 //#region src/fetchers/website-metadata.ts
+/**
+* The presentation properties the metadata projection carries
+*
+* The XQuery whitelists exactly these labels and the parser reads exactly
+* these labels, so they come from one list: whitelisting a label the parser
+* ignores is dead weight, and reading one the whitelist drops silently yields
+* the default.
+*/
+const METADATA_PRESENTATION_LABELS = {
+	privacy: "privacy",
+	faviconIco: "favicon-ico",
+	faviconImg: "favicon-img"
+};
 function parseWebsiteMetadata(data, options) {
 	const rawOchre = data.result.ochre;
 	const websiteTree = rawOchre.tree[0];
@@ -30,52 +42,21 @@ function parseWebsiteMetadata(data, options) {
 		description: websiteName === "" ? metadataDescription : metadataDescription !== "" && metadataDescription !== websiteName ? `${websiteName} - ${metadataDescription}` : websiteName,
 		webpageTitle,
 		properties: {
-			privacy: reader.valueOr("privacy", "public"),
+			privacy: reader.valueOr(METADATA_PRESENTATION_LABELS.privacy, "public"),
 			icon: {
-				faviconUuid: reader.uuid("favicon-ico"),
-				appleTouchIconUuid: reader.uuid("favicon-img")
+				faviconUuid: reader.uuid(METADATA_PRESENTATION_LABELS.faviconIco),
+				appleTouchIconUuid: reader.uuid(METADATA_PRESENTATION_LABELS.faviconImg)
 			}
 		}
 	};
 }
 function buildXQuery(parameters) {
-	return String.raw`xquery version "1.0-ml";
-
-${SUPPLEMENTAL_XQUERY_PROLOG}
-
-declare function local:resource-items($resources) {
-  for $resource in $resources
-  return
-    if ($resource/segments) then $resource
-    else if ($resource/identification) then $resource
-    else local:resource-items($resource/resource)
-};
-
-declare function local:presentation($resource) {
-  string(($resource/properties/property[label/string() = "presentation"]/value)[1])
-};
-
-declare function local:clean-slug($slug) {
-  replace(string($slug), "^\$[^-]*-", "")
-};
-
-declare function local:page-slug($resource, $slug-prefix) {
-  let $slug := local:clean-slug($resource/@slug)
-  return
-    if ($slug-prefix = "") then $slug
-    else if ($slug = "") then $slug-prefix
-    else concat($slug-prefix, "/", $slug)
-};
-
+	return compileOchreQuery({
+		declarations: [`${WEBSITE_WALK_DECLARATIONS}
 declare function local:matches-page-slug($resource, $target-slug, $slug-prefix) {
   local:page-slug($resource, $slug-prefix) = $target-slug
 };
 
-declare function local:page-child-slug-prefix($resource, $slug-prefix) {
-  if ($slug-prefix = "") then ""
-  else local:page-slug($resource, $slug-prefix)
-};
-
 declare function local:metadata-page($resource) {
   element resource {
     attribute uuid { string($resource/@uuid) },
@@ -108,7 +89,7 @@ declare function local:matching-pages($resources, $target-slug, $slug-prefix) {
 
 declare function local:metadata-tree($tree, $target-slug, $slug-prefix) {
   let $resources := local:resource-items($tree/items/resource)
-  let $presentation-properties := $tree/properties/property[label/string() = "presentation"][value/string() = "website"]/property[label/string() = ("favicon-ico", "favicon-img", "privacy")]
+  let $presentation-properties := $tree/properties/property[label/string() = "presentation"][value/string() = "website"]/property[label/string() = (${Object.values(METADATA_PRESENTATION_LABELS).map((label) => stringLiteral(label)).join(", ")})]
   return
     element tree {
       attribute uuid { string($tree/@uuid) },
@@ -124,7 +105,8 @@ declare function local:metadata-tree($tree, $target-slug, $slug-prefix) {
     }
 };
 
-let $website := collection("ochre/tree")/ochre[tree/identification/abbreviation/content/string = ${stringLiteral(parameters.abbreviation)}][1]
+`],
+		body: ({ omitSupplemental }) => `let $website := collection("ochre/tree")/ochre[tree/identification/abbreviation/content/string = ${stringLiteral(parameters.abbreviation)}][1]
 let $target-slug := ${stringLiteral(parameters.slug)}
 return
   <ochre>{
@@ -137,28 +119,24 @@ return
       $website/metadata,
       local:metadata-tree($website/tree[1], $target-slug, "")
     )`)}
-  }</ochre>`;
+  }</ochre>`
+	});
 }
 async function fetchWebsiteMetadata(abbreviation, options) {
 	try {
 		if (options?.slug == null) throw new Error("Website metadata slug is required");
 		const cleanAbbreviation = abbreviation.trim().toLocaleLowerCase("en-US");
 		const slug = options.slug.trim().replaceAll(/^\/+|\/+$/g, "");
-		const requestedLanguages = Array.from(options.languages ?? [], (language) => v.parse(iso639_3Schema, language));
-		const response = await (options.fetch ?? fetch)("https://ochre.lib.uchicago.edu/ochre/v2/ochre.php?xquery&xsl=none&lang=\"*\"", {
-			method: "POST",
-			body: buildXQuery({
+		const requestedLanguages = parseRequestedLanguages(options.languages);
+		const output = await requestOchre({
+			xquery: buildXQuery({
 				abbreviation: cleanAbbreviation,
 				slug
 			}),
-			headers: { "Content-Type": "application/xquery" }
+			schema: XMLWebsiteData,
+			label: "OCHRE website metadata",
+			options
 		});
-		if (!response.ok) throw new Error("Failed to fetch website metadata", { cause: response.statusText });
-		const dataRaw = await response.text();
-		const data = new XMLParser(XML_PARSER_OPTIONS).parse(dataRaw);
-		const { success, issues, output } = v.safeParse(XMLWebsiteData, data);
-		if (!success) throw createSchemaValidationError("Failed to parse website metadata XML", issues);
-		restoreXMLMetadata(output, data);
 		const metadataLanguages = parseMetadataLanguages(output.result.ochre);
 		return {
 			websiteMetadata: parseWebsiteMetadata(output, { languages: resolveLanguages(requestedLanguages, metadataLanguages) }),

package/dist/fetchers/website.d.mts

@@ -1,6 +1,6 @@
 import { ProtectedWebsite, Website } from "../types/website.mjs";
 import { LanguageCodes } from "../types/index.mjs";
-import { FetchFunction } from "../parsers/helpers.mjs";
+import { OchreRequestOptions } from "./request.mjs";
 //#region src/fetchers/website.d.ts
 /**
  * Fetches and parses a website configuration from the OCHRE API.
@@ -11,8 +11,7 @@ import { FetchFunction } from "../parsers/helpers.mjs";
  * `username` and `password` for OCHRE accounts) to authenticate and receive the full
  * website data.
  */
-export declare function fetchWebsite<const T extends LanguageCodes = LanguageCodes>(abbreviation: string, options?: {
-  fetch?: FetchFunction;
+export declare function fetchWebsite<const T extends LanguageCodes = LanguageCodes>(abbreviation: string, options?: OchreRequestOptions & {
   languages?: T;
   credentials?: string | {
     username: string;

package/dist/fetchers/website.mjs

@@ -1,24 +1,23 @@
-import { XML_PARSER_OPTIONS } from "../constants.mjs";
-import { SUPPLEMENTAL_XQUERY_PROLOG, createSchemaValidationError, getErrorOutput, omitSupplemental, stringLiteral } from "../utilities.mjs";
-import { restoreXMLMetadata } from "../xml/metadata.mjs";
+import { getErrorOutput } from "../errors.mjs";
+import { isOchreJsonAccepted, requestOchre } from "./request.mjs";
+import { parseLanguages } from "../parsers/languages.mjs";
 import { XMLWebsiteData } from "../xml/schemas.mjs";
+import { compileOchreQuery, stringLiteral } from "../xquery.mjs";
 import { parseWebsite } from "../parsers/website/index.mjs";
-import * as v from "valibot";
-import { XMLParser } from "fast-xml-parser";
 //#region src/fetchers/website.ts
-async function areWebsiteCredentialsValid(uuid, credentials, fetcher) {
+async function areWebsiteCredentialsValid(uuid, credentials, options) {
 	const security = typeof credentials === "string" ? { validate: credentials } : {
 		validate: credentials.password,
 		userOCHRE: credentials.username
 	};
-	return (await fetcher("https://ochre.lib.uchicago.edu/ochre/v2/ochre.php", {
-		method: "POST",
-		body: JSON.stringify({
+	return isOchreJsonAccepted({
+		body: {
 			uuid,
 			data: { security }
-		}),
-		headers: { "Content-Type": "application/json" }
-	})).ok;
+		},
+		label: "website credentials",
+		options
+	});
 }
 /**
 * Build an XQuery string to fetch a website tree document by abbreviation.
@@ -27,12 +26,8 @@ async function areWebsiteCredentialsValid(uuid, credentials, fetcher) {
 * @returns An XQuery string
 */
 function buildXQuery(abbreviation) {
-	return `xquery version "1.0-ml";
-
-${SUPPLEMENTAL_XQUERY_PROLOG}
-
-for $ochre in collection("ochre/tree")/ochre[tree/identification/abbreviation/content/string = ${stringLiteral(abbreviation)}]
-return element ochre { $ochre/@*, ${omitSupplemental("$ochre/node()")} }`;
+	return compileOchreQuery({ body: ({ omitSupplemental }) => `for $ochre in collection("ochre/tree")/ochre[tree/identification/abbreviation/content/string = ${stringLiteral(abbreviation)}]
+return element ochre { $ochre/@*, ${omitSupplemental("$ochre/node()")} }` });
 }
 /**
 * Fetches and parses a website configuration from the OCHRE API.
@@ -45,19 +40,15 @@ return element ochre { $ochre/@*, ${omitSupplemental("$ochre/node()")} }`;
 */
 async function fetchWebsite(abbreviation, options) {
 	try {
-		const fetcher = options?.fetch ?? fetch;
-		const response = await fetcher("https://ochre.lib.uchicago.edu/ochre/v2/ochre.php?xquery&xsl=none&lang=\"*\"", {
-			method: "POST",
-			body: buildXQuery(abbreviation.trim().toLocaleLowerCase("en-US")),
-			headers: { "Content-Type": "application/xquery" }
+		const cleanAbbreviation = abbreviation.trim().toLocaleLowerCase("en-US");
+		const languages = options?.languages == null ? void 0 : parseLanguages(options.languages);
+		const output = await requestOchre({
+			xquery: buildXQuery(cleanAbbreviation),
+			schema: XMLWebsiteData,
+			label: "OCHRE website",
+			options
 		});
-		if (!response.ok) throw new Error("Failed to fetch website", { cause: response.statusText });
-		const dataRaw = await response.text();
-		const data = new XMLParser(XML_PARSER_OPTIONS).parse(dataRaw);
-		const { success, issues, output } = v.safeParse(XMLWebsiteData, data);
-		if (!success) throw createSchemaValidationError("Failed to parse website XML", issues);
-		restoreXMLMetadata(output, data);
-		const website = parseWebsite(output, { languages: options?.languages });
+		const website = parseWebsite(output, { languages });
 		if (website.properties.privacy !== "public") {
 			if (options?.credentials == null) return {
 				website: null,
@@ -69,7 +60,7 @@ async function fetchWebsite(abbreviation, options) {
 				error: null,
 				detailedError: null
 			};
-			if (!await areWebsiteCredentialsValid(website.uuid, options.credentials, fetcher)) throw new Error("Invalid credentials for protected website");
+			if (!await areWebsiteCredentialsValid(website.uuid, options.credentials, options)) throw new Error("Invalid credentials for protected website");
 		}
 		return {
 			website,