@notionhq/apps 0.0.30 → 0.0.32

package/src/workflow-access.ts

@@ -20,17 +20,17 @@ type WorkflowAccessContentResource = Exclude<WorkflowAccessResource, CustomAgent
 export type WorkflowAccessResourceType = WorkflowAccessResource["resourceType"];
 
 /** Levels accepted by pages, databases, and data sources. */
-export type WorkflowAccessResourceLevel = "view" | "comment" | "edit" | "fullAccess";
+export type ResourceAccessLevel = "view" | "comment" | "edit" | "fullAccess";
 
 /** The only level accepted by a custom agent. */
 export type WorkflowAccessAgentLevel = "call";
 
 /** Every level accepted by at least one workflow access resource. */
-export type WorkflowAccessLevel = WorkflowAccessResourceLevel | WorkflowAccessAgentLevel;
+export type WorkflowAccessLevel = ResourceAccessLevel | WorkflowAccessAgentLevel;
 
 /** The level set accepted by a particular resource kind. */
 export type WorkflowAccessLevelFor<TType extends WorkflowAccessResourceType> =
-	TType extends "customAgent" ? WorkflowAccessAgentLevel : WorkflowAccessResourceLevel;
+	TType extends "customAgent" ? WorkflowAccessAgentLevel : ResourceAccessLevel;
 
 type AccessResourceFor<TType extends WorkflowAccessResourceType> = Extract<
 	WorkflowAccessResource,
@@ -159,57 +159,62 @@ export function normalizeWorkflowAccess(
 		if (!ACCESS_ALIAS_PATTERN.test(alias) || RESERVED_ACCESS_ALIASES.has(alias)) {
 			throw new Error(`Invalid workflow access alias: ${alias}`);
 		}
+		normalized[alias] = normalizeAccessDeclaration(source[alias], `Workflow access "${alias}"`);
+	}
 
-		const declaration: unknown = source[alias];
-		if (
-			!isRecord(declaration) ||
-			!Object.hasOwn(declaration, "resource") ||
-			!Object.hasOwn(declaration, "level")
-		) {
-			throw new Error(`Workflow access "${alias}" must declare a resource and level.`);
+	return Object.freeze(normalized);
+}
+
+/**
+ * Check one access entry and return its resource type, ID, and level.
+ * Workflows check the entry's alias separately; custom-agent grants have no alias.
+ */
+export function normalizeAccessDeclaration(
+	declaration: unknown,
+	label: string,
+): WorkflowAccessRequirement {
+	if (
+		!isRecord(declaration) ||
+		!Object.hasOwn(declaration, "resource") ||
+		!Object.hasOwn(declaration, "level")
+	) {
+		throw new Error(`${label} must declare a resource and level.`);
+	}
+	const resource: unknown = declaration.resource;
+	if (
+		!isRecord(resource) ||
+		!Object.hasOwn(resource, "resourceType") ||
+		!Object.hasOwn(resource, "resourceId") ||
+		typeof resource.resourceId !== "string" ||
+		resource.resourceId.length === 0 ||
+		!isWorkflowAccessResourceType(resource.resourceType)
+	) {
+		throw new Error(`${label} must reference a supported NaC resource handle.`);
+	}
+
+	let requirement: WorkflowAccessRequirement;
+	if (resource.resourceType === "customAgent") {
+		if (declaration.level !== "call") {
+			throw new Error(`${label} custom agents only support level "call".`);
 		}
-		const resource: unknown = declaration.resource;
-		if (
-			!isRecord(resource) ||
-			!Object.hasOwn(resource, "resourceType") ||
-			!Object.hasOwn(resource, "resourceId") ||
-			typeof resource.resourceId !== "string" ||
-			resource.resourceId.length === 0 ||
-			!isWorkflowAccessResourceType(resource.resourceType)
-		) {
+		requirement = {
+			type: resource.resourceType,
+			resourceId: resource.resourceId,
+			level: declaration.level,
+		};
+	} else {
+		if (!isResourceAccessLevel(declaration.level)) {
 			throw new Error(
-				`Workflow access "${alias}" must reference a supported NaC resource handle.`,
+				`${label} ${resource.resourceType} level must be view, comment, edit, or fullAccess.`,
 			);
 		}
-
-		let requirement: WorkflowAccessRequirement;
-		if (resource.resourceType === "customAgent") {
-			if (declaration.level !== "call") {
-				throw new Error(
-					`Workflow access "${alias}" custom agents only support level "call".`,
-				);
-			}
-			requirement = {
-				type: resource.resourceType,
-				resourceId: resource.resourceId,
-				level: declaration.level,
-			};
-		} else {
-			if (!isWorkflowAccessResourceLevel(declaration.level)) {
-				throw new Error(
-					`Workflow access "${alias}" ${resource.resourceType} level must be view, comment, edit, or fullAccess.`,
-				);
-			}
-			requirement = {
-				type: resource.resourceType,
-				resourceId: resource.resourceId,
-				level: declaration.level,
-			};
-		}
-		normalized[alias] = Object.freeze(requirement);
+		requirement = {
+			type: resource.resourceType,
+			resourceId: resource.resourceId,
+			level: declaration.level,
+		};
 	}
-
-	return Object.freeze(normalized);
+	return Object.freeze(requirement);
 }
 
 /**
@@ -294,14 +299,14 @@ function isWorkflowAccessResourceType(value: unknown): value is WorkflowAccessRe
 	return typeof value === "string" && Object.hasOwn(RESOURCE_TYPES, value);
 }
 
-function isWorkflowAccessResourceLevel(value: unknown): value is WorkflowAccessResourceLevel {
+function isResourceAccessLevel(value: unknown): value is ResourceAccessLevel {
 	return value === "view" || value === "comment" || value === "edit" || value === "fullAccess";
 }
 
 function isBinding(value: unknown): value is {
 	type: WorkflowAccessResourceType;
 	resourceId: string;
-	level: WorkflowAccessResourceLevel | WorkflowAccessAgentLevel;
+	level: ResourceAccessLevel | WorkflowAccessAgentLevel;
 	id: string;
 } {
 	if (!isRecord(value) || Reflect.ownKeys(value).length !== 4) return false;
@@ -320,7 +325,7 @@ function isBinding(value: unknown): value is {
 		typeof value.resourceId === "string" &&
 		value.resourceId.length > 0 &&
 		typeof value.level === "string" &&
-		(isWorkflowAccessResourceLevel(value.level) || value.level === "call") &&
+		(isResourceAccessLevel(value.level) || value.level === "call") &&
 		typeof value.id === "string" &&
 		value.id.length > 0
 	);

package/src/workflow.ts

@@ -191,7 +191,7 @@ export type {
 	WorkflowAccessLevel,
 	WorkflowAccessLevelFor,
 	WorkflowAccessResource,
-	WorkflowAccessResourceLevel,
+	ResourceAccessLevel,
 	WorkflowAccessResourceType,
 	WorkflowAccessRequirement,
 	WorkflowAccessRequirements,