prepare watcher for bs-platform itself

Author: bobzhang

Diff for: .vscode/tasks.json

@@ -1,39 +1,36 @@
 {
-    // See https://go.microsoft.com/fwlink/?LinkId=733558
-    // for the documentation about the tasks.json format
     "version": "0.1.0",
-    "command": "make",
+    "command": "node",
+    "options": {
+        "cwd": "${workspaceRoot}/jscomp"
+    },
     "isShellCommand": true,
-    "showOutput": "always",
-    "tasks": [
-        {
-            "taskName": "bsb",
-            "args": [
-                "-C",
-                "jscomp",
-                "bin/bsb.exe"
-            ],
-            "showOutput": "silent",
-            "isBuildCommand": true,
-            "problemMatcher": {
-                // "fileLocation": "absolute",
-                "owner": "ocaml",
-                "pattern": [
-                    {
-                        "regexp": "^File \"(.*)\", line (\\d+)(?:, characters (\\d+)-(\\d+))?:$",
-                        "file": 1,
-                        "line": 2,
-                        "column": 3,
-                        "endColumn": 4
-                    },
-                    {
-                        "regexp": "^(?:(?:Parse\\s+)?(Warning|[Ee]rror)(?:\\s+\\d+)?:)?\\s+(.*)$",
-                        "severity": 1,
-                        "message": 2,
-                        "loop": true
-                    }
-                ]
+    "args": [
+        "../scripts/watcher.js"
+    ],    
+    "isBackground": true,
+    "problemMatcher": {
+        "fileLocation": "absolute",
+        "owner": "ocaml",
+        "watching": {
+            "activeOnStart": true,
+            "beginsPattern": ">>>> Start compiling",
+            "endsPattern": ">>>> Finish compiling"
+        },
+        "pattern": [
+            {
+                "regexp": "^File \"(.*)\", line (\\d+)(?:, characters (\\d+)-(\\d+))?:$",
+                "file": 1,
+                "line": 2,
+                "column": 3,
+                "endColumn": 4
+            },
+            {
+                "regexp": "^(?:(?:Parse\\s+)?(Warning|[Ee]rror)(?:\\s+\\d+)?:)?\\s+(.*)$",
+                "severity": 1,
+                "message": 2,
+                "loop": true
             }
-        }
-    ]
+        ]
+    }
 }

Diff for: jscomp/bin/bsb_watcher.future.js

@@ -0,0 +1,212 @@
+'use strict';
+
+var Path = require('path');
+var Process = require('process');
+var Fs = require('fs');
+var Child_process = require('child_process');
+
+function filterInPlace(p, a) {
+  var i = 0;
+  var j = 0;
+  while(i < a.length) {
+    var v = a[i];
+    if (p(v)) {
+      a[j] = v;
+      j = j + 1 | 0;
+    }
+    i = i + 1 | 0;
+  }
+  a.splice(j);
+  return /* () */0;
+}
+
+function memByRef(x, xs) {
+  return +(xs.indexOf(x) >= 0);
+}
+
+
+/* No side effect */
+
+function getExn(x) {
+  if (x) {
+    return x[0];
+  } else {
+    var str = " " + (String("File \"bs_option.ml\", line 39, characters 34-42") + ": Bs.Option.unsafeGet");
+    throw new Error(str);
+  }
+}
+
+
+/* No side effect */
+
+function undefined_to_opt(x) {
+  if (x === undefined) {
+    return /* None */0;
+  } else {
+    return /* Some */[x];
+  }
+}
+
+
+/* No side effect */
+
+/* unsafeDeleteKey Not a pure module */
+
+function putEnvVar(key, $$var) {
+  Process.env[key] = $$var;
+  return /* () */0;
+}
+
+
+/* Js_dict Not a pure module */
+
+function getWatchFiles(file) {
+  if (Fs.existsSync(file)) {
+    return Fs.readFileSync(file, "utf8").split("\n").filter(function (x) {
+                return +(x.trim().length !== 0);
+              });
+  } else {
+    return /* array */[];
+  }
+}
+
+function makeEventObj() {
+  return {
+          events: /* array */[],
+          empty: function () {
+            var self = this;
+            var a = self.events;
+            a.splice(0);
+            return /* () */0;
+          },
+          push: function (a) {
+            var self = this;
+            var xs = self.events;
+            xs.push(a);
+            return /* () */0;
+          },
+          needRebuild: function () {
+            var self = this;
+            return +(self.events.length !== 0);
+          },
+          currentEvents: function () {
+            var self = this;
+            return self.events;
+          }
+        };
+}
+
+function makeLock() {
+  return {
+          isBuilding: /* false */0,
+          acquire: function () {
+            var self = this;
+            if (self.isBuilding) {
+              return /* false */0;
+            } else {
+              self.isBuilding = /* true */1;
+              return /* true */1;
+            }
+          },
+          release: function () {
+            var self = this;
+            return self.isBuilding = /* false */0;
+          }
+        };
+}
+
+function build(cmd, $$event, lock, idle) {
+  if (lock.acquire()) {
+    console.log(">>>> Start compiling");
+    var events = $$event.currentEvents();
+    console.log("Rebuilding since " + (String(events) + " "));
+    $$event.empty();
+    Child_process.spawn(cmd, ( [ ]), ( { "stdio" : "inherit" })).on("exit", function () {
+          console.log(">>>> Finish compiling");
+          lock.release();
+          if ($$event.needRebuild()) {
+            return build(cmd, $$event, lock, idle);
+          } else {
+            return idle();
+          }
+        });
+    return /* () */0;
+  } else {
+    return 0;
+  }
+}
+
+function makeWatcher(file, onChange) {
+  return /* record */[
+          /* dir */file,
+          /* watcher */Fs.watch(file, onChange)
+        ];
+}
+
+
+/*  Not a pure module */
+
+var sourceDirs = Path.join("lib", "bs", ".sourcedirs");
+
+var lock = makeLock(/* () */0);
+
+var events = makeEventObj(/* () */0);
+
+var watchers = /* array */[];
+
+var source_dirname = getExn(undefined_to_opt(typeof (__dirname) === "undefined" ? undefined : (__dirname)));
+
+var bsb = Path.join(source_dirname, "bsb.exe");
+
+var bsconfig = "bsconfig.json";
+
+function onChange(eventType, fileName) {
+  console.log("Event " + (String(eventType) + (" " + (String(fileName) + ""))));
+  events.push(/* tuple */[
+        eventType,
+        fileName
+      ]);
+  return build(bsb, events, lock, function () {
+              return idle(/* () */0);
+            });
+}
+
+function idle() {
+  var watchFiles = getWatchFiles(sourceDirs);
+  filterInPlace(function (param) {
+        var dir = param[/* dir */0];
+        if (dir === bsconfig || memByRef(dir, watchFiles)) {
+          return /* true */1;
+        } else {
+          console.log(" " + (String(dir) + " is no longer watched"));
+          param[/* watcher */1].close();
+          return /* false */0;
+        }
+      }, watchers);
+  watchFiles.forEach(function (dir) {
+        if (watchers.some(function (param) {
+                return +(param[/* dir */0] === dir);
+              })) {
+          return 0;
+        } else {
+          console.log("watching dir " + (String(dir) + " now "));
+          var x = makeWatcher(dir, onChange);
+          watchers.push(x);
+          return /* () */0;
+        }
+      });
+  return /* () */0;
+}
+
+putEnvVar("BS_VSCODE", "1");
+
+var x = makeWatcher(bsconfig, onChange);
+
+watchers.push(x);
+
+build(bsb, events, lock, function () {
+      return idle(/* () */0);
+    });
+
+
+/* sourceDirs Not a pure module */

Diff for: jscomp/install-bsb-watcher.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# dev small utils
+# hot replace global bsb.exe for quick testing
+cp bin/bsb_watcher.js /usr/local/lib/node_modules/bs-platform/bin/

Diff for: jscomp/others/.depend

@@ -12,6 +12,10 @@ js_json.cmj : js_types.cmj js_string.cmj js_dict.cmj js_array.cmj \
 js_obj.cmj :
 bs_dyn.cmj : bs_dyn.cmi
 bs_dyn_lib.cmj : bs_dyn.cmj bs_dyn_lib.cmi
+bs_array.cmj : js_array.cmj bs_array.cmi
+bs_list.cmj : bs_list.cmi
+bs_option.cmj : bs_option.cmi
+bs_result.cmj :
 node_child_process.cmj : node.cmj
 js_boolean.cmj : js_boolean.cmi
 js_math.cmj :
@@ -27,6 +31,9 @@ js_types.cmi :
 js_json.cmi : js_types.cmi js_string.cmj js_dict.cmi
 bs_dyn.cmi :
 bs_dyn_lib.cmi : bs_dyn.cmi
+bs_array.cmi :
+bs_list.cmi :
+bs_option.cmi :
 js_boolean.cmi :
 js_dict.cmi :
 js_cast.cmi :

Diff for: jscomp/others/Makefile

@@ -5,7 +5,8 @@ COMPILER=../bin/bsc.exe
 MAP_FILES= node bs
 
 SOURCE_LIST= node_path node_fs node_process dict node_module js_array js_string \
-	js_re js_null_undefined node_buffer js_types js_json js_obj bs_dyn bs_dyn_lib \
+	js_re js_null_undefined node_buffer js_types js_json js_obj \
+	bs_dyn bs_dyn_lib bs_array bs_list bs_option bs_result \
 	node_child_process js_boolean js_math js_dict js_date js_global js_cast js_promise dom
 
 $(addsuffix .cmj, $(SOURCE_LIST)): $(addsuffix .cmj, $(MAP_FILES))

Diff for: jscomp/others/bs.ml

@@ -29,3 +29,8 @@ module Dyn = Bs_dyn
 
 module Dyn_lib = Bs_dyn_lib
 (**/*)
+
+module Array = Bs_array
+module List = Bs_list 
+module Option = Bs_option 
+module Result = Bs_result

Diff for: jscomp/others/bs_array.ml

@@ -0,0 +1,64 @@
+(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
+
+type 'a t = 'a array
+
+(** @param a array 
+    @param p predicate 
+*)
+let filterInPlace p a = 
+  let  i = ref 0 in 
+  let j = ref 0 in 
+  while !i < Array.length a do 
+    let v = Array.unsafe_get a !i in 
+    if p v   [@bs] then 
+      begin 
+        Array.unsafe_set a !j v ;
+        incr j
+      end;
+    incr i 
+  done;
+  ignore @@ Js_array.removeFromInPlace ~pos:!j a 
+
+let empty a  = 
+  ignore @@ Js.Array.removeFromInPlace ~pos:0 a
+
+let pushBack x xs = 
+  ignore @@ Js.Array.push x xs 
+
+(** Find by JS (===)  equality *)
+let memByRef x xs = 
+  Js.Array.indexOf x xs >= 0 
+
+let iter f  xs = 
+  for i = 0 to Array.length xs - 1 do 
+    f (Array.unsafe_get xs i) [@bs]
+  done 
+
+(* here [f] is of type ['a -> 'b]
+let iterX f  xs = 
+  for i = 0 to Array.length xs - 1 do 
+    f (Array.unsafe_get xs i) 
+  done 
+*)