prettier 3.0.0-alpha.3 → 3.0.0-alpha.4

package/LICENSE

@@ -13,11 +13,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 ## Licenses of bundled dependencies
 
 The published Prettier artifact additionally contains code with the following licenses:
-MIT, ISC, BSD-2-Clause, BSD-3-Clause, Apache-2.0, 0BSD
+MIT, ISC, BSD-2-Clause, BSD-3-Clause, 0BSD, Apache-2.0
 
 ## Bundled dependencies
 
-### @angular/compiler@v14.2.6
+### @angular/compiler@v14.2.7
 
 License: MIT
 By: angular
@@ -118,7 +118,7 @@ Repository: <https://github.com/babel/babel.git>
 
 ----------------------------------------
 
-### @babel/parser@v7.19.3
+### @babel/parser@v7.19.6
 
 License: MIT
 By: The Babel Team
@@ -337,6 +337,35 @@ License: MIT
 
 ----------------------------------------
 
+### @prettier/is-es5-identifier-name@v0.0.2
+
+License: MIT
+By: fisker Cheung
+
+> MIT License
+>
+> Copyright (c) fisker Cheung <lionkay@gmail.com> (https://www.fiskercheung.com/)
+>
+> Permission is hereby granted, free of charge, to any person obtaining a copy
+> of this software and associated documentation files (the "Software"), to deal
+> in the Software without restriction, including without limitation the rights
+> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+> copies of the Software, and to permit persons to whom the Software is
+> furnished to do so, subject to the following conditions:
+>
+> The above copyright notice and this permission notice shall be included in all
+> copies or substantial portions of the Software.
+>
+> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+> SOFTWARE.
+
+----------------------------------------
+
 ### @prettier/parse-srcset@v2.0.2
 
 License: MIT
@@ -366,7 +395,7 @@ By: Alex Bell
 
 ----------------------------------------
 
-### @typescript-eslint/types@v5.40.0
+### @typescript-eslint/types@v5.40.1
 
 License: MIT
 Repository: <https://github.com/typescript-eslint/typescript-eslint.git>
@@ -395,7 +424,7 @@ Repository: <https://github.com/typescript-eslint/typescript-eslint.git>
 
 ----------------------------------------
 
-### @typescript-eslint/typescript-estree@v5.40.0
+### @typescript-eslint/typescript-estree@v5.40.1
 
 License: BSD-2-Clause
 Repository: <https://github.com/typescript-eslint/typescript-eslint.git>
@@ -429,35 +458,6 @@ Repository: <https://github.com/typescript-eslint/typescript-eslint.git>
 
 ----------------------------------------
 
-### @typescript-eslint/visitor-keys@v5.40.0
-
-License: MIT
-Repository: <https://github.com/typescript-eslint/typescript-eslint.git>
-
-> MIT License
->
-> Copyright (c) 2019 TypeScript ESLint and other contributors
->
-> Permission is hereby granted, free of charge, to any person obtaining a copy
-> of this software and associated documentation files (the "Software"), to deal
-> in the Software without restriction, including without limitation the rights
-> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-> copies of the Software, and to permit persons to whom the Software is
-> furnished to do so, subject to the following conditions:
->
-> The above copyright notice and this permission notice shall be included in all
-> copies or substantial portions of the Software.
->
-> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-> SOFTWARE.
-
-----------------------------------------
-
 ### acorn@v8.8.0
 
 License: MIT
@@ -1352,215 +1352,6 @@ By: Sindre Sorhus
 
 ----------------------------------------
 
-### eslint-visitor-keys@v3.3.0
-
-License: Apache-2.0
-By: Toru Nagashima
-
-> Apache License
->                            Version 2.0, January 2004
->                         http://www.apache.org/licenses/
->
->    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
->
->    1. Definitions.
->
->       "License" shall mean the terms and conditions for use, reproduction,
->       and distribution as defined by Sections 1 through 9 of this document.
->
->       "Licensor" shall mean the copyright owner or entity authorized by
->       the copyright owner that is granting the License.
->
->       "Legal Entity" shall mean the union of the acting entity and all
->       other entities that control, are controlled by, or are under common
->       control with that entity. For the purposes of this definition,
->       "control" means (i) the power, direct or indirect, to cause the
->       direction or management of such entity, whether by contract or
->       otherwise, or (ii) ownership of fifty percent (50%) or more of the
->       outstanding shares, or (iii) beneficial ownership of such entity.
->
->       "You" (or "Your") shall mean an individual or Legal Entity
->       exercising permissions granted by this License.
->
->       "Source" form shall mean the preferred form for making modifications,
->       including but not limited to software source code, documentation
->       source, and configuration files.
->
->       "Object" form shall mean any form resulting from mechanical
->       transformation or translation of a Source form, including but
->       not limited to compiled object code, generated documentation,
->       and conversions to other media types.
->
->       "Work" shall mean the work of authorship, whether in Source or
->       Object form, made available under the License, as indicated by a
->       copyright notice that is included in or attached to the work
->       (an example is provided in the Appendix below).
->
->       "Derivative Works" shall mean any work, whether in Source or Object
->       form, that is based on (or derived from) the Work and for which the
->       editorial revisions, annotations, elaborations, or other modifications
->       represent, as a whole, an original work of authorship. For the purposes
->       of this License, Derivative Works shall not include works that remain
->       separable from, or merely link (or bind by name) to the interfaces of,
->       the Work and Derivative Works thereof.
->
->       "Contribution" shall mean any work of authorship, including
->       the original version of the Work and any modifications or additions
->       to that Work or Derivative Works thereof, that is intentionally
->       submitted to Licensor for inclusion in the Work by the copyright owner
->       or by an individual or Legal Entity authorized to submit on behalf of
->       the copyright owner. For the purposes of this definition, "submitted"
->       means any form of electronic, verbal, or written communication sent
->       to the Licensor or its representatives, including but not limited to
->       communication on electronic mailing lists, source code control systems,
->       and issue tracking systems that are managed by, or on behalf of, the
->       Licensor for the purpose of discussing and improving the Work, but
->       excluding communication that is conspicuously marked or otherwise
->       designated in writing by the copyright owner as "Not a Contribution."
->
->       "Contributor" shall mean Licensor and any individual or Legal Entity
->       on behalf of whom a Contribution has been received by Licensor and
->       subsequently incorporated within the Work.
->
->    2. Grant of Copyright License. Subject to the terms and conditions of
->       this License, each Contributor hereby grants to You a perpetual,
->       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
->       copyright license to reproduce, prepare Derivative Works of,
->       publicly display, publicly perform, sublicense, and distribute the
->       Work and such Derivative Works in Source or Object form.
->
->    3. Grant of Patent License. Subject to the terms and conditions of
->       this License, each Contributor hereby grants to You a perpetual,
->       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
->       (except as stated in this section) patent license to make, have made,
->       use, offer to sell, sell, import, and otherwise transfer the Work,
->       where such license applies only to those patent claims licensable
->       by such Contributor that are necessarily infringed by their
->       Contribution(s) alone or by combination of their Contribution(s)
->       with the Work to which such Contribution(s) was submitted. If You
->       institute patent litigation against any entity (including a
->       cross-claim or counterclaim in a lawsuit) alleging that the Work
->       or a Contribution incorporated within the Work constitutes direct
->       or contributory patent infringement, then any patent licenses
->       granted to You under this License for that Work shall terminate
->       as of the date such litigation is filed.
->
->    4. Redistribution. You may reproduce and distribute copies of the
->       Work or Derivative Works thereof in any medium, with or without
->       modifications, and in Source or Object form, provided that You
->       meet the following conditions:
->
->       (a) You must give any other recipients of the Work or
->           Derivative Works a copy of this License; and
->
->       (b) You must cause any modified files to carry prominent notices
->           stating that You changed the files; and
->
->       (c) You must retain, in the Source form of any Derivative Works
->           that You distribute, all copyright, patent, trademark, and
->           attribution notices from the Source form of the Work,
->           excluding those notices that do not pertain to any part of
->           the Derivative Works; and
->
->       (d) If the Work includes a "NOTICE" text file as part of its
->           distribution, then any Derivative Works that You distribute must
->           include a readable copy of the attribution notices contained
->           within such NOTICE file, excluding those notices that do not
->           pertain to any part of the Derivative Works, in at least one
->           of the following places: within a NOTICE text file distributed
->           as part of the Derivative Works; within the Source form or
->           documentation, if provided along with the Derivative Works; or,
->           within a display generated by the Derivative Works, if and
->           wherever such third-party notices normally appear. The contents
->           of the NOTICE file are for informational purposes only and
->           do not modify the License. You may add Your own attribution
->           notices within Derivative Works that You distribute, alongside
->           or as an addendum to the NOTICE text from the Work, provided
->           that such additional attribution notices cannot be construed
->           as modifying the License.
->
->       You may add Your own copyright statement to Your modifications and
->       may provide additional or different license terms and conditions
->       for use, reproduction, or distribution of Your modifications, or
->       for any such Derivative Works as a whole, provided Your use,
->       reproduction, and distribution of the Work otherwise complies with
->       the conditions stated in this License.
->
->    5. Submission of Contributions. Unless You explicitly state otherwise,
->       any Contribution intentionally submitted for inclusion in the Work
->       by You to the Licensor shall be under the terms and conditions of
->       this License, without any additional terms or conditions.
->       Notwithstanding the above, nothing herein shall supersede or modify
->       the terms of any separate license agreement you may have executed
->       with Licensor regarding such Contributions.
->
->    6. Trademarks. This License does not grant permission to use the trade
->       names, trademarks, service marks, or product names of the Licensor,
->       except as required for reasonable and customary use in describing the
->       origin of the Work and reproducing the content of the NOTICE file.
->
->    7. Disclaimer of Warranty. Unless required by applicable law or
->       agreed to in writing, Licensor provides the Work (and each
->       Contributor provides its Contributions) on an "AS IS" BASIS,
->       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
->       implied, including, without limitation, any warranties or conditions
->       of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
->       PARTICULAR PURPOSE. You are solely responsible for determining the
->       appropriateness of using or redistributing the Work and assume any
->       risks associated with Your exercise of permissions under this License.
->
->    8. Limitation of Liability. In no event and under no legal theory,
->       whether in tort (including negligence), contract, or otherwise,
->       unless required by applicable law (such as deliberate and grossly
->       negligent acts) or agreed to in writing, shall any Contributor be
->       liable to You for damages, including any direct, indirect, special,
->       incidental, or consequential damages of any character arising as a
->       result of this License or out of the use or inability to use the
->       Work (including but not limited to damages for loss of goodwill,
->       work stoppage, computer failure or malfunction, or any and all
->       other commercial damages or losses), even if such Contributor
->       has been advised of the possibility of such damages.
->
->    9. Accepting Warranty or Additional Liability. While redistributing
->       the Work or Derivative Works thereof, You may choose to offer,
->       and charge a fee for, acceptance of support, warranty, indemnity,
->       or other liability obligations and/or rights consistent with this
->       License. However, in accepting such obligations, You may act only
->       on Your own behalf and on Your sole responsibility, not on behalf
->       of any other Contributor, and only if You agree to indemnify,
->       defend, and hold each Contributor harmless for any liability
->       incurred by, or claims asserted against, such Contributor by reason
->       of your accepting any such warranty or additional liability.
->
->    END OF TERMS AND CONDITIONS
->
->    APPENDIX: How to apply the Apache License to your work.
->
->       To apply the Apache License to your work, attach the following
->       boilerplate notice, with the fields enclosed by brackets "{}"
->       replaced with your own identifying information. (Don't include
->       the brackets!)  The text should be enclosed in the appropriate
->       comment syntax for the file format. We also recommend that a
->       file or class name and description of purpose be included on the
->       same "printed page" as the copyright notice for easier
->       identification within third-party archives.
->
->    Copyright contributors
->
->    Licensed under the Apache License, Version 2.0 (the "License");
->    you may not use this file except in compliance with the License.
->    You may obtain a copy of the License at
->
->        http://www.apache.org/licenses/LICENSE-2.0
->
->    Unless required by applicable law or agreed to in writing, software
->    distributed under the License is distributed on an "AS IS" BASIS,
->    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
->    See the License for the specific language governing permissions and
->    limitations under the License.
-
-----------------------------------------
-
 ### espree@v9.4.0
 
 License: BSD-2-Clause
@@ -1594,33 +1385,6 @@ By: Nicholas C. Zakas
 
 ----------------------------------------
 
-### esutils@v2.0.3
-
-License: BSD-2-Clause
-Repository: <http://github.com/estools/esutils.git>
-
-> Redistribution and use in source and binary forms, with or without
-> modification, are permitted provided that the following conditions are met:
->
->   * Redistributions of source code must retain the above copyright
->     notice, this list of conditions and the following disclaimer.
->   * Redistributions in binary form must reproduce the above copyright
->     notice, this list of conditions and the following disclaimer in the
->     documentation and/or other materials provided with the distribution.
->
-> THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-> AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-> IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-> ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-> DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-> (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-> LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-> ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-> (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-> THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-----------------------------------------
-
 ### extend@v3.0.2
 
 License: MIT
@@ -1939,7 +1703,7 @@ Repository: <git+https://github.com/mk-pmb/flatten-js.git>
 
 ----------------------------------------
 
-### flow-parser@v0.190.0
+### flow-parser@v0.190.1
 
 License: MIT
 By: Flow Team
@@ -4101,7 +3865,7 @@ License: ISC
 
 ----------------------------------------
 
-### semver@v7.3.7
+### semver@v7.3.8
 
 License: ISC
 By: GitHub Inc.

package/doc.js

@@ -194,7 +194,7 @@
     }
     return { type: DOC_TYPE_FILL, parts };
   }
-  function ifBreak(breakContents, flatContents, opts = {}) {
+  function ifBreak(breakContents, flatContents = "", opts = {}) {
     if (false) {
       if (breakContents) {
         assertDoc(breakContents);
@@ -469,12 +469,7 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
           break;
         }
         case DOC_TYPE_IF_BREAK:
-          if (doc2.flatContents) {
-            docsStack.push(doc2.flatContents);
-          }
-          if (doc2.breakContents) {
-            docsStack.push(doc2.breakContents);
-          }
+          docsStack.push(doc2.flatContents, doc2.breakContents);
           break;
         case DOC_TYPE_GROUP:
           if (shouldTraverseConditionalGroups && doc2.expandedStates) {
@@ -539,19 +534,12 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
             ...doc2,
             parts: doc2.parts.map(rec)
           });
-        case DOC_TYPE_IF_BREAK: {
-          let {
-            breakContents,
-            flatContents
-          } = doc2;
-          breakContents && (breakContents = rec(breakContents));
-          flatContents && (flatContents = rec(flatContents));
+        case DOC_TYPE_IF_BREAK:
           return cb({
             ...doc2,
-            breakContents,
-            flatContents
+            breakContents: rec(doc2.breakContents),
+            flatContents: rec(doc2.flatContents)
           });
-        }
         case DOC_TYPE_GROUP: {
           let {
             expandedStates,
@@ -659,62 +647,66 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
       return doc.soft ? "" : " ";
     }
     if (doc.type === DOC_TYPE_IF_BREAK) {
-      return doc.flatContents || "";
+      return doc.flatContents;
     }
     return doc;
   }
   function removeLines(doc) {
     return mapDoc(doc, removeLinesFn);
   }
-  var isHardline = (doc, nextDoc) => doc && doc.type === DOC_TYPE_LINE && doc.hard && nextDoc && nextDoc.type === DOC_TYPE_BREAK_PARENT;
-  function stripDocTrailingHardlineFromDoc(doc) {
-    if (!doc) {
-      return doc;
+  function stripTrailingHardlineFromParts(parts) {
+    parts = [...parts];
+    while (parts.length >= 2 && at_default(false, parts, -2).type === DOC_TYPE_LINE && at_default(false, parts, -1).type === DOC_TYPE_BREAK_PARENT) {
+      parts.length -= 2;
     }
-    if (Array.isArray(doc) || doc.type === DOC_TYPE_FILL) {
-      const parts = getDocParts(doc);
-      while (parts.length > 1 && isHardline(...parts.slice(-2))) {
-        parts.length -= 2;
-      }
-      if (parts.length > 0) {
-        const lastPart = stripDocTrailingHardlineFromDoc(at_default(false, parts, -1));
-        parts[parts.length - 1] = lastPart;
-      }
-      return Array.isArray(doc) ? parts : {
-        ...doc,
-        parts
-      };
+    if (parts.length > 0) {
+      const lastPart = stripTrailingHardlineFromDoc(at_default(false, parts, -1));
+      parts[parts.length - 1] = lastPart;
     }
-    switch (doc.type) {
+    return parts;
+  }
+  function stripTrailingHardlineFromDoc(doc) {
+    switch (get_doc_type_default(doc)) {
       case DOC_TYPE_ALIGN:
       case DOC_TYPE_INDENT:
       case DOC_TYPE_INDENT_IF_BREAK:
       case DOC_TYPE_GROUP:
       case DOC_TYPE_LINE_SUFFIX:
       case DOC_TYPE_LABEL: {
-        const contents = stripDocTrailingHardlineFromDoc(doc.contents);
+        const contents = stripTrailingHardlineFromDoc(doc.contents);
         return {
           ...doc,
           contents
         };
       }
-      case DOC_TYPE_IF_BREAK: {
-        const breakContents = stripDocTrailingHardlineFromDoc(doc.breakContents);
-        const flatContents = stripDocTrailingHardlineFromDoc(doc.flatContents);
+      case DOC_TYPE_IF_BREAK:
         return {
           ...doc,
-          breakContents,
-          flatContents
+          breakContents: stripTrailingHardlineFromDoc(doc.breakContents),
+          flatContents: stripTrailingHardlineFromDoc(doc.flatContents)
         };
-      }
+      case DOC_TYPE_FILL:
+        return {
+          ...doc,
+          parts: stripTrailingHardlineFromParts(doc.parts)
+        };
+      case DOC_TYPE_ARRAY:
+        return stripTrailingHardlineFromParts(doc);
+      case DOC_TYPE_STRING:
+        return doc.replace(/[\n\r]*$/, "");
+      case DOC_TYPE_CURSOR:
+      case DOC_TYPE_TRIM:
+      case DOC_TYPE_LINE_SUFFIX_BOUNDARY:
+      case DOC_TYPE_LINE:
+      case DOC_TYPE_BREAK_PARENT:
+        break;
+      default:
+        throw new invalid_doc_error_default(doc);
     }
     return doc;
   }
   function stripTrailingHardline(doc) {
-    if (typeof doc === "string") {
-      return doc.replace(/(?:\r?\n)*$/, "");
-    }
-    return stripDocTrailingHardlineFromDoc(cleanDoc(doc));
+    return stripTrailingHardlineFromDoc(cleanDoc(doc));
   }
   function cleanDocFn(doc) {
     switch (get_doc_type_default(doc)) {
@@ -1374,6 +1366,7 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
   });
   init_define_process();
   function flattenDoc(doc) {
+    var _a;
     if (!doc) {
       return "";
     }
@@ -1402,7 +1395,7 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
       return {
         ...doc,
         contents: flattenDoc(doc.contents),
-        expandedStates: doc.expandedStates && doc.expandedStates.map(flattenDoc)
+        expandedStates: (_a = doc.expandedStates) == null ? void 0 : _a.map(flattenDoc)
       };
     }
     if (doc.type === DOC_TYPE_FILL) {