From 3df8f9373afff3fad59232852e3b118a16eec92d Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sun, 4 Feb 2024 04:54:18 +0900 Subject: [PATCH] Add support for parameters (including Parchment) --- backend/build.gradle | 2 +- .../me/shedaniel/linkie/web/LinkieHandles.kt | 59 ++++++++- .../me/shedaniel/linkie/web/deps/Deps.kt | 1 + frontend/src/App.vue | 1 + frontend/src/app/mappings-data.ts | 6 + frontend/src/components/Tooltip.vue | 22 ++++ frontend/src/components/mappings/AutoBold.vue | 55 ++++++++ .../mappings/MappingsEntryBlock.vue | 121 ++++++++++++++++-- frontend/src/index.css | 4 + frontend/tailwind.config.js | 1 + 10 files changed, 253 insertions(+), 19 deletions(-) create mode 100644 frontend/src/components/Tooltip.vue create mode 100644 frontend/src/components/mappings/AutoBold.vue diff --git a/backend/build.gradle b/backend/build.gradle index a93bc0b..5fad940 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -28,7 +28,7 @@ configurations { } dependencies { - implementation("me.shedaniel:linkie-core:1.0.119") + implementation("me.shedaniel:linkie-core:1.0.120") implementation("io.ktor:ktor-server-cors:2.2.3") implementation("io.ktor:ktor-server-content-negotiation:2.2.3") implementation("io.ktor:ktor-server-status-pages:2.2.3") diff --git a/backend/src/main/kotlin/me/shedaniel/linkie/web/LinkieHandles.kt b/backend/src/main/kotlin/me/shedaniel/linkie/web/LinkieHandles.kt index 91c2c4d..859b9f1 100644 --- a/backend/src/main/kotlin/me/shedaniel/linkie/web/LinkieHandles.kt +++ b/backend/src/main/kotlin/me/shedaniel/linkie/web/LinkieHandles.kt @@ -1,10 +1,15 @@ package me.shedaniel.linkie.web +import com.soywiz.korio.async.launch +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.coroutineScope +import kotlinx.coroutines.withContext import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.json.* import me.shedaniel.linkie.* +import me.shedaniel.linkie.namespaces.YarnNamespace import me.shedaniel.linkie.utils.MemberEntry import me.shedaniel.linkie.utils.ResultHolder import me.shedaniel.linkie.utils.toVersion @@ -17,6 +22,7 @@ import nl.adaptivity.xmlutil.serialization.XmlSerialName import java.io.File import kotlin.math.max import kotlin.math.min +import kotlin.properties.Delegates val xml = XML { autoPolymorphic = true @@ -50,16 +56,39 @@ suspend fun search( ?: (translateNamespace?.defaultVersion?.takeIf { it in allVersions } ?: allVersions.first()) val provider = version?.let { namespace.getProvider(it) } ?: namespace.getProvider(defaultVersion) - val mappings = provider.get() + var mappings by Delegates.notNull() + var yarnMappings: MappingsContainer? = null + coroutineScope { + launch { withContext(Dispatchers.Default) { mappings = provider.get() } } + if (!namespace.hasMethodArgs(provider.version!!) && provider.version!!.tryToVersion()?.takeIf { it > "1.14.4".toVersion() } != null) { + val yarnProvider = YarnNamespace.getProvider(provider.version!!) + if (!yarnProvider.isEmpty()) { + launch { withContext(Dispatchers.Default) { yarnMappings = yarnProvider.get() } } + } + } + } val result = MappingsQueryUtils.query(mappings, query, *buildList { if (allowClasses) add(MappingsEntryType.CLASS) if (allowMethods) add(MappingsEntryType.METHOD) if (allowFields) add(MappingsEntryType.FIELD) }.toTypedArray(), limit = limit) + val argMappings: (Class, Method) -> List? = if (yarnMappings != null) { + inner@{ clazz, method -> + val obfName = method.obfMergedName ?: return@inner null + val obfDesc = method.getObfMergedDesc(mappings) + val parentObfName = clazz.obfMergedName ?: return@inner null + val targetParent = yarnMappings!!.getClassByObfName(parentObfName) ?: return@inner null + val targetMethod = + targetParent.methods.firstOrNull { it.obfMergedName == obfName && it.getObfMergedDesc(yarnMappings!!) == obfDesc } + ?: return@inner null + + targetMethod.args + } + } else { _, _ -> null } if (translateNamespace == null) { return SearchResultEntries( entries = result.results.asSequence().take(limit).mapNotNull { - toJsonFromEntry(mappings, it.value, it.score) + toJsonFromEntry(namespace, mappings, it.value, it.score, argMappings) }.toList(), fuzzy = result.fuzzy, ) @@ -67,8 +96,8 @@ suspend fun search( val target = translateNamespace.getProvider(provider.version!!).get() val elements = mutableListOf() translate(mappings, target, result.results.asSequence().take(limit)) { from, to, score -> - toJsonFromEntry(mappings, from, score)?.also { obj -> - val translated = toJsonFromEntry(target, to, score) + toJsonFromEntry(namespace, mappings, from, score, argMappings)?.also { obj -> + val translated = toJsonFromEntry(translateNamespace, target, to, score) { _, _ -> null } if (translated == null) elements.add(obj) else { elements.add(buildJsonObject { @@ -190,7 +219,7 @@ fun getLoaderVersions(loader: String): MutableMap List?): JsonObject? { return when (entry) { is Class -> json.encodeToJsonElement( SearchResultClassEntry.serializer(), SearchResultClassEntry( @@ -204,7 +233,7 @@ fun toJsonFromEntry(mappings: MappingsContainer, entry: Any?, score: Double): Js ) ) as JsonObject - is MemberEntry<*> -> json.encodeToJsonElement( + is MemberEntry<*> -> (json.encodeToJsonElement( SearchResultMemberEntry.serializer(), SearchResultMemberEntry( obf = entry.member.obfMergedName, intermediary = entry.member.intermediaryName, @@ -224,7 +253,23 @@ fun toJsonFromEntry(mappings: MappingsContainer, entry: Any?, score: Double): Js score = score, memberType = if (entry.member is Field) "f" else "m" ) - ) as JsonObject + ) as JsonObject).let { + if (entry.member is Method) { + var guessed = false + val args = (entry.member as Method).args ?: (argMappings(entry.owner, entry.member as Method)?.also { + guessed = true + } ?: return@let it) + val map = it.toMutableMap() + map["p"] = buildJsonObject { + args.forEach { arg -> + put(arg.index.toString(), arg.name) + } + } + map["q"] = JsonPrimitive(guessed) + map["r"] = JsonPrimitive(!guessed && namespace.id.contains("mojang")) + JsonObject(map) + } else it + } else -> null } diff --git a/backend/src/main/kotlin/me/shedaniel/linkie/web/deps/Deps.kt b/backend/src/main/kotlin/me/shedaniel/linkie/web/deps/Deps.kt index 38fba27..12482be 100644 --- a/backend/src/main/kotlin/me/shedaniel/linkie/web/deps/Deps.kt +++ b/backend/src/main/kotlin/me/shedaniel/linkie/web/deps/Deps.kt @@ -166,6 +166,7 @@ fun startLinkie() { BarnNamespace, FeatherNamespace, ), + maximumLoadedVersions = 4, remapSourceDaemonDuration = 10.minutes, ) ) diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 72d265e..1d95852 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -94,6 +94,7 @@ export default defineComponent({ \ No newline at end of file diff --git a/frontend/src/components/mappings/AutoBold.vue b/frontend/src/components/mappings/AutoBold.vue new file mode 100644 index 0000000..a1b2954 --- /dev/null +++ b/frontend/src/components/mappings/AutoBold.vue @@ -0,0 +1,55 @@ + + + \ No newline at end of file diff --git a/frontend/src/components/mappings/MappingsEntryBlock.vue b/frontend/src/components/mappings/MappingsEntryBlock.vue index 6c91ef6..25b30ed 100644 --- a/frontend/src/components/mappings/MappingsEntryBlock.vue +++ b/frontend/src/components/mappings/MappingsEntryBlock.vue @@ -30,6 +30,53 @@ +
+
+ + + + + + + + + +
+
+ + + + + + + Warning +
+ The method argument mappings are aggregated from other mapping projects,
+ and may not be accurate or fit the current context.

+ This may be the result of the lack of a proper source for this mappings or this version. +
+
+
+ + + + + + + Info +
+ The method argument mappings are provided from a community project, ParchmentMC,
+ and may not be accurate, or may be subject to a different license. +
+ +
+
+ {{ methodReturnType(entry) }} + {{ onlyClass(getOptimumName(entry)) }}( + {{ methodArgs(entry) }}) +
+
  • @@ -102,6 +149,9 @@ import {addAlert} from "../../app/alerts" import {MappingEntry, Namespace} from "../../app/mappings-data" import Copyable from "../Copyable.vue" import Prism, {TokenStream} from "prismjs" +import GeneratorDescription from "../generator/GeneratorDescription.vue" +import AutoBold from "./AutoBold.vue" +import Tooltip from "../Tooltip.vue" function getOptimumName(entry: MappingEntry): string { return entry.named || entry.intermediary || "" @@ -115,19 +165,19 @@ function getOptimumDesc(entry: MappingEntry): string { return entry.descNamed || entry.descIntermediary || "" } -function formatName(str: string | undefined) { +function formatName(str: T): T { if (str) { - return str.replaceAll("$", ".").replaceAll("/", ".") + return str.replaceAll("$", ".").replaceAll("/", ".") as T } else { return str } } -function onlyClass(str: string | undefined) { +function onlyClass(str: T): T { if (str) { let indexOf = str.lastIndexOf("/") - str = indexOf == -1 ? str : str.substring(indexOf + 1) - return formatName(str) + let substr = indexOf == -1 ? str : str.substring(indexOf + 1) + return formatName(substr) as T } else { return str } @@ -263,6 +313,9 @@ function beautifyFieldType(type: string) { case "D": str += "double" break + case "V": + str += "void" + break } } } @@ -276,7 +329,7 @@ function beautifyFieldType(type: string) { export default defineComponent({ name: "MappingsEntryBlock", - components: {Copyable, CodeBlock, EntryDetails, SubHeader, Header, Block}, + components: {Tooltip, AutoBold, GeneratorDescription, Copyable, CodeBlock, EntryDetails, SubHeader, Header, Block}, data() { return { getDisplayName, @@ -365,16 +418,16 @@ export default defineComponent({ if (this.entry.type === "class" && tokenType === "class-name" && child.textContent === toFind) { if (!line.children[j - 2]?.className?.includes("keyword")) continue if (line.children[j - 2]?.textContent !== "class" - && line.children[j - 2]?.textContent !== "interface" - && line.children[j - 2]?.textContent !== "enum") continue + && line.children[j - 2]?.textContent !== "interface" + && line.children[j - 2]?.textContent !== "enum") continue } else if (this.entry.type === "method" && tokenType === "function" && child.textContent === toFind) { if (!line.children[j + 1]?.className?.includes("punctuation")) continue if (line.children[j + 1]?.textContent !== "(") continue if (!line.children[j - 1]?.className?.includes("text")) continue if (line.children[j - 1]?.textContent !== " ") continue if (!(line.children[j - 2]?.className?.includes("keyword") && line.children[j - 1]?.textContent !== "return") - && !line.children[j - 2]?.className?.includes("class-name") - && !line.children[j - 2]?.className?.includes("generics")) continue + && !line.children[j - 2]?.className?.includes("class-name") + && !line.children[j - 2]?.className?.includes("generics")) continue } else if (this.entry.type === "field" && tokenType === "text" && child.textContent === " " + toFind) { if (line.children[j + 1]?.textContent !== ";") continue } else if (this.entry.type === "field" && tokenType === "text" && child.textContent === " " + toFind + " ") { @@ -438,8 +491,54 @@ export default defineComponent({ let desc = getOptimumDesc(entry) return beautifyFieldType(desc) }, + methodReturnType(entry: MappingEntry) { + let desc = getOptimumDesc(entry) + desc = desc.substring(desc.lastIndexOf(")") + 1) + return onlyClass(beautifyFieldType(desc).replaceAll(".", "/")) + }, + getMethodArgs(entry: MappingEntry): string[][] { + let desc = getOptimumDesc(entry) + let args = [] as string[][] + // Args can be single char or full class name wrapped with L and ; + let index = desc.indexOf("(") + 1 + while (desc[index] !== ")") { + let start = desc[index] + if (start === "L") { + let end = desc.indexOf(";", index) + let arg = desc.substring(index, end + 1) + args.push([arg, onlyClass(beautifyFieldType(arg).replaceAll(".", "/"))]) + index = end + 1 + } else { + args.push([desc[index], beautifyFieldType(desc[index])]) + index++ + } + } + return args + }, + methodArgs(entry: MappingEntry) { + let args = this.getMethodArgs(entry) + let min = 1000000, max = 0 + if (entry.args) { + Object.keys(entry.args).filter(it => entry.args!!.hasOwnProperty(it)).map(it => +it).forEach(it => { + if (it < min) min = it + if (it > max) max = it + }) + } + let apply = -1 + if (max - min + 1 == args.length) apply = min + return args.map((arg, index) => { + let name = `var${index}` + if (entry.args && apply >= 0) { + let argName = entry.args[index + apply] + if (argName) { + name = argName + } + } + return `*${arg[1]}* ${name}` + }).join(", ") + }, requestSource() { - this.expandSource = !this.expandSource ? this.namespace?.id + " " + this.version + " " + this.query : null + this.expandSource = !this.expandSource || this.expandSource !== this.namespace?.id + " " + this.version + " " + this.query ? this.namespace?.id + " " + this.version + " " + this.query : null this.source = "" if (this.expandSource === this.namespace?.id + " " + this.version + " " + this.query) { diff --git a/frontend/src/index.css b/frontend/src/index.css index c99f812..a4fcdf1 100644 --- a/frontend/src/index.css +++ b/frontend/src/index.css @@ -74,3 +74,7 @@ input[type=checkbox] { .expand-height.expanded { @apply max-h-[100vh] opacity-100 mt-[-1rem] pt-[1rem]; } + +code { + @apply font-mono; +} diff --git a/frontend/tailwind.config.js b/frontend/tailwind.config.js index 0f5ada1..f851146 100644 --- a/frontend/tailwind.config.js +++ b/frontend/tailwind.config.js @@ -9,6 +9,7 @@ module.exports = { extend: {}, fontFamily: { "sans": ["Inter"], + "mono": ["Jetbrains Mono"], }, colors: { transparent: "transparent",