work towards supporting wasmoon alternative

Author: CapsAdmin

web_playground/.gitignore

@@ -2,4 +2,5 @@ build_output.lua
 node_modules
 *.bundle.*
 yarn.lock
-public/glue.wasm
+public/glue.wasm
+public/js

web_playground/build.js

@@ -4,18 +4,31 @@ const path = require("path")
 const { finished } = require("stream/promises")
 const { Readable } = require("stream")
 
-const getAllFiles = function (dirPath, arrayOfFiles) {
+async function downloadFile(url, outputPath) {
+	const response = await fetch(url)
+
+	if (!response.ok) {
+		throw new Error(`Failed to download, status: ${response.status}`)
+	}
+
+	const directory = path.dirname(outputPath)
+
+	fs.mkdirSync(directory, { recursive: true })
+	fs.writeFileSync(outputPath, Buffer.from(await response.arrayBuffer()))
+}
+
+function getAllFiles(dirPath, arrayOfFiles) {
 	files = fs.readdirSync(dirPath)
 
 	arrayOfFiles = arrayOfFiles || []
 
-	files.forEach(function (file) {
+	for (const file of files) {
 		if (fs.statSync(dirPath + "/" + file).isDirectory()) {
 			arrayOfFiles = getAllFiles(dirPath + "/" + file, arrayOfFiles)
 		} else {
 			arrayOfFiles.push(path.join(__dirname, dirPath, "/", file))
 		}
-	})
+	}
 
 	return arrayOfFiles
 }
@@ -35,16 +48,26 @@ for (let path of getAllFiles("../test/tests/nattlua/analyzer/")) {
 }
 
 fs.writeFileSync("src/random.json", JSON.stringify(tests))
-;(async () => {
-	const res = await fetch("https://unpkg.com/[email protected]/dist/glue.wasm")
-	fs.unlink("public/glue.wasm", (err) => {
-		if (err) {
-			console.error(err)
-		}
-	})
-	const fileStream = fs.createWriteStream("public/glue.wasm", { flags: "wx" })
-	await finished(Readable.fromWeb(res.body).pipe(fileStream))
-})()
+
+async function downloadLua() {
+	let baseUrl = "https://raw.githubusercontent.com/thenumbernine/js-util/7865018a985074f558b4337226d07e18fe5f9452/"
+
+	await downloadFile(baseUrl + "lua-5.4.7-with-ffi.wasm", "public/js/lua-5.4.7-with-ffi.wasm")
+	await downloadFile(baseUrl + "lua-interop.js", "public/js/lua-interop.js")
+	await downloadFile(baseUrl + "lua-5.4.7-with-ffi.js", "public/js/lua-5.4.7-with-ffi.js")
+	;(async () => {
+		const res = await fetch("https://unpkg.com/[email protected]/dist/glue.wasm")
+		fs.unlink("public/glue.wasm", (err) => {
+			if (err) {
+				console.error(err)
+			}
+		})
+		const fileStream = fs.createWriteStream("public/glue.wasm", { flags: "wx" })
+		await finished(Readable.fromWeb(res.body).pipe(fileStream))
+	})()
+}
+
+downloadLua()
 
 execSync("cd ../ && luajit nattlua.lua build fast")
 

web_playground/src/index.ts

@@ -16,7 +16,16 @@ const pathFromURI = (uri: Uri) => {
 
 const main = async () => {
 	const lua = await loadLua()
-	await registerSyntax(lua)
+
+	await lua.doString(`
+	_G.syntax_typesystem = require("nattlua.syntax.typesystem")
+	_G.syntax_runtime = require("nattlua.syntax.runtime")
+  `)
+
+	const syntax_typesystem = lua.global.get("syntax_typesystem")
+	const syntax_runtime = lua.global.get("syntax_runtime")
+
+	await registerSyntax(syntax_runtime, syntax_typesystem)
 
 	const editor = createEditor()
 	const tab = MonacoEditor.createModel("local x = 1337", "nattlua")

web_playground/src/lua.ts

@@ -1,5 +1,4 @@
 import { LuaEngine, LuaFactory } from "wasmoon"
-import { registerSyntax } from "./syntax"
 import { loadLuaModule } from "./util"
 
 export const loadLua = async () => {
@@ -8,19 +7,18 @@ export const loadLua = async () => {
 		openStandardLibs: true,
 	})
 
-	await loadLuaModule(lua, import("./../../build_output.lua"), "nattlua")
+	await loadLuaModule((str) => lua.doStringSync(str), import("./../../build_output.lua"), "nattlua")
 	await lua.doString("for k, v in pairs(package.preload) do print(k,v) end require('nattlua') for k,v in pairs(IMPORTS) do package.preload[k] = v end")
-	await loadLuaModule(lua, import("./../../language_server/lsp.lua"), "lsp", "@language_server/lsp.lua")
+	await loadLuaModule((str) => lua.doStringSync(str), import("./../../language_server/lsp.lua"), "lsp", "@language_server/lsp.lua")
 
 	await lua.doString(`
 		local lsp = require("lsp")
 
 		local listeners = {}
 
 		function lsp.Call(data)
-			if listeners[data.method] then
-				listeners[data.method](data.params)
-			end
+			assert(data.method, "missing method")
+			listeners[data.method](data.params)
 		end
 
 		function lsp.On(method, callback)

web_playground/src/syntax.ts

@@ -1,5 +1,4 @@
 import { languages } from "monaco-editor"
-import { LuaEngine } from "wasmoon"
 import { arrayUnion, escapeRegex, mapsToArray } from "./util"
 
 const uniqueCharacters = (str: string) => {
@@ -10,14 +9,8 @@ const uniqueCharacters = (str: string) => {
 	return Array.from(unique).join("")
 }
 
-export const registerSyntax = async (lua: LuaEngine) => {
-	await lua.doString(`
-    _G.syntax_typesystem = require("nattlua.syntax.typesystem")
-    _G.syntax_runtime = require("nattlua.syntax.runtime")
-  `)
+export const registerSyntax = async (syntax_runtime: any, syntax_typesystem: any) => {
 
-	const syntax_typesystem = lua.global.get("syntax_typesystem")
-	const syntax_runtime = lua.global.get("syntax_runtime")
 	const syntax: languages.IMonarchLanguage = {
 		defaultToken: "",
 		tokenPostfix: ".nl",

web_playground/src/util.ts

@@ -1,5 +1,3 @@
-import { LuaEngine } from "wasmoon"
-
 export const mapsToArray = (maps: { [key: string]: unknown }[]) => {
 	const set = new Set<string>()
 	for (const map of maps) {
@@ -36,7 +34,7 @@ function chunkSubstr(str: string, size: number) {
 	return chunks
 }
 
-export const loadLuaModule = async (lua: LuaEngine, p: Promise<{ default: string }>, moduleName: string, chunkName?: string) => {
+export const loadLuaModule = async (doString: (luaCode: string) => void, p: Promise<{ default: string }>, moduleName: string, chunkName?: string) => {
 	let { default: code } = await p
 
 	if (code.startsWith("#")) {
@@ -59,19 +57,19 @@ export const loadLuaModule = async (lua: LuaEngine, p: Promise<{ default: string
 		bytesStringIndex++
 		if (bytesStringIndex > 8000) {
 			let str = `CHUNKS = CHUNKS or {};CHUNKS[#CHUNKS + 1] = "${bytesString.join("")}"`
-			lua.doStringSync(str)
+			doString(str)
 			bytesString = []
 			bytesStringIndex = 0
 		}
 	}
 	{
 		let str = `CHUNKS = CHUNKS or {};CHUNKS[#CHUNKS + 1] = "${bytesString.join("")}"`
-		lua.doStringSync(str)
+		doString(str)
 	}
 
 	let str = `
 	local code = "package.preload['${moduleName}'] = function(...) " .. table.concat(CHUNKS) .. " end"
 	assert(load(code, "${chunkName}"))(...); CHUNKS = nil
 	`
-	lua.doStringSync(str)
+	doString(str)
 }