lazzexus/Kafkatorio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

version bumps (scrimage, kotlinJsWrappers, ktor, hoplite, tstl, typed-factorio, typescript)

Browse source
This commit is contained in:
Adam 2022-09-10 10:13:48 +02:00
parent 80e8c95bc9
commit dadbcdd8d6
6 changed files with 85 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/events-library/src/commonTest/kotlin/dev/adamko/kafkatorio/schema/packets/EntityUpdateTest.kt
View file

@ -37,8 +37,7 @@ class EntityUpdateTest : FunSpec({
""".trimIndent()
test("decode") {
val entityUpdate: KafkatorioPacket = jsonMapperKafkatorio.decodeFromString(json)
entityUpdate.data
.shouldBeInstanceOf<EntityUpdate>()
entityUpdate.data.shouldBeInstanceOf<EntityUpdate>()
// entityUpdate.health.shouldNotBeNull().shouldBeExactly(350f)
}

30
modules/events-mod/package-lock.json generated
View file

@ -4,6 +4,11 @@
"lockfileVersion": 1,
"requires": true,
"dependencies": {
"@typescript-to-lua/language-extensions": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/@typescript-to-lua/language-extensions/-/language-extensions-1.0.0.tgz",
"integrity": "sha512-GtmhFqyg+txpGgGLM3mlS3R6AEG9MQhKALxxcbr6SBzg9u7YAXcPKqUBaBYd6nH+Pi/eQLcWz4BNOLhz8v4TjQ=="
},
"enhanced-resolve": {
"version": "5.10.0",
"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz",
@ -40,9 +45,9 @@
}
},
"lua-types": {
"version": "2.12.0",
"resolved": "https://registry.npmjs.org/lua-types/-/lua-types-2.12.0.tgz",
"integrity": "sha512-s96z1Zcz3KRXfWyNFM3KP2zpNYTfZwgHo8X/yFXveyS8Dux+cUuyT+zA5tFZbmGh8VViwNs9bFbzNevAR/18uw=="
"version": "2.13.0",
"resolved": "https://registry.npmjs.org/lua-types/-/lua-types-2.13.0.tgz",
"integrity": "sha512-wra+mIPZlcbm8bYoM6QutEwTOAjZ9KyKMiaidGeZ+QJItIAK9hwG+1I6GCDKnW0T9E/Xv2IoTFtZwxQv4zAIJw=="
},
"path-parse": {
"version": "1.0.7",
@ -75,20 +80,21 @@
"integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="
},
"typed-factorio": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/typed-factorio/-/typed-factorio-1.7.0.tgz",
"integrity": "sha512-i7MLTRW7vQAWTwHZSbX8m+PQm0hnCW/3nCBQI1b0DAikK9a/nJIZWpy2U3C4cnwhNqyNz5p50mLFQiedb/s+ow=="
"version": "1.7.5",
"resolved": "https://registry.npmjs.org/typed-factorio/-/typed-factorio-1.7.5.tgz",
"integrity": "sha512-3lTeV8FkmLx7mUUhUp1WPhIDviiqPOfibHYIjE58Lt59mN0ujEDbf7q3o9G8YWjmvgBatS9xJ81a+/Tvq20mUw=="
},
"typescript": {
"version": "4.7.4",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz",
"integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ=="
"version": "4.8.3",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.3.tgz",
"integrity": "sha512-goMHfm00nWPa8UvR/CPSvykqf6dVV8x/dp0c5mFTMTIu0u0FlGWRioyy7Nn0PGAdHxpJZnuO/ut+PpQ8UiHAig=="
},
"typescript-to-lua": {
"version": "1.9.0",
"resolved": "https://registry.npmjs.org/typescript-to-lua/-/typescript-to-lua-1.9.0.tgz",
"integrity": "sha512-Oj8kutP1u/TSjN9oGUuESfOL+feHMSs7CCxl90C60jWTH+4ZXLtrXlRJTalA3Z2/aHjQXXgPaXQStSXBzAYLow==",
"version": "1.10.0",
"resolved": "https://registry.npmjs.org/typescript-to-lua/-/typescript-to-lua-1.10.0.tgz",
"integrity": "sha512-rt+Bb2hH3FqytqTmTqOL+xPFRcV/r4TZ5X+46vVSfw9luzbu9V6ai5yyU8GePARVcf5hGvCv+DqxBNQtdcJLsA==",
"requires": {
"@typescript-to-lua/language-extensions": "1.0.0",
"enhanced-resolve": "^5.8.2",
"resolve": "^1.15.1",
"source-map": "^0.7.3"

8
modules/events-mod/package.json
View file

@ -11,10 +11,10 @@
},
"devDependencies": {},
"dependencies": {
"lua-types": "2.12.0",
"typescript-to-lua": "1.9.0",
"typed-factorio": "1.7.0",
"typescript": "4.7.4"
"lua-types": "2.13.0",
"typescript-to-lua": "1.10.0",
"typed-factorio": "1.7.5",
"typescript": "4.8.3"
},
"license": "UNLICENSED",
"peerDependencies": {},

90
modules/events-mod/src/generated/lua/lualib_bundle.lua
View file

@ -255,11 +255,15 @@ local function __TS__ArrayPushArray(self, items)
return len
end
local function __TS__CountVarargs(...)
return select("#", ...)
end
local function __TS__ArrayReduce(self, callbackFn, ...)
local len = #self
local k = 0
local accumulator = nil
if select("#", ...) ~= 0 then
if __TS__CountVarargs(...) ~= 0 then
accumulator = ...
elseif len > 0 then
accumulator = self[1]
@ -283,7 +287,7 @@ local function __TS__ArrayReduceRight(self, callbackFn, ...)
local len = #self
local k = len - 1
local accumulator = nil
if select("#", ...) ~= 0 then
if __TS__CountVarargs(...) ~= 0 then
accumulator = ...
elseif len > 0 then
accumulator = self[k + 1]
@ -399,7 +403,7 @@ end
local function __TS__ArraySplice(self, ...)
local args = {...}
local len = #self
local actualArgumentCount = select("#", ...)
local actualArgumentCount = __TS__CountVarargs(...)
local start = args[1]
local deleteCount = args[2]
if start < 0 then
@ -1016,6 +1020,16 @@ local function __TS__DecorateParam(paramIndex, decorator)
return function(____, target, key) return decorator(nil, target, key, paramIndex) end
end
local function __TS__StringIncludes(self, searchString, position)
if not position then
position = 1
else
position = position + 1
end
local index = string.find(self, searchString, position, true)
return index ~= nil
end
local Error, RangeError, ReferenceError, SyntaxError, TypeError, URIError
do
local function getErrorStack(self, constructor)
@ -1030,13 +1044,18 @@ do
break
end
end
return debug.traceback(nil, level)
if __TS__StringIncludes(_VERSION, "Lua 5.0") then
return debug.traceback(("[Level " .. tostring(level)) .. "]")
else
return debug.traceback(nil, level)
end
end
local function wrapErrorToString(self, getDescription)
return function(self)
local description = getDescription(self)
local caller = debug.getinfo(3, "f")
if _VERSION == "Lua 5.1" or caller and caller.func ~= error then
local isClassicLua = __TS__StringIncludes(_VERSION, "Lua 5.0") or _VERSION == "Lua 5.1"
if isClassicLua or caller and caller.func ~= error then
return description
else
return (tostring(description) .. "\n") .. self.stack
@ -1185,16 +1204,9 @@ do
function __TS__Generator(fn)
return function(...)
local args = {...}
local argsLength = select("#", ...)
local argsLength = __TS__CountVarargs(...)
return {
____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),
____coroutine = coroutine.create(function() return fn(__TS__Unpack(args, 1, argsLength)) end),
[Symbol.iterator] = generatorIterator,
next = generatorNext
}
@ -1358,8 +1370,12 @@ do
Map[Symbol.species] = Map
end
local __TS__Match = string.match
local __TS__MathAtan2 = math.atan2 or math.atan
local __TS__MathModf = math.modf
local function __TS__MathSign(val)
if val > 0 then
return 1
@ -1369,6 +1385,10 @@ local function __TS__MathSign(val)
return 0
end
local function __TS__Modulo50(a, b)
return a - math.floor(a / b) * b
end
local function __TS__Number(value)
local valueType = type(value)
if valueType == "number" then
@ -1415,7 +1435,7 @@ do
if radix < 2 or radix > 36 then
error("toString() radix argument must be between 2 and 36", 0)
end
local integer, fraction = math.modf(math.abs(self))
local integer, fraction = __TS__MathModf(math.abs(self))
local result = ""
if radix == 8 then
result = string.format("%o", integer)
@ -1571,7 +1591,7 @@ local function __TS__ObjectValues(obj)
end
local function __TS__ParseFloat(numberString)
local infinityMatch = string.match(numberString, "^%s*(-?Infinity)")
local infinityMatch = __TS__Match(numberString, "^%s*(-?Infinity)")
if infinityMatch then
local ____temp_0
if __TS__StringAccess(infinityMatch, 0) == "-" then
@ -1581,7 +1601,7 @@ local function __TS__ParseFloat(numberString)
end
return ____temp_0
end
local number = tonumber(string.match(numberString, "^%s*(-?%d+%.?%d*)"))
local number = tonumber(__TS__Match(numberString, "^%s*(-?%d+%.?%d*)"))
local ____number_1 = number
if ____number_1 == nil then
____number_1 = 0 / 0
@ -1629,16 +1649,16 @@ do
function __TS__ParseInt(numberString, base)
if base == nil then
base = 10
local hexMatch = string.match(numberString, "^%s*-?0[xX]")
local hexMatch = __TS__Match(numberString, "^%s*-?0[xX]")
if hexMatch then
base = 16
local ____string_match_result__0_0
if string.match(hexMatch, "-") then
____string_match_result__0_0 = "-" .. __TS__StringSubstr(numberString, #hexMatch)
local ____TS__Match_result__0_0
if __TS__Match(hexMatch, "-") then
____TS__Match_result__0_0 = "-" .. __TS__StringSubstr(numberString, #hexMatch)
else
____string_match_result__0_0 = __TS__StringSubstr(numberString, #hexMatch)
____TS__Match_result__0_0 = __TS__StringSubstr(numberString, #hexMatch)
end
numberString = ____string_match_result__0_0
numberString = ____TS__Match_result__0_0
end
end
if base < 2 or base > 36 then
@ -1653,7 +1673,7 @@ do
local allowedDigits = ____temp_1
local pattern = ("^%s*(-?[" .. allowedDigits) .. "]*)"
local number = tonumber(
string.match(numberString, pattern),
__TS__Match(numberString, pattern),
base
)
if number == nil then
@ -1965,13 +1985,13 @@ end
local function __TS__SparseArrayNew(...)
local sparseArray = {...}
sparseArray.sparseLength = select("#", ...)
sparseArray.sparseLength = __TS__CountVarargs(...)
return sparseArray
end
local function __TS__SparseArrayPush(sparseArray, ...)
local args = {...}
local argsLen = select("#", ...)
local argsLen = __TS__CountVarargs(...)
local listLen = sparseArray.sparseLength
for i = 1, argsLen do
sparseArray[listLen + i] = args[i]
@ -2086,6 +2106,8 @@ local function __TS__SourceMapTraceBack(fileName, sourceMap)
local trace
if thread == nil and message == nil and level == nil then
trace = originalTraceback()
elseif __TS__StringIncludes(_VERSION, "Lua 5.0") then
trace = originalTraceback((("[Level " .. tostring(level)) .. "] ") .. message)
else
trace = originalTraceback(thread, message, level)
end
@ -2111,7 +2133,7 @@ local function __TS__SourceMapTraceBack(fileName, sourceMap)
local function stringReplacer(____, file, line)
local fileSourceMap = _G.__TS__sourcemap[file]
if fileSourceMap and fileSourceMap[line] then
local chunkName = string.match(file, "%[string \"([^\"]+)\"%]")
local chunkName = __TS__Match(file, "%[string \"([^\"]+)\"%]")
local sourceName = string.gsub(chunkName, ".lua$", ".ts")
local data = fileSourceMap[line]
if type(data) == "number" then
@ -2178,16 +2200,6 @@ local function __TS__StringEndsWith(self, searchString, endPosition)
return string.sub(self, endPosition - #searchString + 1, endPosition) == searchString
end
local function __TS__StringIncludes(self, searchString, position)
if not position then
position = 1
else
position = position + 1
end
local index = string.find(self, searchString, position, true)
return index ~= nil
end
local function __TS__StringPadEnd(self, maxLength, fillString)
if fillString == nil then
fillString = " "
@ -2443,6 +2455,7 @@ return {
__TS__Class = __TS__Class,
__TS__ClassExtends = __TS__ClassExtends,
__TS__CloneDescriptor = __TS__CloneDescriptor,
__TS__CountVarargs = __TS__CountVarargs,
__TS__Decorate = __TS__Decorate,
__TS__DecorateParam = __TS__DecorateParam,
__TS__Delete = __TS__Delete,
@ -2460,8 +2473,11 @@ return {
__TS__Iterator = __TS__Iterator,
__TS__LuaIteratorSpread = __TS__LuaIteratorSpread,
Map = Map,
__TS__Match = __TS__Match,
__TS__MathAtan2 = __TS__MathAtan2,
__TS__MathModf = __TS__MathModf,
__TS__MathSign = __TS__MathSign,
__TS__Modulo50 = __TS__Modulo50,
__TS__New = __TS__New,
__TS__Number = __TS__Number,
__TS__NumberIsFinite = __TS__NumberIsFinite,

2
modules/events-mod/tsconfig.json
View file

@ -8,7 +8,7 @@
"module": "commonjs",
"moduleResolution": "node",
"types": [
"typescript-to-lua/language-extensions",
"@typescript-to-lua/language-extensions",
"lua-types/5.2",
"typed-factorio/runtime",
"typed-factorio/strict-index-types"