feat(service): integrate include resolution for cross-file Map tracking

Author: loganch

src/parsers/MapParser.js

@@ -176,7 +176,7 @@ export default class MapParser {
  // Target is outside functions, only consider global scope
  if (!declFunc) {
  const distance = targetLine - decl.line;
- if (distance < closestDistance) {
+ if (distance <= closestDistance) {
  closestDistance = distance;
  closestDecl = decl;
  }

src/services/MapTrackingService.js

@@ -1,25 +1,33 @@
 import MapParser from '../parsers/MapParser.js';
+import IncludeResolver from '../utils/IncludeResolver.js';
+import fs from 'fs';
 
 /**
  * Singleton service for tracking Map variables across workspace
  */
 class MapTrackingService {
- constructor() {
+ constructor(workspaceRoot = '', autoitIncludePaths = [], maxIncludeDepth = 3) {
  if (MapTrackingService.instance) {
  return MapTrackingService.instance;
  }
 
  this.fileParsers = new Map(); // filePath -> MapParser
+ this.includeResolver = new IncludeResolver(workspaceRoot, autoitIncludePaths, maxIncludeDepth);
+ this.workspaceRoot = workspaceRoot;
  MapTrackingService.instance = this;
  }
 
  /**
  * Get singleton instance
  * @returns {MapTrackingService}
  */
- static getInstance() {
+ static getInstance(workspaceRoot, autoitIncludePaths, maxIncludeDepth) {
  if (!MapTrackingService.instance) {
- MapTrackingService.instance = new MapTrackingService();
+ MapTrackingService.instance = new MapTrackingService(
+ workspaceRoot,
+ autoitIncludePaths,
+ maxIncludeDepth,
+ );
  }
  return MapTrackingService.instance;
  }
@@ -64,6 +72,49 @@ class MapTrackingService {
 
  return parser.getKeysForMapAtLine(mapName, line);
  }
+
+ /**
+ * Get keys for a Map including keys from #include files
+ * @param {string} filePath - Absolute file path
+ * @param {string} mapName - Map variable name
+ * @param {number} line - Line number
+ * @returns {object} Object with directKeys and functionKeys arrays
+ */
+ getKeysForMapWithIncludes(filePath, mapName, line) {
+ // Get keys from current file
+ const currentKeys = this.getKeysForMap(filePath, mapName, line);
+
+ // Get keys from included files
+ const includedFiles = this.includeResolver.resolveAllIncludes(filePath);
+ const allDirectKeys = new Set(currentKeys.directKeys);
+ const allFunctionKeys = [...currentKeys.functionKeys];
+
+ for (const includedFile of includedFiles) {
+ // Parse included file if not already cached
+ if (!this.fileParsers.has(includedFile)) {
+ try {
+ if (fs.existsSync(includedFile)) {
+ const source = fs.readFileSync(includedFile, 'utf8');
+ this.updateFile(includedFile, source);
+ }
+ } catch (error) {
+ // Gracefully handle read errors
+ continue;
+ }
+ }
+
+ const includedKeys = this.getKeysForMap(includedFile, mapName, Infinity);
+
+ // Merge keys
+ includedKeys.directKeys.forEach(key => allDirectKeys.add(key));
+ allFunctionKeys.push(...includedKeys.functionKeys);
+ }
+
+ return {
+ directKeys: Array.from(allDirectKeys),
+ functionKeys: allFunctionKeys,
+ };
+ }
 }
 
 export default MapTrackingService;

test/services/MapTrackingService.test.js

@@ -1,4 +1,7 @@
 import MapTrackingService from '../../src/services/MapTrackingService.js';
+import fs from 'fs';
+
+jest.mock('fs');
 
 describe('MapTrackingService', () => {
  let service;
@@ -64,4 +67,59 @@ $mUser.age = 30`,
  expect(keys2.directKeys).toHaveLength(0);
  });
  });
+
+ describe('getKeysForMapWithIncludes', () => {
+ beforeEach(() => {
+ jest.clearAllMocks();
+ });
+
+ it('should merge keys from included files', () => {
+ // Setup mocks
+ fs.existsSync = jest.fn().mockReturnValue(true);
+ fs.readFileSync = jest.fn(filePath => {
+ // Normalize paths for comparison (handle Windows/Unix differences)
+ const normalizedPath = filePath.replace(/\\/g, '/');
+ if (normalizedPath.endsWith('/workspace/main.au3') || normalizedPath === '/workspace/main.au3') {
+ return `#include "config.au3"
+Local $mApp[]
+$mApp.version = "1.0"`;
+ }
+ if (normalizedPath.endsWith('/workspace/config.au3') || normalizedPath === '/workspace/config.au3') {
+ return `Global $mApp[]
+$mApp.name = "MyApp"`;
+ }
+ return '';
+ });
+
+ const mainSource = `#include "config.au3"
+Local $mApp[]
+$mApp.version = "1.0"`;
+
+ service = MapTrackingService.getInstance('/workspace', []);
+ service.clear();
+ service.updateFile('/workspace/main.au3', mainSource);
+
+ const keys = service.getKeysForMapWithIncludes('/workspace/main.au3', '$mApp', 3);
+
+ expect(keys.directKeys).toContain('version');
+ expect(keys.directKeys).toContain('name'); // From included file
+ });
+
+ it('should handle missing included files gracefully', () => {
+ fs.existsSync = jest.fn().mockReturnValue(false);
+
+ const source = `#include "missing.au3"
+Local $mData[]
+$mData.key = "value"`;
+
+ service = MapTrackingService.getInstance('/workspace', []);
+ service.clear();
+ service.updateFile('/workspace/test.au3', source);
+
+ const keys = service.getKeysForMapWithIncludes('/workspace/test.au3', '$mData', 3);
+
+ // Should still get keys from current file
+ expect(keys.directKeys).toContain('key');
+ });
+ });
 });