bertui 1.1.0 → 1.1.2

package/package.json

@@ -1,21 +1,33 @@
 {
   "name": "bertui",
-  "version": "1.1.0",
-  "description": "Lightning-fast React dev server powered by Bun and Elysia",
+  "version": "1.1.2",
+  "description": "Lightning-fast React dev server powered by Bun and Elysia - Now with TypeScript support!",
   "type": "module",
   "main": "./index.js",
+  "types": "./types/index.d.ts",
   "bin": {
     "bertui": "./bin/bertui.js"
   },
   "exports": {
-    ".": "./index.js",
+    ".": {
+      "types": "./types/index.d.ts",
+      "default": "./index.js"
+    },
     "./styles": "./src/styles/bertui.css",
     "./logger": "./src/logger/logger.js",
-    "./router": "./src/router/Router.jsx"
+    "./router": {
+      "types": "./types/router.d.ts",
+      "default": "./src/router/Router.jsx"
+    },
+    "./config": {
+      "types": "./types/config.d.ts",
+      "default": "./src/config/loadConfig.js"
+    }
   },
   "files": [
     "bin",
     "src",
+    "types",
     "index.js",
     "README.md",
     "LICENSE"
@@ -35,7 +47,11 @@
     "bundler",
     "fast",
     "hmr",
-    "file-based-routing"
+    "file-based-routing",
+    "typescript",
+    "seo",
+    "sitemap",
+    "server-islands"
   ],
   "author": "Pease Ernest",
   "license": "MIT",
@@ -45,7 +61,7 @@
   },
   "dependencies": {
     "elysia": "^1.0.0",
-    "ernest-logger": "latest",
+    "ernest-logger": "^2.0.0",
     "lightningcss": "^1.30.2"
   },
   "peerDependencies": {
@@ -53,6 +69,10 @@
     "react-dom": "^19.2.3",
     "bun": ">=1.0.0"
   },
+  "devDependencies": {
+    "@types/react": "^18.2.0",
+    "@types/react-dom": "^18.2.0"
+  },
   "engines": {
     "bun": ">=1.0.0"
   }

package/src/build/compiler/file-transpiler.js

