@nola-lang/typescript-plugin 0.1.0-alpha.0 → 0.1.3

package/dist/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAMjC,qEAAqE;AACrE,wBAAgB,kBAAkB,IAAI,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAWlE"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAOjC,qEAAqE;AACrE,wBAAgB,kBAAkB,IAAI,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAgBlE"}

package/dist/plugin.js

@@ -11,6 +11,7 @@ import { findProjectRoot } from "@nola-lang/node-loader";
 import { createLanguageServicePlugin } from "@volar/typescript/lib/quickstart/createLanguageServicePlugin.js";
 import { decorateHostWithCompanions } from "./companion-host.js";
 import { guardProjectServiceDocumentCache } from "./document-cache-guard.js";
+import { decorateHostForTsiResolutionWatch } from "./resolution-watch.js";
 import { decorateServerHostForCompanions } from "./server-host.js";
 import { decorateHostHideShadowedDeclarations } from "./shadowed-declarations.js";
 /** tsserver plugin factory; loaded via the CJS bundle in Track 3. */
@@ -23,6 +24,11 @@ export function createNolaTsPlugin() {
         decorateHostWithCompanions(typescript, info.languageServiceHost, { sourceRoot });
         return {
             languagePlugins: [createNolaLanguagePlugin((fileName) => fileName, { sourceRoot })],
+            // setup runs AFTER Volar's decorateLanguageServiceHost, so this wraps the
+            // resolver that actually handles `.tsi` literals (see resolution-watch.ts).
+            setup: () => {
+                decorateHostForTsiResolutionWatch(info.languageServiceHost, info.serverHost, info.project, [".tsi"]);
+            },
         };
     });
 }

package/dist/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,6DAA6D;AAC7D,+EAA+E;AAC/E,2FAA2F;AAC3F,+EAA+E;AAC/E,qEAAqE;AACrE,wDAAwD;AACxD,2FAA2F;AAC3F,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,2BAA2B,EAAE,MAAM,iEAAiE,CAAC;AAE9G,OAAO,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,gCAAgC,EAAE,MAAM,2BAA2B,CAAC;AAC7E,OAAO,EAAE,+BAA+B,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAE,oCAAoC,EAAE,MAAM,4BAA4B,CAAC;AAElF,qEAAqE;AACrE,MAAM,UAAU,kBAAkB;IAChC,OAAO,2BAA2B,CAAC,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE;QACtD,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAAC;QACvE,gCAAgC,CAAE,IAAI,CAAC,OAAkD,CAAC,cAAc,CAAC,CAAC;QAC1G,+BAA+B,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACjD,oCAAoC,CAAC,UAAU,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAC3E,0BAA0B,CAAC,UAAU,EAAE,IAAI,CAAC,mBAAmB,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;QACjF,OAAO;YACL,eAAe,EAAE,CAAC,wBAAwB,CAAS,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;SAC5F,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,6DAA6D;AAC7D,+EAA+E;AAC/E,2FAA2F;AAC3F,+EAA+E;AAC/E,qEAAqE;AACrE,wDAAwD;AACxD,2FAA2F;AAC3F,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,2BAA2B,EAAE,MAAM,iEAAiE,CAAC;AAE9G,OAAO,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,gCAAgC,EAAE,MAAM,2BAA2B,CAAC;AAC7E,OAAO,EAAE,iCAAiC,EAAE,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAE,+BAA+B,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAE,oCAAoC,EAAE,MAAM,4BAA4B,CAAC;AAElF,qEAAqE;AACrE,MAAM,UAAU,kBAAkB;IAChC,OAAO,2BAA2B,CAAC,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE;QACtD,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAAC;QACvE,gCAAgC,CAAE,IAAI,CAAC,OAAkD,CAAC,cAAc,CAAC,CAAC;QAC1G,+BAA+B,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACjD,oCAAoC,CAAC,UAAU,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAC3E,0BAA0B,CAAC,UAAU,EAAE,IAAI,CAAC,mBAAmB,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;QACjF,OAAO;YACL,eAAe,EAAE,CAAC,wBAAwB,CAAS,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;YAC3F,0EAA0E;YAC1E,4EAA4E;YAC5E,KAAK,EAAE,GAAG,EAAE;gBACV,iCAAiC,CAAC,IAAI,CAAC,mBAAmB,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;YACvG,CAAC;SACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/resolution-watch.d.ts

