Issue201 2

build.gradle.kts

@@ -36,7 +36,7 @@ plugins {
     id("io.codearte.nexus-staging") version "0.30.0"
     id("io.gitlab.arturbosch.detekt").version("1.23.8")
     id("info.solidsoft.pitest").version("1.19.0-rc.2")
-    id("org.jetbrains.kotlinx.kover") version "0.9.4"
+    id("org.jetbrains.kotlinx.kover") version "0.9.11"
 }
 
 java {

src/main/kotlin/org/xpathqs/core/annotations/NoXpathBase.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 XPATH-QS
+ * Copyright (c) 2026 XPATH-QS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,9 +22,9 @@
 
 package org.xpathqs.core.annotations
 
-import org.xpathqs.core.selector.base.BaseSelector
-import org.xpathqs.core.selector.group.GroupSelector
-import org.xpathqs.core.selector.xpath.XpathSelector
+import org.xpathqs.core.selector.BaseSelector
+import org.xpathqs.core.selector.GroupSelector
+import org.xpathqs.core.selector.XpathSelector
 
 /**
  * Annotation will remove base xpath from result xpath

src/main/kotlin/org/xpathqs/core/annotations/SingleBase.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 XPATH-QS
+ * Copyright (c) 2026 XPATH-QS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,9 +22,9 @@
 
 package org.xpathqs.core.annotations
 
-import org.xpathqs.core.selector.selector.Selector
-import org.xpathqs.core.selector.group.GroupSelector
-import org.xpathqs.core.selector.xpath.XpathSelector
+import org.xpathqs.core.selector.Selector
+import org.xpathqs.core.selector.GroupSelector
+import org.xpathqs.core.selector.XpathSelector
 import org.xpathqs.core.selector.block.Block
 
 /**

src/main/kotlin/org/xpathqs/core/model/AssociationFinder.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 XPATH-QS
+ * Copyright (c) 2026 XPATH-QS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,7 +22,7 @@
 
 package org.xpathqs.core.model
 
-import org.xpathqs.core.selector.base.BaseSelector
+import org.xpathqs.core.selector.BaseSelector
 import java.lang.reflect.Field
 
 

src/main/kotlin/org/xpathqs/core/model/IModelAssociation.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 XPATH-QS
+ * Copyright (c) 2026 XPATH-QS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,7 +22,7 @@
 
 package org.xpathqs.core.model
 
-import org.xpathqs.core.selector.base.BaseSelector
+import org.xpathqs.core.selector.BaseSelector
 import java.lang.reflect.Field
 
 interface IModelAssociation {

src/main/kotlin/org/xpathqs/core/model/ModelAssociation.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 XPATH-QS
+ * Copyright (c) 2026 XPATH-QS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,7 @@
 package org.xpathqs.core.model
 
 import org.xpathqs.core.reflection.toField
-import org.xpathqs.core.selector.base.BaseSelector
+import org.xpathqs.core.selector.BaseSelector
 import java.lang.reflect.Field
 import kotlin.reflect.KProperty
 

src/main/kotlin/org/xpathqs/core/model/NameAssociation.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 XPATH-QS
+ * Copyright (c) 2026 XPATH-QS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,7 +22,7 @@
 
 package org.xpathqs.core.model
 
-import org.xpathqs.core.selector.base.BaseSelector
+import org.xpathqs.core.selector.BaseSelector
 import org.xpathqs.core.selector.extensions.simpleName
 import java.lang.reflect.Field
 

src/main/kotlin/org/xpathqs/core/reflection/ReflectionExtensions.kt

@@ -23,11 +23,11 @@
 package org.xpathqs.core.reflection
 
 import org.xpathqs.core.selector.NullSelector
-import org.xpathqs.core.selector.base.BaseSelector
+import org.xpathqs.core.selector.BaseSelector
 import org.xpathqs.core.selector.base.BaseSelectorProps
-import org.xpathqs.core.selector.base.ISelector
+import org.xpathqs.core.selector.ISelector
 import org.xpathqs.core.selector.block.Block
-import org.xpathqs.core.selector.group.GroupSelector
+import org.xpathqs.core.selector.GroupSelector
 import kotlin.reflect.KClass
 import kotlin.reflect.KProperty
 import kotlin.reflect.full.declaredMemberProperties

src/main/kotlin/org/xpathqs/core/reflection/SelectorParser.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025 XPATH-QS
+ * Copyright (c) 2026 XPATH-QS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -27,14 +27,14 @@ import org.xpathqs.core.annotations.NoBase
 import org.xpathqs.core.annotations.NoXpathBase
 import org.xpathqs.core.annotations.SingleBase
 import org.xpathqs.core.selector.NullSelector
-import org.xpathqs.core.selector.base.BaseSelector
-import org.xpathqs.core.selector.base.ISelector
+import org.xpathqs.core.selector.BaseSelector
+import org.xpathqs.core.selector.ISelector
 import org.xpathqs.core.selector.base.SelectorState
 import org.xpathqs.core.selector.base.hasAnnotation
 import org.xpathqs.core.selector.block.Block
-import org.xpathqs.core.selector.group.GroupSelector
+import org.xpathqs.core.selector.GroupSelector
 import org.xpathqs.core.selector.group.prefix
-import org.xpathqs.core.selector.selector.Selector
+import org.xpathqs.core.selector.Selector
 import org.xpathqs.core.selector.selector.prefix
 import kotlin.reflect.KProperty
 import kotlin.reflect.full.findAnnotation

src/main/kotlin/org/xpathqs/core/reflection/SelectorReflection.kt

@@ -23,9 +23,9 @@
 package org.xpathqs.core.reflection
 
 import org.xpathqs.core.selector.args.SelectorArgs
-import org.xpathqs.core.selector.base.BaseSelector
+import org.xpathqs.core.selector.BaseSelector
 import org.xpathqs.core.selector.base.BaseSelectorProps
-import org.xpathqs.core.selector.base.ISelector
+import org.xpathqs.core.selector.ISelector
 import org.xpathqs.core.selector.base.SelectorState
 import java.lang.reflect.Field
 import kotlin.reflect.KProperty

src/main/kotlin/org/xpathqs/core/reflection/SelectorReflectionFields.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 XPATH-QS
+ * Copyright (c) 2026 XPATH-QS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,8 +23,7 @@
 package org.xpathqs.core.reflection
 
 import org.xpathqs.core.annotations.NoScan
-import org.xpathqs.core.selector.NullSelector
-import org.xpathqs.core.selector.base.BaseSelector
+import org.xpathqs.core.selector.BaseSelector
 import org.xpathqs.core.selector.block.Block
 import kotlin.reflect.KClass
 import kotlin.reflect.KProperty

src/main/kotlin/org/xpathqs/core/selector/BaseSelector.kt

@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2026 XPATH-QS
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package org.xpathqs.core.selector
+
+import org.xpathqs.core.selector.base.BaseSelectorProps
+import org.xpathqs.core.selector.base.SelectorState
+import kotlin.reflect.KProperty
+
+/**
+ * Base interface for the Selectors
+ * @param state of the Selector
+ * @param base link to the root element
+ * @param name name of the selector (used for logging purposes)
+ * @param props properties for building xpath queries
+ * @param annotations list of annotations for selector
+ * @param property associated field of the root object.
+ *      It may be NULL, when there is no root object
+ */
+sealed interface BaseSelector: ISelector {
+
+    val state: SelectorState
+
+    val base: ISelector
+    override val name: String
+    override val fullName: String
+
+    val props: BaseSelectorProps
+    val annotations: Collection<Annotation>
+
+    val property: KProperty<*>?
+    val noBase: Boolean
+
+    /**
+     * Get selector's tag or an empty string
+     * if tag is not applicable to the Selector's type
+     */
+    val tag: String
+
+    /**
+     * A holder collection for some custom properties
+     * which may be used for the extending the functionality via extension-functions
+     *
+     * Require #1 - map should not be cloned. It purposes only for holding some configuration constants
+     * @sample org.xpathqs.core.selector.base.BaseSelectorCustomPropsMapTest.r1
+     */
+    val customPropsMap: HashMap<String, Any?>
+}

src/main/kotlin/org/xpathqs/core/selector/base/BaseSelector.kt → src/main/kotlin/org/xpathqs/core/selector/BaseSelectorImpl.kt

@@ -20,52 +20,13 @@
  * SOFTWARE.
  */
 
-package org.xpathqs.core.selector.base
+package org.xpathqs.core.selector
 
-import org.xpathqs.core.selector.NullSelector
+import org.xpathqs.core.selector.base.BaseSelectorProps
+import org.xpathqs.core.selector.base.SelectorState
 import kotlin.reflect.KProperty
 
-/**
- * Base interface for the Selectors
- * @param state of the Selector
- * @param base link to the root element
- * @param name name of the selector (used for logging purposes)
- * @param props properties for building xpath queries
- * @param annotations list of annotations for selector
- * @param property associated field of the root object.
- *      It may be NULL, when there is no root object
- */
-interface BaseSelector: ISelector {
-
-    val state: SelectorState
-
-    val base: ISelector
-    override val name: String
-    override val fullName: String
-
-    val props: BaseSelectorProps
-    val annotations: Collection<Annotation>
-
-    val property: KProperty<*>?
-    val noBase: Boolean
-
-    /**
-     * Get selector's tag or an empty string
-     * if tag is not applicable to the Selector's type
-     */
-    val tag: String
-
-    /**
-     * A holder collection for some custom properties
-     * which may be used for the extending the functionality via extension-functions
-     *
-     * Require #1 - map should not be cloned. It purposes only for holding some configuration constants
-     * @sample org.xpathqs.core.selector.base.BaseSelectorCustomPropsMapTest.r1
-     */
-    val customPropsMap: HashMap<String, Any?>
-}
-
-abstract class BaseSelectorImpl(
+sealed class BaseSelectorImpl(
     override val state: SelectorState = SelectorState.INIT,
 
     override val base: ISelector = NullSelector(),

src/main/kotlin/org/xpathqs/core/selector/compose/ComposeSelector.kt → src/main/kotlin/org/xpathqs/core/selector/ComposeSelector.kt

@@ -20,12 +20,10 @@
  * SOFTWARE.
  */
 
-package org.xpathqs.core.selector.compose
+package org.xpathqs.core.selector
 
-import org.xpathqs.core.selector.NullSelector
-import org.xpathqs.core.selector.base.BaseSelectorImpl
-import org.xpathqs.core.selector.base.ISelector
 import org.xpathqs.core.selector.base.SelectorState
+import org.xpathqs.core.selector.compose.ComposeSelectorProps
 
 /**
  * Class with ability to combine several selectors with the `|` operator

src/main/kotlin/org/xpathqs/core/selector/group/GroupSelector.kt → src/main/kotlin/org/xpathqs/core/selector/GroupSelector.kt

@@ -20,13 +20,9 @@
  * SOFTWARE.
  */
 
-package org.xpathqs.core.selector.group
+package org.xpathqs.core.selector
 
-import org.xpathqs.core.selector.NullSelector
-import org.xpathqs.core.selector.base.BaseSelector
-import org.xpathqs.core.selector.base.BaseSelectorImpl
 import org.xpathqs.core.selector.base.BaseSelectorProps
-import org.xpathqs.core.selector.base.ISelector
 import org.xpathqs.core.selector.base.SelectorState
 
 /**

src/main/kotlin/org/xpathqs/core/selector/base/ISelector.kt → src/main/kotlin/org/xpathqs/core/selector/ISelector.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 XPATH-QS
+ * Copyright (c) 2026 XPATH-QS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package org.xpathqs.core.selector.base
+package org.xpathqs.core.selector
 
 /**
  * Root Interface for the Selectors interaction
  */
-interface ISelector : Cloneable {
+sealed interface ISelector : Cloneable {
     /**
      * Build `XPATH` query
      */

src/main/kotlin/org/xpathqs/core/selector/NullSelector.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 XPATH-QS
+ * Copyright (c) 2026 XPATH-QS
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,8 +22,6 @@
 
 package org.xpathqs.core.selector
 
-import org.xpathqs.core.selector.base.ISelector
-
 /**
  * Implementation of `Null Object` pattern for the ISelector
  */

src/main/kotlin/org/xpathqs/core/selector/result/ResultSelector.kt → src/main/kotlin/org/xpathqs/core/selector/ResultSelector.kt

@@ -20,12 +20,9 @@
  * SOFTWARE.
  */
 
-package org.xpathqs.core.selector.result
+package org.xpathqs.core.selector
 
-import org.xpathqs.core.selector.NullSelector
-import org.xpathqs.core.selector.base.BaseSelectorImpl
 import org.xpathqs.core.selector.base.BaseSelectorProps
-import org.xpathqs.core.selector.base.ISelector
 import org.xpathqs.core.selector.base.SelectorState
 
 /**