@wix/origami-site 0.1.11 → 0.1.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/origami-site",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "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": [
@@ -43,7 +43,7 @@
     }
   },
   "dependencies": {
-    "@wix/origami-types": "1.3.0",
+    "@wix/origami-types": "1.4.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "@wix/builder-error-pages": "^1.1.6",
@@ -79,5 +79,5 @@
   "peerDependencies": {
     "vite": "^8"
   },
-  "falconPackageHash": "24c3e9be28422eca894ae970057d12bb43ca7f2b2231d6a51421ada9"
+  "falconPackageHash": "a080aee82c31bea3d382a432f657bcad446c30c80db3c94acb7b8f0c"
 }

package/src/server/site-tree/readSiteTree.js

@@ -2,10 +2,9 @@
 import { existsSync, readFileSync, readdirSync, statSync } from 'node:fs'
 import { basename, resolve } from 'node:path'
 import { parse } from '@babel/parser'
+import { findItems, pageUrl } from '@wix/origami-types'
 import { SiteTreeError } from '../requests/errors.js'
 
-
-
 /** @type {Map<string, { mtimeMs: number, metadata: { title?: string, pageId?: string } }>} */
 const metadataCache = new Map()
 
@@ -63,43 +62,31 @@ export const siteRoot = root => {
 
 /** @param {string} root @returns {Promise<import('@wix/origami-types').SiteRouteTable>} */
 export const readSiteTree = async root => {
-    const pagesDir = resolve(siteRoot(root), 'src/pages')
+    const src = resolve(siteRoot(root), 'src')
     /** @type {import('@wix/origami-types').PageRoute[]} */
     const pages = []
     /** @type {import('@wix/origami-types').SiteNotFoundRoute} */
     let notFound = { key: '@wix/origami-site/default-error-404', title: 'Page not found' }
-    const walk = (folder, itemPath) => {
-        const entries = readdirSync(folder, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name))
+    const pathsByUrl = new Map()
+    const { items, routers } = existsSync(resolve(src, 'pages'))
+        ? findItems(path => readdirSync(resolve(src, path), { withFileTypes: true }), 'pages')
+        : { items: [], routers: [] }
+    if (routers.length) throw new SiteTreeError('NOT_SUPPORTED_YET', [`src/${routers[0]}`], 'Router pages are not supported yet.')
+    for (const itemPath of items) {
         const path = `src/${itemPath}`
-        const isItem = entries.some(entry => entry.isFile() && entry.name === 'version')
-        if (isItem) {
-            const metadata = pageMetadata(folder)
-            if (itemPath === 'pages/error404') notFound = { key: itemPath, itemPath, title: metadata.title }
-            else {
-                const url = '/' + itemPath.split('/').slice(1).filter(segment => !/^\([^()]+\)$/.test(segment)).join('/')
-                pages.push({ key: itemPath, url, itemPath, ...metadata, access: [] })
-            }
+        const metadata = pageMetadata(resolve(src, itemPath))
+        if (itemPath === 'pages/error404') notFound = { key: itemPath, itemPath, title: metadata.title }
+        else {
+            const url = pageUrl(itemPath)
+            const previous = pathsByUrl.get(url)
+            if (previous) throw new SiteTreeError('DUPLICATE_URL', [previous, path], `Both pages serve "${url}".`)
+            pathsByUrl.set(url, path)
+            pages.push({ key: itemPath, url, itemPath, ...metadata, access: [] })
         }
-        const children = entries.filter(entry => entry.isDirectory() && !entry.name.startsWith('.') &&
-            !['_generated', 'node_modules', 'servicesConfigs'].includes(entry.name))
-            .filter(child => walk(resolve(folder, child.name), `${itemPath}/${child.name}`))
-        if (!isItem && !children.length) return false
-        if (/^\[.*\]$/.test(basename(folder)))
-            throw new SiteTreeError('NOT_SUPPORTED_YET', [path], 'Router pages are not supported yet.')
-        if (entries.some(entry => entry.name === 'route.json'))
-            throw new SiteTreeError('NOT_SUPPORTED_YET', [`${path}/route.json`], 'Router pages are not supported yet.')
-        if (itemPath === 'pages/error404' && children.length)
-            throw new SiteTreeError('NOT_FOUND_HAS_CHILDREN', [path, ...children.map(child => `${path}/${child.name}`)],
-                'The not-found page cannot have children.')
-        return true
-    }
-    if (existsSync(pagesDir)) walk(pagesDir, 'pages')
-    const pathsByUrl = new Map()
-    for (const page of pages) {
-        const path = `src/${page.itemPath}`
-        const previous = pathsByUrl.get(page.url)
-        if (previous) throw new SiteTreeError('DUPLICATE_URL', [previous, path], `Both pages serve "${page.url}".`)
-        pathsByUrl.set(page.url, path)
     }
+    const notFoundChildren = pages.filter(page => page.itemPath.startsWith('pages/error404/'))
+    if (notFoundChildren.length)
+        throw new SiteTreeError('NOT_FOUND_HAS_CHILDREN', ['src/pages/error404', ...notFoundChildren.map(page => `src/${page.itemPath}`)],
+            'The not-found page cannot have children.')
     return { version: 2, pages, routers: [], notFound, popups: [] }
 }