Use IDE package prefix feature and organize all imports

- Add sbt-idea plugin - Flatten all packages in core to the root - Create aliases for all type and object references
jeffmay · Apr 22, 2021 · 4e577ef · 4e577ef
1 parent 14ee145
commit 4e577ef
Show file tree

Hide file tree

Showing 99 changed files with 859 additions and 269 deletions.
diff --git a/build.sbt b/build.sbt
@@ -31,9 +31,14 @@ ThisBuild / packageDoc / publishArtifact := false
 // Disable publishing of the root project
 publish / skip := true
 
-def commonProject(dir: String): Project = {
+def commonProject(
+  dir: String,
+  projectPrefix: String = "",
+): Project = {
+  val packagePrefix = s"com.rallyhealth${if (projectPrefix.isEmpty) "" else s".$projectPrefix"}"
   Project(dir, file(dir)).settings(
     name := s"vapors-$dir",
+    idePackagePrefix := Some(packagePrefix),
   )
 }
 

diff --git a/...health/vapors/core/algebra/CaptureP.scala → .../main/scala/vapors/algebra/CaptureP.scala b/...health/vapors/core/algebra/CaptureP.scala → .../main/scala/vapors/algebra/CaptureP.scala
@@ -1,8 +1,11 @@
-package com.rallyhealth.vapors.core.algebra
+package com.rallyhealth
+
+package vapors.algebra
+
+import vapors.data.TypedFact
+import vapors.interpreter.{ExprInput, ExprOutput}
 
 import cats.{Eval, Monoid}
-import com.rallyhealth.vapors.core.data.TypedFact
-import com.rallyhealth.vapors.core.interpreter.{ExprInput, ExprOutput}
 
 import scala.annotation.implicitNotFound
 

diff --git a/...allyhealth/vapors/core/algebra/Expr.scala → .../src/main/scala/vapors/algebra/Expr.scala b/...allyhealth/vapors/core/algebra/Expr.scala → .../src/main/scala/vapors/algebra/Expr.scala
@@ -1,12 +1,14 @@
-package com.rallyhealth.vapors.core.algebra
+package com.rallyhealth
+
+package vapors.algebra
 
 import cats._
 import cats.data.NonEmptyList
-import com.rallyhealth.vapors.core.data._
-import com.rallyhealth.vapors.core.interpreter.{ExprOutput, InterpretExprAsResultFn}
-import com.rallyhealth.vapors.core.lens.NamedLens
-import com.rallyhealth.vapors.core.logic.{Conjunction, Disjunction, Negation}
-import com.rallyhealth.vapors.core.math._
+import vapors.data._
+import vapors.interpreter.{ExprOutput, InterpretExprAsResultFn}
+import vapors.lens.NamedLens
+import vapors.logic.{Conjunction, Disjunction, Negation}
+import vapors.math._
 import shapeless.{HList, Typeable}
 
 import scala.collection.MapView

diff --git a/...h/vapors/core/algebra/ExprConverter.scala → .../scala/vapors/algebra/ExprConverter.scala b/...h/vapors/core/algebra/ExprConverter.scala → .../scala/vapors/algebra/ExprConverter.scala
@@ -1,4 +1,6 @@
-package com.rallyhealth.vapors.core.algebra
+package com.rallyhealth
+
+package vapors.algebra
 
 import shapeless.ops.hlist.Tupler
 import shapeless.{Generic, HList}

diff --git a/...alth/vapors/core/algebra/ExprResult.scala → ...ain/scala/vapors/algebra/ExprResult.scala b/...alth/vapors/core/algebra/ExprResult.scala → ...ain/scala/vapors/algebra/ExprResult.scala
@@ -1,9 +1,13 @@
-package com.rallyhealth.vapors.core.algebra
+package com.rallyhealth
+
+package vapors.algebra
+
+import vapors.data.{FactSet, FactTable, TypedFact}
+import vapors.interpreter.{ExprInput, ExprOutput}
 
 import cats._
 import cats.kernel.Monoid
-import com.rallyhealth.vapors.core.data.{FactSet, FactTable, TypedFact}
-import com.rallyhealth.vapors.core.interpreter.{ExprInput, ExprOutput}
+import com.rallyhealth.vapors.data.{FactTable, TypedFact}
 import shapeless.HList
 
 import scala.collection.{BitSet, MapView}

diff --git a/...alth/vapors/core/algebra/ExprSorter.scala → ...ain/scala/vapors/algebra/ExprSorter.scala b/...alth/vapors/core/algebra/ExprSorter.scala → ...ain/scala/vapors/algebra/ExprSorter.scala
@@ -1,10 +1,12 @@
-package com.rallyhealth.vapors.core.algebra
+package com.rallyhealth
 
-import cats.{Foldable, Order}
-import cats.syntax.foldable._
+package vapors.algebra
+
+import vapors.lens.NamedLens
+
+import cats.Order
 import cats.syntax.contravariant._
 import cats.syntax.show._
-import com.rallyhealth.vapors.core.lens.NamedLens
 
 import scala.collection.Factory
 import scala.reflect.runtime.universe.{typeOf, TypeTag}

diff --git a/...ealth/vapors/core/algebra/HExprList.scala → ...main/scala/vapors/algebra/HExprList.scala b/...ealth/vapors/core/algebra/HExprList.scala → ...main/scala/vapors/algebra/HExprList.scala
@@ -1,4 +1,6 @@
-package com.rallyhealth.vapors.core.algebra
+package com.rallyhealth
+
+package vapors.algebra
 
 import cats.data.Ior
 import cats.syntax.all._

diff --git a/...allyhealth/vapors/core/data/Bounded.scala → .../src/main/scala/vapors/data/Bounded.scala b/...allyhealth/vapors/core/data/Bounded.scala → .../src/main/scala/vapors/data/Bounded.scala
@@ -1,4 +1,6 @@
-package com.rallyhealth.vapors.core.data
+package com.rallyhealth
+
+package vapors.data
 
 import cats.Functor
 

diff --git a/...llyhealth/vapors/core/data/Evidence.scala → ...src/main/scala/vapors/data/Evidence.scala b/...llyhealth/vapors/core/data/Evidence.scala → ...src/main/scala/vapors/data/Evidence.scala
@@ -1,9 +1,10 @@
-package com.rallyhealth.vapors.core.data
+package com.rallyhealth
+
+package vapors.data
 
 import cats.Monoid
 import cats.data.NonEmptySet
 import cats.instances.order._
-import com.rallyhealth.vapors.core.interpreter.InterpretExprAsResultFn
 
 import scala.annotation.tailrec
 import scala.collection.immutable.SortedSet

diff --git a/...lth/vapors/core/data/ExtractInstant.scala → ...in/scala/vapors/data/ExtractInstant.scala b/...lth/vapors/core/data/ExtractInstant.scala → ...in/scala/vapors/data/ExtractInstant.scala
@@ -1,4 +1,6 @@
-package com.rallyhealth.vapors.core.data
+package com.rallyhealth
+
+package vapors.data
 
 import java.time._
 

diff --git a/...ealth/vapors/core/data/ExtractValue.scala → ...main/scala/vapors/data/ExtractValue.scala b/...ealth/vapors/core/data/ExtractValue.scala → ...main/scala/vapors/data/ExtractValue.scala
@@ -1,6 +1,6 @@
-package com.rallyhealth.vapors.core.data
+package com.rallyhealth
 
-import com.rallyhealth.vapors.core.algebra.CaptureP
+package vapors.data
 
 /**
   * Extracts a value from some starting value.

diff --git a/...m/rallyhealth/vapors/core/data/Fact.scala → core/src/main/scala/vapors/data/Fact.scala b/...m/rallyhealth/vapors/core/data/Fact.scala → core/src/main/scala/vapors/data/Fact.scala
@@ -1,8 +1,11 @@
-package com.rallyhealth.vapors.core.data
+package com.rallyhealth
+
+package vapors.data
+
+import vapors.lens.{DataPath, NamedLens}
 
 import cats.Order
 import cats.syntax.all._
-import com.rallyhealth.vapors.core.lens.{DataPath, NamedLens}
 
 sealed abstract class Fact {
   type Value

diff --git a/...alth/vapors/core/data/FactOrFactSet.scala → ...ain/scala/vapors/data/FactOrFactSet.scala b/...alth/vapors/core/data/FactOrFactSet.scala → ...ain/scala/vapors/data/FactOrFactSet.scala
@@ -1,4 +1,6 @@
-package com.rallyhealth.vapors.core.data
+package com.rallyhealth
+
+package vapors.data
 
 final class FactOrFactSet private[FactOrFactSet] (val toSet: Set[Fact]) extends AnyVal
 

diff --git a/...allyhealth/vapors/core/data/FactSet.scala → .../src/main/scala/vapors/data/FactSet.scala b/...allyhealth/vapors/core/data/FactSet.scala → .../src/main/scala/vapors/data/FactSet.scala
@@ -1,4 +1,6 @@
-package com.rallyhealth.vapors.core.data
+package com.rallyhealth
+
+package vapors.data
 
 import cats.Foldable
 

diff --git a/...lyhealth/vapors/core/data/FactTable.scala → ...rc/main/scala/vapors/data/FactTable.scala b/...lyhealth/vapors/core/data/FactTable.scala → ...rc/main/scala/vapors/data/FactTable.scala
@@ -1,8 +1,11 @@
-package com.rallyhealth.vapors.core.data
+package com.rallyhealth
+
+package vapors.data
+
+import vapors.lens.Indexed
 
 import cats.instances.order._
 import cats.{Eq, Monoid}
-import com.rallyhealth.vapors.core.lens.Indexed
 
 import scala.collection.immutable.SortedMap
 

diff --git a/...llyhealth/vapors/core/data/FactType.scala → ...src/main/scala/vapors/data/FactType.scala b/...llyhealth/vapors/core/data/FactType.scala → ...src/main/scala/vapors/data/FactType.scala
@@ -1,7 +1,10 @@
-package com.rallyhealth.vapors.core.data
+package com.rallyhealth
+
+package vapors.data
+
+import vapors.lens.{NamedLens, ValidDataPathKey}
 
 import cats.Order
-import com.rallyhealth.vapors.core.lens.{NamedLens, ValidDataPathKey}
 
 import scala.reflect.ClassTag
 import scala.reflect.runtime.universe.TypeTag

diff --git a/...health/vapors/core/data/FactTypeSet.scala → .../main/scala/vapors/data/FactTypeSet.scala b/...health/vapors/core/data/FactTypeSet.scala → .../main/scala/vapors/data/FactTypeSet.scala
@@ -1,4 +1,6 @@
-package com.rallyhealth.vapors.core.data
+package com.rallyhealth
+
+package vapors.data
 
 import cats.data.{NonEmptyList, NonEmptyMap, NonEmptySet}
 

diff --git a/...lyhealth/vapors/core/data/TimeOrder.scala → ...rc/main/scala/vapors/data/TimeOrder.scala b/...lyhealth/vapors/core/data/TimeOrder.scala → ...rc/main/scala/vapors/data/TimeOrder.scala
@@ -1,4 +1,6 @@
-package com.rallyhealth.vapors.core.data
+package com.rallyhealth
+
+package vapors.data
 
 import cats.syntax.contravariant._
 import cats.Order

diff --git a/...rallyhealth/vapors/core/data/Window.scala → core/src/main/scala/vapors/data/Window.scala b/...rallyhealth/vapors/core/data/Window.scala → core/src/main/scala/vapors/data/Window.scala
@@ -1,8 +1,9 @@
-package com.rallyhealth.vapors.core.data
+package com.rallyhealth
 
-import alleycats.{Empty, Zero}
+package vapors.data
+
+import alleycats.Empty
 import cats.data.Ior
-import cats.kernel.Monoid
 import cats.{Invariant, Order, Show}
 
 import scala.collection.immutable.NumericRange

diff --git a/...allyhealth/vapors/core/data/package.scala → .../src/main/scala/vapors/data/package.scala b/...allyhealth/vapors/core/data/package.scala → .../src/main/scala/vapors/data/package.scala
@@ -1,4 +1,6 @@
-package com.rallyhealth.vapors.core
+package com.rallyhealth
+
+package vapors
 
 package object data {
 

diff --git a/...rs/core/dsl/ConcatOutputExprBuilder.scala → .../vapors/dsl/ConcatOutputExprBuilder.scala b/...rs/core/dsl/ConcatOutputExprBuilder.scala → .../vapors/dsl/ConcatOutputExprBuilder.scala
@@ -1,8 +1,11 @@
-package com.rallyhealth.vapors.core.dsl
+package com.rallyhealth
+
+package vapors.dsl
+
+import vapors.algebra.{CaptureP, Expr}
+import vapors.lens.NamedLens
 
 import cats.MonoidK
-import com.rallyhealth.vapors.core.algebra.{CaptureP, Expr}
-import com.rallyhealth.vapors.core.lens.NamedLens
 
 import scala.collection.Factory
 

diff --git a/...pors/core/dsl/DefinitionExprBuilder.scala → ...la/vapors/dsl/DefinitionExprBuilder.scala b/...pors/core/dsl/DefinitionExprBuilder.scala → ...la/vapors/dsl/DefinitionExprBuilder.scala
@@ -1,8 +1,11 @@
-package com.rallyhealth.vapors.core.dsl
+package com.rallyhealth
+
+package vapors.dsl
+
+import vapors.algebra.Expr
+import vapors.data.{FactSet, FactType}
 
 import cats.{Foldable, Id}
-import com.rallyhealth.vapors.core.algebra.Expr
-import com.rallyhealth.vapors.core.data.{FactSet, FactType}
 
 final class DefinitionExprBuilder[T](private val factType: FactType[T]) extends AnyVal {
 

diff --git a/...yhealth/vapors/core/dsl/ExprBuilder.scala → ...c/main/scala/vapors/dsl/ExprBuilder.scala b/...yhealth/vapors/core/dsl/ExprBuilder.scala → ...c/main/scala/vapors/dsl/ExprBuilder.scala
@@ -1,10 +1,13 @@
-package com.rallyhealth.vapors.core.dsl
+package com.rallyhealth
+
+package vapors.dsl
+
+import vapors.algebra.{CaptureP, Expr, ExprSorter}
+import vapors.data.{Evidence, TypedFact, Window}
+import vapors.lens.NamedLens
+import vapors.math._
 
 import cats._
-import com.rallyhealth.vapors.core.algebra.{CaptureP, Expr, ExprSorter}
-import com.rallyhealth.vapors.core.data.{Evidence, TypedFact, Window}
-import com.rallyhealth.vapors.core.lens.NamedLens
-import com.rallyhealth.vapors.core.math._
 
 import scala.collection.{Factory, MapView, View}
 import scala.reflect.runtime.universe.TypeTag

diff --git a/...s/core/dsl/ExprBuilderCatsInstances.scala → ...vapors/dsl/ExprBuilderCatsInstances.scala b/...s/core/dsl/ExprBuilderCatsInstances.scala → ...vapors/dsl/ExprBuilderCatsInstances.scala
@@ -1,4 +1,6 @@
-package com.rallyhealth.vapors.core.dsl
+package com.rallyhealth
+
+package vapors.dsl
 
 import cats._
 import cats.data.Ior

diff --git a/...rallyhealth/vapors/core/dsl/ExprDsl.scala → core/src/main/scala/vapors/dsl/ExprDsl.scala b/...rallyhealth/vapors/core/dsl/ExprDsl.scala → core/src/main/scala/vapors/dsl/ExprDsl.scala
@@ -1,13 +1,16 @@
-package com.rallyhealth.vapors.core.dsl
+package com.rallyhealth
+
+package vapors.dsl
+
+import vapors.algebra.{CaptureP, Expr, ExprResult}
+import vapors.data._
+import vapors.interpreter.{ExprInput, InterpretExprAsResultFn}
+import vapors.lens.NamedLens
+import vapors.logic.{Conjunction, Disjunction, Negation}
+import vapors.math._
 
 import cats.data.NonEmptyList
 import cats.{Foldable, Monoid}
-import com.rallyhealth.vapors.core.algebra.{CaptureP, Expr, ExprResult}
-import com.rallyhealth.vapors.core.data._
-import com.rallyhealth.vapors.core.interpreter.{ExprInput, InterpretExprAsResultFn}
-import com.rallyhealth.vapors.core.lens.NamedLens
-import com.rallyhealth.vapors.core.logic.{Conjunction, Disjunction, Negation}
-import com.rallyhealth.vapors.core.math._
 
 object ExprDsl extends ExprDsl
 

diff --git a/...pors/core/dsl/HListOperationWrapper.scala → ...la/vapors/dsl/HListOperationWrapper.scala b/...pors/core/dsl/HListOperationWrapper.scala → ...la/vapors/dsl/HListOperationWrapper.scala
@@ -1,7 +1,10 @@
-package com.rallyhealth.vapors.core.dsl
+package com.rallyhealth
 
-import com.rallyhealth.vapors.core.algebra.{CaptureP, Expr, ExprConverter, NonEmptyExprHList}
-import shapeless.ops.hlist.{ToTraversable, Tupler}
+package vapors.dsl
+
+import vapors.algebra.{CaptureP, Expr, ExprConverter, NonEmptyExprHList}
+
+import shapeless.ops.hlist.Tupler
 import shapeless.{Generic, HList}
 
 trait HListOperationWrapper[V, M[_], L <: HList, P] extends Any {

diff --git a/.../vapors/core/dsl/MapViewExprBuilder.scala → ...scala/vapors/dsl/MapViewExprBuilder.scala b/.../vapors/core/dsl/MapViewExprBuilder.scala → ...scala/vapors/dsl/MapViewExprBuilder.scala
@@ -1,8 +1,11 @@
-package com.rallyhealth.vapors.core.dsl
+package com.rallyhealth
+
+package vapors.dsl
+
+import vapors.algebra.{CaptureP, Expr}
+import vapors.lens.{DataPath, NamedLens}
 
 import cats.Id
-import com.rallyhealth.vapors.core.algebra.{CaptureP, Expr}
-import com.rallyhealth.vapors.core.lens.{DataPath, NamedLens}
 import shapeless.Nat
 
 import scala.collection.{MapView, View}

diff --git a/...ealth/vapors/core/dsl/TimeFunctions.scala → ...main/scala/vapors/dsl/TimeFunctions.scala b/...ealth/vapors/core/dsl/TimeFunctions.scala → ...main/scala/vapors/dsl/TimeFunctions.scala
@@ -1,8 +1,11 @@
-package com.rallyhealth.vapors.core.dsl
+package com.rallyhealth
+
+package vapors.dsl
+
+import vapors.algebra.{CaptureP, Expr}
+import vapors.data.FactTable
+import vapors.time.{CountTime, ModifyTime}
 
-import com.rallyhealth.vapors.core.algebra.{CaptureP, Expr}
-import com.rallyhealth.vapors.core.data.FactTable
-import com.rallyhealth.vapors.core.time.{CountTime, ModifyTime}
 import shapeless._
 
 import java.time.{Clock, Instant, LocalDate}

diff --git a/...lth/vapors/core/dsl/WhenExprBuilder.scala → ...in/scala/vapors/dsl/WhenExprBuilder.scala b/...lth/vapors/core/dsl/WhenExprBuilder.scala → ...in/scala/vapors/dsl/WhenExprBuilder.scala
@@ -1,7 +1,10 @@
-package com.rallyhealth.vapors.core.dsl
+package com.rallyhealth
+
+package vapors.dsl
+
+import vapors.algebra.{CaptureP, ConditionBranch, Expr}
 
 import cats.data.NonEmptyList
-import com.rallyhealth.vapors.core.algebra.{CaptureP, ConditionBranch, Expr}
 
 final class WhenExprBuilder[V, P](private val whenExpr: CondExpr[V, P]) extends AnyVal {
 

diff --git a/...ors/core/dsl/WithFactsOfTypeBuilder.scala → ...a/vapors/dsl/WithFactsOfTypeBuilder.scala b/...ors/core/dsl/WithFactsOfTypeBuilder.scala → ...a/vapors/dsl/WithFactsOfTypeBuilder.scala
@@ -1,7 +1,9 @@
-package com.rallyhealth.vapors.core.dsl
+package com.rallyhealth
 
-import com.rallyhealth.vapors.core.algebra.{CaptureP, Expr}
-import com.rallyhealth.vapors.core.data.{FactTypeSet, TypedFact}
+package vapors.dsl
+
+import vapors.algebra.{CaptureP, Expr}
+import vapors.data.{FactTypeSet, TypedFact}
 
 /**
   * @note this is not a value class because the input [[FactTypeSet]] is also a value class AND the [[CaptureP]]

diff --git a/...th/vapors/core/dsl/WithOutputSyntax.scala → ...n/scala/vapors/dsl/WithOutputSyntax.scala b/...th/vapors/core/dsl/WithOutputSyntax.scala → ...n/scala/vapors/dsl/WithOutputSyntax.scala
@@ -1,7 +1,10 @@
-package com.rallyhealth.vapors.core.dsl
+package com.rallyhealth
+
+package vapors.dsl
+
+import vapors.algebra.Expr
 
 import cats.Foldable
-import com.rallyhealth.vapors.core.algebra.Expr
 
 trait WithOutputSyntax {