Merge pull request #522 from Quenty/users/quenty/sorted_list_improvem…

…ents

Users/quenty/sorted list improvements

plugins/ui-converter-plugin/src/modules/Server/UIConverterUtils.lua

@@ -119,7 +119,7 @@ function UIConverterUtils.toLuaPropertyString(value, debugHint)
 						roundY,
 						roundZ)
 			else
-				return string.format("CFrame.new(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)", applyToTuple(roundNumber, value:components()))
+				return string.format("CFrame.new(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)", applyToTuple(roundNumber, value:GetComponents()))
 			end
 		end
 	elseif valueType == "Rect" then

src/accessorytypeutils/package.json

@@ -25,6 +25,7 @@
     "Quenty"
   ],
   "dependencies": {
+    "@quenty/enumutils": "file:../enumutils",
     "@quenty/loader": "file:../loader"
   },
   "publishConfig": {

src/accessorytypeutils/src/Shared/AccessoryTypeUtils.lua

@@ -4,6 +4,8 @@
 
 local require = require(script.Parent.loader).load(script)
 
+local EnumUtils = require("EnumUtils")
+
 local AvatarEditorService = game:GetService("AvatarEditorService")
 
 local AccessoryTypeUtils = {}
@@ -40,34 +42,22 @@ end
 	@param assetTypeId number
 	@return AssetType | nl
 ]=]
-function AccessoryTypeUtils.convertAssetTypeIdToAssetType(assetTypeId): AssetType
+function AccessoryTypeUtils.convertAssetTypeIdToAssetType(assetTypeId: number): AssetType?
 	assert(type(assetTypeId) == "number", "Bad assetTypeId")
 
-	for _, enumItem in pairs(Enum.AssetType:GetEnumItems()) do
-		if enumItem.Value == assetTypeId then
-			return enumItem
-		end
-	end
-
-	return nil
+	return EnumUtils.toEnum(Enum.AssetType, assetTypeId)
 end
 
 --[=[
 	Converts an enum value (retrieved from MarketplaceService) into a proper enum if possible
 
-	@param assetTypeId number
+	@param avatarAssetTypeId number
 	@return AvatarAssetType | nil
 ]=]
-function AccessoryTypeUtils.convertAssetTypeIdToAvatarAssetType(assetTypeId): AvatarAssetType
-	assert(type(assetTypeId) == "number", "Bad assetTypeId")
-
-	for _, enumItem in pairs(Enum.AvatarAssetType:GetEnumItems()) do
-		if enumItem.Value == assetTypeId then
-			return enumItem
-		end
-	end
+function AccessoryTypeUtils.convertAssetTypeIdToAvatarAssetType(avatarAssetTypeId: number): AvatarAssetType?
+	assert(type(avatarAssetTypeId) == "number", "Bad avatarAssetTypeId")
 
-	return nil
+	return EnumUtils.toEnum(Enum.AvatarAssetType, avatarAssetTypeId)
 end
 
 return AccessoryTypeUtils

src/adorneeboundingbox/src/Shared/AdorneeBoundingBox.lua

@@ -51,6 +51,31 @@ function AdorneeBoundingBox:SetAdornee(adornee)
 	end
 end
 
