langaro-api 1.0.8 → 1.1.0

package/lib/cli/init.js

@@ -320,6 +320,7 @@ require('dotenv').config({
 });
 
 const Sentry = require('@/config/instrument');
+const RedisCache = require('@/database/redis-cache');
 const express = require('express');
 const cors = require('cors');
 const morgan = require('morgan');
@@ -434,7 +435,7 @@ class App {
       if (userId) { socket.join(userId); }
     });
 
-    const { models } = await loadModels(this.knex);
+    const { models } = await loadModels(this.knex, undefined, { redis: RedisCache.redis });
     const services = this.services || loadServices(models, io);
 
     const Queue = await this.queues(services, io);

package/lib/cli/migrate.js

@@ -79,7 +79,7 @@ function run() {
     console.log('');
     console.log('  With:');
     console.log("    \x1b[32m+ const { loadModels, loadServices, loadControllers, attachRouters, loadTasks } = require('langaro-api');\x1b[0m");
-    console.log('    \x1b[32m+ const { models } = await loadModels(this.knex);\x1b[0m');
+    console.log('    \x1b[32m+ const { models } = await loadModels(this.knex, undefined, { redis: RedisCache.redis });\x1b[0m');
     console.log('    \x1b[32m+ const services = this.services || loadServices(models, io);\x1b[0m');
     console.log('    \x1b[32m+ const controllers = loadControllers(services, Queue, io);\x1b[0m');
     console.log('    \x1b[32m+ loadTasks(services, Queue);\x1b[0m');

package/lib/generators/crud.js

@@ -149,6 +149,8 @@ module.exports = function generateCrudDts(projectRoot, outputDir) {
   lines.push('  enableCache(): void;');
   addMethodMapping(lines, 'setCacheTimeout');
   lines.push('  setCacheTimeout(timeout: number): void;');
+  addMethodMapping(lines, 'clearQueryCache');
+  lines.push('  clearQueryCache(): Promise<void>;');
   lines.push('}');
   lines.push('');
 
@@ -169,6 +171,10 @@ module.exports = function generateCrudDts(projectRoot, outputDir) {
     '  sortBy?: string;',
     "  sort?: 'asc' | 'desc';",
     '  where?: (query: any) => any;',
+    '  /** Attempt to read from Redis cache (default: false) */',
+    '  cache?: boolean;',
+    '  /** Write result to Redis cache with this TTL in seconds */',
+    '  cacheTime?: number;',
     '  [key: string]: any;',
     '}',
     '',
@@ -178,6 +184,8 @@ module.exports = function generateCrudDts(projectRoot, outputDir) {
     '  where?: (query: any) => any;',
     '  andWhere?: Array<[string, string, any]>;',
     '  whenSuccess?: (data: any) => void;',
+    '  /** Skip automatic Redis query cache invalidation */',
+    '  skipCacheInvalidation?: boolean;',
     '  [key: string]: any;',
     '}',
     '',
@@ -190,6 +198,8 @@ module.exports = function generateCrudDts(projectRoot, outputDir) {
     'declare interface CRUDDeleteOptions {',
     '  where?: (query: any) => any;',
     '  andWhere?: Array<[string, string, any]>;',
+    '  /** Skip automatic Redis query cache invalidation */',
+    '  skipCacheInvalidation?: boolean;',
     '  [key: string]: any;',
     '}',
     '',

package/lib/inject.js

@@ -5,6 +5,12 @@ const { scanControllerEntries } = require('./generators/controllers');
 
 function injectJSDoc(filePath, jsdocComment, targetLineRegex) {
   const content = fs.readFileSync(filePath, 'utf8');
+
+  // Quick check: if target pattern not in file, skip parsing
+  if (!targetLineRegex.test(content)) return false;
+  // Reset regex lastIndex after test
+  targetLineRegex.lastIndex = 0;
+
   const lines = content.split('\n');
 
   const targetIdx = lines.findIndex((line) => targetLineRegex.test(line));
@@ -27,7 +33,9 @@ function injectJSDoc(filePath, jsdocComment, targetLineRegex) {
     lines.splice(targetIdx, 0, jsdocComment);
   }
 
-  fs.writeFileSync(filePath, lines.join('\n'));
+  const newContent = lines.join('\n');
+  if (newContent === content) return true; // no changes needed
+  fs.writeFileSync(filePath, newContent);
   return true;
 }
 

package/lib/loaders/models.js

@@ -3,9 +3,10 @@ const path = require('path');
 
 const query = 'SELECT table_name FROM information_schema.tables WHERE table_schema = ?';
 
-module.exports = async function loadModels(knexInstance, modelsDir) {
+module.exports = async function loadModels(knexInstance, modelsDir, extraConfig) {
   const dir = modelsDir || path.resolve(process.cwd(), 'src/database/models');
   const bindings = [knexInstance.client.database()];
+  const redis = extraConfig && extraConfig.redis ? extraConfig.redis : null;
 
   const results = await knexInstance.raw(query, bindings);
   const tableNames = results[0].map((row) => row.TABLE_NAME);
@@ -29,6 +30,7 @@ module.exports = async function loadModels(knexInstance, modelsDir) {
           table,
           ...modelConfig,
           modelsPath: dir.split(process.cwd())[1],
+          redis,
         });
       }
     };

package/lib/sourcemap.js

@@ -28,12 +28,12 @@ function generateSourceMap(generatedFile, sources, mappings) {
   let prevSourceLine = 0;
   let prevSourceCol = 0;
 
-  const lineSegments = [];
+  const lineSegments = []; // each element is an array of segment strings
 
   sorted.forEach((m) => {
-    // Fill empty lines with ;
+    // Fill empty lines
     while (prevGenLine < m.genLine) {
-      lineSegments.push('');
+      lineSegments.push([]);
       prevGenLine++;
     }
 
@@ -45,10 +45,9 @@ function generateSourceMap(generatedFile, sources, mappings) {
 
     // Append to current line
     if (lineSegments.length === 0 || prevGenLine > lineSegments.length - 1) {
-      lineSegments.push(segment);
+      lineSegments.push([segment]);
     } else {
-      const existing = lineSegments[lineSegments.length - 1];
-      lineSegments[lineSegments.length - 1] = existing ? existing + ',' + segment : segment;
+      lineSegments[lineSegments.length - 1].push(segment);
     }
 
     prevSourceIndex = m.sourceIndex;
@@ -60,7 +59,7 @@ function generateSourceMap(generatedFile, sources, mappings) {
     version: 3,
     file: generatedFile,
     sources,
-    mappings: lineSegments.join(';'),
+    mappings: lineSegments.map((segs) => segs.join(',')).join(';'),
   });
 }
 

package/lib/utils.js

@@ -31,6 +31,24 @@ function extractMethods(filePath) {
 
 function extractMethodsWithLocations(filePath) {
   const content = fs.readFileSync(filePath, 'utf8');
+  const contentLines = content.split('\n');
+
+  // Pre-compute line start offsets for O(1) line lookup by character index
+  const lineOffsets = [0];
+  for (let i = 0; i < content.length; i++) {
+    if (content[i] === '\n') lineOffsets.push(i + 1);
+  }
+
+  function getLineFromOffset(offset) {
+    let lo = 0;
+    let hi = lineOffsets.length - 1;
+    while (lo < hi) {
+      const mid = (lo + hi + 1) >> 1;
+      if (lineOffsets[mid] <= offset) lo = mid;
+      else hi = mid - 1;
+    }
+    return lo;
+  }
 
   const patterns = [
     /^\s+(?:async\s+)?([a-zA-Z_$][a-zA-Z0-9_$]*)\s*\([^)]*\)\s*\{/gm,
@@ -47,9 +65,8 @@ function extractMethodsWithLocations(filePath) {
       if (name === 'constructor' || name.startsWith('_') || JS_RESERVED.has(name)) return;
       if (seen.has(name)) return;
       seen.add(name);
-      const line = content.substring(0, m.index).split('\n').length - 1;
-      const lineText = content.split('\n')[line];
-      const col = lineText.indexOf(name);
+      const line = getLineFromOffset(m.index);
+      const col = contentLines[line].indexOf(name);
       results.push({ name, line, col: col >= 0 ? col : 0 });
     });
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "langaro-api",
-  "version": "1.0.8",
+  "version": "1.1.0",
   "description": "Auto-generate TypeScript types, JSDoc annotations, and boilerplate loaders for knex-extended-crud projects",
   "main": "lib/index.js",
   "bin": {
@@ -22,7 +22,7 @@
   ],
   "peerDependencies": {
     "cron": ">=3.0.0",
-    "knex-extended-crud": ">=2.0.31"
+    "knex-extended-crud": ">=2.0.34"
   },
   "peerDependenciesMeta": {
     "cron": {