ochre-sdk 1.0.38 → 1.0.40

package/dist/parsers/index.mjs

@@ -1137,6 +1137,7 @@ function parseResource(rawResource, options) {
 	for (const resource of rawResource.resource ?? []) items.push(parseResource(resource, options));
 	return {
 		...parseBaseItem("resource", rawResource, options),
+		language: rawResource.lang ?? null,
 		type: rawResource.type ?? "",
 		href: parseHref(rawResource.href),
 		fileFormat: rawResource.fileFormat ?? null,

package/dist/parsers/string.mjs

@@ -15,12 +15,17 @@ const HEADING_LEVEL_TOKEN = "heading-level";
 const RAW_MDX_BLOCK_DELIMITER = "``md``";
 const RAW_MDX_BLOCK_PLACEHOLDER_PREFIX = "\0raw-mdx-block:";
 const RAW_MDX_BLOCK_PLACEHOLDER_SUFFIX = "\0";
+const RICH_LINE_BREAK = "<br />\n";
+const RICH_PARAGRAPH_BREAK = "\n\n";
 const MDX_QUOTED_ATTRIBUTE_ESCAPE_REGEX = /[\n\r"]/;
 const MDX_RENDER_ELEMENTS = {
 	bold: "strong",
 	italic: "em",
 	underline: "u"
 };
+function hasNewlineWhitespace(value) {
+	return value?.split(" ").includes("newline") === true;
+}
 function isXMLRichTextLink(value) {
 	return typeof value === "object" && value != null;
 }
@@ -68,8 +73,9 @@ function applyMDXRenderElements(contentString, options) {
 }
 function applyNewlineWhitespace(contentString, whitespace, rendering) {
 	if (whitespace == null) return contentString;
-	if (!whitespace.split(" ").includes("newline")) return contentString;
-	if (rendering === "rich") return contentString.trim() === "***" ? `${contentString}\n` : `<br />\n${contentString}`;
+	if (!hasNewlineWhitespace(whitespace)) return contentString;
+	if (contentString === "" && rendering !== "plain") return RICH_PARAGRAPH_BREAK;
+	if (rendering === "rich") return contentString.trim() === "***" ? `${contentString}\n` : `${RICH_LINE_BREAK}${contentString}`;
 	return `\n${contentString}`;
 }
 /**
@@ -257,7 +263,7 @@ function parseNestedStringItems(items, contentItem, options) {
 	let result = "";
 	let rawMDXBlockStartIndex = null;
 	for (const [index, item] of items.entries()) {
-		if (item.payload === RAW_MDX_BLOCK_DELIMITER && item.rend == null && item.links == null && item.properties == null && item.annotation == null && item.string == null) {
+		if (item.payload === RAW_MDX_BLOCK_DELIMITER && (index === 0 || hasNewlineWhitespace(item.whitespace)) && item.rend == null && item.links == null && item.properties == null && item.annotation == null && item.string == null) {
 			if (rawMDXBlockStartIndex == null) {
 				rawMDXBlockStartIndex = index;
 				continue;
@@ -272,7 +278,7 @@ function parseNestedStringItems(items, contentItem, options) {
 					rawMDXBlocks: options.rawMDXBlocks
 				});
 			}
-			if (rawMDXBlock !== "" && !rawMDXBlock.endsWith("\n") && item.whitespace?.split(" ").includes("newline") === true) rawMDXBlock += "\n";
+			if (rawMDXBlock !== "" && !rawMDXBlock.endsWith("\n") && hasNewlineWhitespace(item.whitespace)) rawMDXBlock += "\n";
 			if (options.rendering === "rich" && options.rawMDXBlocks != null) {
 				const placeholder = `${RAW_MDX_BLOCK_PLACEHOLDER_PREFIX}${options.rawMDXBlocks.length}${RAW_MDX_BLOCK_PLACEHOLDER_SUFFIX}`;
 				options.rawMDXBlocks.push(rawMDXBlock);
@@ -282,7 +288,8 @@ function parseNestedStringItems(items, contentItem, options) {
 			continue;
 		}
 		if (rawMDXBlockStartIndex != null) continue;
-		result += parseXMLStringItem(item, contentItem, options);
+		const parsedItem = parseXMLStringItem(item, contentItem, options);
+		result += options.rendering === "rich" && result.endsWith("\n") && parsedItem.startsWith(RICH_LINE_BREAK) ? parsedItem.slice(6) : parsedItem;
 	}
 	if (rawMDXBlockStartIndex != null) for (let index = rawMDXBlockStartIndex; index < items.length; index += 1) {
 		const item = items[index];

package/dist/parsers/website/index.mjs

@@ -755,6 +755,7 @@ function parseWebElement(elementResource, options, context) {
 	});
 	return {
 		uuid: elementResource.uuid,
+		language: elementResource.lang ?? null,
 		type: "element",
 		title,
 		cssStyles,

package/dist/types/index.d.mts

@@ -655,6 +655,7 @@ type PropertyValue<T extends LanguageCodes = LanguageCodes, U extends ItemPayloa
  *  Resource in OCHRE
  */
 type Resource<T extends LanguageCodes = LanguageCodes, U extends ItemPayloadKind = "topLevel"> = Prettify<BaseItem<"resource", T, U> & {
+  language: string | null;
   type: string;
   href: string | null;
   fileFormat: string | null;

package/dist/types/website.d.mts

@@ -226,6 +226,7 @@ type WebTitle<T extends LanguageCodes = LanguageCodes> = {
  */
 type WebElement<T extends LanguageCodes = LanguageCodes> = {
   uuid: string;
+  language: string | null;
   type: "element";
   title: WebTitle<T>;
   cssStyles: {

package/dist/xml/schemas.mjs

@@ -605,7 +605,8 @@ const XMLResource = v.object({
 	properties: v.optional(v.object({ property: v.array(XMLProperty) })),
 	bibliographies: v.optional(v.object({ bibliography: v.array(XMLBibliography) })),
 	resource: v.optional(v.array(v.lazy(() => XMLResource))),
-	view: v.optional(v.object({ resource: v.optional(v.array(v.lazy(() => XMLWebsiteResource))) }))
+	view: v.optional(v.object({ resource: v.optional(v.array(v.lazy(() => XMLWebsiteResource))) })),
+	lang: v.optional(v.string("XMLResource: lang is string and optional"))
 }, "XMLResource: Shape error");
 const XMLSection = v.object({
 	uuid: v.pipe(v.string("XMLSection: uuid is string and required"), v.check(isPseudoUuid, "XMLSection: uuid is not a valid pseudo-UUID")),
@@ -731,6 +732,7 @@ const XMLWebsiteResourceItem = v.lazy(() => v.union([
 ]));
 const XMLWebsiteResource = v.lazy(() => v.object({
 	...XMLBaseItem.entries,
+	lang: v.optional(v.string("XMLWebsiteResource: lang is string and optional")),
 	type: v.optional(v.string("XMLWebsiteResource: type is string and optional")),
 	date: v.optional(v.union([customDateTime("XMLWebsiteResource: date is not a valid datetime"), XMLString])),
 	href: v.optional(v.pipe(v.string("XMLWebsiteResource: href is string and optional"), v.url("XMLWebsiteResource: href is not a valid URL"))),

package/dist/xml/types.d.mts

@@ -536,6 +536,7 @@ type XMLPropertyValue = XMLBaseItem & {
   };
 };
 type XMLResource = XMLBaseItem & {
+  lang?: string;
   type?: string;
   date?: Date | XMLString;
   href?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ochre-sdk",
-  "version": "1.0.38",
+  "version": "1.0.40",
   "type": "module",
   "license": "MIT",
   "description": "Node.js library for working with OCHRE (Online Cultural and Historical Research Environment) data",
@@ -74,12 +74,12 @@
   },
   "devDependencies": {
     "@antfu/eslint-config": "^9.0.0",
-    "@types/node": "^24.12.4",
+    "@types/node": "^24.13.1",
     "bumpp": "^11.1.0",
     "eslint": "^10.4.1",
-    "knip": "^6.15.0",
-    "prettier": "^3.8.3",
-    "tsdown": "^0.22.1",
+    "knip": "^6.16.1",
+    "oxfmt": "^0.53.0",
+    "tsdown": "^0.22.2",
     "typescript": "^6.0.3",
     "vitest": "^4.1.8"
   },
@@ -88,8 +88,8 @@
     "build": "tsdown",
     "lint": "knip; eslint .",
     "lint:fix": "knip --fix; eslint . --fix",
-    "format": "prettier --check .",
-    "format:fix": "prettier --write --list-different .",
+    "format": "oxfmt --check",
+    "format:fix": "oxfmt",
     "check-types": "tsc --noEmit",
     "test": "vitest run",
     "release": "bumpp"