add tuple support #69

sahara-ooga · 2020-03-11T10:52:31Z

Support tuple.

let pretty = Pretty(formatter: SinglelineFormatter())
let tuple = (1, ("one", URL(string: "https://www.example.com/")!))
print(pretty.string(tuple, debug: false))    
//(1, ("one", https://www.example.com/))

/* label */
let labeledTuple = (2019, region: "Chili", variety: Optional("Chardonnay"), taste: ["round", "smooth", "young"])
print(pretty.string(labeledTuple, debug: false))
//(2019, region: "Chili", variety: "Chardonnay", taste: ["round", "smooth", "young"])

this solves #34.

# Conflicts: # Sources/Core/Formatter/MultilineFormatter.swift

YusukeHosonuma

Good works!!

Sources/Core/Pretty.swift

YusukeHosonuma · 2020-03-12T11:59:24Z

Tests/Core/Formatter/SinglelineFormatterTests.swift

+
+    func testTupleString() {
+        assert(to: formatter.tupleString).expect([
+            when([], then: #"()"#),


Tests/Core/Formatter/SinglelineFormatterTests.swift

Tests/Core/PrettyTests.swift

Sources/Core/Pretty.swift

Apply suggestions from code review.

codecov-io · 2020-03-13T08:28:12Z

Codecov Report

Merging #69 into master will increase coverage by 2.69%.
The diff coverage is 94.87%.

@@            Coverage Diff             @@
##           master      #69      +/-   ##
==========================================
+ Coverage   74.84%   77.53%   +2.69%     
==========================================
  Files           8        8              
  Lines         318      365      +47     
==========================================
+ Hits          238      283      +45     
- Misses         80       82       +2

Impacted Files	Coverage Δ
Sources/Core/Pretty.swift	`86.77% <100%> (+0.97%)`	⬆️
Sources/Core/Formatter/SinglelineFormatter.swift	`95.45% <90.9%> (-4.55%)`	⬇️
Sources/Core/Formatter/MultilineFormatter.swift	`98.03% <93.33%> (-1.97%)`	⬇️
Sources/API/Debug.swift	`71.11% <0%> (+6.24%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update bf83e00...8990689. Read the comment docs.

thanks to Yusuke, I get the image that we can show the merit to support tuple type. A tuple can hold multi type element, which is distinct from Array.

YusukeHosonuma

Good works!!

Tests/Core/Formatter/MultilineFormatterTests.swift

YusukeHosonuma · 2020-03-14T10:13:27Z

Tests/Core/Formatter/MultilineFormatterTests.swift

@@ -66,6 +66,35 @@ class MultilineFormatterTests: XCTestCase {
                         ]
                         """)
    }
+
+    func testTupleString() {
+        let tupleElements: [(String?, String)] = [


What time first argument of tuple is nil?
(Please write to test that passed to nil if possible)

I can not find a situation in which the label is nil.

Example

the tuple is ()

a formatter receives [].

no label, one element

the tuple is transformed to the inner element instance.

(#""one""#) becomes "one".

no label element and labeled element

(#""one""#, second: 2) becomes [(".0", "\"\"one\"\""), ("second", "2")].

Tests/Core/PrettyTests.swift

YusukeHosonuma · 2020-03-14T10:43:02Z

Sources/Core/Formatter/SinglelineFormatter.swift

+        // if the labels of tuples are not specificated, they are like ".1" (not nil).
+        // Using "." as the first charactor of the label of tuple is prohibited.
+        let labelValuePairs: [String] = elements.map { label, value in
+            if let label = label, label.first != "." {


I think a better way would be this judge move to Pretty.swift.

For example:

// Pretty.swift case .tuple: let elements: [(String?, String)] = mirror.children.map { var labelOrNil: String? = nil if let label = $0.label, label.first != "." { labelOrNil = label } return (label: labelOrNil, value: _string($0.value)) } return formatter.tupleString(elements: elements) // Here let labelValuePairs: [String] = elements.map { label, value in if let label = label { ...

Formatter should be concentrate styling therefore should not judge property of data.

Thank you for a comment!

This suggestion is so reasonable, I adopt it in b4676ce.

Sources/Core/Formatter/SinglelineFormatter.swift

@YusukeHosonuma

followed @YusukeHosonuma's suggestion Co-Authored-By: Yusuke Hosonuma <tobi462@gmail.com>

along with it, modify test cases of single line formatter because formatters receive proper labels.

Co-Authored-By: Yusuke Hosonuma <tobi462@gmail.com>

# Conflicts: # Sources/Core/Pretty.swift # Tests/Core/PrettyTests.swift

YusukeHosonuma

Thank you for your polite works ❤️
Please check last suggestion comment from me :)

That's all!!

Sources/Core/Formatter/MultilineFormatter.swift

Co-Authored-By: Yusuke Hosonuma <tobi462@gmail.com>

sahara-ooga · 2020-03-15T10:36:05Z

Tuple対応

add tuple support

aaf4743

sahara-ooga self-assigned this Mar 11, 2020

sahara-ooga requested review from YusukeHosonuma and po-miyasaka March 11, 2020 11:04

sahara-ooga added 1.0.0 feature: formatter feature: public-api feature: type labels Mar 11, 2020

sahara-ooga added 2 commits March 12, 2020 18:53

add formatter tests

836ad2c

refactoring

9eeeacd

sahara-ooga marked this pull request as ready for review March 12, 2020 09:56

Merge branch 'master' into feature/tuple

c229bfe

# Conflicts: # Sources/Core/Formatter/MultilineFormatter.swift

YusukeHosonuma reviewed Mar 12, 2020

View reviewed changes

sahara-ooga commented Mar 13, 2020

View reviewed changes

Sources/Core/Pretty.swift Outdated Show resolved Hide resolved

remove a comment.

c9b082f

Apply suggestions from code review.

sahara-ooga added 2 commits March 13, 2020 18:36

image poli-type handling...

6d7c912

thanks to Yusuke, I get the image that we can show the merit to support tuple type. A tuple can hold multi type element, which is distinct from Array.

show tuple label

d43f963

YusukeHosonuma reviewed Mar 14, 2020

View reviewed changes

sahara-ooga and others added 5 commits March 15, 2020 10:50

correct tuple style

b10f02b

followed @YusukeHosonuma's suggestion Co-Authored-By: Yusuke Hosonuma <tobi462@gmail.com>

add non label element for test example

daf0d9d

move the judgement of label from formatter to pretty

b4676ce

along with it, modify test cases of single line formatter because formatters receive proper labels.

refactoring: modify string consolidation

14572c2

Co-Authored-By: Yusuke Hosonuma <tobi462@gmail.com>

Merge branch 'master' into feature/tuple

5b0631e

# Conflicts: # Sources/Core/Pretty.swift # Tests/Core/PrettyTests.swift

YusukeHosonuma approved these changes Mar 15, 2020

View reviewed changes

Sources/Core/Formatter/MultilineFormatter.swift Outdated Show resolved Hide resolved

sahara-ooga and others added 2 commits March 15, 2020 14:07

fix to remove leaked unnecessary judge

b9f5a83

Co-Authored-By: Yusuke Hosonuma <tobi462@gmail.com>

fix a test case

8990689

sahara-ooga merged commit 92e8530 into master Mar 15, 2020

sahara-ooga deleted the feature/tuple branch March 15, 2020 05:34

sahara-ooga mentioned this pull request Mar 15, 2020

Support tuple #34

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add tuple support #69

add tuple support #69

sahara-ooga commented Mar 11, 2020 •

edited

Loading

YusukeHosonuma left a comment

YusukeHosonuma Mar 12, 2020

codecov-io commented Mar 13, 2020 •

edited

Loading

YusukeHosonuma left a comment

YusukeHosonuma Mar 14, 2020

sahara-ooga Mar 15, 2020 •

edited

Loading

YusukeHosonuma Mar 14, 2020

sahara-ooga Mar 15, 2020 •

edited

Loading

YusukeHosonuma left a comment

sahara-ooga commented Mar 15, 2020

add tuple support #69

add tuple support #69

Conversation

sahara-ooga commented Mar 11, 2020 • edited Loading

YusukeHosonuma left a comment

Choose a reason for hiding this comment

YusukeHosonuma Mar 12, 2020

Choose a reason for hiding this comment

codecov-io commented Mar 13, 2020 • edited Loading

Codecov Report

YusukeHosonuma left a comment

Choose a reason for hiding this comment

YusukeHosonuma Mar 14, 2020

Choose a reason for hiding this comment

sahara-ooga Mar 15, 2020 • edited Loading

Choose a reason for hiding this comment

Example

the tuple is ()

no label, one element

no label element and labeled element

YusukeHosonuma Mar 14, 2020

Choose a reason for hiding this comment

sahara-ooga Mar 15, 2020 • edited Loading

Choose a reason for hiding this comment

YusukeHosonuma left a comment

Choose a reason for hiding this comment

sahara-ooga commented Mar 15, 2020

sahara-ooga commented Mar 11, 2020 •

edited

Loading

codecov-io commented Mar 13, 2020 •

edited

Loading

sahara-ooga Mar 15, 2020 •

edited

Loading

the tuple is `()`

sahara-ooga Mar 15, 2020 •

edited

Loading