hyperspan 1.0.0-alpha.7 → 1.0.0-alpha.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hyperspan",
-  "version": "1.0.0-alpha.7",
+  "version": "1.0.0-alpha.9",
   "description": "Hyperspan CLI - for @hyperspan/framework",
   "type": "module",
   "public": true,
@@ -32,14 +32,14 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@hyperspan/framework": "^1.0.0-alpha.7",
+    "@hyperspan/framework": "^1.0.0-alpha",
+    "bun-plugin-tailwind": "^0.1.2",
     "commander": "^14.0.2",
     "degit": "^2.8.4"
   },
   "devDependencies": {
     "@types/bun": "^1.3.2",
     "@types/degit": "^2.8.6",
-    "@types/node": "^24.10.0",
-    "bun-plugin-tailwind": "^0.1.2"
+    "@types/node": "^24.10.0"
   }
 }

package/src/index.ts

@@ -43,9 +43,19 @@ program
  */
 program
   .command('start')
+  .alias('dev')
   .option('--dir <path>', 'directory of your hyperspan project', './')
   .description('Start the server')
-  .action(async (options) => {
+  .action(async function (options) {
+
+    const IS_DEV_MODE = process.argv.includes('dev');
+
+    // Developer mode (extra logging, etc.)
+    if (IS_DEV_MODE) {
+      console.log('[Hyperspan] Developer mode enabled 🛠️');
+      process.env.NODE_ENV = 'development';
+    }
+
     // Ensure we are in a hyperspan project
     const serverFile = `${options.dir}/app/routes`;
 
@@ -59,11 +69,13 @@ program
     console.log('\n========================================');
     console.log('[Hyperspan] Starting...');
 
-    const server = await startServer({ development: process.env.NODE_ENV !== 'production' });
+    const server = await startServer({ development: IS_DEV_MODE });
 
     const routes: Record<string, (request: Request) => Promise<Response>> = {};
     for (const route of server._routes) {
-      routes[route._path()] = (request: Request) => route.fetch(request);
+      routes[route._path()] = (request: Request) => {
+        return route.fetch(request);
+      }
     }
 
     const httpServer = Bun.serve({
@@ -108,7 +120,7 @@ program
 
     const server = await import(serverFile);
 
-    console.log(server);
+    // @TODO: Build the project for SSG...
   });
 
 program.parse();

package/src/server.ts

@@ -59,81 +59,108 @@ export async function addDirectoryAsRoutes(
   const buildDir = join(CWD, '.build');
   const cssPublicDir = join(CWD, server._config.publicDir, CSS_PUBLIC_PATH);
 
-  // Scan directory for TypeScript files
-  for await (const file of routesGlob.scan(directoryPath)) {
-    const filePath = join(directoryPath, file);
-
-    // Hidden directories and files start with a double underscore.
-    // These do not get added to the routes. Nothing nested under them gets added to the routes either.
-    if (filePath.includes('/__')) {
-      continue;
-    }
+  try {
+    // Scan directory for TypeScript files
+    for await (const file of routesGlob.scan(directoryPath)) {
+      const filePath = join(directoryPath, file);
+
+      // Hidden directories and files start with a double underscore.
+      // These do not get added to the routes. Nothing nested under them gets added to the routes either.
+      if (filePath.includes('/__')) {
+        continue;
+      }
 
-    files.push(filePath);
+      files.push(filePath);
+    }
+  } catch (error) {
+    console.error(`[Hyperspan] Directory not found: ${directoryPath}`);
   }
 
   const routeMap: { route: string; file: string }[] = [];
   const routes: Array<HS.Route> = (await Promise.all(
     files.map(async (filePath) => {
-      const relativeFilePath = filePath.split(relativeAppPath).pop() || '';
-      if (!isValidRoutePath(relativeFilePath)) {
-        return null;
-      }
-      const module = await import(filePath);
-      const route = getRunnableRoute(module);
-      const parsedPath = parsePath(relativeFilePath);
-
-      // If route has a _path() method that returns a meaningful path, use it
-      // Otherwise, parse path from file path
-      let path = parsedPath.path;
-      if (typeof route._path === 'function') {
-        const routePath = route._path();
-        // If _path() returns a meaningful path (not just '/'), use it
-        if (routePath && routePath !== '/') {
-          path = routePath;
+      try {
+        const relativeFilePath = filePath.split(relativeAppPath).pop() || '';
+        if (!isValidRoutePath(relativeFilePath)) {
+          return null;
         }
-      }
+        const module = await import(filePath);
 
-      let cssFiles: string[] = [];
-
-      // Build the route just for the CSS files (expensive, but easiest way to do CSS compilation by route)
-      // @TODO: Optimize this at some later date... This is O(n) for each route and doesn't scale well for large projects.
-      // @TODO: This will also currently re-compile the same CSS file(s) that are included in multiple routes, which is dumb.
-      const buildResult = await Bun.build({
-        plugins: [tailwind],
-        entrypoints: [filePath],
-        outdir: buildDir,
-        naming: `${relativeAppPath}/${path.endsWith('/') ? path + 'index' : path}-[hash].[ext]`,
-        minify: IS_PROD,
-        format: 'esm',
-        target: 'node',
-      });
-
-      // Move CSS files to the public directory
-      for (const output of buildResult.outputs) {
-        if (output.path.endsWith('.css')) {
-          const cssFileName = output.path.split('/').pop()!;
-          await Bun.write(join(cssPublicDir, cssFileName), Bun.file(output.path));
-          cssFiles.push(cssFileName);
+        const route = getRunnableRoute(module);
+
+        const parsedPath = parsePath(relativeFilePath);
+
+        // If route has a _path() method that returns a meaningful path, use it
+        // Otherwise, parse path from file path
+        let path = parsedPath.path;
+        if (typeof route._path === 'function') {
+          const routePath = route._path();
+          // If _path() returns a meaningful path (not just '/'), use it
+          if (routePath && routePath !== '/') {
+            path = routePath;
+          }
         }
-      }
 
-      // Set route path based on the file path (if not already set)
-      if (!route._config.path) {
-        route._config.path = path;
-      }
+        let cssFiles: string[] = [];
+
+        // Build the route just for the CSS files (expensive, but easiest way to do CSS compilation by route)
+        // @TODO: Optimize this at some later date... This is O(n) for each route and doesn't scale well for large projects.
+        // @TODO: This will also currently re-compile the same CSS file(s) that are included in multiple routes, which is dumb.
+        const buildResult = await Bun.build({
+          plugins: [tailwind],
+          entrypoints: [filePath],
+          outdir: buildDir,
+          naming: `${relativeAppPath}/${path.endsWith('/') ? path + 'index' : path}-[hash].[ext]`,
+          minify: IS_PROD,
+          format: 'esm',
+          target: 'node',
+        });
+
+        // Move CSS files to the public directory
+        for (const output of buildResult.outputs) {
+          if (output.path.endsWith('.css')) {
+            const cssFileName = output.path.split('/').pop()!;
+            await Bun.write(join(cssPublicDir, cssFileName), Bun.file(output.path));
+            cssFiles.push(cssFileName);
+          }
+        }
 
-      if (cssFiles.length > 0) {
-        route._config.cssImports = cssFiles;
-        CSS_ROUTE_MAP.set(path, cssFiles);
-      }
+        // Set route path based on the file path (if not already set)
+        if (!route._config.path) {
+          route._config.path = path;
+
+          // Initialize params object if it doesn't exist
+          if (parsedPath.params.length > 0) {
+            const params = route._config.params ?? {};
+            parsedPath.params.forEach(param => {
+              params[param] = undefined;
+            });
+            route._config.params = params;
+          }
+        }
+
+        if (cssFiles.length > 0) {
+          route._config.cssImports = cssFiles;
+          CSS_ROUTE_MAP.set(path, cssFiles);
+        }
 
-      routeMap.push({ route: path, file: filePath.replace(CWD, '') });
+        routeMap.push({ route: path, file: filePath.replace(CWD, '') });
 
-      return route;
+        return route;
+
+      } catch (error) {
+        console.error(`[Hyperspan] Error loading route: ${filePath}`);
+        console.error(error);
+        process.exit(1);
+      }
     })
   )).filter((route) => route !== null);
 
+  if (routeMap.length === 0) {
+    console.log(`[Hyperspan] No routes found in ${relativeDirectory}`);
+    return;
+  }
+
   if (startConfig.development) {
     console.table(routeMap);
   }