prettier 1.17.0 → 1.18.2

package/third-party.js

@@ -1682,6 +1682,10 @@ var PATTERN_FLOW_INDICATORS = /[,\[\]\{\}]/;
 var PATTERN_TAG_HANDLE = /^(?:!|!!|![a-z\-]+!)$/i;
 var PATTERN_TAG_URI = /^(?:!|[^,\[\]\{\}])(?:%[0-9a-f]{2}|[0-9a-z\-#;\/\?:@&=\+\$,_\.!~\*'\(\)\[\]])*$/i;
 
+function _class(obj) {
+  return Object.prototype.toString.call(obj);
+}
+
 function is_EOL(c) {
   return c === 0x0A
   /* LF */
@@ -1985,7 +1989,31 @@ function mergeMappings(state, destination, source, overridableKeys) {
 }
 
 function storeMappingPair(state, _result, overridableKeys, keyTag, keyNode, valueNode, startLine, startPos) {
-  var index, quantity;
+  var index, quantity; // The output is a plain object here, so keys can only be strings.
+  // We need to convert keyNode to a string, but doing so can hang the process
+  // (deeply nested arrays that explode exponentially using aliases).
+
+  if (Array.isArray(keyNode)) {
+    keyNode = Array.prototype.slice.call(keyNode);
+
+    for (index = 0, quantity = keyNode.length; index < quantity; index += 1) {
+      if (Array.isArray(keyNode[index])) {
+        throwError(state, 'nested arrays are not supported inside keys');
+      }
+
+      if (typeof keyNode === 'object' && _class(keyNode[index]) === '[object Object]') {
+        keyNode[index] = '[object Object]';
+      }
+    }
+  } // Avoid code execution in load() via toString property
+  // (still use its own toString for arrays, timestamps,
+  // and whatever user schema extensions happen to have @@toStringTag)
+
+
+  if (typeof keyNode === 'object' && _class(keyNode) === '[object Object]') {
+    keyNode = '[object Object]';
+  }
+
   keyNode = String(keyNode);
 
   if (_result === null) {
@@ -3480,6 +3508,7 @@ function encodeHex(character) {
 function State$1(options) {
   this.schema = options['schema'] || default_full;
   this.indent = Math.max(1, options['indent'] || 2);
+  this.noArrayIndent = options['noArrayIndent'] || false;
   this.skipInvalid = options['skipInvalid'] || false;
   this.flowLevel = common.isNothing(options['flowLevel']) ? -1 : options['flowLevel'];
   this.styleMap = compileStyleMap(this.schema, options['styles'] || null);
@@ -4080,14 +4109,16 @@ function writeNode(state, level, object, block, compact, iskey) {
         }
       }
     } else if (type === '[object Array]') {
+      var arrayLevel = state.noArrayIndent && level > 0 ? level - 1 : level;
+
       if (block && state.dump.length !== 0) {
-        writeBlockSequence(state, level, state.dump, compact);
+        writeBlockSequence(state, arrayLevel, state.dump, compact);
 
         if (duplicate) {
           state.dump = '&ref_' + duplicateIndex + state.dump;
         }
       } else {
-        writeFlowSequence(state, level, state.dump);
+        writeFlowSequence(state, arrayLevel, state.dump);
 
         if (duplicate) {
           state.dump = '&ref_' + duplicateIndex + ' ' + state.dump;