pass config to -project arg

Author: cometkim

jscomp/bsb_exe/rescript_main.ml

@@ -26,6 +26,9 @@ let () = Bsb_log.setup ()
 
 let separator = "--"
 
+(* FIXME: should be swapped in v12 *)
+let project_path = ref "bsconfig.json"
+
 let watch_mode = ref false
 
 let make_world = ref false
@@ -148,9 +151,10 @@ let build_subcommand ~start argv argv_len =
       ( "-regen",
         unit_set_spec force_regenerate,
         "*internal* \n\
-         Always regenerate build.ninja no matter bsconfig.json is changed or \
+         Always regenerate build.ninja no matter rescript.json is changed or \
          not" );
       ("-verbose", call_spec Bsb_log.verbose, "Set the output to be verbose");
+      ("-project", string_set_spec project_path, "Project file (rescript.json) path");
     |]
     failed_annon;
 

rescript

@@ -13,7 +13,6 @@ var path = require("path");
 var fs = require("fs");
 var bsc_exe = require("./scripts/bin_path").bsc_exe;
 var rescript_exe = require("./scripts/bin_path").rescript_exe;
-var bsconfig = "bsconfig.json";
 
 var LAST_BUILD_START = 0;
 var LAST_FIRED_EVENT = 0;
@@ -28,13 +27,23 @@ var lockFileName = path.join(cwd, ".bsb.lock");
 process.env.BSB_PROJECT_ROOT = cwd;
 // console.log('BSB_PROJECT_ROOT:', process.env.BSB_PROJECT_ROOT)
 
+var bsConfig = "bsconfig.json"
+var resConfig = "rescript.json";
+var resConfigFile = path.join(cwd, resConfig);
+if (!fs.existsSync(resConfigFile)) {
+  resConfig = bsConfig;
+  resConfigFile = path.join(cwd, bsConfig);
+}
+
 // If the project uses gentype and uses custom file extension
 // via generatedFileExtension, ignore them in watch mode
-var bsConfigFile = path.join(cwd, bsconfig);
 var genTypeFileExtension = undefined;
 
