Cleanup private methods and only have one templated actor

Author: dig

README.md

@@ -13,7 +13,7 @@ Read more about Parallel Luau here: [Parallel Luau](https://create.roblox.com/do
 2. Add the dependency to your project's `wally.toml` file
 ```toml
 [dependencies]
-Parallel = "dig/parallel@1.0.1"
+Parallel = "dig/parallel@1.0.2"
 ```
 3. Run `wally install`
 

src/ClientActor/Worker.lua src/Actor/Worker.luasrc/ClientActor/Worker.lua renamed to src/Actor/Worker.lua

@@ -4,8 +4,7 @@ local ServerStorage = game:GetService("ServerStorage")
 
 local Promise = require(script.Parent.Promise)
 
-local ClientActor = script.ClientActor
-local ServerActor = script.ServerActor
+local Actor = script.Actor
 
 export type Promise = typeof(Promise)
 export type PreparedParallel = {
@@ -16,24 +15,34 @@ export type PreparedParallel = {
   destroy: () -> (),
 }
 
-type ActorStateMap = {
-  [Actor]: ActorState,
-}
-
 type ActorState = {
   count: number,
   running: { [Promise]: boolean },
 }
 
--- Set correct worker folder depending on
--- client or server context
-local workersFolder = nil
-if RunService:IsServer() then
-  workersFolder = ServerStorage:FindFirstChild("ParallelWorkers") or Instance.new("Folder")
-  workersFolder.Name = "ParallelWorkers"
-  workersFolder.Parent = ServerStorage
-elseif RunService:IsClient() then
-  workersFolder = script
+type ActorStateMap = {
+  [Actor]: ActorState,
+}
+
+local workersFolder: Instance? = nil
+local function getOrFindWorkerFolder(): Instance
+  if workersFolder == nil then
+    if RunService:IsServer() then
+      workersFolder = ServerStorage:FindFirstChild("ParallelWorkers") or Instance.new("Folder")
+      workersFolder.Name = "ParallelWorkers"
+      workersFolder.Parent = ServerStorage
+    elseif RunService:IsClient() then
+      workersFolder = script
+    end
+  end
+
+  return workersFolder
+end
+
+local function createTemplatedActor(): Actor
+  local actor = Actor:Clone()
+  require(actor.Worker)
+  return actor
 end
 
 -- Parallel class
@@ -60,8 +69,7 @@ function Parallel.of(runnable: (...any?) -> any?): PreparedParallel
   self._connection = self._bindableEvent.Event:Connect(function(uuid: string, ...: any)
     self._results[uuid] = {...}
   end)
-
-  self._folder.Parent = workersFolder
+  self._folder.Parent = getOrFindWorkerFolder()
   self:_createActors()
   return self
 end
@@ -99,7 +107,7 @@ function Parallel:submit(...: any?): Promise
   local actor = self:_findAvailableActor()
   local uuid = HttpService:GenerateGUID(false)
 
-  local promise
+  local promise = nil
   local function cleanup(status: string)
     if status == "Cancelled" or status == "Rejected" then
       actor:SendMessage("Parallel:CancelTask", uuid)
@@ -169,7 +177,7 @@ end
 
 function Parallel:_createActors()
   for _ = 1, self._actorCount - #self._actors do
-    local actor = Parallel._createTemplatedActor()
+    local actor = createTemplatedActor()
     actor.Parent = self._folder
     actor:SendMessage("Parallel:Init", self._bindableEvent, self._runnable)
 
@@ -181,17 +189,6 @@ function Parallel:_createActors()
   end
 end
 
-function Parallel._createTemplatedActor(): Actor
-  local actor = nil
-  if RunService:IsServer() then
-    actor = ServerActor:Clone()
-  else
-    actor = ClientActor:Clone()
-  end
-  require(actor.Worker)
-  return actor
-end
-
 function Parallel:__tostring()
   return string.format("Parallel<%s>", self._name)
 end

src/ClientActor/init.meta.json src/Actor/init.meta.jsonsrc/ClientActor/init.meta.json renamed to src/Actor/init.meta.json

@@ -1,11 +1,11 @@
 [package]
 name = "dig/parallel"
 description = "Parallel execution library for Roblox lua"
-version = "1.0.1"
+version = "1.0.2"
 license = "MIT"
 registry = "https://github.com/UpliftGames/wally-index"
 realm = "shared"
-include = ["src", "default.project.json"]
+include = ["src", "default.project.json", "LICENSE"]
 
 [dependencies]
 Promise = "evaera/promise@4.0.0"