Improve dedent (fixes #1202) #1203
Conversation
| @@ -190,7 +190,7 @@ describe('Printer: Query document', () => { | |||
|
|
|||
| fragment frag on Friend { | |||
| foo(size: $size, bar: $b, obj: {key: "value", block: """ | |||
| block string uses \""" | |||
| block string uses \\""" | |||
There was a problem hiding this comment.
Instead of changing this to \\, could you use String.raw as discussed in #1202? This test case intends to show the actual GraphQL string written, so avoiding double-encoding is intentional.
| @@ -212,7 +212,7 @@ describe('Type System Printer', () => { | |||
| } | |||
|
|
|||
| type Root { | |||
| singleField(argOne: String = "tes\t de\fault"): String | |||
| singleField(argOne: String = "tes\\t de\\fault"): String | |||
|
That's true, using String.raw is clearer for the printer tests. I changed it and added another unit test to make sure interpolation also works properly when dedent is used as a string tag. |
src/jsutils/__tests__/dedent-test.js
Outdated
| `).to.equal( | ||
| 'type Query {\n me: User\n}\n\n' + | ||
| 'type User {\n id: ID\n name: String\n}\n', | ||
| ); |
There was a problem hiding this comment.
In the current form, these tests are hard to read.
Would be great to have test string in a separate variable and expected string in readable form, e.g.:
const output = dedent`
type Query {
me: User
}
`;
expect(output).to.equal([
'type Query {',
' me: User',
'}',
].join('\n'));There was a problem hiding this comment.
Yes, that looks a bit nicer, particularly if you're using that style already elsewhere. I refactored it already.
Changed the behavior of the function to not have the undocumented side effect of converting the string to its escaped (raw) form any more, and to also consider tabs in addition to spaces. Also added unit tests for the dedent function and adapted existing tests that were depending on the old behavior of the function.
|
Rebased onto current master now. |
As discussed in #1202, this changes the behavior of the dedent function that is used in unit tests to not return raw strings any more. Also added tests for the function itself.