create-velox-app 0.6.103 → 0.6.105

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # create-velox-app
 
+## 0.6.105
+
+### Patch Changes
+
+- fix(create): resolve JSX conditional marker artifacts and add auth route guard & some socumentation updates
+
+## 0.6.104
+
+### Patch Changes
+
+- feat(client): smart convention-based route inference, eliminate routes.ts
+
 ## 0.6.103
 
 ### Patch Changes

package/dist/templates/auth.js

@@ -50,9 +50,6 @@ function generateIndexTs() {
 function generateRouterTs() {
     return compileTemplate('api/router.auth.ts', AUTH_CONFIG);
 }
-function generateRoutesTs() {
-    return compileTemplate('api/routes.auth.ts', AUTH_CONFIG);
-}
 function generateConfigDatabase(config) {
     return compileTemplate('api/config/database.ts', config);
 }
@@ -96,7 +93,6 @@ export function generateAuthTemplate(config) {
         { path: 'apps/api/prisma/schema.prisma', content: generatePrismaSchema(config) },
         // API Source files
         { path: 'apps/api/src/router.ts', content: generateRouterTs() },
-        { path: 'apps/api/src/routes.ts', content: generateRoutesTs() },
         { path: 'apps/api/src/index.ts', content: generateIndexTs() },
         { path: 'apps/api/src/config/app.ts', content: generateConfigApp(config) },
         { path: 'apps/api/src/config/auth.ts', content: generateAuthConfig() },

package/dist/templates/placeholders.js

@@ -310,90 +310,96 @@ export function processConditionals(content, config) {
     const { template, database } = config;
     // =========================================================================
     // Template conditionals
+    //
+    // IMPORTANT: JSX patterns must be processed BEFORE non-JSX patterns.
+    // Non-JSX markers (/* @if auth */) are substrings of JSX markers
+    // ({/* @if auth */}). Processing non-JSX first would partially strip
+    // JSX markers, leaving orphaned {} in the output.
     // =========================================================================
-    // Process auth conditionals (both JS and JSX style)
+    // Process auth conditionals
     if (template === 'auth') {
-        // Keep auth content but remove markers
-        result = result.replaceAll(CONDITIONALS.AUTH_START, '');
-        result = result.replaceAll(CONDITIONALS.AUTH_END, '');
+        // Keep auth content but remove markers (JSX first, then non-JSX)
         result = result.replaceAll(CONDITIONALS.JSX_AUTH_START, '');
         result = result.replaceAll(CONDITIONALS.JSX_AUTH_END, '');
+        result = result.replaceAll(CONDITIONALS.AUTH_START, '');
+        result = result.replaceAll(CONDITIONALS.AUTH_END, '');
     }
     else {
-        // Remove entire auth blocks (for default and trpc templates)
-        result = result.replace(AUTH_BLOCK_PATTERN, '');
+        // Remove entire auth blocks (JSX first, then non-JSX)
         result = result.replace(JSX_AUTH_BLOCK_PATTERN, '');
+        result = result.replace(AUTH_BLOCK_PATTERN, '');
     }
-    // Process default conditionals (both JS and JSX style)
+    // Process default conditionals
     // Note: 'rsc' template uses default-style content (no auth)
     // 'trpc' template has its own @if trpc blocks for tRPC-specific configuration
     if (template === 'spa' || template === 'rsc') {
-        // Keep default content but remove markers
-        result = result.replaceAll(CONDITIONALS.DEFAULT_START, '');
-        result = result.replaceAll(CONDITIONALS.DEFAULT_END, '');
+        // Keep default content but remove markers (JSX first, then non-JSX)
         result = result.replaceAll(CONDITIONALS.JSX_DEFAULT_START, '');
         result = result.replaceAll(CONDITIONALS.JSX_DEFAULT_END, '');
+        result = result.replaceAll(CONDITIONALS.DEFAULT_START, '');
+        result = result.replaceAll(CONDITIONALS.DEFAULT_END, '');
     }
     else {
-        // Remove entire default blocks (for auth and trpc templates)
-        result = result.replace(DEFAULT_BLOCK_PATTERN, '');
+        // Remove entire default blocks (JSX first, then non-JSX)
         result = result.replace(JSX_DEFAULT_BLOCK_PATTERN, '');
+        result = result.replace(DEFAULT_BLOCK_PATTERN, '');
     }
-    // Process trpc conditionals (both JS and JSX style)
+    // Process trpc conditionals
     if (template === 'trpc') {
-        // Keep trpc content but remove markers
-        result = result.replaceAll(CONDITIONALS.TRPC_START, '');
-        result = result.replaceAll(CONDITIONALS.TRPC_END, '');
+        // Keep trpc content but remove markers (JSX first, then non-JSX)
         result = result.replaceAll(CONDITIONALS.JSX_TRPC_START, '');
         result = result.replaceAll(CONDITIONALS.JSX_TRPC_END, '');
+        result = result.replaceAll(CONDITIONALS.TRPC_START, '');
+        result = result.replaceAll(CONDITIONALS.TRPC_END, '');
     }
     else {
-        // Remove entire trpc blocks (for spa, auth, rsc templates)
-        result = result.replace(TRPC_BLOCK_PATTERN, '');
+        // Remove entire trpc blocks (JSX first, then non-JSX)
         result = result.replace(JSX_TRPC_BLOCK_PATTERN, '');
+        result = result.replace(TRPC_BLOCK_PATTERN, '');
     }
-    // Process rest conditionals (both JS and JSX style)
+    // Process rest conditionals
     // REST mode applies to all templates except trpc (spa, auth, rsc)
     if (template !== 'trpc') {
-        // Keep rest content but remove markers
-        result = result.replaceAll(CONDITIONALS.REST_START, '');
-        result = result.replaceAll(CONDITIONALS.REST_END, '');
+        // Keep rest content but remove markers (JSX first, then non-JSX)
         result = result.replaceAll(CONDITIONALS.JSX_REST_START, '');
         result = result.replaceAll(CONDITIONALS.JSX_REST_END, '');
+        result = result.replaceAll(CONDITIONALS.REST_START, '');
+        result = result.replaceAll(CONDITIONALS.REST_END, '');
     }
     else {
-        // Remove entire rest blocks (for trpc template)
-        result = result.replace(REST_BLOCK_PATTERN, '');
+        // Remove entire rest blocks (JSX first, then non-JSX)
         result = result.replace(JSX_REST_BLOCK_PATTERN, '');
+        result = result.replace(REST_BLOCK_PATTERN, '');
     }
     // =========================================================================
     // Database conditionals
     // =========================================================================
     // Process sqlite conditionals
     if (database === 'sqlite') {
-        // Keep sqlite content but remove markers
-        result = result.replaceAll(CONDITIONALS.SQLITE_START, '');
-        result = result.replaceAll(CONDITIONALS.SQLITE_END, '');
         result = result.replaceAll(CONDITIONALS.JSX_SQLITE_START, '');
         result = result.replaceAll(CONDITIONALS.JSX_SQLITE_END, '');
+        result = result.replaceAll(CONDITIONALS.SQLITE_START, '');
+        result = result.replaceAll(CONDITIONALS.SQLITE_END, '');
     }
     else {
-        // Remove entire sqlite blocks
-        result = result.replace(SQLITE_BLOCK_PATTERN, '');
         result = result.replace(JSX_SQLITE_BLOCK_PATTERN, '');
+        result = result.replace(SQLITE_BLOCK_PATTERN, '');
     }
     // Process postgresql conditionals
     if (database === 'postgresql') {
-        // Keep postgresql content but remove markers
-        result = result.replaceAll(CONDITIONALS.POSTGRESQL_START, '');
-        result = result.replaceAll(CONDITIONALS.POSTGRESQL_END, '');
         result = result.replaceAll(CONDITIONALS.JSX_POSTGRESQL_START, '');
         result = result.replaceAll(CONDITIONALS.JSX_POSTGRESQL_END, '');
+        result = result.replaceAll(CONDITIONALS.POSTGRESQL_START, '');
+        result = result.replaceAll(CONDITIONALS.POSTGRESQL_END, '');
     }
     else {
-        // Remove entire postgresql blocks
-        result = result.replace(POSTGRESQL_BLOCK_PATTERN, '');
         result = result.replace(JSX_POSTGRESQL_BLOCK_PATTERN, '');
+        result = result.replace(POSTGRESQL_BLOCK_PATTERN, '');
     }
+    // =========================================================================
+    // Cleanup: remove trailing whitespace and collapse consecutive blank lines
+    // =========================================================================
+    result = result.replace(/[ \t]+$/gm, '');
+    result = result.replace(/\n{3,}/g, '\n\n');
     return result;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-velox-app",
-  "version": "0.6.103",
+  "version": "0.6.105",
   "description": "Project scaffolder for VeloxTS framework",
   "type": "module",
   "main": "dist/index.js",

package/src/templates/source/web/main.tsx

@@ -8,10 +8,8 @@ import './styles/global.css';
 
 // Import router type (type-only import is erased at compile time)
 import type { AppRouter } from '../../api/src/router.js';
-/* @if auth */
-// Import routes from browser-safe routes file (no server-side code)
-import { routes } from '../../api/src/routes.js';
 
+/* @if auth */
 /* @endif auth */
 
 // Create router with route tree
@@ -82,7 +80,17 @@ createRoot(rootElement).render(
       config={{
         baseUrl: '/api',
         headers: getAuthHeaders,
-        routes,
+        // Routes are inferred from procedure naming conventions.
+        // Manually add routes for procedures with .rest() overrides:
+        routes: {
+          auth: {
+            createAccount: { method: 'POST', path: '/auth/register', kind: 'mutation' },
+            createSession: { method: 'POST', path: '/auth/login', kind: 'mutation' },
+            createRefresh: { method: 'POST', path: '/auth/refresh', kind: 'mutation' },
+            deleteSession: { method: 'POST', path: '/auth/logout', kind: 'mutation' },
+            getMe: { method: 'GET', path: '/auth/me', kind: 'query' },
+          },
+        },
         onUnauthorized: handleUnauthorized,
       }}
     >

package/src/templates/source/web/routes/__root.tsx

@@ -8,6 +8,7 @@ import styles from '@/App.module.css';
 
 export const Route = createRootRoute({
   component: RootLayout,
+  notFoundComponent: () => <div>Not Found</div>,
 });
 
 function RootLayout() {

package/src/templates/source/web/routes/users.tsx

@@ -5,7 +5,7 @@
  * Data is guaranteed to be available when the component renders.
  */
 
-import { createFileRoute } from '@tanstack/react-router';
+import { createFileRoute, notFound } from '@tanstack/react-router';
 import { Suspense } from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
 
@@ -14,6 +14,13 @@ import { api } from '@/api';
 
 export const Route = createFileRoute('/users')({
   component: UsersPage,
+  /* @if auth */
+  beforeLoad: () => {
+    if (!localStorage.getItem('token')) {
+      throw notFound();
+    }
+  },
+  /* @endif auth */
 });
 
 function UsersPage() {

package/src/templates/source/api/routes.auth.ts

@@ -1,41 +0,0 @@
-/**
- * Browser-Safe Route Definitions
- *
- * This file exports route metadata that can be safely imported by frontend code.
- * It does NOT import any server-side modules like procedures or database clients.
- *
- * IMPORTANT: Keep this file browser-safe - no Node.js imports or side effects.
- */
-
-import type { RouteMap } from '@veloxts/velox';
-
-/**
- * Route mappings for the VeloxTS client
- *
- * Maps namespace -> procedure -> { method, path, kind }
- * These must match the actual procedure definitions in ./procedures/
- */
-export const routes: RouteMap = {
-  health: {
-    getHealth: { method: 'GET', path: '/health', kind: 'query' },
-  },
-  auth: {
-    createAccount: { method: 'POST', path: '/auth/register', kind: 'mutation' },
-    createSession: { method: 'POST', path: '/auth/login', kind: 'mutation' },
-    createRefresh: { method: 'POST', path: '/auth/refresh', kind: 'mutation' },
-    deleteSession: { method: 'POST', path: '/auth/logout', kind: 'mutation' },
-    getMe: { method: 'GET', path: '/auth/me', kind: 'query' },
-  },
-  users: {
-    listUsers: { method: 'GET', path: '/users', kind: 'query' },
-    getUser: { method: 'GET', path: '/users/:id', kind: 'query' },
-    createUser: { method: 'POST', path: '/users', kind: 'mutation' },
-    updateUser: { method: 'PUT', path: '/users/:id', kind: 'mutation' },
-    patchUser: { method: 'PATCH', path: '/users/:id', kind: 'mutation' },
-    deleteUser: { method: 'DELETE', path: '/users/:id', kind: 'mutation' },
-  },
-  profiles: {
-    getProfile: { method: 'GET', path: '/profiles/:id', kind: 'query' },
-    getFullProfile: { method: 'GET', path: '/profiles/:id/full', kind: 'query' },
-  },
-};