make spacepackLite closer to real spacepack

moonlight-mod · Dec 6, 2023 · fe17463 · fe17463
1 parent 4a2d2a0
commit fe17463
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/src/Patcher.js b/src/Patcher.js
@@ -1,5 +1,5 @@
 import matchModule from "./matchModule";
-import { getWpToolsFunc } from "./spacepackLite";
+import { getSpacepack } from "./spacepackLite";
 
 class ConfigValidationError extends Error {}
 
@@ -70,7 +70,7 @@ export default class Patcher {
         name: "spacepack",
         // This is sorta a scope hack.
         // If we rewrap this function, it will lose its scope (in this case the match module import and the chunk object name)
-        run: getWpToolsFunc(this.chunkObject),
+        run: getSpacepack(this.chunkObject),
         entry: true,
       });
     }

diff --git a/src/spacepackEverywhere.js b/src/spacepackEverywhere.js
@@ -1,4 +1,4 @@
-import { getWpToolsFunc } from "./spacepackLite";
+import { getSpacepack } from "./spacepackLite";
 
 function getWebpackVersion(chunkObject) {
   if (chunkObject instanceof Array) {
@@ -37,7 +37,7 @@ function pushSpacepack(chunkObjectName) {
   switch (version) {
     case "modern":
       chunkObject.__spacepack_everywhere_injected = true;
-      chunkObject.push([["spacepack"], { spacepack: getWpToolsFunc(chunkObjectName, true) }, onChunkLoaded]);
+      chunkObject.push([["spacepack"], { spacepack: getSpacepack(chunkObjectName, true) }, onChunkLoaded]);
       break;
   }
 }

diff --git a/src/spacepackLite.js b/src/spacepackLite.js
@@ -67,8 +67,8 @@ function getNamedRequire(webpackRequire) {
   return namedRequireObj;
 }
 
-export function getWpToolsFunc(chunkObject, logSuccess = false) {
-  function wpTools(module, exports, webpackRequire) {
+export function getSpacepack(chunkObject, logSuccess = false) {
+  function spacepack(module, exports, webpackRequire) {
     if (logSuccess) {
       console.log("[wpTools] spacepack loaded in " + chunkObject);
     }
@@ -78,7 +78,7 @@ export function getWpToolsFunc(chunkObject, logSuccess = false) {
     // modules require cache (exports): webpackRequire.c
 
     // TODO: recurse in objects
-    function findModulesByExports(keysArg) {
+    function findByExports(keysArg) {
       if (!webpackRequire.c) {
         throw new Error("webpack runtime didn't export its moduleCache");
       }
@@ -98,7 +98,7 @@ export function getWpToolsFunc(chunkObject, logSuccess = false) {
         });
     }
 
-    function findModulesByCode(search) {
+    function findByCode(search) {
       return Object.entries(webpackRequire.m)
         .filter(([moduleId, moduleFunc]) => {
           const funcStr = Function.prototype.toString.apply(moduleFunc);
@@ -197,8 +197,8 @@ export function getWpToolsFunc(chunkObject, logSuccess = false) {
           chunkObject: window[chunkObject],
           name: chunkObject,
 
-          findModulesByCode,
-          findModulesByExports,
+          findByCode,
+          findByExports,
           findObjectFromKey,
           findObjectFromKeyValuePair,
           findObjectFromValue,
@@ -231,7 +231,7 @@ export function getWpToolsFunc(chunkObject, logSuccess = false) {
   }
 
   // Mark as processed as to not loose scope if somehow passed to Patcher._patchModules()
-  wpTools.__wpt_processed = true;
+  spacepack.__wpt_processed = true;
 
-  return wpTools;
+  return spacepack;
 }