@zenithbuild/core 0.4.1 → 0.4.2

package/cli/commands/dev.ts

@@ -244,16 +244,44 @@ export async function dev(options: DevOptions = {}): Promise<void> {
 }
 
 function findPageForRoute(route: string, pagesDir: string): string | null {
+    // 1. Try exact match first (e.g., /about -> about.zen)
     const exactPath = path.join(pagesDir, route === '/' ? 'index.zen' : `${route.slice(1)}.zen`)
     if (fs.existsSync(exactPath)) return exactPath
+
+    // 2. Try index.zen in directory (e.g., /about -> about/index.zen)
     const indexPath = path.join(pagesDir, route === '/' ? 'index.zen' : `${route.slice(1)}/index.zen`)
     if (fs.existsSync(indexPath)) return indexPath
+
+    // 3. Try dynamic routes [slug].zen, [...slug].zen
+    // Walk up the path looking for dynamic segments
+    const segments = route === '/' ? [] : route.slice(1).split('/').filter(Boolean)
+
+    // Try matching with dynamic [slug].zen at each level
+    for (let i = segments.length - 1; i >= 0; i--) {
+        const staticPart = segments.slice(0, i).join('/')
+        const baseDir = staticPart ? path.join(pagesDir, staticPart) : pagesDir
+
+        // Check for [slug].zen (single segment catch)
+        const singleDynamicPath = path.join(baseDir, '[slug].zen')
+        if (fs.existsSync(singleDynamicPath)) return singleDynamicPath
+
+        // Check for [...slug].zen (catch-all)
+        const catchAllPath = path.join(baseDir, '[...slug].zen')
+        if (fs.existsSync(catchAllPath)) return catchAllPath
+    }
+
+    // 4. Check for catch-all at root
+    const rootCatchAll = path.join(pagesDir, '[...slug].zen')
+    if (fs.existsSync(rootCatchAll)) return rootCatchAll
+
     return null
 }
 
 function generateDevHTML(page: CompiledPage, contentData: any = {}): string {
     const runtimeTag = `<script src="/runtime.js"></script>`
-    const contentTag = `<script>window.__ZENITH_CONTENT__ = ${JSON.stringify(contentData)};</script>`
+    // Escape </script> sequences in JSON content to prevent breaking the script tag
+    const contentJson = JSON.stringify(contentData).replace(/<\//g, '<\\/')
+    const contentTag = `<script>window.__ZENITH_CONTENT__ = ${contentJson};</script>`
     const scriptTag = `<script>\n${page.script}\n</script>`
     const allScripts = `${runtimeTag}\n${contentTag}\n${scriptTag}`
     return page.html.includes('</body>')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zenithbuild/core",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "Core library for the Zenith framework",
   "license": "MIT",
   "type": "module",

package/runtime/bundle-generator.ts

@@ -506,6 +506,120 @@ export function generateBundleJS(): string {
     return new ZenCollection(data);
   }
 
+  // ============================================
+  // useZenOrder - Documentation ordering & navigation
+  // ============================================
+  
+  function slugify(text) {
+    return String(text || '')
+      .toLowerCase()
+      .replace(/[^\\w\\s-]/g, '')
+      .replace(/\\s+/g, '-')
+      .replace(/-+/g, '-')
+      .trim();
+  }
+  
+  function getDocSlug(doc) {
+    const slugOrId = String(doc.slug || doc.id || '');
+    const parts = slugOrId.split('/');
+    const filename = parts[parts.length - 1];
+    return filename ? slugify(filename) : slugify(doc.title || 'untitled');
+  }
+  
+  function processRawSections(rawSections) {
+    const sections = (rawSections || []).map(function(rawSection) {
+      const sectionSlug = slugify(rawSection.title || rawSection.id || 'section');
+      const items = (rawSection.items || []).map(function(item) {
+        return Object.assign({}, item, {
+          slug: getDocSlug(item),
+          sectionSlug: sectionSlug,
+          isIntro: item.intro === true || (item.tags && item.tags.includes && item.tags.includes('intro'))
+        });
+      });
+      
+      // Sort items: intro first, then order, then alphabetical
+      items.sort(function(a, b) {
+        if (a.isIntro && !b.isIntro) return -1;
+        if (!a.isIntro && b.isIntro) return 1;
+        if (a.order !== undefined && b.order !== undefined) return a.order - b.order;
+        if (a.order !== undefined) return -1;
+        if (b.order !== undefined) return 1;
+        return (a.title || '').localeCompare(b.title || '');
+      });
+      
+      return {
+        id: rawSection.id || sectionSlug,
+        title: rawSection.title || 'Untitled',
+        slug: sectionSlug,
+        order: rawSection.order !== undefined ? rawSection.order : (rawSection.meta && rawSection.meta.order),
+        hasIntro: items.some(function(i) { return i.isIntro; }),
+        items: items
+      };
+    });
+    
+    // Sort sections: order → hasIntro → alphabetical
+    sections.sort(function(a, b) {
+      if (a.order !== undefined && b.order !== undefined) return a.order - b.order;
+      if (a.order !== undefined) return -1;
+      if (b.order !== undefined) return 1;
+      if (a.hasIntro && !b.hasIntro) return -1;
+      if (!a.hasIntro && b.hasIntro) return 1;
+      return a.title.localeCompare(b.title);
+    });
+    
+    return sections;
+  }
+  
+  function createZenOrder(rawSections) {
+    const sections = processRawSections(rawSections);
+    
+    return {
+      sections: sections,
+      selectedSection: sections[0] || null,
+      selectedDoc: sections[0] && sections[0].items[0] || null,
+      
+      getSectionBySlug: function(sectionSlug) {
+        return sections.find(function(s) { return s.slug === sectionSlug; }) || null;
+      },
+      
+      getDocBySlug: function(sectionSlug, docSlug) {
+        var section = sections.find(function(s) { return s.slug === sectionSlug; });
+        if (!section) return null;
+        return section.items.find(function(d) { return d.slug === docSlug; }) || null;
+      },
+      
+      getNextDoc: function(currentDoc) {
+        if (!currentDoc) return null;
+        var currentSection = sections.find(function(s) { return s.slug === currentDoc.sectionSlug; });
+        if (!currentSection) return null;
+        var idx = currentSection.items.findIndex(function(d) { return d.slug === currentDoc.slug; });
+        if (idx < currentSection.items.length - 1) return currentSection.items[idx + 1];
+        var secIdx = sections.findIndex(function(s) { return s.slug === currentSection.slug; });
+        if (secIdx < sections.length - 1) return sections[secIdx + 1].items[0] || null;
+        return null;
+      },
+      
+      getPrevDoc: function(currentDoc) {
+        if (!currentDoc) return null;
+        var currentSection = sections.find(function(s) { return s.slug === currentDoc.sectionSlug; });
+        if (!currentSection) return null;
+        var idx = currentSection.items.findIndex(function(d) { return d.slug === currentDoc.slug; });
+        if (idx > 0) return currentSection.items[idx - 1];
+        var secIdx = sections.findIndex(function(s) { return s.slug === currentSection.slug; });
+        if (secIdx > 0) {
+          var prev = sections[secIdx - 1];
+          return prev.items[prev.items.length - 1] || null;
+        }
+        return null;
+      },
+      
+      buildDocUrl: function(sectionSlug, docSlug) {
+        if (!docSlug || docSlug === 'index') return '/documentation/' + sectionSlug;
+        return '/documentation/' + sectionSlug + '/' + docSlug;
+      }
+    };
+  }
+
   // Virtual DOM Helper for JSX-style expressions
   function h(tag, props, children) {
     const el = document.createElement(tag);
@@ -573,6 +687,10 @@ export function generateBundleJS(): string {
     // zenith:content
     defineSchema: defineSchema,
     zenCollection: zenCollection,
+    // useZenOrder hook
+    createZenOrder: createZenOrder,
+    processRawSections: processRawSections,
+    slugify: slugify,
     // Virtual DOM helper for JSX
     h: h,
     // Lifecycle
@@ -610,6 +728,11 @@ export function generateBundleJS(): string {
   global.onMount = zenOnMount;
   global.onUnmount = zenOnUnmount;
   
+  // useZenOrder hook exports
+  global.createZenOrder = createZenOrder;
+  global.processRawSections = processRawSections;
+  global.slugify = slugify;
+  
   // ============================================
   // HMR Client (Development Only)
   // ============================================