ochre-sdk 1.0.8 → 1.0.10

package/dist/index.mjs

@@ -621,33 +621,6 @@ function createSchemaValidationError(message, issues) {
 	return new Error(message, { cause: issues });
 }
 /**
-* Logs Valibot validation issues to the console with detailed formatting
-* @param issues - The validation issues to log
-* @param depth - The depth of the issues for indentation
-* @internal
-*/
-function logIssues(issues, depth = 0) {
-	if (issues == null) return;
-	for (const issue of issues) {
-		const indent = "  ".repeat(depth);
-		const prefix = depth === 0 ? "❌" : "└─";
-		const pathStr = issue.path != null && issue.path.length > 0 ? ` at ${v.getDotPath(issue)}` : "";
-		const typeInfo = `[${issue.kind}:${issue.type}]`;
-		console.error(`${indent}${prefix} ${typeInfo} ${issue.message}${pathStr}`);
-		if (issue.expected != null) {
-			console.error(`${indent}   Expected: ${issue.expected}`);
-			console.error(`${indent}   Received: ${issue.received}`);
-		}
-		if (issue.input !== void 0 && typeof issue.input !== "object") console.error(`${indent}   Input: ${JSON.stringify(issue.input)}`);
-		if (issue.requirement !== void 0) console.error(`${indent}   Requirement: ${JSON.stringify(issue.requirement)}`);
-		if (issue.issues != null && issue.issues.length > 0) {
-			console.error(`${indent}   Nested issues:`);
-			logIssues(issue.issues, depth + 1);
-		}
-		if (depth === 0) console.error("");
-	}
-}
-/**
 * Validates a pseudo-UUID string
 * @param value - The string to validate
 * @returns True if the string is a valid pseudo-UUID, false otherwise
@@ -785,11 +758,6 @@ const whitespaceSchema = v.pipe(v.string(), v.transform((str) => str.split(" "))
 	"leading"
 ])));
 /**
-* Schema for validating email addresses
-* @internal
-*/
-const emailSchema = v.pipe(v.string(), v.email("Invalid email address"));
-/**
 * Schema for validating date data types
 * @internal
 */
@@ -983,9 +951,6 @@ const ITEM_PAGE_TOKEN = "item-page";
 const ENTRY_PAGE_TOKEN = "entry-page";
 const VARIANT_TOKEN = "variant";
 const HEADING_LEVEL_TOKEN = "heading-level";
