From af68a4b1d3c233b88b874a1fda9f5fcbb09f390c Mon Sep 17 00:00:00 2001 From: Ivan Goncharov Date: Wed, 12 May 2021 13:21:17 +0300 Subject: [PATCH] dedent: simplify implementation --- src/__testUtils__/dedent.js | 13 +++---------- src/utilities/__tests__/printSchema-test.js | 4 ++-- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/__testUtils__/dedent.js b/src/__testUtils__/dedent.js index a628aad3e9..fca583865a 100644 --- a/src/__testUtils__/dedent.js +++ b/src/__testUtils__/dedent.js @@ -30,17 +30,10 @@ export function dedent( strings: $ReadOnlyArray, ...values: $ReadOnlyArray ): string { - let str = ''; + let str = strings[0]; - for (let i = 0; i < strings.length; ++i) { - str += strings[i]; - if (i < values.length) { - // istanbul ignore next (Ignore else inside Babel generated code) - const value = values[i]; - - str += value; // interpolation - } + for (let i = 1; i < strings.length; ++i) { + str += values[i - 1] + strings[i]; // interpolation } - return dedentString(str); } diff --git a/src/utilities/__tests__/printSchema-test.js b/src/utilities/__tests__/printSchema-test.js index a649859511..c7971ab126 100644 --- a/src/utilities/__tests__/printSchema-test.js +++ b/src/utilities/__tests__/printSchema-test.js @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import { dedent } from '../../__testUtils__/dedent'; +import { dedent, dedentString } from '../../__testUtils__/dedent'; import { DirectiveLocation } from '../../language/directiveLocation'; @@ -158,7 +158,7 @@ describe('Type System Printer', () => { expectPrintedSchema(schema).to.equal( // $FlowFixMe[incompatible-call] - dedent(String.raw` + dedentString(String.raw` type Query { singleField(argOne: String = "tes\t de\fault"): String }