sort mappings. faster lazy resolving

Author: wagyourtail

build.gradle.kts

@@ -28,11 +28,8 @@ allprojects {
 kotlin {
     jvmToolchain(8)
     jvm {
-        withJava()
-        compilations.all {
-            kotlinOptions {
-                freeCompilerArgs = listOf("-Xjsr305=strict")
-            }
+        compilerOptions {
+            freeCompilerArgs = listOf("-Xjsr305=strict")
         }
     }
     js {

gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 asm = "9.7.1"
 okio = "3.7.0"
-kotlin = "2.0.20"
+kotlin = "2.1.20"
 
 commons = "1.0.0"
 

kotlin-js-store/yarn.lock

@@ -82,23 +82,7 @@
   dependencies:
     "@types/node" "*"
 
-"@types/eslint-scope@^3.7.3":
-  version "3.7.7"
-  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5"
-  integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==
-  dependencies:
-    "@types/eslint" "*"
-    "@types/estree" "*"
-
-"@types/eslint@*":
-  version "8.56.1"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.1.tgz#988cabb39c973e9200f35fdbb29d17992965bb08"
-  integrity sha512-18PLWRzhy9glDQp3+wOgfLYRWlhgX0azxgJ63rdpoUHyrC9z0f5CkFburjQx4uD7ZCruw85ZtMt6K+L+R8fLJQ==
-  dependencies:
-    "@types/estree" "*"
-    "@types/json-schema" "*"
-
-"@types/estree@*", "@types/estree@^1.0.5":
+"@types/estree@^1.0.5":
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
   integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
@@ -135,7 +119,7 @@
   dependencies:
     "@types/node" "*"
 
-"@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+"@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.15"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
   integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
@@ -810,10 +794,10 @@ encodeurl@~1.0.2:
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
 
-enhanced-resolve@^5.17.0:
-  version "5.17.1"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15"
-  integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==
+enhanced-resolve@^5.17.1:
+  version "5.18.1"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz#728ab082f8b7b6836de51f1637aab5d3b9568faf"
+  integrity sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
@@ -1416,6 +1400,13 @@ kind-of@^6.0.2:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
+kotlin-web-helpers@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-2.0.0.tgz#b112096b273c1e733e0b86560998235c09a19286"
+  integrity sha512-xkVGl60Ygn/zuLkDPx+oHj7jeLR7hCvoNF99nhwXMn8a3ApB4lLiC9pk4ol4NHPjyoCbvQctBqvzUcp8pkqyWw==
+  dependencies:
+    format-util "^1.0.5"
+
 launch-editor@^2.6.0:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.6.1.tgz#f259c9ef95cbc9425620bbbd14b468fcdb4ffe3c"
@@ -1534,10 +1525,10 @@ minimatch@^5.0.1, minimatch@^5.1.6:
   dependencies:
     brace-expansion "^2.0.1"
 
-mocha@10.7.0:
-  version "10.7.0"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.0.tgz#9e5cbed8fa9b37537a25bd1f7fb4f6fc45458b9a"
-  integrity sha512-v8/rBWr2VO5YkspYINnvu81inSz2y3ODJrhO175/Exzor1RcEZZkizgE2A+w/CAXXoESS8Kys5E62dOHGHzULA==
+mocha@10.7.3:
+  version "10.7.3"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.3.tgz#ae32003cabbd52b59aece17846056a68eb4b0752"
+  integrity sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==
   dependencies:
     ansi-colors "^4.1.3"
     browser-stdout "^1.3.1"
@@ -2378,12 +2369,11 @@ webpack-sources@^3.2.3:
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
-webpack@5.93.0:
-  version "5.93.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.93.0.tgz#2e89ec7035579bdfba9760d26c63ac5c3462a5e5"
-  integrity sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA==
+webpack@5.94.0:
+  version "5.94.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f"
+  integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==
   dependencies:
-    "@types/eslint-scope" "^3.7.3"
     "@types/estree" "^1.0.5"
     "@webassemblyjs/ast" "^1.12.1"
     "@webassemblyjs/wasm-edit" "^1.12.1"
@@ -2392,7 +2382,7 @@ webpack@5.93.0:
     acorn-import-attributes "^1.9.5"
     browserslist "^4.21.10"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.17.0"
+    enhanced-resolve "^5.17.1"
     es-module-lexer "^1.2.1"
     eslint-scope "5.1.1"
     events "^3.2.0"

src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/umf/UMFReader.kt

@@ -31,7 +31,7 @@ object UMFReader : FormatReader {
     var uncheckedReading = false
 
     override fun isFormat(fileName: String, input: BufferedSource, envType: EnvType): Boolean {
-        return input.peek().readUtf8Line()?.lowercase()?.startsWith("umf") ?: false
+        return input.peek().readUtf8Line()?.lowercase()?.startsWith("umf") == true
     }
 
     fun String.indentCount(): Int {

src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/umf/UMFWriter.kt

@@ -57,10 +57,14 @@ object UMFWriter : FormatWriter {
         return write(envType, into::writeUtf8, minimize)
     }
 
-    fun write(envType: EnvType, into: (String) -> Unit, minimize: Boolean): MappingVisitor {
+    fun write(into: (String) -> Unit, minimize: Boolean): MappingVisitor {
         into(EMPTY)
         return EmptyMappingVisitor().delegator(UMFWriterDelegator(into, minimize))
+    }
 
+    fun write(envType: EnvType, into: (String) -> Unit, minimize: Boolean): MappingVisitor {
+        into(EMPTY)
+        return EmptyMappingVisitor().delegator(UMFWriterDelegator(into, minimize))
     }
 
     class UMFWriterDelegator(

src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/jvms/four/two.one/PackageName.kt

@@ -22,7 +22,7 @@ value class PackageName private constructor(val value: String) : Type {
         }
 
         override fun read(reader: CharReader<*>, append: (Any) -> Unit) {
-            while (true) {
+            while (!reader.exhausted()) {
                 reader.mark()
                 val id = UnqualifiedName.read(reader)
                 if (reader.take() != '/') {
@@ -38,17 +38,15 @@ value class PackageName private constructor(val value: String) : Type {
     }
 
     fun getParts(): List<UnqualifiedName> {
-        return value.split("/").map { UnqualifiedName.unchecked(it) }
+        return value.split("/").dropLast(1).map { UnqualifiedName.unchecked(it) }
     }
 
     override fun accept(visitor: (Any) -> Boolean) {
         if (visitor(this)) {
             val parts = getParts()
             for (i in parts.indices) {
                 parts[i].accept(visitor)
-                if (i != parts.lastIndex) {
-                    visitor("/")
-                }
+                visitor("/")
             }
         }
     }

src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/propagator/InheritanceTree.kt

@@ -7,6 +7,7 @@ import kotlinx.coroutines.sync.withLock
 import xyz.wagyourtail.commonskt.collection.defaultedMapOf
 import xyz.wagyourtail.commonskt.utils.coroutines.parallelMap
 import xyz.wagyourtail.unimined.mapping.Namespace
+import xyz.wagyourtail.unimined.mapping.jvms.ext.FieldOrMethodDescriptor
 import xyz.wagyourtail.unimined.mapping.jvms.four.AccessFlag
 import xyz.wagyourtail.unimined.mapping.jvms.four.ElementType
 import xyz.wagyourtail.unimined.mapping.jvms.four.contains
@@ -15,6 +16,7 @@ import xyz.wagyourtail.unimined.mapping.jvms.four.three.two.FieldDescriptor
 import xyz.wagyourtail.unimined.mapping.jvms.four.two.one.InternalName
 import xyz.wagyourtail.unimined.mapping.tree.AbstractMappingTree
 import xyz.wagyourtail.unimined.mapping.tree.MemoryMappingTree
+import xyz.wagyourtail.unimined.mapping.tree.node._class.member.WildcardNode
 import xyz.wagyourtail.unimined.mapping.visitor.*
 import xyz.wagyourtail.unimined.mapping.visitor.delegate.Delegator
 import xyz.wagyourtail.unimined.mapping.visitor.delegate.delegator
@@ -194,10 +196,15 @@ abstract class InheritanceTree(val tree: AbstractMappingTree) {
                 val initialMethods = methods.filter { md ->
                     // modify access
                     val acc = AccessFlag.of(ElementType.METHOD, md.access).toMutableSet()
-                    val methods = tree.getClass(fns, name)?.getMethods(fns, md.name, md.descriptor)
+                    val cls = tree.getClass(fns, name)
+                    val methods = cls?.getMethods(fns, md.name, md.descriptor)
                     methods?.flatMap { it.access }?.forEach {
                         it.apply(acc)
                     }
+                    val wildcards = cls?.getWildcards(WildcardNode.WildcardType.METHOD, fns, FieldOrMethodDescriptor(md.descriptor))
+                    wildcards?.flatMap { it.access }?.forEach {
+                        it.apply(acc)
+                    }
                     AccessFlag.isInheritable(acc) && !md.name.startsWith("<")
                 }.toMutableList()
 

src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/tree/AbstractMappingTree.kt

@@ -3,6 +3,7 @@ package xyz.wagyourtail.unimined.mapping.tree
 import xyz.wagyourtail.commonskt.utils.escape
 import xyz.wagyourtail.commonskt.utils.maybeEscape
 import xyz.wagyourtail.unimined.mapping.Namespace
+import xyz.wagyourtail.unimined.mapping.formats.umf.UMFWriter
 import xyz.wagyourtail.unimined.mapping.jvms.JVMS
 import xyz.wagyourtail.unimined.mapping.jvms.ext.FieldOrMethodDescriptor
 import xyz.wagyourtail.unimined.mapping.jvms.ext.FullyQualifiedName
@@ -366,14 +367,19 @@ abstract class AbstractMappingTree : BaseNode<MappingVisitor, NullVisitor>(null)
     override fun acceptInner(visitor: MappingVisitor, nsFilter: Collection<Namespace>) {
         visitor.visitHeader(*nsFilter.filter { namespaces.contains(it) }.map { it.name }.toTypedArray())
         super.acceptInner(visitor, nsFilter)
-        for (pkg in packagesIter()) {
-            pkg.second().accept(visitor, nsFilter)
+        for (pkg in packagesIter().asSequence().map { it.second() }.sortedBy { it.toString() }) {
+            pkg.accept(visitor, nsFilter)
         }
-        for (cls in classesIter()) {
-            cls.second().accept(visitor, nsFilter)
+        for (cls in classesIter().asSequence().map { it.second() }.sortedBy { it.toString() }) {
+            cls.accept(visitor, nsFilter)
         }
-        for (group in constantGroupsIter()) {
-            group.second().accept(visitor, nsFilter)
+        for (group in constantGroupsIter().asSequence().map { it.second() }.sortedBy { it.toString() }) {
+            group.accept(visitor, nsFilter)
         }
     }
+
+    override fun toUMF(inner: Boolean) = buildString {
+        acceptInner(UMFWriter.write(::append, false), namespaces)
+    }
+
 }

src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/tree/node/AccessNode.kt

@@ -11,6 +11,8 @@ import xyz.wagyourtail.unimined.mapping.visitor.AccessParentVisitor
 import xyz.wagyourtail.unimined.mapping.visitor.AccessType
 import xyz.wagyourtail.unimined.mapping.visitor.AccessVisitor
 import xyz.wagyourtail.unimined.mapping.visitor.EmptyAccessParentVisitor
+import xyz.wagyourtail.unimined.mapping.visitor.EmptyAccessVisitor
+import xyz.wagyourtail.unimined.mapping.visitor.delegate.DelegateAccessVisitor
 
 class AccessNode<U: AccessParentVisitor<U>>(parent: BaseNode<U, *>, val accessType: AccessType, val accessFlag: AccessFlag, val conditions: AccessConditions) : BaseNode<AccessVisitor, U>(parent), AccessVisitor {
     private val _namespaces: MutableSet<Namespace> = mutableSetOf()
@@ -27,13 +29,6 @@ class AccessNode<U: AccessParentVisitor<U>>(parent: BaseNode<U, *>, val accessTy
         return visitor.visitAccess(accessType, accessFlag, conditions, ns)
     }
 
-    override fun toString() = buildString {
-        val delegator = UMFWriter.UMFWriterDelegator(::append, true)
-        delegator.namespaces = root.namespaces
-        delegator.visitAccess(EmptyAccessParentVisitor(), accessType, accessFlag, conditions, namespaces)
-//        acceptInner(DelegateAccessVisitor(EmptyAccessVisitor(), delegator), root.namespaces)
-    }
-
     fun apply(set: MutableSet<AccessFlag>) {
         if (conditions.check(set)) {
             if (accessType == AccessType.ADD) {
@@ -44,4 +39,11 @@ class AccessNode<U: AccessParentVisitor<U>>(parent: BaseNode<U, *>, val accessTy
         }
     }
 
+    override fun toUMF(inner: Boolean) = buildString {
+        val delegator = UMFWriter.UMFWriterDelegator(::append, true)
+        delegator.namespaces = root.namespaces
+        delegator.visitAccess(EmptyAccessParentVisitor(), accessType, accessFlag, conditions, namespaces)
+        if (inner) acceptInner(DelegateAccessVisitor(EmptyAccessVisitor(), delegator), root.namespaces)
+    }
+
 }

src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/tree/node/AccessParentNode.kt

@@ -14,7 +14,7 @@ abstract class AccessParentNode<T: AccessParentVisitor<T>, U: BaseVisitor<U>>(pa
     val access: List<AccessNode<T>> get() = _access
 
     override fun acceptInner(visitor: T, nsFilter: Collection<Namespace>) {
-        for (access in access) {
+        for (access in access.sortedBy { it.toString() }) {
             access.accept(visitor, nsFilter)
         }
         super.acceptInner(visitor, nsFilter)