diff --git a/src/create/approaches.nim b/src/create/approaches.nim index 90b1ffd1..2583b14c 100644 --- a/src/create/approaches.nim +++ b/src/create/approaches.nim @@ -1,5 +1,4 @@ import std/[os, strformat, strutils] -import pkg/jsony import ".."/[fmt/approaches, helpers, sync/sync_common, types_track_config, types_approaches_config, uuid/uuid] diff --git a/src/create/articles.nim b/src/create/articles.nim index 91009274..fd6be03a 100644 --- a/src/create/articles.nim +++ b/src/create/articles.nim @@ -1,5 +1,4 @@ import std/[os, strformat, strutils] -import pkg/jsony import ".."/[fmt/articles, helpers, sync/sync_common, types_track_config, types_articles_config, uuid/uuid] diff --git a/src/fmt/exercises.nim b/src/fmt/exercises.nim index 5b0cf260..25064d6a 100644 --- a/src/fmt/exercises.nim +++ b/src/fmt/exercises.nim @@ -1,5 +1,4 @@ import std/[json, options, os, sets, strformat, strutils] -import pkg/jsony import ".."/[helpers, sync/sync_common, types_exercise_config, types_track_config] func filesKeyOrder(val: ConceptExerciseFiles | PracticeExerciseFiles; diff --git a/src/fmt/track_config.nim b/src/fmt/track_config.nim index f4c5db57..4c3bfe50 100644 --- a/src/fmt/track_config.nim +++ b/src/fmt/track_config.nim @@ -1,5 +1,4 @@ import std/[algorithm, sequtils, json, options, sets, strformat] -import pkg/jsony import ".."/[helpers, sync/sync_common, types_track_config] func trackConfigKeyOrderForFmt(e: TrackConfig): seq[TrackConfigKey] = diff --git a/src/helpers.nim b/src/helpers.nim index 06db68f6..79dbfdff 100644 --- a/src/helpers.nim +++ b/src/helpers.nim @@ -1,6 +1,7 @@ import std/[algorithm, os, parseutils, strformat, strscans, strutils, terminal] import pkg/jsony import "."/cli +export jsony # Ensures `parseHook`s are visible at call sites. template withDir*(dir: string; body: untyped): untyped = ## Changes the current directory to `dir` temporarily. diff --git a/src/sync/sync.nim b/src/sync/sync.nim index e3d0c6e8..99de5013 100644 --- a/src/sync/sync.nim +++ b/src/sync/sync.nim @@ -1,5 +1,4 @@ import std/[os, sequtils, strformat, strutils, terminal] -import pkg/jsony # This is not always used, but removing it will make tests fail. import ".."/[cli, helpers, logger, types_track_config] import "."/[exercises, probspecs, sync_common, sync_docs, sync_filepaths, sync_metadata, sync_tests] diff --git a/src/sync/sync_filepaths.nim b/src/sync/sync_filepaths.nim index d3244198..c97e95e2 100644 --- a/src/sync/sync_filepaths.nim +++ b/src/sync/sync_filepaths.nim @@ -1,5 +1,4 @@ import std/[os, strformat, strutils] -import pkg/jsony # This is not always used, but removing it will make tests fail. import ".."/[cli, fmt/exercises, helpers, logger, types_exercise_config, types_track_config] import "."/sync_common diff --git a/src/types_track_config.nim b/src/types_track_config.nim index bcf06a65..0011373e 100644 --- a/src/types_track_config.nim +++ b/src/types_track_config.nim @@ -1,5 +1,4 @@ import std/[hashes, options, sets] -import pkg/jsony import "."/[cli, helpers] type diff --git a/tests/test_fmt.nim b/tests/test_fmt.nim index eb8966ee..c825ba50 100644 --- a/tests/test_fmt.nim +++ b/tests/test_fmt.nim @@ -1,5 +1,4 @@ import std/[importutils, json, os, options, random, strutils, unittest] -import pkg/jsony import exec, fmt/exercises, helpers, sync/sync_common, types_exercise_config const