-if (fs.existsSync(bsConfigFile)) {
-  var genTypeConfig = require(bsConfigFile).gentypeconfig
+if (fs.existsSync(resConfigFile)) {
+  if (resConfig === bsConfig) {
+    console.warn("bsconfig.json is deprecated. Use rescript.json instead.");
+  }
+  var genTypeConfig = require(resConfigFile).gentypeconfig
   if (genTypeConfig) {
     genTypeFileExtension = genTypeConfig.generatedFileExtension
   }
@@ -249,29 +258,25 @@ if (
       require("./scripts/rescript_format.js").main(
         process.argv.slice(3),
         rescript_exe,
-        bsc_exe
-      );
-      break;
-    case "dump":
-      require("./scripts/rescript_dump.js").main(
-        process.argv.slice(3),
-        rescript_exe,
-        bsc_exe
+        bsc_exe,
+        resConfigFile
       );
       break;
     case "dump":
       require("./scripts/rescript_dump.js").main(
         process.argv.slice(3),
         rescript_exe,
-        bsc_exe
+        bsc_exe,
+        resConfigFile
       );
       break;
     case "convert":
       // Todo
       require("./scripts/rescript_convert.js").main(
         process.argv.slice(3),
         rescript_exe,
-        bsc_exe
+        bsc_exe,
+        resConfigFile
       );
       break;
     case "-h":
@@ -312,6 +317,11 @@ if (
   }
 
   verbose = delegate_args.includes("-verbose");
+
+  if (!delegate_args.includes("-config")) {
+    delegate_args = delegate_args.concat(["-project", resConfigFile]);
+  }
+
   /**
    * @type {child_process.ChildProcess}
    */
@@ -373,7 +383,7 @@ if (
       watch_generated = watch_config.generated;
       // close and remove all unused watchers
       watchers = watchers.filter(function (watcher) {
-        if (watcher.dir === bsconfig) {
+        if (watcher.dir === resConfig) {
           return true;
         } else if (watch_files.indexOf(watcher.dir) < 0) {
           dlog(`${watcher.dir} is no longer watched`);
@@ -583,7 +593,7 @@ if (
       }
     }
 
-    watchers.push({ watcher: fs.watch(bsconfig, on_change), dir: bsconfig });
+    watchers.push({ watcher: fs.watch(resConfig, on_change), dir: resConfig });
     build(0);
   }
 }

scripts/rescript_convert.js

@@ -67,7 +67,7 @@ function handleOneFile(file, bsc_exe) {
  * @param {string} rescript_exe
  * @param {string} bsc_exe
  */
-function main(argv, rescript_exe, bsc_exe) {
+function main(argv, rescript_exe, bsc_exe, project_path) {
   try {
     /**
      * @type {string[]}
@@ -88,7 +88,7 @@ function main(argv, rescript_exe, bsc_exe) {
       // TODO: check the rest arguments
       var output = child_process.spawnSync(
         rescript_exe,
-        ["info", "-list-files"],
+        ["info", "-list-files", "-project", project_path],
         {
           encoding: "utf-8",
         }

scripts/rescript_dump.js

@@ -15,7 +15,7 @@ var specs = [];
  * @param {string} rescript_exe
  * @param {string} bsc_exe
  */
-function main(argv, rescript_exe, bsc_exe) {
+function main(argv, rescript_exe, bsc_exe, project_path) {
   var target;
   arg.parse_exn(dump_usage, argv, specs, xs => {
     if (xs.length !== 1) {
@@ -30,9 +30,11 @@ function main(argv, rescript_exe, bsc_exe) {
     process.exit(2);
   }
 
-  var output = child_process.spawnSync(rescript_exe, ["build", "--", target], {
-    encoding: "utf-8",
-  });
+  var output = child_process.spawnSync(
+    rescript_exe,
+    ["build", "-project", project_path, "--", target],
+    { encoding: "utf-8" }
+  );
   if (output.status !== 0) {
     console.log(output.stdout);
     console.error(output.stderr);

scripts/rescript_format.js

@@ -73,15 +73,21 @@ async function readStdin() {
  * @param {(x: string) => boolean} isSupportedFile
  * @param {boolean} checkFormatting
  */
-async function formatFiles(files, bsc_exe, isSupportedFile, checkFormatting) {
+async function formatFiles(
+  files,
+  bsc_exe,
+  project_path,
+  isSupportedFile,
+  checkFormatting
+) {
   var incorrectlyFormattedFiles = 0;
   try {
     const _promises = await Promise.all(
       files.map(async file => {
         if (isSupportedFile(file)) {
           const flags = checkFormatting
-            ? ["-format", file]
-            : ["-o", file, "-format", file];
+            ? ["-project", project_path, "-format", file]
+            : ["-project", project_path, "-o", file, "-format", file];
           const { stdout } = await asyncExecFile(bsc_exe, flags);
           if (check.val) {
             const original = await asyncFs.readFile(file, "utf-8");
@@ -115,7 +121,7 @@ async function formatFiles(files, bsc_exe, isSupportedFile, checkFormatting) {
  * @param {string} rescript_exe
  * @param {string} bsc_exe
  */
-async function main(argv, rescript_exe, bsc_exe) {
+async function main(argv, rescript_exe, bsc_exe, project_path) {
   var isSupportedFile = hasExtension(formattedFileExtensions);
   var isSupportedStd = hasExtension(formattedStdExtensions);
 
@@ -160,7 +166,13 @@ async function main(argv, rescript_exe, bsc_exe) {
         process.exit(2);
       }
       files = output.stdout.split("\n").map(x => x.trim());
-      await formatFiles(files, bsc_exe, isSupportedFile, check.val);
+      await formatFiles(
+        files,
+        bsc_exe,
+        project_path,
+        isSupportedFile,
+        check.val
+      );
     } else if (use_stdin) {
       if (check.val) {
         console.error("format -stdin cannot be used with -check flag");
@@ -183,7 +195,7 @@ async function main(argv, rescript_exe, bsc_exe) {
           process.addListener("exit", () => fs.unlinkSync(filename));
           child_process.execFile(
             bsc_exe,
-            ["-format", filename],
+            ["-project", project_path, "-format", filename],
             (error, stdout, stderr) => {
               if (error === null) {
                 process.stdout.write(stdout);
@@ -214,7 +226,13 @@ async function main(argv, rescript_exe, bsc_exe) {
           process.exit(2);
         }
       }
-      await formatFiles(files, bsc_exe, isSupportedFile, check.val);
+      await formatFiles(
+        files,
+        bsc_exe,
+        project_path,
+        isSupportedFile,
+        check.val
+      );
     }
   } catch (e) {
     if (e instanceof arg.ArgError) {