@@ -0,0 +1,171 @@
+// bertui/src/build/compiler/file-transpiler.js - SINGLE TRANSPILER INSTANCE
+import { join, relative, dirname, extname } from 'path';
+import { readdirSync, statSync, mkdirSync } from 'fs';
+import logger from '../../logger/logger.js';
+import { replaceEnvInCode } from '../../utils/env.js';
+
+// ✅ CRITICAL FIX: Create transpilers ONCE at module level
+const jsxTranspiler = new Bun.Transpiler({ loader: 'jsx' });
+
+const tsxTranspiler = new Bun.Transpiler({ 
+  loader: 'tsx',
+  tsconfig: {
+    compilerOptions: {
+      jsx: 'react',
+      jsxFactory: 'React.createElement',
+      jsxFragmentFactory: 'React.Fragment'
+    }
+  }
+});
+
+const tsTranspiler = new Bun.Transpiler({ 
+  loader: 'ts',
+  tsconfig: {
+    compilerOptions: {
+      jsx: 'preserve'
+    }
+  }
+});
+
+function getTranspiler(loader) {
+  // Just return the pre-created instances
+  return loader === 'tsx' ? tsxTranspiler : 
+         loader === 'ts' ? tsTranspiler : 
+         jsxTranspiler;
+}
+
+export async function compileBuildDirectory(srcDir, buildDir, root, envVars) {
+  const files = readdirSync(srcDir);
+  const filesToCompile = [];
+  
+  for (const file of files) {
+    const srcPath = join(srcDir, file);
+    const stat = statSync(srcPath);
+    
+    if (stat.isDirectory()) {
+      const subBuildDir = join(buildDir, file);
+      mkdirSync(subBuildDir, { recursive: true });
+      await compileBuildDirectory(srcPath, subBuildDir, root, envVars);
+    } else {
+      const ext = extname(file);
+      if (ext === '.css') continue;
+      
+      if (['.jsx', '.tsx', '.ts'].includes(ext)) {
+        filesToCompile.push({ path: srcPath, dir: buildDir, name: file, type: 'tsx' });
+      } else if (ext === '.js') {
+        filesToCompile.push({ path: srcPath, dir: buildDir, name: file, type: 'js' });
+      }
+    }
+  }
+  
+  if (filesToCompile.length === 0) return;
+  
+  // ✅ Process sequentially with progress
+  logger.info(`📦 Compiling ${filesToCompile.length} files sequentially...`);
+  
+  for (let i = 0; i < filesToCompile.length; i++) {
+    const file = filesToCompile[i];
+    
+    try {
+      if (file.type === 'tsx') {
+        await compileBuildFile(file.path, file.dir, file.name, root, envVars);
+      } else {
+        await compileJSFile(file.path, file.dir, file.name, root, envVars);
+      }
+      
+      // Progress every 10 files
+      if ((i + 1) % 10 === 0 || i === filesToCompile.length - 1) {
+        const percent = (((i + 1) / filesToCompile.length) * 100).toFixed(0);
+        logger.info(`   Progress: ${i + 1}/${filesToCompile.length} (${percent}%)`);
+      }
+      
+    } catch (error) {
+      logger.error(`Failed to compile ${file.name}: ${error.message}`);
+      // Continue with other files
+    }
+  }
+  
+  logger.success(`✅ Compiled ${filesToCompile.length} files`);
+}
+
+async function compileBuildFile(srcPath, buildDir, filename, root, envVars) {
+  const ext = extname(filename);
+  const loader = ext === '.tsx' ? 'tsx' : ext === '.ts' ? 'ts' : 'jsx';
+  
+  try {
+    let code = await Bun.file(srcPath).text();
+    code = removeCSSImports(code);
+    code = replaceEnvInCode(code, envVars);
+    
+    const outFilename = filename.replace(/\.(jsx|tsx|ts)$/, '.js');
+    const outPath = join(buildDir, outFilename);
+    code = fixBuildImports(code, srcPath, outPath, root);
+    
+    // ✅ Reuse the same transpiler instance
+    const transpiler = getTranspiler(loader);
+    let compiled = await transpiler.transform(code);
+    
+    if (usesJSX(compiled) && !compiled.includes('import React')) {
+      compiled = `import React from 'react';\n${compiled}`;
+    }
+    
+    compiled = fixRelativeImports(compiled);
+    await Bun.write(outPath, compiled);
+    
+    // Help GC
+    code = null;
+    compiled = null;
+    
+  } catch (error) {
+    logger.error(`Failed to compile ${filename}: ${error.message}`);
+    throw error;
+  }
+}
+
+async function compileJSFile(srcPath, buildDir, filename, root, envVars) {
+  const outPath = join(buildDir, filename);
+  let code = await Bun.file(srcPath).text();
+  code = removeCSSImports(code);
+  code = replaceEnvInCode(code, envVars);
+  code = fixBuildImports(code, srcPath, outPath, root);
+  
+  if (usesJSX(code) && !code.includes('import React')) {
+    code = `import React from 'react';\n${code}`;
+  }
+  
+  await Bun.write(outPath, code);
+  code = null;
+}
+
+function usesJSX(code) {
+  return code.includes('React.createElement') || 
+         code.includes('React.Fragment') ||
+         /<[A-Z]/.test(code) ||
+         code.includes('jsx(') ||
+         code.includes('jsxs(');
+}
+
+function removeCSSImports(code) {
+  code = code.replace(/import\s+['"][^'"]*\.css['"];?\s*/g, '');
+  code = code.replace(/import\s+['"]bertui\/styles['"]\s*;?\s*/g, '');
+  return code;
+}
+
+function fixBuildImports(code, srcPath, outPath, root) {
+  const buildDir = join(root, '.bertuibuild');
+  const routerPath = join(buildDir, 'router.js');
+  const relativeToRouter = relative(dirname(outPath), routerPath).replace(/\\/g, '/');
+  const routerImport = relativeToRouter.startsWith('.') ? relativeToRouter : './' + relativeToRouter;
+  
+  code = code.replace(/from\s+['"]bertui\/router['"]/g, `from '${routerImport}'`);
+  return code;
+}
+
+function fixRelativeImports(code) {
+  const importRegex = /from\s+['"](\.\.[\/\\]|\.\/)((?:[^'"]+?)(?<!\.js|\.jsx|\.ts|\.tsx|\.json))['"];?/g;
+  code = code.replace(importRegex, (match, prefix, path) => {
+    if (path.endsWith('/') || /\.\w+$/.test(path)) return match;
+    return `from '${prefix}${path}.js';`;
+  });
+  return code;
+}

package/src/build/compiler/index.js

@@ -0,0 +1,45 @@
+// bertui/src/build/compiler/index.js
+import { join } from 'path';
+import { existsSync } from 'fs';
+import logger from '../../logger/logger.js';
+import { discoverRoutes } from './route-discoverer.js';
+import { compileBuildDirectory } from './file-transpiler.js';
+import { generateBuildRouter } from './router-generator.js';
+
+
+export async function compileForBuild(root, buildDir, envVars) {
+  const srcDir = join(root, 'src');
+  const pagesDir = join(srcDir, 'pages');
+  
+  if (!existsSync(srcDir)) {
+    throw new Error('src/ directory not found!');
+  }
+  
+  let routes = [];
+  let serverIslands = [];
+  let clientRoutes = [];
+  
+  if (existsSync(pagesDir)) {
+    routes = await discoverRoutes(pagesDir);
+    
+    for (const route of routes) {
+      const sourceCode = await Bun.file(route.path).text();
+      const isServerIsland = sourceCode.includes('export const render = "server"');
+      
+      if (isServerIsland) {
+        serverIslands.push(route);
+        logger.success(`🏝️  Server Island: ${route.route}`);
+      } else {
+        clientRoutes.push(route);
+      }
+    }
+  }
+  
+  await compileBuildDirectory(srcDir, buildDir, root, envVars);
+  
+  if (routes.length > 0) {
+    await generateBuildRouter(routes, buildDir);
+  }
+  
+  return { routes, serverIslands, clientRoutes };
+}

package/src/build/compiler/route-discoverer.js

@@ -0,0 +1,46 @@
+// bertui/src/build/compiler/route-discoverer.js
+import { join, extname } from 'path';
+import { readdirSync, statSync } from 'fs';
+
+export async function discoverRoutes(pagesDir) {
+  const routes = [];
+  
+  async function scanDirectory(dir, basePath = '') {
+    const entries = readdirSync(dir, { withFileTypes: true });
+    
+    for (const entry of entries) {
+      const fullPath = join(dir, entry.name);
+      const relativePath = join(basePath, entry.name);
+      
+      if (entry.isDirectory()) {
+        await scanDirectory(fullPath, relativePath);
+      } else if (entry.isFile()) {
+        const ext = extname(entry.name);
+        if (ext === '.css') continue;
+        
+        if (['.jsx', '.tsx', '.js', '.ts'].includes(ext)) {
+          const fileName = entry.name.replace(ext, '');
+          let route = '/' + relativePath.replace(/\\/g, '/').replace(ext, '');
+          
+          if (fileName === 'index') {
+            route = route.replace('/index', '') || '/';
+          }
+          
+          const isDynamic = fileName.includes('[') && fileName.includes(']');
+          
+          routes.push({
+            route: route === '' ? '/' : route,
+            file: relativePath.replace(/\\/g, '/'),
+            path: fullPath,
+            type: isDynamic ? 'dynamic' : 'static'
+          });
+        }
+      }
+    }
+  }
+  
+  await scanDirectory(pagesDir);
+  routes.sort((a, b) => a.type === b.type ? a.route.localeCompare(b.route) : a.type === 'static' ? -1 : 1);
+  
+  return routes;
+}

package/src/build/compiler/router-generator.js

@@ -0,0 +1,104 @@
+// bertui/src/build/compiler/router-generator.js
+import { join } from 'path';
+
+export async function generateBuildRouter(routes, buildDir) {
+  const imports = routes.map((route, i) => {
+    const componentName = `Page${i}`;
+    const importPath = `./pages/${route.file.replace(/\.(jsx|tsx|ts)$/, '.js')}`;
+    return `import ${componentName} from '${importPath}';`;
+  }).join('\n');
+  
+  const routeConfigs = routes.map((route, i) => {
+    const componentName = `Page${i}`;
+    return `  { path: '${route.route}', component: ${componentName}, type: '${route.type}' }`;
+  }).join(',\n');
+  
+  const routerCode = `import React, { useState, useEffect, createContext, useContext } from 'react';
+
+const RouterContext = createContext(null);
+
+export function useRouter() {
+  const context = useContext(RouterContext);
+  if (!context) throw new Error('useRouter must be used within a Router');
+  return context;
+}
+
+export function Router({ routes }) {
+  const [currentRoute, setCurrentRoute] = useState(null);
+  const [params, setParams] = useState({});
+
+  useEffect(() => {
+    matchAndSetRoute(window.location.pathname);
+    const handlePopState = () => matchAndSetRoute(window.location.pathname);
+    window.addEventListener('popstate', handlePopState);
+    return () => window.removeEventListener('popstate', handlePopState);
+  }, [routes]);
+
+  function matchAndSetRoute(pathname) {
+    for (const route of routes) {
+      if (route.type === 'static' && route.path === pathname) {
+        setCurrentRoute(route);
+        setParams({});
+        return;
+      }
+    }
+    for (const route of routes) {
+      if (route.type === 'dynamic') {
+        const pattern = route.path.replace(/\\[([^\\]]+)\\]/g, '([^/]+)');
+        const regex = new RegExp('^' + pattern + '$');
+        const match = pathname.match(regex);
+        if (match) {
+          const paramNames = [...route.path.matchAll(/\\[([^\\]]+)\\]/g)].map(m => m[1]);
+          const extractedParams = {};
+          paramNames.forEach((name, i) => { extractedParams[name] = match[i + 1]; });
+          setCurrentRoute(route);
+          setParams(extractedParams);
+          return;
+        }
+      }
+    }
+    setCurrentRoute(null);
+    setParams({});
+  }
+
+  function navigate(path) {
+    window.history.pushState({}, '', path);
+    matchAndSetRoute(path);
+  }
+
+  const Component = currentRoute?.component;
+  return React.createElement(
+    RouterContext.Provider,
+    { value: { currentRoute, params, navigate, pathname: window.location.pathname } },
+    Component ? React.createElement(Component, { params }) : React.createElement(NotFound)
+  );
+}
+
+export function Link({ to, children, ...props }) {
+  const { navigate } = useRouter();
+  return React.createElement('a', { 
+    href: to, 
+    onClick: (e) => { e.preventDefault(); navigate(to); }, 
+    ...props 
+  }, children);
+}
+
+function NotFound() {
+  return React.createElement('div', {
+    style: { display: 'flex', flexDirection: 'column', alignItems: 'center', 
+             justifyContent: 'center', minHeight: '100vh', fontFamily: 'system-ui' }
+  },
+    React.createElement('h1', { style: { fontSize: '6rem', margin: 0 } }, '404'),
+    React.createElement('p', { style: { fontSize: '1.5rem', color: '#666' } }, 'Page not found'),
+    React.createElement('a', { href: '/', style: { color: '#10b981', textDecoration: 'none' } }, 'Go home')
+  );
+}
+
+${imports}
+
+export const routes = [
+${routeConfigs}
+];`;
+  
+  await Bun.write(join(buildDir, 'router.js'), routerCode);
+}