@websline/cms-view-utils 1.1.1 → 1.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websline/cms-view-utils",
-  "version": "1.1.1",
+  "version": "1.2.1",
   "type": "module",
   "files": [
     "src",
@@ -10,7 +10,6 @@
     ".": "./src/index.js",
     "./server": "./src/server.js",
     "./components/*": "./src/components/*",
-    "./utils/*": "./src/utils/*",
     "./preview-bridge": "./dist/previewBridge.global.js",
     "./edit-scroll": "./dist/editScroll.global.js",
     "./dist/*": "./dist/*"

package/src/client/fetchSimilarPackages.js

@@ -0,0 +1,20 @@
+const fetchSimilarPackages = async ({ excludeId, limit, locale }) => {
+	const params = new URLSearchParams();
+
+	if (excludeId != null && excludeId !== "") {
+		params.set("excludeId", excludeId);
+	}
+
+	if (limit != null) {
+		params.set("limit", limit);
+	}
+
+	const query = params.toString();
+	const url = `/api/cms/api/public/abm-packages/${locale}${query ? `?${query}` : ""}`;
+
+	const response = await fetch(url, { method: "GET" });
+
+	return response.json();
+};
+
+export { fetchSimilarPackages };

package/src/client/fetchSimilarRooms.js

@@ -0,0 +1,20 @@
+const fetchSimilarRooms = async ({ excludeId, limit, locale }) => {
+	const params = new URLSearchParams();
+
+	if (excludeId != null && excludeId !== "") {
+		params.set("excludeId", excludeId);
+	}
+
+	if (limit != null) {
+		params.set("limit", limit);
+	}
+
+	const query = params.toString();
+	const url = `/api/cms/api/public/abm-rooms/${locale}${query ? `?${query}` : ""}`;
+
+	const response = await fetch(url, { method: "GET" });
+
+	return response.json();
+};
+
+export { fetchSimilarRooms };

package/src/{utils → cms}/editorToken.js

@@ -1,5 +1,5 @@
 import jwt from "jsonwebtoken";
-import { HttpError } from "./errors.js";
+import { HttpError } from "../shared/errors.js";
 
 const resolveDraftUuidFromToken = (editorToken) => {
 	if (!editorToken) return undefined;

package/src/{utils → cms}/fetchPage.js

@@ -1,7 +1,7 @@
 import { resolveDraftUuidFromToken } from "./editorToken.js";
 import { buildCmsPageUrl } from "./urlResolver.js";
 import { buildCmsHeaders } from "./headers.js";
-import { HttpError } from "./errors.js";
+import { HttpError } from "../shared/errors.js";
 
 const fetchPage = async (context) => {
 	let { path = "" } = context.params;

package/src/cms/fetchSiteConfig.js

@@ -0,0 +1,20 @@
+import { buildCmsSiteConfigUrl } from "./urlResolver.js";
+import { buildCmsHeaders } from "./headers.js";
+import { HttpError } from "../shared/errors.js";
+
+const fetchSiteConfig = async (request) => {
+	const cmsUrl = buildCmsSiteConfigUrl();
+
+	const response = await fetch(cmsUrl, {
+		method: "GET",
+		headers: buildCmsHeaders(request),
+	});
+
+	if (!response.ok) {
+		throw new HttpError(response.status, "CMS Error");
+	}
+
+	return response.json();
+};
+
+export { fetchSiteConfig };

package/src/{utils → cms}/fetchSitemap.js

@@ -1,6 +1,6 @@
 import { buildCmsSitemapUrl } from "./urlResolver.js";
 import { buildCmsHeaders } from "./headers.js";
-import { HttpError } from "./errors.js";
+import { HttpError } from "../shared/errors.js";
 
 const fetchSitemap = async (request) => {
 	const cmsUrl = buildCmsSitemapUrl();

package/src/cms/proxyToCms.js

@@ -0,0 +1,39 @@
+import { buildCmsHeaders } from "./headers.js";
+import { HttpError } from "../shared/errors.js";
+
+const proxyToCms = async (context) => {
+	const cmsBase = import.meta.env.CMS_URL;
+
+	if (!cmsBase) {
+		throw new HttpError(500, "CMS proxy not configured");
+	}
+
+	const { path = "" } = context.params;
+	const { request } = context;
+	const url = new URL(request.url);
+	const target = `${cmsBase}/${path}${url.search}`;
+
+	const response = await fetch(target, {
+		method: request.method,
+		headers: buildCmsHeaders(request),
+	});
+
+	if (!response.ok) {
+		throw new HttpError(response.status, "CMS Error");
+	}
+
+	const data = await response.text();
+
+	return new Response(data, {
+		status: response.status,
+		headers: {
+			"content-type": response.headers.get("content-type") ?? "application/json",
+		},
+	});
+};
+
+const createCmsProxyHandler = () => {
+	return (context) => proxyToCms(context);
+};
+
+export { proxyToCms, createCmsProxyHandler };

package/src/cms/urlResolver.js

@@ -0,0 +1,21 @@
+const CMS_BASE_URL = import.meta.env.CMS_URL;
+
+const buildCmsPageUrl = ({ draftUuid, path }) => {
+	if (draftUuid) {
+		return `${CMS_BASE_URL}/api/public/pages/preview/${draftUuid}`;
+	}
+
+	const normalizedPath = path.startsWith("/") ? path : `/${path}`;
+
+	return `${CMS_BASE_URL}/api/public/pages${normalizedPath}`;
+};
+
+const buildCmsSiteConfigUrl = () => {
+	return `${CMS_BASE_URL}/api/public/site-config`;
+};
+
+const buildCmsSitemapUrl = () => {
+	return `${CMS_BASE_URL}/api/public/sitemap`;
+};
+
+export { buildCmsPageUrl, buildCmsSiteConfigUrl, buildCmsSitemapUrl };

package/src/components/AddBlockPlaceholder.svelte

@@ -1,6 +1,6 @@
 <script>
 	import { twMerge as tw } from "tailwind-merge";
-	import { EVENTS, notifyCMS } from "../utils/notify.js";
+	import { EVENTS, notifyCMS } from "../editor/notify.js";
 
 	let {
 		class: className,

package/src/components/EditableBlock.svelte

@@ -1,6 +1,6 @@
 <script>
-	import { EVENTS, notifyCMS } from "../utils/notify.js";
-	import { CMS_ACTIONS } from "../utils/cmsActions.js";
+	import { EVENTS, notifyCMS } from "../editor/notify.js";
+	import { CMS_ACTIONS } from "../editor/cmsActions.js";
 	import Text from "./skeleton/Text.svelte";
 	import Image from "./skeleton/Image.svelte";
 	import Grid from "./skeleton/Grid.svelte";

package/src/handlers/robotsHandler.js

@@ -0,0 +1,45 @@
+import { fetchSiteConfig } from "../cms/fetchSiteConfig.js";
+import { HttpError } from "../shared/errors.js";
+
+const buildRobotsTxt = ({ siteUrl, allowIndexing }) => {
+	if (!allowIndexing) {
+		return `User-agent: *
+Disallow: /
+`;
+	}
+
+	return `User-agent: *
+Allow: /
+
+Sitemap: ${siteUrl}/sitemap.xml
+`;
+};
+
+const createRobotsHandler =
+	() =>
+	async ({ request }) => {
+		try {
+			const siteConfig = await fetchSiteConfig(request);
+			const siteUrl = siteConfig?.url;
+			const allowIndexing = siteConfig?.mode === "PRODUCTION";
+
+			const body = buildRobotsTxt({ siteUrl, allowIndexing });
+
+			return new Response(body, {
+				status: 200,
+				headers: {
+					"Content-Type": "text/plain; charset=utf-8",
+					"Cache-Control": "no-store",
+				},
+			});
+		} catch (error) {
+			if (error instanceof HttpError) {
+				return new Response(`Robots error: ${error.message}`, {
+					status: error.status,
+				});
+			}
+			throw error;
+		}
+	};
+
+export { createRobotsHandler };

package/src/{utils → handlers}/sitemapHandler.js

@@ -1,20 +1,18 @@
-import { fetchSitemap } from "./fetchSitemap.js";
+import { fetchSitemap } from "../cms/fetchSitemap.js";
+import { fetchSiteConfig } from "../cms/fetchSiteConfig.js";
 import { buildSitemapXml } from "./sitemapXml.js";
-import { HttpError } from "./errors.js";
-
-const resolveSiteUrl = (request) => {
-	const url = new URL(request.url);
-	return `${url.protocol}//${url.host}`;
-};
+import { HttpError } from "../shared/errors.js";
 
 const createSitemapHandler =
 	() =>
 	async ({ request }) => {
-		const siteUrl = resolveSiteUrl(request);
-
 		try {
-			const entries = await fetchSitemap(request);
-			const xml = buildSitemapXml(entries, siteUrl);
+			const [entries, siteConfig] = await Promise.all([
+				fetchSitemap(request),
+				fetchSiteConfig(request),
+			]);
+
+			const xml = buildSitemapXml(entries, siteConfig?.url);
 
 			return new Response(xml, {
 				status: 200,

package/src/index.js

@@ -1,4 +1,6 @@
-export { isValid } from "./utils/blockValidation.js";
+export { isValid } from "./editor/blockValidation.js";
+export { fetchSimilarRooms } from "./client/fetchSimilarRooms.js";
+export { fetchSimilarPackages } from "./client/fetchSimilarPackages.js";
 
 export { default as AddBlockPlaceholder } from "./components/AddBlockPlaceholder.svelte";
 export { default as BlockWrapper } from "./components/BlockWrapper.svelte";

package/src/middleware/withCmsFetch.js

@@ -1,4 +1,4 @@
-import { fetchPage } from "../utils/fetchPage.js";
+import { fetchPage } from "../cms/fetchPage.js";
 
 /**
  * Returns the CMS page fetch function for use in createCmsMiddleware.

package/src/server.js

@@ -1,8 +1,9 @@
-export { fetchPage } from "./utils/fetchPage.js";
+export { fetchPage } from "./cms/fetchPage.js";
 
 export { createCmsMiddleware } from "./middleware/createCmsMiddleware.js";
 export { withRequestFilter } from "./middleware/withRequestFilter.js";
 export { withCmsFetch } from "./middleware/withCmsFetch.js";
 export { withParaglide } from "./middleware/withParaglide.js";
-export { createSitemapHandler } from "./utils/sitemapHandler.js";
-export { createRobotsHandler } from "./utils/robotsHandler.js";
+export { createSitemapHandler } from "./handlers/sitemapHandler.js";
+export { createRobotsHandler } from "./handlers/robotsHandler.js";
+export { createCmsProxyHandler } from "./cms/proxyToCms.js";

package/src/utils/robotsHandler.js

@@ -1,40 +0,0 @@
-const buildRobotsTxt = ({ siteUrl, allowIndexing }) => {
-	if (!allowIndexing) {
-		return `User-agent: *
-Disallow: /
-`;
-	}
-
-	return `User-agent: *
-Allow: /
-
-Sitemap: ${siteUrl}/sitemap.xml
-`;
-};
-
-const resolveSiteUrl = (request) => {
-	const url = new URL(request.url);
-	return `${url.protocol}//${url.host}`;
-};
-
-// TODO: replace with CMS setting once available
-const resolveAllowIndexing = () => true;
-
-const createRobotsHandler =
-	() =>
-	async ({ request }) => {
-		const siteUrl = resolveSiteUrl(request);
-		const allowIndexing = resolveAllowIndexing();
-
-		const body = buildRobotsTxt({ siteUrl, allowIndexing });
-
-		return new Response(body, {
-			status: 200,
-			headers: {
-				"Content-Type": "text/plain; charset=utf-8",
-				"Cache-Control": "no-store",
-			},
-		});
-	};
-
-export { createRobotsHandler };

package/src/utils/urlResolver.js

@@ -1,19 +0,0 @@
-const buildCmsPageUrl = ({ draftUuid, path }) => {
-	const base = import.meta.env.CMS_URL;
-
-	if (draftUuid) {
-		return `${base}/api/public/pages/preview/${draftUuid}`;
-	}
-
-	const normalizedPath = path.startsWith("/") ? path : `/${path}`;
-
-	return `${base}/api/public/pages${normalizedPath}`;
-};
-
-const buildCmsSitemapUrl = () => {
-	const base = import.meta.env.CMS_URL;
-
-	return `${base}/api/public/sitemap`;
-};
-
-export { buildCmsPageUrl, buildCmsSitemapUrl };