diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 63f4605..5fb90e7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,7 +25,7 @@ kxs-charleskornKaml = "0.44.0" kxs-mamoeYamlkt = "0.12.0" kxs-kxsTsGen = "0.2.1" -kotlinJsWrappers = "1.0.0-pre.357" # https://search.maven.org/artifact/org.jetbrains.kotlin-wrappers/kotlin-wrappers-bom +kotlinJsWrappers = "1.0.0-pre.359" # https://search.maven.org/artifact/org.jetbrains.kotlin-wrappers/kotlin-wrappers-bom kotlinx-cli = "0.3.4" kotlinx-coroutines = "1.6.4" # https://github.com/Kotlin/kotlinx.coroutines/releases diff --git a/modules/events-mod/package-lock.json b/modules/events-mod/package-lock.json index fe903b7..eff221b 100644 --- a/modules/events-mod/package-lock.json +++ b/modules/events-mod/package-lock.json @@ -75,9 +75,9 @@ "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==" }, "typed-factorio": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/typed-factorio/-/typed-factorio-1.3.2.tgz", - "integrity": "sha512-sAVIDvSSBPWL7trI94SPd2Suq9dLjXmXL1WFKJIYJpFQocNwJUb0ydGRBsvJjZhVAyEZYJC0lHlDWH47RWP/tw==" + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/typed-factorio/-/typed-factorio-1.4.0.tgz", + "integrity": "sha512-hT5YDtdJk/hVIm83hYlXx2vOSmhElQhHhcI0OIrdx2nmrx18zKEnjGk4abJ6WHjuy4xoVZ+00mjnC3mWclvrzw==" }, "typescript": { "version": "4.7.4", @@ -85,9 +85,9 @@ "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==" }, "typescript-to-lua": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/typescript-to-lua/-/typescript-to-lua-1.6.3.tgz", - "integrity": "sha512-yfXxGjOwX6453wSgEB37lLdxZZ8m+LH1g3PfebNfKaZHGGtbm9owxE6oRKB3sWcy2CICkfobAjWf3VdhKnEETg==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/typescript-to-lua/-/typescript-to-lua-1.7.1.tgz", + "integrity": "sha512-iDjCnel38p3Cxv+Las8rBzd6BaRIE49DQSyFOgupg4gSw36+8H1xtwde3lRdGMPZx19/zVwXEO8UspiACYJc+A==", "requires": { "enhanced-resolve": "^5.8.2", "resolve": "^1.15.1", diff --git a/modules/events-mod/package.json b/modules/events-mod/package.json index bc5da72..d9a4fc4 100644 --- a/modules/events-mod/package.json +++ b/modules/events-mod/package.json @@ -12,8 +12,8 @@ "devDependencies": {}, "dependencies": { "lua-types": "^2.11.0", - "typescript-to-lua": "1.6.3", - "typed-factorio": "1.3.2", + "typescript-to-lua": "1.7.1", + "typed-factorio": "1.4.0", "typescript": "4.7.4" }, "license": "UNLICENSED", diff --git a/modules/events-mod/src/generated/lua/lualib_bundle.lua b/modules/events-mod/src/generated/lua/lualib_bundle.lua index cdebff7..e118180 100644 --- a/modules/events-mod/src/generated/lua/lualib_bundle.lua +++ b/modules/events-mod/src/generated/lua/lualib_bundle.lua @@ -345,7 +345,11 @@ end local function __TS__ArraySlice(self, first, last) local len = #self - first = first or 0 + local ____first_0 = first + if ____first_0 == nil then + ____first_0 = 0 + end + first = ____first_0 if first < 0 then first = len + first if first < 0 then @@ -356,7 +360,11 @@ local function __TS__ArraySlice(self, first, last) first = len end end - last = last or len + local ____last_1 = last + if ____last_1 == nil then + ____last_1 = len + end + last = ____last_1 if last < 0 then last = len + last if last < 0 then @@ -412,7 +420,11 @@ local function __TS__ArraySplice(self, ...) elseif actualArgumentCount == 1 then actualDeleteCount = len - start else - actualDeleteCount = deleteCount or 0 + local ____deleteCount_0 = deleteCount + if ____deleteCount_0 == nil then + ____deleteCount_0 = 0 + end + actualDeleteCount = ____deleteCount_0 if actualDeleteCount < 0 then actualDeleteCount = 0 end @@ -1175,7 +1187,14 @@ do local args = {...} local argsLength = select("#", ...) return { - ____coroutine = coroutine.create(function() return fn((unpack or table.unpack)(args, 1, argsLength)) end), + ____coroutine = coroutine.create(function() + local ____fn_1 = fn + local ____unpack_0 = unpack + if ____unpack_0 == nil then + ____unpack_0 = table.unpack + end + return ____fn_1(____unpack_0(args, 1, argsLength)) + end), [Symbol.iterator] = generatorIterator, next = generatorNext } @@ -1553,7 +1572,11 @@ local function __TS__ParseFloat(numberString) return ____temp_0 end local number = tonumber(string.match(numberString, "^%s*(-?%d+%.?%d*)")) - return number or 0 / 0 + local ____number_1 = number + if ____number_1 == nil then + ____number_1 = 0 / 0 + end + return ____number_1 end local function __TS__StringSubstr(self, from, length) @@ -1947,7 +1970,11 @@ local function __TS__SparseArrayPush(sparseArray, ...) end local function __TS__SparseArraySpread(sparseArray) - local _unpack = unpack or table.unpack + local ____unpack_0 = unpack + if ____unpack_0 == nil then + ____unpack_0 = table.unpack + end + local _unpack = ____unpack_0 return _unpack(sparseArray, 1, sparseArray.sparseLength) end @@ -2127,7 +2154,11 @@ local function __TS__StringCharCodeAt(self, index) if index < 0 then return 0 / 0 end - return string.byte(self, index + 1) or 0 / 0 + local ____string_byte_result_0 = string.byte(self, index + 1) + if ____string_byte_result_0 == nil then + ____string_byte_result_0 = 0 / 0 + end + return ____string_byte_result_0 end local function __TS__StringEndsWith(self, searchString, endPosition)