@zenithbuild/core 0.6.2 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zenithbuild/core",
-  "version": "0.6.2",
+  "version": "1.1.0",
   "description": "Core library for the Zenith framework",
   "license": "MIT",
   "type": "module",
@@ -47,7 +47,15 @@
     "start": "bun run build && bun run dev",
     "build:cli": "bun build bin/zenith.ts bin/zen-dev.ts bin/zen-build.ts bin/zen-preview.ts --outdir dist --target bun --bundle && for f in dist/*.js; do echo '#!/usr/bin/env bun' | cat - \"$f\" > \"$f.tmp\" && mv \"$f.tmp\" \"$f\" && chmod +x \"$f\"; done",
     "format": "prettier --write \"**/*.ts\"",
-    "format:check": "prettier --check \"**/*.ts\""
+    "format:check": "prettier --check \"**/*.ts\"",
+    "release": "bun run scripts/release.ts",
+    "release:dry": "bun run scripts/release.ts --dry-run",
+    "release:patch": "bun run scripts/release.ts --bump=patch",
+    "release:minor": "bun run scripts/release.ts --bump=minor",
+    "release:major": "bun run scripts/release.ts --bump=major"
+  },
+  "publishConfig": {
+    "access": "public"
   },
   "private": false,
   "devDependencies": {
@@ -69,4 +77,4 @@
     "parse5": "^8.0.0",
     "picocolors": "^1.1.1"
   }
-}
+}

package/runtime/bundle-generator.ts

