ochre-sdk 1.0.65 → 1.0.67

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

@@ -13,7 +13,7 @@ function getLabelContentLanguages(content) {
 	return languages.length > 0 ? languages : [...DEFAULT_LANGUAGES];
 }
 function parsePropertyValueLabelText(text) {
-	if (text == null || text === "") return null;
+	if (text === "" || text == null) return null;
 	return text === "<unassigned>" ? null : text;
 }
 function parsePropertyValueLabel(content, text) {
@@ -23,7 +23,7 @@ function parsePropertyValueLabel(content, text) {
 	return MultilingualString.fromObject({ [DEFAULT_LANGUAGES[0]]: parsedText });
 }
 function parsePropertyValueBooleanContent(rawValue) {
-	if (rawValue == null || rawValue === "") return null;
+	if (rawValue === "" || rawValue == null) return null;
 	return rawValue.toLocaleLowerCase("en-US") === "true";
 }
 function normalizePropertyValueDataType(dataType) {

package/dist/parsers/index.mjs

@@ -242,7 +242,7 @@ function isResourceWrapper(value) {
 function sourceOrderSort(left, right) {
 	const leftIndex = getXMLSourceIndex(left.item);
 	const rightIndex = getXMLSourceIndex(right.item);
-	if (leftIndex != null && rightIndex != null && leftIndex !== rightIndex) return leftIndex - rightIndex;
+	if (leftIndex !== rightIndex && leftIndex != null && rightIndex != null) return leftIndex - rightIndex;
 	return left.fallbackIndex - right.fallbackIndex;
 }
 function collectHierarchyEntries(hierarchy, categories) {
@@ -297,7 +297,7 @@ function normalizeSetItemCategories(containedItemCategory) {
 	return uniqueCategories;
 }
 function normalizeTreeItemCategory(containedItemCategory) {
-	if (containedItemCategory != null && typeof containedItemCategory !== "string") throw new Error("Tree containedItemCategory must be a single category", { cause: containedItemCategory });
+	if (typeof containedItemCategory !== "string" && containedItemCategory != null) throw new Error("Tree containedItemCategory must be a single category", { cause: containedItemCategory });
 	if (containedItemCategory === "tree") throw new Error("Tree containedItemCategory cannot be \"tree\"", { cause: containedItemCategory });
 	return containedItemCategory;
 }
@@ -306,7 +306,7 @@ function resolveTreeItemCategory(rawTree, containedItemCategory) {
 	if (inferredCategories.length > 1) throw new Error(`Expected Tree items to contain one category, received ${inferredCategories.join(", ")}`, { cause: inferredCategories });
 	const inferredCategory = inferredCategories[0] ?? null;
 	if (inferredCategory === "tree") throw new Error("Tree items cannot contain category \"tree\"", { cause: inferredCategory });
-	if (containedItemCategory != null && inferredCategory != null && containedItemCategory !== inferredCategory) throw new Error(`Tree containedItemCategory "${containedItemCategory}" does not match XML items category "${inferredCategory}"`, { cause: {
+	if (containedItemCategory !== inferredCategory && containedItemCategory != null && inferredCategory != null) throw new Error(`Tree containedItemCategory "${containedItemCategory}" does not match XML items category "${inferredCategory}"`, { cause: {
 		containedItemCategory,
 		inferredCategory
 	} });
@@ -456,7 +456,7 @@ function parseNotes(rawNotes, options) {
 	return Array.from(rawNotes?.note ?? [], (note) => parseNote(note, options));
 }
 function parsePropertyDataType(dataType) {
-	if (dataType == null || dataType === "") return "string";
+	if (dataType === "" || dataType == null) return "string";
 	const normalizedDataType = dataType.startsWith("xs:") ? dataType.slice(3) : dataType;
 	for (const propertyDataType of PROPERTY_DATA_TYPES) if (normalizedDataType === propertyDataType) return propertyDataType;
 	throw new Error(`Invalid property value data type: ${dataType}`, { cause: dataType });
@@ -645,7 +645,7 @@ function parseSetItemHierarchy(hierarchy, options, categories) {
 }
 function normalizeTreeLinkItemsCategory(type) {
 	const category = normalizeCategory(type);
-	if (category == null || category === "tree") return null;
+	if (category === "tree" || category == null) return null;
 	return category;
 }
 function normalizeSetLinkItemsCategory(type) {

package/dist/parsers/string.mjs

@@ -139,7 +139,7 @@ function getDistinctTooltipContent(content, textContent) {
 	return content === textContent ? void 0 : content;
 }
 function createMDXStringAttribute(name, value) {
-	if (value == null || value === "") return "";
+	if (value === "" || value == null) return "";
 	return ` ${name}=${MDX_QUOTED_ATTRIBUTE_ESCAPE_REGEX.test(value) ? `{${JSON.stringify(value)}}` : `"${value}"`}`;
 }
 function getPropertyValueUuid(property) {
@@ -324,7 +324,7 @@ function getXMLRichTextLinks(item) {
 	for (const rawLinks of linkGroups) {
 		if (!Array.isArray(rawLinks)) continue;
 		for (const rawLink of rawLinks) {
-			if (!(isXMLRichTextLink(rawLink) && !isTextAnnotationMarkerLink(rawLink))) continue;
+			if (!isXMLRichTextLink(rawLink) || isTextAnnotationMarkerLink(rawLink)) continue;
 			links.push({
 				link: rawLink,
 				fallbackIndex
@@ -335,7 +335,7 @@ function getXMLRichTextLinks(item) {
 	links.sort((left, right) => {
 		const leftIndex = getXMLSourceIndex(left.link);
 		const rightIndex = getXMLSourceIndex(right.link);
-		if (leftIndex != null && rightIndex != null && leftIndex !== rightIndex) return leftIndex - rightIndex;
+		if (leftIndex !== rightIndex && leftIndex != null && rightIndex != null) return leftIndex - rightIndex;
 		return left.fallbackIndex - right.fallbackIndex;
 	});
 	const sortedLinks = [];

package/dist/parsers/website/index.mjs

@@ -41,7 +41,7 @@ function cleanWebsitePageSlug(slug) {
 	return slug?.replace(SEGMENT_UNIQUE_SLUG_PREFIX_REGEX, "") ?? null;
 }
 function prefixSlug(slug, slugPrefix) {
-	if (slugPrefix == null || slugPrefix === "") return slug;
+	if (slugPrefix === "" || slugPrefix == null) return slug;
 	if (slug === "") return slugPrefix;
 	return `${slugPrefix}/${slug}`;
 }
@@ -126,7 +126,7 @@ function parseResponsiveCssStyles(properties) {
 * @returns Parsed bounds object
 */
 function parseBounds(bounds) {
-	const [southWest, northEast] = bounds.trim().startsWith("[") ? parseJsonBounds(bounds) : bounds.split(";").map((pair) => pair.split(",").map((coordinate) => Number(coordinate.trim())));
+	const [southWest, northEast] = bounds.trimStart().startsWith("[") ? parseJsonBounds(bounds) : bounds.split(";").map((pair) => pair.split(",").map((coordinate) => Number(coordinate.trim())));
 	if (southWest?.length !== 2 || northEast?.length !== 2 || southWest.some((coordinate) => Number.isNaN(coordinate)) || northEast.some((coordinate) => Number.isNaN(coordinate))) throw new Error(`Invalid bounds: ${bounds}`, { cause: bounds });
 	return [[southWest[0], southWest[1]], [northEast[0], northEast[1]]];
 }
@@ -248,8 +248,6 @@ const COLLECTION_PROPERTY_DEFAULTS = {
 	variant: "slide",
 	paginationVariant: "default",
 	loadingVariant: "skeleton",
-	imageLayout: "start",
-	isImagePlaceholderDisplayed: true,
 	minimumColumnCount: null,
 	maximumColumnCount: null,
 	expectedItemCount: null,
@@ -258,29 +256,51 @@ const COLLECTION_PROPERTY_DEFAULTS = {
 	isInteractive: true
 };
 /**
+* Default values for a collection's image display properties, merged separately
+* from {@link COLLECTION_PROPERTY_DEFAULTS} because overrides of the nested
+* "image" object are themselves partial.
+*/
+const COLLECTION_IMAGE_DEFAULTS = {
+	layout: "start",
+	fit: "fit",
+	alignment: null,
+	isPlaceholderDisplayed: true
+};
+/**
 * Reads the collection display properties explicitly set on a reader, omitting
 * any that are unset. The "collection" component merges these over
-* {@link COLLECTION_PROPERTY_DEFAULTS}, while the "query" component uses them as
-* partial overrides for its embedded collection.
+* {@link COLLECTION_PROPERTY_DEFAULTS} and {@link COLLECTION_IMAGE_DEFAULTS},
+* while the "query" component uses them as partial overrides for its embedded
+* collection.
 */
 function parseCollectionPropertyOverrides(reader) {
 	const overrides = {};
+	const imageOverrides = {};
 	function read(key, label) {
 		const value = reader.value(label);
 		if (value != null) overrides[key] = value;
 	}
+	function readImage(key, label) {
+		const value = reader.value(label);
+		if (value != null) imageOverrides[key] = value;
+	}
 	read("variant", "variant");
 	read("paginationVariant", "pagination-variant");
 	read("loadingVariant", "loading-variant");
-	read("imageLayout", "image-layout");
-	read("isImagePlaceholderDisplayed", "image-placeholder-displayed");
 	read("minimumColumnCount", "minimum-column-count");
 	read("maximumColumnCount", "maximum-column-count");
 	read("expectedItemCount", "item-count");
 	read("isSortDisplayed", "sort-displayed");
 	read("isUsingQueryParams", "is-using-query-params");
 	read("isInteractive", "is-interactive");
-	return overrides;
+	readImage("layout", "image-layout");
+	readImage("fit", "image-fit");
+	readImage("alignment", "image-alignment");
+	readImage("isPlaceholderDisplayed", "image-placeholder-displayed");
+	return Object.keys(imageOverrides).length > 0 ? {
+		...overrides,
+		image: imageOverrides
+	} : overrides;
 }
 /**
 * Parses the "use-property" values defining which item properties a collection
@@ -444,12 +464,17 @@ function parseWebElementProperties(componentProperty, elementResource, options,
 			const isFilterSidebarDisplayed = componentReader.valueOr("filter-sidebar-displayed", false);
 			const filterSidebarSort = componentReader.valueOr("filter-sidebar-sort", "default");
 			const componentOptions = parseWebsiteOptions(elementResource.options, options);
+			const propertyOverrides = parseCollectionPropertyOverrides(componentReader);
 			properties = {
 				component: "collection",
 				linkUuids: setLinks.map((link) => link.uuid),
 				displayedProperties: parseCollectionDisplayedProperties(componentReader),
 				...COLLECTION_PROPERTY_DEFAULTS,
-				...parseCollectionPropertyOverrides(componentReader),
+				...propertyOverrides,
+				image: {
+					...COLLECTION_IMAGE_DEFAULTS,
+					...propertyOverrides.image
+				},
 				filter: {
 					isSidebarDisplayed: isFilterSidebarDisplayed,
 					isResultsBarDisplayed: isFilterResultsBarDisplayed,
@@ -1254,7 +1279,7 @@ function parseContextItem(contextItemToParse, options) {
 	const levels = [];
 	const levelsToParse = contextItemToParse.levels?.level ?? [];
 	for (const level of levelsToParse) {
-		const [rawVariableUuid = "", rawValueUuid] = level.payload.split(",");
+		const [rawVariableUuid = "", rawValueUuid] = level.payload.split(",", 2);
 		const valueUuid = rawValueUuid == null || rawValueUuid.trim() === "null" ? null : rawValueUuid.trim();
 		type = level.dataType ?? type;
 		levels.push({

package/dist/query.mjs

@@ -99,7 +99,7 @@ function buildWordQueryOptionsExpression(parameters) {
 	if (matchMode === "exact") options.push("unstemmed", "unwildcarded");
 	else if (queryFamily === "text") {
 		options.push(isStemmed ? "stemmed" : "unstemmed", isWildcarded ? "wildcarded" : "unwildcarded");
-		if (isStemmed && language != null && language !== "") options.push(`lang=${language}`);
+		if (isStemmed && language !== "" && language != null) options.push(`lang=${language}`);
 	}
 	return `(${options.map((option) => stringLiteral(option)).join(", ")})`;
 }

package/dist/types/website.d.mts

@@ -319,8 +319,12 @@ type WebElementComponent<T extends LanguageCodes = LanguageCodes> = {
   variant: "slide" | "table" | "card" | "tile" | "showcase";
   paginationVariant: "default" | "numeric";
   loadingVariant: "spinner" | "skeleton" | "animation" | "none";
-  imageLayout: "top" | "bottom" | "start" | "end" | null;
-  isImagePlaceholderDisplayed: boolean;
+  image: {
+    layout: "top" | "bottom" | "start" | "end" | null;
+    fit: "fill" | "fit";
+    alignment: "top" | "center" | "bottom" | null;
+    isPlaceholderDisplayed: boolean;
+  };
   minimumColumnCount: number | null;
   maximumColumnCount: number | null;
   expectedItemCount: number | null;
@@ -409,7 +413,11 @@ type WebElementComponent<T extends LanguageCodes = LanguageCodes> = {
   };
   collectionProperties: Prettify<Partial<Omit<Extract<WebElementComponent<T>, {
     component: "collection";
-  }>, "component" | "linkUuids" | "options">>>;
+  }>, "component" | "linkUuids" | "options" | "image"> & {
+    image: Partial<Extract<WebElementComponent<T>, {
+      component: "collection";
+    }>["image"]>;
+  }>>;
 } | {
   component: "search-bar";
   queryVariant: "submit" | "change";

package/dist/xml/schemas.mjs

@@ -24,7 +24,7 @@ function parseXMLNumber(value) {
 }
 function parseOptionalXMLNumber(value) {
 	const payload = getXMLStringPayload(value);
-	return payload == null || payload === "" ? void 0 : Number(payload);
+	return payload === "" || payload == null ? void 0 : Number(payload);
 }
 const ITEM_CATEGORIES = [
 	"tree",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ochre-sdk",
-  "version": "1.0.65",
+  "version": "1.0.67",
   "type": "module",
   "license": "MIT",
   "description": "Node.js library for working with OCHRE (Online Cultural and Historical Research Environment) data",
@@ -51,13 +51,13 @@
     "valibot": "^1.4.2"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^9.1.0",
+    "@antfu/eslint-config": "^9.2.0",
     "@types/node": "^24.13.3",
     "bumpp": "^12.0.0",
-    "eslint": "^10.7.0",
-    "knip": "^6.27.0",
-    "oxfmt": "^0.59.0",
-    "tsdown": "^0.22.12",
+    "eslint": "^10.8.0",
+    "knip": "^6.29.0",
+    "oxfmt": "^0.60.0",
+    "tsdown": "^0.22.14",
     "typescript": "^6.0.3",
     "vitest": "^4.1.10"
   },