@@ -0,0 +1,30 @@
+import type ts from "typescript";
+/**
+ * Re-resolution bridge for deleted-then-recreated `.tsi` imports.
+ *
+ * Volar's host decoration resolves a `.tsi`-suffixed literal with its OWN
+ * resolver (it intercepts probes for the phantom `x.d.tsi.ts` and checks the
+ * real `x.tsi`), bypassing tsserver's resolution cache for those literals.
+ * Two consequences when the target file is missing: the recorded failed
+ * lookups name only the phantom paths, and — worse — tsserver never sees the
+ * resolution at all, so it installs no failed-lookup watcher and has no
+ * trigger to ever re-resolve. Deleting a `.tsi` produced TS2307 immediately
+ * (it was a watched program file), but re-creating it left the error stuck
+ * until the importing file was closed and reopened.
+ *
+ * This decoration wraps the (Volar-decorated) `resolveModuleNameLiterals`:
+ * when a relative `.tsi` literal fails to resolve, it watches the candidate
+ * path via the ServerHost; on any event it marks the importing files'
+ * resolutions invalidated, dirties the project, and refreshes diagnostics —
+ * the next program synchronize then re-resolves exactly those files. The
+ * watcher is PERSISTENT (never closed once armed): after the delete/revive
+ * cycle the revived ScriptInfo reloads content but no longer dirties the
+ * project on change (verified: a stale TS2305 cleared instantly on an
+ * unrelated nudge), so the same watcher doubles as the change trigger for
+ * every later edit of that file — content restored, emptied again, or
+ * re-deleted. Must be installed AFTER Volar's decoration (the plugin's
+ * `setup` hook) so the wrapped prior is the resolver that actually handles
+ * `.tsi`.
+ */
+export declare function decorateHostForTsiResolutionWatch(host: ts.LanguageServiceHost, serverHost: ts.server.ServerHost, project: ts.server.Project, extensions: string[]): void;
+//# sourceMappingURL=resolution-watch.d.ts.map

package/dist/resolution-watch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolution-watch.d.ts","sourceRoot":"","sources":["../src/resolution-watch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAEjC;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,EAAE,CAAC,mBAAmB,EAC5B,UAAU,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,EAChC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,EAC1B,UAAU,EAAE,MAAM,EAAE,GACnB,IAAI,CA2EN"}

package/dist/resolution-watch.js

