Move JS wrapper into Monoucha

Operation "modularize Chawan somewhat" part 3

4 files changed, 21 insertions, 18 deletions

diff --git a/src/loader/headers.nim b/src/loader/headers.nim
index 21900189..ff7f9ed3 100644
--- a/src/loader/headers.nim
+++ b/src/loader/headers.nim
@@ -1,9 +1,10 @@
 import std/tables
 
-import bindings/quickjs
-import js/jserror
-import js/fromjs
-import js/javascript
+import monoucha/fromjs
+import monoucha/javascript
+import monoucha/jserror
+import monoucha/quickjs
+import types/opt
 import utils/twtstr
 
 type
diff --git a/src/loader/loader.nim b/src/loader/loader.nim
index 8bc23c16..c84f247a 100644
--- a/src/loader/loader.nim
+++ b/src/loader/loader.nim
@@ -33,15 +33,16 @@ import io/serversocket
 import io/socketstream
 import io/tempfile
 import io/urlfilter
-import js/jserror
-import js/javascript
 import loader/cgi
 import loader/connecterror
 import loader/headers
 import loader/loaderhandle
 import loader/request
 import loader/response
+import monoucha/javascript
+import monoucha/jserror
 import types/cookie
+import types/opt
 import types/referrer
 import types/urimethodmap
 import types/url
diff --git a/src/loader/request.nim b/src/loader/request.nim
index 1398d25f..fc6c43f5 100644
--- a/src/loader/request.nim
+++ b/src/loader/request.nim
@@ -2,15 +2,16 @@ import std/options
 import std/strutils
 import std/tables
 
-import bindings/quickjs
 import html/script
-import js/fromjs
-import js/javascript
-import js/jserror
-import js/jstypes
 import loader/headers
+import monoucha/fromjs
+import monoucha/javascript
+import monoucha/jserror
+import monoucha/jstypes
+import monoucha/quickjs
 import types/blob
 import types/formdata
+import types/opt
 import types/referrer
 import types/url
 
diff --git a/src/loader/response.nim b/src/loader/response.nim
index 4cf17c99..ca300957 100644
--- a/src/loader/response.nim
+++ b/src/loader/response.nim
@@ -1,22 +1,22 @@
 import std/strutils
 import std/tables
 
-import bindings/quickjs
+import chagashi/charset
+import chagashi/decoder
+import chagashi/validator
 import io/promise
 import io/socketstream
-import js/jserror
-import js/javascript
 import loader/headers
 import loader/request
+import monoucha/javascript
+import monoucha/jserror
+import monoucha/quickjs
 import types/blob
+import types/opt
 import types/url
 import utils/mimeguess
 import utils/twtstr
 
-import chagashi/charset
-import chagashi/decoder
-import chagashi/validator
-
 type
   ResponseType* = enum
     TYPE_DEFAULT = "default"