Fixed 5.1.5 glue not loading because of missing pcallk

Author: lolleko

.github/workflows/release.yml

@@ -1,4 +1,3 @@
-
 name: Release
 
 on:
@@ -23,4 +22,4 @@ jobs:
       - run: npm run complete-build
       - run: npm publish
         env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}

README.md

@@ -3,6 +3,7 @@
 WASM bindings and binaries for Lua 5.1 to 5.4.
 
 Make sure to run `./scripts/setup.ts` (requires emscripten sdk) first before using `npm run build`.
+
 ### Important: This currently only includes the bindings used to test TypescriptToLua
 
 In the future Bindings for the complete API may be added.
@@ -14,38 +15,36 @@ import { LUA_OK } from "lua-wasm-bindings/dist/lua";
 
 import { lauxlib, lua, lualib } from "lua-wasm-bindings/dist/lua.54";
 
-
 const luaCode = `return "Hello"`;
 consol.log(executeLua(luaCode));
 
-function executeLua (luaCode: string): string | Error | never {
-    const L = lauxlib.luaL_newstate();
-    lualib.luaL_openlibs(L);
-
-    // Optional Load modules
-    // lua.lua_getglobal(L, "package");
-    // lua.lua_getfield(L, -1, "preload");
-    // lauxlib.luaL_loadstring(L, jsonLib); // Load extenal package from string
-    // lua.lua_setfield(L, -2, "json");
-
-    const status = lauxlib.luaL_dostring(L, luaCode);
-
-    if (status === LUA_OK) {
-        if (lua.lua_isstring(L, -1)) {
-            const result = lua.lua_tostring(L, -1);
-            lua.lua_close(L);
-            return result === null ? undefined : result;
-        } else {
-            const returnType = lua.lua_typename(L, lua.lua_type(L, -1));
-            lua.lua_close(L);
-            throw new Error(`Unsupported Lua return type: ${returnType}`);
-        }
+function executeLua(luaCode: string): string | Error | never {
+  const L = lauxlib.luaL_newstate();
+  lualib.luaL_openlibs(L);
+
+  // Optional Load modules
+  // lua.lua_getglobal(L, "package");
+  // lua.lua_getfield(L, -1, "preload");
+  // lauxlib.luaL_loadstring(L, jsonLib); // Load extenal package from string
+  // lua.lua_setfield(L, -2, "json");
+
+  const status = lauxlib.luaL_dostring(L, luaCode);
+
+  if (status === LUA_OK) {
+    if (lua.lua_isstring(L, -1)) {
+      const result = lua.lua_tostring(L, -1);
+      lua.lua_close(L);
+      return result === null ? undefined : result;
     } else {
-        const luaStackString = lua.lua_tostring(L, -1);
-        const message = luaStackString.replace(/^\[string "(--)?\.\.\."\]:\d+: /, "");
-        lua.lua_close(L);
-        return new Error(message);
+      const returnType = lua.lua_typename(L, lua.lua_type(L, -1));
+      lua.lua_close(L);
+      throw new Error(`Unsupported Lua return type: ${returnType}`);
     }
+  } else {
+    const luaStackString = lua.lua_tostring(L, -1);
+    const message = luaStackString.replace(/^\[string "(--)?\.\.\."\]:\d+: /, "");
+    lua.lua_close(L);
+    return new Error(message);
+  }
 }
 ```
-    

src/binding-factory.ts

@@ -1,6 +1,22 @@
 import { LuaEmscriptenModule } from "./glue/glue";
 import { LauxLib, Lua, LuaLib, LuaState, LUA_MULTRET } from "./lua";
 
+function safeCwrap(
+    glue: LuaEmscriptenModule,
+    ident: string,
+    returnType: Emscripten.JSType | null,
+    argTypes: Emscripten.JSType[],
+    opts?: Emscripten.CCallOpts
+): (...args: any[]) => any {
+    try {
+        return glue.cwrap(ident, returnType, argTypes, opts);
+    } catch {
+        return _args => {
+            throw `${ident} not supported in this Lua version!`;
+        };
+    }
+}
+
 /** @internal */
 export function createLua(glue: LuaEmscriptenModule, overrides: Partial<Lua>): Lua {
     const defaultLua: Lua = {
@@ -12,7 +28,14 @@ export function createLua(glue: LuaEmscriptenModule, overrides: Partial<Lua>): L
         lua_pcall: function (L: LuaState, nargs: number, nresults: number, msgh: number) {
             return this.lua_pcallk(L, nargs, nresults, msgh, 0, 0);
         },
-        lua_pcallk: glue.cwrap("lua_pcallk", "number", ["number", "number", "number", "number", "number", "number"]),
+        lua_pcallk: safeCwrap(glue, "lua_pcallk", "number", [
+            "number",
+            "number",
+            "number",
+            "number",
+            "number",
+            "number",
+        ]),
         lua_setfield: glue.cwrap("lua_setfield", null, ["number", "number", "string"]),
         lua_tolstring: glue.cwrap("lua_tolstring", "string", ["number", "number", "number"]),
         // In C this is just a #define so we have to recreate it ourself

src/glue/glue-lua-5.1.5.d.ts

@@ -2,4 +2,4 @@ import type { EmscriptenModuleFactorySync, LuaEmscriptenModule } from "./glue";
 
 declare const glue: EmscriptenModuleFactorySync<LuaEmscriptenModule>;
 
-export default glue;
+export default glue;

src/glue/glue-lua-5.2.4.d.ts

@@ -2,4 +2,4 @@ import type { EmscriptenModuleFactorySync, LuaEmscriptenModule } from "./glue";
 
 declare const glue: EmscriptenModuleFactorySync<LuaEmscriptenModule>;
 
-export default glue;
+export default glue;

src/glue/glue-lua-5.3.6.d.ts

@@ -2,4 +2,4 @@ import type { EmscriptenModuleFactorySync, LuaEmscriptenModule } from "./glue";
 
 declare const glue: EmscriptenModuleFactorySync<LuaEmscriptenModule>;
 
-export default glue;
+export default glue;

src/glue/glue-lua-5.4.2.d.ts

@@ -2,4 +2,4 @@ import type { EmscriptenModuleFactorySync, LuaEmscriptenModule } from "./glue";
 
 declare const glue: EmscriptenModuleFactorySync<LuaEmscriptenModule>;
 
-export default glue;
+export default glue;