Enhance type handling in ConvertTo-LuaTable; improve parsing logic in Read-LuaTable and update output types in ConvertFrom-LuaTable

Author: MariusStorhaug

src/functions/private/ConvertFrom-LuaTable.ps1

@@ -9,6 +9,7 @@
         engine used by ConvertFrom-Lua.
     #>
     [OutputType([object])]
+    [OutputType([System.Collections.Specialized.OrderedDictionary])]
     [CmdletBinding()]
     param(
         # The Lua table string to parse.
@@ -40,7 +41,7 @@
             $script:luaString.Substring($script:luaPos, 6) -ceq 'return') {
             $nextPos = $script:luaPos + 6
             if ($nextPos -ge $script:luaString.Length -or
-                $script:luaString[$nextPos] -match '[\s{]') {
+                $script:luaString[$nextPos] -notmatch '[a-zA-Z0-9_]') {
                 $script:luaPos = $nextPos
                 Skip-LuaWhitespace
             }

src/functions/private/ConvertTo-LuaTable.ps1

@@ -61,7 +61,14 @@
                 $escaped = $InputObject.ToString() -replace '\\', '\\\\' -replace '"', '\"'
                 return "`"$escaped`""
             }
-            return ([int]$InputObject).ToString([System.Globalization.CultureInfo]::InvariantCulture)
+            $underlyingType = [System.Enum]::GetUnderlyingType($InputObject.GetType())
+            if ($underlyingType -eq [byte] -or
+                $underlyingType -eq [uint16] -or
+                $underlyingType -eq [uint32] -or
+                $underlyingType -eq [uint64]) {
+                return ([System.Convert]::ToUInt64($InputObject)).ToString([System.Globalization.CultureInfo]::InvariantCulture)
+            }
+            return ([System.Convert]::ToInt64($InputObject)).ToString([System.Globalization.CultureInfo]::InvariantCulture)
         }
 
         if ($InputObject -is [int] -or $InputObject -is [long] -or

src/functions/private/Read-LuaTable.ps1

@@ -36,9 +36,11 @@
             }
 
             # Check for bracket key: ["key"] = value or [expr] = value
+            # When [ is followed by [ or =, it's a long-bracket string value, not a bracket key
             if ($script:luaString[$script:luaPos] -eq '[' -and
                 $script:luaPos + 1 -lt $script:luaString.Length -and
-                $script:luaString[$script:luaPos + 1] -ne '[') {
+                $script:luaString[$script:luaPos + 1] -ne '[' -and
+                $script:luaString[$script:luaPos + 1] -ne '=') {
                 $script:luaPos++ # skip [
                 Skip-LuaWhitespace
                 $key = Read-LuaValue