polish

Author: aspeddro

scripts/ExamplesTest.mjs

@@ -111,7 +111,7 @@ function createFileInTempDir(id) {
   return Path.join(Os.tmpdir(), id);
 }
 
-async function testCodeBlock(id, _kind, code) {
+async function testCode(id, code) {
   var tempFileName = Path.join(Os.tmpdir(), id);
   await Promises.writeFile(tempFileName + ".res", code);
   var args = [
@@ -149,7 +149,7 @@ async function testCodeBlock(id, _kind, code) {
   }
 }
 
-function extractDoc(file) {
+function extractDocFromFile(file) {
   var toolsBin = Path.join(Path.dirname(dirname), "node_modules", ".bin", "rescript-tools");
   var spawn = Child_process.spawnSync(toolsBin, [
         "doc",
@@ -158,7 +158,7 @@ function extractDoc(file) {
   return Tools_Docgen.decodeFromJson(JSON.parse(spawn.stdout.toString()));
 }
 
-function getDocstrings(param) {
+function getExamples(param) {
   var loop = function (_items, _acc) {
     while(true) {
       var acc = _acc;
@@ -277,28 +277,19 @@ function getCodeBlocks(example) {
                           }))), /* [] */0));
 }
 
-var tests = getDocstrings(extractDoc("src/RescriptCore.res")).map(function (doc) {
-        return [
-                doc,
-                getCodeBlocks(doc)
-              ];
-      }).filter(function (param) {
-      return param[1].length > 0;
-    });
-
-var moduleTestsResults = await Promise.all(tests.map(async function (param) {
-          var docTest = param[0];
-          var results = await Promise.all(param[1].map(async function (code) {
-                    var id = docTest.id.replaceAll(".", "_");
-                    return await testCodeBlock(id, docTest.kind, code);
+var results = await Promise.all(getExamples(extractDocFromFile("src/RescriptCore.res")).map(async function (example) {
+          var id = example.id.replaceAll(".", "_");
+          var codes = getCodeBlocks(example);
+          var results = await Promise.all(codes.map(async function (code) {
+                    return await testCode(id, code);
                   }));
           return [
-                  docTest,
+                  example,
                   results
                 ];
         }));
 
-var errors = Belt_Array.keepMap(moduleTestsResults, (function (param) {
+var errors = Belt_Array.keepMap(results, (function (param) {
         var errors = Belt_Array.keepMap(param[1], (function (result) {
                 if (result.TAG === "Ok") {
                   return ;
@@ -331,7 +322,7 @@ errors.forEach(function (param) {
       process.stderr.write(message);
     });
 
-process.exit(errors.length);
+process.exit(errors.length === 0 ? 0 : 1);
 
 var Docgen;
 
@@ -346,12 +337,11 @@ export {
   rescriptJson ,
   prepareCompiler ,
   createFileInTempDir ,
-  testCodeBlock ,
-  extractDoc ,
-  getDocstrings ,
+  testCode ,
+  extractDocFromFile ,
+  getExamples ,
   getCodeBlocks ,
-  tests ,
-  moduleTestsResults ,
+  results ,
   errors ,
 }
 /* dirname Not a pure module */

scripts/ExamplesTest.res

@@ -86,7 +86,7 @@ let prepareCompiler = () => {
 
 prepareCompiler()
 
-type docTest = {
+type example = {
   id: string,
   kind: string,
   name: string,
@@ -95,7 +95,7 @@ type docTest = {
 
 let createFileInTempDir = id => Path.join2(OS.tmpdir(), id)
 
-let testCodeBlock = async (id, _kind, code) => {
+let testCode = async (~id, ~code) => {
   let tempFileName = createFileInTempDir(id)
 
   let () = await Fs.writeFile(tempFileName ++ ".res", code)
@@ -132,7 +132,7 @@ let testCodeBlock = async (id, _kind, code) => {
   }
 }
 
-let extractDoc = file => {
+let extractDocFromFile = file => {
   let toolsBin = Path.join([Path.dirname(dirname), "node_modules", ".bin", "rescript-tools"])
   let spawn = ChildProcess.spawnSync(toolsBin, ["doc", file])
 
@@ -142,8 +142,8 @@ let extractDoc = file => {
   ->Docgen.decodeFromJson
 }
 
-let getDocstrings = ({items}: Docgen.doc) => {
-  let rec loop = (items: list<Docgen.item>, acc: list<docTest>) => {
+let getExamples = ({items}: Docgen.doc) => {
+  let rec loop = (items: list<Docgen.item>, acc: list<example>) => {
     switch items {
     | list{Value({docstrings, id, name}), ...rest} =>
       loop(rest, list{{id, name, docstrings, kind: "value"}, ...acc})
@@ -218,27 +218,21 @@ let getCodeBlocks = example => {
   ->List.toArray
 }
 
-let tests =
-  extractDoc("src/RescriptCore.res")
-  ->getDocstrings
-  ->Array.map(doc => (doc, doc->getCodeBlocks))
-  ->Array.filter(((_, b)) => Array.length(b) > 0)
-
-let moduleTestsResults =
-  await tests
-  ->Array.map(async ((docTest, codeblocks)) => {
+let results =
+  await extractDocFromFile("src/RescriptCore.res")
+  ->getExamples
+  ->Array.map(async example => {
+    let id = example.id->String.replaceAll(".", "_")
+    let codes = example->getCodeBlocks
     let results =
-      await codeblocks
-      ->Array.map(async code => {
-        let id = docTest.id->String.replaceAll(".", "_")
-        await testCodeBlock(id, docTest.kind, code)
-      })
+      await codes
+      ->Array.map(async code => await testCode(~id, ~code))
       ->Promise.all
-    (docTest, results)
+    (example, results)
   })
   ->Promise.all
 
-let errors = moduleTestsResults->Belt.Array.keepMap(((test, results)) => {
+let errors = results->Belt.Array.keepMap(((example, results)) => {
   let errors = results->Belt.Array.keepMap(result =>
     switch result {
     | Ok() => None
@@ -247,7 +241,7 @@ let errors = moduleTestsResults->Belt.Array.keepMap(((test, results)) => {
   )
 
   if Array.length(errors) > 0 {
-    Some((test, errors))
+    Some((example, errors))
   } else {
     None
   }
@@ -278,4 +272,4 @@ let () = errors->Array.forEach(((test, errors)) => {
   Process.stderrWrite(message)
 })
 
-Process.exit(errors->Array.length)
+Process.exit(errors->Array.length == 0 ? 0 : 1)