gitnexus 1.6.6-rc.151 → 1.6.6-rc.152

package/dist/core/group/extractors/http-patterns/java.js

@@ -335,6 +335,19 @@ function joinPath(prefix, methodPath) {
         return `/${cleanSub}`;
     return `/${cleanPrefix}/${cleanSub}`;
 }
+function joinInheritedSpringPath(controllerPrefix, inheritedPath, inheritedOwnerPrefix = '') {
+    const joined = joinPath(controllerPrefix, inheritedPath);
+    const cleanPrefix = controllerPrefix.replace(/^\/+/, '').replace(/\/+$/, '');
+    const cleanOwnerPrefix = inheritedOwnerPrefix.replace(/^\/+/, '').replace(/\/+$/, '');
+    const cleanInherited = inheritedPath.replace(/^\/+/, '');
+    if (!cleanPrefix)
+        return joined;
+    if (cleanPrefix === cleanOwnerPrefix &&
+        (cleanInherited === cleanPrefix || cleanInherited.startsWith(`${cleanPrefix}/`))) {
+        return `/${cleanInherited}`;
+    }
+    return joined;
+}
 function getNodeName(node) {
     return node.childForFieldName('name')?.text ?? null;
 }
@@ -543,6 +556,7 @@ function scanSpringProject(files) {
             const routes = method.routes.map((route) => ({
                 method: route.method,
                 path: type.classPrefix ? joinPath(type.classPrefix, route.path) : route.path,
+                ownerPrefix: type.classPrefix,
             }));
             if (routes.length > 0)
                 methodMap.set(method.name, routes);
@@ -563,7 +577,7 @@ function scanSpringProject(files) {
                 const routes = routeMap.get(method.name) ?? [];
                 return routes.map((route) => ({
                     method: route.method,
-                    path: joinPath(type.classPrefix, route.path),
+                    path: joinInheritedSpringPath(type.classPrefix, route.path, route.ownerPrefix),
                 }));
             });
             for (const route of inheritedRoutes) {

package/dist/core/ingestion/languages/vue/captures.d.ts

@@ -27,11 +27,11 @@ import type { CaptureMatch } from '../../../../_shared/index.js';
  *   1. **Full SFC content** (sequential path, <15 files): `sourceText`
  *      contains the whole `.vue` file with `<template>`, `<script>`, etc.
  *      `extractVueScript` extracts the script block and we delegate to
- *      `emitTsScopeCaptures` with that extracted content.
+ *      `emitTsScopeCaptures` or `emitJsScopeCaptures` based on `lang`.
  *
  *   2. **Already-extracted script content** (worker-mode path, ≥15 files):
  *      the parse worker calls `extractVueScript` itself before calling
- *      `extractParsedFile`, so `sourceText` is already the bare TypeScript
+ *      `extractParsedFile`, so `sourceText` is already the bare script
  *      text with no `<script>` tags. The caller marks this explicitly via
  *      `sourceMeta.sourceKind === 'pre-extracted-script'`.
  *
@@ -42,4 +42,5 @@ import type { CaptureMatch } from '../../../../_shared/index.js';
  */
 export declare function emitVueScopeCaptures(sourceText: string, filePath: string, cachedTree?: unknown, sourceMeta?: {
     sourceKind?: 'full-file' | 'pre-extracted-script';
+    setupLang?: string;
 }): readonly CaptureMatch[];

package/dist/core/ingestion/languages/vue/captures.js

@@ -20,6 +20,7 @@
  */
 import { extractVueScript } from '../../vue-sfc-extractor.js';
 import { emitTsScopeCaptures } from '../typescript/captures.js';
+import { emitJsScopeCaptures } from '../javascript/captures.js';
 /**
  * Emit scope captures for a Vue SFC.
  *
@@ -28,11 +29,11 @@ import { emitTsScopeCaptures } from '../typescript/captures.js';
  *   1. **Full SFC content** (sequential path, <15 files): `sourceText`
  *      contains the whole `.vue` file with `<template>`, `<script>`, etc.
  *      `extractVueScript` extracts the script block and we delegate to
- *      `emitTsScopeCaptures` with that extracted content.
+ *      `emitTsScopeCaptures` or `emitJsScopeCaptures` based on `lang`.
  *
  *   2. **Already-extracted script content** (worker-mode path, ≥15 files):
  *      the parse worker calls `extractVueScript` itself before calling
- *      `extractParsedFile`, so `sourceText` is already the bare TypeScript
+ *      `extractParsedFile`, so `sourceText` is already the bare script
  *      text with no `<script>` tags. The caller marks this explicitly via
  *      `sourceMeta.sourceKind === 'pre-extracted-script'`.
  *
@@ -49,10 +50,18 @@ export function emitVueScopeCaptures(sourceText, filePath, cachedTree, sourceMet
         return emitTsScopeCaptures(sourceText, filePath, cachedTree);
     }
     if (sourceMeta?.sourceKind === 'pre-extracted-script') {
+        // Worker-mode path: the parse worker always uses TypeScript grammar for
+        // .vue files. Lang-based grammar selection is a sequential-path feature.
         return emitTsScopeCaptures(sourceText, filePath, cachedTree);
     }
     const extracted = extractVueScript(sourceText);
     if (extracted === null)
         return [];
+    // Select captures based on script lang attribute.
+    // Use TS grammar unless ALL blocks explicitly request JS/JSX.
+    // Mixed-lang: TS handles JS natively; JS grammar chokes on TS syntax.
+    if (extracted.lang === 'js' || extracted.lang === 'jsx') {
+        return emitJsScopeCaptures(extracted.scriptContent, filePath, cachedTree);
+    }
     return emitTsScopeCaptures(extracted.scriptContent, filePath, cachedTree);
 }

package/dist/core/ingestion/vue-sfc-extractor.d.ts

@@ -9,19 +9,20 @@
 export interface VueScriptExtraction {
     /** Extracted script content (TypeScript/JavaScript) */
     scriptContent: string;
-    /** 0-based line number in the .vue file where the script content starts */
+    /** 1-based line number in the .vue file where the script content starts
+     * (used as offset from tree-sitter's 0-based row). */
     lineOffset: number;
-    /** true if the primary block is <script setup> */
+    /** true if at least one block is <script setup> */
     isSetup: boolean;
+    /** Value of the `lang` attribute on the extracted script block (e.g. "ts", "js", "tsx", "jsx", or "" for default). */
+    lang: string;
 }
 /**
  * Extract script content from a Vue SFC.
  *
- * When both <script> and <script setup> are present, returns only the
- * <script setup> block (the dominant pattern — 94% of Vue files in real
- * projects use setup). The <script> (non-setup) block typically contains
- * only `defineOptions` or legacy option merges and is less important for
- * the knowledge graph.
+ * When both <script> and <script setup> are present, the content of all
+ * blocks is combined (non-setup first, then setup) so the full script
+ * surface is available to the knowledge graph.
  */
 export declare function extractVueScript(vueContent: string): VueScriptExtraction | null;
 /**

package/dist/core/ingestion/vue-sfc-extractor.js

@@ -210,11 +210,9 @@ function parseScriptBlock(attrs, content, precedingText) {
 /**
  * Extract script content from a Vue SFC.
  *
- * When both <script> and <script setup> are present, returns only the
- * <script setup> block (the dominant pattern — 94% of Vue files in real
- * projects use setup). The <script> (non-setup) block typically contains
- * only `defineOptions` or legacy option merges and is less important for
- * the knowledge graph.
+ * When both <script> and <script setup> are present, the content of all
+ * blocks is combined (non-setup first, then setup) so the full script
+ * surface is available to the knowledge graph.
  */
 export function extractVueScript(vueContent) {
     const blocks = [];
@@ -227,13 +225,21 @@ export function extractVueScript(vueContent) {
     }
     if (blocks.length === 0)
         return null;
-    // Prefer <script setup> if present
-    const setupBlock = blocks.find((b) => b.isSetup);
-    const primary = setupBlock ?? blocks[0];
+    // Merge all blocks: non-setup first, then setup, so content order is stable.
+    const nonSetupBlocks = blocks.filter((b) => !b.isSetup);
+    const setupBlocks = blocks.filter((b) => b.isSetup);
+    const ordered = [...nonSetupBlocks, ...setupBlocks];
+    const combinedContent = ordered.map((b) => b.content).join('\n');
+    const lineOffset = ordered[0].lineOffset;
+    // Only use JavaScript grammar when ALL blocks are explicitly lang="js"
+    // or lang="jsx". If any block omits lang or uses ts/tsx, TypeScript wins.
+    const allBlocksJs = blocks.length > 0 && blocks.every((b) => b.lang === 'js' || b.lang === 'jsx');
+    const lang = allBlocksJs ? 'js' : '';
     return {
-        scriptContent: primary.content,
-        lineOffset: primary.lineOffset,
-        isSetup: primary.isSetup,
+        scriptContent: combinedContent,
+        lineOffset,
+        isSetup: blocks.some((b) => b.isSetup),
+        lang,
     };
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitnexus",
-  "version": "1.6.6-rc.151",
+  "version": "1.6.6-rc.152",
   "description": "Graph-powered code intelligence for AI agents. Index any codebase, query via MCP or CLI.",
   "author": "Abhigyan Patwari",
   "license": "PolyForm-Noncommercial-1.0.0",