@rohal12/spindle-lsp 0.3.0 → 0.3.2

package/dist/bin.js

@@ -244,6 +244,7 @@ var init_passage_index = __esm({
 
 // src/core/workspace/macro-registry.ts
 import { existsSync, readFileSync as readFileSync2 } from "node:fs";
+import { createRequire } from "node:module";
 import { dirname, join, parse as parsePath } from "node:path";
 import { fileURLToPath } from "node:url";
 var MacroRegistry;
@@ -262,7 +263,7 @@ var init_macro_registry = __esm({
         let builtinMacros = [];
         try {
           const thisDir = dirname(fileURLToPath(import.meta.url));
-          const registryPath = this.resolveRegistryPath(thisDir);
+          const registryPath = this.resolveRegistryPathViaRequire(thisDir) ?? this.resolveRegistryPath(thisDir);
           if (registryPath) {
             const raw = readFileSync2(registryPath, "utf-8");
             const parsed = JSON.parse(raw);
@@ -352,6 +353,20 @@ var init_macro_registry = __esm({
        * Walk up directory tree from `startDir` to find the
        * @rohal12/spindle/dist/pkg/macro-registry.json file.
        */
+      /**
+       * Resolve macro-registry.json using Node's require resolution.
+       * Works in bundled contexts where import.meta.url may not be near node_modules.
+       */
+      resolveRegistryPathViaRequire(startDir) {
+        try {
+          const require2 = createRequire(join(startDir, "_"));
+          const toolingPath = require2.resolve("@rohal12/spindle/tooling");
+          const candidate = join(dirname(toolingPath), "macro-registry.json");
+          if (existsSync(candidate)) return candidate;
+        } catch {
+        }
+        return null;
+      }
       resolveRegistryPath(startDir) {
         const target = join("node_modules", "@rohal12", "spindle", "dist", "pkg", "macro-registry.json");
         let dir = startDir;
@@ -1033,6 +1048,8 @@ var init_workspace_model = __esm({
         this.macros = new MacroRegistry();
         this.variables = new VariableTracker();
         this.widgets = new WidgetRegistry();
+        this.macros.loadBuiltins();
+        this.macros.loadSupplements(macro_supplements_default);
         this.onDocumentChanged = (uri) => this.handleDocumentChange(uri);
         this.onDocumentOpened = (uri) => this.handleDocumentChange(uri);
         this.onDocumentClosed = (uri) => this.handleDocumentClose(uri);
@@ -1045,8 +1062,6 @@ var init_workspace_model = __esm({
        * Loads all file contents, builds indices, and emits 'modelReady'.
        */
       initialize(fileContents) {
-        this.macros.loadBuiltins();
-        this.macros.loadSupplements(macro_supplements_default);
         this.documents.removeListener("documentOpened", this.onDocumentOpened);
         this.documents.removeListener("documentChanged", this.onDocumentChanged);
         for (const [uri, text] of fileContents) {
@@ -4845,6 +4860,7 @@ function startServer(_args) {
   let activePlugins = [];
   let workspaceRoot;
   connection.onInitialize((params) => {
+    console.error("[spindle-lsp] onInitialize called");
     const initOptions = params.initializationOptions ?? {};
     workspaceRoot = initOptions.workspaceRoot ?? (params.workspaceFolders?.[0]?.uri ? uriToFsPath(params.workspaceFolders[0].uri) : void 0);
     const projectConfig = workspaceRoot ? loadConfigFromDisk(workspaceRoot) : { macros: {} };
@@ -4854,12 +4870,15 @@ function startServer(_args) {
       workspaceRoot
     };
     workspace = new WorkspaceModel();
+    console.error("[spindle-lsp] workspaceRoot:", workspaceRoot ?? "undefined");
     activePlugins = loadPlugins(allPlugins, config);
+    console.error("[spindle-lsp] plugins loaded:", activePlugins.map((p) => p.id).join(", "));
     for (const plugin of activePlugins) {
       plugin.initialize({ connection, workspace, config });
     }
     if (Object.keys(projectConfig.macros).length > 0) {
       workspace.macros.loadSupplements(projectConfig.macros);
+      console.error("[spindle-lsp] loaded config macros:", Object.keys(projectConfig.macros).length);
     }
     return {
       capabilities: buildCapabilities(activePlugins)
@@ -4878,7 +4897,9 @@ function startServer(_args) {
     });
     if (workspace) {
       const fileContents = await scanWorkspaceFiles(workspaceRoot);
+      console.error("[spindle-lsp] onInitialized: scanned", fileContents.size, "files from root:", workspaceRoot ?? "undefined");
       workspace.initialize(fileContents);
+      console.error("[spindle-lsp] workspace initialized, macros:", workspace.macros.getAllMacros().length, "warnings:", workspace.macros.warnings);
     }
   });
   connection.onDidOpenTextDocument(({ textDocument }) => {