Merge d43d321 into 2f51799

README.md

@@ -231,7 +231,7 @@ print(IPlayer(myPlayer2)) --> false, "[interface] unexpected field 'A'"
 ## Roblox Instances
 t includes two functions to check the types of Roblox Instances.
 
-**`t.instance(className)`**\
+**`t.instanceOf(className)`**\
 ensures the value is an Instance and it's ClassName exactly matches `className`
 
 **`t.instanceIsA(className)`**\

lib/init.lua

@@ -856,7 +856,7 @@ end
 
 	@returns A function that will return true iff the condition is passed
 **--]]
-function t.instance(className)
+function t.instanceOf(className)
 	assert(t.string(className))
 	return function(value)
 		local instanceSuccess, instanceErrMsg = t.Instance(value)
@@ -871,6 +871,7 @@ function t.instance(className)
 		return true
 	end
 end
+t.instance = t.instanceOf
 
 --[[**
 	ensure value is an Instance and it's ClassName matches the given ClassName by an IsA comparison
@@ -951,4 +952,38 @@ function t.strict(check)
 	end
 end
 
+do
+	local checkChildren = t.map(t.string, t.callback)
+	function t.children(checkTable)
+		assert(checkChildren(checkTable))
+
+		return function(value)
+			local instanceSuccess, instanceErrMsg = t.Instance(value)
+			if not instanceSuccess then
+				return false, instanceErrMsg or ""
+			end
+
+			local childrenByName = {}
+			for _, child in pairs(value:GetChildren()) do
+				local name = child.Name
+				if checkTable[name] then
+					if childrenByName[name] then
+						return false, string.format("Cannot process multiple children with the same name \"%s\"", name)
+					end
+					childrenByName[name] = child
+				end
+			end
+
+			for name, check in pairs(checkTable) do
+				local success, errMsg = check(childrenByName[name])
+				if not success then
+					return false, string.format("[%s.%s] %s", value:GetFullName(), name, errMsg or "")
+				end
+			end
+
+			return true
+		end
+	end
+end
+
 return t

lib/init.spec.lua

@@ -253,7 +253,7 @@ return function()
 	end)
 
 	it("should support Roblox Instance types", function()
-		local stringValueCheck = t.instance("StringValue")
+		local stringValueCheck = t.instanceOf("StringValue")
 		local stringValue = Instance.new("StringValue")
 		local boolValue = Instance.new("BoolValue")
 
@@ -378,4 +378,45 @@ return function()
 		local myInterface = t.strictInterface({ a = t.number })
 		expect(myInterface({ a = 1, [{}] = 2 })).to.equal(false)
 	end)
+
+	it("should support children", function()
+		local myInterface = t.interface({
+			buttonInFrame = t.intersection(t.instanceOf("Frame"), t.children({
+				MyButton = t.instanceOf("ImageButton")
+			}))
+		})
+
+		expect(t.children({})(5)).to.equal(false)
+		expect(myInterface({ buttonInFrame = Instance.new("Frame") })).to.equal(false)
+
+		do
+			local frame = Instance.new("Frame")
+			local button = Instance.new("ImageButton", frame)
+			button.Name = "MyButton"
+			expect(myInterface({ buttonInFrame = frame })).to.equal(true)
+		end
+
+		do
+			local frame = Instance.new("Frame")
+			local button = Instance.new("ImageButton", frame)
+			button.Name = "NotMyButton"
+			expect(myInterface({ buttonInFrame = frame })).to.equal(false)
+		end
+
+		do
+			local frame = Instance.new("Frame")
+			local button = Instance.new("TextButton", frame)
+			button.Name = "MyButton"
+			expect(myInterface({ buttonInFrame = frame })).to.equal(false)
+		end
+
+		do
+			local frame = Instance.new("Frame")
+			local button1 = Instance.new("ImageButton", frame)
+			button1.Name = "MyButton"
+			local button2 = Instance.new("ImageButton", frame)
+			button2.Name = "MyButton"
+			expect(myInterface({ buttonInFrame = frame })).to.equal(false)
+		end
+	end)
 end

lib/ts.lua

@@ -405,7 +405,7 @@ do
 	end
 end
 
-function t.instance(className)
+function t.instanceOf(className)
 	assert(t.string(className))
 	return function(value)
 		local instanceSuccess = t.Instance(value)
@@ -420,6 +420,7 @@ function t.instance(className)
 		return true
 	end
 end
+t.instance = t.instanceOf
 
 function t.instanceIsA(className)
 	assert(t.string(className))
@@ -471,4 +472,38 @@ function t.strict(check)
 	end
 end
 
+do
+	local checkChildren = t.map(t.string, t.callback)
+	function t.children(checkTable)
+		assert(checkChildren(checkTable))
+
+		return function(value)
+			local instanceSuccess = t.Instance(value)
+			if not instanceSuccess then
+				return false
+			end
+
+			local childrenByName = {}
+			for _, child in pairs(value:GetChildren()) do
+				local name = child.Name
+				if checkTable[name] then
+					if childrenByName[name] then
+						return false
+					end
+					childrenByName[name] = child
+				end
+			end
+
+			for name, check in pairs(checkTable) do
+				local success = check(childrenByName[name])
+				if not success then
+					return false
+				end
+			end
+
+			return true
+		end
+	end
+end
+
 return t