dineway 0.1.49 → 0.2.1

package/dist/{zod-generator-K91-g665.mjs → zod-generator-C7AsLpSB.mjs}

@@ -1,12 +1,13 @@
-import { a as __exportAll } from "./runner-DzIpHGND.mjs";
-import { n as hashString } from "./hash-BPmX6P8I.mjs";
+import { a as __exportAll } from "./runner-BgmttQmD.mjs";
+import { n as hashString } from "./hash-mxxx2oPW.mjs";
 import { z } from "zod";
 
 //#region src/schema/zod-generator.ts
 var zod_generator_exports = /* @__PURE__ */ __exportAll({
 	generateSchemaHash: () => generateSchemaHash,
 	generateTypeScript: () => generateTypeScript,
-	generateTypesFile: () => generateTypesFile
+	generateTypesFile: () => generateTypesFile,
+	uniqueInterfaceNames: () => uniqueInterfaceNames
 });
 /** Pattern to split on underscores, hyphens, and spaces for PascalCase conversion */
 const PASCAL_CASE_SPLIT_PATTERN = /[_\-\s]+/;
@@ -14,8 +15,7 @@ const PASCAL_CASE_SPLIT_PATTERN = /[_\-\s]+/;
 * Generate TypeScript interface from field definitions
 * Used by CLI `dineway types` to generate types
 */
