Simplify

src/loc.js

@@ -1,6 +1,4 @@
-const loc = (prop) => (node) => {
- return node.loc && node.loc[prop] && node.loc[prop].offset;
-};
+const loc = (prop) => (node) => node.loc?.[prop]?.offset;
 
 export const locStart = loc("start");
 export const locEnd = loc("end");

src/printer.js

@@ -14,7 +14,6 @@ import { locStart, locEnd } from "./loc.js";
 import {
  getLast,
  getPenultimate,
- isLastStatement,
  lineShouldEndWithSemicolon,
  printNumber,
  shouldFlatten,
@@ -36,7 +35,6 @@ import {
  isDocNode,
  getAncestorNode,
  isReferenceLikeNode,
- getNextNode,
  normalizeMagicMethodName,
 } from "./util.js";
 
@@ -934,7 +932,7 @@ function printLines(path, options, print, childrenAttribute = "children") {
  const isInlineNode = childNode.kind === "inline";
  const printedPath = print();
  const canPrintBlankLine =
- !isLastStatement(path) &&
+ !isLastNode &&
  !isInlineNode &&
  (nextNode && nextNode.kind === "case"
  ? !isFirstChildrenInlineNode(path)
@@ -1102,15 +1100,15 @@ function printLines(path, options, print, childrenAttribute = "children") {
 }
 
 function printStatements(path, options, print, childrenAttribute) {
- return path.map(() => {
+ return path.map(({ node, isLast }) => {
  const parts = [];
 
  parts.push(print());
 
- if (!isLastStatement(path)) {
+ if (!isLast) {
  parts.push(hardline);
 
- if (isNextLineEmpty(options.originalText, locEnd(path.node))) {
+ if (isNextLineEmpty(options.originalText, locEnd(node))) {
  parts.push(hardline);
  }
  }
@@ -1607,13 +1605,11 @@ function printNode(path, options, print) {
  ];
  }
 
- const nextNode = getNextNode(path, node);
-
  return [
  "declare(",
  printDeclareArguments(path),
  ")",
- nextNode && nextNode.kind === "inline" ? "" : ";",
+ path.next?.kind === "inline" ? "" : ";",
  ];
  }
  case "declaredirective":

src/util.js

@@ -154,14 +154,6 @@ function getNodeListProperty(node) {
  return Array.isArray(body) ? body : null;
 }
 
-function getParentNodeListProperty(path) {
- const { parent } = path;
- if (!parent) {
- return null;
- }
- return getNodeListProperty(parent);
-}
-
 function getLast(arr) {
  if (arr.length > 0) {
  return arr[arr.length - 1];
@@ -176,15 +168,6 @@ function getPenultimate(arr) {
  return null;
 }
 
-function isLastStatement(path) {
- const body = getParentNodeListProperty(path);
- if (!body) {
- return true;
- }
- const { node } = path;
- return body[body.length - 1] === node;
-}
-
 function isFirstChildrenInlineNode(path) {
  const { node } = path;
 
@@ -499,23 +482,6 @@ function getAlignment(text) {
  return lastLine.length - lastLine.trimLeft().length + 1;
 }
 
-function getNextNode(path, node) {
- const { parent } = path;
- const children = getNodeListProperty(parent);
-
- if (!children) {
- return null;
- }
-
- const index = children.indexOf(node);
-
- if (index === -1) {
- return null;
- }
-
- return parent.children[index + 1];
-}
-
 function isProgramLikeNode(node) {
  return ["program", "declare", "namespace"].includes(node.kind);
 }
@@ -652,11 +618,8 @@ export {
  isBitwiseOperator,
  shouldFlatten,
  nodeHasStatement,
- getNodeListProperty,
- getParentNodeListProperty,
  getLast,
  getPenultimate,
- isLastStatement,
  getBodyFirstChild,
  lineShouldEndWithSemicolon,
  fileShouldEndWithHardline,
@@ -677,6 +640,5 @@ export {
  shouldPrintHardlineBeforeTrailingComma,
  isDocNode,
  getAncestorNode,
- getNextNode,
  normalizeMagicMethodName,
 };