@zentryc5t/ts-plugin-for-bruno 1.0.4 → 2.0.0

package/out/index.js

@@ -20,22 +20,38 @@ function init(_modules) {
         };
         proxy.getSuggestionDiagnostics = (fileName) => {
             const defaultDiagnostics = info.languageService.getSuggestionDiagnostics(fileName);
-            if (!isBrunoFile(fileName)) {
+            const isBruFile = isBrunoFile(fileName);
+            if (!isBruFile && !isJsFileFromBrunoCollection(info, fileName)) {
                 return defaultDiagnostics;
             }
-            const allDiagnosticsForCodeBlocks = filterDefaultDiagnostics(info, fileName, defaultDiagnostics);
+            const allDiagnostics = filterDefaultDiagnostics(info, fileName, defaultDiagnostics);
             // The ts server always reports errors when importing a Javascript function in a .bru file.
-            return allDiagnosticsForCodeBlocks.filter(
-            // Do not show diagnostics that only make sense for Typescript files.
-            // Bru file code blocks should be treated like Javascript functions instead.
-            // A list of diagnostics can be found here: https://github.com/microsoft/TypeScript/blob/main/src/compiler/diagnosticMessages.json
-            ({ code }) => (code < 7043 || code > 7050) && code != 80004);
+            return isBruFile
+                ? allDiagnostics.filter(
+                // Do not show diagnostics that only make sense for Typescript files.
+                // Bru file code blocks should be treated like Javascript functions instead.
+                // A list of diagnostics can be found here: https://github.com/microsoft/TypeScript/blob/main/src/compiler/diagnosticMessages.json
+                ({ code }) => (code < 7043 || code > 7050) &&
+                    code != 80001 &&
+                    code != 80004)
+                : allDiagnostics.filter(({ code }) => code != 80001); // Bruno currently only supports CommonJS modules.
         };
-        // All hovers are provided by the extension implementation
+        // All hovers are provided by the extension implementation for '.bru' and '.js' files within collections.
+        // Only for the temp js file, the ts language service has to be used.
         proxy.getQuickInfoAtPosition = (fileName, position) => {
-            return isBrunoFile(fileName)
+            if (isBrunoFile(fileName) ||
+                (isJsFileFromBrunoCollection(info, fileName) &&
+                    !isTempJsFile(fileName))) {
+                return undefined;
+            }
+            return info.languageService.getQuickInfoAtPosition(fileName, position);
+        };
+        // All completions for '.js' files within collections are provided by the extension already.
+        proxy.getCompletionsAtPosition = (fileName, position, options) => {
+            return isJsFileFromBrunoCollection(info, fileName) &&
+                !isTempJsFile(fileName)
                 ? undefined
-                : info.languageService.getQuickInfoAtPosition(fileName, position);
+                : info.languageService.getCompletionsAtPosition(fileName, position, options);
         };
         return proxy;
     }