-function generateTypeScript(collection) {
-	const interfaceName = getInterfaceName(collection);
+function generateTypeScript(collection, interfaceName = getInterfaceName(collection)) {
 	const lines = [];
 	lines.push(`export interface ${interfaceName} {`);
 	lines.push(`  id: string;`);
@@ -50,16 +50,14 @@ function generateTypesFile(collections) {
 	if (needsPortableText) imports.push("PortableTextBlock");
 	lines.push(`import type { ${imports.join(", ")} } from "dineway";`);
 	lines.push(``);
+	const interfaceNames = uniqueInterfaceNames(collections);
 	for (const collection of collections) {
-		lines.push(generateTypeScript(collection));
+		lines.push(generateTypeScript(collection, interfaceNames.get(collection.slug)));
 		lines.push(``);
 	}
 	lines.push(`declare module "dineway" {`);
 	lines.push(`  interface DinewayCollections {`);
-	for (const collection of collections) {
-		const interfaceName = getInterfaceName(collection);
-		lines.push(`    ${collection.slug}: ${interfaceName};`);
-	}
+	for (const collection of collections) lines.push(`    ${collection.slug}: ${interfaceNames.get(collection.slug)};`);
 	lines.push(`  }`);
 	lines.push(`}`);
 	return lines.join("\n");
@@ -114,7 +112,8 @@ function pascalCase(str) {
 	return str.split(PASCAL_CASE_SPLIT_PATTERN).filter(Boolean).map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()).join("");
 }
 /**
-* Simple singularization - handles common cases
+* Naive singularization for slug-derived interface names. Handles common
+* English plural endings; intentionally simple, not a full inflector.
 */
 function singularize(str) {
 	if (str.endsWith("ies")) return str.slice(0, -3) + "y";
@@ -123,11 +122,40 @@ function singularize(str) {
 	return str;
 }
 /**
-* Get the interface name for a collection
+* Get the interface name for a collection.
+*
+* Derived from the slug, not the human label. Slugs are constrained to
+* /^[a-z][a-z0-9_]*$/, so PascalCasing one always yields a valid TypeScript
+* identifier. Labels are arbitrary user-facing text and may contain spaces,
+* punctuation, or duplicates across collections.
+*
+* The slug is singularized first because the interface describes one entry,
+* not the collection. Callers emitting more than one interface should use
+* uniqueInterfaceNames() to resolve collisions introduced by singularization.
 */
 function getInterfaceName(collection) {
-	return pascalCase(collection.labelSingular || singularize(collection.slug));
+	return pascalCase(singularize(collection.slug));
+}
+/**
+* Resolve interface names for a set of collections, guaranteeing each emitted
+* identifier is unique within the generated file.
+*/
+function uniqueInterfaceNames(collections) {
+	const used = /* @__PURE__ */ new Set();
+	const names = /* @__PURE__ */ new Map();
+	for (const collection of collections) {
+		const base = getInterfaceName(collection);
+		let name = base;
+		let suffix = 2;
+		while (used.has(name)) {
+			name = `${base}${suffix}`;
+			suffix++;
+		}
+		used.add(name);
+		names.set(collection.slug, name);
+	}
+	return names;
 }
 
 //#endregion
-export { zod_generator_exports as n, generateTypeScript as t };
+export { uniqueInterfaceNames as n, zod_generator_exports as r, generateTypeScript as t };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dineway",
-  "version": "0.1.49",
+  "version": "0.2.1",
   "description": "Agentic Website builder for restaurants — structured content meets AI via the Model Context Protocol",
   "type": "module",
   "publishConfig": {
@@ -64,6 +64,10 @@
       "types": "./dist/cli/index.d.mts",
       "default": "./dist/cli/index.mjs"
     },
+    "./cli/plugin-kit": {
+      "types": "./dist/cli/plugin-kit.d.mts",
+      "default": "./dist/cli/plugin-kit.mjs"
+    },
     "./routes/PluginRegistry": {
       "types": "./dist/astro/routes/PluginRegistry.d.mts",
       "default": "./dist/astro/routes/PluginRegistry.mjs"
@@ -93,6 +97,10 @@
       "types": "./dist/storage/s3.d.mts",
       "default": "./dist/storage/s3.mjs"
     },
+    "./object-cache/memory": {
+      "types": "./dist/object-cache/memory.d.mts",
+      "default": "./dist/object-cache/memory.mjs"
+    },
     "./media": {
       "types": "./dist/media/index.d.mts",
       "default": "./dist/media/index.mjs"
@@ -101,6 +109,14 @@
       "types": "./dist/media/local-runtime.d.mts",
       "default": "./dist/media/local-runtime.mjs"
     },
+    "./media/image-endpoint": {
+      "types": "./dist/media/image-endpoint.d.mts",
+      "default": "./dist/media/image-endpoint.mjs"
+    },
+    "./image-endpoint": {
+      "types": "./dist/astro/image-endpoint.d.mts",
+      "default": "./dist/astro/image-endpoint.mjs"
+    },
     "./runtime": {
       "types": "./dist/runtime.d.mts",
       "default": "./dist/runtime.mjs"
@@ -217,6 +233,9 @@
       "cli": [
         "dist/cli/index.d.mts"
       ],
+      "cli/plugin-kit": [
+        "dist/cli/plugin-kit.d.mts"
+      ],
       "client": [
         "dist/client/index.d.mts"
       ],
@@ -265,6 +284,12 @@
       "media/local-runtime": [
         "dist/media/local-runtime.d.mts"
       ],
+      "media/image-endpoint": [
+        "dist/media/image-endpoint.d.mts"
+      ],
+      "image-endpoint": [
+        "dist/astro/image-endpoint.d.mts"
+      ],
       "middleware": [
         "dist/astro/middleware.d.mts"
       ],
@@ -280,6 +305,9 @@
       "middleware/setup": [
         "dist/astro/middleware/setup.d.mts"
       ],
+      "object-cache/memory": [
+        "dist/object-cache/memory.d.mts"
+      ],
       "page": [
         "dist/page/index.d.mts"
       ],
@@ -320,7 +348,7 @@
   },
   "dependencies": {
     "@forgeway/sdk": "^1.1.0",
-    "@cloudflare/kumo": "^2.3.0",
+    "@cloudflare/kumo": "2.6.0",
     "@floating-ui/react": "^0.27.16",
     "@modelcontextprotocol/sdk": "^1.26.0",
     "@portabletext/toolkit": "^5.0.1",
@@ -338,7 +366,7 @@
     "@tiptap/suggestion": "^3.20.0",
     "@unpic/placeholder": "^0.1.2",
     "arctic": "^3.7.0",
-    "astro-portabletext": "^0.11.0",
+    "astro-portabletext": "^0.13.0",
     "better-sqlite3": "^12.8.0",
     "blurhash": "^2.0.5",
     "citty": "^0.1.6",
@@ -350,15 +378,16 @@
     "kysely": "^0.27.0",
     "mime": "^4.1.0",
     "modern-tar": "^0.7.5",
+    "parse5": "^8.0.0",
     "picocolors": "^1.1.1",
     "sanitize-html": "^2.17.1",
     "sax": "^1.4.1",
     "ulidx": "^2.4.1",
     "upng-js": "^2.1.0",
     "zod": "^4.4.1",
-    "@dineway-ai/admin": "^0.1.18",
-    "@dineway-ai/auth": "^0.1.18",
-    "@dineway-ai/gutenberg-to-portable-text": "^0.1.16"
+    "@dineway-ai/admin": "^0.2.1",
+    "@dineway-ai/auth": "^0.2.3",
+    "@dineway-ai/gutenberg-to-portable-text": "^0.2.1"
   },
   "optionalDependencies": {
     "@aws-sdk/client-s3": "^3.1049.0",
@@ -380,14 +409,14 @@
     "@types/react": "19.2.14",
     "@types/sanitize-html": "^2.16.0",
     "@types/sax": "^1.2.7",
-    "@vitest/ui": "^4.0.17",
+    "@vitest/ui": "4.0.18",
     "publint": "0.3.17",
     "tsdown": "0.20.3",
     "typescript": "^5.9.3",
     "vite": "^6.0.0",
     "vitest": "^4.0.18",
     "zod-openapi": "^5.4.6",
-    "@dineway-ai/blocks": "^0.1.16"
+    "@dineway-ai/blocks": "^0.2.3"
   },
   "keywords": [
     "astro",
@@ -405,6 +434,7 @@
     "typecheck": "tsgo --noEmit",
     "check": "publint && attw --pack --ignore-rules=cjs-resolves-to-esm --ignore-rules=no-resolution --ignore-rules=internal-resolution-error",
     "test": "vitest",
+    "test:repro": "vitest run --config vitest.repro.config.ts",
     "test:smoke": "vitest run --config vitest.smoke.config.ts",
     "test:integration": "vitest run --config vitest.integration.config.ts"
   }

package/src/components/Block.astro

@@ -0,0 +1,50 @@
+---
+import type { BlockProps } from "astro-portabletext/types";
+
+import { textAlignClassName } from "./portable-text-text-align.js";
+
+type TextAlignedNode = BlockProps["node"] & { textAlign?: string };
+type Props = Omit<BlockProps, "node"> & { node: TextAlignedNode };
+
+const props = Astro.props as Props;
+const { node, index: _index, isInline: _isInline, ...attrs } = props;
+
+const styleIs = (style: string) => style === node.style;
+const alignClass = textAlignClassName(node.textAlign);
+---
+
+{
+	styleIs("h1") ? (
+		<h1 class={alignClass} {...attrs}>
+			<slot />
+		</h1>
+	) : styleIs("h2") ? (
+		<h2 class={alignClass} {...attrs}>
+			<slot />
+		</h2>
+	) : styleIs("h3") ? (
+		<h3 class={alignClass} {...attrs}>
+			<slot />
+		</h3>
+	) : styleIs("h4") ? (
+		<h4 class={alignClass} {...attrs}>
+			<slot />
+		</h4>
+	) : styleIs("h5") ? (
+		<h5 class={alignClass} {...attrs}>
+			<slot />
+		</h5>
+	) : styleIs("h6") ? (
+		<h6 class={alignClass} {...attrs}>
+			<slot />
+		</h6>
+	) : styleIs("blockquote") ? (
+		<blockquote class={alignClass} {...attrs}>
+			<slot />
+		</blockquote>
+	) : (
+		<p class={alignClass} {...attrs}>
+			<slot />
+		</p>
+	)
+}

package/src/components/Comments.astro

@@ -19,6 +19,8 @@ interface Props {
 	collection: string;
 	contentId: string;
 	threaded?: boolean;
+	reactions?: boolean;
+	sort?: "oldest" | "best";
 	class?: string;
 }
 
@@ -26,13 +28,15 @@ const {
 	collection,
 	contentId,
 	threaded = false,
+	reactions = false,
+	sort = "oldest",
 	class: className,
 } = Astro.props;
 
 const collectionInfo = await getCollectionInfo(collection);
 const enabled = collectionInfo?.commentsEnabled ?? false;
 const { items, total } = enabled
-	? await getComments({ collection, contentId, threaded })
+	? await getComments({ collection, contentId, threaded, reactions, sort })
 	: { items: [], total: 0 };
 
 const URL_RE = /https?:\/\/[^\s<>"')\]]+/g;
@@ -60,15 +64,74 @@ function escapeHtml(text: string): string {
 function formatBody(text: string): string {
 	return autoLinkUrls(escapeHtml(text));
 }
+
+const REACTION_SCRIPT = `
+(() => {
+  const sections = document.querySelectorAll('[data-ec-comments][data-ec-reactions]');
+  sections.forEach((section) => {
+    const collection = section.getAttribute('data-collection');
+    const contentId = section.getAttribute('data-content-id');
+    if (!collection || !contentId) return;
+
+    const base = '/_dineway/api/comments/' + encodeURIComponent(collection) + '/' + encodeURIComponent(contentId) + '/reactions';
+    const headers = { 'X-Dineway-Request': '1' };
+
+    fetch(base, { headers: headers })
+      .then((response) => (response.ok ? response.json() : null))
+      .then((payload) => {
+        const viewer = payload && payload.data && payload.data.viewer;
+        if (!viewer) return;
+        Object.keys(viewer).forEach((commentId) => {
+          (viewer[commentId] || []).forEach((reaction) => {
+            const selector = '.ec-reaction[data-comment-id="' + commentId + '"][data-ec-reaction="' + reaction + '"]';
+            const button = section.querySelector(selector);
+            if (button) button.setAttribute('aria-pressed', 'true');
+          });
+        });
+      })
+      .catch(() => {});
+
+    section.addEventListener('click', (event) => {
+      const target = event.target;
+      if (!(target instanceof Element)) return;
+      const button = target.closest('.ec-reaction');
+      if (!button || !section.contains(button)) return;
+
+      const commentId = button.getAttribute('data-comment-id');
+      const reaction = button.getAttribute('data-ec-reaction');
+      if (!commentId || !reaction) return;
+
+      button.disabled = true;
+      fetch(base, {
+        method: 'POST',
+        headers: Object.assign({ 'Content-Type': 'application/json' }, headers),
+        body: JSON.stringify({ commentId: commentId, reaction: reaction }),
+      })
+        .then((response) => (response.ok ? response.json() : null))
+        .then((payload) => {
+          const data = payload && payload.data;
+          if (!data) return;
+          button.setAttribute('aria-pressed', data.reacted ? 'true' : 'false');
+          const countEl = button.querySelector('[data-ec-reaction-count]');
+          if (countEl) countEl.textContent = String((data.counts && data.counts[reaction]) || 0);
+        })
+        .catch(() => {})
+        .finally(() => { button.disabled = false; });
+    });
+  });
+})();
+`;
 ---
 
 {
 	enabled && (
+		<Fragment>
 		<section
 			class:list={["ec-comments", className]}
 			data-ec-comments
 			data-collection={collection}
 			data-content-id={contentId}
+			{...(reactions ? { "data-ec-reactions": "" } : {})}
 		>
 			<h3 class="ec-comments-heading">
 				{total === 0
@@ -110,6 +173,25 @@ function formatBody(text: string): string {
 									class="ec-comment-body"
 									set:html={formatBody(comment.body)}
 								/>
+								{reactions && (
+									<div class="ec-comment-actions">
+										<button
+											type="button"
+											class="ec-reaction"
+											data-ec-reaction="like"
+											data-comment-id={comment.id}
+											aria-pressed="false"
+										>
+											<span class="ec-reaction-icon" aria-hidden="true">
+												&#x2661;
+											</span>
+											<span class="ec-reaction-label">Like</span>
+											<span class="ec-reaction-count" data-ec-reaction-count>
+												{comment.reactions?.like ?? 0}
+											</span>
+										</button>
+									</div>
+								)}
 								{threaded && comment.replies && comment.replies.length > 0 && (
 									<ol class="ec-comment-replies">
 										{comment.replies.map((reply: PublicComment) => (
@@ -151,6 +233,28 @@ function formatBody(text: string): string {
 														class="ec-comment-body"
 														set:html={formatBody(reply.body)}
 													/>
+													{reactions && (
+														<div class="ec-comment-actions">
+															<button
+																type="button"
+																class="ec-reaction"
+																data-ec-reaction="like"
+																data-comment-id={reply.id}
+																aria-pressed="false"
+															>
+																<span class="ec-reaction-icon" aria-hidden="true">
+																	&#x2661;
+																</span>
+																<span class="ec-reaction-label">Like</span>
+																<span
+																	class="ec-reaction-count"
+																	data-ec-reaction-count
+																>
+																	{reply.reactions?.like ?? 0}
+																</span>
+															</button>
+														</div>
+													)}
 												</article>
 											</li>
 										))}
@@ -162,6 +266,8 @@ function formatBody(text: string): string {
 				</ol>
 			)}
 		</section>
+		{reactions && <script is:inline set:html={REACTION_SCRIPT} />}
+		</Fragment>
 	)
 }
 
@@ -227,4 +333,40 @@ function formatBody(text: string): string {
 		white-space: pre-wrap;
 		word-break: break-word;
 	}
+
+	.ec-comment-actions {
+		margin-top: 0.5rem;
+	}
+
+	.ec-reaction {
+		display: inline-flex;
+		align-items: center;
+		gap: 0.35rem;
+		font: inherit;
+		font-size: 0.875em;
+		color: inherit;
+		background: none;
+		border: var(--ec-comment-border);
+		border-radius: 999px;
+		padding: 0.15rem 0.6rem;
+		cursor: pointer;
+	}
+
+	.ec-reaction[aria-pressed="true"] {
+		border-color: currentColor;
+		font-weight: 600;
+	}
+
+	.ec-reaction[aria-pressed="true"] .ec-reaction-icon {
+		color: #e0245e;
+	}
+
+	.ec-reaction:disabled {
+		opacity: 0.5;
+		cursor: default;
+	}
+
+	.ec-reaction-count {
+		font-variant-numeric: tabular-nums;
+	}
 </style>

package/src/components/DinewayHead.astro

@@ -14,6 +14,7 @@
  * ```
  */
 import {
+	createSha256CspHash,
 	generateBaseSeoContributions,
 	generateSiteSeoContributions,
 	getPageRuntime,
@@ -25,7 +26,9 @@ import {
 	absolutizeMediaUrl,
 	type PageMetadataContribution,
 	type PublicPageContext,
+	type ResolvedPageMetadata,
 } from "dineway/ui/server-runtime";
+import JsonLdScript from "./JsonLdScript.astro";
 
 interface Props {
 	page: PublicPageContext;
@@ -37,6 +40,7 @@ const runtime = getPageRuntime(Astro.locals as Record<string, unknown>);
 let metadataHtml = "";
 let siteIdentityHtml = "";
 let fragmentsHtml = "";
+let jsonLdScripts: ResolvedPageMetadata["jsonld"] = [];
 
 if (runtime) {
 	// Plugin contributions come BEFORE site/base, so resolvePageMetadata's
@@ -59,17 +63,30 @@ if (runtime) {
 	const siteContributions = generateSiteSeoContributions(siteSettings.seo);
 	const allContributions = [...pluginContributions, ...siteContributions, ...baseContributions];
 	const resolved = resolvePageMetadata(allContributions);
-	metadataHtml = renderPageMetadata(resolved);
+	jsonLdScripts = resolved.jsonld;
+	metadataHtml = renderPageMetadata(resolved, { includeJsonLd: false });
 	siteIdentityHtml = renderSiteIdentity({ favicon: siteSettings.favicon });
 	fragmentsHtml = renderFragments(fragments, "head");
 } else {
 	// No runtime (Dineway not initialized) — still render base SEO
 	const baseContributions: PageMetadataContribution[] = generateBaseSeoContributions(page);
 	const resolved = resolvePageMetadata(baseContributions);
-	metadataHtml = renderPageMetadata(resolved);
+	jsonLdScripts = resolved.jsonld;
+	metadataHtml = renderPageMetadata(resolved, { includeJsonLd: false });
+}
+
+if (Astro.csp && jsonLdScripts.length > 0) {
+	await Promise.all(
+		jsonLdScripts.map(async ({ json }) => {
+			Astro.csp?.insertScriptHash(await createSha256CspHash(json));
+		}),
+	);
 }
 ---
 
 <Fragment set:html={metadataHtml} />
+{
+	jsonLdScripts.map(({ json }) => <JsonLdScript json={json} />)
+}
 <Fragment set:html={siteIdentityHtml} />
 <Fragment set:html={fragmentsHtml} />