refactor: deduplicate shared logic across monorepo

apps/api/src/app/api/github/install/route.ts

@@ -1,7 +1,5 @@
 import { auth } from "@superset/auth/server";
-import { db } from "@superset/db/client";
-import { members } from "@superset/db/schema";
-import { and, eq } from "drizzle-orm";
+import { findOrgMembership } from "@superset/db/utils";
 
 import { env } from "@/env";
 import { createSignedState } from "@/lib/oauth-state";
@@ -23,11 +21,9 @@ export async function GET(request: Request) {
 		);
 	}
 
-	const membership = await db.query.members.findFirst({
-		where: and(
-			eq(members.organizationId, organizationId),
-			eq(members.userId, session.user.id),
-		),
+	const membership = await findOrgMembership({
+		userId: session.user.id,
+		organizationId,
 	});
 
 	if (!membership) {

apps/api/src/app/api/integrations/linear/connect/route.ts

@@ -1,7 +1,5 @@
 import { auth } from "@superset/auth/server";
-import { db } from "@superset/db/client";
-import { members } from "@superset/db/schema";
-import { and, eq } from "drizzle-orm";
+import { findOrgMembership } from "@superset/db/utils";
 
 import { env } from "@/env";
 import { createSignedState } from "@/lib/oauth-state";
@@ -25,11 +23,9 @@ export async function GET(request: Request) {
 		);
 	}
 
-	const membership = await db.query.members.findFirst({
-		where: and(
-			eq(members.organizationId, organizationId),
-			eq(members.userId, session.user.id),
-		),
+	const membership = await findOrgMembership({
+		userId: session.user.id,
+		organizationId,
 	});
 
 	if (!membership) {

apps/api/src/app/api/integrations/slack/connect/route.ts

@@ -1,7 +1,5 @@
 import { auth } from "@superset/auth/server";
-import { db } from "@superset/db/client";
-import { members } from "@superset/db/schema";
-import { and, eq } from "drizzle-orm";
+import { findOrgMembership } from "@superset/db/utils";
 
 import { env } from "@/env";
 import { createSignedState } from "@/lib/oauth-state";
@@ -42,12 +40,7 @@ export async function GET(request: Request) {
 
 	const userId = session.user.id;
 
-	const membership = await db.query.members.findFirst({
-		where: and(
-			eq(members.organizationId, organizationId),
-			eq(members.userId, userId),
-		),
-	});
+	const membership = await findOrgMembership({ userId, organizationId });
 
 	if (!membership) {
 		return Response.json(

apps/api/src/app/api/integrations/slack/link/route.ts

@@ -1,11 +1,8 @@
 import { createHmac } from "node:crypto";
 import { auth } from "@superset/auth/server";
 import { db } from "@superset/db/client";
-import {
-	integrationConnections,
-	members,
-	usersSlackUsers,
-} from "@superset/db/schema";
+import { integrationConnections, usersSlackUsers } from "@superset/db/schema";
+import { findOrgMembership } from "@superset/db/utils";
 import { and, eq } from "drizzle-orm";
 import { headers } from "next/headers";
 import { env } from "@/env";
@@ -65,11 +62,9 @@ export async function GET(request: Request) {
 		);
 	}
 
-	const membership = await db.query.members.findFirst({
-		where: and(
-			eq(members.organizationId, connection.organizationId),
-			eq(members.userId, session.user.id),
-		),
+	const membership = await findOrgMembership({
+		userId: session.user.id,
+		organizationId: connection.organizationId,
 	});
 
 	if (!membership) {

apps/marketing/src/lib/blog-utils.ts

@@ -4,6 +4,7 @@
  */
 
 import type { BlogCategory } from "./blog-constants";
+import { formatContentDate } from "./content-utils";
 import type { Person } from "./people";
 
 export interface TocItem {
@@ -25,17 +26,8 @@ export interface BlogPost {
 	content: string;
 }
 
-export function formatBlogDate(date: string): string {
-	return new Date(date).toLocaleDateString("en-US", {
-		year: "numeric",
-		month: "short",
-		day: "numeric",
-	});
-}
+export { slugify } from "./content-utils";
 
-export function slugify(text: string): string {
-	return text
-		.toLowerCase()
-		.replace(/[^a-z0-9]+/g, "-")
-		.replace(/(^-|-$)/g, "");
+export function formatBlogDate(date: string): string {
+	return formatContentDate(date, "short");
 }

apps/marketing/src/lib/blog.ts

@@ -2,6 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import matter from "gray-matter";
 import { type BlogPost, slugify, type TocItem } from "./blog-utils";
+import { normalizeContentDate } from "./content-utils";
 import { getPersonById } from "./people";
 
 export { BLOG_CATEGORIES, type BlogCategory } from "./blog-constants";
@@ -21,15 +22,7 @@ function parseFrontmatter(filePath: string): BlogPost | null {
 		const { data, content } = matter(fileContent);
 
 		const slug = path.basename(filePath, ".mdx");
-
-		let dateValue: string;
-		if (data.date instanceof Date) {
-			dateValue = data.date.toISOString().split("T")[0] as string;
-		} else if (data.date) {
-			dateValue = String(data.date);
-		} else {
-			dateValue = new Date().toISOString().split("T")[0] as string;
-		}
+		const dateValue = normalizeContentDate(data.date) as string;
 
 		const authorId: string = data.author ?? "unknown";
 		const author = getPersonById(authorId) ?? {

apps/marketing/src/lib/changelog-utils.ts

@@ -3,6 +3,8 @@
  * These can be safely imported in both server and client components.
  */
 
+import { formatContentDate } from "./content-utils";
+
 export interface ChangelogEntry {
 	slug: string;
 	url: string;
@@ -13,17 +15,8 @@ export interface ChangelogEntry {
 	content: string;
 }
 
-export function formatChangelogDate(date: string): string {
-	return new Date(date).toLocaleDateString("en-US", {
-		year: "numeric",
-		month: "long",
-		day: "numeric",
-	});
-}
+export { slugify } from "./content-utils";
 
-export function slugify(text: string): string {
-	return text
-		.toLowerCase()
-		.replace(/[^a-z0-9]+/g, "-")
-		.replace(/(^-|-$)/g, "");
+export function formatChangelogDate(date: string): string {
+	return formatContentDate(date, "long");
 }

apps/marketing/src/lib/changelog.ts

@@ -2,6 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import matter from "gray-matter";
 import { type ChangelogEntry, slugify } from "./changelog-utils";
+import { normalizeContentDate } from "./content-utils";
 
 export {
 	type ChangelogEntry,
@@ -17,15 +18,7 @@ function parseFrontmatter(filePath: string): ChangelogEntry | null {
 		const { data, content } = matter(fileContent);
 
 		const slug = path.basename(filePath, ".mdx");
-
-		let dateValue: string;
-		if (data.date instanceof Date) {
-			dateValue = data.date.toISOString().split("T")[0] as string;
-		} else if (data.date) {
-			dateValue = String(data.date);
-		} else {
-			dateValue = new Date().toISOString().split("T")[0] as string;
-		}
+		const dateValue = normalizeContentDate(data.date) as string;
 
 		return {
 			slug,

apps/marketing/src/lib/compare-utils.ts

@@ -3,6 +3,8 @@
  * These can be safely imported in both server and client components.
  */
 
+import { formatContentDate } from "./content-utils";
+
 export interface ComparisonPage {
 	slug: string;
 	url: string;
@@ -18,9 +20,5 @@ export interface ComparisonPage {
 }
 
 export function formatCompareDate(date: string): string {
-	return new Date(date).toLocaleDateString("en-US", {
-		year: "numeric",
-		month: "short",
-		day: "numeric",
-	});
+	return formatContentDate(date, "short");
 }

apps/marketing/src/lib/compare.ts

@@ -3,6 +3,7 @@ import path from "node:path";
 import matter from "gray-matter";
 import { slugify, type TocItem } from "./blog-utils";
 import type { ComparisonPage } from "./compare-utils";
+import { normalizeContentDate } from "./content-utils";
 
 export { type ComparisonPage, formatCompareDate } from "./compare-utils";
 
@@ -14,22 +15,10 @@ function parseFrontmatter(filePath: string): ComparisonPage | null {
 		const { data, content } = matter(fileContent);
 
 		const slug = path.basename(filePath, ".mdx");
-
-		let dateValue: string;
-		if (data.date instanceof Date) {
-			dateValue = data.date.toISOString().split("T")[0] as string;
-		} else if (data.date) {
-			dateValue = String(data.date);
-		} else {
-			dateValue = new Date().toISOString().split("T")[0] as string;
-		}
-
-		let lastUpdated: string | undefined;
-		if (data.lastUpdated instanceof Date) {
-			lastUpdated = data.lastUpdated.toISOString().split("T")[0] as string;
-		} else if (data.lastUpdated) {
-			lastUpdated = String(data.lastUpdated);
-		}
+		const dateValue = normalizeContentDate(data.date) as string;
+		const lastUpdated = normalizeContentDate(data.lastUpdated, {
+			fallbackToNow: false,
+		});
 
 		return {
 			slug,

apps/marketing/src/lib/content-utils.ts

@@ -0,0 +1,46 @@
+const MONTH_SHORT = "short";
+const _MONTH_LONG = "long";
+
+export function formatContentDate(
+	date: string,
+	monthStyle: "short" | "long" = MONTH_SHORT,
+): string {
+	return new Date(date).toLocaleDateString("en-US", {
+		year: "numeric",
+		month: monthStyle,
+		day: "numeric",
+	});
+}
+
+export function slugify(text: string): string {
+	return text
+		.toLowerCase()
+		.replace(/[^a-z0-9]+/g, "-")
+		.replace(/(^-|-$)/g, "");
+}
+
+function toDateInput(dateValue: Date | string | number): string {
+	return new Date(dateValue).toISOString().split("T")[0] as string;
+}
+
+export function normalizeContentDate(
+	value: unknown,
+	options: { fallbackToNow?: boolean } = {},
+): string | undefined {
+	const { fallbackToNow = true } = options;
+	const fallback = fallbackToNow ? toDateInput(Date.now()) : undefined;
+
+	if (value instanceof Date) {
+		return toDateInput(value);
+	}
+
+	if (typeof value === "string" || typeof value === "number") {
+		return value ? String(value) : fallback;
+	}
+
+	if (value) {
+		return String(value);
+	}
+
+	return fallback;
+}

packages/db/src/utils/index.ts

@@ -1 +1,2 @@
+export * from "./membership";
 export * from "./sql";

packages/db/src/utils/membership.ts

@@ -0,0 +1,19 @@
+import { and, eq } from "drizzle-orm";
+
+import { db } from "../client";
+import { members } from "../schema";
+
+export async function findOrgMembership({
+	userId,
+	organizationId,
+}: {
+	userId: string;
+	organizationId: string;
+}) {
+	return db.query.members.findFirst({
+		where: and(
+			eq(members.organizationId, organizationId),
+			eq(members.userId, userId),
+		),
+	});
+}