studiocms 0.1.0-beta.24 → 0.1.0-beta.26

package/src/routes/api/rest/v1/pages/[id]/history/[diffid].ts

@@ -1,53 +1,63 @@
 import { apiResponseLogger } from 'studiocms:logger';
 import { SDKCore } from 'studiocms:sdk';
-import type { APIContext, APIRoute } from 'astro';
-import { convertToVanilla, genLogger } from '../../../../../../../lib/effects/index.js';
-import { AllResponse, OptionsResponse } from '../../../../../../../lib/endpointResponses.js';
+import {
+	AllResponse,
+	createEffectAPIRoutes,
+	createJsonResponse,
+	Effect,
+	genLogger,
+	OptionsResponse,
+} from '../../../../../../../effect.js';
 import { verifyAuthTokenFromHeader } from '../../../../utils/auth-token.js';
 
-export const GET: APIRoute = async (context: APIContext) =>
-	await convertToVanilla(
-		genLogger('studioCMS:rest:v1:pages:[id]:history:[diffid]:GET')(function* () {
-			const sdk = yield* SDKCore;
-
-			const user = yield* verifyAuthTokenFromHeader(context);
-
-			if (user instanceof Response) {
-				return user;
-			}
-
-			const { rank } = user;
-
-			if (rank !== 'owner' && rank !== 'admin' && rank !== 'editor') {
-				return apiResponseLogger(401, 'Unauthorized');
-			}
-
-			const { id, diffid } = context.params;
-
-			if (!id) {
-				return apiResponseLogger(400, 'Invalid page ID');
-			}
-
-			if (!diffid) {
-				return apiResponseLogger(400, 'Invalid diff ID');
-			}
-
-			const diff = yield* sdk.diffTracking.get.single(diffid);
-
-			if (!diff) {
-				return apiResponseLogger(404, 'Diff not found');
-			}
-
-			return new Response(JSON.stringify(diff), {
-				headers: {
-					'Content-Type': 'application/json',
-				},
-			});
-		})
-	).catch((error) => {
-		return apiResponseLogger(500, 'Internal Server Error', error);
-	});
-
-export const OPTIONS: APIRoute = async () => OptionsResponse(['GET']);
-
-export const ALL: APIRoute = async () => AllResponse();
+export const { GET, OPTIONS, ALL } = createEffectAPIRoutes(
+	{
+		GET: (ctx) =>
+			genLogger('studioCMS:rest:v1:pages:[id]:history:[diffid]:GET')(function* () {
+				const sdk = yield* SDKCore;
+
+				const user = yield* verifyAuthTokenFromHeader(ctx);
+
+				if (user instanceof Response) {
+					return user;
+				}
+
+				const { rank } = user;
+
+				if (rank !== 'owner' && rank !== 'admin' && rank !== 'editor') {
+					return apiResponseLogger(401, 'Unauthorized');
+				}
+
+				const { id, diffid } = ctx.params;
+
+				if (!id) {
+					return apiResponseLogger(400, 'Invalid page ID');
+				}
+
+				if (!diffid) {
+					return apiResponseLogger(400, 'Invalid diff ID');
+				}
+
+				const diff = yield* sdk.diffTracking.get.single(diffid);
+
+				if (!diff) {
+					return apiResponseLogger(404, 'Diff not found');
+				}
+
+				if (diff.pageId !== id) {
+					return apiResponseLogger(404, 'Diff not found');
+				}
+
+				return createJsonResponse(diff);
+			}),
+		OPTIONS: () => Effect.try(() => OptionsResponse({ allowedMethods: ['GET'] })),
+		ALL: () => Effect.try(() => AllResponse()),
+	},
+	{
+		cors: { methods: ['GET', 'OPTIONS'] },
+		onError: (error) => {
+			console.error('API Error:', error);
+			return createJsonResponse({ error: 'Internal Server Error' }, { status: 500 });
+		},
+	}
+);

package/src/routes/api/rest/v1/pages/[id]/history/index.ts

@@ -1,69 +1,67 @@
 import { apiResponseLogger } from 'studiocms:logger';
 import { SDKCore } from 'studiocms:sdk';
-import type { APIContext, APIRoute } from 'astro';
-import { convertToVanilla, genLogger } from '../../../../../../../lib/effects/index.js';
-import { AllResponse, OptionsResponse } from '../../../../../../../lib/endpointResponses.js';
+import {
+	AllResponse,
+	createEffectAPIRoutes,
+	createJsonResponse,
+	Effect,
+	genLogger,
+	OptionsResponse,
+} from '../../../../../../../effect.js';
 import { verifyAuthTokenFromHeader } from '../../../../utils/auth-token.js';
 
