Added dependency from json-value

Author: 1602

elm-package.json

@@ -9,6 +9,7 @@
  ],
  "exposed-modules": [],
  "dependencies": {
+ "1602/json-value": "1.0.0 <= v < 2.0.0",
  "NoRedInk/elm-decode-pipeline": "3.0.0 <= v < 4.0.0",
  "elm-community/json-extra": "2.0.0 <= v < 3.0.0",
  "elm-community/list-extra": "6.1.0 <= v < 7.0.0",

src/EditableJsonValue.elm

@@ -1,11 +1,11 @@
 module EditableJsonValue exposing (EditableJsonValue(..), makeEditableJsonValue, makeJsonValue)
 
-import Json.Schema.Definitions as Schema
+import JsonValue
  exposing
  ( JsonValue
  ( ObjectValue
  , ArrayValue
- , BooleanValue
+ , BoolValue
  , NullValue
  , NumericValue
  , StringValue
@@ -34,7 +34,7 @@ makeEditableJsonValue jsonValue =
  NumericValue n ->
  NumericEValue n
 
- BooleanValue b ->
+ BoolValue b ->
  BoolEValue b
 
  NullValue ->
@@ -61,7 +61,7 @@ makeJsonValue editableJsonValue =
  NumericValue n
 
  BoolEValue b ->
- BooleanValue b
+ BoolValue b
 
  NullEValue ->
  NullValue

src/JsonInput.elm

@@ -68,17 +68,14 @@ import Helpers
  , setPropertyNameInJsonValue
  )
 import Validation
+import JsonValue exposing (JsonValue(ObjectValue, ArrayValue))
 import Json.Schema.Definitions as Schema
  exposing
  ( Schema(BooleanSchema, ObjectSchema)
  , SubSchema
  , Schemata(Schemata)
  , Type(AnyType, SingleType, NullableType, UnionType)
  , SingleType(IntegerType, NumberType, StringType, BooleanType)
- , JsonValue(ObjectValue, ArrayValue, BooleanValue, NullValue, NumericValue, StringValue)
- , jsonValueDecoder
- , encodeJsonValue
- , blankSchema
  )
 import EditableJsonValue
  exposing
@@ -139,7 +136,7 @@ init schema val =
  let
  jsonValue =
  val
- |> Decode.decodeValue jsonValueDecoder
+ |> Decode.decodeValue JsonValue.decoder
  |> Result.withDefault (ObjectValue [])
 
  editableJsonValue =
@@ -169,7 +166,7 @@ makeValidSchema jsonValue schema =
  let
  val =
  jsonValue
- |> encodeJsonValue
+ |> JsonValue.encode
  in
  schema
  |> Validation.validate val
@@ -180,7 +177,7 @@ makeValidSchema jsonValue schema =
 getValue : Model -> Value
 getValue model =
  model.jsonValue
- |> encodeJsonValue
+ |> JsonValue.encode
 
 
 updateValue : Model -> String -> Result String EditableJsonValue -> ( Model, ExternalMsg )
@@ -256,7 +253,7 @@ update msg model =
  |> getJsonValue (parseJsonPointer jsonPointer)
  |> Result.withDefault model.editableJsonValue
  |> EditableJsonValue.makeJsonValue
- |> encodeJsonValue
+ |> JsonValue.encode
  |> Encode.encode 4
  }
  , Select id
@@ -274,7 +271,7 @@ update msg model =
  -}
  ValueChange path str ->
  str
- |> decodeString jsonValueDecoder
+ |> decodeString JsonValue.decoder
  |> Result.map EditableJsonValue.makeEditableJsonValue
  |> updateValue { model | editValue = str, editPath = path } path
 
@@ -356,7 +353,7 @@ update msg model =
  ( { model
  | jsonValue =
  s
- |> Decode.decodeValue jsonValueDecoder
+ |> Decode.decodeValue JsonValue.decoder
  |> Result.withDefault (ObjectValue [])
  }
  , NoOp