Moving CompositeSourceSetID and ContentSourceSet into `.dokka.model`

5 files changed, 36 insertions, 33 deletions

diff --git a/core/src/main/kotlin/model/CompositeSourceSetID.kt b/core/src/main/kotlin/model/CompositeSourceSetID.kt
new file mode 100644
index 00000000..5eb106bf
--- /dev/null
+++ b/core/src/main/kotlin/model/CompositeSourceSetID.kt
@@ -0,0 +1,30 @@
+package org.jetbrains.dokka.model
+
+import org.jetbrains.dokka.DokkaConfiguration
+import org.jetbrains.dokka.DokkaSourceSetID
+
+data class CompositeSourceSetID(
+    private val children: Set<DokkaSourceSetID>
+) {
+    constructor(sourceSetIDs: Iterable<DokkaSourceSetID>) : this(sourceSetIDs.toSet())
+    constructor(sourceSetId: DokkaSourceSetID) : this(setOf(sourceSetId))
+
+    init {
+        require(children.isNotEmpty()) { "Expected at least one source set id" }
+    }
+
+    val merged = DokkaSourceSetID(
+        moduleName = children.map { it.moduleName }.reduce { acc, s -> "$acc+$s" },
+        sourceSetName = children.map { it.sourceSetName }.reduce { acc, s -> "$acc+$s" }
+    )
+
+    val all: Set<DokkaSourceSetID> = setOf(merged, *children.toTypedArray())
+
+    operator fun contains(sourceSetId: DokkaSourceSetID): Boolean {
+        return sourceSetId in all
+    }
+
+    operator fun contains(sourceSet: DokkaConfiguration.DokkaSourceSet): Boolean {
+        return sourceSet.sourceSetID in this
+    }
+}
diff --git a/core/src/main/kotlin/pages/ContentSourceSet.kt b/core/src/main/kotlin/model/ContentSourceSet.kt
index f53cdb12..6eee4c94 100644
--- a/core/src/main/kotlin/pages/ContentSourceSet.kt
+++ b/core/src/main/kotlin/model/ContentSourceSet.kt
@@ -1,10 +1,9 @@
-package org.jetbrains.dokka.pages
+package org.jetbrains.dokka.model
 
 import org.jetbrains.dokka.DokkaConfiguration.DokkaSourceSet
 import org.jetbrains.dokka.DokkaSourceSetID
 import org.jetbrains.dokka.Platform
 
-
 data class ContentSourceSet(
     val sourceSetIDs: CompositeSourceSetID,
     val displayName: String,
@@ -26,33 +25,6 @@ data class ContentSourceSet(
 }
 
 
-data class CompositeSourceSetID(
-    private val children: Set<DokkaSourceSetID>
-) {
-    constructor(sourceSetIDs: Iterable<DokkaSourceSetID>) : this(sourceSetIDs.toSet())
-    constructor(sourceSetId: DokkaSourceSetID) : this(setOf(sourceSetId))
-
-    init {
-        require(children.isNotEmpty()) { "Expected at least one source set id" }
-    }
-
-    val merged = DokkaSourceSetID(
-        moduleName = children.map { it.moduleName }.reduce { acc, s -> "$acc+$s" },
-        sourceSetName = children.map { it.sourceSetName }.reduce { acc, s -> "$acc+$s" }
-    )
-
-    val all: List<DokkaSourceSetID> = listOf(merged, *children.toTypedArray())
-
-    operator fun contains(sourceSetId: DokkaSourceSetID): Boolean {
-        return sourceSetId in all
-    }
-
-    operator fun contains(sourceSet: DokkaSourceSet): Boolean {
-        return sourceSet.sourceSetID in this
-    }
-}
-
-
 fun DokkaSourceSet.toContentSourceSet(): ContentSourceSet = ContentSourceSet(this)
 
 fun Iterable<DokkaSourceSet>.toContentSourceSets(): Set<ContentSourceSet> = map { it.toContentSourceSet() }.toSet()
diff --git a/core/src/main/kotlin/pages/ContentNodes.kt b/core/src/main/kotlin/pages/ContentNodes.kt
index 02d6bf61..0d43d062 100644
--- a/core/src/main/kotlin/pages/ContentNodes.kt
+++ b/core/src/main/kotlin/pages/ContentNodes.kt
@@ -1,6 +1,7 @@
 package org.jetbrains.dokka.pages
 
 import org.jetbrains.dokka.links.DRI
+import org.jetbrains.dokka.model.ContentSourceSet
 import org.jetbrains.dokka.model.WithChildren
 import org.jetbrains.dokka.model.properties.PropertyContainer
 import org.jetbrains.dokka.model.properties.WithExtraProperties
diff --git a/core/src/test/kotlin/model/CompositeSourceSetIDTest.kt b/core/src/test/kotlin/model/CompositeSourceSetIDTest.kt
index 68af259d..ab9a2ab1 100644
--- a/core/src/test/kotlin/model/CompositeSourceSetIDTest.kt
+++ b/core/src/test/kotlin/model/CompositeSourceSetIDTest.kt
@@ -1,7 +1,7 @@
 package model
 
 import org.jetbrains.dokka.DokkaSourceSetID
-import org.jetbrains.dokka.pages.CompositeSourceSetID
+import org.jetbrains.dokka.model.CompositeSourceSetID
 import kotlin.test.*
 
 class CompositeSourceSetIDTest {
diff --git a/core/src/test/kotlin/model/ContentSourceSetTest.kt b/core/src/test/kotlin/model/ContentSourceSetTest.kt
index cb17bcba..b96180a2 100644
--- a/core/src/test/kotlin/model/ContentSourceSetTest.kt
+++ b/core/src/test/kotlin/model/ContentSourceSetTest.kt
@@ -2,9 +2,9 @@ package model
 
 import org.jetbrains.dokka.DokkaSourceSetID
 import org.jetbrains.dokka.Platform
-import org.jetbrains.dokka.pages.CompositeSourceSetID
-import org.jetbrains.dokka.pages.ContentSourceSet
-import org.jetbrains.dokka.pages.sourceSetIDs
+import org.jetbrains.dokka.model.CompositeSourceSetID
+import org.jetbrains.dokka.model.ContentSourceSet
+import org.jetbrains.dokka.model.sourceSetIDs
 import kotlin.test.Test
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue