Change package naming (#44)

* Change Rule module back to uppercase.

* Changed package names. #41

Co-authored-by: Attila Mihaly <[email protected]>

morphir/sdk/core/src-2.11/org/morphir/internal/collection/decorators/IterableDecorator.scala → morphir/sdk/core/src-2.11/morphir/internal/collection/decorators/IterableDecorator.scala

@@ -1,4 +1,4 @@
-package org.morphir.internal.collection.decorators
+package morphir.internal.collection.decorators
 
 import scala.collection.GenTraversableLike
 

morphir/sdk/core/src-2.12/org/morphir/internal/collection/decorators/package.scala → morphir/sdk/core/src-2.11/morphir/internal/collection/decorators/package.scala

@@ -1,4 +1,4 @@
-package org.morphir.internal.collection
+package morphir.internal.collection
 
 import scala.collection.generic.IsTraversableLike
 import scala.language.implicitConversions

morphir/sdk/core/src-2.12/org/morphir/sdk/MaybeLike.scala → morphir/sdk/core/src-2.11/morphir/sdk/MaybeLike.scala

@@ -1,6 +1,6 @@
-package org.morphir.sdk
+package morphir.sdk
 
-import org.morphir.sdk.Maybe.Maybe
+import morphir.sdk.Maybe.Maybe
 
 private[sdk] trait MaybeLike[+A] extends Product with Serializable
 

morphir/sdk/core/src-2.12/org/morphir/sdk/StringOps.scala → morphir/sdk/core/src-2.11/morphir/sdk/StringOps.scala

@@ -1,7 +1,8 @@
-package org.morphir.sdk
+package morphir.sdk
+
+import morphir.sdk.Maybe._
+import morphir.sdk.String.String
 
-import org.morphir.sdk.Maybe._
-import org.morphir.sdk.String.String
 import scala.util.Try
 
 object StringOps {

morphir/sdk/core/src-2.12/org/morphir/internal/collection/decorators/IterableDecorator.scala → morphir/sdk/core/src-2.12/morphir/internal/collection/decorators/IterableDecorator.scala

@@ -1,4 +1,4 @@
-package org.morphir.internal.collection.decorators
+package morphir.internal.collection.decorators
 
 import scala.collection.GenTraversableLike
 

morphir/sdk/core/src-2.11/org/morphir/internal/collection/decorators/package.scala → morphir/sdk/core/src-2.12/morphir/internal/collection/decorators/package.scala

@@ -1,4 +1,4 @@
-package org.morphir.internal.collection
+package morphir.internal.collection
 
 import scala.collection.generic.IsTraversableLike
 import scala.language.implicitConversions

morphir/sdk/core/src-2.11/org/morphir/sdk/MaybeLike.scala → morphir/sdk/core/src-2.12/morphir/sdk/MaybeLike.scala

@@ -1,6 +1,6 @@
-package org.morphir.sdk
+package morphir.sdk
 
-import org.morphir.sdk.Maybe.Maybe
+import morphir.sdk.Maybe.Maybe
 
 private[sdk] trait MaybeLike[+A] extends Product with Serializable
 

morphir/sdk/core/src-2.11/org/morphir/sdk/StringOps.scala → morphir/sdk/core/src-2.12/morphir/sdk/StringOps.scala

@@ -1,7 +1,7 @@
-package org.morphir.sdk
+package morphir.sdk
+
+import morphir.sdk.Maybe.Maybe
 
-import org.morphir.sdk.Maybe._
-import org.morphir.sdk.String.String
 import scala.util.Try
 
 object StringOps {

morphir/sdk/core/src-2.13/org/morphir/internal/collection/decorators/IterableDecorator.scala → morphir/sdk/core/src-2.13/morphir/internal/collection/decorators/IterableDecorator.scala

@@ -1,4 +1,4 @@
-package org.morphir.internal.collection.decorators
+package morphir.internal.collection.decorators
 
 import scala.collection.generic.IsIterable
 

morphir/sdk/core/src-2.13/org/morphir/internal/collection/decorators/package.scala → morphir/sdk/core/src-2.13/morphir/internal/collection/decorators/package.scala

@@ -1,6 +1,6 @@
-package org.morphir.internal.collection
+package morphir.internal.collection
 
-import scala.collection.generic.{ IsIterable }
+import scala.collection.generic.IsIterable
 
 package object decorators {
   implicit def iteratorDecorator[A](it: Iterator[A]): IteratorDecorator[A] =

morphir/sdk/core/src-2.13/org/morphir/sdk/MaybeLike.scala → morphir/sdk/core/src-2.13/morphir/sdk/MaybeLike.scala

@@ -1,6 +1,6 @@
-package org.morphir.sdk
+package morphir.sdk
 
-import org.morphir.sdk.Maybe.Maybe
+import morphir.sdk.Maybe.Maybe
 
 private[sdk] trait MaybeLike[+A] extends IterableOnce[A] with Product with Serializable
 

morphir/sdk/core/src-2.13/morphir/sdk/StringOps.scala

@@ -0,0 +1,9 @@
+package morphir.sdk
+
+import morphir.sdk.Maybe.Maybe
+import morphir.sdk.String.String
+
+object StringOps {
+  @inline def toInt(text: String): Maybe[Int] =
+    text.toIntOption
+}

morphir/sdk/core/src/org/morphir/internal/collection/decorators/IteratorDecorator.scala → morphir/sdk/core/src/morphir/internal/collection/decorators/IteratorDecorator.scala

@@ -1,4 +1,4 @@
-package org.morphir.internal.collection.decorators
+package morphir.internal.collection.decorators
 
 /** Enriches Iterator with additional methods. */
 class IteratorDecorator[A](val `this`: Iterator[A]) extends AnyVal {

morphir/sdk/core/src/org/morphir/sdk/Bool.scala → morphir/sdk/core/src/morphir/sdk/Bool.scala

@@ -1,6 +1,6 @@
-package org.morphir.sdk
+package morphir.sdk
 
-import String.String
+import morphir.sdk.String.String
 
 object Bool {
   type Bool = Boolean

morphir/sdk/core/src/org/morphir/sdk/Char.scala → morphir/sdk/core/src/morphir/sdk/Char.scala

@@ -1,4 +1,4 @@
-package org.morphir.sdk
+package morphir.sdk
 
 //TODO: We need to think how we want to represent chars as Elm chars support full unicode
 //    : but java cannot store full unicode in a single char

morphir/sdk/core/src/org/morphir/sdk/Dict.scala → morphir/sdk/core/src/morphir/sdk/Dict.scala

@@ -1,6 +1,6 @@
-package org.morphir.sdk
+package morphir.sdk
 
-import Maybe._
+import morphir.sdk.Maybe._
 
 object Dict {
   sealed abstract class Dict[K, +V]

morphir/sdk/core/src/org/morphir/sdk/Int.scala → morphir/sdk/core/src/morphir/sdk/Int.scala

@@ -1,4 +1,4 @@
-package org.morphir.sdk
+package morphir.sdk
 
 object Int {
   type Int   = scala.BigInt

morphir/sdk/core/src/org/morphir/sdk/List.scala → morphir/sdk/core/src/morphir/sdk/List.scala

@@ -1,6 +1,6 @@
-package org.morphir.sdk
+package morphir.sdk
 
-import org.morphir.sdk.Maybe.{ Just, Maybe }
+import morphir.sdk.Maybe.{ Just, Maybe }
 
 object List {
   type List[+A] = scala.List[A]

morphir/sdk/core/src/org/morphir/sdk/LocalDate.scala → morphir/sdk/core/src/morphir/sdk/LocalDate.scala

@@ -1,4 +1,4 @@
-package org.morphir.sdk
+package morphir.sdk
 
 object LocalDate {
   type LocalDate = java.time.LocalDate

morphir/sdk/core/src/org/morphir/sdk/Maybe.scala → morphir/sdk/core/src/morphir/sdk/Maybe.scala

@@ -1,4 +1,4 @@
-package org.morphir.sdk
+package morphir.sdk
 
 import scala.util.{ Failure, Success, Try }
 

morphir/sdk/core/src/org/morphir/sdk/MorphirConversions.scala → morphir/sdk/core/src/morphir/sdk/MorphirConversions.scala

@@ -1,4 +1,4 @@
-package org.morphir.sdk
+package morphir.sdk
 
 import scala.{ Char => ScalaChar }
 

morphir/sdk/core/src/org/morphir/sdk/NonEmptyListModule.scala → morphir/sdk/core/src/morphir/sdk/NonEmptyListModule.scala

@@ -1,6 +1,6 @@
-package org.morphir.sdk
+package morphir.sdk
 
-import org.morphir.sdk.NonEmptyListModule.NonEmptyList.{ Cons, Single }
+import morphir.sdk.NonEmptyListModule.NonEmptyList.{ Cons, Single }
 
 import scala.annotation.tailrec
 

morphir/sdk/core/src/org/morphir/sdk/Number.scala → morphir/sdk/core/src/morphir/sdk/Number.scala

@@ -1,4 +1,4 @@
-package org.morphir.sdk
+package morphir.sdk
 
 object Number {
 

morphir/sdk/core/src/org/morphir/sdk/Regex.scala → morphir/sdk/core/src/morphir/sdk/Regex.scala

@@ -1,6 +1,6 @@
-package org.morphir.sdk
+package morphir.sdk
 
-import org.morphir.sdk.Maybe.Maybe
+import morphir.sdk.Maybe.Maybe
 
 import scala.util.matching.{ Regex => RE }
 

morphir/sdk/core/src/org/morphir/sdk/Result.scala → morphir/sdk/core/src/morphir/sdk/Result.scala

@@ -1,6 +1,6 @@
-package org.morphir.sdk
+package morphir.sdk
 
-import Maybe._
+import morphir.sdk.Maybe._
 
 sealed abstract class Result[+E, +A] extends Product with Serializable {
 

morphir/sdk/core/src/org/morphir/sdk/rule.scala → morphir/sdk/core/src/morphir/sdk/Rule.scala

@@ -1,10 +1,10 @@
-package org.morphir.sdk
+package morphir.sdk
 
-import org.morphir.sdk.Bool.Bool
-import org.morphir.sdk.Maybe.Maybe
-import org.morphir.sdk.List.List
+import morphir.sdk.Bool.Bool
+import morphir.sdk.List.List
+import morphir.sdk.Maybe.Maybe
 
-object rule {
+object Rule {
 
   type Rule[A, B] = A => Maybe[B]
 

morphir/sdk/core/src/org/morphir/sdk/String.scala → morphir/sdk/core/src/morphir/sdk/String.scala

@@ -1,6 +1,6 @@
-package org.morphir.sdk
+package morphir.sdk
 
-import org.morphir.sdk.Maybe.Maybe
+import morphir.sdk.Maybe.Maybe
 
 object String {
   type String = scala.Predef.String

morphir/sdk/core/src/morphir/sdk/package.scala

@@ -0,0 +1,6 @@
+package morphir
+
+package object sdk {
+  val StringModule: StringModule = String
+  type StringModule = String.type
+}

morphir/sdk/core/test/src/org/morphir/internal/collection/decorators/IterableDecoratorSpec.scala → morphir/sdk/core/test/src/morphir/internal/collection/decorators/IterableDecoratorSpec.scala

@@ -1,7 +1,7 @@
-package org.morphir.internal.collection.decorators
+package morphir.internal.collection.decorators
 
-import zio.test._
 import zio.test.Assertion._
+import zio.test._
 
 object IterableDecoratorSpec extends DefaultRunnableSpec {
   def spec = suite("IterableDecoratorSpec")(

morphir/sdk/core/test/src/org/morphir/sdk/CharSpec.scala → morphir/sdk/core/test/src/morphir/sdk/CharSpec.scala

@@ -1,7 +1,7 @@
-package org.morphir.sdk
+package morphir.sdk
 
-import zio.test._
 import zio.test.Assertion._
+import zio.test._
 
 object CharSpec extends DefaultRunnableSpec {
   def spec = suite("CharSpec")(

morphir/sdk/core/test/src/org/morphir/sdk/IntSpec.scala → morphir/sdk/core/test/src/morphir/sdk/IntSpec.scala

@@ -1,9 +1,9 @@
-package org.morphir.sdk
+package morphir.sdk
 
-import zio.test._
+import morphir.sdk
+import morphir.sdk.Int._
 import zio.test.Assertion._
-import Int._
-import org.morphir.sdk
+import zio.test._
 
 object IntSpec extends DefaultRunnableSpec {
   def spec = suite("IntSpec")(

morphir/sdk/core/test/src/org/morphir/sdk/ListSpec.scala → morphir/sdk/core/test/src/morphir/sdk/ListSpec.scala

@@ -1,9 +1,9 @@
-package org.morphir.sdk
+package morphir.sdk
 
 import zio.duration._
-import zio.test._
 import zio.test.Assertion._
 import zio.test.TestAspect.timeout
+import zio.test._
 
 object ListSpec extends DefaultRunnableSpec {
   def spec = suite("ListSpec")(

morphir/sdk/core/test/src/org/morphir/sdk/MaybeSpec.scala → morphir/sdk/core/test/src/morphir/sdk/MaybeSpec.scala

@@ -1,8 +1,8 @@
-package org.morphir.sdk
+package morphir.sdk
 
-import Maybe.Maybe
-import zio.test._
+import morphir.sdk.Maybe.Maybe
 import zio.test.Assertion._
+import zio.test._
 
 object MaybeSpec extends DefaultRunnableSpec {
   def spec = suite("MaybeSpec")(

morphir/sdk/core/test/src/org/morphir/sdk/ResultSpec.scala → morphir/sdk/core/test/src/morphir/sdk/ResultSpec.scala

@@ -1,7 +1,7 @@
-package org.morphir.sdk
+package morphir.sdk
 
-import zio.test._
 import zio.test.Assertion._
+import zio.test._
 
 object ResultSpec extends DefaultRunnableSpec {
   def spec = suite("ResultSpec")(
@@ -39,7 +39,7 @@ object ResultSpec extends DefaultRunnableSpec {
         },
         test("Given an Err in value A should return that value") {
           val bad: Result[String, Int] = Result.Err("No Bueno!")
-          val inputb = Result.Ok(1).withErr[String]
+          val inputb                   = Result.Ok(1).withErr[String]
           assert(
             Result.map2((a: Int, b: Int) => a * b * 2)(bad)(inputb)
           )(
@@ -48,7 +48,7 @@ object ResultSpec extends DefaultRunnableSpec {
         },
         test("Given an Err in value B should return that value") {
           val bad: Result[String, Int] = Result.Err("No Bueno!")
-          val inputa = Result.Ok(1).withErr[String]
+          val inputa                   = Result.Ok(1).withErr[String]
           assert(
             Result.map2((a: Int, b: Int) => a * b * 2)(inputa)(bad)
           )(