@@ -640,7 +640,16 @@ export function generateBundleJS(): string {
   function defineSchema(name, schema) { schemaRegistry.set(name, schema); }
 
   function zenCollection(collectionName) {
-    const data = (global.__ZENITH_CONTENT__ && global.__ZENITH_CONTENT__[collectionName]) || [];
+    // Access plugin data from the neutral envelope
+    // Content plugin stores all items under 'content' namespace
+    const pluginData = global.__ZENITH_PLUGIN_DATA__ || {};
+    const contentItems = pluginData.content || [];
+    
+    // Filter by collection name (plugin owns data structure, runtime just filters)
+    const data = Array.isArray(contentItems)
+      ? contentItems.filter(item => item && item.collection === collectionName)
+      : [];
+    
     return new ZenCollection(data);
   }
 
@@ -880,9 +889,7 @@ export function generateBundleJS(): string {
   // SPA Router Runtime
   // ============================================
   
-  (function() {
-    'use strict';
-    
+  // Router state
     // Current route state
     var currentRoute = {
       path: '/',
@@ -1096,6 +1103,18 @@ export function generateBundleJS(): string {
         return;
       }
       
+      // Dev mode: If no route manifest is loaded, use browser navigation
+      // This allows ZenLink to work in dev server where pages are served fresh
+      if (routeManifest.length === 0) {
+        var url = normalizedPath + (Object.keys(query).length ? '?' + new URLSearchParams(query) : '');
+        if (options.replace) {
+          location.replace(url);
+        } else {
+          location.href = url;
+        }
+        return;
+      }
+      
       resolveAndRender(path, query, true, options.replace || false);
     }
     
@@ -1166,19 +1185,19 @@ export function generateBundleJS(): string {
       );
     }
     
-    // Expose router API globally
-    global.__zenith_router = {
-      navigate: navigate,
-      getRoute: getRoute,
-      onRouteChange: onRouteChange,
-      isActive: isActive,
-      prefetch: prefetch,
-      initRouter: initRouter
-    };
-    
-    // Also expose navigate directly for convenience
-    global.navigate = navigate;
-  })();
+  // Expose router API globally
+  global.__zenith_router = {
+    navigate: navigate,
+    getRoute: getRoute,
+    onRouteChange: onRouteChange,
+    isActive: isActive,
+    prefetch: prefetch,
+    initRouter: initRouter
+  };
+  
+  // Also expose navigate directly for convenience
+  global.navigate = navigate;
+  
   
   // ============================================
   // HMR Client (Development Only)

package/runtime/client-runtime.ts

@@ -485,6 +485,25 @@ export function cleanup(container?: Element | Document): void {
     triggerUnmount();
 }
 
+// ============================================
+// Plugin Runtime Data Access
+// ============================================
+
+/**
+ * Access plugin data from the neutral envelope
+ * 
+ * Plugins use this to retrieve their data at runtime.
+ * The CLI injected this data via window.__ZENITH_PLUGIN_DATA__
+ * 
+ * @param namespace - Plugin namespace (e.g., 'content', 'router')
+ * @returns The plugin's data, or undefined if not present
+ */
+export function getPluginRuntimeData(namespace: string): unknown {
+    if (typeof window === 'undefined') return undefined;
+    const envelope = (window as any).__ZENITH_PLUGIN_DATA__;
+    return envelope?.[namespace];
+}
+
 // ============================================
 // Browser Globals Setup
 // ============================================
@@ -506,7 +525,8 @@ export function setupGlobals(): void {
         onMount: zenOnMount,
         onUnmount: zenOnUnmount,
         triggerMount,
-        triggerUnmount
+        triggerUnmount,
+        getPluginData: getPluginRuntimeData  // Access plugin data from envelope
     };
 
     // Expression registry

package/cli/utils/content.ts

@@ -1,112 +0,0 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import { marked } from 'marked';
-
-export interface ContentItem {
-    id?: string | number;
-    slug?: string | null;
-    collection?: string | null;
-    content?: string | null;
-    [key: string]: any | null;
-}
-
-/**
- * Load all content from the content directory
- */
-export function loadContent(contentDir: string): Record<string, ContentItem[]> {
-    if (!fs.existsSync(contentDir)) {
-        return {};
-    }
-
-    const collections: Record<string, ContentItem[]> = {};
-    const files = getAllFiles(contentDir);
-
-    for (const filePath of files) {
-        const ext = path.extname(filePath).toLowerCase();
-        const relativePath = path.relative(contentDir, filePath);
-        const collection = relativePath.split(path.sep)[0];
-        if (!collection) continue;
-
-        const slug = relativePath.replace(/\.(md|mdx|json)$/, '').replace(/\\/g, '/');
-        const id = slug;
-
-        const rawContent = fs.readFileSync(filePath, 'utf-8');
-
-        if (!collections[collection]) {
-            collections[collection] = [];
-        }
-
-        if (ext === '.json') {
-            try {
-                const data = JSON.parse(rawContent);
-                collections[collection].push({
-                    id,
-                    slug,
-                    collection,
-                    content: '',
-                    ...data
-                });
-            } catch (e) {
-                console.error(`Error parsing JSON file ${filePath}:`, e);
-            }
-        } else if (ext === '.md' || ext === '.mdx') {
-            const { metadata, content } = parseMarkdown(rawContent);
-            collections[collection].push({
-                id,
-                slug,
-                collection,
-                content,
-                ...metadata
-            });
-        }
-    }
-
-    return collections;
-}
-
-function getAllFiles(dir: string, fileList: string[] = []): string[] {
-    const files = fs.readdirSync(dir);
-    files.forEach((file: string) => {
-        const name = path.join(dir, file);
-        if (fs.statSync(name).isDirectory()) {
-            getAllFiles(name, fileList);
-        } else {
-            fileList.push(name);
-        }
-    });
-    return fileList;
-}
-
-function parseMarkdown(content: string): { metadata: Record<string, any>, content: string } {
-    const frontmatterRegex = /^---\r?\n([\s\S]*?)\r?\n---\r?\n?([\s\S]*)$/;
-    const match = content.match(frontmatterRegex);
-
-    if (!match) {
-        return { metadata: {}, content: content.trim() };
-    }
-
-    const [, yamlStr, body] = match;
-    const metadata: Record<string, any> = {};
-
-    if (yamlStr) {
-        yamlStr.split('\n').forEach(line => {
-            const [key, ...values] = line.split(':');
-            if (key && values.length > 0) {
-                const value = values.join(':').trim();
-                // Basic type conversion
-                if (value === 'true') metadata[key.trim()] = true;
-                else if (value === 'false') metadata[key.trim()] = false;
-                else if (!isNaN(Number(value))) metadata[key.trim()] = Number(value);
-                else if (value.startsWith('[') && value.endsWith(']')) {
-                    metadata[key.trim()] = value.slice(1, -1).split(',').map(v => v.trim().replace(/^['"]|['"]$/g, ''));
-                }
-                else metadata[key.trim()] = value.replace(/^['"]|['"]$/g, '');
-            }
-        });
-    }
-
-    return {
-        metadata,
-        content: marked.parse((body || '').trim()) as string
-    };
-}

package/router/manifest.ts

@@ -1,314 +0,0 @@
-/**
- * Zenith Route Manifest Generator
- * 
- * Scans pages/ directory at build time and generates a route manifest
- * with proper scoring for deterministic route matching.
- */
-
-import fs from "fs"
-import path from "path"
-import {
-  type RouteDefinition,
-  type ParsedSegment,
-  SegmentType
-} from "./types"
-
-/**
- * Scoring constants for route ranking
- * Higher scores = higher priority
- */
-const SEGMENT_SCORES = {
-  [SegmentType.STATIC]: 10,
-  [SegmentType.DYNAMIC]: 5,
-  [SegmentType.CATCH_ALL]: 1,
-  [SegmentType.OPTIONAL_CATCH_ALL]: 0
-} as const
-
-/**
- * Discover all .zen files in the pages directory
- */
-export function discoverPages(pagesDir: string): string[] {
-  const pages: string[] = []
-  
-  function walk(dir: string): void {
-    if (!fs.existsSync(dir)) return
-    
-    const entries = fs.readdirSync(dir, { withFileTypes: true })
-    
-    for (const entry of entries) {
-      const fullPath = path.join(dir, entry.name)
-      
-      if (entry.isDirectory()) {
-        walk(fullPath)
-      } else if (entry.isFile() && entry.name.endsWith(".zen")) {
-        pages.push(fullPath)
-      }
-    }
-  }
-  
-  walk(pagesDir)
-  return pages
-}
-
-/**
- * Convert a file path to a route path
- * 
- * Examples:
- *   pages/index.zen       → /
- *   pages/about.zen       → /about
- *   pages/blog/index.zen  → /blog
- *   pages/blog/[id].zen   → /blog/:id
- *   pages/posts/[...slug].zen → /posts/*slug
- *   pages/[[...all]].zen  → /*all (optional)
- */
-export function filePathToRoutePath(filePath: string, pagesDir: string): string {
-  // Get relative path from pages directory
-  const relativePath = path.relative(pagesDir, filePath)
-  
-  // Remove .zen extension
-  const withoutExt = relativePath.replace(/\.zen$/, "")
-  
-  // Split into segments
-  const segments = withoutExt.split(path.sep)
-  
-  // Transform segments
-  const routeSegments: string[] = []
-  
-  for (const segment of segments) {
-    // Handle index files (they represent the directory root)
-    if (segment === "index") {
-      continue
-    }
-    
-    // Handle optional catch-all: [[...param]]
-    const optionalCatchAllMatch = segment.match(/^\[\[\.\.\.(\w+)\]\]$/)
-    if (optionalCatchAllMatch) {
-      routeSegments.push(`*${optionalCatchAllMatch[1]}?`)
-      continue
-    }
-    
-    // Handle required catch-all: [...param]
-    const catchAllMatch = segment.match(/^\[\.\.\.(\w+)\]$/)
-    if (catchAllMatch) {
-      routeSegments.push(`*${catchAllMatch[1]}`)
-      continue
-    }
-    
-    // Handle dynamic segment: [param]
-    const dynamicMatch = segment.match(/^\[(\w+)\]$/)
-    if (dynamicMatch) {
-      routeSegments.push(`:${dynamicMatch[1]}`)
-      continue
-    }
-    
-    // Static segment
-    routeSegments.push(segment)
-  }
-  
-  // Build route path
-  const routePath = "/" + routeSegments.join("/")
-  
-  // Normalize trailing slashes
-  return routePath === "/" ? "/" : routePath.replace(/\/$/, "")
-}
-
-/**
- * Parse a route path into segments with type information
- */
-export function parseRouteSegments(routePath: string): ParsedSegment[] {
-  if (routePath === "/") {
-    return []
-  }
-  
-  const segments = routePath.slice(1).split("/")
-  const parsed: ParsedSegment[] = []
-  
-  for (const segment of segments) {
-    // Optional catch-all: *param?
-    if (segment.startsWith("*") && segment.endsWith("?")) {
-      parsed.push({
-        type: SegmentType.OPTIONAL_CATCH_ALL,
-        paramName: segment.slice(1, -1),
-        raw: segment
-      })
-      continue
-    }
-    
-    // Required catch-all: *param
-    if (segment.startsWith("*")) {
-      parsed.push({
-        type: SegmentType.CATCH_ALL,
-        paramName: segment.slice(1),
-        raw: segment
-      })
-      continue
-    }
-    
-    // Dynamic: :param
-    if (segment.startsWith(":")) {
-      parsed.push({
-        type: SegmentType.DYNAMIC,
-        paramName: segment.slice(1),
-        raw: segment
-      })
-      continue
-    }
-    
-    // Static
-    parsed.push({
-      type: SegmentType.STATIC,
-      raw: segment
-    })
-  }
-  
-  return parsed
-}
-
-/**
- * Calculate route score based on segments
- * Higher scores = higher priority for matching
- */
-export function calculateRouteScore(segments: ParsedSegment[]): number {
-  if (segments.length === 0) {
-    // Root route gets a high score
-    return 100
-  }
-  
-  let score = 0
-  
-  for (const segment of segments) {
-    score += SEGMENT_SCORES[segment.type]
-  }
-  
-  // Bonus for having more static segments (specificity)
-  const staticCount = segments.filter(s => s.type === SegmentType.STATIC).length
-  score += staticCount * 2
-  
-  return score
-}
-
-/**
- * Extract parameter names from parsed segments
- */
-export function extractParamNames(segments: ParsedSegment[]): string[] {
-  return segments
-    .filter(s => s.paramName !== undefined)
-    .map(s => s.paramName!)
-}
-
-/**
- * Convert route path to regex pattern
- * 
- * Examples:
- *   /about         → /^\/about\/?$/
- *   /blog/:id      → /^\/blog\/([^/]+)\/?$/
- *   /posts/*slug   → /^\/posts\/(.+)\/?$/
- *   /              → /^\/$/
- *   /*all?         → /^(?:\/(.*))?$/  (optional catch-all)
- */
-export function routePathToRegex(routePath: string): RegExp {
-  if (routePath === "/") {
-    return /^\/$/
-  }
-  
-  const segments = routePath.slice(1).split("/")
-  const regexParts: string[] = []
-  
-  for (let i = 0; i < segments.length; i++) {
-    const segment = segments[i]
-    if (!segment) continue
-    
-    // Optional catch-all: *param?
-    if (segment.startsWith("*") && segment.endsWith("?")) {
-      // Optional catch-all - matches zero or more path segments
-      // Should only be at the end
-      regexParts.push("(?:\\/(.*))?")
-      continue
-    }
-    
-    // Required catch-all: *param
-    if (segment.startsWith("*")) {
-      // Required catch-all - matches one or more path segments
-      regexParts.push("\\/(.+)")
-      continue
-    }
-    
-    // Dynamic: :param
-    if (segment.startsWith(":")) {
-      regexParts.push("\\/([^/]+)")
-      continue
-    }
-    
-    // Static segment - escape special regex characters
-    const escaped = segment.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")
-    regexParts.push(`\\/${escaped}`)
-  }
-  
-  // Build final regex with optional trailing slash
-  const pattern = `^${regexParts.join("")}\\/?$`
-  return new RegExp(pattern)
-}
-
-/**
- * Generate a route definition from a file path
- */
-export function generateRouteDefinition(
-  filePath: string,
-  pagesDir: string
-): RouteDefinition {
-  const routePath = filePathToRoutePath(filePath, pagesDir)
-  const segments = parseRouteSegments(routePath)
-  const paramNames = extractParamNames(segments)
-  const score = calculateRouteScore(segments)
-  
-  return {
-    path: routePath,
-    segments,
-    paramNames,
-    score,
-    filePath
-  }
-}
-
-/**
- * Generate route manifest from pages directory
- * Returns route definitions sorted by score (highest first)
- */
-export function generateRouteManifest(pagesDir: string): RouteDefinition[] {
-  const pages = discoverPages(pagesDir)
-  
-  const definitions = pages.map(filePath => 
-    generateRouteDefinition(filePath, pagesDir)
-  )
-  
-  // Sort by score descending (highest priority first)
-  definitions.sort((a, b) => b.score - a.score)
-  
-  return definitions
-}
-
-/**
- * Generate the route manifest as JavaScript code for runtime
- */
-export function generateRouteManifestCode(definitions: RouteDefinition[]): string {
-  const routeEntries = definitions.map(def => {
-    const regex = routePathToRegex(def.path)
-    
-    return `  {
-    path: ${JSON.stringify(def.path)},
-    regex: ${regex.toString()},
-    paramNames: ${JSON.stringify(def.paramNames)},
-    score: ${def.score},
-    filePath: ${JSON.stringify(def.filePath)}
-  }`
-  })
-  
-  return `// Auto-generated route manifest
-// Do not edit directly
-
-export const routeManifest = [
-${routeEntries.join(",\n")}
-];
-`
-}
-