-const EMAIL_BRACKET_CLEANUP_REGEX = /(?<=\s|^)[([{]+|[)\]}]+(?=\s|$)/g;
-const EMAIL_PUNCTUATION_CLEANUP_REGEX = /[!),:;?\]]/g;
-const EMAIL_TRAILING_PERIOD_REGEX = /\.$/;
 const MDX_QUOTED_ATTRIBUTE_ESCAPE_REGEX = /[\n\r"]/;
 const MDX_RENDER_ELEMENTS = {
 	bold: "strong",
@@ -1007,31 +972,6 @@ function transformPermanentIdentificationUrl(url) {
 	return url.replace("https://pi.lib.uchicago.edu/1001/org/ochre/", "https://ochre.lib.uchicago.edu/ochre/v2/ochre.php?uuid=");
 }
 /**
-* Parses email addresses in a string into HTML links
-*
-* @param string - Input string to parse
-* @returns String with emails converted to HTML links
-*
-* @internal
-*/
-function parseEmail(string) {
-	const splitString = string.split(" ");
-	const returnSplitString = [];
-	for (const string of splitString) {
-		const cleanString = transformPermanentIdentificationUrl(string).replaceAll(EMAIL_BRACKET_CLEANUP_REGEX, "").replaceAll(EMAIL_PUNCTUATION_CLEANUP_REGEX, "").replace(EMAIL_TRAILING_PERIOD_REGEX, "");
-		const index = string.indexOf(cleanString);
-		const { success } = v.safeParse(emailSchema, cleanString);
-		if (success) {
-			const before = index === -1 ? "" : string.slice(0, index);
-			const after = index === -1 ? "" : string.slice(index + cleanString.length);
-			returnSplitString.push(`${before}<ExternalLink href="mailto:${cleanString}">${cleanString}</ExternalLink>${after}`);
-			continue;
-		}
-		returnSplitString.push(string);
-	}
-	return returnSplitString.join(" ");
-}
-/**
 * Applies text rendering options (bold, italic, underline) to a string
 *
 * @param contentString - The string content to render
@@ -1096,7 +1036,6 @@ function parseWhitespace(contentString, whitespace, rendering) {
 * @param string - XML string to parse
 * @param options - Options for parsing
 * @param options.rendering - Which text rendering to produce
-* @param options.parseEmail - Whether to parse email addresses
 * @returns Formatted string with whitespace and rendering options
 *
 * @internal
@@ -1108,19 +1047,12 @@ function parseXMLStringVariant(string, options) {
 	return returnString;
 }
 function parseXMLStringPayload(string, options) {
-	const returnString = (string.payload ?? "").replaceAll("<", options.rendering === "rich" ? String.raw`\<` : "<").replaceAll("{", String.raw`\{`).replaceAll("}", String.raw`\}`);
-	return options.parseEmail ? parseEmail(returnString) : returnString;
+	return (string.payload ?? "").replaceAll("<", options.rendering === "rich" ? String.raw`\<` : "<").replaceAll("{", String.raw`\{`).replaceAll("}", String.raw`\}`);
 }
-function parseXMLString(string, options) {
+function parseXMLString(string) {
 	return {
-		text: parseXMLStringVariant(string, {
-			rendering: "plain",
-			parseEmail: false
-		}),
-		richText: parseXMLStringVariant(string, {
-			rendering: "rich",
-			parseEmail: options.parseEmail
-		})
+		text: parseXMLStringVariant(string, { rendering: "plain" }),
+		richText: parseXMLStringVariant(string, { rendering: "rich" })
 	};
 }
 /**
@@ -1185,7 +1117,7 @@ function getFirstPropertyMetadata(item) {
 }
 function parseContentLikeForLanguage(value, options) {
 	if (value == null) return "";
-	if (!("content" in value)) return parseXMLString(value, { parseEmail: false }).text;
+	if (!("content" in value)) return parseXMLString(value).text;
 	const contentItem = value.content.find((item) => item.lang === options.language) ?? value.content[0];
 	if (contentItem == null) return "";
 	const languages = [contentItem.lang];
@@ -1272,21 +1204,12 @@ function hasRichTextEnvelope(item) {
 function parseXMLStringItem(item, contentItem, options) {
 	if (!(item.payload != null || item.string != null) && getXMLRichTextLinks(item).length === 0) return item.whitespace == null ? "" : parseWhitespace("", item.whitespace, options.rendering);
 	if (hasRichTextEnvelope(item)) {
-		let linkString = item.payload != null ? parseXMLStringPayload(item, {
-			rendering: options.rendering,
-			parseEmail: false
-		}) : parseNestedStringItems(item.string ?? [], contentItem, {
-			...options,
-			parseEmail: false
-		});
+		let linkString = item.payload != null ? parseXMLStringPayload(item, { rendering: options.rendering }) : parseNestedStringItems(item.string ?? [], contentItem, { ...options });
 		if (item.rend != null) linkString = parseRenderOptions(linkString, item.rend, options.rendering);
 		if (options.rendering === "plain") return applyWhitespaceToResult(linkString, item.whitespace, options.rendering);
 		return renderRichTextItem(item, linkString, contentItem, options);
 	}
-	if (item.payload != null) return parseXMLStringVariant(item, {
-		rendering: options.rendering,
-		parseEmail: options.parseEmail
-	});
+	if (item.payload != null) return parseXMLStringVariant(item, { rendering: options.rendering });
 	let result = parseNestedStringItems(item.string ?? [], contentItem, options);
 	if (item.rend != null) result = parseRenderOptions(result, item.rend, options.rendering);
 	return applyWhitespaceToResult(result, item.whitespace, options.rendering);
@@ -1342,7 +1265,7 @@ function renderRichTextItem(item, linkString, contentItem, options) {
 	if (links.length === 0) return applyWhitespaceToResult(wrapWithTextStyling(linkString, annotationMetadata.textStyling), item.whitespace, rendering);
 	let result = "";
 	for (const link of links) {
-		const linkContent = link.identification != null ? "content" in link.identification.label ? parseXMLContent(link.identification.label, { languages }) : MultilingualString.create(contentItem.lang, parseXMLString(link.identification.label, { parseEmail: false }), languages) : MultilingualString.create(contentItem.lang, "", languages);
+		const linkContent = link.identification != null ? "content" in link.identification.label ? parseXMLContent(link.identification.label, { languages }) : MultilingualString.create(contentItem.lang, parseXMLString(link.identification.label), languages) : MultilingualString.create(contentItem.lang, "", languages);
 		const contentText = (rendering === "rich" ? linkContent.getExactRichText(contentItem.lang) : linkContent.getExactText(contentItem.lang)) ?? "";
 		if ("type" in link && link.type != null) switch (link.type) {
 			case "IIIF":
@@ -1463,13 +1386,11 @@ function parseXMLContentItem(contentItem, options) {
 	return {
 		text: parseNestedStringItems(contentItem.string, contentItem, {
 			...options,
-			rendering: "plain",
-			parseEmail: false
+			rendering: "plain"
 		}),
 		richText: parseNestedStringItems(contentItem.string, contentItem, {
 			...options,
-			rendering: "rich",
-			parseEmail: true
+			rendering: "rich"
 		})
 	};
 }
@@ -1508,10 +1429,10 @@ function parseLicense(availability) {
 		target: availability.license.target ?? null
 	};
 }
-function parseStringLike(value, options = {}) {
+function parseStringLike(value) {
 	if (value == null) return null;
 	if (typeof value === "string") return value;
-	return parseXMLString(value, { parseEmail: options.parseEmail ?? false }).text;
+	return parseXMLString(value).text;
 }
 function isXMLContent(value) {
 	return "content" in value;
@@ -1524,7 +1445,7 @@ function multilingualFromText(text, options) {
 function parseContentLike(value, options) {
 	if (value == null) return null;
 	if (typeof value === "string") return multilingualFromText(value, options);
-	if (!isXMLContent(value)) return multilingualFromText(parseXMLString(value, { parseEmail: true }), options);
+	if (!isXMLContent(value)) return multilingualFromText(parseXMLString(value), options);
 	return parseXMLContent(value, { languages: options.languages });
 }
 function parseRequiredContentLike(value, options) {
@@ -1537,7 +1458,7 @@ function parseStringContent(value, options = FALLBACK_PARSER_OPTIONS) {
 	if (value == null) return "";
 	if (typeof value === "string") return value;
 	if (isXMLContent(value)) return parseXMLContent(value, { languages: options.languages }).getText();
-	return parseXMLString(value, { parseEmail: true }).text;
+	return parseXMLString(value).text;
 }
 //#endregion
 //#region src/parsers/index.ts
@@ -1970,7 +1891,7 @@ function parseImageMap(rawImageMap) {
 function parseNote(rawNote, options) {
 	const authors = [];
 	for (const author of rawNote.authors?.author ?? []) authors.push(parsePerson(author, options));
-	const content = rawNote.content == null ? multilingualFromText(parseXMLString(rawNote, { parseEmail: true }), options) : parseRequiredContentLike(rawNote, options);
+	const content = rawNote.content == null ? multilingualFromText(parseXMLString(rawNote), options) : parseRequiredContentLike(rawNote, options);
 	return {
 		number: rawNote.noteNo ?? 0,
 		title: parseNoteTitle(rawNote, options),
@@ -3766,10 +3687,7 @@ async function fetchGallery(params, options) {
 		const dataRaw = await response.text();
 		const data = new XMLParser(XML_PARSER_OPTIONS).parse(dataRaw);
 		const { success, issues, output } = v.safeParse(XMLGalleryData, data);
-		if (!success) {
-			logIssues(issues);
-			throw createSchemaValidationError("Failed to parse gallery XML", issues);
-		}
+		if (!success) throw createSchemaValidationError("Failed to parse gallery XML", issues);
 		restoreXMLMetadata(output, data);
 		return {
 			gallery: parseGallery(output, { languages: resolveGalleryLanguages(output, requestedLanguages) }),
@@ -3777,7 +3695,6 @@ async function fetchGallery(params, options) {
 			detailedError: null
 		};
 	} catch (error) {
-		console.error(error);
 		return {
 			gallery: null,
 			...getErrorOutput(error, "Failed to fetch gallery")
@@ -3877,10 +3794,7 @@ async function fetchItemLinks(uuid, options) {
 		const dataRaw = await response.text();
 		const data = new XMLParser(XML_PARSER_OPTIONS).parse(dataRaw);
 		const { success, issues, output } = v.safeParse(XMLItemLinksData, data);
-		if (!success) {
-			logIssues(issues);
-			throw createSchemaValidationError("Failed to parse OCHRE item links", issues);
-		}
+		if (!success) throw createSchemaValidationError("Failed to parse OCHRE item links", issues);
 		restoreXMLMetadata(output, data);
 		const languages = resolveItemLinksLanguages(output, requestedLanguages);
 		return {
@@ -3892,7 +3806,6 @@ async function fetchItemLinks(uuid, options) {
 			detailedError: null
 		};
 	} catch (error) {
-		console.error(error);
 		return {
 			items: null,
 			...getErrorOutput(error, "Unknown error")
@@ -3979,10 +3892,7 @@ async function fetchItem(uuid, options) {
 		const dataRaw = await response.text();
 		const data = new XMLParser(XML_PARSER_OPTIONS).parse(dataRaw);
 		const { success, issues, output } = v.safeParse(XMLData, data);
-		if (!success) {
-			logIssues(issues);
-			throw createSchemaValidationError("Failed to parse OCHRE data", issues);
-		}
+		if (!success) throw createSchemaValidationError("Failed to parse OCHRE data", issues);
 		restoreXMLMetadata(output, data);
 		const category = options?.category ?? inferFetchItemCategory(output.result.ochre);
 		assertItemCategoryAllowed(category, options?.containedItemCategory);
@@ -3996,7 +3906,6 @@ async function fetchItem(uuid, options) {
 			detailedError: null
 		};
 	} catch (error) {
-		console.error(error);
 		return {
 			item: null,
 			...getErrorOutput(error, "Unknown error")
@@ -5054,10 +4963,7 @@ async function fetchSetItems(params, containedItemCategories, options) {
 		const dataRaw = await response.text();
 		const data = new XMLParser(XML_PARSER_OPTIONS).parse(dataRaw);
 		const { success, issues, output } = v.safeParse(XMLSetItemsData, data);
-		if (!success) {
-			logIssues(issues);
-			throw createSchemaValidationError("Failed to parse OCHRE Set items", issues);
-		}
+		if (!success) throw createSchemaValidationError("Failed to parse OCHRE Set items", issues);
 		restoreXMLMetadata(output, data);
 		if (containedItemCategories != null) {
 			const missingCategories = containedItemCategories.filter((category) => !hasSetItemsCategory(output.result.ochre.items, category));
@@ -5080,7 +4986,6 @@ async function fetchSetItems(params, containedItemCategories, options) {
 			detailedError: null
 		};
 	} catch (error) {
-		console.error(error);
 		return {
 			totalCount: null,
 			page: null,
@@ -5533,10 +5438,7 @@ async function fetchSetPropertyValues(params, options) {
 		const dataRaw = await response.text();
 		const data = new XMLParser(XML_PARSER_OPTIONS).parse(dataRaw);
 		const { success, issues, output } = v.safeParse(responseSchema, data);
-		if (!success) {
-			logIssues(issues);
-			throw createSchemaValidationError("Failed to parse OCHRE Set property values", issues);
-		}
+		if (!success) throw createSchemaValidationError("Failed to parse OCHRE Set property values", issues);
 		const parsedPropertyValues = [];
 		const parsedAttributeValues = [];
 		if (output.result.ochre.propertyValue != null) parsedPropertyValues.push(...Array.isArray(output.result.ochre.propertyValue) ? output.result.ochre.propertyValue : [output.result.ochre.propertyValue]);
@@ -5590,7 +5492,6 @@ async function fetchSetPropertyValues(params, options) {
 			detailedError: null
 		};
 	} catch (error) {
-		console.error(error);
 		return {
 			propertyValues: null,
 			propertyValuesByPropertyVariableUuid: null,
@@ -6677,11 +6578,8 @@ function parseWebElementProperties(componentProperty, elementResource, options)
 			};
 			break;
 		}
-		default:
-			console.warn(`Invalid or non-implemented component name “${unparsedComponentName.toString()}” for the following element: “${parseStringContent(elementResource.identification.label, options)}”`);
-			break;
+		default: throw new Error(`Invalid or non-implemented component name “${unparsedComponentName.toString()}” for the following element: “${parseStringContent(elementResource.identification.label, options)}”`);
 	}
-	if (properties === null) throw new Error(formatComponentError("Properties not found", componentName, elementResource), { cause: componentProperty });
 	return properties;
 }
 function parseWebTitle(properties, identification, overrides) {
@@ -7262,10 +7160,7 @@ async function fetchWebsite(abbreviation, options) {
 		const dataRaw = await response.text();
 		const data = new XMLParser(XML_PARSER_OPTIONS).parse(dataRaw);
 		const { success, issues, output } = v.safeParse(XMLWebsiteData, data);
-		if (!success) {
-			logIssues(issues);
-			throw createSchemaValidationError("Failed to parse website XML", issues);
-		}
+		if (!success) throw createSchemaValidationError("Failed to parse website XML", issues);
 		restoreXMLMetadata(output, data);
 		return {
 			website: parseWebsite(output, { languages: options?.languages }),
@@ -7273,7 +7168,6 @@ async function fetchWebsite(abbreviation, options) {
 			detailedError: null
 		};
 	} catch (error) {
-		console.error(error);
 		return {
 			website: null,
 			...getErrorOutput(error, "Unknown error")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ochre-sdk",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "type": "module",
   "license": "MIT",
   "description": "Node.js library for working with OCHRE (Online Cultural and Historical Research Environment) data",
@@ -52,7 +52,7 @@
     "@antfu/eslint-config": "^9.0.0",
     "@types/node": "^24.12.4",
     "bumpp": "^11.1.0",
-    "eslint": "^10.3.0",
+    "eslint": "^10.4.0",
     "prettier": "^3.8.3",
     "tsdown": "^0.22.0",
     "typescript": "^6.0.3",