Move JS wrapper into Monoucha

Operation "modularize Chawan somewhat" part 3

5 files changed, 27 insertions, 24 deletions

diff --git a/src/local/client.nim b/src/local/client.nim
index a14ce63c..4b81f668 100644
--- a/src/local/client.nim
+++ b/src/local/client.nim
@@ -9,8 +9,6 @@ import std/strutils
 import std/tables
 import std/unicode
 
-import bindings/constcharp
-import bindings/quickjs
 import config/config
 import html/catom
 import html/chadombuilder
@@ -30,16 +28,9 @@ import js/base64
 import js/console
 import js/domexception
 import js/encoding
-import js/fromjs
 import js/intl
-import js/javascript
-import js/jserror
 import js/jsmodule
-import js/jsopaque
-import js/jstypes
-import js/jsutils
 import js/timeout
-import js/tojs
 import loader/headers
 import loader/loader
 import loader/request
@@ -47,6 +38,15 @@ import local/container
 import local/lineedit
 import local/pager
 import local/term
+import monoucha/constcharp
+import monoucha/fromjs
+import monoucha/javascript
+import monoucha/jserror
+import monoucha/jsopaque
+import monoucha/jstypes
+import monoucha/jsutils
+import monoucha/quickjs
+import monoucha/tojs
 import server/buffer
 import server/forkserver
 import types/blob
diff --git a/src/local/container.nim b/src/local/container.nim
index 00553190..8439b32a 100644
--- a/src/local/container.nim
+++ b/src/local/container.nim
@@ -3,6 +3,7 @@ import std/net
 import std/options
 import std/os
 import std/posix
+import std/tables
 import std/unicode
 
 import config/config
@@ -12,18 +13,19 @@ import io/dynstream
 import io/promise
 import io/serversocket
 import io/socketstream
-import js/javascript
-import js/jsregex
-import js/jstypes
 import layout/renderdocument
 import loader/headers
 import loader/loader
 import loader/request
 import local/select
+import monoucha/javascript
+import monoucha/jsregex
+import monoucha/jstypes
 import server/buffer
 import types/cell
 import types/color
 import types/cookie
+import types/opt
 import types/referrer
 import types/url
 import types/winattrs
diff --git a/src/local/lineedit.nim b/src/local/lineedit.nim
index 04507de7..22fd3988 100644
--- a/src/local/lineedit.nim
+++ b/src/local/lineedit.nim
@@ -1,8 +1,8 @@
 import std/strutils
 import std/unicode
 
-import bindings/quickjs
-import js/javascript
+import monoucha/quickjs
+import monoucha/javascript
 import types/cell
 import types/opt
 import types/winattrs
diff --git a/src/local/pager.nim b/src/local/pager.nim
index 367802d9..8eb42b65 100644
--- a/src/local/pager.nim
+++ b/src/local/pager.nim
@@ -8,8 +8,6 @@ import std/selectors
 import std/tables
 import std/unicode
 
-import bindings/libregexp
-import bindings/quickjs
 import config/chapath
 import config/config
 import config/mailcap
@@ -21,13 +19,6 @@ import io/socketstream
 import io/stdio
 import io/tempfile
 import io/urlfilter
-import js/fromjs
-import js/javascript
-import js/jserror
-import js/jsregex
-import js/jstypes
-import js/jsutils
-import js/tojs
 import loader/connecterror
 import loader/headers
 import loader/loader
@@ -36,6 +27,15 @@ import local/container
 import local/lineedit
 import local/select
 import local/term
+import monoucha/fromjs
+import monoucha/javascript
+import monoucha/jserror
+import monoucha/jsregex
+import monoucha/jstypes
+import monoucha/jsutils
+import monoucha/libregexp
+import monoucha/quickjs
+import monoucha/tojs
 import server/buffer
 import server/forkserver
 import types/cell
@@ -46,6 +46,7 @@ import types/url
 import types/winattrs
 import utils/luwrap
 import utils/mimeguess
+import utils/regexutils
 import utils/strwidth
 import utils/twtstr
 
diff --git a/src/local/select.nim b/src/local/select.nim
index 997eff1c..9e2f2c22 100644
--- a/src/local/select.nim
+++ b/src/local/select.nim
@@ -1,6 +1,6 @@
 import std/unicode
 
-import js/jsregex
+import monoucha/jsregex
 import server/buffer
 import types/cell
 import utils/luwrap