typescript-to-lua 1.4.2 → 1.5.0

package/dist/lualib/StringReplaceAll.lua

@@ -1,35 +1,42 @@
-local function __TS__StringReplaceAll(source, searchValue, replaceValue)
-    local replacer
-    if type(replaceValue) == "string" then
-        replacer = function() return replaceValue end
-    else
-        replacer = replaceValue
-    end
-    local parts = {}
-    local partsIndex = 1
+local __TS__StringReplaceAll
+do
     local sub = string.sub
-    if #searchValue == 0 then
-        parts[1] = replacer(nil, "", 0, source)
-        partsIndex = 2
-        for i = 1, #source do
-            parts[partsIndex] = sub(source, i, i)
-            parts[partsIndex + 1] = replacer(nil, "", i, source)
-            partsIndex = partsIndex + 2
+    local find = string.find
+    function __TS__StringReplaceAll(source, searchValue, replaceValue)
+        if type(replaceValue) == "string" then
+            local concat = table.concat(
+                __TS__StringSplit(source, searchValue),
+                replaceValue
+            )
+            if #searchValue == 0 then
+                return (replaceValue .. concat) .. replaceValue
+            end
+            return concat
         end
-    else
-        local find = string.find
-        local currentPos = 1
-        while true do
-            local startPos, endPos = find(source, searchValue, currentPos, true)
-            if not startPos then
-                break
+        local parts = {}
+        local partsIndex = 1
+        if #searchValue == 0 then
+            parts[1] = replaceValue(nil, "", 0, source)
+            partsIndex = 2
+            for i = 1, #source do
+                parts[partsIndex] = sub(source, i, i)
+                parts[partsIndex + 1] = replaceValue(nil, "", i, source)
+                partsIndex = partsIndex + 2
+            end
+        else
+            local currentPos = 1
+            while true do
+                local startPos, endPos = find(source, searchValue, currentPos, true)
+                if not startPos then
+                    break
+                end
+                parts[partsIndex] = sub(source, currentPos, startPos - 1)
+                parts[partsIndex + 1] = replaceValue(nil, searchValue, startPos - 1, source)
+                partsIndex = partsIndex + 2
+                currentPos = endPos + 1
             end
-            parts[partsIndex] = sub(source, currentPos, startPos - 1)
-            parts[partsIndex + 1] = replacer(nil, searchValue, startPos - 1, source)
-            partsIndex = partsIndex + 2
-            currentPos = endPos + 1
+            parts[partsIndex] = sub(source, currentPos)
         end
-        parts[partsIndex] = sub(source, currentPos)
+        return table.concat(parts)
     end
-    return table.concat(parts)
 end

package/dist/lualib/StringSplit.lua

@@ -1,36 +1,36 @@
-local function __TS__StringSplit(source, separator, limit)
-    if limit == nil then
-        limit = 4294967295
-    end
-    if limit == 0 then
-        return {}
-    end
-    local out = {}
-    local index = 0
-    local count = 0
-    if separator == nil or separator == "" then
-        while index < #source - 1 and count < limit do
-            out[count + 1] = __TS__StringAccess(source, index)
-            count = count + 1
-            index = index + 1
+local __TS__StringSplit
+do
+    local sub = string.sub
+    local find = string.find
+    function __TS__StringSplit(source, separator, limit)
+        if limit == nil then
+            limit = 4294967295
         end
-    else
-        local separatorLength = #separator
-        local nextIndex = (string.find(source, separator, nil, true) or 0) - 1
-        while nextIndex >= 0 and count < limit do
-            out[count + 1] = __TS__StringSubstring(source, index, nextIndex)
-            count = count + 1
-            index = nextIndex + separatorLength
-            nextIndex = (string.find(
-                source,
-                separator,
-                math.max(index + 1, 1),
-                true
-            ) or 0) - 1
+        if limit == 0 then
+            return {}
         end
+        local result = {}
+        local resultIndex = 1
+        if separator == nil or separator == "" then
+            for i = 1, #source do
+                result[resultIndex] = sub(source, i, i)
+                resultIndex = resultIndex + 1
+            end
+        else
+            local currentPos = 1
+            while resultIndex <= limit do
+                local startPos, endPos = find(source, separator, currentPos, true)
+                if not startPos then
+                    break
+                end
+                result[resultIndex] = sub(source, currentPos, startPos - 1)
+                resultIndex = resultIndex + 1
+                currentPos = endPos + 1
+            end
+            if resultIndex <= limit then
+                result[resultIndex] = sub(source, currentPos)
+            end
+        end
+        return result
     end
-    if count < limit then
-        out[count + 1] = __TS__StringSubstring(source, index)
-    end
-    return out
 end