+function AdorneeBoundingBox:ObserveBoundingBox()
+	return Rx.combineLatest({
+		CFrame = self:ObserveCFrame();
+		Size = self:ObserveSize();
+	}):Pipe({
+		Rx.where(function(state)
+			return state.CFrame and state.Size
+		end);
+	})
+end
+
+function AdorneeBoundingBox:GetBoundingBox()
+	local cframe = self._bbCFrame.Value
+	local size = self._bbSize.Value
+
+	if cframe and size then
+		return {
+			CFrame = cframe;
+			Size = size;
+		}
+	else
+		return nil
+	end
+end
+
 --[=[
 	Observes the cframe of the adornee
 	@return Observable<Vector3>

src/adorneeutils/src/Shared/AdorneeUtils.lua

@@ -19,7 +19,7 @@ function AdorneeUtils.getCenter(adornee)
 	if adornee:IsA("BasePart") then
 		return adornee.Position
 	elseif adornee:IsA("Model") then
-		return adornee:GetBoundingBox().p
+		return adornee:GetBoundingBox().Position
 	elseif adornee:IsA("Attachment") then
 		return adornee.WorldPosition
 	elseif adornee:IsA("Humanoid") then

src/aggregator/README.md

@@ -0,0 +1,23 @@
+## Aggregator
+
+<div align="center">
+  <a href="http://quenty.github.io/NevermoreEngine/">
+    <img src="https://github.com/Quenty/NevermoreEngine/actions/workflows/docs.yml/badge.svg" alt="Documentation status" />
+  </a>
+  <a href="https://discord.gg/mhtGUS8">
+    <img src="https://img.shields.io/discord/385151591524597761?color=5865F2&label=discord&logo=discord&logoColor=white" alt="Discord" />
+  </a>
+  <a href="https://github.com/Quenty/NevermoreEngine/actions">
+    <img src="https://github.com/Quenty/NevermoreEngine/actions/workflows/build.yml/badge.svg" alt="Build and release status" />
+  </a>
+</div>
+
+Aggregates async promise requests
+
+<div align="center"><a href="https://quenty.github.io/NevermoreEngine/api/AggregatorUtils">View docs →</a></div>
+
+## Installation
+
+```
+npm install @quenty/aggregator --save
+```

src/aggregator/default.project.json

@@ -0,0 +1,7 @@
+{
+  "name": "aggregator",
+  "globIgnorePaths": [ "**/.package-lock.json" ],
+  "tree": {
+    "$path": "src"
+  }
+}

src/aggregator/package.json

@@ -0,0 +1,39 @@
+{
+  "name": "@quenty/aggregator",
+  "version": "1.0.0",
+  "description": "Aggregates async promise requests",
+  "keywords": [
+    "Roblox",
+    "Nevermore",
+    "Lua",
+    "aggregator"
+  ],
+  "bugs": {
+    "url": "https://github.com/Quenty/NevermoreEngine/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Quenty/NevermoreEngine.git",
+    "directory": "src/aggregator/"
+  },
+  "funding": {
+    "type": "patreon",
+    "url": "https://www.patreon.com/quenty"
+  },
+  "license": "MIT",
+  "contributors": [
+    "Quenty"
+  ],
+  "dependencies": {
+    "@quenty/baseobject": "file:../baseobject",
+    "@quenty/loader": "file:../loader",
+    "@quenty/lrucache": "file:../lrucache",
+    "@quenty/promise": "file:../promise",
+    "@quenty/queue": "file:../queue",
+    "@quenty/rx": "file:../rx",
+    "@quenty/tuple": "file:../tuple"
+  },
+  "publishConfig": {
+    "access": "public"
+  }
+}

src/aggregator/src/Shared/Aggregator.lua

@@ -0,0 +1,146 @@
+--[=[
+	Aggregates all requests into one big send request to deduplicate the request
+
+	@class Aggregator
+]=]
+
+local require = require(script.Parent.loader).load(script)
+
+local BaseObject = require("BaseObject")
+local Promise = require("Promise")
+local Rx = require("Rx")
+local LRUCache = require("LRUCache")
+
+local Aggregator = setmetatable({}, BaseObject)
+Aggregator.ClassName = "Aggregator"
+Aggregator.__index = Aggregator
+
+--[=[
+	Creates a new aggregator that aggregates promised results together
+
+	@param debugName string
+	@param promiseBulkQuery ({ number }) -> Promise<T>
+
+	@return Aggregator<T>
+]=]
+function Aggregator.new(debugName, promiseBulkQuery)
+	assert(type(debugName) == "string", "Bad debugName")
+
+	local self = setmetatable(BaseObject.new(), Aggregator)
+
+	self._debugName = debugName
+	self._promiseBulkQuery = assert(promiseBulkQuery, "No promiseBulkQuery")
+
+	-- TODO: LRU cache this? Limit to 1k or something?
+	self._promisesLruCache = LRUCache.new(2000)
+
+	self._maxPerRequest = 200
+	self._unsentCount = 0
+	self._unsentPromises = {}
+
+	return self
+end
+
+--[=[
+	@param id number
+	@return Promise<T>
+]=]
+function Aggregator:Promise(id)
+	assert(type(id) == "number", "Bad id")
+
+	local found = self._promisesLruCache:get(id)
+	if found then
+		return found
+	end
+
+	local promise = Promise.new()
+
+	self._unsentPromises[id] = promise
+	self._unsentCount = self._unsentCount + 1
+	self._promisesLruCache:set(id, promise)
+
+	self:_queueAggregatedPromises()
+
+	return promise
+end
+
+--[=[
+	Observes the aggregated data
+
+	@param id number
+	@return Observable<T>
+]=]
+function Aggregator:Observe(id)
+	assert(type(id) == "number", "Bad id")
+
+	return Rx.fromPromise(self:Promise(id))
+end
+
+function Aggregator:_sendAggregatedPromises(promiseMap)
+	assert(promiseMap, "No promiseMap")
+
+	local idList = {}
+	local unresolvedMap = {}
+	for id, promise in pairs(promiseMap) do
+		table.insert(idList, id)
+		unresolvedMap[id] = promise
+	end
+
+	if #idList == 0 then
+		return
+	end
+
+	assert(#idList <= self._maxPerRequest, "Too many idList sent")
+
+	self._maid:GivePromise(self._promiseBulkQuery(idList))
+		:Then(function(result)
+			assert(type(result) == "table", "Bad result")
+
+			for _, data in pairs(result) do
+				assert(type(data.Id) == "number", "Bad result[?].Id")
+
+				if unresolvedMap[data.Id] then
+					unresolvedMap[data.Id]:Resolve(data)
+					unresolvedMap[data.Id] = nil
+				end
+			end
+
+			-- Reject other ones
+			for id, promise in pairs(unresolvedMap) do
+				promise:Reject(string.format("Aggregated %s failed to get result for id %d", self._debugName, id))
+			end
+		end, function(...)
+			for _, item in pairs(unresolvedMap) do
+				item:Reject(...)
+			end
+		end)
+end
+
+function Aggregator:_resetQueue()
+	local promiseMap = self._unsentPromises
+
+	self._maid._queue = nil
+	self._unsentCount = 0
+	self._unsentPromises = {}
+
+	return promiseMap
+end
+
+function Aggregator:_queueAggregatedPromises()
+	if self._unsentCount >= self._maxPerRequest then
+		self:_sendAggregatedPromises(self:_resetQueue())
+		return
+	end
+
+	if self._maid._queue then
+		return
+	end
+
+	self._maid._queue = task.delay(0.1, function()
+		task.spawn(function()
+			self:_sendAggregatedPromises(self:_resetQueue())
+		end)
+	end)
+end
+
+return Aggregator