@notionhq/custom-blocks-host 0.3.6 → 0.3.8

package/src/dateValue.ts

@@ -0,0 +1,120 @@
+import type {
+	NotionDate,
+	NotionDateRange,
+	NotionDateTime,
+	NotionDateTimeRange,
+} from "@notionhq/custom-blocks-protocol/dataSources/dateValue.js"
+import type { NotionDateInput } from "@notionhq/custom-blocks-protocol/pages/page.js"
+
+export type CustomBlockDateValue =
+	| NotionDate
+	| NotionDateRange
+	| (NotionDateTime & { time_zone: string })
+	| (NotionDateTimeRange & { time_zone: string })
+
+export class InvalidNotionDateError extends Error {}
+
+export function toNotionDateValue(
+	value: NotionDateInput,
+): CustomBlockDateValue {
+	try {
+		return convertDateValue(value)
+	} catch (error) {
+		if (error instanceof RangeError) {
+			throw new InvalidNotionDateError(error.message)
+		}
+		throw error
+	}
+}
+
+function convertDateValue(value: NotionDateInput): CustomBlockDateValue {
+	const { start, end, time_zone, reminder } = value
+	if (!start.split("T")[0]) {
+		throw new InvalidNotionDateError("Date values must include a date.")
+	}
+	const timed = start.includes("T") || time_zone != null
+	const offset = start.match(/([+-])(\d{2}):(\d{2})$/)
+	const offsetMinutes = offset
+		? (Number(offset[2]) * 60 + Number(offset[3])) *
+			(offset[1] === "-" ? -1 : 1)
+		: 0
+	const fixedZone = time_zone?.match(/^UTC(?:([+-])(\d{1,2})(?::(\d{2}))?)?$/)
+	const targetOffsetMinutes = fixedZone
+		? (Number(fixedZone[2] ?? 0) * 60 + Number(fixedZone[3] ?? 0)) *
+			(fixedZone[1] === "-" ? -1 : 1)
+		: offsetMinutes
+	const parts = (input: string) => {
+		if (!input.split("T")[0]) {
+			throw new InvalidNotionDateError("Date values must include a date.")
+		}
+		if (!input.includes("T")) {
+			return { date: input, time: "00:00" }
+		}
+		const wallClock = input.match(
+			/^(\d{4}-\d{2}-\d{2})T(\d{2}:\d{2})(?::\d{2}(?:\.\d+)?)?$/,
+		)
+		if (wallClock) {
+			return { date: wallClock[1], time: wallClock[2] }
+		}
+		if (!time_zone || fixedZone) {
+			const local = new Date(
+				new Date(input).getTime() + targetOffsetMinutes * 60_000,
+			).toISOString()
+			return { date: local.slice(0, 10), time: local.slice(11, 16) }
+		}
+		const entries = new Intl.DateTimeFormat("en-CA", {
+			timeZone: time_zone,
+			year: "numeric",
+			month: "2-digit",
+			day: "2-digit",
+			hour: "2-digit",
+			minute: "2-digit",
+			hourCycle: "h23",
+		}).formatToParts(new Date(input))
+		const get = (type: string) =>
+			entries.find(part => part.type === type)?.value
+		return {
+			date: `${get("year")}-${get("month")}-${get("day")}`,
+			time: `${get("hour")}:${get("minute")}`,
+		}
+	}
+	const startParts = parts(start)
+	const endParts = end ? parts(end) : undefined
+	if (!timed) {
+		if (reminder && !("time" in reminder) && reminder.unit !== "none") {
+			throw new InvalidNotionDateError(
+				"Hour and minute reminders require a date with a time.",
+			)
+		}
+		return endParts
+			? {
+					type: "daterange",
+					start_date: startParts.date,
+					end_date: endParts.date,
+					reminder,
+				}
+			: { type: "date", start_date: startParts.date, reminder }
+	}
+	const zone =
+		time_zone ??
+		(offsetMinutes === 0
+			? "UTC"
+			: `UTC${offsetMinutes < 0 ? "-" : "+"}${Math.floor(Math.abs(offsetMinutes) / 60)}${Math.abs(offsetMinutes) % 60 === 0 ? "" : `:${String(Math.abs(offsetMinutes) % 60).padStart(2, "0")}`}`)
+	return endParts
+		? {
+				type: "datetimerange",
+				start_date: startParts.date,
+				start_time: startParts.time,
+				end_date: endParts.date,
+				end_time: endParts.time,
+				time_zone: zone,
+				reminder,
+			}
+		: {
+				type: "datetime",
+				start_date: startParts.date,
+				start_time: startParts.time,
+				time_zone: zone,
+				reminder,
+			}
+}