@@ -0,0 +1,95 @@
+/**
+ * Re-resolution bridge for deleted-then-recreated `.tsi` imports.
+ *
+ * Volar's host decoration resolves a `.tsi`-suffixed literal with its OWN
+ * resolver (it intercepts probes for the phantom `x.d.tsi.ts` and checks the
+ * real `x.tsi`), bypassing tsserver's resolution cache for those literals.
+ * Two consequences when the target file is missing: the recorded failed
+ * lookups name only the phantom paths, and — worse — tsserver never sees the
+ * resolution at all, so it installs no failed-lookup watcher and has no
+ * trigger to ever re-resolve. Deleting a `.tsi` produced TS2307 immediately
+ * (it was a watched program file), but re-creating it left the error stuck
+ * until the importing file was closed and reopened.
+ *
+ * This decoration wraps the (Volar-decorated) `resolveModuleNameLiterals`:
+ * when a relative `.tsi` literal fails to resolve, it watches the candidate
+ * path via the ServerHost; on any event it marks the importing files'
+ * resolutions invalidated, dirties the project, and refreshes diagnostics —
+ * the next program synchronize then re-resolves exactly those files. The
+ * watcher is PERSISTENT (never closed once armed): after the delete/revive
+ * cycle the revived ScriptInfo reloads content but no longer dirties the
+ * project on change (verified: a stale TS2305 cleared instantly on an
+ * unrelated nudge), so the same watcher doubles as the change trigger for
+ * every later edit of that file — content restored, emptied again, or
+ * re-deleted. Must be installed AFTER Volar's decoration (the plugin's
+ * `setup` hook) so the wrapped prior is the resolver that actually handles
+ * `.tsi`.
+ */
+export function decorateHostForTsiResolutionWatch(host, serverHost, project, extensions) {
+    const prior = host.resolveModuleNameLiterals?.bind(host);
+    if (!prior)
+        return;
+    // 500 = tsserver's PollingInterval.Medium; the polling fallback watcher
+    // requires an explicit interval (undefined throws in Node's fs.watchFile).
+    const watchFile = (path, cb) => serverHost.watchFile(path, cb, 500);
+    const caseSensitive = typeof host.useCaseSensitiveFileNames === "function"
+        ? host.useCaseSensitiveFileNames()
+        : (host.useCaseSensitiveFileNames ?? false);
+    const canon = (fileName) => {
+        const posix = fileName.replace(/\\/g, "/");
+        return caseSensitive ? posix : posix.toLowerCase();
+    };
+    const watched = new Map();
+    const invalidated = new Set();
+    const hostWithInvalidation = host;
+    // markAsDirty is internal-but-stable: it bumps the project version so the
+    // next synchronize actually rebuilds the program.
+    const projectWithDirty = project;
+    // Project.updateGraphWorker REASSIGNS `this.hasInvalidatedResolutions` on
+    // every graph update (from its resolutionCache), so a plain property
+    // override is clobbered before synchronizeHostData ever reads it. An
+    // accessor keeps ours composed on top: the setter captures tsserver's
+    // function as the inner delegate, the getter serves the composition.
+    let innerHasInvalidated = hostWithInvalidation.hasInvalidatedResolutions;
+    const composedHasInvalidated = (path) => invalidated.has(canon(path)) || (innerHasInvalidated?.(path) ?? false);
+    Object.defineProperty(host, "hasInvalidatedResolutions", {
+        configurable: true,
+        get: () => composedHasInvalidated,
+        set: (fn) => {
+            innerHasInvalidated = fn;
+        },
+    });
+    host.resolveModuleNameLiterals = (moduleLiterals, containingFile, ...rest) => {
+        const containing = canon(containingFile);
+        invalidated.delete(containing);
+        const results = prior(moduleLiterals, containingFile, ...rest);
+        for (let i = 0; i < moduleLiterals.length; i++) {
+            const text = moduleLiterals[i]?.text ?? "";
+            if (!text.startsWith("./") && !text.startsWith("../"))
+                continue;
+            if (!extensions.some((ext) => text.endsWith(ext)))
+                continue;
+            const dir = containingFile.replace(/\\/g, "/").split("/").slice(0, -1).join("/");
+            const candidate = canon(`${dir}/${text}`.replace(/\/\.\//g, "/"));
+            const entry = watched.get(candidate);
+            if (entry) {
+                entry.waiters.add(containing);
+                continue;
+            }
+            // arm only on failure; a healthy never-deleted file keeps tsserver's own
+            // ScriptInfo watching and needs no bridge
+            if (results[i]?.resolvedModule)
+                continue;
+            const waiters = new Set([containing]);
+            const watcher = watchFile(candidate, () => {
+                for (const waiter of waiters)
+                    invalidated.add(waiter);
+                projectWithDirty.markAsDirty?.();
+                project.refreshDiagnostics();
+            });
+            watched.set(candidate, { watcher, waiters });
+        }
+        return results;
+    };
+}
+//# sourceMappingURL=resolution-watch.js.map

package/dist/resolution-watch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolution-watch.js","sourceRoot":"","sources":["../src/resolution-watch.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@nola-lang/typescript-plugin",
-  "version": "0.1.0-alpha.0",
+  "version": "0.1.3",
   "description": "tsserver plugin serving .tsi to TypeScript editors (internal editor layer)",
   "keywords": [
     "nola"
   ],
-  "license": "MIT",
+  "license": "Apache-2.0",
   "author": "Evgen Mykhailenko",
   "homepage": "https://github.com/nola-lang/nola#readme",
   "repository": {
@@ -29,15 +29,16 @@
     }
   },
   "files": [
-    "dist"
+    "dist",
+    "!dist/.tsbuildinfo"
   ],
   "scripts": {
     "bundle": "node scripts/bundle.mjs"
   },
   "dependencies": {
-    "@nola-lang/compiler": "0.1.0-alpha.0",
-    "@nola-lang/language-core": "0.1.0-alpha.0",
-    "@nola-lang/node-loader": "0.1.0-alpha.0",
+    "@nola-lang/compiler": "0.1.3",
+    "@nola-lang/language-core": "0.1.3",
+    "@nola-lang/node-loader": "0.1.3",
     "@volar/typescript": "2.4.28"
   },
   "devDependencies": {