@wix/origami-site 0.1.25 → 0.1.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/origami-site",
-  "version": "0.1.25",
+  "version": "0.1.26",
   "description": "Runs an exported Wix origami site: file-based routing, Wix dynamic pages, popups and build checks. Use with @wix/origami-site-astro or @wix/origami-site-express.",
   "type": "module",
   "files": [
@@ -51,7 +51,7 @@
     "@wix/origami-transforms": "0.1.15",
     "@babel/parser": "^7.25.0",
     "@wix/system-core-components": "^1.3.10",
-    "@wix/origami-services": "1.0.0",
+    "@wix/origami-services": "1.1.0",
     "@wix/services-manager-react": "^1.0.8"
   },
   "exports": {
@@ -93,5 +93,5 @@
       "optional": true
     }
   },
-  "falconPackageHash": "f8725853850b9e85eea5ab8a460ab2365f62097d441e9697c451901e"
+  "falconPackageHash": "246a4b184a70a57f10be175d35c87676a58576eb90d0f213c8dac49f"
 }

package/src/browser/index.d.ts

@@ -7,6 +7,8 @@ export type MountPageOptions = {
   popups: Record<string, () => Promise<unknown>>
   seoUriByPageId: Record<string, string>
   beforeMount: () => Promise<unknown>
+  /** The site's meta site id, from `VITE_WIX_METASITE_ID`. Services get no site identity without it. */
+  siteId?: string
 }
 export function mountPage(element: Element | null, options: MountPageOptions): Promise<() => void>
 /** Cached per page load. Warns once and returns undefined if the block is missing.

package/src/browser/index.js

@@ -36,7 +36,7 @@ export function readPageData() {
  * @param {import('./index.js').MountPageOptions} options
  * @returns {Promise<() => void>}
  */