-export const GET: APIRoute = async (context: APIContext) =>
-	await convertToVanilla(
-		genLogger('studioCMS:rest:v1:public:pages:[id]:history:GET')(function* () {
-			const sdk = yield* SDKCore;
-
-			const user = yield* verifyAuthTokenFromHeader(context);
-
-			if (user instanceof Response) {
-				return user;
-			}
-
-			const { rank } = user;
-
-			if (rank !== 'owner' && rank !== 'admin' && rank !== 'editor') {
-				return apiResponseLogger(401, 'Unauthorized');
-			}
-
-			const { id } = context.params;
-
-			if (!id) {
-				return apiResponseLogger(400, 'Invalid page ID');
-			}
-
-			const page = yield* sdk.GET.page.byId(id);
-
-			if (!page) {
-				return apiResponseLogger(404, 'Page not found');
-			}
-
-			const searchParams = context.url.searchParams;
-
-			const limit = searchParams.get('limit');
-
-			let diffs: {
-				id: string;
-				userId: string;
-				pageId: string;
-				timestamp: Date | null;
-				pageMetaData: unknown;
-				pageContentStart: string;
-				diff: string | null;
-			}[] = [];
-
-			if (limit) {
-				diffs = yield* sdk.diffTracking.get.byPageId.latest(id, Number.parseInt(limit));
-			} else {
-				diffs = yield* sdk.diffTracking.get.byPageId.all(id);
-			}
-
-			return new Response(JSON.stringify(diffs), {
-				headers: {
-					'Content-Type': 'application/json',
-				},
-			});
-		})
-	).catch((error) => {
-		return apiResponseLogger(500, 'Internal Server Error', error);
-	});
-
-export const OPTIONS: APIRoute = async () => OptionsResponse(['GET']);
-
-export const ALL: APIRoute = async () => AllResponse();
+export const { GET, OPTIONS, ALL } = createEffectAPIRoutes(
+	{
+		GET: (ctx) =>
+			genLogger('studioCMS:rest:v1:public:pages:[id]:history:GET')(function* () {
+				const [sdk, user] = yield* Effect.all([SDKCore, verifyAuthTokenFromHeader(ctx)]);
+
+				if (user instanceof Response) {
+					return user;
+				}
+
+				const { rank } = user;
+
+				if (rank !== 'owner' && rank !== 'admin' && rank !== 'editor') {
+					return apiResponseLogger(401, 'Unauthorized');
+				}
+
+				const { id } = ctx.params;
+
+				if (!id) {
+					return apiResponseLogger(400, 'Invalid page ID');
+				}
+
+				const page = yield* sdk.GET.page.byId(id);
+
+				if (!page) {
+					return apiResponseLogger(404, 'Page not found');
+				}
+
+				const searchParams = ctx.url.searchParams;
+
+				const limitParam = searchParams.get('limit');
+				const parsedLimit = limitParam ? Number.parseInt(limitParam, 10) : undefined;
+				const limit =
+					typeof parsedLimit === 'number' && Number.isFinite(parsedLimit) && parsedLimit > 0
+						? Math.min(parsedLimit, 100) // clamp to protect backend
+						: undefined;
+
+				const diffs =
+					limit !== undefined
+						? yield* sdk.diffTracking.get.byPageId.latest(id, limit)
+						: yield* sdk.diffTracking.get.byPageId.all(id);
+
+				return createJsonResponse(diffs);
+			}),
+		OPTIONS: () => Effect.try(() => OptionsResponse({ allowedMethods: ['GET'] })),
+		ALL: () => Effect.try(() => AllResponse()),
+	},
+	{
+		cors: { methods: ['GET', 'OPTIONS'] },
+		onError: (error) => {
+			console.error('API Error:', error);
+			return createJsonResponse({ error: 'Internal Server Error' }, { status: 500 });
+		},
+	}
+);

package/src/routes/api/rest/v1/pages/[id]/index.ts

@@ -2,10 +2,15 @@ import { apiResponseLogger } from 'studiocms:logger';
 import { Notifications } from 'studiocms:notifier';
 import { SDKCore } from 'studiocms:sdk';
 import type { tsPageContentSelect, tsPageDataSelect } from 'studiocms:sdk/types';