package/src/index.ts

@@ -55,6 +55,11 @@ export {
 	type CustomBlockHostOptions,
 	createCustomBlockHost,
 } from "./createCustomBlockHost.js"
+export {
+	type CustomBlockDateValue,
+	InvalidNotionDateError,
+	toNotionDateValue,
+} from "./dateValue.js"
 export { toNotionPageId } from "./ids.js"
 export type { CustomBlockHostManifestOptions } from "./lifecycle/manifestOptions.js"
 export type {

package/src/lifecycle/legacyPage.ts

@@ -5,6 +5,7 @@ import type {
 	notionPageDataSchema,
 } from "@notionhq/custom-blocks-protocol/pages/page.js"
 import type { InferOutput } from "valibot"
+import { toNotionDateValue } from "../dateValue.js"
 import { unreachable } from "../utils.js"
 
 export function toLegacyPage(
@@ -78,78 +79,6 @@ function timestamp(
 	}
 }
 
-function legacyDate(value: {
-	start: string
-	end?: string | null
-	time_zone?: string | null
-}): NotionDataSourceValue {
-	const timed = value.start.includes("T") || value.time_zone != null
-	const offset = value.start.match(/([+-])(\d{2}):(\d{2})$/)
-	const offsetMinutes = offset
-		? (Number(offset[2]) * 60 + Number(offset[3])) *
-			(offset[1] === "-" ? -1 : 1)
-		: 0
-	const parts = (input: string) => {
-		if (!input.includes("T")) {
-			return { date: input, time: "00:00" }
-		}
-		const wallClock = input.match(
-			/^(\d{4}-\d{2}-\d{2})T(\d{2}:\d{2})(?::\d{2}(?:\.\d+)?)?$/,
-		)
-		if (wallClock) {
-			return { date: wallClock[1], time: wallClock[2] }
-		}
-		if (!value.time_zone) {
-			const local = new Date(
-				new Date(input).getTime() + offsetMinutes * 60_000,
-			).toISOString()
-			return { date: local.slice(0, 10), time: local.slice(11, 16) }
-		}
-		const entries = new Intl.DateTimeFormat("en-CA", {
-			timeZone: value.time_zone,
-			year: "numeric",
-			month: "2-digit",
-			day: "2-digit",
-			hour: "2-digit",
-			minute: "2-digit",
-			hourCycle: "h23",
-		}).formatToParts(new Date(input))
-		const get = (type: string) =>
-			entries.find(part => part.type === type)?.value
-		return {
-			date: `${get("year")}-${get("month")}-${get("day")}`,
-			time: `${get("hour")}:${get("minute")}`,
-		}
-	}
-	const start = parts(value.start)
-	const end = value.end ? parts(value.end) : undefined
-	if (!timed) {
-		return end
-			? { type: "daterange", start_date: start.date, end_date: end.date }
-			: { type: "date", start_date: start.date }
-	}
-	const zone =
-		value.time_zone ??
-		(offsetMinutes === 0
-			? "UTC"
-			: `UTC${offsetMinutes < 0 ? "-" : "+"}${Math.floor(Math.abs(offsetMinutes) / 60)}${Math.abs(offsetMinutes) % 60 === 0 ? "" : `:${String(Math.abs(offsetMinutes) % 60).padStart(2, "0")}`}`)
-	return end
-		? {
-				type: "datetimerange",
-				start_date: start.date,
-				start_time: start.time,
-				end_date: end.date,
-				end_time: end.time,
-				time_zone: zone,
-			}
-		: {
-				type: "datetime",
-				start_date: start.date,
-				start_time: start.time,
-				time_zone: zone,
-			}
-}
-
 function toLegacyProperty(
 	property: NotionPagePropertyValue,
 ): NotionDataSourceValue | undefined {
@@ -175,7 +104,7 @@ function toLegacyProperty(
 		case "multi_select":
 			return property.multi_select.flatMap(option => option.name ?? [])
 		case "date":
-			return property.date ? legacyDate(property.date) : undefined
+			return property.date ? toNotionDateValue(property.date) : undefined
 		case "people":
 			return property.people.map(person =>
 				person.object === "group"
@@ -190,6 +119,18 @@ function toLegacyProperty(
 			return property.relation.map(page => ({ id: page.id, table: "block" }))
 		case "files":
 			return property.files.map(file => file.name).join(",")
+		case "unique_id":
+			return property.unique_id
+		case "button":
+			return property.button
+		case "formula":
+			return property.formula
+		case "location":
+			return property.location
+		case "rollup":
+			return property.rollup
+		case "verification":
+			return property.verification
 		case "place":
 			return ""
 		case "created_time":