graphql 15.3.0 → 15.5.1

package/language/blockString.js.flow

@@ -1,5 +1,4 @@
 // @flow strict
-
 /**
  * Produces the value of a block string from its parsed raw value, similar to
  * CoffeeScript's block string, Python's docstring trim or Ruby's strip_heredoc.
@@ -13,7 +12,7 @@ export function dedentBlockStringValue(rawString: string): string {
   const lines = rawString.split(/\r\n|[\n\r]/g);
 
   // Remove common indentation from all lines but first.
-  const commonIndent = getBlockStringIndentation(lines);
+  const commonIndent = getBlockStringIndentation(rawString);
 
   if (commonIndent !== 0) {
     for (let i = 1; i < lines.length; i++) {
@@ -22,52 +21,68 @@ export function dedentBlockStringValue(rawString: string): string {
   }
 
   // Remove leading and trailing blank lines.
-  while (lines.length > 0 && isBlank(lines[0])) {
-    lines.shift();
+  let startLine = 0;
+  while (startLine < lines.length && isBlank(lines[startLine])) {
+    ++startLine;
   }
-  while (lines.length > 0 && isBlank(lines[lines.length - 1])) {
-    lines.pop();
+
+  let endLine = lines.length;
+  while (endLine > startLine && isBlank(lines[endLine - 1])) {
+    --endLine;
   }
 
   // Return a string of the lines joined with U+000A.
-  return lines.join('\n');
+  return lines.slice(startLine, endLine).join('\n');
+}
+
+function isBlank(str: string): boolean {
+  for (let i = 0; i < str.length; ++i) {
+    if (str[i] !== ' ' && str[i] !== '\t') {
+      return false;
+    }
+  }
+
+  return true;
 }
+
 /**
  * @internal
  */
-export function getBlockStringIndentation(
-  lines: $ReadOnlyArray<string>,
-): number {
+export function getBlockStringIndentation(value: string): number {
+  let isFirstLine = true;
+  let isEmptyLine = true;
+  let indent = 0;
   let commonIndent = null;
 
-  for (let i = 1; i < lines.length; i++) {
-    const line = lines[i];
-    const indent = leadingWhitespace(line);
-    if (indent === line.length) {
-      continue; // skip empty lines
-    }
-
-    if (commonIndent === null || indent < commonIndent) {
-      commonIndent = indent;
-      if (commonIndent === 0) {
+  for (let i = 0; i < value.length; ++i) {
+    switch (value.charCodeAt(i)) {
+      case 13: //  \r
+        if (value.charCodeAt(i + 1) === 10) {
+          ++i; // skip \r\n as one symbol
+        }
+      // falls through
+      case 10: //  \n
+        isFirstLine = false;
+        isEmptyLine = true;
+        indent = 0;
         break;
-      }
+      case 9: //   \t
+      case 32: //  <space>
+        ++indent;
+        break;
+      default:
+        if (
+          isEmptyLine &&
+          !isFirstLine &&
+          (commonIndent === null || indent < commonIndent)
+        ) {
+          commonIndent = indent;
+        }
+        isEmptyLine = false;
     }
   }
 
-  return commonIndent === null ? 0 : commonIndent;
-}
-
-function leadingWhitespace(str) {
-  let i = 0;
-  while (i < str.length && (str[i] === ' ' || str[i] === '\t')) {
-    i++;
-  }
-  return i;
-}
-
-function isBlank(str) {
-  return leadingWhitespace(str) === str.length;
+  return commonIndent ?? 0;
 }
 
 /**
@@ -79,8 +94,8 @@ function isBlank(str) {
  */
 export function printBlockString(
   value: string,
-  indentation?: string = '',
-  preferMultipleLines?: boolean = false,
+  indentation: string = '',
+  preferMultipleLines: boolean = false,
 ): string {
   const isSingleLine = value.indexOf('\n') === -1;
   const hasLeadingSpace = value[0] === ' ' || value[0] === '\t';

package/language/blockString.mjs

@@ -10,7 +10,7 @@ export function dedentBlockStringValue(rawString) {
   // Expand a block string's raw value into independent lines.
   var lines = rawString.split(/\r\n|[\n\r]/g); // Remove common indentation from all lines but first.
 
-  var commonIndent = getBlockStringIndentation(lines);
+  var commonIndent = getBlockStringIndentation(rawString);
 
   if (commonIndent !== 0) {
     for (var i = 1; i < lines.length; i++) {
@@ -19,56 +19,78 @@ export function dedentBlockStringValue(rawString) {
   } // Remove leading and trailing blank lines.
 
 
-  while (lines.length > 0 && isBlank(lines[0])) {
-    lines.shift();
+  var startLine = 0;
+
+  while (startLine < lines.length && isBlank(lines[startLine])) {
+    ++startLine;
   }
 
-  while (lines.length > 0 && isBlank(lines[lines.length - 1])) {
-    lines.pop();
+  var endLine = lines.length;
+
+  while (endLine > startLine && isBlank(lines[endLine - 1])) {
+    --endLine;
   } // Return a string of the lines joined with U+000A.
 
 
-  return lines.join('\n');
+  return lines.slice(startLine, endLine).join('\n');
+}
+
+function isBlank(str) {
+  for (var i = 0; i < str.length; ++i) {
+    if (str[i] !== ' ' && str[i] !== '\t') {
+      return false;
+    }
+  }
+
+  return true;
 }
 /**
  * @internal
  */
 
-export function getBlockStringIndentation(lines) {
-  var commonIndent = null;
 
-  for (var i = 1; i < lines.length; i++) {
-    var line = lines[i];
-    var indent = leadingWhitespace(line);
-
-    if (indent === line.length) {
-      continue; // skip empty lines
-    }
+export function getBlockStringIndentation(value) {
+  var _commonIndent;
 
-    if (commonIndent === null || indent < commonIndent) {
-      commonIndent = indent;
+  var isFirstLine = true;
+  var isEmptyLine = true;
+  var indent = 0;
+  var commonIndent = null;
 
-      if (commonIndent === 0) {
+  for (var i = 0; i < value.length; ++i) {
+    switch (value.charCodeAt(i)) {
+      case 13:
+        //  \r
+        if (value.charCodeAt(i + 1) === 10) {
+          ++i; // skip \r\n as one symbol
+        }
+
+      // falls through
+
+      case 10:
+        //  \n
+        isFirstLine = false;
+        isEmptyLine = true;
+        indent = 0;
         break;
-      }
-    }
-  }
 
-  return commonIndent === null ? 0 : commonIndent;
-}
+      case 9: //   \t
 
-function leadingWhitespace(str) {
-  var i = 0;
+      case 32:
+        //  <space>
+        ++indent;
+        break;
 
-  while (i < str.length && (str[i] === ' ' || str[i] === '\t')) {
-    i++;
-  }
+      default:
+        if (isEmptyLine && !isFirstLine && (commonIndent === null || indent < commonIndent)) {
+          commonIndent = indent;
+        }
 
-  return i;
-}
+        isEmptyLine = false;
+    }
+  }
 
-function isBlank(str) {
-  return leadingWhitespace(str) === str.length;
+  return (_commonIndent = commonIndent) !== null && _commonIndent !== void 0 ? _commonIndent : 0;
 }
 /**
  * Print a block string in the indented block form by adding a leading and
@@ -78,7 +100,6 @@ function isBlank(str) {
  * @internal
  */
 
-
 export function printBlockString(value) {
   var indentation = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
   var preferMultipleLines = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;

package/language/directiveLocation.js.flow

@@ -1,5 +1,4 @@
 // @flow strict
-
 /**
  * The set of allowed directive location values.
  */