bsmnt 0.2.7 → 0.2.9

package/src/helpers/integrate/sanity/files/lib/integrations/sanity/sanity.config.ts

@@ -17,10 +17,8 @@ import { structure } from "./structure";
 // Helper function for URL resolution
 function resolveHref(documentType?: string, slug?: string): string | undefined {
 	switch (documentType) {
-		case "page":
-			return slug === "sanity" ? "/sanity" : `/sanity/${slug}`;
 		case "article":
-			return slug ? `/sanity/${slug}` : undefined;
+			return slug ? `/blog/${slug}` : undefined;
 		default:
 			console.warn("Invalid document type:", documentType);
 			return undefined;
@@ -39,29 +37,11 @@ export default defineConfig({
 				// Map routes to documents and GROQ filters
 				mainDocuments: defineDocuments([
 					{
-						route: "/sanity",
-						filter: `_type == "page" && slug.current == "sanity"`,
-					},
-					{
-						route: "/sanity/:slug",
+						route: "/blog/:slug",
 						filter: `_type == "article" && slug.current == $slug && defined(slug.current)`,
 					},
 				]),
 				locations: {
-					page: defineLocations({
-						select: {
-							title: "title",
-							slug: "slug.current",
-						},
-						resolve: (doc) => ({
-							locations: [
-								{
-									title: doc?.title || "Untitled Page",
-									href: resolveHref("page", doc?.slug) ?? "",
-								},
-							],
-						}),
-					}),
 					article: defineLocations({
 						select: {
 							title: "title",

package/src/helpers/integrate/sanity/files/lib/integrations/sanity/sanity.types.ts

@@ -41,13 +41,6 @@ export type Navigation = {
 	}>;
 };
 
-export type PageReference = {
-	_ref: string;
-	_type: "reference";
-	_weak?: boolean;
-	[internalGroqTypeReferenceTo]?: "page";
-};
-
 export type ArticleReference = {
 	_ref: string;
 	_type: "reference";
@@ -58,7 +51,7 @@ export type ArticleReference = {
 export type Link = {
 	_type: "link";
 	linkType?: "internal" | "external";
-	internalLink?: PageReference | ArticleReference;
+	internalLink?: ArticleReference;
 	externalUrl?: string;
 	text?: string;
 	openInNewTab?: boolean;
@@ -201,20 +194,6 @@ export type Article = {
 	tags?: string[];
 };
 
-export type Page = {
-	_id: string;
-	_type: "page";
-	_createdAt: string;
-	_updatedAt: string;
-	_rev: string;
-	slug?: Slug;
-	publishedAt?: string;
-	metadata?: Metadata;
-	title?: string;
-	content?: RichText;
-	link?: Link;
-};
-
 export type SanityImagePaletteSwatch = {
 	_type: "sanity.imagePaletteSwatch";
 	background?: string;
@@ -314,7 +293,6 @@ export type Geopoint = {
 export type AllSanitySchemaTypes =
 	| SanityImageAssetReference
 	| Navigation
-	| PageReference
 	| ArticleReference
 	| Link
 	| SanityImageCrop
@@ -324,7 +302,6 @@ export type AllSanitySchemaTypes =
 	| RichText
 	| Slug
 	| Article
-	| Page
 	| SanityImagePaletteSwatch
 	| SanityImagePalette
 	| SanityImageDimensions

package/src/helpers/integrate/sanity/files/lib/integrations/sanity/schema.json

@@ -158,36 +158,6 @@
 			}
 		}
 	},
-	{
-		"type": "type",
-		"name": "page.reference",
-		"value": {
-			"type": "object",
-			"attributes": {
-				"_ref": {
-					"type": "objectAttribute",
-					"value": {
-						"type": "string"
-					}
-				},
-				"_type": {
-					"type": "objectAttribute",
-					"value": {
-						"type": "string",
-						"value": "reference"
-					}
-				},
-				"_weak": {
-					"type": "objectAttribute",
-					"value": {
-						"type": "boolean"
-					},
-					"optional": true
-				}
-			},
-			"dereferencesTo": "page"
-		}
-	},
 	{
 		"type": "type",
 		"name": "article.reference",
@@ -251,17 +221,8 @@
 				"internalLink": {
 					"type": "objectAttribute",
 					"value": {
-						"type": "union",
-						"of": [
-							{
-								"type": "inline",
-								"name": "page.reference"
-							},
-							{
-								"type": "inline",
-								"name": "article.reference"
-							}
-						]
+						"type": "inline",
+						"name": "article.reference"
 					},
 					"optional": true
 				},
@@ -1189,89 +1150,6 @@
 			}
 		}
 	},
-	{
-		"name": "page",
-		"type": "document",
-		"attributes": {
-			"_id": {
-				"type": "objectAttribute",
-				"value": {
-					"type": "string"
-				}
-			},
-			"_type": {
-				"type": "objectAttribute",
-				"value": {
-					"type": "string",
-					"value": "page"
-				}
-			},
-			"_createdAt": {
-				"type": "objectAttribute",
-				"value": {
-					"type": "string"
-				}
-			},
-			"_updatedAt": {
-				"type": "objectAttribute",
-				"value": {
-					"type": "string"
-				}
-			},
-			"_rev": {
-				"type": "objectAttribute",
-				"value": {
-					"type": "string"
-				}
-			},
-			"slug": {
-				"type": "objectAttribute",
-				"value": {
-					"type": "inline",
-					"name": "slug"
-				},
-				"optional": true
-			},
-			"publishedAt": {
-				"type": "objectAttribute",
-				"value": {
-					"type": "string"
-				},
-				"optional": true
-			},
-			"metadata": {
-				"type": "objectAttribute",
-				"value": {
-					"type": "inline",
-					"name": "metadata"
-				},
-				"optional": true
-			},
-			"title": {
-				"type": "objectAttribute",
-				"value": {
-					"type": "string"
-				},
-				"optional": true
-			},
-			"content": {
-				"type": "objectAttribute",
-				"value": {
-					"type": "inline",
-					"name": "richText"
-				},
-				"optional": true
-			},
-			"link": {
-				"type": "objectAttribute",
-				"value": {
-					"type": "inline",
-					"name": "link"
-				},
-				"optional": true
-			}
-		}
-	},
 	{
 		"name": "sanity.imagePaletteSwatch",
 		"type": "type",

package/src/helpers/integrate/sanity/files/lib/integrations/sanity/schemas/index.ts

@@ -12,11 +12,10 @@ import { example } from "./example";
 import { link } from "./link";
 import { metadata } from "./metadata";
 import { navigation } from "./navigation";
-import { page } from "./page";
 import { richText } from "./richText";
 
 // Re-export all schemas for convenience
-export { link, metadata, richText, article, example, page, navigation };
+export { link, metadata, richText, article, example, navigation };
 
 // Schema collection for Sanity configuration
 export const schema: { types: SchemaTypeDefinition[] } = {
@@ -27,7 +26,6 @@ export const schema: { types: SchemaTypeDefinition[] } = {
 		richText,
 
 		// Document types (content pages)
-		page,
 		article,
 		example,
 

package/src/helpers/integrate/sanity/files/lib/integrations/sanity/schemas/link.ts

@@ -24,7 +24,7 @@ export const link = defineType({
 			name: "internalLink",
 			title: "Internal Link",
 			type: "reference",
-			to: [{ type: "page" }, { type: "article" }],
+			to: [{ type: "article" }],
 			hidden: ({ parent }) => parent?.linkType !== "internal",
 			validation: (Rule) =>
 				Rule.custom((value, context) => {
@@ -76,7 +76,7 @@ export const link = defineType({
 			const title = text || internalTitle || externalUrl || "Untitled Link";
 			const subtitle =
 				linkType === "internal"
-					? `Internal: ${internalTitle || "No page selected"}`
+					? `Internal: ${internalTitle || "No document selected"}`
 					: `External: ${externalUrl || "No URL"}`;
 
 			return {

package/src/helpers/integrate/sanity/files/lib/integrations/sanity/utils/link.ts

@@ -1,11 +1,34 @@
 import type { Link } from "../sanity.types";
 
+/**
+ * Mapping of Sanity document types to their public markdown route paths.
+ */
+export const CONTENT_TYPE_TO_PATH: Record<string, string> = {
+	article: "/blog",
+};
+
 type InternalReference = {
 	_type: string;
 	slug?: { current: string };
 	title?: string;
 };
 
+/**
+ * Resolves a Sanity reference to a full Markdown URL.
+ * Uses the CONTENT_TYPE_TO_PATH mapping for consistency.
+ */
+export const resolveMarkdownUrl = (
+	ref: InternalReference,
+	baseUrl: string,
+): string => {
+	const path = CONTENT_TYPE_TO_PATH[ref._type];
+	if (!path || !ref.slug?.current) {
+		// Fallback to blog if type is unknown
+		return `${baseUrl}/blog/${ref.slug?.current || ""}.md`;
+	}
+	return `${baseUrl}${path}/${ref.slug.current}.md`;
+};
+
 export const urlForReference = (link: Link): string => {
 	if (!link) return "#";
 
@@ -36,8 +59,8 @@ function resolveDocumentUrl(documentType: string, slug?: string): string {
 	if (!slug) return "#";
 
 	switch (documentType) {
-		case "page":
-			return slug === "home" ? "/" : `/${slug}`;
+		case "article":
+			return `/blog/${slug}`;
 		default:
 			console.warn("Unknown document type for URL resolution:", documentType);
 			return "#";

package/src/helpers/integrate/sanity/files/lib/scripts/generate-page.ts

@@ -122,16 +122,9 @@ const generatePageContent = (
 		imports.push(
 			`import { isSanityConfigured } from '@/lib/integrations/check-integration'`,
 		);
-		imports.push(`import { sanityFetch } from 'next-sanity/live'`);
-		imports.push(
-			`import { pageQuery } from '@/lib/integrations/sanity/queries'`,
-		);
-		imports.push(
-			`import type { Page } from '@/lib/integrations/sanity/sanity.types'`,
-		);
-		imports.push(
-			`import { generateSanityMetadata } from '@/lib/utils/metadata'`,
-		);
+		// sanityFetch and generateSanityMetadata are available for use:
+		// import { sanityFetch } from 'next-sanity/live'
+		// import { generateSanityMetadata } from '@/lib/utils/metadata'
 	}
 
 	// Build wrapper props
@@ -154,10 +147,11 @@ const generatePageContent = (
     )
   }
 
-  const { data } = await sanityFetch({
-    query: pageQuery,
-    params: { slug: '${pageName}' },
-  })
+  // TODO: Create a GROQ query for this page's content type
+  // const { data } = await sanityFetch({
+  //   query: yourQuery,
+  //   params: { slug: '${pageName}' },
+  // })
 
   return (
     <Wrapper ${wrapperProps.join(" ")}>
@@ -165,7 +159,7 @@ const generatePageContent = (
         <div className="container">
           <h1>${title}</h1>
           {/* Your content here */}
-          {/* Use data from Sanity: {data?.title} */}
+          {/* Fetch data from Sanity using a custom query */}
         </div>
       </section>
     </Wrapper>
@@ -196,23 +190,16 @@ export async function generateMetadata(): Promise<Metadata> {
     }
   }
 
-  const { data } = await sanityFetch({
-    query: pageQuery,
-    params: { slug: '${pageName}' },
-  })
+  // TODO: Fetch metadata from Sanity using a custom query
+  // const { data } = await sanityFetch({
+  //   query: yourQuery,
+  //   params: { slug: '${pageName}' },
+  // })
 
-  if (!data) {
-    return {
-      title: '${title}',
-      description: '${title} page description',
-    }
+  return {
+    title: '${title}',
+    description: '${title} page description',
   }
-
-  return generateSanityMetadata({
-    document: data,
-    url: '/${pageName}',
-    type: 'website',
-  })
 }`;
 	} else {
 		metadataExport = `

package/src/helpers/integrate/sanity/files/lib/utils/metadata.ts

@@ -35,14 +35,14 @@ const APP_BASE_URL =
  * @example
  * ```ts
  * export async function generateMetadata({ params }) {
- *   const page = await fetchPage(params.slug)
+ *   const article = await fetchArticle(params.slug)
  *
  *   return generatePageMetadata({
- *     title: page.metadata?.title || page.title,
- *     description: page.metadata?.description,
- *     image: { url: page.metadata?.image?.asset?.url },
- *     url: `/page/${params.slug}`,
- *     noIndex: page.metadata?.noIndex,
+ *     title: article.metadata?.title || article.title,
+ *     description: article.metadata?.description,
+ *     image: { url: article.metadata?.image?.asset?.url },
+ *     url: `/blog/${params.slug}`,
+ *     noIndex: article.metadata?.noIndex,
  *   })
  * }
  * ```
@@ -56,7 +56,7 @@ export function generatePageMetadata(
 		keywords,
 		image,
 		url,
-		siteName = "Satūs",
+		siteName = "Basement",
 		noIndex = false,
 		type = "website",
 		publishedTime,
@@ -126,18 +126,18 @@ export function generatePageMetadata(
 }
 
 /**
- * Generate metadata specifically for Sanity CMS pages
+ * Generate metadata specifically for Sanity CMS content
  *
  * @example
  * ```ts
  * import { sanityFetch } from '@/integrations/sanity/live'
  *
  * export async function generateMetadata({ params }) {
- *   const { data } = await sanityFetch({ query: pageQuery, params })
+ *   const { data } = await sanityFetch({ query: ARTICLE_QUERY, params })
  *
  *   return generateSanityMetadata({
  *     document: data,
- *     url: `/sanity/${params.slug}`,
+ *     url: `/blog/${params.slug}`,
  *   })
  * }
  * ```

package/src/helpers/integrate/sanity/files/lib/utils/portable-text-to-markdown.ts

@@ -0,0 +1,24 @@
+import { portableTextToMarkdown as toMarkdown } from "@portabletext/markdown";
+import type { PortableTextBlock } from "@portabletext/types";
+import { urlForImage } from "@/lib/integrations/sanity/utils/image";
+
+export function portableTextToMarkdown(
+	value: PortableTextBlock[] | undefined | null,
+): string {
+	if (!value) return "";
+
+	return toMarkdown(value, {
+		types: {
+			image: ({ value: img }) => {
+				if (!img?.asset?._ref) return "";
+				try {
+					const url = urlForImage(img).url();
+					const alt = img.alt || "Image";
+					return `![${alt}](${url})`;
+				} catch {
+					return "";
+				}
+			},
+		},
+	});
+}

package/src/helpers/integrate/sanity/files/proxy.ts

@@ -0,0 +1,66 @@
+import { NextResponse } from "next/server";
+import type { NextRequest } from "next/server";
+import {
+	mdExtensionRoutes,
+	acceptHeaderRoutes,
+	ignoredPaths,
+} from "@/lib/integrations/sanity/markdown-proxy.config";
+
+export function proxy(request: NextRequest) {
+	const { pathname } = request.nextUrl;
+	const acceptHeader = request.headers.get("accept") || "";
+
+	if (ignoredPaths.some((p) => pathname.startsWith(p))) {
+		return NextResponse.next();
+	}
+
+	// 1. Rewrite .md extension URLs to API routes
+	//    e.g. /blog/my-post.md → /api/blog/my-post.md
+	for (const route of mdExtensionRoutes) {
+		const match = route.regex.exec(pathname);
+		if (match) {
+			const slug = match[1];
+			const url = request.nextUrl.clone();
+			url.pathname = route.apiPath.replace("[slug]", slug!);
+			return NextResponse.rewrite(url);
+		}
+	}
+
+	// 2. Accept: text/markdown — rewrite to markdown API route
+	if (acceptHeader.includes("text/markdown")) {
+		for (const route of acceptHeaderRoutes) {
+			const match = route.regex.exec(pathname);
+			if (match) {
+				const slug = match[1];
+				const url = request.nextUrl.clone();
+				url.pathname = route.apiPath.replace("[slug]", slug!);
+				return NextResponse.rewrite(url);
+			}
+		}
+	}
+
+	// 3. Add Link header for markdown discoverability on HTML page requests
+	const response = NextResponse.next();
+
+	for (const route of acceptHeaderRoutes) {
+		const match = route.regex.exec(pathname);
+		if (match) {
+			const slug = match[1];
+			const mdUrl = route.publicPath.replace("[slug]", slug!);
+			response.headers.set(
+				"Link",
+				`<${mdUrl}>; rel="alternate"; type="text/markdown"`,
+			);
+			response.headers.set("Vary", "Accept");
+			break;
+		}
+	}
+
+	return response;
+}
+
+export const config = {
+	matcher: [
+		"/((?!_next/static|_next/image|favicon.ico|sitemap.xml|robots.txt).*)",
+	],
+};

package/src/templates/next-default/components/ui/image/image.module.css

@@ -0,0 +1,5 @@
+.block {
+  display: block;
+  width: 100%;
+  height: auto;
+}

package/src/templates/next-default/components/ui/image/index.tsx

@@ -10,7 +10,6 @@ import cn from "clsx"
 import NextImage, { type ImageProps as NextImageProps } from "next/image"
 import type { CSSProperties, Ref } from "react"
 import { breakpoints } from "@/lib/styles/config"
-import s from "./image.module.css"
 
 /**
  * Enhanced Image component props extending Next.js Image.
@@ -205,7 +204,7 @@ export function Image({
         objectFit,
         ...style,
       }}
-      className={cn(className, block && s.block)}
+      className={cn(className, block && "block w-full")}
       sizes={finalSizes}
       src={src}
       unoptimized={unoptimized || isSvg}

package/src/templates/next-default/lib/scripts/generate.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env bun
 /**
- * Satūs Generator CLI
+ * Basement Generator CLI
  *
  * Interactive scaffolding for new pages and components.
  * Generates pre-configured templates following project conventions.
@@ -24,7 +24,7 @@ import { createPage, promptPageConfig } from "./generate-page"
 const main = async (): Promise<void> => {
   console.clear()
 
-  p.intro("Satūs Generator")
+  p.intro("Basement Generator")
 
   // Ask what to create
   const createType = await p.select({

package/src/templates/next-default/lib/utils/metadata.ts

@@ -56,7 +56,7 @@ export function generatePageMetadata(
     keywords,
     image,
     url,
-    siteName = "Satūs",
+    siteName = "Basement",
     noIndex = false,
     type = "website",
     publishedTime,

package/src/templates/next-default/next.config.ts

@@ -58,7 +58,6 @@ const nextConfig: NextConfig = {
       },
     },
   },
-  cacheComponents: true,
   experimental: {
     browserDebugInfoInTerminal: true,
     optimizePackageImports: [

package/src/templates/next-experiments/components/ui/image/image.module.css

@@ -0,0 +1,5 @@
+.block {
+  display: block;
+  width: 100%;
+  height: auto;
+}

package/src/templates/next-experiments/components/ui/image/index.tsx

@@ -10,7 +10,6 @@ import cn from "clsx";
 import NextImage, { type ImageProps as NextImageProps } from "next/image";
 import type { CSSProperties, Ref } from "react";
 import { breakpoints } from "@/lib/styles/config";
-import s from "./image.module.css";
 
 /**
  * Enhanced Image component props extending Next.js Image.
@@ -29,6 +28,8 @@ export type ImageProps = Omit<NextImageProps, "objectFit" | "alt"> & {
   desktopSize?: `${number}vw`;
   /** Ref for accessing the underlying img element */
   ref?: Ref<HTMLImageElement>;
+  /** Alt text for accessibility (required for meaningful images) */
+  alt?: string;
   /** Aspect ratio for automatic placeholder and layout stability */
   aspectRatio?: number;
 };
@@ -203,7 +204,7 @@ export function Image({
         objectFit,
         ...style,
       }}
-      className={cn(className, block && s.block)}
+      className={cn(className, block && "block w-full")}
       sizes={finalSizes}
       src={src}
       unoptimized={unoptimized || isSvg}

package/src/templates/next-experiments/lib/scripts/generate.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env bun
 /**
- * Satūs Generator CLI
+ * Basement Generator CLI
  *
  * Interactive scaffolding for new pages and components.
  * Generates pre-configured templates following project conventions.
@@ -24,7 +24,7 @@ import { createPage, promptPageConfig } from "./generate-page"
 const main = async (): Promise<void> => {
   console.clear()
 
-  p.intro("Satūs Generator")
+  p.intro("Basement Generator")
 
   // Ask what to create
   const createType = await p.select({

package/src/templates/next-experiments/lib/utils/metadata.ts

@@ -56,7 +56,7 @@ export function generatePageMetadata(
     keywords,
     image,
     url,
-    siteName = "Satūs",
+    siteName = "Basement",
     noIndex = false,
     type = "website",
     publishedTime,

package/src/templates/next-experiments/next.config.ts

@@ -58,7 +58,6 @@ const nextConfig: NextConfig = {
       },
     },
   },
-  cacheComponents: true,
   experimental: {
     browserDebugInfoInTerminal: true,
     optimizePackageImports: [