create-backlist 6.0.6 → 6.0.8

package/src/templates/java-spring/partials/Controller.java.ejs

@@ -4,32 +4,23 @@ package <%= group %>.<%= projectName %>.controller;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.List;
-
+import java.util.Optional;
 import <%= group %>.<%= projectName %>.service.<%= controllerName %>Service;
 import <%= group %>.<%= projectName %>.model.<%= controllerName %>;
 
 @RestController
-@RequestMapping("<%= basePath %>")
+@RequestMapping("/api/<%= controllerName.toLowerCase() %>s")
 @CrossOrigin(origins = "*")
 public class <%= controllerName %>Controller {
   private final <%= controllerName %>Service service;
+  public <%= controllerName %>Controller(<%= controllerName %>Service service) { this.service = service; }
 
-  public <%= controllerName %>Controller(<%= controllerName %>Service service) {
-    this.service = service;
-  }
-
-  @GetMapping
-  public List<<%= controllerName %>> all() {
-    return service.findAll();
-  }
+  @GetMapping public List<<%= controllerName %>> all() { return service.findAll(); }
 
   @GetMapping("/{id}")
   public ResponseEntity<<%= controllerName %>> one(@PathVariable Long id) {
-    return service.findById(id)
-      .map(ResponseEntity::ok)
-      .orElse(ResponseEntity.notFound().build());
+    return service.findById(id).map(ResponseEntity::ok).orElse(ResponseEntity.notFound().build());
   }
 
   @PostMapping
@@ -39,9 +30,7 @@ public class <%= controllerName %>Controller {
 
   @PutMapping("/{id}")
   public ResponseEntity<<%= controllerName %>> update(@PathVariable Long id, @RequestBody <%= controllerName %> m) {
-    return service.update(id, m)
-      .map(ResponseEntity::ok)
-      .orElse(ResponseEntity.notFound().build());
+    return service.update(id, m).map(ResponseEntity::ok).orElse(ResponseEntity.notFound().build());
   }
 
   @DeleteMapping("/{id}")

package/src/templates/java-spring/partials/Dockerfile.ejs

@@ -1,12 +1,7 @@
 # Auto-generated by create-backlist
 FROM eclipse-temurin:21-jdk AS build
 WORKDIR /app
-
-COPY .mvn/ .mvn/
-COPY mvnw pom.xml ./
-RUN chmod +x mvnw && ./mvnw -q -DskipTests dependency:go-offline
-
-COPY src ./src
+COPY . .
 RUN ./mvnw -q -DskipTests package
 
 FROM eclipse-temurin:21-jre

package/src/templates/java-spring/partials/Entity.java.ejs

@@ -2,24 +2,14 @@
 package <%= group %>.<%= projectName %>.model;
 
 import jakarta.persistence.*;
-import lombok.*;
+import lombok.Data;
 
 @Data
-@NoArgsConstructor
-@AllArgsConstructor
 @Entity
-@Table(name = "<%= modelName.toLowerCase() %>")
 public class <%= modelName %> {
-
-  @Id
-  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
   private Long id;
-
-<% model.fields.forEach(f => { -%>
-  private <%- (f.type === 'number' || f.type === 'Number') ? 'Double'
-        : (f.type === 'int' || f.type === 'Integer') ? 'Integer'
-        : (f.type === 'boolean' || f.type === 'Boolean') ? 'Boolean'
-        : (f.type === 'date' || f.type === 'Date') ? 'java.time.Instant'
-        : 'String' %> <%= f.name %>;
-<% }) -%>
+  <% model.fields.forEach(f => { %>
+  private <%= f.type === 'Number' ? 'Integer' : (f.type === 'Boolean' ? 'Boolean' : 'String') %> <%= f.name %>;
+  <% }) %>
 }

package/src/templates/java-spring/partials/JwtAuthFilter.java.ejs

@@ -5,9 +5,6 @@ import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-
-import io.jsonwebtoken.JwtException;
-
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -28,39 +25,19 @@ public class JwtAuthFilter extends OncePerRequestFilter {
     this.uds = uds;
   }
 
-  @Override
-  protected boolean shouldNotFilter(HttpServletRequest request) {
-    String path = request.getRequestURI();
-    return path != null && path.startsWith("/api/auth");
-  }
-
   @Override
   protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
       throws ServletException, IOException {
-
-    // If already authenticated, skip
-    if (SecurityContextHolder.getContext().getAuthentication() != null) {
-      chain.doFilter(request, response);
-      return;
-    }
-
     String header = request.getHeader("Authorization");
-
     if (header != null && header.startsWith("Bearer ")) {
-      String token = header.substring(7).trim();
-      if (!token.isEmpty()) {
-        try {
-          String subject = jwtService.validateAndGetSubject(token);
-          UserDetails ud = uds.loadUserByUsername(subject);
-
-          var auth = new UsernamePasswordAuthenticationToken(ud, null, ud.getAuthorities());
-          SecurityContextHolder.getContext().setAuthentication(auth);
-        } catch (JwtException ex) {
-          // Invalid/expired token: continue without authentication
-        }
-      }
+      String token = header.substring(7);
+      try {
+        String subject = jwtService.validateAndGetSubject(token);
+        UserDetails ud = uds.loadUserByUsername(subject);
+        var auth = new UsernamePasswordAuthenticationToken(ud, null, ud.getAuthorities());
+        SecurityContextHolder.getContext().setAuthentication(auth);
+      } catch (Exception ignored) {}
     }
-
     chain.doFilter(request, response);
   }
 }

package/src/templates/java-spring/partials/JwtService.java.ejs

@@ -5,54 +5,26 @@ import io.jsonwebtoken.*;
 import io.jsonwebtoken.security.Keys;
 import org.springframework.stereotype.Service;
 
-import java.nio.charset.StandardCharsets;
 import java.security.Key;
 import java.util.Date;
 
 @Service
 public class JwtService {
+  private final Key key = Keys.hmacShaKeyFor(System.getenv("JWT_SECRET") != null
+          ? System.getenv("JWT_SECRET").getBytes()
+          : "change_this_dev_secret_change_this_dev_secret".getBytes());
 
-  private final Key key;
-  private final long expirationMs;
-
-  public JwtService() {
-    String secret = System.getenv("JWT_SECRET");
-    if (secret == null || secret.trim().length() < 32) {
-      // Must be >= 32 chars for HS256 keys (jjwt enforces minimum)
-      secret = "change_this_dev_secret_change_this_dev_secret";
-    }
-    this.key = Keys.hmacShaKeyFor(secret.getBytes(StandardCharsets.UTF_8));
-
-    String exp = System.getenv("JWT_EXPIRES_MS");
-    long fallback = 1000L * 60 * 60 * 5; // 5 hours
-    this.expirationMs = (exp != null) ? parseLongSafe(exp, fallback) : fallback;
-  }
-
-  public String generateToken(String subject) {
-    Date now = new Date();
-    Date exp = new Date(now.getTime() + expirationMs);
-
+  public String generateToken(String userId) {
     return Jwts.builder()
-      .setSubject(subject)
-      .setIssuedAt(now)
-      .setExpiration(exp)
+      .setSubject(userId)
+      .setIssuedAt(new Date())
+      .setExpiration(new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 5))
       .signWith(key, SignatureAlgorithm.HS256)
       .compact();
   }
 
-  /**
-   * @throws JwtException if token invalid/expired
-   */
-  public String validateAndGetSubject(String token) throws JwtException {
-    return Jwts.parserBuilder()
-      .setSigningKey(key)
-      .build()
-      .parseClaimsJws(token)
-      .getBody()
-      .getSubject();
-  }
-
-  private long parseLongSafe(String v, long fallback) {
-    try { return Long.parseLong(v); } catch (Exception e) { return fallback; }
+  public String validateAndGetSubject(String token) {
+    return Jwts.parserBuilder().setSigningKey(key).build()
+      .parseClaimsJws(token).getBody().getSubject();
   }
 }

package/src/templates/java-spring/partials/Repository.java.ejs

@@ -3,16 +3,7 @@ package <%= group %>.<%= projectName %>.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
-
 import <%= group %>.<%= projectName %>.model.<%= modelName %>;
 
 @Repository
-public interface <%= modelName %>Repository extends JpaRepository<<%= modelName %>, Long> {
-
-<%
-// If generator passes `extraFinders: [{name:'Email', type:'String'}]`
-(extraFinders || []).forEach(f => {
--%>
-  java.util.Optional<<%= modelName %>> findBy<%= f.name %>(<%= f.type %> <%= f.name.charAt(0).toLowerCase() + f.name.slice(1) %>);
-<% }) -%>
-}
+public interface <%= modelName %>Repository extends JpaRepository<<%= modelName %>, Long> {}

package/src/templates/java-spring/partials/Service.java.ejs

@@ -2,65 +2,27 @@
 package <%= group %>.<%= projectName %>.service;
 
 import org.springframework.stereotype.Service;
-
 import java.util.List;
 import java.util.Optional;
-
 import <%= group %>.<%= projectName %>.repository.<%= modelName %>Repository;
 import <%= group %>.<%= projectName %>.model.<%= modelName %>;
 
 @Service
 public class <%= modelName %>Service {
-
   private final <%= modelName %>Repository repo;
+  public <%= modelName %>Service(<%= modelName %>Repository repo) { this.repo = repo; }
 
-  public <%= modelName %>Service(<%= modelName %>Repository repo) {
-    this.repo = repo;
-  }
-
-  public List<<%= modelName %>> findAll() {
-    return repo.findAll();
-  }
-
-  public Optional<<%= modelName %>> findById(Long id) {
-    return repo.findById(id);
-  }
-
-  public <%= modelName %> create(<%= modelName %> m) {
-    // Ensure id is not forced by client
-    m.setId(null);
-    return repo.save(m);
-  }
-
+  public List<<%= modelName %>> findAll() { return repo.findAll(); }
+  public Optional<<%= modelName %>> findById(Long id) { return repo.findById(id); }
+  public <%= modelName %> create(<%= modelName %> m) { return repo.save(m); }
   public Optional<<%= modelName %>> update(Long id, <%= modelName %> m) {
     return repo.findById(id).map(existing -> {
-<% model.fields.forEach(f => { 
-  const cap = f.name.charAt(0).toUpperCase() + f.name.slice(1);
--%>
-      // Update <%= f.name %>
-      existing.set<%= cap %>(m.get<%= cap %>());
-<% }) -%>
-      return repo.save(existing);
-    });
-  }
-
-  /**
-   * Partial update: only set non-null values.
-   * Useful if your frontend sends partial payloads.
-   */
-  public Optional<<%= modelName %>> patch(Long id, <%= modelName %> m) {
-    return repo.findById(id).map(existing -> {
-<% model.fields.forEach(f => { 
-  const cap = f.name.charAt(0).toUpperCase() + f.name.slice(1);
--%>
-      if (m.get<%= cap %>() != null) {
-        existing.set<%= cap %>(m.get<%= cap %>());
-      }
-<% }) -%>
+      <% model.fields.forEach(f => { %>
+      existing.set<%= f.name.charAt(0).toUpperCase() + f.name.slice(1) %>(m.get<%= f.name.charAt(0).toUpperCase() + f.name.slice(1) %>());
+      <% }) %>
       return repo.save(existing);
     });
   }
-
   public boolean delete(Long id) {
     if (!repo.existsById(id)) return false;
     repo.deleteById(id);

package/src/templates/java-spring/partials/User.java.ejs

@@ -1,33 +1,20 @@
 // Auto-generated by create-backlist
 package <%= group %>.<%= projectName %>.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
-import lombok.*;
+import lombok.Data;
 
 @Data
-@NoArgsConstructor
-@AllArgsConstructor
 @Entity
-@Table(
-  name = "users",
-  indexes = {
-    @Index(name = "idx_users_email", columnList = "email", unique = true)
-  }
-)
+@Table(name="users")
 public class User {
-
-  @Id
-  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
   private Long id;
 
-  @Column(nullable = false)
   private String name;
 
-  @Column(nullable = false, unique = true)
+  @Column(unique = true)
   private String email;
 
-  @JsonIgnore
-  @Column(nullable = false)
   private String password;
 }

package/src/templates/java-spring/partials/UserDetailsServiceImpl.java.ejs

@@ -3,12 +3,12 @@ package <%= group %>.<%= projectName %>.security;
 
 import <%= group %>.<%= projectName %>.model.User;
 import <%= group %>.<%= projectName %>.repository.UserRepository;
-
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
-
 import org.springframework.stereotype.Service;
+import org.springframework.security.core.userdetails.User.UserBuilder;
+import org.springframework.security.core.userdetails.User.*;
 
 @Service
 public class UserDetailsServiceImpl implements UserDetailsService {
@@ -21,13 +21,7 @@ public class UserDetailsServiceImpl implements UserDetailsService {
 
   @Override
   public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException {
-    User u = repo.findByEmail(email)
-      .orElseThrow(() -> new UsernameNotFoundException("User not found: " + email));
-
-    return org.springframework.security.core.userdetails.User
-      .withUsername(u.getEmail())
-      .password(u.getPassword())
-      .authorities("ROLE_USER")
-      .build();
+    User u = repo.findByEmail(email).orElseThrow(() -> new UsernameNotFoundException("Not found"));
+    return withUsername(u.getEmail()).password(u.getPassword()).authorities("USER").build();
   }
 }

package/src/templates/java-spring/partials/UserRepository.java.ejs

@@ -2,19 +2,11 @@
 package <%= group %>.<%= projectName %>.repository;
 
 import java.util.Optional;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
-
 import <%= group %>.<%= projectName %>.model.User;
 
 @Repository
 public interface UserRepository extends JpaRepository<User, Long> {
-
   Optional<User> findByEmail(String email);
-
-  boolean existsByEmail(String email);
-
-  // Optional: helpful if emails are stored normalized but requests vary
-  Optional<User> findByEmailIgnoreCase(String email);
 }

package/src/templates/java-spring/partials/docker-compose.yml.ejs

@@ -1,5 +1,4 @@
-version: "3.8"
-
+version: '3.8'
 services:
   db:
     image: postgres:16-alpine
@@ -8,28 +7,21 @@ services:
       POSTGRES_PASSWORD: ${DB_PASSWORD:-password}
       POSTGRES_DB: ${DB_NAME:-<%= projectName %>}
     ports:
-      - "${DB_PORT:-5432}:5432"
+      - "5432:5432"
     volumes:
       - pgdata:/var/lib/postgresql/data
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${DB_USER:-postgres} -d ${DB_NAME:-<%= projectName %>}"]
-      interval: 5s
-      timeout: 5s
-      retries: 20
 
   app:
     build: .
     depends_on:
-      db:
-        condition: service_healthy
+      - db
     environment:
-      JWT_SECRET: ${JWT_SECRET:-change_me_long_secret_change_me_long_secret}
-      SPRING_DATASOURCE_URL: jdbc:postgresql://db:5432/${DB_NAME:-<%= projectName %>}
-      SPRING_DATASOURCE_USERNAME: ${DB_USER:-postgres}
-      SPRING_DATASOURCE_PASSWORD: ${DB_PASSWORD:-password}
-      SPRING_JPA_HIBERNATE_DDL_AUTO: ${JPA_DDL_AUTO:-update}
+      - JWT_SECRET=${JWT_SECRET:-change_me_long_secret}
+      - SPRING_DATASOURCE_URL=jdbc:postgresql://db:5432/${DB_NAME:-<%= projectName %>}
+      - SPRING_DATASOURCE_USERNAME=${DB_USER:-postgres}
+      - SPRING_DATASOURCE_PASSWORD=${DB_PASSWORD:-password}
     ports:
-      - "${APP_PORT:-8080}:8080"
+      - "8080:8080"
 
 volumes:
   pgdata:

package/src/templates/node-ts-express/base/server.ts

@@ -4,26 +4,19 @@ import dotenv from 'dotenv';
 
 dotenv.config();
 
-const app: Express = express();
+const app: Express = express(); // Added :Express type
 
 app.use(cors());
 app.use(express.json());
 
-app.get('/', (req: Request, res: Response) => {
+app.get('/', (req: Request, res: Response) => { // Added :Request and :Response types
   res.send('Node.js Backend says Hello! Generated by Backlist.');
 });
 
-// <backlist:imports>
-// </backlist:imports>
+// INJECT:ROUTES
 
-// <backlist:setup>
-// </backlist:setup>
-
-// <backlist:routes>
-// </backlist:routes>
-
-const PORT: number | string = process.env.PORT || 8000;
+const PORT: number | string = process.env.PORT || 8000; // Added type for PORT
 
 app.listen(PORT, () => {
-  console.log(`Server running on http://localhost:${PORT}`);
-});
+  console.log(`⚡️ Server running on http://localhost:${PORT}`);
+});

package/src/templates/node-ts-express/base/tsconfig.json

@@ -1,20 +1,10 @@
 {
   "compilerOptions": {
-    "target": "ES2021",
+    "target": "es6",
     "module": "commonjs",
-    "moduleResolution": "node",
     "rootDir": "./src",
     "outDir": "./dist",
-
     "esModuleInterop": true,
-    "strict": true,
-
-    "types": ["node"],
-    "resolveJsonModule": true,
-    "forceConsistentCasingInFileNames": true,
-    "skipLibCheck": true,
-
-    "sourceMap": true
-  },
-  "include": ["src/**/*"]
+    "strict": true
+  }
 }

package/src/templates/node-ts-express/partials/ApiDocs.ts.ejs

@@ -1,4 +1,4 @@
-// Auto-generated by create-backlist v5.1
+// Auto-generated by create-backlist v5.0
 import swaggerUi from 'swagger-ui-express';
 import swaggerJsdoc from 'swagger-jsdoc';
 import { Express } from 'express';
@@ -17,27 +17,17 @@ const options: swaggerJsdoc.Options = {
         description: 'Development server',
       },
     ],
-<% if (addAuth) { -%>
-    components: {
-      securitySchemes: {
-        bearerAuth: {
-          type: 'http',
-          scheme: 'bearer',
-          bearerFormat: 'JWT',
-        },
-      },
-    },
-    security: [{ bearerAuth: [] }],
-<% } -%>
+    // TODO: Add components (e.g., securitySchemes for JWT)
   },
-
-  // Scan all TS files (routes/controllers) for JSDoc @swagger comments
-  apis: ['./src/**/*.ts'],
+  // Path to the API docs
+  apis: ['./src/routes/*.ts', './src/routes.ts'], // Looks for JSDoc comments in routes
 };
 
 const swaggerSpec = swaggerJsdoc(options);
 
 export function setupSwagger(app: Express) {
   app.use('/api-docs', swaggerUi.serve, swaggerUi.setup(swaggerSpec));
-  console.log(`API documentation: http://localhost:<%= port %>/api-docs`);
+  console.log(
+    `📄 API documentation is available at http://localhost:<%= port %>/api-docs`
+  );
 }

package/src/templates/node-ts-express/partials/App.test.ts.ejs

@@ -1,61 +1,38 @@
-// Auto-generated by create-backlist v5.1
+// Auto-generated by create-backlist v5.0
 import request from 'supertest';
 import express from 'express';
-
-import apiRoutes from '../routes';
-
-<% if (addAuth) { -%>
-import authRoutes from '../routes/Auth.routes';
-<% } -%>
+// Import your main app configuration. This might need path adjustment.
+// For simplicity, we create a test server here.
+import apiRoutes from '../routes'; // Assuming main routes
+import authRoutes from '../routes/Auth.routes'; // Assuming auth routes
 
 const app = express();
 app.use(express.json());
-
-<% if (addAuth) { -%>
+app.use('/api', apiRoutes);
 app.use('/api/auth', authRoutes);
-<% } -%>
 
-app.use('/api', apiRoutes);
 
-describe('API Endpoints (Generated)', () => {
-  it('sanity check', () => {
+describe('API Endpoints', () => {
+
+  it('should respond to the root GET endpoint', async () => {
+    // This test assumes a GET /api/ endpoint exists or a similar public one.
+    // You might need to adjust this to a real endpoint from your app.
+    // Example for GET /api/users
+    // const res = await request(app).get('/api/users');
+    // expect(res.statusCode).toEqual(200);
+    
+    // For now, a placeholder test:
     expect(1 + 1).toBe(2);
   });
 
-  <% endpoints
-      .filter(ep => ep && ep.route && ep.method)
-      .forEach(ep => {
-        const method = String(ep.method).toLowerCase();
-
-        // ep.route might be "/api/..." or "/..."
-        const url = (String(ep.route).startsWith('/api/')
-          ? String(ep.route).replace(/^\/api/, '')
-          : String(ep.route)
-        )
-          // replace ":id" style params with dummy value
-          .replace(/:\w+/g, '1');
-  -%>
-  it('<%= ep.method %> <%= url %> should respond', async () => {
-    const req = request(app).<%= method %>('<%= '/api' + url %>');
-
-    <% if (['post','put','patch'].includes(method) && ep.schemaFields) { -%>
-    req.send(
-      <%- JSON.stringify(
-        Object.fromEntries(
-          Object.entries(ep.schemaFields).map(([k, t]) => [
-            k,
-            t === 'Number' ? 1 : (t === 'Boolean' ? true : 'test')
-          ])
-        )
-      ) %>
-    );
-    <% } -%>
-
-    const res = await req;
-
-    // We only assert "not 404" because generated handlers may be TODO stubs,
-    // and auth/validation may affect exact status codes.
-    expect(res.statusCode).not.toBe(404);
-  });
-  <% }) -%>
+  // TODO: Add more specific tests for your generated endpoints
+  // describe('POST /api/users', () => {
+  //   it('should create a new user', async () => {
+  //     const res = await request(app)
+  //       .post('/api/users')
+  //       .send({ name: 'Test User', email: 'test@example.com', password: 'password123' });
+  //     expect(res.statusCode).toEqual(201);
+  //     expect(res.body).toHaveProperty('name', 'Test User');
+  //   });
+  // });
 });