-export async function mountPage(element, { pages, beforeMount }) {
+export async function mountPage(element, { pages, beforeMount, siteId }) {
     if (!element) throw new Error('Cannot mount page: root element is missing')
     const data = readPageData()
     const pageKey = data?.page
@@ -54,7 +54,10 @@ export async function mountPage(element, { pages, beforeMount }) {
     }
     // Loading the page registers its globals and own DM configs before services are created.
     const { default: Page } = await loadPage()
-    const map = servicesMap({ servicesConfigs: registeredServicesConfigs(), requestConfigs: data?.services ?? {}, url: location.href })
+    const map = servicesMap({
+        servicesConfigs: registeredServicesConfigs(), requestConfigs: data?.services ?? {}, url: location.href, siteId,
+        userAgent: navigator.userAgent, reducedMotion: globalThis.matchMedia?.('(prefers-reduced-motion: reduce)').matches,
+    })
     sealServicesConfigs()
     const root = createRoot(element)
     // Stage 3: PopupHost belongs inside WixServices so popups share page services.

package/src/server/requests/createSite.js

@@ -9,6 +9,7 @@ import { normalizeRequestPath } from './urlPath.js'
 import { canBePagePath } from './canBePagePath.js'
 import { getAccessToken, runInRequestContext } from './context.js'
 import { errorPage } from './errorPage.js'
+import { pageServicesConfigs } from './pageServicesConfigs.js'
 
 /** @type {import('../index.js').AccessSource} */
 export const noAccessRules = { async load() { return new Map() } }
@@ -77,14 +78,20 @@ export async function createSite(options) {
             if (response) return { kind: /** @type {const} */ ('response'), response }
         }
     }
-    /** @param {{ key: string, title: string, itemPath?: string, pageId?: string }} route @param {200 | 404} status
+    /** @param {import('@wix/origami-types').SiteRouteTable} current @param {import('./pageServicesConfigs.js').ServedPage} served @param {200 | 404} status
      * @param {import('../index.js').PageData['route']} routeData @param {Record<string, unknown>} services @param {HeadersInit} [headers] */
-    async function pageResolution(route, status, routeData, services = {}, headers = {}) {
+    async function pageResolution(current, served, status, routeData, services = {}, headers = {}) {
+        /** @type {{ key: string, title: string, itemPath?: string, pageId?: string }} */
+        const route = served.kind === 'router' ? served.rolePage : served.route
         const page = { key: route.key, title: route.title, ...(route.itemPath === undefined ? {} : { itemPath: route.itemPath }) }
-        // Identity and dynamic-route configs use different services; merge per service if server layers ever overlap.
         const identity = wix.siteId ? { '@wix/viewer-service-environment': { metaSiteId: wix.siteId } } : {}
+        // Identity and page configs both set environment fields, so layers merge per service.
+        /** @type {Record<string, object>} */
+        const configs = {}
+        for (const layer of [identity, pageServicesConfigs(current, served), services])
+            for (const [key, config] of Object.entries(layer)) configs[key] = { ...configs[key], ...config }
         return {
-            kind: /** @type {const} */ ('page'), status, page, data: { page: page.key, route: routeData, services: { ...identity, ...services } }, headers: new Headers(headers),
+            kind: /** @type {const} */ ('page'), status, page, data: { page: page.key, route: routeData, services: configs }, headers: new Headers(headers),
             embeds: embeds ? await embeds.forPage(route.pageId) : noEmbeds,
         }
     }
@@ -107,7 +114,7 @@ export async function createSite(options) {
         const rolePage = answer.kind === 'page' ? pickRolePage(match.route, answer.page) : null
         if (answer.kind === 'page' && !rolePage)
             logger.warn(`The router for /${match.route.prefix} answered page "${answer.page}", which no role page in route.json matches.`)
-        if (answer.kind !== 'page' || !rolePage) return pageResolution(current.notFound, 404, { kind: 'notFound', url: path }, {}, noStore)
+        if (answer.kind !== 'page' || !rolePage) return pageResolution(current, { kind: 'notFound', route: current.notFound }, 404, { kind: 'notFound', url: path }, {}, noStore)
         const denied = await checkAccess(rolePage, request, context)
         if (denied) {
             // A login redirect is per visitor too. Copy into new headers: Response.redirect()'s are immutable.
@@ -116,8 +123,10 @@ export async function createSite(options) {
             const { status, statusText, body } = denied.response
             return { kind: /** @type {const} */ ('response'), response: new Response(body, { status, statusText, headers }) }
         }
-        return pageResolution(rolePage, 200, { kind: 'router', url: path, role: rolePage.role }, {
-            '@wix/viewer-service-dynamic-route': { dynamicRouteData: { pageData: answer.data, publicData: answer.publicData } },
+        const dynamicRoute = { dynamicRouteData: { pageData: answer.data, publicData: answer.publicData } }
+        return pageResolution(current, { kind: 'router', rolePage }, 200, { kind: 'router', url: path, role: rolePage.role }, {
+            '@wix/viewer-service-dynamic-route': dynamicRoute,
+            '@wix/site-service-dynamic-route': dynamicRoute,
         }, noStore)
     }
     return {
@@ -151,9 +160,9 @@ export async function createSite(options) {
                     if (match.kind === 'page') {
                         const denied = await checkAccess(match.route, request, context)
                         if (denied) return denied
-                        return pageResolution(match.route, 200, { kind: 'page', url: /** @type {string} */ (path) })
+                        return pageResolution(current, { kind: 'page', route: match.route }, 200, { kind: 'page', url: /** @type {string} */ (path) })
                     }
-                    return pageResolution(current.notFound, 404, { kind: 'notFound', url: path ?? url.pathname })
+                    return pageResolution(current, { kind: 'notFound', route: current.notFound }, 404, { kind: 'notFound', url: path ?? url.pathname })
                 })
             } catch (error) { return errorPage(error, 500, mode, logger) }
         },

package/src/server/requests/pageServicesConfigs.js

@@ -0,0 +1,69 @@
+// Services know pages by slug, not by Wix page id: a page's last URL segment, a role page's
+// slug, a popup's seoUri. The home page's URL is `/`, so it is `home`.
+const HOME = 'home'
+
+/** @param {import('@wix/origami-types').PageRoute} route */
+const pageSlug = route => route.url === '/' ? HOME : route.url.slice(route.url.lastIndexOf('/') + 1)
+
+/** @typedef {{ title: string, path: string, popup: boolean, parentPageId?: string }} SitePage */
+
+/** @param {import('@wix/origami-types').SiteRouteTable} table */
+function sitePages(table) {
+    const slugByUrl = new Map(table.pages.map(route => [route.url, pageSlug(route)]))
+    /** @type {Record<string, SitePage>} */
+    const pages = {}
+    for (const route of table.pages) {
+        const parentPageId = slugByUrl.get(route.url.slice(0, route.url.lastIndexOf('/')))
+        pages[pageSlug(route)] = { title: route.title, path: route.url.slice(1), popup: false, ...(parentPageId ? { parentPageId } : {}) }
+    }
+    for (const router of table.routers)
+        for (const rolePage of Object.values(router.rolePages)) pages[rolePage.slug] = { title: rolePage.title, path: router.prefix, popup: false }
+    for (const popup of table.popups) pages[popup.seoUri] = { title: popup.title, path: popup.seoUri, popup: true }
+    return pages
+}
+
+/** The page being served: a page route, a router's role page, or the 404 page.
+ * @typedef {{ kind: 'page', route: import('@wix/origami-types').PageRoute }
+ *   | { kind: 'router', rolePage: import('@wix/origami-types').RolePage }
+ *   | { kind: 'notFound', route: import('@wix/origami-types').SiteNotFoundRoute }} ServedPage */
+
+/** @param {ServedPage} served @returns {[string, string]} its slug and title */
+const servedPage = served => served.kind === 'page' ? [pageSlug(served.route), served.route.title]
+    : served.kind === 'router' ? [served.rolePage.slug, served.rolePage.title]
+    : [served.route.key.slice(served.route.key.lastIndexOf('/') + 1), served.route.title]
+
+/** Configs every page gets from the route table: the site's pages, the page being served and the routers.
+ * @param {import('@wix/origami-types').SiteRouteTable} table @param {ServedPage} served @returns {Record<string, object>} */
+export function pageServicesConfigs(table, served) {
+    const pages = sitePages(table)
+    const [currentPageId, title] = servedPage(served)
+    const home = pages[HOME]
+    const appDefinitionIdBySlug = new Map(table.routers.flatMap(router =>
+        Object.values(router.rolePages).map(rolePage => [rolePage.slug, router.config.appDefinitionId])))
+    return {
+        '@wix/site-service-pages': {
+            pages,
+            ...(home ? { mainPage: { id: HOME, ...home } } : {}),
+            currentPage: { id: currentPageId, ...(pages[currentPageId] ?? { title, path: '', popup: false }) },
+        },
+        ...(home ? { '@wix/viewer-service-environment': { mainPageId: HOME } } : {}),
+        '@wix/viewer-service-pages': {
+            pages: Object.fromEntries(Object.entries(pages).map(([id, { popup: _, ...page }]) => [id, page])),
+            currentPageId,
+            ...(home ? { mainPageId: HOME } : {}),
+        },
+        '@wix/site-service-url': {
+            // As thunderbolt: popups aren't app sections, and a section's URL is `/` and its slug.
+            pages: Object.entries(pages).filter(([, page]) => !page.popup).map(([id]) => ({
+                id, url: `/${id}`, ...(appDefinitionIdBySlug.has(id) ? { appDefinitionId: appDefinitionIdBySlug.get(id) } : {}),
+            })),
+            pageIdToPrefix: Object.fromEntries(table.routers.flatMap(router =>
+                Object.values(router.rolePages).map(rolePage => [rolePage.slug, router.prefix]))),
+        },
+        '@wix/site-service-renderer-configuration': {
+            routersMap: Object.fromEntries(table.routers.map(router => [router.prefix, {
+                prefix: router.prefix, appDefinitionId: router.config.appDefinitionId, extensionId: router.config.extensionId,
+            }])),
+        },
+    }
+}