ochre-sdk 1.0.77 → 1.0.79

package/dist/parsers/website/reader.d.mts

@@ -3,7 +3,7 @@ import { LanguageCodes, PropertyValueContent, SimplifiedProperty } from "../../t
 import { ParserOptions } from "../helpers.mjs";
 //#region src/parsers/website/reader.d.ts
 type WebsitePropertyContent<T extends LanguageCodes> = PropertyValueContent<T>["content"];
-declare class WebsitePresentationReader<T extends LanguageCodes> {
+export declare class WebsitePresentationReader<T extends LanguageCodes> {
   private readonly sourceProperties;
   constructor(sourceProperties: ReadonlyArray<SimplifiedProperty<T>>);
   property(label: string): SimplifiedProperty<T> | null;
@@ -22,6 +22,5 @@ declare class WebsitePresentationReader<T extends LanguageCodes> {
   get size(): number;
   get properties(): ReadonlyArray<SimplifiedProperty<T>>;
 }
-declare function websitePresentationReader<T extends LanguageCodes>(properties: ReadonlyArray<SimplifiedProperty<T>>): WebsitePresentationReader<T>;
-//#endregion
-export { WebsitePresentationReader, websitePresentationReader };
+export declare function websitePresentationReader<T extends LanguageCodes>(properties: ReadonlyArray<SimplifiedProperty<T>>): WebsitePresentationReader<T>;
+//#endregion

package/dist/query.d.mts

@@ -1,6 +1,6 @@
 import { Query } from "./types/index.mjs";
 //#region src/query.d.ts
-declare function buildBelongsToCollectionQueryExpression(belongsToCollectionScopeUuids: Array<string>, belongsToCollectionPropertyVariableUuid: string): string | null;
+export declare function buildBelongsToCollectionQueryExpression(belongsToCollectionScopeUuids: Array<string>, belongsToCollectionPropertyVariableUuid: string): string | null;
 /**
  * Compile a query tree into the XQuery `let` clauses that bind `$items` to the
  * matching Set items
@@ -8,9 +8,12 @@ declare function buildBelongsToCollectionQueryExpression(belongsToCollectionScop
  * Most queries compile to a single `cts:search` over the Set item projections.
  * An `ocr` leaf cannot: the projections drop the `<ocr>` layer, so it resolves
  * to a search over the Resource documents whose matching UUIDs are joined back
- * in as an item path predicate. Path predicates only ever AND, so an `ocr` leaf
- * that sits under an `or` becomes its own arm of a node union instead, and one
- * that sits under an `and` alongside a union becomes an intersection.
+ * in as an item path predicate. A negated leaf cannot either, because CTS
+ * answers a negation for the whole fragment rather than for the item that
+ * matched, so it is filtered per item instead. Path predicates only ever AND,
+ * so such a leaf that sits under an `or` becomes its own arm of a node union
+ * instead, and one that sits under an `and` alongside a union becomes an
+ * intersection.
  *
  * The searchable path has to stay inline in `cts:search`: binding it to a
  * variable first makes every query XDMP-UNSEARCHABLE.
@@ -20,7 +23,7 @@ declare function buildBelongsToCollectionQueryExpression(belongsToCollectionScop
  * @param parameters.scopeQueryExpression - An optional CTS query ANDed into every compiled search
  * @returns The prolog declaring the query helpers, and the `let` clauses binding `$items`
  */
-declare function buildQueryPlan(parameters: {
+export declare function buildQueryPlan(parameters: {
   queries: Query | null;
   baseItemsExpression: string;
   scopeQueryExpression?: string | null;
@@ -28,5 +31,4 @@ declare function buildQueryPlan(parameters: {
   prolog: string;
   itemsClause: string;
 };
-//#endregion
-export { buildBelongsToCollectionQueryExpression, buildQueryPlan };
+//#endregion

package/dist/query.mjs

@@ -940,6 +940,23 @@ function buildCtsItemsPlan(queryExpression) {
 	};
 }
 /**
+* Plan a negated leaf as an item path predicate
+*
+* A Set holds every one of its items in one fragment, and CTS resolves
+* `cts:not-query` from the fragment indexes without filtering the match down to
+* the node it came from. Negating inside the search query would therefore drop
+* every item of a Set as soon as one of them matched, and keep every item of a
+* Set that held no match at all. `cts:contains` evaluates the leaf against one
+* item projection instead, which is the scope the negation is asking about.
+*/
+function buildNegatedItemsPlan(queryExpression) {
+	return {
+		kind: "search",
+		itemPredicates: [`[not(cts:contains(., ${queryExpression}))]`],
+		queryExpressions: []
+	};
+}
+/**
 * Splice the children of same-kind child plans into their parent, so that a
 * nested group of the same operator does not cost an extra search
 */
@@ -1021,7 +1038,7 @@ function buildItemsPlan(context, query) {
 			};
 		}
 		const queryExpression = buildLeafQueryExpression(context, query);
-		return buildCtsItemsPlan(query.isNegated === true ? buildNotCtsQueryExpression(queryExpression) : queryExpression);
+		return query.isNegated === true ? buildNegatedItemsPlan(queryExpression) : buildCtsItemsPlan(queryExpression);
 	}
 	const optimizedIncludesGroupQueries = getCompatibleIncludesGroupLeaves(query);
 	if (optimizedIncludesGroupQueries != null) return buildCtsItemsPlan(buildIncludesGroupQueryExpression(context, optimizedIncludesGroupQueries));
@@ -1066,9 +1083,12 @@ function buildBelongsToCollectionQueryExpression(belongsToCollectionScopeUuids,
 * Most queries compile to a single `cts:search` over the Set item projections.
 * An `ocr` leaf cannot: the projections drop the `<ocr>` layer, so it resolves
 * to a search over the Resource documents whose matching UUIDs are joined back
-* in as an item path predicate. Path predicates only ever AND, so an `ocr` leaf
-* that sits under an `or` becomes its own arm of a node union instead, and one
-* that sits under an `and` alongside a union becomes an intersection.
+* in as an item path predicate. A negated leaf cannot either, because CTS
+* answers a negation for the whole fragment rather than for the item that
+* matched, so it is filtered per item instead. Path predicates only ever AND,
+* so such a leaf that sits under an `or` becomes its own arm of a node union
+* instead, and one that sits under an `and` alongside a union becomes an
+* intersection.
 *
 * The searchable path has to stay inline in `cts:search`: binding it to a
 * variable first makes every query XDMP-UNSEARCHABLE.

package/dist/schemas.d.mts

@@ -5,22 +5,22 @@ import * as v from "valibot";
  * Schema for validating UUIDs
  * @internal
  */
-declare const uuidSchema: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "Invalid pseudo-UUID">]>;
+export declare const uuidSchema: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "Invalid pseudo-UUID">]>;
 /**
  * Schema for validating language codes
  * @internal
  */
-declare const iso639_3Schema: v.SchemaWithPipe<readonly [v.StringSchema<"Language code must be a string">, v.RegexAction<string, "Language code must be exactly 3 lowercase letters">]>;
+export declare const iso639_3Schema: v.SchemaWithPipe<readonly [v.StringSchema<"Language code must be a string">, v.RegexAction<string, "Language code must be exactly 3 lowercase letters">]>;
 /**
  * Valid component types for web elements
  * @internal
  */
-declare const componentSchema: v.PicklistSchema<readonly ["3d-viewer", "advanced-search", "annotated-document", "annotated-image", "audio-player", "bibliography", "button", "collection", "empty-space", "entries", "iframe", "iiif-viewer", "image", "image-gallery", "map", "query", "search-bar", "table", "text", "timeline", "video"], "Invalid/unknown web element component">;
+export declare const componentSchema: v.PicklistSchema<readonly ["3d-viewer", "advanced-search", "annotated-document", "annotated-image", "audio-player", "bibliography", "button", "collection", "empty-space", "entries", "iframe", "iiif-viewer", "image", "image-gallery", "map", "query", "search-bar", "table", "text", "timeline", "video"], "Invalid/unknown web element component">;
 /**
  * Schema for validating gallery parameters
  * @internal
  */
-declare const gallerySchema: v.ObjectSchema<{
+export declare const gallerySchema: v.ObjectSchema<{
   readonly uuid: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "Invalid pseudo-UUID">]>;
   readonly filter: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
   readonly page: v.SchemaWithPipe<readonly [v.NumberSchema<"Page must be positive">, v.CheckAction<number, "Page must be positive">]>;
@@ -30,12 +30,12 @@ declare const gallerySchema: v.ObjectSchema<{
  * Schema for validating and parsing render options
  * @internal
  */
-declare const renderOptionsSchema: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.TransformAction<string, string[]>, v.ArraySchema<v.PicklistSchema<["bold", "italic", "underline"], undefined>, undefined>]>;
+export declare const renderOptionsSchema: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.TransformAction<string, string[]>, v.ArraySchema<v.PicklistSchema<["bold", "italic", "underline"], undefined>, undefined>]>;
 /**
  * Schema for validating the parameters for the Set property values fetching function
  * @internal
  */
-declare const setPropertyValuesParametersSchema: v.ObjectSchema<{
+export declare const setPropertyValuesParametersSchema: v.ObjectSchema<{
   readonly setScopeUuids: v.SchemaWithPipe<readonly [v.ArraySchema<v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "Invalid pseudo-UUID">]>, undefined>, v.MinLengthAction<string[], 1, "At least one set scope UUID is required">]>;
   readonly belongsToCollectionScopeUuids: v.OptionalSchema<v.ArraySchema<v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "Invalid pseudo-UUID">]>, undefined>, readonly []>;
   readonly queries: v.OptionalSchema<v.NullableSchema<v.GenericSchema<unknown, Query>, undefined>, null>;
@@ -52,7 +52,7 @@ declare const setPropertyValuesParametersSchema: v.ObjectSchema<{
  * Schema for validating the parameters for the item OCR data fetching function
  * @internal
  */
-declare const itemOcrDataParametersSchema: v.ObjectSchema<{
+export declare const itemOcrDataParametersSchema: v.ObjectSchema<{
   readonly uuid: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "Invalid pseudo-UUID">]>;
   readonly value: v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "A search value is required">]>;
   readonly matchMode: v.OptionalSchema<v.PicklistSchema<["includes", "exact"], undefined>, "includes">;
@@ -62,7 +62,7 @@ declare const itemOcrDataParametersSchema: v.ObjectSchema<{
  * Schema for validating Set items parameters
  * @internal
  */
-declare const setItemsParametersSchema: v.ObjectSchema<{
+export declare const setItemsParametersSchema: v.ObjectSchema<{
   readonly setScopeUuids: v.SchemaWithPipe<readonly [v.ArraySchema<v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "Invalid pseudo-UUID">]>, undefined>, v.MinLengthAction<string[], 1, "At least one set scope UUID is required">]>;
   readonly belongsToCollectionScopeUuids: v.OptionalSchema<v.ArraySchema<v.SchemaWithPipe<readonly [v.StringSchema<undefined>, v.CheckAction<string, "Invalid pseudo-UUID">]>, undefined>, readonly []>;
   readonly queries: v.OptionalSchema<v.NullableSchema<v.GenericSchema<unknown, Query>, undefined>, null>;
@@ -84,5 +84,4 @@ declare const setItemsParametersSchema: v.ObjectSchema<{
   readonly page: v.OptionalSchema<v.GenericSchema<unknown, number>, 1>;
   readonly pageSize: v.OptionalSchema<v.GenericSchema<unknown, number>, 48>;
 }, undefined>;
-//#endregion
-export { componentSchema, gallerySchema, iso639_3Schema, itemOcrDataParametersSchema, renderOptionsSchema, setItemsParametersSchema, setPropertyValuesParametersSchema, uuidSchema };
+//#endregion