tina4-nodejs 3.5.0 → 3.6.0

package/README.md

@@ -371,7 +371,7 @@ export default class User {
     };
 }
 
-// Auto-generates: GET/POST /api/users, GET/PUT/DELETE /api/users/:id
+// Auto-generates: GET/POST /api/users, GET/PUT/DELETE /api/users/{id}
 // With filtering, sorting, pagination, and validation built in
 ```
 
@@ -409,10 +409,10 @@ get("/protected", async (request, response) => {
 ### JWT Authentication
 
 ```typescript
-import { createToken, validateToken } from "tina4-nodejs";
+import { getToken, validToken } from "tina4-nodejs";
 
-const token = createToken({userId: 42}, "your-secret");
-const payload = validateToken(token, "your-secret");
+const token = getToken({userId: 42}, "your-secret");
+const payload = validToken(token, "your-secret");
 ```
 
 POST/PUT/PATCH/DELETE routes require `Authorization: Bearer <token>` by default. Use `noauth()` to make public, `secured()` to protect GET routes.
@@ -643,7 +643,7 @@ DATABASE_USERNAME=admin              # Separate credentials for networked databa
 DATABASE_PASSWORD=secret
 TINA4_DEBUG=true                     # Enable dev toolbar, error overlay
 TINA4_LOG_LEVEL=ALL                  # ALL, DEBUG, INFO, WARNING, ERROR
-TINA4_LANGUAGE=en                    # en, fr, af, zh, ja, es
+TINA4_LOCALE=en                      # en, fr, af, zh, ja, es
 TINA4_SESSION_HANDLER=SessionFileHandler
 SWAGGER_TITLE=My API
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tina4-nodejs",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "type": "module",
   "description": "This is not a framework. Tina4 for Node.js/TypeScript — zero deps, 38 built-in features.",
   "keywords": ["tina4", "framework", "web", "api", "orm", "graphql", "websocket", "typescript"],

package/packages/cli/src/commands/serve.ts

@@ -10,11 +10,12 @@ export async function serveProject(options: ServeOptions): Promise<void> {
   const cwd = process.cwd();
 
   const routesDir = resolve(cwd, "src/routes");
+  const ormDir = resolve(cwd, "src/orm");
   const modelsDir = resolve(cwd, "src/models");
   const templatesDir = resolve(cwd, "src/templates");
   const staticDir = resolve(cwd, "public");
 
-  if (!existsSync(routesDir) && !existsSync(modelsDir)) {
+  if (!existsSync(routesDir) && !existsSync(modelsDir) && !existsSync(ormDir)) {
     console.error("  Error: Not a Tina4 project. Run this from a project created with 'tina4 init'.");
     process.exit(1);
   }
@@ -31,7 +32,8 @@ export async function serveProject(options: ServeOptions): Promise<void> {
   });
 
   // Watch for file changes and reload routes
-  const watcher = watchForChanges([routesDir, modelsDir, templatesDir], async () => {
+  const watchDirs = [routesDir, ormDir, modelsDir, templatesDir].filter((d) => existsSync(d));
+  const watcher = watchForChanges(watchDirs, async () => {
     try {
       const { discoverRoutes } = await import("@tina4/core");
       const routes = await discoverRoutes(routesDir);

package/packages/core/src/server.ts

@@ -383,6 +383,7 @@ ${reset}
   const base = config?.basePath ? resolve(config.basePath) : process.cwd();
   const routesDir = resolve(base, config?.routesDir ?? "src/routes");
   const modelsDir = resolve(base, config?.modelsDir ?? "src/models");
+  const ormDir = resolve(base, "src/orm");
   const staticDir = resolve(base, config?.staticDir ?? "public");
   const templatesDir = resolve(base, config?.templatesDir ?? "src/templates");
 
@@ -429,8 +430,10 @@ ${reset}
     console.log(`\n  No routes directory found at ${routesDir}`);
   }
 
-  // Initialize ORM if models directory exists
-  if (existsSync(modelsDir)) {
+  // Initialize ORM if models directory exists (check src/orm/ first, then src/models/)
+  const hasOrmDir = existsSync(ormDir);
+  const hasModelsDir = existsSync(modelsDir);
+  if (hasOrmDir || hasModelsDir) {
     try {
       const orm = await import("@tina4/orm");
       const dbConfig = config?.database ?? {};
@@ -439,7 +442,18 @@ ${reset}
         path: dbConfig.path ?? "./data/tina4.db",
       });
 
-      const models = await orm.discoverModels(modelsDir);
+      // Discover from src/orm/ (primary) and src/models/ (fallback), merge results
+      let models = hasOrmDir ? await orm.discoverModels(ormDir) : [];
+      if (hasModelsDir) {
+        const extraModels = await orm.discoverModels(modelsDir);
+        // Only add models not already discovered (src/orm/ takes priority)
+        const existingTables = new Set(models.map((m: any) => m.definition.tableName));
+        for (const m of extraModels) {
+          if (!existingTables.has(m.definition.tableName)) {
+            models.push(m);
+          }
+        }
+      }
       if (models.length > 0) {
         console.log(`\n  Models discovered:`);
         orm.syncModels(models);
@@ -476,9 +490,16 @@ ${reset}
     let modelDefs: Array<{ tableName: string; fields: Record<string, unknown> }> = [];
     try {
       const orm = await import("@tina4/orm");
-      if (existsSync(modelsDir)) {
-        const models = await orm.discoverModels(modelsDir);
-        modelDefs = models.map((m) => m.definition);
+      const allModelDirs = [ormDir, modelsDir].filter((d) => existsSync(d));
+      const seenTables = new Set<string>();
+      for (const dir of allModelDirs) {
+        const discovered = await orm.discoverModels(dir);
+        for (const m of discovered) {
+          if (!seenTables.has(m.definition.tableName)) {
+            modelDefs.push(m.definition);
+            seenTables.add(m.definition.tableName);
+          }
+        }
       }
     } catch {
       // ORM not available, swagger will work without model schemas