ochre-sdk 0.22.18 → 0.22.19

package/dist/index.d.mts

@@ -300,6 +300,7 @@ type Event = {
 type Interpretation = {
   date: string | null;
   number: number;
+  notes: Array<Note>;
   links: Array<Link>;
   properties: Array<Property>;
   bibliographies: Array<Bibliography>;

package/dist/index.mjs

@@ -1292,7 +1292,7 @@ function parseObservation(observation) {
 * @returns Array of parsed Observation objects
 */
 function parseObservations(observations) {
-	return observations.map((obs) => parseObservation(obs));
+	return observations.map((observation) => parseObservation(observation));
 }
 /**
 * Parses an array of raw events into standardized Event objects
@@ -1435,12 +1435,13 @@ function parseProperties(properties, language = "eng") {
 * @returns Array of parsed Interpretation objects
 */
 function parseInterpretations(interpretations) {
-	return interpretations.map((interp) => ({
-		date: interp.date ?? null,
-		number: interp.interpretationNo,
-		links: interp.links ? parseLinks(ensureArray(interp.links)) : [],
-		properties: interp.properties ? parseProperties(ensureArray(interp.properties.property)) : [],
-		bibliographies: interp.bibliographies ? parseBibliographies(ensureArray(interp.bibliographies.bibliography)) : []
+	return interpretations.map((interpretation) => ({
+		date: interpretation.date ?? null,
+		number: interpretation.interpretationNo,
+		notes: interpretation.notes ? parseNotes(ensureArray(interpretation.notes.note)) : [],
+		links: interpretation.links ? parseLinks(ensureArray(interpretation.links)) : [],
+		properties: interpretation.properties ? parseProperties(ensureArray(interpretation.properties.property)) : [],
+		bibliographies: interpretation.bibliographies ? parseBibliographies(ensureArray(interpretation.bibliographies.bibliography)) : []
 	}));
 }
 /**
@@ -2275,13 +2276,8 @@ function buildRichTextPhraseQueryExpression(params) {
 	const { value, isCaseSensitive } = params;
 	return `cts:word-query(${stringLiteral(value)}, ${buildRichTextPhraseOptionsExpression({ isCaseSensitive })})`;
 }
-function buildCtsNearQueryExpression(params) {
-	const { queryExpressions, distance, isOrdered = false } = params;
-	const options = isOrdered ? `, (${stringLiteral("ordered")})` : "";
-	return `cts:near-query((${queryExpressions.join(", ")}), ${distance}${options})`;
-}
 function buildRichTextExactQueryExpression(params) {
-	const { value, isCaseSensitive, language } = params;
+	const { value, isCaseSensitive } = params;
 	const phraseQuery = buildRichTextPhraseQueryExpression({
 		value,
 		isCaseSensitive
@@ -2291,17 +2287,10 @@ function buildRichTextExactQueryExpression(params) {
 		isCaseSensitive
 	});
 	if (terms.length <= 1) return phraseQuery;
-	return buildOrCtsQueryExpressionInternal([phraseQuery, buildCtsNearQueryExpression({
-		queryExpressions: terms.map((term) => buildCtsWordQueryExpression({
-			value: term,
-			matchMode: "exact",
-			isCaseSensitive,
-			queryFamily: "text",
-			language
-		})),
-		distance: 2,
-		isOrdered: true
-	})]);
+	return buildOrCtsQueryExpressionInternal([phraseQuery, buildAndCtsQueryExpressionInternal(terms.map((term) => buildRichTextPhraseQueryExpression({
+		value: term,
+		isCaseSensitive
+	})))]);
 }
 function buildCtsElementWordQueryExpression(params) {
 	const { elementName, value, matchMode, isCaseSensitive, queryFamily, language } = params;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ochre-sdk",
-  "version": "0.22.18",
+  "version": "0.22.19",
   "type": "module",
   "license": "MIT",
   "description": "Node.js library for working with OCHRE (Online Cultural and Historical Research Environment) data",