Turns the standard AST JNumber into a safe constructor

README.md

@@ -33,6 +33,8 @@ Implementation is in `scalajson.ast.JValue`
       of a number (http://stackoverflow.com/a/13502497/1519631)
       - Equals will properly detect if two numbers are equal, i.e. `scalajson.ast.JNumber("34.00") == scalajson.ast.JNumber("34")`
       - Hashcode has been designed to provide consistent hash for numbers of unlimited precision.
+      - If you construct a JNumber with `Float.NaN`/`Float.PositiveInfinity`/`Float.NegativeInfinity`/`Double.NaN`/`Double.PositiveInfinity`/`Double.NegativeInfinity` it will return a `JNull`
+      - Also provides a `.fromString` function which you can use to create unlimited precision numbers. Returns an `Option[JNumber]` (will return `None` if `String` isn't a valid number)
     - `scalajson.ast.JObject` is an actual `Map[String,JValue]`. This means that it doesn't handle duplicate keys for a `scalajson.ast.JObject`,
     nor does it handle key ordering.
     - `scalajson.ast.JArray` is an `Vector`.
@@ -109,8 +111,7 @@ import scalajson.jNumberRegex
 "3535353".matches(jNumberRegex) // true
 ```
 
-Code of Conduct
-===============
+## Code of Conduct
 ScalaJSON uses the [Scala Code of Conduct](https://www.scala-lang.org/conduct.html)
 for all communication and discussion. This includes both GitHub, Gitter chat and
 other more direct lines of communication such as email.

js/src/main/scala/scalajson/ast/JValue.scala

@@ -50,15 +50,15 @@ final case class JString(value: String) extends JValue {
 }
 
 object JNumber {
-  def apply(value: Int): JNumber = JNumber(value.toString)
+  def apply(value: Int): JNumber = new JNumber(value.toString)
 
-  def apply(value: Integer): JNumber = JNumber(value.toString)
+  def apply(value: Integer): JNumber = new JNumber(value.toString)
 
-  def apply(value: Long): JNumber = JNumber(value.toString)
+  def apply(value: Long): JNumber = new JNumber(value.toString)
 
-  def apply(value: BigInt): JNumber = JNumber(value.toString())
+  def apply(value: BigInt): JNumber = new JNumber(value.toString())
 
-  def apply(value: BigDecimal): JNumber = JNumber(value.toString())
+  def apply(value: BigDecimal): JNumber = new JNumber(value.toString())
 
   /**
     * @param value
@@ -67,7 +67,7 @@ object JNumber {
   def apply(value: Double): JValue = value match {
     case n if n.isNaN => JNull
     case n if n.isInfinity => JNull
-    case _ => JNumber(value.toString)
+    case _ => new JNumber(value.toString)
   }
 
   /**
@@ -77,22 +77,26 @@ object JNumber {
   def apply(value: Float): JValue = value match {
     case n if java.lang.Float.isNaN(n) => JNull
     case n if n.isInfinity => JNull
-    case _ => JNumber(value.toString)
+    case _ => new JNumber(value.toString)
   }
+
+  def fromString(value: String): Option[JNumber] =
+    if (value.matches(jNumberRegex))
+      Some(new JNumber(value))
+    else
+      None
+
+  def unapply(arg: JNumber): Option[String] = Some(arg.underlying)
 }
 
 /** Represents a JSON number value. If you are passing in a
-  * NaN or Infinity as a [[scala.Double]], [[JNumber]] will
+  * NaN or Infinity as a [[scala.Double]] or [[scala.Float]], [[JNumber]] will
   * return a [[JNull]].
   *
   * @author Matthew de Detrich
-  * @throws scala.NumberFormatException - If the value is not a valid JSON Number
   */
-final case class JNumber(value: String) extends JValue {
-
-  if (!value.matches(jNumberRegex)) {
-    throw new NumberFormatException(value)
-  }
+final class JNumber(private[ast] val underlying: String) extends JValue {
+  @inline val value: String = underlying
 
   /**
     * Javascript specification for numbers specify a [[scala.Double]], so this is the default export method to `Javascript`
@@ -101,22 +105,40 @@ final case class JNumber(value: String) extends JValue {
     */
   def this(value: Double) = this(value.toString)
 
-  override def toUnsafe: unsafe.JValue = unsafe.JNumber(value)
+  override def toUnsafe: unsafe.JValue = unsafe.JNumber(underlying)
 
-  override def toJsAny: js.Any = value.toDouble match {
+  override def toJsAny: js.Any = underlying.toDouble match {
     case n if n.isNaN => null
     case n if n.isInfinity => null
     case n => n
   }
 
-  override def equals(obj: Any) =
+  override def equals(obj: Any): Boolean =
     obj match {
-      case jNumber: JNumber => numericStringEquals(value, jNumber.value)
+      case jNumber: JNumber =>
+        numericStringEquals(underlying, jNumber.underlying)
       case _ => false
     }
 
   override def hashCode: Int =
-    numericStringHashcode(value)
+    numericStringHashcode(underlying)
+
+  override def productElement(n: Int): Any =
+    if (n == 0)
+      underlying
+    else
+      throw new IndexOutOfBoundsException(n.toString)
+
+  override def productArity: Int = 1
+
+  override def canEqual(obj: Any): Boolean = {
+    obj match {
+      case _: JNumber => true
+      case _ => false
+    }
+  }
+
+  override def toString: String = s"JNumber($underlying)"
 }
 
 /** Represents a JSON Boolean value, which can either be a

js/src/main/scala/scalajson/ast/unsafe/JValue.scala

@@ -1,4 +1,5 @@
-package scalajson.ast.unsafe
+package scalajson.ast
+package unsafe
 
 import scalajson.ast
 import scalajson.ast._
@@ -84,7 +85,11 @@ object JNumber {
   */
 // JNumber is internally represented as a string, to improve performance
 final case class JNumber(value: String) extends JValue {
-  override def toStandard: ast.JValue = ast.JNumber(value)
+  override def toStandard: ast.JValue =
+    if (value.matches(jNumberRegex))
+      new ast.JNumber(value)
+    else
+      throw new NumberFormatException(value)
 
   def this(value: Double) = {
     this(value.toString)

js/src/test/scala/specs/JNumber.scala

@@ -123,28 +123,44 @@ object JNumber extends TestSuite with UTestScalaCheck {
       }.checkUTest()
 
     def hashCodeEqualsDecimal = {
-      scalajson.ast.JNumber("34").## == scalajson.ast.JNumber("34.0").##
+      scalajson.ast.JNumber.fromString("34").get.## == scalajson.ast.JNumber
+        .fromString("34.0")
+        .get
+        .##
     }
 
     def hashCodeEqualsDecimal2 = {
-      scalajson.ast.JNumber("34").## == scalajson.ast.JNumber("34.00").##
+      scalajson.ast.JNumber.fromString("34").get.## == scalajson.ast.JNumber
+        .fromString("34.00")
+        .get
+        .##
     }
 
     def hashCodeNotEqualsDecimal = {
-      scalajson.ast.JNumber("34").## == scalajson.ast.JNumber("34.01").##
+      scalajson.ast.JNumber.fromString("34").get.## == scalajson.ast.JNumber
+        .fromString("34.01")
+        .get
+        .##
     }
 
     def hashCodeNotEqualsDecimal2 = {
-      scalajson.ast.JNumber("34").## == scalajson.ast.JNumber("34.001").##
+      scalajson.ast.JNumber.fromString("34").get.## == scalajson.ast.JNumber
+        .fromString("34.001")
+        .get
+        .##
     }
 
     def hashCodeEqualsE = {
-      scalajson.ast.JNumber("34e34").## != scalajson.ast.JNumber("34e034").##
+      scalajson.ast.JNumber.fromString("34e34").get.## != scalajson.ast.JNumber
+        .fromString("34e034")
+        .get
+        .##
     }
 
     def hashCodeEqualsE2 = {
-      scalajson.ast.JNumber("34e34").## != scalajson.ast
-        .JNumber("34e0034")
+      scalajson.ast.JNumber.fromString("34e34").get.## != scalajson.ast.JNumber
+        .fromString("34e0034")
+        .get
         .##
     }
 

js/src/test/scala/specs/JValue.scala

@@ -22,7 +22,7 @@ object JValue extends TestSuite with UTestScalaCheck {
       val cloned = jValue match {
         case scalajson.ast.JNull => scalajson.ast.JNull
         case jNumber: scalajson.ast.JNumber =>
-          scalajson.ast.JNumber(jNumber.value)
+          scalajson.ast.JNumber.fromString(jNumber.value).get
         case jString: scalajson.ast.JString =>
           scalajson.ast.JString(jString.value)
         case jArray: scalajson.ast.JArray =>

jvm/src/main/scala/scalajson/ast/JValue.scala

@@ -40,11 +40,11 @@ final case class JString(value: String) extends JValue {
   * return a JNull
   */
 object JNumber {
-  def apply(value: Int): JNumber = JNumber(value.toString)
+  def apply(value: Int): JNumber = new JNumber(value.toString)
 
-  def apply(value: Long): JNumber = JNumber(value.toString)
+  def apply(value: Long): JNumber = new JNumber(value.toString)
 
-  def apply(value: BigInt): JNumber = JNumber(value.toString)
+  def apply(value: BigInt): JNumber = new JNumber(value.toString)
 
   /**
     * @param value
@@ -53,10 +53,10 @@ object JNumber {
   def apply(value: Float): JValue = value match {
     case n if java.lang.Float.isNaN(n) => JNull
     case n if n.isInfinity => JNull
-    case _ => JNumber(value.toString)
+    case _ => new JNumber(value.toString)
   }
 
-  def apply(value: BigDecimal): JNumber = JNumber(value.toString())
+  def apply(value: BigDecimal): JNumber = new JNumber(value.toString())
 
   /**
     * @param value
@@ -65,37 +65,65 @@ object JNumber {
   def apply(value: Double): JValue = value match {
     case n if n.isNaN => JNull
     case n if n.isInfinity => JNull
-    case _ => JNumber(value.toString)
+    case _ => new JNumber(value.toString)
   }
 
-  def apply(value: Integer): JNumber = JNumber(value.toString)
+  def apply(value: Integer): JNumber = new JNumber(value.toString)
 
-  def apply(value: Array[Char]): JNumber = JNumber(new String(value))
+  def apply(value: Array[Char]): Option[JNumber] = {
+    val s = new String(value)
+    if (s.matches(jNumberRegex))
+      Some(new JNumber(s))
+    else
+      None
+  }
+
+  def fromString(value: String): Option[JNumber] =
+    if (value.matches(jNumberRegex))
+      Some(new JNumber(value))
+    else
+      None
+
+  def unapply(arg: JNumber): Option[String] = Some(arg.underlying)
 }
 
 /** Represents a JSON number value. If you are passing in a
-  * NaN or Infinity as a [[scala.Double]], [[JNumber]] will
+  * NaN or Infinity as a [[scala.Double]] or [[scala.Float]], [[JNumber]] will
   * return a [[JNull]].
   *
   * @author Matthew de Detrich
-  * @throws scala.NumberFormatException - If the value is not a valid JSON Number
   */
-final case class JNumber(value: String) extends JValue {
+final class JNumber(private[ast] val underlying: String) extends JValue {
+  @inline val value: String = underlying
 
-  if (!value.matches(jNumberRegex)) {
-    throw new NumberFormatException(value)
-  }
-
-  override def toUnsafe: unsafe.JValue = unsafe.JNumber(value)
+  override def toUnsafe: unsafe.JValue = unsafe.JNumber(underlying)
 
   override def equals(obj: Any): Boolean =
     obj match {
-      case jNumber: JNumber => numericStringEquals(value, jNumber.value)
+      case jNumber: JNumber =>
+        numericStringEquals(underlying, jNumber.underlying)
       case _ => false
     }
 
   override def hashCode: Int =
-    numericStringHashcode(value)
+    numericStringHashcode(underlying)
+
+  override def productElement(n: Int): Any =
+    if (n == 0)
+      underlying
+    else
+      throw new IndexOutOfBoundsException(n.toString)
+
+  override def productArity: Int = 1
+
+  override def canEqual(obj: Any): Boolean = {
+    obj match {
+      case _: JNumber => true
+      case _ => false
+    }
+  }
+
+  override def toString: String = s"JNumber($underlying)"
 }
 
 /** Represents a JSON Boolean value, which can either be a

jvm/src/main/scala/scalajson/ast/unsafe/JValue.scala

@@ -1,4 +1,5 @@
-package scalajson.ast.unsafe
+package scalajson.ast
+package unsafe
 
 import scalajson.ast
 import scalajson.ast._
@@ -70,7 +71,12 @@ object JNumber {
   */
 // JNumber is internally represented as a string, to improve performance
 final case class JNumber(value: String) extends JValue {
-  override def toStandard: ast.JValue = ast.JNumber(value)
+  override def toStandard: ast.JValue = {
+    if (value.matches(jNumberRegex))
+      new ast.JNumber(value)
+    else
+      throw new NumberFormatException(value)
+  }
 }
 
 /** Represents a JSON Boolean value, which can either be a