Developer Experience - Speed up Oni2 build (onivim#241)

* Refactor libs to not need top-level libraries

* Only build Oni2 in main package.json

* Add test.json

* Update build steps

* Add test.esy.lock

* Add hygiene check for '@test' sandbox

* Update tests to point to new lbs

* Update missed test

* Fix libs

* Update test.json

* Wire test/bench back up

* Fix nested describe

* Update lockfile

* Update BufferViewTokenizer tests

* Update lockfile

* Update test instructions

.ci/esy-build-steps.yml

@@ -9,7 +9,9 @@ steps:
     displayName: 'Bootstrap Oni2 setup with system specific build variables'
   - script: esy build
     displayName: 'Build: esy build'
-  - script: esy test-ci
+  - script: esy @test install
+    displayName: 'Test: install'
+  - script: esy @test run
     displayName: 'Unit Tests: esy test-ci (round 1)'
   # TODO: Stabilize and bring back!
   # - script: esy x OniUnitTestRunner
@@ -28,5 +30,5 @@ steps:
     displayName: "Bench: install"
   - script: esy @bench build
     displayName: "Bench: build"
-  - script: esy @bench x oni-bench
+  - script: esy @bench run
     displayName: "Bench: run"

.ci/esy-check-hygiene.yml

@@ -14,6 +14,10 @@ steps:
     displayName: 'esy @bench install'
   - script: git diff --exit-code
     displayName: 'check that `bench.esy.lock` is up-to-date. If this fails, commit `bench.esy.lock` changes and re-submit PR.'
+  - script: esy @test install
+    displayName: 'esy @test install'
+  - script: git diff --exit-code
+    displayName: 'check that `test.esy.lock` is up-to-date. If this fails, commit `test.esy.lock` changes and re-submit PR.'
   - script: esy bootstrap
     displayName: 'esy bootstrap'
   - script: esy build

README.md

@@ -62,13 +62,15 @@ The goal of this project is to build an editor that doesn't exist today - the _s
 
 ### Tests
 
-- `esy test`
+- `esy '@test' install`
+- `esy '@test' build`
+- `esy '@test' run`
 
 ### Benchmarks
 
 - `esy '@bench' install`
 - `esy '@bench' build`
-- `esy '@bench' x oni-bench`
+- `esy '@bench' run`
 
 ## Documentation
 

bench.json

@@ -1,7 +1,7 @@
 {
   "source": "./package.json",
   "scripts": {
-    "run": "esy '@bench' x oni-bench"
+    "run": "esy '@bench' x OniBench"
   },
   "override": {
       "build": ["dune build --root . -j4"],

bench/exe/OniBench.re

@@ -0,0 +1 @@
+OniBenchLib.BenchFramework.cli();

bench/exe/dune

@@ -1,6 +1,7 @@
 (executable
-    (name bench)
-    (public_name oni-bench)
+    (name OniBench)
+    (public_name OniBench)
+    (modules OniBench)
     (libraries OniBench.lib)
     (package OniBench)
 )

bench/lib/dune

@@ -1,6 +1,6 @@
 (library
-    (name OniBench)
+    (name OniBenchLib)
     (public_name OniBench.lib)
     (ocamlopt_flags -linkall)
-    (libraries Oni_Core Oni_Neovim Oni_UI reperf.lib)
+    (libraries Oni2.core Oni2.neovim Oni2.ui reperf.lib)
 )

dune

@@ -0,0 +1 @@
+(ignored_subdirs (node_modules _esy vendor extensions esy.lock bench.esy.lock test.esy.lock))

package.json

@@ -4,16 +4,9 @@
   "description": "Lightweight code editor",
   "license": "MIT",
   "esy": {
-    "build": "refmterr dune build --root . -j4",
+    "build": "refmterr dune build -p Oni2 -j4",
     "install": [
-      "esy-installer Oni2.install",
-      "esy-installer Oni_Core.install",
-      "esy-installer Oni_Extensions.install",
-      "esy-installer Oni_Model.install",
-      "esy-installer Oni_Store.install",
-      "esy-installer Oni_UI.install",
-      "esy-installer Oni_Neovim.install",
-      "esy-installer OniUnitTestRunner.install"
+      "esy-installer Oni2.install"
     ]
   },
   "scripts": {

src/editor/Core/dune

@@ -1,6 +1,6 @@
 (library
     (name Oni_Core)
-    (public_name Oni_Core)
+    (public_name Oni2.core)
     (libraries 
         str
         bigarray

src/editor/Extensions/dune

@@ -1,6 +1,6 @@
 (library
     (name Oni_Extensions)
-    (public_name Oni_Extensions)
+    (public_name Oni2.extensions)
     (libraries
         str
         bigarray
@@ -15,6 +15,6 @@
         ppx_deriving.runtime
         ppx_deriving_yojson.runtime
         reason-jsonrpc
-        Oni_Core
+        Oni2.core
     )
     (preprocess (pps ppx_deriving_yojson ppx_deriving.show)))

src/editor/Model/dune

@@ -1,6 +1,6 @@
 (library
     (name Oni_Model)
-    (public_name Oni_Model)
+    (public_name Oni2.model)
     (libraries 
         str
         bigarray
@@ -16,8 +16,8 @@
         ppx_deriving_yojson.runtime
         reason-jsonrpc
         isolinear
-        Oni_Core
-        Oni_Extensions
+        Oni2.core
+        Oni2.extensions
         ReasonFuzz
     )
     (preprocess (pps ppx_deriving_yojson ppx_deriving.show)))

src/editor/Neovim/dune

@@ -1,6 +1,6 @@
 (library
     (name Oni_Neovim)
-    (public_name Oni_Neovim)
+    (public_name Oni2.neovim)
     (libraries
         str
         bigarray
@@ -9,8 +9,8 @@
         msgpck
         lwt
         lwt.unix
-        Oni_Core
-        Oni_Model
+        Oni2.core
+        Oni2.model
         Rench
         Revery
         ppx_deriving.runtime

src/editor/Store/dune

@@ -1,16 +1,16 @@
 (library
     (name Oni_Store)
-    (public_name Oni_Store)
+    (public_name Oni2.store)
     (libraries 
         Rench
         Revery
         yojson
         ppx_deriving.runtime
         ppx_deriving_yojson.runtime
-        Oni_Core
-        Oni_Model
-        Oni_Neovim
-        Oni_Extensions
+        Oni2.core
+        Oni2.model
+        Oni2.neovim
+        Oni2.extensions
         isolinear
     )
     (preprocess (pps ppx_deriving_yojson ppx_deriving.show)))

src/editor/UI/dune

@@ -1,6 +1,6 @@
 (library
     (name Oni_UI)
-    (public_name Oni_UI)
+    (public_name Oni2.ui)
     (libraries 
         str
         bigarray
@@ -9,8 +9,8 @@
         msgpck
         lwt
         lwt.unix
-        Oni_Core
-        Oni_Model
+        Oni2.core
+        Oni2.model
         Rench
         Revery
     ))

src/editor/bin/dune

@@ -13,12 +13,12 @@
         lwt.unix
         Rench
         Revery
-        Oni_Core
-        Oni_Extensions
-        Oni_Neovim
-        Oni_Model
-        Oni_Store
-        Oni_UI
+        Oni2.core
+        Oni2.extensions
+        Oni2.neovim
+        Oni2.model
+        Oni2.store
+        Oni2.ui
             )
   (preprocess (
                pps

test.esy.lock/.gitattributes

@@ -0,0 +1,3 @@
+
+# Set eol to LF so files aren't converted to CRLF-eol on Windows.
+* text eol=lf

test.esy.lock/.gitignore

@@ -0,0 +1,3 @@
+
+# Reset any possible .gitignore, we want all esy.lock to be un-ignored.
+!*