socket-function 0.133.0 → 0.135.0

package/SocketFunction.ts

@@ -36,8 +36,8 @@ if (isNode()) {
 module.allowclient = true;
 
 type ExtractShape<ClassType, Shape> = {
-    [key in keyof Shape]: (
-        key extends keyof ClassType
+    [key in keyof ClassType]: (
+        key extends keyof Shape
         ? ClassType[key] extends SocketExposedInterface[""]
         ? ClassType[key]
         : ClassType[key] extends Function ? "All exposed function must be async (or return a Promise)" : never

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "socket-function",
-	"version": "0.133.0",
+	"version": "0.135.0",
 	"main": "index.js",
 	"license": "MIT",
 	"dependencies": {

package/require/require.ts

@@ -480,6 +480,10 @@ export function requireMain() {
 
     function createRequire(module: ModuleType, serializedModule: SerializedModule, asyncIsFineOuter?: boolean) {
         require.cache = moduleCache;
+        // Dynamically get folder, incase our filename changes
+        function getModuleFolder() {
+            return module.filename.replace(/\\/g, "/").split("/").slice(0, -1).join("/") + "/";
+        }
         function resolve(request: string) {
             let requests = serializedModule.requests;
             if (request in requests) {
@@ -487,7 +491,7 @@ export function requireMain() {
             }
             let absolutePath = request;
             if (absolutePath.startsWith("./") || absolutePath.startsWith("../")) {
-                let folderParts = moduleFolder.split("/");
+                let folderParts = getModuleFolder().split("/");
                 while (absolutePath.startsWith("./") || absolutePath.startsWith("../")) {
                     if (absolutePath.startsWith("./")) {
                         absolutePath = absolutePath.slice("./".length);
@@ -505,7 +509,6 @@ export function requireMain() {
             return absolutePath;
         }
         require.resolve = resolve;
-        let moduleFolder = module.filename.replace(/\\/g, "/").split("/").slice(0, -1).join("/") + "/";
         return require;
         function require(request: string, asyncIsFine?: boolean) {
             if (asyncIsFineOuter) {
@@ -792,6 +795,7 @@ export function requireMain() {
                         },
                     },
                     module.exports,
+                    // eslint-disable-next-line @typescript-eslint/unbound-method
                     module.require,
                     module,
                     module.filename,