@tikoci/rosetta 0.8.3 → 0.8.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tikoci/rosetta",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "RouterOS documentation as SQLite FTS5 — RAG search + command glossary via MCP",
   "type": "module",
   "license": "MIT",

package/src/browse.ts

@@ -31,6 +31,7 @@ import {
   browseCommands,
   browseCommandsAtVersion,
   checkCommandVersions,
+  compareVersions,
   diffCommandVersions,
   fetchCurrentVersions,
   getDudePage,
@@ -1966,7 +1967,13 @@ async function doSearchChangelogs(query: string): Promise<void> {
     if (part.toLowerCase() === "breaking") { breakingOnly = true; continue; }
     // Version range: "7.20..7.22"
     const rangeMatch = part.match(/^(\d+\.\d+[.\w]*)\.\.(\d+\.\d+[.\w]*)$/);
-    if (rangeMatch) { fromVersion = rangeMatch[1]; toVersion = rangeMatch[2]; continue; }
+    if (rangeMatch) {
+      const [a, b] = [rangeMatch[1], rangeMatch[2]];
+      // Normalise: always put the lower version first
+      if (compareVersions(a, b) <= 0) { fromVersion = a; toVersion = b; }
+      else { fromVersion = b; toVersion = a; }
+      continue;
+    }
     // Single version: "7.22"
     if (/^\d+\.\d+/.test(part)) { version = part; continue; }
     searchTerms.push(part);
@@ -1979,6 +1986,8 @@ async function doSearchChangelogs(query: string): Promise<void> {
     version,
     fromVersion,
     toVersion,
+    inclusiveFrom: fromVersion !== undefined, // X..Y range is [X, Y] inclusive on both ends
+    sortAscending: fromVersion !== undefined,  // range queries read chronologically (oldest first)
     category,
     breakingOnly,
     limit: 50,

package/src/query.ts

@@ -1852,6 +1852,7 @@ export type ChangelogResult = {
   is_breaking: number;
   description: string;
   excerpt: string;
+  sort_order: number;
 };
 
 /** Get all versions that have changelog data, sorted numerically. */
@@ -1862,14 +1863,22 @@ function getChangelogVersions(): string[] {
   return rows.map((r) => r.version).sort(compareVersions);
 }
 
-/** Filter versions to those within (fromVersion, toVersion] range (fromVersion exclusive, toVersion inclusive). */
+/**
+ * Filter versions to those within a range.
+ * Default: (fromVersion, toVersion] — fromVersion exclusive, toVersion inclusive.
+ * Pass inclusiveFrom=true for [fromVersion, toVersion] (both ends inclusive).
+ */
 function filterVersionRange(
   versions: string[],
   fromVersion?: string,
   toVersion?: string,
+  inclusiveFrom = false,
 ): string[] {
   return versions.filter((v) => {
-    if (fromVersion && compareVersions(v, fromVersion) <= 0) return false;
+    if (fromVersion) {
+      const cmp = compareVersions(v, fromVersion);
+      if (inclusiveFrom ? cmp < 0 : cmp <= 0) return false;
+    }
     if (toVersion && compareVersions(v, toVersion) > 0) return false;
     return true;
   });
@@ -1882,6 +1891,8 @@ export function searchChangelogs(
     version?: string;
     fromVersion?: string;
     toVersion?: string;
+    inclusiveFrom?: boolean;
+    sortAscending?: boolean;
     category?: string;
     breakingOnly?: boolean;
     limit?: number;
@@ -1896,23 +1907,30 @@ export function searchChangelogs(
     versionList = [options.version];
   } else if (options.fromVersion || options.toVersion) {
     const all = getChangelogVersions();
-    versionList = filterVersionRange(all, options.fromVersion, options.toVersion);
+    versionList = filterVersionRange(all, options.fromVersion, options.toVersion, options.inclusiveFrom);
     if (versionList.length === 0) return [];
   }
 
+  let results: ChangelogResult[];
+
   // No FTS query — browse by filters only
   if (terms.length === 0) {
-    return browseChangelogs(versionList, options.category, options.breakingOnly, limit);
-  }
+    results = browseChangelogs(versionList, options.category, options.breakingOnly, limit);
+  } else {
+    // FTS search with AND, then fallback to OR
+    let ftsQuery = buildFtsQuery(terms, "AND");
+    if (!ftsQuery) return [];
+    results = runChangelogFtsQuery(ftsQuery, versionList, options.category, options.breakingOnly, limit);
 
-  // FTS search with AND, then fallback to OR
-  let ftsQuery = buildFtsQuery(terms, "AND");
-  if (!ftsQuery) return [];
-  let results = runChangelogFtsQuery(ftsQuery, versionList, options.category, options.breakingOnly, limit);
+    if (results.length === 0 && terms.length > 1) {
+      ftsQuery = buildFtsQuery(terms, "OR");
+      results = runChangelogFtsQuery(ftsQuery, versionList, options.category, options.breakingOnly, limit);
+    }
+  }
 
-  if (results.length === 0 && terms.length > 1) {
-    ftsQuery = buildFtsQuery(terms, "OR");
-    results = runChangelogFtsQuery(ftsQuery, versionList, options.category, options.breakingOnly, limit);
+  // Re-sort by version when caller wants chronological order (oldest first)
+  if (options.sortAscending) {
+    results.sort((a, b) => compareVersions(a.version, b.version) || a.sort_order - b.sort_order);
   }
 
   return results;
@@ -1946,7 +1964,7 @@ function browseChangelogs(
   }
 
   const sql = `SELECT c.version, c.released, c.category, c.is_breaking,
-      c.description, substr(c.description, 1, 200) as excerpt
+      c.description, substr(c.description, 1, 200) as excerpt, c.sort_order
     FROM changelogs c
     WHERE ${where.join(" AND ")}
     ORDER BY c.sort_order
@@ -1982,7 +2000,7 @@ function runChangelogFtsQuery(
     }
 
     const sql = `SELECT c.version, c.released, c.category, c.is_breaking,
-        c.description,
+        c.description, c.sort_order,
         snippet(changelogs_fts, 1, '**', '**', '...', 25) as excerpt
       FROM changelogs_fts fts
       JOIN changelogs c ON c.id = fts.rowid