@varlabs/create-solidstep 0.1.4 → 0.1.6

package/generate/app/layout.tsx

@@ -1,5 +1,5 @@
 import type { Component, JSX } from 'solid-js';
-import 'globals.css';
+import './globals.css';
 
 export const generateMeta = () => ({
     'title': {

package/generate/app/page.tsx

@@ -1,4 +1,4 @@
-import { defineLoader } from '../utils/loader';
+import { defineLoader, type LoaderDataFromFunction } from '../utils/loader';
 import { NoHydration } from 'solid-js/web';
 
 export const loader = defineLoader(async () => {
@@ -19,7 +19,7 @@ export const generateMeta = () => ({
     },
 });
 
-type LoaderData = Awaited<ReturnType<Exclude<typeof loader, null>>>['data'];
+type LoaderData = LoaderDataFromFunction<typeof loader>;
 
 const Page = ({
     loaderData

package/generate/app.config.ts

@@ -29,7 +29,7 @@ export default createApp({
             plugins: () => [serverFunctions.client(), solid({ ssr: true })],
             base: '/_build',
             routes: (router, app) => {
-                return new ServerRouter(
+                return new ClientRouter(
                     {
                         dir: path.join(__dirname, 'app'),
                         extensions: ['jsx', 'js', 'tsx', 'ts'],
@@ -54,7 +54,7 @@ export default createApp({
 			// },
             middleware: './app/middleware.ts',
             routes: (router, app) => {
-                return new ClientRouter(
+                return new ServerRouter(
                     {
                         dir: path.join(__dirname, 'app'),
                         extensions: ['jsx', 'js', 'tsx', 'ts'],

package/generate/server.ts

@@ -125,7 +125,7 @@ const createRouteManifest = async () => {
         const routePath = '/' + segments.filter(s => !(s.startsWith('('))).join('/');
         const regex = /\?(?:pick=.*)*/g;
         const src = fileRoute.$handler.src.replace(regex, '');
-        
+
         if (isPageFile(src)) {
             const loadingPage = allLoadingPages.find(route => {
                 const path = '/' + route.path.split('/').slice(2).map(parseSegment).join('/');
@@ -136,7 +136,7 @@ const createRouteManifest = async () => {
                 const parentPath = route.parent ? '/' + route.parent.split('/').slice(2).map(parseSegment).join('/') : '';
                 return parentPath === routePath;
             });
-            const groups: RoutePageEntry['groups'] = {};
+            let groups: RoutePageEntry['groups'] = {};
             if (matchedGroups && matchedGroups.length > 0) {
                 for (const group of matchedGroups) {
                     const groupName = group.path.split('/').filter(s => !(s.startsWith('('))).map(parseSegment).at(-1);
@@ -149,7 +149,7 @@ const createRouteManifest = async () => {
             }
 
             let errorPage: FileRoute | undefined;
-            const layouts: RoutePageEntry['layouts'] = [];
+            let layouts: RoutePageEntry['layouts'] = [];
             for (let i = segments.length; i > (routePath === '/' ? 0 : -1); i--) {
                 const path = '/' + segments.slice(0, i).join('/');
                 if (!errorPage) {
@@ -212,7 +212,7 @@ const createRouteManifest = async () => {
 };
 
 const extractRouteParams = (route: string, url: string) => {
-    const routeSegments = route.split('/').filter(Boolean);
+    const routeSegments = route.split('/').filter(s => !(s.startsWith('('))).filter(Boolean);
     const urlSegments = url.split('/').filter(Boolean);
 
     const params = {};

package/generate/utils/loader.ts

@@ -8,7 +8,7 @@ type LoaderOptions = {
 
 export const defineLoader = <T>(loader: LoaderFunction<T>, options?: LoaderOptions) => {
     if (isServer) {
-        return async (request?: Request) => {
+        const fn = async (request?: Request) => {
             try {
                 const loaderData = await loader(request);
                 return {
@@ -20,7 +20,16 @@ export const defineLoader = <T>(loader: LoaderFunction<T>, options?: LoaderOptio
                 throw error; // Re-throw to allow error handling upstream
             }
         };
+
+        return {
+            loader: fn,
+            options: options || {},
+        };
     }
 
     return null; // Return null if not on the server
 };
+
+export type LoaderDataFromFunction<T> = T extends { loader: infer L extends (...args: any) => any }
+    ? Awaited<ReturnType<T['loader']>> extends { data: infer D } ? D : never
+    : never;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@varlabs/create-solidstep",
-    "version": "0.1.4",
+    "version": "0.1.6",
     "description": "Next Step SolidJS CLI for building web applications.",
     "type": "module",
     "author": "HamzaKV <hamzakv333@gmail.com>",