tina4-nodejs 3.10.63 → 3.10.65

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tina4-nodejs",
-  "version": "3.10.63",
+  "version": "3.10.65",
   "type": "module",
   "description": "Tina4 for Node.js/TypeScript — 54 built-in features, zero dependencies",
   "keywords": ["tina4", "framework", "web", "api", "orm", "graphql", "websocket", "typescript"],

package/packages/cli/src/bin.ts

@@ -133,10 +133,8 @@ async function main(): Promise<void> {
     }
     case "console": {
       const repl = await import("node:repl");
-      const { loadEnv } = await import("@tina4/core");
-      const { Router } = await import("@tina4/core");
-      const { initDatabase, Database } = await import("@tina4/orm");
-      const { Log } = await import("@tina4/core");
+      const { loadEnv, Router, Log } = await import("../../core/src/index.js");
+      const { initDatabase, Database } = await import("../../orm/src/index.js");
 
       loadEnv();
 

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

@@ -20,15 +20,15 @@ export async function runMigrations(migrationDir?: string): Promise<void> {
   }
 
   // Initialise the database so the adapter is available
-  let initDatabase: typeof import("@tina4/orm").initDatabase;
-  let ensureMigrationTable: typeof import("@tina4/orm").ensureMigrationTable;
-  let isMigrationApplied: typeof import("@tina4/orm").isMigrationApplied;
-  let recordMigration: typeof import("@tina4/orm").recordMigration;
-  let getNextBatch: typeof import("@tina4/orm").getNextBatch;
-  let getAdapter: typeof import("@tina4/orm").getAdapter;
+  let initDatabase: typeof import("../../../orm/src/index.js").initDatabase;
+  let ensureMigrationTable: typeof import("../../../orm/src/index.js").ensureMigrationTable;
+  let isMigrationApplied: typeof import("../../../orm/src/index.js").isMigrationApplied;
+  let recordMigration: typeof import("../../../orm/src/index.js").recordMigration;
+  let getNextBatch: typeof import("../../../orm/src/index.js").getNextBatch;
+  let getAdapter: typeof import("../../../orm/src/index.js").getAdapter;
 
   try {
-    const orm = await import("@tina4/orm");
+    const orm = await import("../../../orm/src/index.js");
     initDatabase = orm.initDatabase;
     ensureMigrationTable = orm.ensureMigrationTable;
     isMigrationApplied = orm.isMigrationApplied;

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

@@ -13,13 +13,13 @@ import { resolve } from "node:path";
 export async function migrateRollback(migrationDir?: string): Promise<void> {
   const dir = resolve(migrationDir ?? "migrations");
 
-  let initDatabase: typeof import("@tina4/orm").initDatabase;
-  let ensureMigrationTable: typeof import("@tina4/orm").ensureMigrationTable;
-  let rollbackFn: typeof import("@tina4/orm").rollback;
-  let getLastBatchMigrations: typeof import("@tina4/orm").getLastBatchMigrations;
+  let initDatabase: typeof import("../../../orm/src/index.js").initDatabase;
+  let ensureMigrationTable: typeof import("../../../orm/src/index.js").ensureMigrationTable;
+  let rollbackFn: typeof import("../../../orm/src/index.js").rollback;
+  let getLastBatchMigrations: typeof import("../../../orm/src/index.js").getLastBatchMigrations;
 
   try {
-    const orm = await import("@tina4/orm");
+    const orm = await import("../../../orm/src/index.js");
     initDatabase = orm.initDatabase;
     ensureMigrationTable = orm.ensureMigrationTable;
     rollbackFn = orm.rollback;

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

@@ -10,12 +10,12 @@ import { resolve } from "node:path";
 export async function migrateStatus(migrationDir?: string): Promise<void> {
   const dir = resolve(migrationDir ?? "migrations");
 
-  let initDatabase: typeof import("@tina4/orm").initDatabase;
-  let ensureMigrationTable: typeof import("@tina4/orm").ensureMigrationTable;
-  let statusFn: typeof import("@tina4/orm").status;
+  let initDatabase: typeof import("../../../orm/src/index.js").initDatabase;
+  let ensureMigrationTable: typeof import("../../../orm/src/index.js").ensureMigrationTable;
+  let statusFn: typeof import("../../../orm/src/index.js").status;
 
   try {
-    const orm = await import("@tina4/orm");
+    const orm = await import("../../../orm/src/index.js");
     initDatabase = orm.initDatabase;
     ensureMigrationTable = orm.ensureMigrationTable;
     statusFn = orm.status;

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

@@ -14,10 +14,10 @@ export async function listRoutes(): Promise<void> {
     process.exit(1);
   }
 
-  let discoverRoutes: typeof import("@tina4/core").discoverRoutes;
+  let discoverRoutes: typeof import("../../../core/src/index.js").discoverRoutes;
 
   try {
-    const core = await import("@tina4/core");
+    const core = await import("../../../core/src/index.js");
     discoverRoutes = core.discoverRoutes;
   } catch {
     console.error("  Error: @tina4/core is required to list routes.");

package/packages/core/src/metrics.ts

@@ -50,22 +50,71 @@ function readFileSafe(filePath: string): string | null {
   }
 }
 
-function relativePath(filePath: string): string {
-  return path.relative(".", filePath);
+function relativePath(filePath: string, root: string = "."): string {
+  return path.relative(root, filePath);
 }
 
 // ── Test file detection ─────────────────────────────────────
 
 function hasMatchingTest(relPath: string): boolean {
-  const name = relPath.split('/').pop()?.replace('.ts', '').replace('.js', '') || '';
-  const patterns = [
-    `test/${name}.test.ts`,
-    `test/${name}.test.js`,
-    `${relPath.replace('.ts', '.test.ts').replace('.js', '.test.js')}`,
-    `tests/${name}.test.ts`,
-    `spec/${name}.spec.ts`,
-  ];
-  return patterns.some(p => fs.existsSync(p));
+  const parts = relPath.split('/');
+  const basename = parts[parts.length - 1] || '';
+  const name = basename.replace(/\.(ts|js)$/, '');
+  // Parent directory name (e.g. "adapters" from "adapters/sqlite.ts")
+  const parentModule = parts.length > 1 ? parts[parts.length - 2] : '';
+
+  // Stage 1: Filename matching — name.test, name.spec, test_name patterns
+  const testDirs = ['test', 'tests', 'spec'];
+  for (const td of testDirs) {
+    const patterns = [
+      `${td}/${name}.test.ts`,
+      `${td}/${name}.test.js`,
+      `${td}/${name}.spec.ts`,
+      `${td}/${name}.spec.js`,
+      // Also check parent-named tests (test/database.test.ts covers adapters/sqlite.ts)
+      ...(parentModule && parentModule !== name ? [
+        `${td}/${parentModule}.test.ts`,
+        `${td}/${parentModule}.test.js`,
+        `${td}/${parentModule}.spec.ts`,
+      ] : []),
+    ];
+    if (patterns.some(p => fs.existsSync(p))) {
+      return true;
+    }
+  }
+
+  // Build the module import path for content matching
+  // e.g. "packages/core/src/metrics.ts" → "metrics" or "src/metrics"
+  const pathWithoutExt = relPath.replace(/\.(ts|js)$/, '');
+  // Build CamelCase class name from camelCase/kebab module name
+  // e.g. "sqlTranslation" → "SqlTranslation", "sql-translation" → "SqlTranslation"
+  const className = name
+    .replace(/[-_](.)/g, (_, c: string) => c.toUpperCase())
+    .replace(/^(.)/, (_, c: string) => c.toUpperCase());
+
+  // Stage 2+3: Content scan — check if any test file imports or references this module
+  for (const td of testDirs) {
+    if (!fs.existsSync(td)) continue;
+    const testFiles = walkFiles(td, ['.ts', '.js']);
+    for (const testFile of testFiles) {
+      const content = readFileSafe(testFile);
+      if (content === null) continue;
+      // Stage 2: import path matching
+      if (content.includes(name) && (
+        content.includes(`"${name}"`) || content.includes(`'${name}'`) ||
+        content.includes(`/${name}"`) || content.includes(`/${name}'`) ||
+        content.includes(pathWithoutExt)
+      )) {
+        return true;
+      }
+      // Stage 3: class name mention
+      if (className !== name && new RegExp(`\\b${className.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\b`).test(content)) {
+        return true;
+      }
+    }
+  }
+
+  return false;
 }
 
 // ── Line counting ────────────────────────────────────────────
@@ -192,7 +241,7 @@ interface FunctionInfo {
   file?: string;
 }
 
-function extractFunctions(source: string, filePath: string): FunctionInfo[] {
+function extractFunctions(source: string, filePath: string, root: string = "."): FunctionInfo[] {
   const functions: FunctionInfo[] = [];
   const lines = source.split("\n");
 
@@ -268,7 +317,7 @@ function extractFunctions(source: string, filePath: string): FunctionInfo[] {
           complexity,
           loc: funcLoc,
           args,
-          file: relativePath(filePath),
+          file: relativePath(filePath, root),
         });
 
         break; // Only match first pattern per line
@@ -590,7 +639,7 @@ export function quickMetrics(root: string = "src"): Record<string, any> {
     totalFunctions += functions;
 
     fileDetails.push({
-      path: relativePath(f),
+      path: relativePath(f, rootPath),
       loc: counts.loc,
       blank: counts.blank,
       comment: counts.comment,
@@ -704,7 +753,7 @@ export function fullAnalysis(root: string = "src"): Record<string, any> {
     const source = readFileSafe(f);
     if (source === null) continue;
 
-    const relPath = relativePath(f);
+    const relPath = relativePath(f, rootPath);
     const lines = source.split("\n");
     const loc = lines.filter(
       (l) => l.trim() && !l.trim().startsWith("//")
@@ -722,7 +771,7 @@ export function fullAnalysis(root: string = "src"): Record<string, any> {
     }
 
     // Analyze functions/methods
-    const fileFunctions = extractFunctions(source, f);
+    const fileFunctions = extractFunctions(source, f, rootPath);
     let fileComplexity = 0;
 
     for (const func of fileFunctions) {