fix visibility in :serialize-*

tuProlog · Jun 28, 2020 · 0db238c · 0db238c
1 parent 6395d91
commit 0db238c
Show file tree

Hide file tree

Showing 22 changed files with 58 additions and 31 deletions.
diff --git a/serialize-core/src/jsMain/kotlin/it/unibo/tuprolog/serialize/JsTermDeobjectifier.kt b/serialize-core/src/jsMain/kotlin/it/unibo/tuprolog/serialize/JsTermDeobjectifier.kt
@@ -6,7 +6,7 @@ import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.core.Var
 
 @Suppress("USELESS_CAST")
-class JsTermDeobjectifier : TermDeobjectifier {
+internal class JsTermDeobjectifier : TermDeobjectifier {
 
     private val scope: Scope = Scope.empty()
 

diff --git a/serialize-core/src/jsMain/kotlin/it/unibo/tuprolog/serialize/JsTermDeserializer.kt b/serialize-core/src/jsMain/kotlin/it/unibo/tuprolog/serialize/JsTermDeserializer.kt
@@ -2,7 +2,7 @@ package it.unibo.tuprolog.serialize
 
 import it.unibo.tuprolog.core.Term
 
-class JsTermDeserializer(override val mimeType: MimeType) : TermDeserializer {
+internal class JsTermDeserializer(override val mimeType: MimeType) : TermDeserializer {
     override fun deserialize(string: String): Term =
         JsTermDeobjectifier().deobjectify(parse(string))
 

diff --git a/serialize-core/src/jsMain/kotlin/it/unibo/tuprolog/serialize/JsTermObjectifier.kt b/serialize-core/src/jsMain/kotlin/it/unibo/tuprolog/serialize/JsTermObjectifier.kt
@@ -2,7 +2,7 @@ package it.unibo.tuprolog.serialize
 
 import it.unibo.tuprolog.core.*
 
-class JsTermObjectifier : TermObjectifier {
+internal class JsTermObjectifier : TermObjectifier {
     override fun defaultValue(term: Term): Any {
         throw IllegalStateException()
     }

diff --git a/serialize-core/src/jsMain/kotlin/it/unibo/tuprolog/serialize/JsTermSerializer.kt b/serialize-core/src/jsMain/kotlin/it/unibo/tuprolog/serialize/JsTermSerializer.kt
@@ -2,7 +2,7 @@ package it.unibo.tuprolog.serialize
 
 import it.unibo.tuprolog.core.Term
 
-class JsTermSerializer(override val mimeType: MimeType) : TermSerializer {
+internal class JsTermSerializer(override val mimeType: MimeType) : TermSerializer {
 
     private val objectifier = JsTermObjectifier()
 

diff --git a/serialize-core/src/jsMain/kotlin/it/unibo/tuprolog/serialize/JsUtils.kt b/serialize-core/src/jsMain/kotlin/it/unibo/tuprolog/serialize/JsUtils.kt
@@ -1,14 +1,12 @@
 package it.unibo.tuprolog.serialize
 
-fun emptyJsObject() = jsObject()
-
-fun jsObject(config: dynamic.() -> Unit): Any {
+internal fun jsObject(config: dynamic.() -> Unit): Any {
     val obj = object {}
     config(obj)
     return obj
 }
 
-fun jsObject(vararg properties: Pair<String, dynamic>, config: dynamic.() -> Unit = {}): Any {
+internal fun jsObject(vararg properties: Pair<String, dynamic>, config: dynamic.() -> Unit = {}): Any {
     return jsObject {
         for ((k, v) in properties) {
             this[k] = v
@@ -17,7 +15,7 @@ fun jsObject(vararg properties: Pair<String, dynamic>, config: dynamic.() -> Uni
     }
 }
 
-fun jsObject(properties: Iterable<Pair<String, dynamic>>, config: dynamic.() -> Unit = {}): Any {
+internal fun jsObject(properties: Iterable<Pair<String, dynamic>>, config: dynamic.() -> Unit = {}): Any {
     return jsObject {
         for ((k, v) in properties) {
             this[k] = v
@@ -26,9 +24,5 @@ fun jsObject(properties: Iterable<Pair<String, dynamic>>, config: dynamic.() ->
     }
 }
 
-fun jsObject(properties: Sequence<Pair<String, dynamic>>, config: dynamic.() -> Unit = {}): Any {
-    return jsObject(properties.asIterable(), config)
-}
-
-fun hasProperty(obj: dynamic, name: String): Boolean =
+internal fun hasProperty(obj: dynamic, name: String): Boolean =
     obj[name] != undefined
diff --git a/serialize-core/src/jvmMain/kotlin/it/unibo/tuprolog/serialize/JvmTermDeobjectifier.kt b/serialize-core/src/jvmMain/kotlin/it/unibo/tuprolog/serialize/JvmTermDeobjectifier.kt
@@ -5,7 +5,7 @@ import java.math.BigDecimal
 import java.math.BigInteger
 import it.unibo.tuprolog.core.Integer as LogicInteger
 
-class JvmTermDeobjectifier : TermDeobjectifier {
+internal class JvmTermDeobjectifier : TermDeobjectifier {
 
     private val scope: Scope = Scope.empty()
 

diff --git a/serialize-core/src/jvmMain/kotlin/it/unibo/tuprolog/serialize/JvmTermDeserializer.kt b/serialize-core/src/jvmMain/kotlin/it/unibo/tuprolog/serialize/JvmTermDeserializer.kt
@@ -3,7 +3,7 @@ package it.unibo.tuprolog.serialize
 import it.unibo.tuprolog.core.Term
 import java.io.Reader
 
-class JvmTermDeserializer(override val mimeType: MimeType) : ReadingTermDeserializer {
+internal class JvmTermDeserializer(override val mimeType: MimeType) : ReadingTermDeserializer {
 
     private val mapper = mimeType.objectMapper
 

diff --git a/serialize-core/src/jvmMain/kotlin/it/unibo/tuprolog/serialize/JvmTermObjectifier.kt b/serialize-core/src/jvmMain/kotlin/it/unibo/tuprolog/serialize/JvmTermObjectifier.kt
@@ -4,7 +4,7 @@ import it.unibo.tuprolog.core.*
 import it.unibo.tuprolog.core.List
 import it.unibo.tuprolog.core.Set
 
-class JvmTermObjectifier : TermObjectifier {
+internal class JvmTermObjectifier : TermObjectifier {
     override fun defaultValue(term: Term): Any {
         throw IllegalStateException()
     }

diff --git a/serialize-core/src/jvmMain/kotlin/it/unibo/tuprolog/serialize/JvmTermSerializer.kt b/serialize-core/src/jvmMain/kotlin/it/unibo/tuprolog/serialize/JvmTermSerializer.kt
@@ -3,7 +3,7 @@ package it.unibo.tuprolog.serialize
 import it.unibo.tuprolog.core.Term
 import java.io.Writer
 
-class JvmTermSerializer(override val mimeType: MimeType) : WritingTermSerializer {
+internal class JvmTermSerializer(override val mimeType: MimeType) : WritingTermSerializer {
 
     private val mapper = mimeType.objectMapper
     private val objectifier = JvmTermObjectifier()

diff --git a/serialize-core/src/jvmMain/kotlin/it/unibo/tuprolog/serialize/ReadingTermDeserializer.kt b/serialize-core/src/jvmMain/kotlin/it/unibo/tuprolog/serialize/ReadingTermDeserializer.kt
@@ -2,4 +2,11 @@ package it.unibo.tuprolog.serialize
 
 import it.unibo.tuprolog.core.Term
 
-interface ReadingTermDeserializer : TermDeserializer, ReadingDeserializer<Term>
+interface ReadingTermDeserializer : TermDeserializer, ReadingDeserializer<Term> {
+    companion object {
+        @JvmStatic
+        fun of(mimeType: MimeType): ReadingTermDeserializer {
+            return JvmTermDeserializer(mimeType)
+        }
+    }
+}
diff --git a/serialize-core/src/jvmMain/kotlin/it/unibo/tuprolog/serialize/WritingTermSerializer.kt b/serialize-core/src/jvmMain/kotlin/it/unibo/tuprolog/serialize/WritingTermSerializer.kt
@@ -2,4 +2,11 @@ package it.unibo.tuprolog.serialize
 
 import it.unibo.tuprolog.core.Term
 
-interface WritingTermSerializer : TermSerializer, WritingSerializer<Term>
+interface WritingTermSerializer : TermSerializer, WritingSerializer<Term> {
+    companion object {
+        @JvmStatic
+        fun of(mimeType: MimeType): WritingTermSerializer {
+            return JvmTermSerializer(mimeType)
+        }
+    }
+}
diff --git a/serialize-theory/build.gradle.kts b/serialize-theory/build.gradle.kts
@@ -8,6 +8,12 @@ kotlin {
             }
         }
 
+        val commonTest by getting {
+            dependencies {
+                api(project(":solve"))
+            }
+        }
+
         jvm {
             compilations["main"].defaultSourceSet {
                 dependencies {

diff --git a/serialize-theory/src/jsMain/kotlin/it/unibo/tuprolog/serialize/JsTheoryDeobjectifier.kt b/serialize-theory/src/jsMain/kotlin/it/unibo/tuprolog/serialize/JsTheoryDeobjectifier.kt
@@ -3,7 +3,7 @@ package it.unibo.tuprolog.serialize
 import it.unibo.tuprolog.core.Clause
 import it.unibo.tuprolog.theory.Theory
 
-class JsTheoryDeobjectifier : TheoryDeobjectifier {
+internal class JsTheoryDeobjectifier : TheoryDeobjectifier {
     override fun deobjectify(`object`: Any): Theory {
         return Theory.of(
             JsTermDeobjectifier().deobjectifyMany(`object`)

diff --git a/serialize-theory/src/jsMain/kotlin/it/unibo/tuprolog/serialize/JsTheoryDeserializer.kt b/serialize-theory/src/jsMain/kotlin/it/unibo/tuprolog/serialize/JsTheoryDeserializer.kt
@@ -2,7 +2,7 @@ package it.unibo.tuprolog.serialize
 
 import it.unibo.tuprolog.theory.Theory
 
-class JsTheoryDeserializer(override val mimeType: MimeType) : TheoryDeserializer {
+internal class JsTheoryDeserializer(override val mimeType: MimeType) : TheoryDeserializer {
     override fun deserialize(string: String): Theory =
         JsTheoryDeobjectifier().deobjectify(parse(string))
 

diff --git a/serialize-theory/src/jsMain/kotlin/it/unibo/tuprolog/serialize/JsTheoryObjectifier.kt b/serialize-theory/src/jsMain/kotlin/it/unibo/tuprolog/serialize/JsTheoryObjectifier.kt
@@ -2,7 +2,7 @@ package it.unibo.tuprolog.serialize
 
 import it.unibo.tuprolog.theory.Theory
 
-class JsTheoryObjectifier : TheoryObjectifier {
+internal class JsTheoryObjectifier : TheoryObjectifier {
     private val objectifier = JsTermObjectifier()
 
     override fun objectify(value: Theory): Any {

diff --git a/serialize-theory/src/jsMain/kotlin/it/unibo/tuprolog/serialize/JsTheorySerializer.kt b/serialize-theory/src/jsMain/kotlin/it/unibo/tuprolog/serialize/JsTheorySerializer.kt
@@ -2,7 +2,7 @@ package it.unibo.tuprolog.serialize
 
 import it.unibo.tuprolog.theory.Theory
 
-class JsTheorySerializer(override val mimeType: MimeType) : TheorySerializer {
+internal class JsTheorySerializer(override val mimeType: MimeType) : TheorySerializer {
 
     private val objectifier = JsTheoryObjectifier()
 

diff --git a/serialize-theory/src/jvmMain/kotlin/it/unibo/tuprolog/serialize/JvmTheoryDeobjectifier.kt b/serialize-theory/src/jvmMain/kotlin/it/unibo/tuprolog/serialize/JvmTheoryDeobjectifier.kt
@@ -3,10 +3,10 @@ package it.unibo.tuprolog.serialize
 import it.unibo.tuprolog.core.Clause
 import it.unibo.tuprolog.theory.Theory
 
-class JvmTheoryDeobjectifier : TheoryDeobjectifier {
+internal class JvmTheoryDeobjectifier : TheoryDeobjectifier {
     override fun deobjectify(`object`: Any): Theory {
         return Theory.of(
-            JvmTermDeobjectifier().deobjectifyMany(`object`)
+            TermDeobjectifier.default.deobjectifyMany(`object`)
                 .asSequence()
                 .map { it as Clause }
         )

diff --git a/serialize-theory/src/jvmMain/kotlin/it/unibo/tuprolog/serialize/JvmTheoryDeserializer.kt b/serialize-theory/src/jvmMain/kotlin/it/unibo/tuprolog/serialize/JvmTheoryDeserializer.kt
@@ -3,7 +3,7 @@ package it.unibo.tuprolog.serialize
 import it.unibo.tuprolog.theory.Theory
 import java.io.Reader
 
-class JvmTheoryDeserializer(override val mimeType: MimeType) : ReadingTheoryDeserializer {
+internal class JvmTheoryDeserializer(override val mimeType: MimeType) : ReadingTheoryDeserializer {
 
     private val mapper = mimeType.objectMapper
 

diff --git a/serialize-theory/src/jvmMain/kotlin/it/unibo/tuprolog/serialize/JvmTheoryObjectifier.kt b/serialize-theory/src/jvmMain/kotlin/it/unibo/tuprolog/serialize/JvmTheoryObjectifier.kt
@@ -2,9 +2,9 @@ package it.unibo.tuprolog.serialize
 
 import it.unibo.tuprolog.theory.Theory
 
-class JvmTheoryObjectifier : TheoryObjectifier {
+internal class JvmTheoryObjectifier : TheoryObjectifier {
 
-    private val objectifier = JvmTermObjectifier()
+    private val objectifier = TermObjectifier.default
 
     override fun objectify(value: Theory): Any {
         return value.map { objectifier.objectify(it) }

diff --git a/serialize-theory/src/jvmMain/kotlin/it/unibo/tuprolog/serialize/JvmTheorySerializer.kt b/serialize-theory/src/jvmMain/kotlin/it/unibo/tuprolog/serialize/JvmTheorySerializer.kt
@@ -3,7 +3,7 @@ package it.unibo.tuprolog.serialize
 import it.unibo.tuprolog.theory.Theory
 import java.io.Writer
 
-class JvmTheorySerializer(override val mimeType: MimeType) : WritingTheorySerializer {
+internal class JvmTheorySerializer(override val mimeType: MimeType) : WritingTheorySerializer {
 
     private val mapper = mimeType.objectMapper
     private val objectifier = JvmTheoryObjectifier()

diff --git a/serialize-theory/src/jvmMain/kotlin/it/unibo/tuprolog/serialize/ReadingTheoryDeserializer.kt b/serialize-theory/src/jvmMain/kotlin/it/unibo/tuprolog/serialize/ReadingTheoryDeserializer.kt
@@ -2,4 +2,11 @@ package it.unibo.tuprolog.serialize
 
 import it.unibo.tuprolog.theory.Theory
 
-interface ReadingTheoryDeserializer : TheoryDeserializer, ReadingDeserializer<Theory>
+interface ReadingTheoryDeserializer : TheoryDeserializer, ReadingDeserializer<Theory> {
+    companion object {
+        @JvmStatic
+        fun of(mimeType: MimeType): ReadingTheoryDeserializer {
+            return JvmTheoryDeserializer(mimeType)
+        }
+    }
+}
diff --git a/serialize-theory/src/jvmMain/kotlin/it/unibo/tuprolog/serialize/WritingTheorySerializer.kt b/serialize-theory/src/jvmMain/kotlin/it/unibo/tuprolog/serialize/WritingTheorySerializer.kt
@@ -3,4 +3,10 @@ package it.unibo.tuprolog.serialize
 import it.unibo.tuprolog.theory.Theory
 
 interface WritingTheorySerializer : TheorySerializer, WritingSerializer<Theory> {
+    companion object {
+        @JvmStatic
+        fun of(mimeType: MimeType): WritingTheorySerializer {
+            return JvmTheorySerializer(mimeType)
+        }
+    }
 }