1.0.4

Author: NotNite

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 moonlight contributors
+Copyright (c) 2025 moonlight contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moonlight-mod/moonmap",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "license": "MIT",
   "repository": {
     "type": "git",

src/index.ts

@@ -41,7 +41,8 @@ type WebpackModule = (
 export type ModuleExport =
   | {
       type: ModuleExportType.Function;
-      find: string | RegExp;
+      find: string | RegExp | (string | RegExp)[];
+      recursive?: boolean;
     }
   | {
       type: ModuleExportType.Key;
@@ -202,8 +203,13 @@ export default class Moonmap {
   ) {
     switch (moduleExport.type) {
       case ModuleExportType.Function: {
-        const match = findFunctionByStrings(original, moduleExport.find);
-        return match?.[0]?.[0];
+        return findFunctionByStrings(
+          original,
+          Array.isArray(moduleExport.find)
+            ? moduleExport.find
+            : [moduleExport.find],
+          moduleExport.recursive ?? false
+        );
       }
 
       case ModuleExportType.Key: {

src/utils.ts

@@ -1,19 +1,29 @@
 export function findFunctionByStrings(
   exports: Record<string, any>,
-  ...strings: (string | RegExp)[]
+  strings: (string | RegExp)[],
+  recursive = false,
+  state = new WeakSet()
 ) {
-  return (
-    Object.entries(exports).filter(
-      ([index, func]) =>
-        typeof func === "function" &&
-        !strings.some(
-          (query) =>
-            !(query instanceof RegExp
-              ? func.toString().match(query)
-              : func.toString().includes(query))
+  for (const [key, value] of Object.entries(exports)) {
+    if (typeof value === "function") {
+      if (
+        strings.every((query) =>
+          query instanceof RegExp
+            ? value.toString().match(query)
+            : value.toString().includes(query)
         )
-    ) ?? null
-  );
+      ) {
+        return key;
+      }
+    } else if (recursive && typeof value === "object" && value !== null) {
+      if (state.has(value)) continue;
+      state.add(value);
+      const result = findFunctionByStrings(value, strings, recursive, state);
+      if (result != null) return key;
+    }
+  }
+
+  return null;
 }
 
 export function findObjectFromKey(exports: Record<string, any>, key: string) {