@wix/origami-site 0.1.9 → 0.1.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/origami-site",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "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,12 +43,12 @@
     }
   },
   "dependencies": {
-    "@wix/origami-types": "1.2.0",
+    "@wix/origami-types": "1.3.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "@wix/builder-error-pages": "^1.1.6",
     "@wix/builder-piler-components": "^1.6.7",
-    "@wix/origami-transforms": "0.1.7",
+    "@wix/origami-transforms": "0.1.8",
     "@babel/parser": "^7.25.0"
   },
   "exports": {
@@ -79,5 +79,5 @@
   "peerDependencies": {
     "vite": "^8"
   },
-  "falconPackageHash": "2972bc6c393f95c8d5a0dcd44a3e9afdd4fc110b3f45d9b6e0bdcc66"
+  "falconPackageHash": "24c3e9be28422eca894ae970057d12bb43ca7f2b2231d6a51421ada9"
 }

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

@@ -4,6 +4,8 @@ import { basename, resolve } from 'node:path'
 import { parse } from '@babel/parser'
 import { SiteTreeError } from '../requests/errors.js'
 
+
+
 /** @type {Map<string, { mtimeMs: number, metadata: { title?: string, pageId?: string } }>} */
 const metadataCache = new Map()
 
@@ -66,32 +68,38 @@ export const readSiteTree = async root => {
     const pages = []
     /** @type {import('@wix/origami-types').SiteNotFoundRoute} */
     let notFound = { key: '@wix/origami-site/default-error-404', title: 'Page not found' }
-    const pathsByUrl = new Map()
     const walk = (folder, itemPath) => {
         const entries = readdirSync(folder, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name))
         const path = `src/${itemPath}`
-        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.')
-        const children = entries.filter(entry => entry.isDirectory() && !entry.name.startsWith('.') &&
-            !['_generated', 'node_modules'].includes(entry.name))
-        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.')
-        if (entries.some(entry => entry.isFile() && !entry.name.startsWith('.'))) {
+        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('/')
-                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: [] })
             }
         }
-        for (const child of children) walk(resolve(folder, child.name), `${itemPath}/${child.name}`)
+        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)
+    }
     return { version: 2, pages, routers: [], notFound, popups: [] }
 }