bimba-cli 0.7.14 → 0.7.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bimba-cli",
-  "version": "0.7.14",
+  "version": "0.7.16",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/HeapVoid/bimba.git"

package/typecheck.js

@@ -26,6 +26,10 @@ function canResolve(request, from) {
     }
 }
 
+function hasPackage(root, name) {
+    return fs.existsSync(path.join(root, name, 'package.json'));
+}
+
 function findTypeScript(cwd) {
     const tsserver = canResolve('typescript/lib/tsserver.js', cwd);
     if (tsserver) return tsserver;
@@ -35,7 +39,7 @@ function findTypeScript(cwd) {
 
 function findPluginProbe(cwd) {
     const localProbe = path.join(cwd, 'node_modules');
-    if (canResolve('typescript-imba-plugin', localProbe)) return localProbe;
+    if (hasPackage(localProbe, 'typescript-imba-plugin')) return localProbe;
 
     const extensionRoots = [
         path.join(os.homedir(), '.vscode', 'extensions'),
@@ -49,7 +53,7 @@ function findPluginProbe(cwd) {
 
         for (const entry of fs.readdirSync(root)) {
             const probe = path.join(root, entry, 'node_modules');
-            if (canResolve('typescript-imba-plugin', probe)) return probe;
+            if (hasPackage(probe, 'typescript-imba-plugin')) return probe;
         }
     }
 
@@ -153,7 +157,7 @@ function send(server, seq, command, args) {
 
 export async function checkImbaTypes(entrypoint, options = {}) {
     const cwd = options.cwd || process.cwd();
-    const timeout = Number(options.timeout || process.env.BIMBA_TYPECHECK_TIMEOUT || process.env.IMBA_TS_CHECK_TIMEOUT || 12000);
+    const timeout = Number(options.timeout || process.env.BIMBA_TYPECHECK_TIMEOUT || process.env.IMBA_TS_CHECK_TIMEOUT || 30000);
     const scanRoot = getScanRoot(entrypoint, cwd);
     const files = collectImbaFiles(scanRoot);
 
@@ -174,6 +178,7 @@ export async function checkImbaTypes(entrypoint, options = {}) {
         let buffer = Buffer.alloc(0);
         const seq = { value: 1 };
         const diagnostics = [];
+        let geterrSeq = null;
 
         const server = spawn(runner, [
             tsserver,
@@ -191,7 +196,7 @@ export async function checkImbaTypes(entrypoint, options = {}) {
             resolve(success);
         }
 
-        const timer = setTimeout(() => {
+        function finishWithDiagnostics() {
             const unique = uniqueDiagnostics(diagnostics);
 
             if (!unique.length) {
@@ -203,6 +208,11 @@ export async function checkImbaTypes(entrypoint, options = {}) {
             printDiagnostics(cwd, unique);
             console.log(theme.failure(' Failure ') + ` TypeScript found ${theme.count(unique.length)} diagnostic${unique.length > 1 ? 's' : ''}`);
             finish(false);
+        }
+
+        const timer = setTimeout(() => {
+            console.log(theme.failure(' Failure ') + ` Timed out waiting for TypeScript diagnostics after ${theme.time(timeout)} ms`);
+            finish(false);
         }, timeout);
 
         server.on('error', (error) => {
@@ -215,7 +225,14 @@ export async function checkImbaTypes(entrypoint, options = {}) {
         server.stdout.on('data', chunk => {
             buffer = Buffer.concat([buffer, chunk]);
             buffer = parseMessages(buffer, msg => {
-                if (msg.type != 'event' || !/Diag$/.test(msg.event)) return;
+                if (msg.type != 'event') return;
+
+                if (msg.event == 'requestCompleted' && msg.body?.request_seq == geterrSeq) {
+                    finishWithDiagnostics();
+                    return;
+                }
+
+                if (!/Diag$/.test(msg.event)) return;
                 if (!msg.body?.diagnostics?.length) return;
 
                 for (const diagnostic of msg.body.diagnostics) {
@@ -242,6 +259,7 @@ export async function checkImbaTypes(entrypoint, options = {}) {
             if (settled) return;
             send(server, seq, 'configure', { preferences: {}, hostInfo: 'bimba-typecheck' });
             for (const file of files) send(server, seq, 'open', { file, projectRootPath: cwd });
+            geterrSeq = seq.value;
             send(server, seq, 'geterr', { files, delay: 0 });
         }, 100);
     });