@digitalculture/ochre-sdk 0.5.16 → 0.5.18

package/dist/index.cjs

@@ -63,6 +63,7 @@ __export(index_exports, {
   parsePerson: () => parsePerson,
   parsePersons: () => parsePersons,
   parseProperties: () => parseProperties,
+  parseProperty: () => parseProperty,
   parsePropertyValue: () => parsePropertyValue,
   parsePropertyValues: () => parsePropertyValues,
   parseResource: () => parseResource,
@@ -524,9 +525,36 @@ function filterProperties(property, filter, options = DEFAULT_OPTIONS) {
   const { searchNestedProperties } = options;
   const isAllFields = filter.label.toLocaleLowerCase("en-US") === "all fields";
   if (isAllFields || property.label.toLocaleLowerCase("en-US") === filter.label.toLocaleLowerCase("en-US")) {
-    let isFound = property.values.some(
-      (value) => value.content.toLocaleLowerCase("en-US").includes(filter.value.toLocaleLowerCase("en-US"))
-    );
+    let isFound = property.values.some((value) => {
+      if (value.content === null) {
+        return false;
+      }
+      if (typeof value.content === "string") {
+        if (typeof filter.value !== "string") {
+          return false;
+        }
+        return value.content.toLocaleLowerCase("en-US").includes(filter.value.toLocaleLowerCase("en-US"));
+      }
+      if (typeof value.content === "number") {
+        if (typeof filter.value !== "number") {
+          return false;
+        }
+        return value.content === filter.value;
+      }
+      if (typeof value.content === "boolean") {
+        if (typeof filter.value !== "boolean") {
+          return false;
+        }
+        return value.booleanValue === filter.value;
+      }
+      if (value.content instanceof Date) {
+        if (!(filter.value instanceof Date)) {
+          return false;
+        }
+        return value.content.getTime() === filter.value.getTime();
+      }
+      return false;
+    });
     if (!isFound && searchNestedProperties) {
       isFound = property.properties.some(
         (property2) => filterProperties(property2, filter, { searchNestedProperties: true })
@@ -561,6 +589,23 @@ var websiteSchema = import_zod3.z.object({
     { message: "Invalid website privacy" }
   )
 });
+var resourceTypeSchema = import_zod3.z.enum(
+  [
+    "audio",
+    "document",
+    "drawing",
+    "FITS",
+    "geospatial",
+    "IIIF",
+    "image",
+    "model",
+    "PTM",
+    "TEI",
+    "video",
+    "webpage"
+  ],
+  { message: "Invalid resource type" }
+);
 var componentSchema = import_zod3.z.enum(
   [
     "annotated-document",
@@ -874,33 +919,71 @@ function parseEvents(events) {
   }
   return returnEvents;
 }
-function parseProperties(properties, language = "eng") {
-  const returnProperties = [];
-  for (const property of properties) {
-    const valuesToParse = "value" in property && property.value ? Array.isArray(property.value) ? property.value : [property.value] : [];
-    const values = valuesToParse.map(
-      (value) => !["string", "number", "boolean"].includes(typeof value) && typeof value === "object" ? {
-        content: value.slug ? parseFakeString(value.slug) : parseStringContent(value),
-        type: value.type,
-        category: value.category !== "value" ? value.category ?? null : null,
-        uuid: value.uuid ?? null,
-        publicationDateTime: value.publicationDateTime != null ? new Date(value.publicationDateTime) : null
-      } : {
-        content: parseFakeString(value),
-        type: "string",
+function parseProperty(property, type, language = "eng") {
+  const valuesToParse = "value" in property && property.value ? Array.isArray(property.value) ? property.value : [property.value] : [];
+  const values = valuesToParse.map((value) => {
+    let content = null;
+    let booleanValue = null;
+    if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+      content = parseFakeString(value);
+      const returnValue = {
+        content,
+        booleanValue,
+        type,
         category: "value",
         uuid: null,
         publicationDateTime: null
+      };
+      return returnValue;
+    } else {
+      switch (type) {
+        case "integer":
+        case "decimal": {
+          content = Number(value.content);
+          break;
+        }
+        case "dateTime": {
+          content = value.content ? typeof value.content === "string" ? new Date(value.content) : new Date(parseStringContent({ content: value.content })) : null;
+          break;
+        }
+        default: {
+          if ("slug" in value && value.slug != null) {
+            content = parseFakeString(value.slug);
+          } else if (value.content != null) {
+            content = parseStringContent({ content: value.content });
+          }
+          if (type === "boolean") {
+            booleanValue = value.booleanValue ?? null;
+          }
+          break;
+        }
       }
+      const returnValue = {
+        content,
+        booleanValue,
+        type,
+        category: value.category ?? "value",
+        uuid: value.uuid ?? null,
+        publicationDateTime: value.publicationDateTime != null ? new Date(value.publicationDateTime) : null
+      };
+      return returnValue;
+    }
+  });
+  return {
+    label: parseStringContent(property.label, language).replace(/\s*\.{3}$/, "").trim(),
+    values,
+    comment: property.comment != null ? parseFakeString(property.comment) : null,
+    properties: property.property ? parseProperties(
+      Array.isArray(property.property) ? property.property : [property.property]
+    ) : []
+  };
+}
+function parseProperties(properties, language = "eng") {
+  const returnProperties = [];
+  for (const property of properties) {
+    returnProperties.push(
+      parseProperty(property, "string", language)
     );
-    returnProperties.push({
-      label: parseStringContent(property.label, language).replace(/\s*\.{3}$/, "").trim(),
-      values,
-      comment: property.comment != null ? parseFakeString(property.comment) : null,
-      properties: property.property ? parseProperties(
-        Array.isArray(property.property) ? property.property : [property.property]
-      ) : []
-    });
   }
   return returnProperties;
 }
@@ -957,10 +1040,13 @@ function parsePeriods(periods) {
 function parseBibliography(bibliography) {
   let resource = null;
   if (bibliography.source?.resource) {
+    const resourceType = resourceTypeSchema.parse(
+      bibliography.source.resource.type
+    );
     resource = {
       uuid: bibliography.source.resource.uuid,
       publicationDateTime: bibliography.source.resource.publicationDateTime ? new Date(bibliography.source.resource.publicationDateTime) : null,
-      type: bibliography.source.resource.type,
+      type: resourceType,
       identification: parseIdentification(
         bibliography.source.resource.identification
       )
@@ -1203,11 +1289,12 @@ function parseSet(set) {
   };
 }
 function parseResource(resource, isNested = false) {
+  const resourceType = resourceTypeSchema.parse(resource.type);
   const returnResource = {
     uuid: resource.uuid,
     category: "resource",
     publicationDateTime: resource.publicationDateTime ? new Date(resource.publicationDateTime) : null,
-    type: resource.type,
+    type: resourceType,
     number: resource.n,
     format: resource.format ?? null,
     context: "context" in resource && resource.context ? parseContext(resource.context) : null,
@@ -1644,7 +1731,11 @@ async function parseWebElementProperties(componentProperty, elementResource) {
         "width"
       );
       if (widthProperty !== null) {
-        width = Number.parseFloat(widthProperty);
+        if (typeof widthProperty === "number") {
+          width = widthProperty;
+        } else if (typeof widthProperty === "string") {
+          width = Number.parseFloat(widthProperty);
+        }
       }
       let height = null;
       const heightProperty = getPropertyValueByLabel(
@@ -1652,7 +1743,11 @@ async function parseWebElementProperties(componentProperty, elementResource) {
         "height"
       );
       if (heightProperty !== null) {
-        height = Number.parseFloat(heightProperty);
+        if (typeof heightProperty === "number") {
+          height = heightProperty;
+        } else if (typeof heightProperty === "string") {
+          height = Number.parseFloat(heightProperty);
+        }
       }
       let isFullWidth = true;
       const isFullWidthProperty = getPropertyValueByLabel(
@@ -1714,7 +1809,11 @@ async function parseWebElementProperties(componentProperty, elementResource) {
             "seconds-per-image"
           );
           if (secondsPerImageProperty !== null) {
-            secondsPerImage = Number.parseFloat(secondsPerImageProperty);
+            if (typeof secondsPerImageProperty === "number") {
+              secondsPerImage = secondsPerImageProperty;
+            } else if (typeof secondsPerImageProperty === "string") {
+              secondsPerImage = Number.parseFloat(secondsPerImageProperty);
+            }
           }
         }
         carouselOptions = {
@@ -1969,7 +2068,7 @@ async function parseWebpage(webpageResource) {
       resourceProperties,
       "presentation"
     );
-    if (!resourceType) {
+    if (resourceType == null) {
       continue;
     }
     switch (resourceType) {
@@ -2150,7 +2249,7 @@ async function parseBlock(blockResource) {
       resourceProperties,
       "presentation"
     );
-    if (!resourceType) {
+    if (resourceType == null) {
       continue;
     }
     switch (resourceType) {
@@ -2223,6 +2322,16 @@ function parseWebsiteProperties(properties) {
   if (!result.success) {
     throw new Error(`Invalid website properties: ${result.error.message}`);
   }
+  let contact = null;
+  const contactProperty = websiteProperties.find(
+    (property) => property.label === "contact"
+  );
+  if (contactProperty) {
+    const [name, email] = (contactProperty.values[0]?.content).split(
+      ";"
+    );
+    contact = { name, email: email ?? null };
+  }
   const logoUuid = websiteProperties.find((property) => property.label === "logo")?.values[0]?.uuid ?? null;
   let isHeaderDisplayed = true;
   let headerVariant = "default";
@@ -2289,6 +2398,7 @@ function parseWebsiteProperties(properties) {
     type: validatedType,
     privacy: validatedPrivacy,
     status: validatedStatus,
+    contact,
     isHeaderDisplayed,
     headerVariant,
     headerAlignment,
@@ -2759,6 +2869,7 @@ async function fetchWebsite(abbreviation) {
   parsePerson,
   parsePersons,
   parseProperties,
+  parseProperty,
   parsePropertyValue,
   parsePropertyValues,
   parseResource,

package/dist/index.d.cts

@@ -112,7 +112,7 @@ type Link = {
     uuid: string;
     publicationDateTime: Date | null;
     type: string | null;
-    category: "resource" | "spatialUnit" | "concept" | "set" | "tree" | "person" | "bibliography" | "epigraphicUnit" | "propertyValue" | null;
+    category: string | null;
     identification: Identification | null;
     content: string | null;
     href: string | null;
@@ -199,6 +199,10 @@ type Footnote = {
     label: string;
     content: string;
 };
+/**
+ * Represents the type of a resource
+ */
+type ResourceType = "audio" | "document" | "drawing" | "FITS" | "geospatial" | "IIIF" | "image" | "model" | "PTM" | "TEI" | "video" | "webpage";
 /**
  * Represents a resource item with associated metadata, content and relationships
  */
@@ -206,7 +210,7 @@ type Resource = {
     uuid: string;
     category: "resource";
     publicationDateTime: Date | null;
-    type: string;
+    type: ResourceType;
     number: number;
     context: Context | null;
     license: License | null;
@@ -360,13 +364,15 @@ type PropertyValue = {
     notes: Array<Note>;
     links: Array<Link>;
 };
+type PropertyValueContentType = "string" | "integer" | "decimal" | "boolean" | "date" | "dateTime" | "time" | "coordinate" | "IDREF";
 /**
  * Represents a property value with type information
  */
-type PropertyValueContent = {
-    content: string;
-    type: "string" | "number" | "integer" | "boolean" | "date" | "dateTime" | "time" | "IDREF";
-    category: string | null;
+type PropertyValueContent<T extends PropertyValueContentType> = {
+    content: T extends "number" ? number : T extends "integer" ? number : T extends "decimal" ? number : T extends "dateTime" ? Date | null : string;
+    booleanValue: T extends "boolean" ? boolean : null;
+    type: T;
+    category: string;
     uuid: string | null;
     publicationDateTime: Date | null;
 };
@@ -375,7 +381,7 @@ type PropertyValueContent = {
  */
 type Property = {
     label: string;
-    values: Array<PropertyValueContent>;
+    values: Array<PropertyValueContent<PropertyValueContentType>>;
     comment: string | null;
     properties: Array<Property>;
 };
@@ -443,6 +449,10 @@ type WebsiteProperties = {
     type: "traditional" | "digital-collection" | "plum" | "cedar" | "elm" | "maple" | "oak" | "palm";
     privacy: "public" | "password" | "private";
     status: "development" | "preview" | "production";
+    contact: {
+        name: string;
+        email: string | null;
+    } | null;
     isHeaderDisplayed: boolean;
     headerVariant: "default" | "floating" | "inline";
     headerAlignment: "start" | "center" | "end";
@@ -548,7 +558,7 @@ type WebElementComponent = {
     isFullHeight: boolean;
     imageQuality: "high" | "low";
     captionSource: "name" | "abbreviation" | "description";
-    captionLayout: "top" | "bottom" | "suppress";
+    captionLayout: "top" | "bottom" | "inset" | "suppress";
     altTextSource: "name" | "abbreviation" | "description";
     isTransparentBackground: boolean;
     isCover: boolean;
@@ -988,12 +998,14 @@ type OchreNestedConcept = Omit<OchreConcept, "context" | "availability">;
 /**
  * Raw property value structure corresponding to the parsed PropertyValue type
  */
-type OchrePropertyValueContent = OchreStringContent & {
+type OchrePropertyValueContent = {
   uuid?: string;
   publicationDateTime?: string; // YYYY-MM-DDThh:mm:ssZ
   type: string;
   category?: string;
   slug?: FakeString;
+  booleanValue?: boolean;
+  content?: FakeString | OchreStringItem | Array<OchreStringItem>;
 };
 
 /**
@@ -1020,6 +1032,7 @@ type OchreIdentification = {
   heightPreview?: number;
   height?: number;
   width?: number;
+  email?: FakeString;
   website?: string;
 };
 
@@ -1584,7 +1597,7 @@ declare function getPropertyByLabel(properties: Array<Property>, label: string,
  * }
  * ```
  */
-declare function getPropertyValuesByLabel(properties: Array<Property>, label: string, options?: PropertyOptions): Array<string> | null;
+declare function getPropertyValuesByLabel(properties: Array<Property>, label: string, options?: PropertyOptions): Array<string | number | boolean | Date | null> | null;
 /**
  * Gets the first value of a property with the given label
  *
@@ -1601,7 +1614,7 @@ declare function getPropertyValuesByLabel(properties: Array<Property>, label: st
  * }
  * ```
  */
-declare function getPropertyValueByLabel(properties: Array<Property>, label: string, options?: PropertyOptions): string | null;
+declare function getPropertyValueByLabel(properties: Array<Property>, label: string, options?: PropertyOptions): string | number | boolean | Date | null;
 /**
  * Gets all unique property labels from an array of properties
  *
@@ -1639,7 +1652,7 @@ declare function getAllPropertyLabels(properties: Array<Property>, options?: Pro
  */
 declare function filterProperties(property: Property, filter: {
     label: string;
-    value: string;
+    value: string | number | boolean | Date;
 }, options?: PropertyOptions): boolean;
 
 /**
@@ -1756,6 +1769,7 @@ declare function parseObservations(observations: Array<OchreObservation>): Array
  * @returns Array of parsed Event objects
  */
 declare function parseEvents(events: Array<OchreEvent>): Array<Event>;
+declare function parseProperty<T extends PropertyValueContentType>(property: OchreProperty, type: T, language?: string): Property;
 /**
  * Parses raw properties into standardized Property objects
  *
@@ -1933,4 +1947,4 @@ declare function parseStringDocumentItem(item: OchreStringRichTextItem, footnote
  */
 declare function parseStringContent(content: OchreStringContent, language?: string): string;
 
-export { type Bibliography, type Concept, type Context, type ContextItem, type ContextNode, type Coordinates, type Data, type Document, type Event, type Footnote, type Gallery, type Identification, type Image, type ImageMap, type ImageMapArea, type Interpretation, type License, type Link, type Metadata, type NestedConcept, type NestedResource, type NestedSpatialUnit, type Note, type Observation, type Period, type Person, type Property, type PropertyValue, type PropertyValueContent, type Resource, type Set, type SpatialUnit, type Style, type Tree, type WebBlock, type WebElement, type WebElementComponent, type WebImage, type Webpage, type WebpageProperties, type Website, type WebsiteProperties, fetchBibliography, fetchByUuid, fetchConcept, fetchGallery, fetchPeriod, fetchPropertyValue, fetchResource, fetchSet, fetchSpatialUnit, fetchTree, fetchWebsite, filterProperties, getAllPropertyLabels, getPropertyByLabel, getPropertyValueByLabel, getPropertyValuesByLabel, parseBibliographies, parseBibliography, parseConcept, parseConcepts, parseContext, parseCoordinates, parseDocument, parseEmail, parseEvents, parseFakeString, parseIdentification, parseImage, parseImageMap, parseInterpretations, parseLanguages, parseLicense, parseLink, parseLinks, parseMetadata, parseNotes, parseObservation, parseObservations, parsePeriod, parsePeriods, parsePerson, parsePersons, parseProperties, parsePropertyValue, parsePropertyValues, parseResource, parseResources, parseSet, parseSpatialUnit, parseSpatialUnits, parseStringContent, parseStringDocumentItem, parseStringItem, parseTree, parseWebsite };
+export { type Bibliography, type Concept, type Context, type ContextItem, type ContextNode, type Coordinates, type Data, type Document, type Event, type Footnote, type Gallery, type Identification, type Image, type ImageMap, type ImageMapArea, type Interpretation, type License, type Link, type Metadata, type NestedConcept, type NestedResource, type NestedSpatialUnit, type Note, type Observation, type Period, type Person, type Property, type PropertyValue, type PropertyValueContent, type PropertyValueContentType, type Resource, type ResourceType, type Set, type SpatialUnit, type Style, type Tree, type WebBlock, type WebElement, type WebElementComponent, type WebImage, type Webpage, type WebpageProperties, type Website, type WebsiteProperties, fetchBibliography, fetchByUuid, fetchConcept, fetchGallery, fetchPeriod, fetchPropertyValue, fetchResource, fetchSet, fetchSpatialUnit, fetchTree, fetchWebsite, filterProperties, getAllPropertyLabels, getPropertyByLabel, getPropertyValueByLabel, getPropertyValuesByLabel, parseBibliographies, parseBibliography, parseConcept, parseConcepts, parseContext, parseCoordinates, parseDocument, parseEmail, parseEvents, parseFakeString, parseIdentification, parseImage, parseImageMap, parseInterpretations, parseLanguages, parseLicense, parseLink, parseLinks, parseMetadata, parseNotes, parseObservation, parseObservations, parsePeriod, parsePeriods, parsePerson, parsePersons, parseProperties, parseProperty, parsePropertyValue, parsePropertyValues, parseResource, parseResources, parseSet, parseSpatialUnit, parseSpatialUnits, parseStringContent, parseStringDocumentItem, parseStringItem, parseTree, parseWebsite };

package/dist/index.d.ts

@@ -112,7 +112,7 @@ type Link = {
     uuid: string;
     publicationDateTime: Date | null;
     type: string | null;
-    category: "resource" | "spatialUnit" | "concept" | "set" | "tree" | "person" | "bibliography" | "epigraphicUnit" | "propertyValue" | null;
+    category: string | null;
     identification: Identification | null;
     content: string | null;
     href: string | null;
@@ -199,6 +199,10 @@ type Footnote = {
     label: string;
     content: string;
 };
+/**
+ * Represents the type of a resource
+ */
+type ResourceType = "audio" | "document" | "drawing" | "FITS" | "geospatial" | "IIIF" | "image" | "model" | "PTM" | "TEI" | "video" | "webpage";
 /**
  * Represents a resource item with associated metadata, content and relationships
  */
@@ -206,7 +210,7 @@ type Resource = {
     uuid: string;
     category: "resource";
     publicationDateTime: Date | null;
-    type: string;
+    type: ResourceType;
     number: number;
     context: Context | null;
     license: License | null;
@@ -360,13 +364,15 @@ type PropertyValue = {
     notes: Array<Note>;
     links: Array<Link>;
 };
+type PropertyValueContentType = "string" | "integer" | "decimal" | "boolean" | "date" | "dateTime" | "time" | "coordinate" | "IDREF";
 /**
  * Represents a property value with type information
  */
-type PropertyValueContent = {
-    content: string;
-    type: "string" | "number" | "integer" | "boolean" | "date" | "dateTime" | "time" | "IDREF";
-    category: string | null;
+type PropertyValueContent<T extends PropertyValueContentType> = {
+    content: T extends "number" ? number : T extends "integer" ? number : T extends "decimal" ? number : T extends "dateTime" ? Date | null : string;
+    booleanValue: T extends "boolean" ? boolean : null;
+    type: T;
+    category: string;
     uuid: string | null;
     publicationDateTime: Date | null;
 };
@@ -375,7 +381,7 @@ type PropertyValueContent = {
  */
 type Property = {
     label: string;
-    values: Array<PropertyValueContent>;
+    values: Array<PropertyValueContent<PropertyValueContentType>>;
     comment: string | null;
     properties: Array<Property>;
 };
@@ -443,6 +449,10 @@ type WebsiteProperties = {
     type: "traditional" | "digital-collection" | "plum" | "cedar" | "elm" | "maple" | "oak" | "palm";
     privacy: "public" | "password" | "private";
     status: "development" | "preview" | "production";
+    contact: {
+        name: string;
+        email: string | null;
+    } | null;
     isHeaderDisplayed: boolean;
     headerVariant: "default" | "floating" | "inline";
     headerAlignment: "start" | "center" | "end";
@@ -548,7 +558,7 @@ type WebElementComponent = {
     isFullHeight: boolean;
     imageQuality: "high" | "low";
     captionSource: "name" | "abbreviation" | "description";
-    captionLayout: "top" | "bottom" | "suppress";
+    captionLayout: "top" | "bottom" | "inset" | "suppress";
     altTextSource: "name" | "abbreviation" | "description";
     isTransparentBackground: boolean;
     isCover: boolean;
@@ -988,12 +998,14 @@ type OchreNestedConcept = Omit<OchreConcept, "context" | "availability">;
 /**
  * Raw property value structure corresponding to the parsed PropertyValue type
  */
-type OchrePropertyValueContent = OchreStringContent & {
+type OchrePropertyValueContent = {
   uuid?: string;
   publicationDateTime?: string; // YYYY-MM-DDThh:mm:ssZ
   type: string;
   category?: string;
   slug?: FakeString;
+  booleanValue?: boolean;
+  content?: FakeString | OchreStringItem | Array<OchreStringItem>;
 };
 
 /**
@@ -1020,6 +1032,7 @@ type OchreIdentification = {
   heightPreview?: number;
   height?: number;
   width?: number;
+  email?: FakeString;
   website?: string;
 };
 
@@ -1584,7 +1597,7 @@ declare function getPropertyByLabel(properties: Array<Property>, label: string,
  * }
  * ```
  */
-declare function getPropertyValuesByLabel(properties: Array<Property>, label: string, options?: PropertyOptions): Array<string> | null;
+declare function getPropertyValuesByLabel(properties: Array<Property>, label: string, options?: PropertyOptions): Array<string | number | boolean | Date | null> | null;
 /**
  * Gets the first value of a property with the given label
  *
@@ -1601,7 +1614,7 @@ declare function getPropertyValuesByLabel(properties: Array<Property>, label: st
  * }
  * ```
  */
-declare function getPropertyValueByLabel(properties: Array<Property>, label: string, options?: PropertyOptions): string | null;
+declare function getPropertyValueByLabel(properties: Array<Property>, label: string, options?: PropertyOptions): string | number | boolean | Date | null;
 /**
  * Gets all unique property labels from an array of properties
  *
@@ -1639,7 +1652,7 @@ declare function getAllPropertyLabels(properties: Array<Property>, options?: Pro
  */
 declare function filterProperties(property: Property, filter: {
     label: string;
-    value: string;
+    value: string | number | boolean | Date;
 }, options?: PropertyOptions): boolean;
 
 /**
@@ -1756,6 +1769,7 @@ declare function parseObservations(observations: Array<OchreObservation>): Array
  * @returns Array of parsed Event objects
  */
 declare function parseEvents(events: Array<OchreEvent>): Array<Event>;
+declare function parseProperty<T extends PropertyValueContentType>(property: OchreProperty, type: T, language?: string): Property;
 /**
  * Parses raw properties into standardized Property objects
  *
@@ -1933,4 +1947,4 @@ declare function parseStringDocumentItem(item: OchreStringRichTextItem, footnote
  */
 declare function parseStringContent(content: OchreStringContent, language?: string): string;
 
-export { type Bibliography, type Concept, type Context, type ContextItem, type ContextNode, type Coordinates, type Data, type Document, type Event, type Footnote, type Gallery, type Identification, type Image, type ImageMap, type ImageMapArea, type Interpretation, type License, type Link, type Metadata, type NestedConcept, type NestedResource, type NestedSpatialUnit, type Note, type Observation, type Period, type Person, type Property, type PropertyValue, type PropertyValueContent, type Resource, type Set, type SpatialUnit, type Style, type Tree, type WebBlock, type WebElement, type WebElementComponent, type WebImage, type Webpage, type WebpageProperties, type Website, type WebsiteProperties, fetchBibliography, fetchByUuid, fetchConcept, fetchGallery, fetchPeriod, fetchPropertyValue, fetchResource, fetchSet, fetchSpatialUnit, fetchTree, fetchWebsite, filterProperties, getAllPropertyLabels, getPropertyByLabel, getPropertyValueByLabel, getPropertyValuesByLabel, parseBibliographies, parseBibliography, parseConcept, parseConcepts, parseContext, parseCoordinates, parseDocument, parseEmail, parseEvents, parseFakeString, parseIdentification, parseImage, parseImageMap, parseInterpretations, parseLanguages, parseLicense, parseLink, parseLinks, parseMetadata, parseNotes, parseObservation, parseObservations, parsePeriod, parsePeriods, parsePerson, parsePersons, parseProperties, parsePropertyValue, parsePropertyValues, parseResource, parseResources, parseSet, parseSpatialUnit, parseSpatialUnits, parseStringContent, parseStringDocumentItem, parseStringItem, parseTree, parseWebsite };
+export { type Bibliography, type Concept, type Context, type ContextItem, type ContextNode, type Coordinates, type Data, type Document, type Event, type Footnote, type Gallery, type Identification, type Image, type ImageMap, type ImageMapArea, type Interpretation, type License, type Link, type Metadata, type NestedConcept, type NestedResource, type NestedSpatialUnit, type Note, type Observation, type Period, type Person, type Property, type PropertyValue, type PropertyValueContent, type PropertyValueContentType, type Resource, type ResourceType, type Set, type SpatialUnit, type Style, type Tree, type WebBlock, type WebElement, type WebElementComponent, type WebImage, type Webpage, type WebpageProperties, type Website, type WebsiteProperties, fetchBibliography, fetchByUuid, fetchConcept, fetchGallery, fetchPeriod, fetchPropertyValue, fetchResource, fetchSet, fetchSpatialUnit, fetchTree, fetchWebsite, filterProperties, getAllPropertyLabels, getPropertyByLabel, getPropertyValueByLabel, getPropertyValuesByLabel, parseBibliographies, parseBibliography, parseConcept, parseConcepts, parseContext, parseCoordinates, parseDocument, parseEmail, parseEvents, parseFakeString, parseIdentification, parseImage, parseImageMap, parseInterpretations, parseLanguages, parseLicense, parseLink, parseLinks, parseMetadata, parseNotes, parseObservation, parseObservations, parsePeriod, parsePeriods, parsePerson, parsePersons, parseProperties, parseProperty, parsePropertyValue, parsePropertyValues, parseResource, parseResources, parseSet, parseSpatialUnit, parseSpatialUnits, parseStringContent, parseStringDocumentItem, parseStringItem, parseTree, parseWebsite };

package/dist/index.js

@@ -444,9 +444,36 @@ function filterProperties(property, filter, options = DEFAULT_OPTIONS) {
   const { searchNestedProperties } = options;
   const isAllFields = filter.label.toLocaleLowerCase("en-US") === "all fields";
   if (isAllFields || property.label.toLocaleLowerCase("en-US") === filter.label.toLocaleLowerCase("en-US")) {
-    let isFound = property.values.some(
-      (value) => value.content.toLocaleLowerCase("en-US").includes(filter.value.toLocaleLowerCase("en-US"))
-    );
+    let isFound = property.values.some((value) => {
+      if (value.content === null) {
+        return false;
+      }
+      if (typeof value.content === "string") {
+        if (typeof filter.value !== "string") {
+          return false;
+        }
+        return value.content.toLocaleLowerCase("en-US").includes(filter.value.toLocaleLowerCase("en-US"));
+      }
+      if (typeof value.content === "number") {
+        if (typeof filter.value !== "number") {
+          return false;
+        }
+        return value.content === filter.value;
+      }
+      if (typeof value.content === "boolean") {
+        if (typeof filter.value !== "boolean") {
+          return false;
+        }
+        return value.booleanValue === filter.value;
+      }
+      if (value.content instanceof Date) {
+        if (!(filter.value instanceof Date)) {
+          return false;
+        }
+        return value.content.getTime() === filter.value.getTime();
+      }
+      return false;
+    });
     if (!isFound && searchNestedProperties) {
       isFound = property.properties.some(
         (property2) => filterProperties(property2, filter, { searchNestedProperties: true })
@@ -481,6 +508,23 @@ var websiteSchema = z3.object({
     { message: "Invalid website privacy" }
   )
 });
+var resourceTypeSchema = z3.enum(
+  [
+    "audio",
+    "document",
+    "drawing",
+    "FITS",
+    "geospatial",
+    "IIIF",
+    "image",
+    "model",
+    "PTM",
+    "TEI",
+    "video",
+    "webpage"
+  ],
+  { message: "Invalid resource type" }
+);
 var componentSchema = z3.enum(
   [
     "annotated-document",
@@ -794,33 +838,71 @@ function parseEvents(events) {
   }
   return returnEvents;
 }
-function parseProperties(properties, language = "eng") {
-  const returnProperties = [];
-  for (const property of properties) {
-    const valuesToParse = "value" in property && property.value ? Array.isArray(property.value) ? property.value : [property.value] : [];
-    const values = valuesToParse.map(
-      (value) => !["string", "number", "boolean"].includes(typeof value) && typeof value === "object" ? {
-        content: value.slug ? parseFakeString(value.slug) : parseStringContent(value),
-        type: value.type,
-        category: value.category !== "value" ? value.category ?? null : null,
-        uuid: value.uuid ?? null,
-        publicationDateTime: value.publicationDateTime != null ? new Date(value.publicationDateTime) : null
-      } : {
-        content: parseFakeString(value),
-        type: "string",
+function parseProperty(property, type, language = "eng") {
+  const valuesToParse = "value" in property && property.value ? Array.isArray(property.value) ? property.value : [property.value] : [];
+  const values = valuesToParse.map((value) => {
+    let content = null;
+    let booleanValue = null;
+    if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+      content = parseFakeString(value);
+      const returnValue = {
+        content,
+        booleanValue,
+        type,
         category: "value",
         uuid: null,
         publicationDateTime: null
+      };
+      return returnValue;
+    } else {
+      switch (type) {
+        case "integer":
+        case "decimal": {
+          content = Number(value.content);
+          break;
+        }
+        case "dateTime": {
+          content = value.content ? typeof value.content === "string" ? new Date(value.content) : new Date(parseStringContent({ content: value.content })) : null;
+          break;
+        }
+        default: {
+          if ("slug" in value && value.slug != null) {
+            content = parseFakeString(value.slug);
+          } else if (value.content != null) {
+            content = parseStringContent({ content: value.content });
+          }
+          if (type === "boolean") {
+            booleanValue = value.booleanValue ?? null;
+          }
+          break;
+        }
       }
+      const returnValue = {
+        content,
+        booleanValue,
+        type,
+        category: value.category ?? "value",
+        uuid: value.uuid ?? null,
+        publicationDateTime: value.publicationDateTime != null ? new Date(value.publicationDateTime) : null
+      };
+      return returnValue;
+    }
+  });
+  return {
+    label: parseStringContent(property.label, language).replace(/\s*\.{3}$/, "").trim(),
+    values,
+    comment: property.comment != null ? parseFakeString(property.comment) : null,
+    properties: property.property ? parseProperties(
+      Array.isArray(property.property) ? property.property : [property.property]
+    ) : []
+  };
+}
+function parseProperties(properties, language = "eng") {
+  const returnProperties = [];
+  for (const property of properties) {
+    returnProperties.push(
+      parseProperty(property, "string", language)
     );
-    returnProperties.push({
-      label: parseStringContent(property.label, language).replace(/\s*\.{3}$/, "").trim(),
-      values,
-      comment: property.comment != null ? parseFakeString(property.comment) : null,
-      properties: property.property ? parseProperties(
-        Array.isArray(property.property) ? property.property : [property.property]
-      ) : []
-    });
   }
   return returnProperties;
 }
@@ -877,10 +959,13 @@ function parsePeriods(periods) {
 function parseBibliography(bibliography) {
   let resource = null;
   if (bibliography.source?.resource) {
+    const resourceType = resourceTypeSchema.parse(
+      bibliography.source.resource.type
+    );
     resource = {
       uuid: bibliography.source.resource.uuid,
       publicationDateTime: bibliography.source.resource.publicationDateTime ? new Date(bibliography.source.resource.publicationDateTime) : null,
-      type: bibliography.source.resource.type,
+      type: resourceType,
       identification: parseIdentification(
         bibliography.source.resource.identification
       )
@@ -1123,11 +1208,12 @@ function parseSet(set) {
   };
 }
 function parseResource(resource, isNested = false) {
+  const resourceType = resourceTypeSchema.parse(resource.type);
   const returnResource = {
     uuid: resource.uuid,
     category: "resource",
     publicationDateTime: resource.publicationDateTime ? new Date(resource.publicationDateTime) : null,
-    type: resource.type,
+    type: resourceType,
     number: resource.n,
     format: resource.format ?? null,
     context: "context" in resource && resource.context ? parseContext(resource.context) : null,
@@ -1564,7 +1650,11 @@ async function parseWebElementProperties(componentProperty, elementResource) {
         "width"
       );
       if (widthProperty !== null) {
-        width = Number.parseFloat(widthProperty);
+        if (typeof widthProperty === "number") {
+          width = widthProperty;
+        } else if (typeof widthProperty === "string") {
+          width = Number.parseFloat(widthProperty);
+        }
       }
       let height = null;
       const heightProperty = getPropertyValueByLabel(
@@ -1572,7 +1662,11 @@ async function parseWebElementProperties(componentProperty, elementResource) {
         "height"
       );
       if (heightProperty !== null) {
-        height = Number.parseFloat(heightProperty);
+        if (typeof heightProperty === "number") {
+          height = heightProperty;
+        } else if (typeof heightProperty === "string") {
+          height = Number.parseFloat(heightProperty);
+        }
       }
       let isFullWidth = true;
       const isFullWidthProperty = getPropertyValueByLabel(
@@ -1634,7 +1728,11 @@ async function parseWebElementProperties(componentProperty, elementResource) {
             "seconds-per-image"
           );
           if (secondsPerImageProperty !== null) {
-            secondsPerImage = Number.parseFloat(secondsPerImageProperty);
+            if (typeof secondsPerImageProperty === "number") {
+              secondsPerImage = secondsPerImageProperty;
+            } else if (typeof secondsPerImageProperty === "string") {
+              secondsPerImage = Number.parseFloat(secondsPerImageProperty);
+            }
           }
         }
         carouselOptions = {
@@ -1889,7 +1987,7 @@ async function parseWebpage(webpageResource) {
       resourceProperties,
       "presentation"
     );
-    if (!resourceType) {
+    if (resourceType == null) {
       continue;
     }
     switch (resourceType) {
@@ -2070,7 +2168,7 @@ async function parseBlock(blockResource) {
       resourceProperties,
       "presentation"
     );
-    if (!resourceType) {
+    if (resourceType == null) {
       continue;
     }
     switch (resourceType) {
@@ -2143,6 +2241,16 @@ function parseWebsiteProperties(properties) {
   if (!result.success) {
     throw new Error(`Invalid website properties: ${result.error.message}`);
   }
+  let contact = null;
+  const contactProperty = websiteProperties.find(
+    (property) => property.label === "contact"
+  );
+  if (contactProperty) {
+    const [name, email] = (contactProperty.values[0]?.content).split(
+      ";"
+    );
+    contact = { name, email: email ?? null };
+  }
   const logoUuid = websiteProperties.find((property) => property.label === "logo")?.values[0]?.uuid ?? null;
   let isHeaderDisplayed = true;
   let headerVariant = "default";
@@ -2209,6 +2317,7 @@ function parseWebsiteProperties(properties) {
     type: validatedType,
     privacy: validatedPrivacy,
     status: validatedStatus,
+    contact,
     isHeaderDisplayed,
     headerVariant,
     headerAlignment,
@@ -2678,6 +2787,7 @@ export {
   parsePerson,
   parsePersons,
   parseProperties,
+  parseProperty,
   parsePropertyValue,
   parsePropertyValues,
   parseResource,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitalculture/ochre-sdk",
-  "version": "0.5.16",
+  "version": "0.5.18",
   "type": "module",
   "license": "MIT",
   "description": "Node.js library for working with OCHRE (Online Cultural and Historical Research Environment) data",
@@ -41,12 +41,12 @@
   ],
   "dependencies": {
     "iso-639-3": "^3.0.1",
-    "zod": "^3.24.2"
+    "zod": "^3.24.3"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^4.12.0",
     "@arethetypeswrong/cli": "^0.17.4",
-    "@changesets/cli": "^2.29.1",
+    "@changesets/cli": "^2.29.2",
     "@total-typescript/ts-reset": "^0.6.1",
     "@types/node": "^22.14.1",
     "eslint": "^9.24.0",