It's a collection

arennow · May 2, 2020 · 36e42c8 · 36e42c8
1 parent feb0373
commit 36e42c8
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 6 deletions.
diff --git a/Sources/KeyedArray/KeyedArray.swift b/Sources/KeyedArray/KeyedArray.swift
@@ -50,14 +50,25 @@ extension KeyedArray where Element: Identifiable, Key == Element.ID {
 	public init() {
 		self.init(keyExtractor: \.id)
 	}
-}
-
-extension KeyedArray: ExpressibleByArrayLiteral where Element: Identifiable, Key == Element.ID {
-	public init(arrayLiteral elements: Element...) {
+
+	public init<S: Sequence>(_ seq: S) where S.Element == Element {
 		self.init()
 
-		for element in elements {
+		for element in seq {
 			self.append(element)
 		}
 	}
 }
+
+extension KeyedArray: ExpressibleByArrayLiteral where Element: Identifiable, Key == Element.ID {
+	public init(arrayLiteral elements: Element...) {
+		self.init(elements)
+	}
+}
+
+extension KeyedArray: Collection {
+	public var startIndex: Int { array.startIndex }
+	public var endIndex: Int { array.endIndex }
+
+	public func index(after i: Int) -> Int { array.index(after: i) }
+}
diff --git a/Tests/KeyedArrayTests/KeyedArrayTests.swift b/Tests/KeyedArrayTests/KeyedArrayTests.swift
@@ -14,7 +14,10 @@ final class KeyedArrayTests: XCTestCase {
 		("testAppend", testAppend),
 		("testInsert", testInsert),
 		("testRemoveByIndex", testRemoveByIndex),
-		("testRemoveByKey", testRemoveByKey)
+		("testRemoveByKey", testRemoveByKey),
+		("testReplaceByIndex", testReplaceByIndex),
+		("testArrayIsArray", testArrayIsArray),
+		("testIterator", testIterator)
 	]
 
 	var ar: KeyedArray<Character, DemoVal>!
@@ -60,4 +63,15 @@ final class KeyedArrayTests: XCTestCase {
 		XCTAssertEqual(ar.array, ["alpha", "bravo"])
 		XCTAssertEqual(ar.dictionary, ["a": "alpha", "b": "bravo"])
 	}
+
+	func testArrayIsArray() {
+		XCTAssertEqual(Array(ar.array), ar.array)
+	}
+
+	func testIterator() {
+		var it = ar.makeIterator()
+		XCTAssertEqual(it.next(), "alpha")
+		XCTAssertEqual(it.next(), "beta")
+		XCTAssertEqual(it.next(), nil)
+	}
 }