@currentjs/gen 0.5.6 → 0.5.7

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.5.7] - 2026-04-08
+
+- HTTP errors in generated controllers
+
 ## [0.5.6] - 2026-04-08
 
 - database identifier types (numeric, uuid, nanoid)

package/dist/generators/controllerGenerator.d.ts

@@ -11,6 +11,11 @@ export declare class ControllerGenerator {
      * Check if auth config includes owner permission
      */
     private hasOwnerAuth;
+    /**
+     * Determine which HTTP error classes from @currentjs/router are needed
+     * based on the auth configs of all endpoints in a controller.
+     */
+    private getNeededHttpErrorImports;
     /**
      * Generate pre-fetch authentication/authorization check code.
      * This runs before fetching the entity and validates authentication and role-based access.

package/dist/generators/controllerGenerator.js

@@ -78,6 +78,28 @@ class ControllerGenerator {
         const roles = this.normalizeAuth(auth);
         return roles.includes(constants_1.AUTH_ROLES.OWNER);
     }
+    /**
+     * Determine which HTTP error classes from @currentjs/router are needed
+     * based on the auth configs of all endpoints in a controller.
+     */
+    getNeededHttpErrorImports(auths) {
+        const needed = new Set();
+        for (const auth of auths) {
+            const roles = this.normalizeAuth(auth);
+            if (roles.length === 0 || (roles.length === 1 && roles[0] === constants_1.AUTH_ROLES.ALL))
+                continue;
+            needed.add('UnauthorizedError');
+            const roleChecks = roles.filter(r => r !== constants_1.AUTH_ROLES.OWNER && r !== constants_1.AUTH_ROLES.ALL && r !== constants_1.AUTH_ROLES.AUTHENTICATED);
+            if (roleChecks.length > 0) {
+                needed.add('ForbiddenError');
+            }
+            if (roles.includes(constants_1.AUTH_ROLES.OWNER)) {
+                needed.add('ForbiddenError');
+                needed.add('NotFoundError');
+            }
+        }
+        return Array.from(needed).sort();
+    }
     /**
      * Generate pre-fetch authentication/authorization check code.
      * This runs before fetching the entity and validates authentication and role-based access.
@@ -92,14 +114,14 @@ class ControllerGenerator {
         // If only 'authenticated' is specified
         if (roles.length === 1 && roles[0] === constants_1.AUTH_ROLES.AUTHENTICATED) {
             return `if (!context.request.user) {
-      throw new Error('${constants_1.AUTH_ERRORS.REQUIRED}');
+      throw new UnauthorizedError('${constants_1.AUTH_ERRORS.REQUIRED}');
     }`;
         }
         // If only 'owner' is specified - just require authentication here
         // (owner check happens post-fetch)
         if (roles.length === 1 && roles[0] === constants_1.AUTH_ROLES.OWNER) {
             return `if (!context.request.user) {
-      throw new Error('${constants_1.AUTH_ERRORS.REQUIRED}');
+      throw new UnauthorizedError('${constants_1.AUTH_ERRORS.REQUIRED}');
     }`;
         }
         // Filter out 'owner' and 'all' for role checks (owner is checked post-fetch)
@@ -111,16 +133,16 @@ class ControllerGenerator {
             if (roleChecks.length === 0) {
                 // Only owner (and maybe authenticated) - just require auth
                 return `if (!context.request.user) {
-      throw new Error('${constants_1.AUTH_ERRORS.REQUIRED}');
+      throw new UnauthorizedError('${constants_1.AUTH_ERRORS.REQUIRED}');
     }`;
             }
             if (roleChecks.length === 1 && !hasOwner) {
                 // Single role check
                 return `if (!context.request.user) {
-      throw new Error('${constants_1.AUTH_ERRORS.REQUIRED}');
+      throw new UnauthorizedError('${constants_1.AUTH_ERRORS.REQUIRED}');
     }
     if (context.request.user.role !== '${roleChecks[0]}') {
-      throw new Error('${constants_1.AUTH_ERRORS.INSUFFICIENT_PERMISSIONS}: ${roleChecks[0]} role required');
+      throw new ForbiddenError('${constants_1.AUTH_ERRORS.INSUFFICIENT_PERMISSIONS}: ${roleChecks[0]} role required');
     }`;
             }
             // Multiple roles OR owner - use OR logic
@@ -129,22 +151,22 @@ class ControllerGenerator {
             if (hasOwner) {
                 // With owner: require auth, role check will be combined with owner check post-fetch
                 return `if (!context.request.user) {
-      throw new Error('${constants_1.AUTH_ERRORS.REQUIRED}');
+      throw new UnauthorizedError('${constants_1.AUTH_ERRORS.REQUIRED}');
     }`;
             }
             // Multiple roles without owner - check if user has ANY of the roles
             const roleConditions = roleChecks.map(r => `context.request.user.role === '${r}'`).join(' || ');
             return `if (!context.request.user) {
-      throw new Error('${constants_1.AUTH_ERRORS.REQUIRED}');
+      throw new UnauthorizedError('${constants_1.AUTH_ERRORS.REQUIRED}');
     }
     if (!(${roleConditions})) {
-      throw new Error('${constants_1.AUTH_ERRORS.INSUFFICIENT_PERMISSIONS}: one of [${roleChecks.join(', ')}] role required');
+      throw new ForbiddenError('${constants_1.AUTH_ERRORS.INSUFFICIENT_PERMISSIONS}: one of [${roleChecks.join(', ')}] role required');
     }`;
         }
         // Only 'authenticated' in the mix
         if (hasAuthenticated) {
             return `if (!context.request.user) {
-      throw new Error('${constants_1.AUTH_ERRORS.REQUIRED}');
+      throw new UnauthorizedError('${constants_1.AUTH_ERRORS.REQUIRED}');
     }`;
         }
         return '';
@@ -168,10 +190,10 @@ class ControllerGenerator {
     // Owner validation (post-fetch for reads, via parent)
     const resourceOwnerId = await this.${useCaseVar}.getResourceOwner(${resultVar}.id);
     if (resourceOwnerId === null) {
-      throw new Error('Resource not found');
+      throw new NotFoundError('Resource not found');
     }
     if (resourceOwnerId !== context.request.user?.id) {
-      throw new Error('${constants_1.AUTH_ERRORS.ACCESS_DENIED}');
+      throw new ForbiddenError('${constants_1.AUTH_ERRORS.ACCESS_DENIED}');
     }`;
             }
             const bypassConditions = bypassRoles.map(r => `context.request.user?.role === '${r}'`).join(' || ');
@@ -179,12 +201,12 @@ class ControllerGenerator {
     // Owner validation (post-fetch for reads, via parent, bypassed for: ${bypassRoles.join(', ')})
     const resourceOwnerId = await this.${useCaseVar}.getResourceOwner(${resultVar}.id);
     if (resourceOwnerId === null) {
-      throw new Error('Resource not found');
+      throw new NotFoundError('Resource not found');
     }
     const isOwner = resourceOwnerId === context.request.user?.id;
     const hasPrivilegedRole = ${bypassConditions};
     if (!isOwner && !hasPrivilegedRole) {
-      throw new Error('${constants_1.AUTH_ERRORS.ACCESS_DENIED}');
+      throw new ForbiddenError('${constants_1.AUTH_ERRORS.ACCESS_DENIED}');
     }`;
         }
         // Root entity: result has ownerId
@@ -192,7 +214,7 @@ class ControllerGenerator {
             return `
     // Owner validation (post-fetch for reads)
     if (${resultVar}.ownerId !== context.request.user?.id) {
-      throw new Error('${constants_1.AUTH_ERRORS.ACCESS_DENIED}');
+      throw new ForbiddenError('${constants_1.AUTH_ERRORS.ACCESS_DENIED}');
     }`;
         }
         const bypassConditions = bypassRoles.map(r => `context.request.user?.role === '${r}'`).join(' || ');
@@ -201,7 +223,7 @@ class ControllerGenerator {
     const isOwner = ${resultVar}.ownerId === context.request.user?.id;
     const hasPrivilegedRole = ${bypassConditions};
     if (!isOwner && !hasPrivilegedRole) {
-      throw new Error('${constants_1.AUTH_ERRORS.ACCESS_DENIED}');
+      throw new ForbiddenError('${constants_1.AUTH_ERRORS.ACCESS_DENIED}');
     }`;
     }
     /**
@@ -225,10 +247,10 @@ class ControllerGenerator {
     // Pre-mutation owner validation
     const resourceOwnerId = await this.${useCaseVar}.getResourceOwner(input.id);
     if (resourceOwnerId === null) {
-      throw new Error('Resource not found');
+      throw new NotFoundError('Resource not found');
     }
     if (resourceOwnerId !== context.request.user?.id) {
-      throw new Error('${constants_1.AUTH_ERRORS.ACCESS_DENIED}');
+      throw new ForbiddenError('${constants_1.AUTH_ERRORS.ACCESS_DENIED}');
     }
 `;
         }
@@ -238,12 +260,12 @@ class ControllerGenerator {
     // Pre-mutation owner validation (bypassed for: ${bypassRoles.join(', ')})
     const resourceOwnerId = await this.${useCaseVar}.getResourceOwner(input.id);
     if (resourceOwnerId === null) {
-      throw new Error('Resource not found');
+      throw new NotFoundError('Resource not found');
     }
     const isOwner = resourceOwnerId === context.request.user?.id;
     const hasPrivilegedRole = ${bypassConditions};
     if (!isOwner && !hasPrivilegedRole) {
-      throw new Error('${constants_1.AUTH_ERRORS.ACCESS_DENIED}');
+      throw new ForbiddenError('${constants_1.AUTH_ERRORS.ACCESS_DENIED}');
     }
 `;
     }
@@ -559,7 +581,9 @@ class ControllerGenerator {
         const constructorParams = Array.from(useCaseModels)
             .map(model => `private ${model.toLowerCase()}UseCase: ${model}UseCase`)
             .join(',\n    ');
-        return `import { Controller, Get, Post, Put, Delete, type IContext } from '@currentjs/router';
+        const errorImports = this.getNeededHttpErrorImports(sortedEndpoints.map(e => e.auth));
+        const routerImports = ['Controller', 'Get', 'Post', 'Put', 'Delete', 'type IContext', ...errorImports].join(', ');
+        return `import { ${routerImports} } from '@currentjs/router';
 ${useCaseImports}
 ${dtoImportStatements}
 
@@ -626,7 +650,9 @@ ${methods.join('\n\n')}
     ${constructorParams.join(',\n    ')}
   ) {}`
             : 'constructor() {}';
-        return `import { Controller, Get, Post, Render, type IContext } from '@currentjs/router';
+        const errorImports = this.getNeededHttpErrorImports(sortedPages.map(p => p.auth));
+        const routerImports = ['Controller', 'Get', 'Post', 'Render', 'type IContext', ...errorImports].join(', ');
+        return `import { ${routerImports} } from '@currentjs/router';
 ${useCaseImports}
 ${serviceImports.join('\n')}
 ${dtoImportStatements}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@currentjs/gen",
-  "version": "0.5.6",
+  "version": "0.5.7",
   "description": "CLI code generator",
   "license": "LGPL-3.0",
   "author": "Konstantin Zavalny",