Skip to content

fix: nil as input #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Leeeon233 merged 2 commits into from
Mar 3, 2025
Merged

fix: nil as input #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4fe397
fix: nil as input
Leeeon233 Mar 3, 2025
495a1b4
fix: more nil loro value
Leeeon233 Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 45 additions & 2 deletions Sources/Loro/Container.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,6 @@ extension LoroMovableList: ContainerLike{
return typedResult
}
}
extension LoroCounter: ContainerLike{}
extension LoroUnknown: ContainerLike{}


extension LoroList: ContainerLike{
Expand Down Expand Up @@ -163,5 +161,50 @@ extension LoroList: ContainerLike{
}
}

extension LoroCounter: ContainerLike{}
extension LoroUnknown: ContainerLike{}

// Extension for handling nil input
// Although we extend Optional, we still need to specify the type explicitly
// e.g. `nil as String?`. This is not convenient in some scenarios.
extension LoroList{
public func insert(pos: UInt32, v: LoroValueLike?) throws {
try self.insert(pos: pos, v: v?.asLoroValue() ?? .null)
}

public func push(v: LoroValueLike?) throws {
try self.push(v: v?.asLoroValue() ?? .null)
}
}

extension LoroMap{
public func insert(key: String, v: LoroValueLike?) throws {
try self.insert(key: key, v: v?.asLoroValue() ?? .null)
}
}

extension LoroMovableList{
public func insert(pos: UInt32, v: LoroValueLike?) throws {
try self.insert(pos: pos, v: v?.asLoroValue() ?? .null)
}

public func push(v: LoroValueLike?) throws {
try self.push(v: v?.asLoroValue() ?? .null)
}

public func set(pos: UInt32, v: LoroValueLike?) throws {
try self.set(pos: pos, value: v?.asLoroValue() ?? .null)
}
}

extension LoroText{
public func mark(from: UInt32, to: UInt32, key: String, value: LoroValueLike?) throws {
try self.mark(from: from, to: to, key: key, value: value?.asLoroValue() ?? .null)
}
}

extension Awareness{
public func setLocalState(value: LoroValueLike?){
self.setLocalState(value: value?.asLoroValue() ?? .null)
}
}
10 changes: 10 additions & 0 deletions Sources/Loro/Value.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,16 @@ extension LoroValue: LoroValueLike {
}
}

extension Optional: LoroValueLike where Wrapped: LoroValueLike {
public func asLoroValue() -> LoroValue {
if let value = self {
return value.asLoroValue()
} else {
return .null
}
}
}

extension Bool: LoroValueLike{
public func asLoroValue() -> LoroValue {
return LoroValue.bool(value: self)
Expand Down
15 changes: 15 additions & 0 deletions Tests/LoroTests/LoroTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,21 @@ final class LoroTests: XCTestCase {
sub.detach()
XCTAssertEqual(num, 1)
}

func testOptional(){
let doc = LoroDoc()
let list = doc.getList(id: "list")
try! list.insert(pos: 0, v: nil)
let map = doc.getMap(id: "map")
try! map.insert(key: "key", v: nil)
let movableList = doc.getMovableList(id: "movableList")
try! movableList.insert(pos: 0, v: nil)
try! movableList.set(pos: 0, v: nil)
doc.commit()
XCTAssertEqual(list.get(index: 0)!.asValue()!, LoroValue.null)
XCTAssertEqual(map.get(key: "key")!.asValue()!, LoroValue.null)
XCTAssertEqual(movableList.get(index: 0)!.asValue()!, LoroValue.null)
}

func testText(){
let doc = LoroDoc()
Expand Down
Loading