Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/leona/core.clj
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
(ns leona.core
(:refer-clojure :exclude [compile])
(:require [camel-snake-kebab.core :as csk]
[camel-snake-kebab.extras :as cske]
(:require [camel-snake-kebab.extras :as cske]
[clojure.spec.alpha :as s]
[clojure.string :as str]
[clojure.walk :as walk]
[com.walmartlabs.lacinia :as lacinia]
[com.walmartlabs.lacinia.resolve :as lacinia-resolve]
[com.walmartlabs.lacinia.schema :as lacinia-schema]
[com.walmartlabs.lacinia.util :as lacinia-util]
[leona.schema :as leona-schema]
[leona.util :as util]))

Expand Down
5 changes: 3 additions & 2 deletions src/leona/util.clj
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
(ns leona.util
(:require [camel-snake-kebab.core :as csk]
[clojure.spec.alpha :as s]
[clojure.string :as str]))
[clojure.string :as str])
(:import (java.util.regex Pattern)))

(defn replace-punctuation
[s]
Expand All @@ -16,7 +17,7 @@
(str/replace #"_XMARK_" "!")))

(defn- split-keep-delim
[s re-delim]
[^String s ^Pattern re-delim]
(let [m (.matcher re-delim s)]
((fn step [last-end]
(if (.find m)
Expand Down
17 changes: 8 additions & 9 deletions test/leona/custom_scalar_test.clj
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
(ns leona.custom-scalar-test
(:require [clj-time.core :as t]
[clj-time.format :as tf]
[clj-time.types :as tt]
[clojure.spec.alpha :as s]
[clojure.string :as str]
[clojure.test :refer :all]
[leona.core :as leona]
[leona.schema :as leona-schema]
[spec-tools.core :as st]))
(:require [clj-time.core :as t]
[clj-time.format :as tf]
[clj-time.types :as tt]
[clojure.spec.alpha :as s]
[clojure.test :refer :all]
[leona.core :as leona]
[leona.schema :as leona-schema]
[spec-tools.core :as st]))

(deftest custom-scalars-are-preserved-at-schema-time
(s/def ::date tt/date-time?)
Expand Down
12 changes: 6 additions & 6 deletions test/leona/real_schema_test.clj
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
(ns leona.real-schema-test
(:require [clojure.spec.alpha :as s]
[clojure.spec.gen.alpha :as gen]
[clojure.string :as str]
[clojure.test :refer :all]
[leona.core :as leona]
[leona.schema :as schema]))
(:require [clojure.spec.alpha :as s]
[clojure.spec.gen.alpha :as gen]
[clojure.string :as str]
[clojure.test :refer :all]
[leona.core :as leona]
[leona.schema :as schema]))

;; Location
(s/def :wh.location/street string?)
Expand Down
13 changes: 6 additions & 7 deletions test/leona/schema_test.clj
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
(ns leona.schema-test
(:require [clojure.spec.alpha :as s]
[clojure.test :refer :all]
[leona.core :as leona]
[leona.schema :as schema]
[leona.test-spec :as test]
[leona.util :as util]
[spec-tools.core :as st]))
(:require [clojure.spec.alpha :as s]
[clojure.test :refer :all]
[leona.schema :as schema]
[leona.test-spec :as test]
[leona.util :as util]
[spec-tools.core :as st]))

(deftest fix-references-test
(let [s {:objects {:Test {:fields {:b {:objects {:B {:fields {:a {:type '(non-null Int)}}}}},
Expand Down
3 changes: 1 addition & 2 deletions test/leona/test_spec.clj
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
(ns leona.test-spec
(:require [clojure.spec.alpha :as s]
[clojure.test :as t]))
(:require [clojure.spec.alpha :as s]))

(s/def ::primary-functions (s/coll-of string?))
(s/def ::home-planet string?)
Expand Down