ref: use pkg/shakar instead of internal sugar code

Author: xTrayambak

ferus.nimble

@@ -32,6 +32,7 @@ requires "glfw >= 3.4.0.4"
 requires "whisky >= 0.1.3"
 requires "npeg >= 1.3.0"
 requires "webidl2nim >= 0.0.1"
+requires "shakar >= 0.1.3"
 
 task niskriya, "Build Niskriya, the WebIDL to Nim source generator":
   exec "nim c --define:release --out:niskriya tools/niskriya.nim"

src/components/argparser.nim

@@ -1,5 +1,5 @@
 import std/[os, parseopt, logging, tables, options]
-import ../components/shared/sugar
+import pkg/shakar
 
 type Input* = object
   arguments*: seq[string]

src/components/ipc/client/client.nim

@@ -1,4 +1,5 @@
-import std/[os, net, options, sugar, times, sets], jsony
+import std/[os, net, options, sugar, times, sets]
+import pkg/jsony
 import ../shared
 
 when not defined(ferusInJail):

src/components/js/process.nim

@@ -1,12 +1,12 @@
 import std/[logging, json, net]
 import
-  pkg/jsony,
+  pkg/[jsony, shakar],
   pkg/simdutf/base64,
   pkg/bali/grammar/prelude,
   pkg/bali/runtime/prelude,
   pkg/bali/stdlib/console
 import
-  ../../components/shared/[nix, sugar],
+  ../../components/shared/[nix],
   ../../components/ipc/client/prelude,
   ../../components/web/[window],
   ../../components/web/document as jsdoc,

src/components/layout/processor.nim

@@ -1,11 +1,10 @@
 ## Yoga-based layout engine
 import std/[logging, strutils, tables, importutils, options]
-import pkg/[pixie, vmath, pretty]
+import pkg/[pixie, vmath, pretty, shakar]
 import ../../bindings/yoga
 import ../../components/parsers/html/document
 import ../../components/parsers/css/[parser, anb, types]
 import ../../components/style/[selector_engine, style_matcher, functions]
-import ../../components/shared/sugar
 import ../../components/ipc/[client/prelude, shared]
 
 type

src/components/master/master.nim

@@ -4,13 +4,13 @@
 
 import std/[os, logging, osproc, strutils, options, net, sets, terminal, posix, tables]
 import
-  pkg/[jsony, pretty],
+  pkg/[jsony, pretty, shakar],
   pkg/sanchar/parse/url,
   pkg/sanchar/proto/http/shared,
   pkg/simdutf/base64
 
 import
-  ../../components/shared/[nix, sugar],
+  ../../components/shared/[nix],
   ../../components/
     [network/ipc, renderer/ipc, parsers/html/ipc, parsers/html/document, js/ipc],
   ../../components/web/cookie/parsed_cookie,

src/components/network/ipc.nim

@@ -2,9 +2,9 @@
 import std/[options]
 import pkg/sanchar/parse/url,
        pkg/sanchar/proto/http/shared,
-       pkg/simdutf/base64
-import ../../components/ipc/shared,
-       ../../components/shared/[sugar]
+       pkg/simdutf/base64,
+       pkg/[shakar]
+import ../../components/ipc/shared
 #!fmt: on
 
 type

src/components/network/process.nim

@@ -1,6 +1,6 @@
 import std/[strutils, sequtils, importutils, logging, options, os, json, net]
 import
-  pkg/[pretty, whisky, jsony],
+  pkg/[pretty, whisky, jsony, shakar],
   pkg/sanchar/[http, proto/http/shared],
   pkg/sanchar/parse/url,
   pkg/simdutf/base64
@@ -10,7 +10,7 @@ when defined(ferusUseCurl):
   import pkg/webby/httpheaders, pkg/curly #!fmt:on
 
 import
-  ../../components/shared/[nix, sugar],
+  ../../components/shared/[nix],
   ../../components/network/[websocket, types, ipc],
   ../../components/build_utils,
   ../../components/ipc/client/prelude

src/components/network/websocket.nim

@@ -1,10 +1,9 @@
 ## WebSocket logic
 ## This currently uses the Whisky library, but there are plans to use a homegrown implementation sooner or later.
 import std/[importutils, net]
-import pkg/[jsony, whisky]
+import pkg/[jsony, whisky, shakar]
 import ../ipc/client/prelude
 import ../js/ipc
-import ../shared/sugar
 import ./[types, ipc]
 
 privateAccess(WebSocket)

src/components/parsers/css/parser.nim

@@ -1,8 +1,8 @@
+#!fmt:off
 import std/[strutils, tables, options]
-import stylus/[parser, shared, tokenizer], results
-import pkg/pretty
 import ./[types, selector_parser, anb, keywords, units]
-import ../../shared/sugar
+import pkg/stylus/[parser, shared, tokenizer], pkg/[shakar, pretty, results]
+#!fmt:on
 
 type CSSParser* = ref object
   state*: Parser