Make testing framework more generic

lib/compression.luau

@@ -1,4 +1,5 @@
 local serde = require("@lune/serde")
+local types = require("./types")
 
 type CompressionModule = {
     zlibDecompress: (contents: string, recursive: boolean?) -> string | boolean
@@ -10,19 +11,18 @@ local compressionModule = {} :: CompressionModule
 -- take in file contents and zlib decompress them
 -- if recursive param is true repeatedly zlib decompress the file until it fails
 -- (modelscrape files are often double/triple zlib decompressed)
-function compressionModule.zlibDecompress(contents: string, recursive: boolean?): string | boolean
+function compressionModule.zlibDecompress(contents: string,  opts: types.opts): string | boolean
     assert(typeof(contents) == "string", "Expected contents to be of type 'string'")
-    if recursive == nil then recursive = false end
-    assert(typeof(recursive) == "boolean", "Expected recursive to be of type 'boolean'")
+    assert(typeof(opts) == "table", "Expected opts to be of type 'table'")
     local success, decompressed: string = pcall(function() return serde.decompress("zlib", contents) end)
     if not success then
         return false
     end
-    if recursive then
-        local nextDecompressed = compressionModule.zlibDecompress(decompressed, true)
+    if opts.zlibDecompressFilesRecursive then
+        local nextDecompressed = compressionModule.zlibDecompress(decompressed, opts)
         while nextDecompressed do
             decompressed = nextDecompressed
-            nextDecompressed = compressionModule.zlibDecompress(decompressed, true)
+            nextDecompressed = compressionModule.zlibDecompress(decompressed, opts)
         end
     end
     return decompressed

lib/core.luau

@@ -40,7 +40,7 @@ function core.fileContainsWorkspace(fileContents: string, opts: types.opts): boo
     assert(typeof(fileContents) == "string", "Expected fileContents to be of type 'string'")
     assert(typeof(opts) == "table", "Expected opts to be of type 'table'")
     if opts.zlibDecompressFiles or opts.zlibDecompressFilesRecursive then
-        local success = pcall(function() fileContents = compression.zlibDecompress(fileContents, opts.zlibDecompressFilesRecursive) end)
+        local success = pcall(function() fileContents = compression.zlibDecompress(fileContents, opts) end)
         if not success then
             stdio.write(stdio.color("yellow"))
             stdio.write("Warning: Failed to decompress file with zlib. Proceeding with original contents.\n")
@@ -54,6 +54,7 @@ function core.fileContainsWorkspace(fileContents: string, opts: types.opts): boo
     return core.scanForWorkspace(instances, opts.printInstanceNames)
 end
 
+
 -- formats the workspace detection result as a colored string
 function core.formatResult(result: boolean, fileName: string): string
     assert(typeof(result) == "boolean", "Expected result to be of type 'boolean'")

lib/types.luau

@@ -3,14 +3,14 @@
 local types = {}
 
 export type opts = {
-    outputFile:          string?,
-    directoryMode:       boolean,
-    directoryPath:       string?,
-    forceBinaryRead:     boolean,
-    printInstanceNames:  boolean,
-    zlibDecompressFiles: boolean,
+    outputFile:                   string?,
+    directoryMode:                boolean,
+    directoryPath:                string?,
+    forceBinaryRead:              boolean,
+    printInstanceNames:           boolean,
+    zlibDecompressFiles:          boolean,
     zlibDecompressFilesRecursive: boolean,
-    filesToProcess:      {string?}
+    filesToProcess:               {string?}
 }
 
 export type model = {Instance}