@@ -44,18 +60,19 @@ function init(_modules) {
     };
 }
 function filterDefaultDiagnostics(info, fileName, defaultDiagnostics) {
-    if (!isBrunoFile(fileName)) {
-        return defaultDiagnostics;
-    }
-    else {
-        let fileContent = undefined;
-        const scriptSnapshot = info.languageServiceHost.getScriptSnapshot(fileName);
-        if (scriptSnapshot) {
-            fileContent = scriptSnapshot.getText(0, scriptSnapshot.getLength());
+    if (isJsFileFromBrunoCollection(info, fileName)) {
+        // Avoid showing errors for temp js files.
+        if (isTempJsFile(fileName)) {
+            return [];
         }
-        else {
-            fileContent = info.languageServiceHost.readFile(fileName);
+        const fileContent = getFileContent(info, fileName);
+        if (!fileContent) {
+            return [];
         }
+        return filterOutDiagnosticsForInbuiltRuntimeFunctions(defaultDiagnostics, fileContent);
+    }
+    else if (isBrunoFile(fileName)) {
+        const fileContent = getFileContent(info, fileName);
         if (!fileContent) {
             return [];
         }
@@ -66,20 +83,14 @@ function filterDefaultDiagnostics(info, fileName, defaultDiagnostics) {
                 indizes.push({ blockName, ...indizesForBlock });
             }
         }
-        if (indizes.length > 0) {
-            return defaultDiagnostics.filter(({ start, length }) => start != undefined &&
-                length != undefined &&
-                indizes.some(({ startIndex: blockStart, endIndex: blockEnd }) => start >= blockStart && start <= blockEnd) &&
-                // Do not show diagnostics for functions that are provided by Bruno at runtime
-                !["bru", "req", "res", "test", "expect"].includes(fileContent.substring(start, start + length)) &&
-                // Avoid showing incorrect error when using `require`
-                // (the error seems to only occur for short periods of time when typescript type definitions have not been reloaded for a while)
-                fileContent.substring(start, start + length) !=
-                    "require");
-        }
-        else {
+        if (indizes.length == 0) {
             return [];
         }
+        return filterOutDiagnosticsForInbuiltRuntimeFunctions(defaultDiagnostics.filter(({ start }) => start != undefined &&
+            indizes.some(({ startIndex: blockStart, endIndex: blockEnd }) => start >= blockStart && start <= blockEnd)), fileContent);
+    }
+    else {
+        return defaultDiagnostics;
     }
 }
 function getCodeBlockStartAndEndIndex(fullTextContent, blockName) {
@@ -104,9 +115,65 @@ function getCodeBlockStartAndEndIndex(fullTextContent, blockName) {
         endIndex: blockStartIndex + blockNodeInSubDocument.end,
     };
 }
+function isJsFileFromBrunoCollection(info, fileName) {
+    return (0, path_1.extname)(fileName) == ".js" && isInABrunoCollection(info, fileName);
+}
+function filterOutDiagnosticsForInbuiltRuntimeFunctions(diagnosticsToFilter, fileContent) {
+    return diagnosticsToFilter.filter(({ start, length }) => start != undefined &&
+        length != undefined &&
+        // Do not show diagnostics for functions that are provided by Bruno at runtime
+        !["bru", "req", "res", "test", "expect"].includes(fileContent.substring(start, start + length)) &&
+        // Avoid showing incorrect error when using `require`
+        // (the error seems to only occur for short periods of time when typescript type definitions have not been reloaded for a while)
+        fileContent.substring(start, start + length) != "require");
+}
+function getFileContent(info, fileName) {
+    const scriptSnapshot = info.languageServiceHost.getScriptSnapshot(fileName);
+    if (scriptSnapshot) {
+        return scriptSnapshot.getText(0, scriptSnapshot.getLength());
+    }
+    else {
+        return info.languageServiceHost.readFile(fileName);
+    }
+}
+function isInABrunoCollection(info, fileName) {
+    let currentDirectory = (0, path_1.dirname)(fileName);
+    let isCollectionRoot = isACollectionRootFolder(info, currentDirectory);
+    while (info.serverHost.directoryExists(currentDirectory) &&
+        !isCollectionRoot &&
+        (0, path_1.dirname)(currentDirectory) != currentDirectory // dirname of a base folder in the file system seems to return the input folder again
+    ) {
+        currentDirectory = (0, path_1.dirname)(currentDirectory);
+        isCollectionRoot = isACollectionRootFolder(info, currentDirectory);
+    }
+    return isCollectionRoot;
+}
+function isACollectionRootFolder(info, directoryPath) {
+    return info.serverHost
+        .readDirectory(directoryPath, undefined, undefined, undefined, 1)
+        .some((fileName) => {
+        if (!fileName.endsWith("bruno.json")) {
+            return false;
+        }
+        const content = info.languageServiceHost.readFile(fileName);
+        if (!content) {
+            return false;
+        }
+        try {
+            const parsedContent = JSON.parse(content);
+            return parsedContent && parsedContent.type == "collection";
+        }
+        catch {
+            return false;
+        }
+    });
+}
 function isBrunoFile(fileName) {
     return (0, path_1.extname)(fileName) == ".bru";
 }
+function isTempJsFile(fileName) {
+    return (0, path_1.basename)(fileName) == "__temp_bru_reference.js";
+}
 var TextBlockName;
 (function (TextBlockName) {
     TextBlockName["Tests"] = "tests";

package/out/index.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zentryc5t/ts-plugin-for-bruno",
-    "version": "1.0.4",
+    "version": "2.0.0",
     "main": "./out/index.js",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1"

package/src/index.ts

@@ -1,4 +1,4 @@
-import { extname } from "path";
+import { basename, dirname, extname } from "path";
 import * as ts from "typescript/lib/tsserverlibrary";
 
 function init(_modules: {
@@ -38,31 +38,58 @@ function init(_modules: {
             const defaultDiagnostics =
                 info.languageService.getSuggestionDiagnostics(fileName);
 
-            if (!isBrunoFile(fileName)) {
+            const isBruFile = isBrunoFile(fileName);
+
+            if (!isBruFile && !isJsFileFromBrunoCollection(info, fileName)) {
                 return defaultDiagnostics;
             }
-            const allDiagnosticsForCodeBlocks = filterDefaultDiagnostics(
+
+            const allDiagnostics = filterDefaultDiagnostics(
                 info,
                 fileName,
                 defaultDiagnostics,
             ) as ts.DiagnosticWithLocation[];
 
             // The ts server always reports errors when importing a Javascript function in a .bru file.
-            return allDiagnosticsForCodeBlocks.filter(
-                // Do not show diagnostics that only make sense for Typescript files.
-                // Bru file code blocks should be treated like Javascript functions instead.
-                // A list of diagnostics can be found here: https://github.com/microsoft/TypeScript/blob/main/src/compiler/diagnosticMessages.json
-                ({ code }) => (code < 7_043 || code > 7_050) && code != 80_004,
-            );
+            return isBruFile
+                ? allDiagnostics.filter(
+                      // Do not show diagnostics that only make sense for Typescript files.
+                      // Bru file code blocks should be treated like Javascript functions instead.
+                      // A list of diagnostics can be found here: https://github.com/microsoft/TypeScript/blob/main/src/compiler/diagnosticMessages.json
+                      ({ code }) =>
+                          (code < 7_043 || code > 7_050) &&
+                          code != 80_001 &&
+                          code != 80_004,
+                  )
+                : allDiagnostics.filter(({ code }) => code != 80_001); // Bruno currently only supports CommonJS modules.
         };
 
-        // All hovers are provided by the extension implementation
+        // All hovers are provided by the extension implementation for '.bru' and '.js' files within collections.
+        // Only for the temp js file, the ts language service has to be used.
         proxy.getQuickInfoAtPosition = (fileName, position) => {
-            return isBrunoFile(fileName)
+            if (
+                isBrunoFile(fileName) ||
+                (isJsFileFromBrunoCollection(info, fileName) &&
+                    !isTempJsFile(fileName))
+            ) {
+                return undefined;
+            }
+
+            return info.languageService.getQuickInfoAtPosition(
+                fileName,
+                position,
+            );
+        };
+
+        // All completions for '.js' files within collections are provided by the extension already.
+        proxy.getCompletionsAtPosition = (fileName, position, options) => {
+            return isJsFileFromBrunoCollection(info, fileName) &&
+                !isTempJsFile(fileName)
                 ? undefined
-                : info.languageService.getQuickInfoAtPosition(
+                : info.languageService.getCompletionsAtPosition(
                       fileName,
                       position,
+                      options,
                   );
         };
 
@@ -79,19 +106,25 @@ function filterDefaultDiagnostics(
     fileName: string,
     defaultDiagnostics: (ts.Diagnostic | ts.DiagnosticWithLocation)[],
 ) {
-    if (!isBrunoFile(fileName)) {
-        return defaultDiagnostics;
-    } else {
-        let fileContent: string | undefined = undefined;
-        const scriptSnapshot =
-            info.languageServiceHost.getScriptSnapshot(fileName);
-
-        if (scriptSnapshot) {
-            fileContent = scriptSnapshot.getText(0, scriptSnapshot.getLength());
-        } else {
-            fileContent = info.languageServiceHost.readFile(fileName);
+    if (isJsFileFromBrunoCollection(info, fileName)) {
+        // Avoid showing errors for temp js files.
+        if (isTempJsFile(fileName)) {
+            return [];
+        }
+
+        const fileContent = getFileContent(info, fileName);
+
+        if (!fileContent) {
+            return [];
         }
 
+        return filterOutDiagnosticsForInbuiltRuntimeFunctions(
+            defaultDiagnostics,
+            fileContent,
+        );
+    } else if (isBrunoFile(fileName)) {
+        const fileContent = getFileContent(info, fileName);
+
         if (!fileContent) {
             return [];
         }
@@ -113,30 +146,23 @@ function filterDefaultDiagnostics(
             }
         }
 
-        if (indizes.length > 0) {
-            return defaultDiagnostics.filter(
-                ({ start, length }) =>
+        if (indizes.length == 0) {
+            return [];
+        }
+
+        return filterOutDiagnosticsForInbuiltRuntimeFunctions(
+            defaultDiagnostics.filter(
+                ({ start }) =>
                     start != undefined &&
-                    length != undefined &&
                     indizes.some(
                         ({ startIndex: blockStart, endIndex: blockEnd }) =>
                             start >= blockStart && start <= blockEnd,
-                    ) &&
-                    // Do not show diagnostics for functions that are provided by Bruno at runtime
-                    !["bru", "req", "res", "test", "expect"].includes(
-                        (fileContent as string).substring(
-                            start,
-                            start + length,
-                        ),
-                    ) &&
-                    // Avoid showing incorrect error when using `require`
-                    // (the error seems to only occur for short periods of time when typescript type definitions have not been reloaded for a while)
-                    (fileContent as string).substring(start, start + length) !=
-                        "require",
-            );
-        } else {
-            return [];
-        }
+                    ),
+            ),
+            fileContent,
+        );
+    } else {
+        return defaultDiagnostics;
     }
 }
 
@@ -183,10 +209,97 @@ function getCodeBlockStartAndEndIndex(
     };
 }
 
+function isJsFileFromBrunoCollection(
+    info: ts.server.PluginCreateInfo,
+    fileName: string,
+) {
+    return extname(fileName) == ".js" && isInABrunoCollection(info, fileName);
+}
+
+function filterOutDiagnosticsForInbuiltRuntimeFunctions(
+    diagnosticsToFilter: (ts.Diagnostic | ts.DiagnosticWithLocation)[],
+    fileContent: string,
+) {
+    return diagnosticsToFilter.filter(
+        ({ start, length }) =>
+            start != undefined &&
+            length != undefined &&
+            // Do not show diagnostics for functions that are provided by Bruno at runtime
+            !["bru", "req", "res", "test", "expect"].includes(
+                fileContent.substring(start, start + length),
+            ) &&
+            // Avoid showing incorrect error when using `require`
+            // (the error seems to only occur for short periods of time when typescript type definitions have not been reloaded for a while)
+            fileContent.substring(start, start + length) != "require",
+    );
+}
+
+function getFileContent(info: ts.server.PluginCreateInfo, fileName: string) {
+    const scriptSnapshot = info.languageServiceHost.getScriptSnapshot(fileName);
+
+    if (scriptSnapshot) {
+        return scriptSnapshot.getText(0, scriptSnapshot.getLength());
+    } else {
+        return info.languageServiceHost.readFile(fileName);
+    }
+}
+
+function isInABrunoCollection(
+    info: ts.server.PluginCreateInfo,
+    fileName: string,
+) {
+    let currentDirectory = dirname(fileName);
+    let isCollectionRoot = isACollectionRootFolder(info, currentDirectory);
+
+    while (
+        info.serverHost.directoryExists(currentDirectory) &&
+        !isCollectionRoot &&
+        dirname(currentDirectory) != currentDirectory // dirname of a base folder in the file system seems to return the input folder again
+    ) {
+        currentDirectory = dirname(currentDirectory);
+        isCollectionRoot = isACollectionRootFolder(info, currentDirectory);
+    }
+
+    return isCollectionRoot;
+}
+
+function isACollectionRootFolder(
+    info: ts.server.PluginCreateInfo,
+    directoryPath: string,
+) {
+    return info.serverHost
+        .readDirectory(directoryPath, undefined, undefined, undefined, 1)
+        .some((fileName) => {
+            if (!fileName.endsWith("bruno.json")) {
+                return false;
+            }
+
+            const content = info.languageServiceHost.readFile(fileName);
+
+            if (!content) {
+                return false;
+            }
+
+            try {
+                const parsedContent = JSON.parse(content) as
+                    | { type: string }
+                    | undefined;
+
+                return parsedContent && parsedContent.type == "collection";
+            } catch {
+                return false;
+            }
+        });
+}
+
 function isBrunoFile(fileName: string) {
     return extname(fileName) == ".bru";
 }
 
+function isTempJsFile(fileName: string) {
+    return basename(fileName) == "__temp_bru_reference.js";
+}
+
 enum TextBlockName {
     Tests = "tests",
     PreRequestScript = "script:pre-request",