@prettier/plugin-php 0.19.7 → 0.20.1

package/src/needs-parens.js

@@ -1,18 +1,14 @@
-"use strict";
-
-const assert = require("assert");
-
-const { getPrecedence, shouldFlatten, isBitwiseOperator } = require("./util");
+import assert from "assert";
+import { getPrecedence, shouldFlatten, isBitwiseOperator } from "./util.js";
 
 function needsParens(path) {
-  const parent = path.getParentNode();
+  const { parent } = path;
 
   if (!parent) {
     return false;
   }
 
-  const name = path.getName();
-  const node = path.getNode();
+  const { key, node } = path;
 
   if (
     [
@@ -56,9 +52,9 @@ function needsParens(path) {
         case "staticlookup":
         case "offsetlookup":
         case "call":
-          return name === "what" && parent.what === node;
+          return key === "what";
         case "bin":
-          return parent.type === "**" && name === "left";
+          return parent.type === "**" && key === "left";
         default:
           return false;
       }
@@ -80,7 +76,7 @@ function needsParens(path) {
         case "nullsafepropertylookup":
         case "staticlookup":
         case "offsetlookup":
-          return name === "what" && parent.what === node;
+          return key === "what";
         case "bin": {
           const po = parent.type;
           const pp = getPrecedence(po);
@@ -95,7 +91,7 @@ function needsParens(path) {
             return true;
           }
 
-          if (pp === np && name === "right") {
+          if (pp === np && key === "right") {
             assert.strictEqual(parent.right, node);
 
             return true;
@@ -127,11 +123,7 @@ function needsParens(path) {
     case "staticlookup": {
       switch (parent.kind) {
         case "call":
-          return (
-            name === "what" &&
-            parent.what === node &&
-            node.parenthesizedExpression
-          );
+          return key === "what" && node.parenthesizedExpression;
 
         default:
           return false;
@@ -145,7 +137,7 @@ function needsParens(path) {
         case "staticlookup":
         case "offsetlookup":
         case "call":
-          return name === "what" && parent.what === node;
+          return key === "what";
         default:
           return false;
       }
@@ -157,10 +149,10 @@ function needsParens(path) {
         case "staticlookup":
         case "offsetlookup":
         case "call":
-          return name === "what" && parent.what === node;
+          return key === "what";
 
         case "retif":
-          return parent.test === node;
+          return key === "test";
 
         default:
           return !!(node.key || node.value);
@@ -195,7 +187,7 @@ function needsParens(path) {
         case "unary":
         case "bin":
         case "retif":
-          if (name === "test" && !parent.trueExpr) {
+          if (key === "test" && !parent.trueExpr) {
             return false;
           }
 
@@ -205,7 +197,7 @@ function needsParens(path) {
         case "staticlookup":
         case "offsetlookup":
         case "call":
-          return name === "what" && parent.what === node;
+          return key === "what";
 
         default:
           return false;
@@ -213,7 +205,7 @@ function needsParens(path) {
     case "closure":
       switch (parent.kind) {
         case "call":
-          return name === "what" && parent.what === node;
+          return key === "what";
 
         // https://github.com/prettier/plugin-php/issues/1675
         case "propertylookup":
@@ -243,7 +235,7 @@ function needsParens(path) {
             return false;
           }
 
-          return name === "what" && parent.what === node;
+          return key === "what";
         default:
           return false;
       }
@@ -255,4 +247,4 @@ function needsParens(path) {
   return false;
 }
 
-module.exports = needsParens;
+export default needsParens;

package/src/options.js

@@ -1,8 +1,6 @@
-"use strict";
-
 const CATEGORY_PHP = "PHP";
 
-module.exports = {
+export default {
   phpVersion: {
     since: "0.13.0",
     category: CATEGORY_PHP,

package/src/parser.js

@@ -1,7 +1,6 @@
-"use strict";
-const engine = require("php-parser");
+import engine from "php-parser";
 
-function parse(text, parsers, opts) {
+function parse(text, opts) {
   const inMarkdown = opts && opts.parentParser === "markdown";
 
   if (!text && inMarkdown) {
@@ -61,4 +60,4 @@ function parse(text, parsers, opts) {
   return ast;
 }
 
-module.exports = parse;
+export default parse;

package/src/pragma.js

@@ -1,7 +1,5 @@
-"use strict";
-
-const parse = require("./parser");
-const memoize = require("mem");
+import memoize from "mem";
+import parse from "./parser.js";
 
 const reHasPragma = /@prettier|@format/;
 
@@ -91,7 +89,4 @@ function insertPragma(text) {
 ${after}`;
 }
 
-module.exports = {
-  hasPragma,
-  insertPragma,
-};
+export { hasPragma, insertPragma };