ok got some failing tests for bs, which isnt awesome

Author: jaredly

src/analyze/BuildSystem.re

@@ -120,17 +120,24 @@ let getBsbExecutable = rootPath =>
     |?>> (path => path /+ ".bin" /+ "bsb")
   );
 
-let getCompilerVersion = executable => {
-  let cmd = executable ++ " -version";
-  let (output, success) = Commands.execSync(cmd);
-  success ? switch output {
-  | [line] => switch (Utils.split_on_char('.', String.trim(line))) {
+let parseOCamlVersion = versionString =>switch (Utils.split_on_char('.', String.trim(versionString))) {
     | ["4", "02", _] => Ok(V402)
     | ["4", "06", _] => Ok(V406)
     | ["4", "07", _] => Ok(V407)
     | ["4", "08", _] => Ok(V408)
-    | _ => Error("Unsupported OCaml version: " ++ line)
+    | _ => Error("Unsupported OCaml version: " ++ versionString)
   }
+
+let getCompilerVersion = executable => {
+  let cmd = executable ++ " -version";
+  let (output, success) = Commands.execSync(cmd);
+  success ? switch output {
+  | [line] when Str.string_match(Str.regexp_string("BuckleScript "), line, 0) =>
+    switch (Str.split(Str.regexp_string("(Using OCaml"), String.trim(line))) {
+      | [_, version] => parseOCamlVersion(version)
+      | _ => Error("Cannot detect OCaml version from BuckleScript version string: " ++ line)
+    }
+  | [line] => parseOCamlVersion(line)
   | _ => Error("Unable to determine compiler version (ran " ++ cmd ++ "). Output: " ++ String.concat("\n", output))
   } : Error("Could not run compiler (ran " ++ cmd ++ "). Output: " ++ String.concat("\n", output));
 };
@@ -162,6 +169,21 @@ let detect = (rootPath, bsconfig) => {
   }) : Bsb(bsbVersion);
 };
 
+let detectFull = projectDir => {
+  let bsConfig = Filename.concat(projectDir, "bsconfig.json");
+  if (Files.exists(bsConfig)) {
+    let%try raw = Files.readFileResult(bsConfig);
+    let config = Json.parse(raw);
+    detect(projectDir, config);
+  } else {
+    let esy = getLine("esy --version", ~pwd=projectDir);
+    switch (esy) {
+    | Ok(v) => Ok(Dune(Esy(v)))
+    | Error(err) => Error("Couldn't get esy version")
+    };
+  };
+};
+
 let getEsyCompiledBase = () => {
   let env = Unix.environment()->Array.to_list;
 

src/analyze_example_tests/ExamplesTests.re

@@ -3,9 +3,9 @@ open TestFramework;
 
 open Analyze;
 
-let checkExampleProject = (rootPath, sourcePaths) => {
+let checkExampleProject = (name, rootPath, sourcePaths) => {
 
-  let {describe, describeSkip, describeOnly} =
+  let {describe} =
     describeConfig
     |> withLifecycle(testLifecycle =>
         testLifecycle
@@ -25,7 +25,7 @@ let checkExampleProject = (rootPath, sourcePaths) => {
     Files.collect(path, FindFiles.isSourceFile)
   })->Belt.List.toArray->Belt.List.concatMany;
 
-  describe(rootPath, ({test}) => {
+  describe("Examples Test " ++ name, ({test}) => {
     files->Belt.List.forEach(path => {
       let uri = Utils.toUri(path);
       test(uri, ({expect, env: state}) => {
@@ -77,12 +77,12 @@ let projects = (Sys.os_type == "Unix" ? esyProjects : []) @ [
 // let main = (baseDir, _verbose, args) => {
 //   print_endline("Checking each example project to make sure we can analyze each source file...");
 let baseDir = Sys.getcwd();
-  projects->Belt.List.forEach(((root, sourcePaths, prepareCommand)) => {
+  projects->Belt.List.forEach(((rootName, sourcePaths, prepareCommand)) => {
     // if (args == [] || List.mem(root, args)) {
-      describe(root, ({test}) => {
-        let root = Filename.concat(baseDir, Filename.concat("examples", root));
+      describe("ExamplesTests " ++ rootName, ({test}) => {
+        let root = Filename.concat(baseDir, Filename.concat("examples", rootName));
 
-        let {describe, describeSkip, describeOnly} =
+        let {describe} =
           describeConfig
           |> withLifecycle(testLifecycle =>
               testLifecycle
@@ -107,7 +107,7 @@ let baseDir = Sys.getcwd();
           // sourcePaths->Belt.List.forEach(sourcePath => {
           //   describe(sourcePath, ({test}) => checkExampleProject(root, sourcePath))
           // })
-          checkExampleProject(root, sourcePaths)
+          checkExampleProject(rootName, root, sourcePaths)
         // }
       })
     // } else {

src/analyze_fixture_tests/AnalyzeFixtureTests.re

@@ -30,8 +30,14 @@ Printexc.record_backtrace(true);
 //   Log.spamError := true;
 // };
 
-let projectDirs = ["./examples/bs-3.1.5", "./examples/dune", "./examples/example-react"];
+let projectDirs = [
+  "./examples/bs-3.1.5",
+  "./examples/dune",
+  "./examples/example-react",
+  "."
+];
 
+let baseDir = Sys.getcwd();
 projectDirs->Belt.List.forEach(projectDir => {
   // describe(projectDir, ({describe}) => {
     tests->Belt.List.forEach(m => {
@@ -48,7 +54,7 @@ projectDirs->Belt.List.forEach(projectDir => {
               ->Belt.List.forEach(item => {
                   test(item.name, ({expect}) => {
                     expect.string(
-                      M.getOutput(~projectDir, item.otherFiles, item.mainContent)
+                      M.getOutput(~projectDir=Filename.concat(baseDir, projectDir), item.otherFiles, item.mainContent)
                       ->String.trim,
                     ).
                       toEqual(

src/analyze_fixture_tests/lib/TestUtils.re

@@ -2,16 +2,11 @@ open Analyze;
 let tmp = "/tmp/.lsp-test";
 Files.mkdirp(tmp);
 
-let getBuildSystem = (projectDir) => {
-  let esy = BuildSystem.getLine("esy --version", ~pwd=projectDir);
-  switch (esy) {
-  | Ok(v) => Ok(BuildSystem.Dune(Esy(v)));
-  | Error(err) => Error("Couldn't get esy version")
-  };
-};
+// let getBuildSystem = (projectDir) => {
+// };
 
 let compilerForProjectDir = (projectDir) => {
-  let%try buildSystem = getBuildSystem(projectDir);
+  let%try buildSystem = BuildSystem.detectFull(projectDir);
   let%try compilerPath = BuildSystem.getCompiler(projectDir, buildSystem);
   let%try_wrap compilerVersion = BuildSystem.getCompilerVersion(compilerPath);
   (buildSystem, compilerPath, compilerVersion)