ochre-sdk 1.1.2 → 1.1.3

package/dist/fetchers/website-metadata.mjs

@@ -82,7 +82,10 @@ declare function local:matching-pages($resources, $target-slug, $slug-prefix) {
     return local:matching-pages(
       local:resource-items($segment/items/resource),
       $target-slug,
-      $page-slug
+      local:prefix-slug(
+        $segment/identification/abbreviation/content/string,
+        $page-slug
+      )
     )
   )
 };

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

@@ -56,8 +56,11 @@ export declare function childSlugPrefix(pageSlug: string, slugPrefix: string | u
  * The XQuery counterpart of {@link cleanWebsitePageSlug},
  * {@link prefixSlug} and {@link childSlugPrefix}
  *
- * Declares `local:clean-slug`, `local:page-slug` and
+ * Declares `local:clean-slug`, `local:prefix-slug`, `local:page-slug` and
  * `local:page-child-slug-prefix`. "No prefix" is the empty string here.
+ * `local:prefix-slug` takes a slug value rather than a resource, because a
+ * segment's own slug comes from its abbreviation instead of a `@slug`
+ * attribute.
  * @internal
  */
 export declare const WEBSITE_PAGE_SLUG_DECLARATIONS: string;

package/dist/parsers/website/slug.mjs

@@ -57,20 +57,27 @@ function childSlugPrefix(pageSlug, slugPrefix) {
 * The XQuery counterpart of {@link cleanWebsitePageSlug},
 * {@link prefixSlug} and {@link childSlugPrefix}
 *
-* Declares `local:clean-slug`, `local:page-slug` and
+* Declares `local:clean-slug`, `local:prefix-slug`, `local:page-slug` and
 * `local:page-child-slug-prefix`. "No prefix" is the empty string here.
+* `local:prefix-slug` takes a slug value rather than a resource, because a
+* segment's own slug comes from its abbreviation instead of a `@slug`
+* attribute.
 * @internal
 */
 const WEBSITE_PAGE_SLUG_DECLARATIONS = `declare function local:clean-slug($slug) {
   replace(string($slug), ${stringLiteral(SEGMENT_UNIQUE_SLUG_PREFIX_PATTERN)}, "")
 };
 
-declare function local:page-slug($resource, $slug-prefix) {
-  let $slug := local:clean-slug($resource/@slug)
+declare function local:prefix-slug($slug, $slug-prefix) {
+  let $slug-string := string(($slug)[1])
   return
-    if ($slug-prefix = "") then $slug
-    else if ($slug = "") then $slug-prefix
-    else concat($slug-prefix, ${stringLiteral("/")}, $slug)
+    if ($slug-prefix = "") then $slug-string
+    else if ($slug-string = "") then $slug-prefix
+    else concat($slug-prefix, ${stringLiteral("/")}, $slug-string)
+};
+
+declare function local:page-slug($resource, $slug-prefix) {
+  local:prefix-slug(local:clean-slug($resource/@slug), $slug-prefix)
 };
 
 declare function local:page-child-slug-prefix($resource, $slug-prefix) {

package/dist/xml/schemas.mjs

@@ -776,10 +776,22 @@ const XMLWebsiteSegment = v.lazy(() => v.object({
 	uuid: v.pipe(v.string("XMLWebsiteSegment: uuid is string and required"), v.check(isPseudoUuid, "XMLWebsiteSegment: uuid is not a valid pseudo-UUID")),
 	publicationDateTime: v.optional(customDateTime("XMLWebsiteSegment: publicationDateTime is not a valid datetime"))
 }, "XMLWebsiteSegment: Shape error"));
+/**
+* A website resource item
+*
+* The member order is load-bearing, because a union returns its first match
+* and every member is an object schema, which drops the keys its own shape
+* does not name. {@link XMLWebsiteSegment} goes first: every entry on
+* {@link XMLWebsiteResource} other than `uuid` is optional, so a segment
+* wrapper satisfies that schema too and would come back without its
+* `segments`. {@link XMLWebsiteResourceGroup} goes last for the mirror
+* reason, since a resource holding children satisfies the group shape and
+* would lose its own slug and properties.
+*/
 const XMLWebsiteResourceItem = v.lazy(() => v.union([
+	XMLWebsiteSegment,
 	XMLWebsiteResource,
-	XMLWebsiteResourceGroup,
-	XMLWebsiteSegment
+	XMLWebsiteResourceGroup
 ]));
 const XMLWebsiteResource = v.lazy(() => v.object({
 	...XMLBaseItem.entries,

package/package.json

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