-import type { APIContext, APIRoute } from 'astro';
-import { Effect } from 'effect';
-import { convertToVanilla, genLogger } from '../../../../../../lib/effects/index.js';
-import { AllResponse, OptionsResponse } from '../../../../../../lib/endpointResponses.js';
+import {
+	AllResponse,
+	createEffectAPIRoutes,
+	createJsonResponse,
+	Effect,
+	genLogger,
+	OptionsResponse,
+	readAPIContextJson,
+} from '../../../../../../effect.js';
 import { verifyAuthTokenFromHeader } from '../../../utils/auth-token.js';
 
 type UpdatePageData = Partial<tsPageDataSelect>;
@@ -17,218 +22,210 @@ interface UpdatePageJson {
 	content?: UpdatePageContent;
 }
 
-export const GET: APIRoute = async (context: APIContext) =>
-	await convertToVanilla(
-		genLogger('studioCMS:rest:v1:public:pages:[id]:GET')(function* () {
-			const sdk = yield* SDKCore;
+export const { GET, PATCH, DELETE, OPTIONS, ALL } = createEffectAPIRoutes(
+	{
+		GET: (ctx) =>
+			genLogger('studioCMS:rest:v1:pages:[id]:GET')(function* () {
+				const [sdk, user] = yield* Effect.all([SDKCore, verifyAuthTokenFromHeader(ctx)]);
 
-			const user = yield* verifyAuthTokenFromHeader(context);
+				if (user instanceof Response) {
+					return user;
+				}
 
-			if (user instanceof Response) {
-				return user;
-			}
+				const { rank } = user;
 
-			const { rank } = user;
+				if (rank !== 'owner' && rank !== 'admin' && rank !== 'editor') {
+					return apiResponseLogger(401, 'Unauthorized');
+				}
 
-			if (rank !== 'owner' && rank !== 'admin' && rank !== 'editor') {
-				return apiResponseLogger(401, 'Unauthorized');
-			}
+				const { id } = ctx.params;
 
-			const { id } = context.params;
+				if (!id) {
+					return apiResponseLogger(400, 'Invalid page ID');
+				}
 
-			if (!id) {
-				return apiResponseLogger(400, 'Invalid page ID');
-			}
+				const page = yield* sdk.GET.page.byId(id);
 
-			const page = yield* sdk.GET.page.byId(id);
+				if (!page) {
+					return apiResponseLogger(404, 'Page not found');
+				}
 
-			if (!page) {
-				return apiResponseLogger(404, 'Page not found');
-			}
+				return createJsonResponse(page);
+			}),
+		PATCH: (ctx) =>
+			genLogger('studioCMS:rest:v1:pages:[id]:PATCH')(function* () {
+				const [sdk, user, notifier] = yield* Effect.all([
+					SDKCore,
+					verifyAuthTokenFromHeader(ctx),
+					Notifications,
+				]);
 
-			return new Response(JSON.stringify(page), {
-				headers: {
-					'Content-Type': 'application/json',
-				},
-			});
-		})
-	).catch((error) => {
-		return apiResponseLogger(500, 'Internal Server Error', error);
-	});
+				if (user instanceof Response) {
+					return user;
+				}
 
-export const PATCH: APIRoute = async (context: APIContext) =>
-	await convertToVanilla(
-		genLogger('studioCMS:rest:v1:public:pages:[id]:PATCH')(function* () {
-			const sdk = yield* SDKCore;
+				const { rank, userId } = user;
 
-			const user = yield* verifyAuthTokenFromHeader(context);
+				if (rank !== 'owner' && rank !== 'admin' && rank !== 'editor') {
+					return apiResponseLogger(401, 'Unauthorized');
+				}
 
-			if (user instanceof Response) {
-				return user;
-			}
+				const { id } = ctx.params;
 
-			const { rank, userId } = user;
+				if (!id) {
+					return apiResponseLogger(400, 'Invalid page ID');
+				}
 
-			if (rank !== 'owner' && rank !== 'admin' && rank !== 'editor') {
-				return apiResponseLogger(401, 'Unauthorized');
-			}
+				const jsonData = yield* readAPIContextJson<UpdatePageJson>(ctx);
 
-			const { id } = context.params;
+				const { data, content } = jsonData;
 
-			if (!id) {
-				return apiResponseLogger(400, 'Invalid page ID');
-			}
+				if (!data) {
+					return apiResponseLogger(400, 'Invalid form data, data is required');
+				}
 
-			const jsonData: UpdatePageJson = yield* Effect.tryPromise(() => context.request.json());
+				if (!content) {
+					return apiResponseLogger(400, 'Invalid form data, content is required');
+				}
 
-			const { data, content } = jsonData;
+				if (!data.id) {
+					return apiResponseLogger(400, 'Invalid form data, id is required');
+				}
 
-			if (!data) {
-				return apiResponseLogger(400, 'Invalid form data, data is required');
-			}
+				if (!content.id) {
+					return apiResponseLogger(400, 'Invalid form data, id is required');
+				}
+				if (data.id !== id) {
+					return apiResponseLogger(400, 'Payload id does not match path id');
+				}
 
-			if (!content) {
-				return apiResponseLogger(400, 'Invalid form data, content is required');
-			}
+				const currentPageData = yield* sdk.GET.page.byId(id);
 
-			if (!data.id) {
-				return apiResponseLogger(400, 'Invalid form data, id is required');
-			}
+				if (!currentPageData) {
+					return apiResponseLogger(404, 'Page not found');
+				}
 
-			if (!content.id) {
-				return apiResponseLogger(400, 'Invalid form data, id is required');
-			}
+				const { authorId, contributorIds, defaultContent } = currentPageData.data;
 
-			const currentPageData = yield* sdk.GET.page.byId(id);
+				let AuthorId = authorId;
 
-			if (!currentPageData) {
-				return apiResponseLogger(404, 'Page not found');
-			}
+				if (!authorId) {
+					AuthorId = userId || null;
+				}
 
-			const { authorId, contributorIds } = currentPageData.data;
+				const ContributorIds = contributorIds || [];
 
-			let AuthorId = authorId;
+				if (!ContributorIds.includes(userId)) {
+					ContributorIds.push(userId);
+				}
 
-			if (!authorId) {
-				AuthorId = userId || null;
-			}
+				data.authorId = AuthorId;
+				data.contributorIds = ContributorIds;
+				data.updatedAt = new Date();
 
-			const ContributorIds = contributorIds || [];
-
-			if (!ContributorIds.includes(userId)) {
-				ContributorIds.push(userId);
-			}
-
-			data.authorId = AuthorId;
-			data.contributorIds = JSON.stringify(ContributorIds);
-			data.updatedAt = new Date();
-
-			const startMetaData = (yield* sdk.GET.databaseTable.pageData()).find(
-				(metaData) => metaData.id === data.id
-			);
-
-			const {
-				data: { defaultContent },
-			} = yield* sdk.GET.page.byId(data.id);
-
-			const _updated = yield* sdk.UPDATE.page.byId(data.id, {
-				pageData: data as tsPageDataSelect,
-				pageContent: content as tsPageContentSelect,
-			});
-
-			const updatedMetaData = (yield* sdk.GET.databaseTable.pageData()).find(
-				(metaData) => metaData.id === data.id
-			);
-
-			const siteConfig = yield* sdk.GET.siteConfig();
-
-			if (!siteConfig) {
-				return apiResponseLogger(500, 'Site configuration not found');
-			}
-
-			const { enableDiffs, diffPerPage = 10 } = siteConfig.data;
-
-			if (enableDiffs) {
-				yield* sdk.diffTracking.insert(
-					userId,
-					data.id,
-					{
-						content: {
-							start: defaultContent?.content || '',
-							end: content.content || '',
-						},
-						// biome-ignore lint/style/noNonNullAssertion: This is a valid use case for non-null assertion
-						metaData: { start: startMetaData!, end: updatedMetaData! },
-					},
-					diffPerPage
+				const startMetaData = (yield* sdk.GET.databaseTable.pageData()).find(
+					(metaData) => metaData.id === data.id
 				);
-			}
-
-			yield* sdk.CLEAR.page.byId(id);
-
-			// biome-ignore lint/style/noNonNullAssertion: This is a valid use case for non-null assertion
-			yield* Notifications.sendEditorNotification('page_updated', updatedMetaData!.title);
-
-			return apiResponseLogger(200, 'Page updated successfully');
-		}).pipe(Notifications.Provide)
-	).catch((error) => {
-		return apiResponseLogger(500, 'Internal Server Error', error);
-	});
-
-export const DELETE: APIRoute = async (context: APIContext) =>
-	await convertToVanilla(
-		genLogger('studioCMS:rest:v1:public:pages:[id]:DELETE')(function* () {
-			const sdk = yield* SDKCore;
-
-			const user = yield* verifyAuthTokenFromHeader(context);
 
-			if (user instanceof Response) {
-				return user;
-			}
+				yield* sdk.UPDATE.page.byId(data.id, {
+					pageData: data as tsPageDataSelect,
+					pageContent: content as tsPageContentSelect,
+				});
 
-			const { rank } = user;
-
-			if (rank !== 'owner' && rank !== 'admin') {
-				return apiResponseLogger(401, 'Unauthorized');
-			}
-
-			const { id } = context.params;
-
-			if (!id) {
-				return apiResponseLogger(400, 'Invalid page ID');
-			}
-
-			const jsonData = yield* Effect.tryPromise(() => context.request.json());
-
-			const { slug } = jsonData;
-
-			if (!slug) {
-				return apiResponseLogger(400, 'Invalid request');
-			}
-
-			const isHomePage = yield* sdk.GET.page.bySlug('index');
-
-			if (isHomePage.data && isHomePage.data.id === id) {
-				return apiResponseLogger(400, 'Cannot delete home page');
-			}
-
-			const page = yield* sdk.GET.page.byId(id);
-
-			if (!page) {
-				return apiResponseLogger(404, 'Page not found');
-			}
-
-			yield* sdk.DELETE.page(id);
-			yield* sdk.CLEAR.page.byId(id);
-
-			yield* Notifications.sendEditorNotification('page_deleted', page.data.title);
-
-			return apiResponseLogger(200, 'Page deleted successfully');
-		}).pipe(Notifications.Provide)
-	).catch((error) => {
-		return apiResponseLogger(500, 'Internal Server Error', error);
-	});
-
-export const OPTIONS: APIRoute = async () => OptionsResponse(['GET', 'PATCH', 'DELETE']);
+				const updatedMetaData = (yield* sdk.GET.databaseTable.pageData()).find(
+					(metaData) => metaData.id === data.id
+				);
 
-export const ALL: APIRoute = async () => AllResponse();
+				const siteConfig = yield* sdk.GET.siteConfig();
+
+				if (!siteConfig) {
+					return apiResponseLogger(500, 'Site configuration not found');
+				}
+
+				const { enableDiffs, diffPerPage = 10 } = siteConfig.data;
+
+				if (enableDiffs) {
+					yield* sdk.diffTracking.insert(
+						userId,
+						data.id,
+						{
+							content: {
+								start: defaultContent?.content || '',
+								end: content.content || '',
+							},
+							// biome-ignore lint/style/noNonNullAssertion: This is a valid use case for non-null assertion
+							metaData: { start: startMetaData!, end: updatedMetaData! },
+						},
+						diffPerPage
+					);
+				}
+
+				yield* sdk.CLEAR.page.byId(id);
+
+				// biome-ignore lint/style/noNonNullAssertion: This is a valid use case for non-null assertion
+				yield* notifier.sendEditorNotification('page_updated', updatedMetaData!.title);
+
+				return apiResponseLogger(200, 'Page updated successfully');
+			}).pipe(Notifications.Provide),
+		DELETE: (ctx) =>
+			genLogger('studioCMS:rest:v1:pages:[id]:DELETE')(function* () {
+				const [sdk, user, notifier] = yield* Effect.all([
+					SDKCore,
+					verifyAuthTokenFromHeader(ctx),
+					Notifications,
+				]);
+
+				if (user instanceof Response) {
+					return user;
+				}
+
+				const { rank } = user;
+
+				if (rank !== 'owner' && rank !== 'admin') {
+					return apiResponseLogger(401, 'Unauthorized');
+				}
+
+				const { id } = ctx.params;
+
+				if (!id) {
+					return apiResponseLogger(400, 'Invalid page ID');
+				}
+
+				const jsonData = yield* readAPIContextJson<{ slug: string }>(ctx);
+
+				const { slug } = jsonData;
+
+				if (!slug) {
+					return apiResponseLogger(400, 'Invalid request');
+				}
+
+				const page = yield* sdk.GET.page.byId(id);
+
+				if (!page) {
+					return apiResponseLogger(404, 'Page not found');
+				}
+
+				yield* sdk.DELETE.page(id);
+				yield* sdk.CLEAR.page.byId(id);
+
+				yield* notifier.sendEditorNotification('page_deleted', page.data.title);
+
+				return apiResponseLogger(200, 'Page deleted successfully');
+			}).pipe(Notifications.Provide),
+		OPTIONS: () =>
+			Effect.try(() => OptionsResponse({ allowedMethods: ['GET', 'PATCH', 'DELETE'] })),
+		ALL: () => Effect.try(() => AllResponse()),
+	},
+	{
+		cors: { methods: ['GET', 'PATCH', 'DELETE', 'OPTIONS'] },
+		onError: (error) => {
+			console.error('API Error:', error);
+			return createJsonResponse(
+				{ error: 'Internal Server Error' },
+				{
+					status: 500,
+				}
+			);
+		},
+	}
+);