prettier-plugin-java 2.5.0 → 2.6.0

package/dist/printers/packages-and-modules.js

@@ -1,198 +1,171 @@
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PackagesAndModulesPrettierVisitor = void 0;
-var prettier_builder_1 = require("./prettier-builder");
-var format_comments_1 = require("./comments/format-comments");
-var printer_utils_1 = require("./printer-utils");
-var doc_1 = require("prettier/doc");
-var base_cst_printer_1 = require("../base-cst-printer");
-var utils_1 = require("../types/utils");
-var line = doc_1.builders.line, hardline = doc_1.builders.hardline, indent = doc_1.builders.indent, group = doc_1.builders.group;
-var PackagesAndModulesPrettierVisitor = /** @class */ (function (_super) {
-    __extends(PackagesAndModulesPrettierVisitor, _super);
-    function PackagesAndModulesPrettierVisitor() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    PackagesAndModulesPrettierVisitor.prototype.compilationUnit = function (ctx) {
-        var compilationUnit = (0, utils_1.isOrdinaryCompilationUnitCtx)(ctx)
+import { concat, join } from "./prettier-builder.js";
+import { printTokenWithComments } from "./comments/format-comments.js";
+import { buildFqn, displaySemicolon, getBlankLinesSeparator, putIntoBraces, rejectAndConcat, rejectAndJoin, rejectAndJoinSeps, sortImports } from "./printer-utils.js";
+import { builders } from "prettier/doc";
+import { BaseCstPrettierPrinter } from "../base-cst-printer.js";
+import { isOrdinaryCompilationUnitCtx } from "../types/utils.js";
+const { line, hardline, indent, group } = builders;
+export class PackagesAndModulesPrettierVisitor extends BaseCstPrettierPrinter {
+    compilationUnit(ctx) {
+        const compilationUnit = isOrdinaryCompilationUnitCtx(ctx)
             ? ctx.ordinaryCompilationUnit
             : ctx.modularCompilationUnit;
-        return (0, prettier_builder_1.concat)([this.visit(compilationUnit[0]), line]);
-    };
-    PackagesAndModulesPrettierVisitor.prototype.ordinaryCompilationUnit = function (ctx) {
-        var packageDecl = this.visit(ctx.packageDeclaration);
-        var sortedImportsDecl = (0, printer_utils_1.sortImports)(ctx.importDeclaration);
-        var nonStaticImports = this.mapVisit(sortedImportsDecl.nonStaticImports);
-        var staticImports = this.mapVisit(sortedImportsDecl.staticImports);
-        var typesDecl = this.mapVisit(ctx.typeDeclaration);
+        return concat([this.visit(compilationUnit[0]), line]);
+    }
+    ordinaryCompilationUnit(ctx) {
+        const packageDecl = this.visit(ctx.packageDeclaration);
+        const sortedImportsDecl = sortImports(ctx.importDeclaration);
+        const nonStaticImports = this.mapVisit(sortedImportsDecl.nonStaticImports);
+        const staticImports = this.mapVisit(sortedImportsDecl.staticImports);
+        const typesDecl = this.mapVisit(ctx.typeDeclaration);
         // TODO: utility to add item+line (or multiple lines) but only if an item exists
-        return (0, printer_utils_1.rejectAndConcat)([
-            (0, printer_utils_1.rejectAndJoin)((0, prettier_builder_1.concat)([hardline, hardline]), [
+        return rejectAndConcat([
+            rejectAndJoin(concat([hardline, hardline]), [
                 packageDecl,
-                (0, printer_utils_1.rejectAndJoin)(hardline, staticImports),
-                (0, printer_utils_1.rejectAndJoin)(hardline, nonStaticImports),
-                (0, printer_utils_1.rejectAndJoin)((0, prettier_builder_1.concat)([hardline, hardline]), typesDecl)
+                rejectAndJoin(hardline, staticImports),
+                rejectAndJoin(hardline, nonStaticImports),
+                rejectAndJoin(concat([hardline, hardline]), typesDecl)
             ])
         ]);
-    };
-    PackagesAndModulesPrettierVisitor.prototype.modularCompilationUnit = function (ctx) {
-        var sortedImportsDecl = (0, printer_utils_1.sortImports)(ctx.importDeclaration);
-        var nonStaticImports = this.mapVisit(sortedImportsDecl.nonStaticImports);
-        var staticImports = this.mapVisit(sortedImportsDecl.staticImports);
-        var moduleDeclaration = this.visit(ctx.moduleDeclaration);
-        return (0, printer_utils_1.rejectAndConcat)([
-            (0, printer_utils_1.rejectAndJoin)((0, prettier_builder_1.concat)([hardline, hardline]), [
-                (0, printer_utils_1.rejectAndJoin)(hardline, staticImports),
-                (0, printer_utils_1.rejectAndJoin)(hardline, nonStaticImports),
+    }
+    modularCompilationUnit(ctx) {
+        const sortedImportsDecl = sortImports(ctx.importDeclaration);
+        const nonStaticImports = this.mapVisit(sortedImportsDecl.nonStaticImports);
+        const staticImports = this.mapVisit(sortedImportsDecl.staticImports);
+        const moduleDeclaration = this.visit(ctx.moduleDeclaration);
+        return rejectAndConcat([
+            rejectAndJoin(concat([hardline, hardline]), [
+                rejectAndJoin(hardline, staticImports),
+                rejectAndJoin(hardline, nonStaticImports),
                 moduleDeclaration
             ])
         ]);
-    };
-    PackagesAndModulesPrettierVisitor.prototype.packageDeclaration = function (ctx) {
-        var modifiers = this.mapVisit(ctx.packageModifier);
-        var name = (0, printer_utils_1.buildFqn)(ctx.Identifier, ctx.Dot);
-        return (0, printer_utils_1.rejectAndJoin)(hardline, [
-            (0, printer_utils_1.rejectAndJoin)(hardline, modifiers),
-            (0, prettier_builder_1.concat)([ctx.Package[0], " ", name, ctx.Semicolon[0]])
+    }
+    packageDeclaration(ctx) {
+        const modifiers = this.mapVisit(ctx.packageModifier);
+        const name = buildFqn(ctx.Identifier, ctx.Dot);
+        return rejectAndJoin(hardline, [
+            rejectAndJoin(hardline, modifiers),
+            concat([ctx.Package[0], " ", name, ctx.Semicolon[0]])
         ]);
-    };
-    PackagesAndModulesPrettierVisitor.prototype.packageModifier = function (ctx) {
+    }
+    packageModifier(ctx) {
         return this.visitSingle(ctx);
-    };
-    PackagesAndModulesPrettierVisitor.prototype.importDeclaration = function (ctx) {
+    }
+    importDeclaration(ctx) {
         if (ctx.emptyStatement !== undefined) {
             return this.visit(ctx.emptyStatement);
         }
-        var optionalStatic = ctx.Static ? ctx.Static[0] : "";
-        var packageOrTypeName = this.visit(ctx.packageOrTypeName);
-        var optionalDotStar = ctx.Dot ? (0, prettier_builder_1.concat)([ctx.Dot[0], ctx.Star[0]]) : "";
-        return (0, printer_utils_1.rejectAndJoin)(" ", [
+        const optionalStatic = ctx.Static ? ctx.Static[0] : "";
+        const packageOrTypeName = this.visit(ctx.packageOrTypeName);
+        const optionalDotStar = ctx.Dot ? concat([ctx.Dot[0], ctx.Star[0]]) : "";
+        return rejectAndJoin(" ", [
             ctx.Import[0],
             optionalStatic,
-            (0, printer_utils_1.rejectAndConcat)([packageOrTypeName, optionalDotStar, ctx.Semicolon[0]])
+            rejectAndConcat([packageOrTypeName, optionalDotStar, ctx.Semicolon[0]])
         ]);
-    };
-    PackagesAndModulesPrettierVisitor.prototype.typeDeclaration = function (ctx) {
+    }
+    typeDeclaration(ctx) {
         if (ctx.Semicolon) {
-            return (0, printer_utils_1.displaySemicolon)(ctx.Semicolon[0]);
+            return displaySemicolon(ctx.Semicolon[0]);
         }
         return this.visitSingle(ctx);
-    };
-    PackagesAndModulesPrettierVisitor.prototype.moduleDeclaration = function (ctx) {
-        var annotations = this.mapVisit(ctx.annotation);
-        var optionalOpen = ctx.Open ? ctx.Open[0] : "";
-        var name = (0, printer_utils_1.buildFqn)(ctx.Identifier, ctx.Dot);
-        var moduleDirectives = this.mapVisit(ctx.moduleDirective);
-        var content = (0, printer_utils_1.rejectAndJoinSeps)((0, printer_utils_1.getBlankLinesSeparator)(ctx.moduleDirective), moduleDirectives);
-        return (0, printer_utils_1.rejectAndJoin)(" ", [
-            (0, prettier_builder_1.join)(" ", annotations),
+    }
+    moduleDeclaration(ctx) {
+        const annotations = this.mapVisit(ctx.annotation);
+        const optionalOpen = ctx.Open ? ctx.Open[0] : "";
+        const name = buildFqn(ctx.Identifier, ctx.Dot);
+        const moduleDirectives = this.mapVisit(ctx.moduleDirective);
+        const content = rejectAndJoinSeps(getBlankLinesSeparator(ctx.moduleDirective), moduleDirectives);
+        return rejectAndJoin(" ", [
+            join(" ", annotations),
             optionalOpen,
             ctx.Module[0],
             name,
-            (0, printer_utils_1.putIntoBraces)(content, hardline, ctx.LCurly[0], ctx.RCurly[0])
+            putIntoBraces(content, hardline, ctx.LCurly[0], ctx.RCurly[0])
         ]);
-    };
-    PackagesAndModulesPrettierVisitor.prototype.moduleDirective = function (ctx) {
+    }
+    moduleDirective(ctx) {
         return this.visitSingle(ctx);
-    };
-    PackagesAndModulesPrettierVisitor.prototype.requiresModuleDirective = function (ctx) {
-        var modifiers = this.mapVisit(ctx.requiresModifier);
-        var moduleName = this.visit(ctx.moduleName);
-        return (0, printer_utils_1.rejectAndJoin)(" ", [
+    }
+    requiresModuleDirective(ctx) {
+        const modifiers = this.mapVisit(ctx.requiresModifier);
+        const moduleName = this.visit(ctx.moduleName);
+        return rejectAndJoin(" ", [
             ctx.Requires[0],
-            (0, prettier_builder_1.join)(" ", modifiers),
-            (0, prettier_builder_1.concat)([moduleName, ctx.Semicolon[0]])
+            join(" ", modifiers),
+            concat([moduleName, ctx.Semicolon[0]])
         ]);
-    };
-    PackagesAndModulesPrettierVisitor.prototype.exportsModuleDirective = function (ctx) {
-        var packageName = this.visit(ctx.packageName);
-        var moduleNames = this.mapVisit(ctx.moduleName);
-        var commas = ctx.Comma ? ctx.Comma.map(function (elt) { return (0, prettier_builder_1.concat)([elt, line]); }) : [];
+    }
+    exportsModuleDirective(ctx) {
+        const packageName = this.visit(ctx.packageName);
+        const moduleNames = this.mapVisit(ctx.moduleName);
+        const commas = ctx.Comma ? ctx.Comma.map(elt => concat([elt, line])) : [];
         if (ctx.To) {
-            return group((0, printer_utils_1.rejectAndConcat)([
-                indent((0, printer_utils_1.rejectAndJoin)(line, [
-                    (0, printer_utils_1.rejectAndJoin)(" ", [ctx.Exports[0], packageName]),
-                    group(indent((0, printer_utils_1.rejectAndJoin)(line, [
+            return group(rejectAndConcat([
+                indent(rejectAndJoin(line, [
+                    rejectAndJoin(" ", [ctx.Exports[0], packageName]),
+                    group(indent(rejectAndJoin(line, [
                         ctx.To[0],
-                        (0, printer_utils_1.rejectAndJoinSeps)(commas, moduleNames)
+                        rejectAndJoinSeps(commas, moduleNames)
                     ])))
                 ])),
                 ctx.Semicolon[0]
             ]));
         }
-        return (0, printer_utils_1.rejectAndConcat)([
-            (0, prettier_builder_1.concat)([ctx.Exports[0], " "]),
+        return rejectAndConcat([
+            concat([ctx.Exports[0], " "]),
             packageName,
             ctx.Semicolon[0]
         ]);
-    };
-    PackagesAndModulesPrettierVisitor.prototype.opensModuleDirective = function (ctx) {
-        var packageName = this.visit(ctx.packageName);
-        var to = ctx.To ? ctx.To[0] : "";
-        var moduleNames = this.mapVisit(ctx.moduleName);
-        var commas = ctx.Comma ? ctx.Comma.map(function (elt) { return (0, prettier_builder_1.concat)([elt, line]); }) : [];
+    }
+    opensModuleDirective(ctx) {
+        const packageName = this.visit(ctx.packageName);
+        const to = ctx.To ? ctx.To[0] : "";
+        const moduleNames = this.mapVisit(ctx.moduleName);
+        const commas = ctx.Comma ? ctx.Comma.map(elt => concat([elt, line])) : [];
         if (ctx.To) {
-            return group((0, printer_utils_1.rejectAndConcat)([
-                indent((0, printer_utils_1.rejectAndJoin)(line, [
-                    (0, printer_utils_1.rejectAndJoin)(" ", [ctx.Opens[0], packageName]),
-                    group(indent((0, printer_utils_1.rejectAndJoin)(line, [
+            return group(rejectAndConcat([
+                indent(rejectAndJoin(line, [
+                    rejectAndJoin(" ", [ctx.Opens[0], packageName]),
+                    group(indent(rejectAndJoin(line, [
                         ctx.To[0],
-                        (0, printer_utils_1.rejectAndJoinSeps)(commas, moduleNames)
+                        rejectAndJoinSeps(commas, moduleNames)
                     ])))
                 ])),
                 ctx.Semicolon[0]
             ]));
         }
-        return (0, printer_utils_1.rejectAndConcat)([
-            (0, prettier_builder_1.concat)([ctx.Opens[0], " "]),
+        return rejectAndConcat([
+            concat([ctx.Opens[0], " "]),
             packageName,
             ctx.Semicolon[0]
         ]);
-    };
-    PackagesAndModulesPrettierVisitor.prototype.usesModuleDirective = function (ctx) {
-        var typeName = this.visit(ctx.typeName);
-        return (0, printer_utils_1.rejectAndConcat)([
-            (0, prettier_builder_1.concat)([ctx.Uses[0], " "]),
+    }
+    usesModuleDirective(ctx) {
+        const typeName = this.visit(ctx.typeName);
+        return rejectAndConcat([
+            concat([ctx.Uses[0], " "]),
             typeName,
             ctx.Semicolon[0]
         ]);
-    };
-    PackagesAndModulesPrettierVisitor.prototype.providesModuleDirective = function (ctx) {
-        var firstTypeName = this.visit(ctx.typeName[0]);
-        var otherTypeNames = this.mapVisit(ctx.typeName.slice(1));
-        var commas = ctx.Comma ? ctx.Comma.map(function (elt) { return (0, prettier_builder_1.concat)([elt, line]); }) : [];
-        return group((0, printer_utils_1.rejectAndConcat)([
-            indent((0, printer_utils_1.rejectAndJoin)(line, [
-                (0, printer_utils_1.rejectAndJoin)(" ", [ctx.Provides[0], firstTypeName]),
-                group(indent((0, printer_utils_1.rejectAndJoin)(line, [
+    }
+    providesModuleDirective(ctx) {
+        const firstTypeName = this.visit(ctx.typeName[0]);
+        const otherTypeNames = this.mapVisit(ctx.typeName.slice(1));
+        const commas = ctx.Comma ? ctx.Comma.map(elt => concat([elt, line])) : [];
+        return group(rejectAndConcat([
+            indent(rejectAndJoin(line, [
+                rejectAndJoin(" ", [ctx.Provides[0], firstTypeName]),
+                group(indent(rejectAndJoin(line, [
                     ctx.With[0],
-                    (0, printer_utils_1.rejectAndJoinSeps)(commas, otherTypeNames)
+                    rejectAndJoinSeps(commas, otherTypeNames)
                 ])))
             ])),
             ctx.Semicolon[0]
         ]));
-    };
-    PackagesAndModulesPrettierVisitor.prototype.requiresModifier = function (ctx) {
-        return (0, format_comments_1.printTokenWithComments)(this.getSingle(ctx));
-    };
-    PackagesAndModulesPrettierVisitor.prototype.isModuleCompilationUnit = function () {
-        return "isModuleCompilationUnit";
-    };
-    return PackagesAndModulesPrettierVisitor;
-}(base_cst_printer_1.BaseCstPrettierPrinter));
-exports.PackagesAndModulesPrettierVisitor = PackagesAndModulesPrettierVisitor;
+    }
+    requiresModifier(ctx) {
+        return printTokenWithComments(this.getSingle(ctx));
+    }
+}

package/dist/printers/prettier-builder.js

@@ -1,55 +1,45 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.indentIfBreak = exports.ifBreak = exports.dedent = exports.indent = exports.fill = exports.group = exports.join = exports.concat = void 0;
-var doc_1 = require("prettier/doc");
-var processComments = require("./comments/format-comments").processComments;
+import { builders } from "prettier/doc";
+import * as formatComments from "./comments/format-comments.js";
+const processComments = formatComments.processComments;
 /*
  * ------------------------------------------------------------------
  * Wraps the Prettier builder functions to print tokens with comments
  * ------------------------------------------------------------------
  */
-function concat(docs) {
-    var concatenation = processComments(docs);
+export function concat(docs) {
+    const concatenation = processComments(docs);
     if (!Array.isArray(docs)) {
         return "";
     }
     return concatenation;
 }
-exports.concat = concat;
-function join(sep, docs) {
-    return doc_1.builders.join(processComments(sep), processComments(docs));
+export function join(sep, docs) {
+    return builders.join(processComments(sep), processComments(docs));
 }
-exports.join = join;
-function group(docs, opts) {
-    var group = doc_1.builders.group(processComments(docs), opts);
+export function group(docs, opts) {
+    const group = builders.group(processComments(docs), opts);
     return group.contents === undefined ? "" : group;
 }
-exports.group = group;
-function fill(docs) {
-    return doc_1.builders.fill(processComments(docs));
+export function fill(docs) {
+    return builders.fill(processComments(docs));
 }
-exports.fill = fill;
-function indent(doc) {
-    var processedDoc = processComments(doc);
+export function indent(doc) {
+    const processedDoc = processComments(doc);
     if (processedDoc.length === 0) {
         return "";
     }
-    return doc_1.builders.indent(processedDoc);
+    return builders.indent(processedDoc);
 }
-exports.indent = indent;
-function dedent(doc) {
-    var processedDoc = processComments(doc);
+export function dedent(doc) {
+    const processedDoc = processComments(doc);
     if (processedDoc.length === 0) {
         return "";
     }
-    return doc_1.builders.dedent(processComments(doc));
+    return builders.dedent(processComments(doc));
 }
-exports.dedent = dedent;
-function ifBreak(breakContents, flatContents) {
-    return doc_1.builders.ifBreak(processComments(breakContents), processComments(flatContents));
+export function ifBreak(breakContents, flatContents) {
+    return builders.ifBreak(processComments(breakContents), processComments(flatContents));
 }
-exports.ifBreak = ifBreak;
-function indentIfBreak(contents, opts) {
-    return doc_1.builders.indentIfBreak(processComments(contents), opts);
+export function indentIfBreak(contents, opts) {
+    return builders.indentIfBreak(processComments(contents), opts);
 }
-exports.indentIfBreak = indentIfBreak;