prettier-plugin-java 2.5.0 → 2.6.1

package/LICENSE

@@ -1,5 +1,5 @@
 
-    Copyright 2018-2023 the original author or authors from the JHipster project
+    Copyright 2018-2024 the original author or authors from the JHipster project
 
                                  Apache License
                            Version 2.0, January 2004

package/package.json

@@ -1,17 +1,24 @@
 {
   "name": "prettier-plugin-java",
-  "version": "2.5.0",
+  "version": "2.6.1",
   "description": "Prettier Java Plugin",
-  "main": "dist/index.js",
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": "./src/index.d.ts",
+      "default": "./src/index.js"
+    }
+  },
   "files": [
     "dist"
   ],
+  "homepage": "https://jhipster.github.io/prettier-java/",
   "repository": "https://github.com/jhipster/prettier-java",
   "license": "Apache-2.0",
   "dependencies": {
-    "java-parser": "2.2.0",
+    "java-parser": "2.3.1",
     "lodash": "4.17.21",
-    "prettier": "3.0.3"
+    "prettier": "3.2.5"
   },
   "scripts": {
     "test": "yarn run test:unit && yarn run test:e2e-core",
@@ -21,16 +28,11 @@
     "test:e2e-jhipster2": "node scripts/clone-samples e2e-jhipster2 && mocha \"test/repository-test/jhipster-2-test.ts\"",
     "test:all": "yarn run test && yarn run test:e2e-jhipster1 && yarn run test:e2e-jhipster2",
     "clone-samples": "node scripts/clone-samples.js",
-    "build": "tsc -p tsconfig.build.json --outDir dist",
-    "build:watch": "tsc -p tsconfig.build.json --inlineSourceMap --outDir dist -w"
+    "build": "tsc",
+    "build:watch": "tsc --inlineSourceMap -w"
   },
   "devDependencies": {
-    "@babel/cli": "7.19.3",
-    "@babel/core": "7.20.2",
-    "@babel/preset-env": "7.20.2",
-    "@babel/preset-typescript": "7.18.6",
-    "@babel/register": "7.18.9",
-    "@chevrotain/types": "9.0.2",
+    "@chevrotain/types": "11.0.3",
     "@types/chai": "4.3.4",
     "@types/fs-extra": "9.0.13",
     "@types/jest": "29.2.3",
@@ -41,5 +43,5 @@
     "ts-node": "10.9.1",
     "typescript": "4.9.3"
   },
-  "gitHead": "00a8585d20c56d933ce4c89dcb532d9e98d1a4cf"
+  "gitHead": "8ee70accfbc3eecd5fb1c5da430701ca4765c994"
 }

package/dist/base-cst-printer.js

@@ -1,77 +0,0 @@
-"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.BaseCstPrettierPrinter = void 0;
-var java_parser_1 = require("java-parser");
-var format_comments_1 = require("./printers/comments/format-comments");
-var BaseCstPrettierPrinter = /** @class */ (function (_super) {
-    __extends(BaseCstPrettierPrinter, _super);
-    function BaseCstPrettierPrinter() {
-        var _this = _super.call(this) || this;
-        _this.mapVisit = function (elements, params) {
-            if (elements === undefined) {
-                // TODO: can optimize this by returning an immutable empty array singleton.
-                return [];
-            }
-            return elements.map(function (element) { return _this.visit(element, params); });
-        };
-        _this.getSingle = function (ctx) {
-            var ctxKeys = Object.keys(ctx);
-            if (ctxKeys.length !== 1) {
-                throw Error("Expecting single key CST ctx but found: <".concat(ctxKeys.length, "> keys"));
-            }
-            var singleElementKey = ctxKeys[0];
-            var singleElementValues = ctx[singleElementKey];
-            if ((singleElementValues === null || singleElementValues === void 0 ? void 0 : singleElementValues.length) !== 1) {
-                throw Error("Expecting single item in CST ctx key but found: <".concat(singleElementValues === null || singleElementValues === void 0 ? void 0 : singleElementValues.length, "> items"));
-            }
-            return singleElementValues[0];
-        };
-        // @ts-ignore
-        _this.orgVisit = _this.visit;
-        _this.visit = function (ctx, inParam) {
-            if (ctx === undefined) {
-                // empty Doc
-                return "";
-            }
-            var node = Array.isArray(ctx) ? ctx[0] : ctx;
-            if (node.ignore) {
-                try {
-                    var startOffset = node.leadingComments !== undefined
-                        ? node.leadingComments[0].startOffset
-                        : node.location.startOffset;
-                    var endOffset = (node.trailingComments !== undefined
-                        ? node.trailingComments[node.trailingComments.length - 1].endOffset
-                        : node.location.endOffset);
-                    return this.prettierOptions.originalText.substring(startOffset, endOffset + 1);
-                }
-                catch (e) {
-                    throw Error(e +
-                        "\nThere might be a problem with prettier-ignore, please report an issue on https://github.com/jhipster/prettier-java/issues");
-                }
-            }
-            return (0, format_comments_1.printNodeWithComments)(node, this.orgVisit.call(this, node, inParam));
-        };
-        _this.visitSingle = function (ctx, params) {
-            var singleElement = this.getSingle(ctx);
-            return this.visit(singleElement, params);
-        };
-        return _this;
-    }
-    return BaseCstPrettierPrinter;
-}(java_parser_1.BaseJavaCstVisitor));
-exports.BaseCstPrettierPrinter = BaseCstPrettierPrinter;

package/dist/cst-printer.js

@@ -1,37 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createPrettierDoc = void 0;
-var base_cst_printer_1 = require("./base-cst-printer");
-var arrays_1 = require("./printers/arrays");
-var blocks_and_statements_1 = require("./printers/blocks-and-statements");
-var classes_1 = require("./printers/classes");
-var expressions_1 = require("./printers/expressions");
-var interfaces_1 = require("./printers/interfaces");
-var lexical_structure_1 = require("./printers/lexical-structure");
-var names_1 = require("./printers/names");
-var types_values_and_variables_1 = require("./printers/types-values-and-variables");
-var packages_and_modules_1 = require("./printers/packages-and-modules");
-// Mixins for the win
-mixInMethods(arrays_1.ArraysPrettierVisitor, blocks_and_statements_1.BlocksAndStatementPrettierVisitor, classes_1.ClassesPrettierVisitor, expressions_1.ExpressionsPrettierVisitor, interfaces_1.InterfacesPrettierVisitor, lexical_structure_1.LexicalStructurePrettierVisitor, names_1.NamesPrettierVisitor, types_values_and_variables_1.TypesValuesAndVariablesPrettierVisitor, packages_and_modules_1.PackagesAndModulesPrettierVisitor);
-function mixInMethods() {
-    var classesToMix = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        classesToMix[_i] = arguments[_i];
-    }
-    classesToMix.forEach(function (from) {
-        var fromMethodsNames = Object.getOwnPropertyNames(from.prototype);
-        var fromPureMethodsName = fromMethodsNames.filter(function (methodName) { return methodName !== "constructor"; });
-        fromPureMethodsName.forEach(function (methodName) {
-            // @ts-ignore
-            base_cst_printer_1.BaseCstPrettierPrinter.prototype[methodName] = from.prototype[methodName];
-        });
-    });
-}
-var prettyPrinter = new base_cst_printer_1.BaseCstPrettierPrinter();
-// TODO: do we need the "path" and "print" arguments passed by prettier
-// see https://github.com/prettier/prettier/issues/5747
-function createPrettierDoc(cstNode, options) {
-    prettyPrinter.prettierOptions = options;
-    return prettyPrinter.visit(cstNode);
-}
-exports.createPrettierDoc = createPrettierDoc;

package/dist/index.js

@@ -1,67 +0,0 @@
-"use strict";
-var parse = require("./parser");
-var print = require("./printer");
-var options = require("./options");
-var languages = [
-    {
-        name: "Java",
-        parsers: ["java"],
-        group: "Java",
-        tmScope: "text.html.vue",
-        aceMode: "html",
-        codemirrorMode: "clike",
-        codemirrorMimeType: "text/x-java",
-        extensions: [".java"],
-        linguistLanguageId: 181,
-        vscodeLanguageIds: ["java"]
-    }
-];
-function locStart( /* node */) {
-    return -1;
-}
-function locEnd( /* node */) {
-    return -1;
-}
-function hasPragma(text) {
-    return /^\/\*\*[\n][\t\s]+\*\s@(prettier|format)[\n][\t\s]+\*\//.test(text);
-}
-var parsers = {
-    java: {
-        parse: parse,
-        astFormat: "java",
-        locStart: locStart,
-        locEnd: locEnd,
-        hasPragma: hasPragma
-    }
-};
-function canAttachComment(node) {
-    return node.ast_type && node.ast_type !== "comment";
-}
-function printComment(commentPath) {
-    var comment = commentPath.getValue();
-    switch (comment.ast_type) {
-        case "comment":
-            return comment.value;
-        default:
-            throw new Error("Not a comment: " + JSON.stringify(comment));
-    }
-}
-function clean(ast, newObj) {
-    delete newObj.lineno;
-    delete newObj.col_offset;
-}
-var printers = {
-    java: {
-        print: print,
-        // hasPrettierIgnore,
-        printComment: printComment,
-        canAttachComment: canAttachComment,
-        massageAstNode: clean
-    }
-};
-module.exports = {
-    languages: languages,
-    printers: printers,
-    parsers: parsers,
-    options: options
-};

package/dist/options.js

@@ -1,258 +0,0 @@
-"use strict";
-module.exports = {
-    entrypoint: {
-        type: "choice",
-        category: "Global",
-        default: "compilationUnit",
-        // sed -nr 's/.*\.RULE\(([^,]+),.*/\1/p' $(ls path/to/java-parser/rules/folder/*)
-        choices: [
-            { value: "arrayInitializer" },
-            { value: "variableInitializerList" },
-            { value: "block" },
-            { value: "blockStatements" },
-            { value: "blockStatement" },
-            { value: "localVariableDeclarationStatement" },
-            { value: "localVariableDeclaration" },
-            { value: "localVariableType" },
-            { value: "statement" },
-            { value: "statementWithoutTrailingSubstatement" },
-            { value: "emptyStatement" },
-            { value: "labeledStatement" },
-            { value: "expressionStatement" },
-            { value: "statementExpression" },
-            { value: "ifStatement" },
-            { value: "assertStatement" },
-            { value: "switchStatement" },
-            { value: "switchBlock" },
-            { value: "switchBlockStatementGroup" },
-            { value: "switchLabel" },
-            { value: "switchRule" },
-            { value: "caseConstant" },
-            { value: "whileStatement" },
-            { value: "doStatement" },
-            { value: "forStatement" },
-            { value: "basicForStatement" },
-            { value: "forInit" },
-            { value: "forUpdate" },
-            { value: "statementExpressionList" },
-            { value: "enhancedForStatement" },
-            { value: "breakStatement" },
-            { value: "continueStatement" },
-            { value: "returnStatement" },
-            { value: "throwStatement" },
-            { value: "synchronizedStatement" },
-            { value: "tryStatement" },
-            { value: "catches" },
-            { value: "catchClause" },
-            { value: "catchFormalParameter" },
-            { value: "catchType" },
-            { value: "finally" },
-            { value: "tryWithResourcesStatement" },
-            { value: "resourceSpecification" },
-            { value: "resourceList" },
-            { value: "resource" },
-            { value: "yieldStatement" },
-            { value: "variableAccess" },
-            { value: "isBasicForStatement" },
-            { value: "isLocalVariableDeclaration" },
-            { value: "isClassicSwitchLabel" },
-            { value: "classDeclaration" },
-            { value: "normalClassDeclaration" },
-            { value: "classModifier" },
-            { value: "typeParameters" },
-            { value: "typeParameterList" },
-            { value: "superclass" },
-            { value: "superinterfaces" },
-            { value: "interfaceTypeList" },
-            { value: "classPermits" },
-            { value: "classBody" },
-            { value: "classBodyDeclaration" },
-            { value: "classMemberDeclaration" },
-            { value: "fieldDeclaration" },
-            { value: "fieldModifier" },
-            { value: "variableDeclaratorList" },
-            { value: "variableDeclarator" },
-            { value: "variableDeclaratorId" },
-            { value: "variableInitializer" },
-            { value: "unannType" },
-            { value: "unannPrimitiveTypeWithOptionalDimsSuffix" },
-            { value: "unannPrimitiveType" },
-            { value: "unannReferenceType" },
-            { value: "unannClassOrInterfaceType" },
-            { value: "unannClassType" },
-            { value: "unannInterfaceType" },
-            { value: "unannTypeVariable" },
-            { value: "methodDeclaration" },
-            { value: "methodModifier" },
-            { value: "methodHeader" },
-            { value: "result" },
-            { value: "methodDeclarator" },
-            { value: "receiverParameter" },
-            { value: "formalParameterList" },
-            { value: "formalParameter" },
-            { value: "variableParaRegularParameter" },
-            { value: "variableArityParameter" },
-            { value: "variableModifier" },
-            { value: "throws" },
-            { value: "exceptionTypeList" },
-            { value: "exceptionType" },
-            { value: "methodBody" },
-            { value: "instanceInitializer" },
-            { value: "staticInitializer" },
-            { value: "constructorDeclaration" },
-            { value: "constructorModifier" },
-            { value: "constructorDeclarator" },
-            { value: "simpleTypeName" },
-            { value: "constructorBody" },
-            { value: "explicitConstructorInvocation" },
-            { value: "unqualifiedExplicitConstructorInvocation" },
-            { value: "qualifiedExplicitConstructorInvocation" },
-            { value: "enumDeclaration" },
-            { value: "enumBody" },
-            { value: "enumConstantList" },
-            { value: "enumConstant" },
-            { value: "enumConstantModifier" },
-            { value: "enumBodyDeclarations" },
-            { value: "recordDeclaration" },
-            { value: "recordHeader" },
-            { value: "recordComponentList" },
-            { value: "recordComponent" },
-            { value: "variableArityRecordComponent" },
-            { value: "recordComponentModifier" },
-            { value: "recordBody" },
-            { value: "recordBodyDeclaration" },
-            { value: "compactConstructorDeclaration" },
-            { value: "isClassDeclaration" },
-            { value: "identifyClassBodyDeclarationType" },
-            { value: "isDims" },
-            { value: "isCompactConstructorDeclaration" },
-            { value: "expression" },
-            { value: "lambdaExpression" },
-            { value: "lambdaParameters" },
-            { value: "lambdaParametersWithBraces" },
-            { value: "lambdaParameterList" },
-            { value: "inferredLambdaParameterList" },
-            { value: "explicitLambdaParameterList" },
-            { value: "lambdaParameter" },
-            { value: "regularLambdaParameter" },
-            { value: "lambdaParameterType" },
-            { value: "lambdaBody" },
-            { value: "ternaryExpression" },
-            { value: "binaryExpression" },
-            { value: "unaryExpression" },
-            { value: "unaryExpressionNotPlusMinus" },
-            { value: "primary" },
-            { value: "primaryPrefix" },
-            { value: "primarySuffix" },
-            { value: "fqnOrRefType" },
-            { value: "fqnOrRefTypePartRest" },
-            { value: "fqnOrRefTypePartCommon" },
-            { value: "fqnOrRefTypePartFirst" },
-            { value: "parenthesisExpression" },
-            { value: "castExpression" },
-            { value: "primitiveCastExpression" },
-            { value: "referenceTypeCastExpression" },
-            { value: "newExpression" },
-            { value: "unqualifiedClassInstanceCreationExpression" },
-            { value: "classOrInterfaceTypeToInstantiate" },
-            { value: "typeArgumentsOrDiamond" },
-            { value: "diamond" },
-            { value: "methodInvocationSuffix" },
-            { value: "argumentList" },
-            { value: "arrayCreationExpression" },
-            { value: "arrayCreationDefaultInitSuffix" },
-            { value: "arrayCreationExplicitInitSuffix" },
-            { value: "dimExprs" },
-            { value: "dimExpr" },
-            { value: "classLiteralSuffix" },
-            { value: "arrayAccessSuffix" },
-            { value: "methodReferenceSuffix" },
-            { value: "pattern" },
-            { value: "typePattern" },
-            { value: "recordPattern" },
-            { value: "componentPatternList" },
-            { value: "componentPattern" },
-            { value: "unnamedPattern" },
-            { value: "guard" },
-            { value: "identifyNewExpressionType" },
-            { value: "isLambdaExpression" },
-            { value: "isCastExpression" },
-            { value: "isPrimitiveCastExpression" },
-            { value: "isReferenceTypeCastExpression" },
-            { value: "isRefTypeInMethodRef" },
-            { value: "interfaceDeclaration" },
-            { value: "normalInterfaceDeclaration" },
-            { value: "interfaceModifier" },
-            { value: "extendsInterfaces" },
-            { value: "interfacePermits" },
-            { value: "interfaceBody" },
-            { value: "interfaceMemberDeclaration" },
-            { value: "constantDeclaration" },
-            { value: "constantModifier" },
-            { value: "interfaceMethodDeclaration" },
-            { value: "interfaceMethodModifier" },
-            { value: "annotationTypeDeclaration" },
-            { value: "annotationTypeBody" },
-            { value: "annotationTypeMemberDeclaration" },
-            { value: "annotationTypeElementDeclaration" },
-            { value: "annotationTypeElementModifier" },
-            { value: "defaultValue" },
-            { value: "annotation" },
-            { value: "elementValuePairList" },
-            { value: "elementValuePair" },
-            { value: "elementValue" },
-            { value: "elementValueArrayInitializer" },
-            { value: "elementValueList" },
-            { value: "identifyInterfaceBodyDeclarationType" },
-            { value: "identifyAnnotationBodyDeclarationType" },
-            { value: "isSimpleElementValueAnnotation" },
-            { value: "literal" },
-            { value: "integerLiteral" },
-            { value: "floatingPointLiteral" },
-            { value: "booleanLiteral" },
-            { value: "moduleName" },
-            { value: "packageName" },
-            { value: "typeName" },
-            { value: "expressionName" },
-            { value: "methodName" },
-            { value: "packageOrTypeName" },
-            { value: "ambiguousName" },
-            { value: "compilationUnit" },
-            { value: "ordinaryCompilationUnit" },
-            { value: "modularCompilationUnit" },
-            { value: "packageDeclaration" },
-            { value: "packageModifier" },
-            { value: "importDeclaration" },
-            { value: "typeDeclaration" },
-            { value: "moduleDeclaration" },
-            { value: "moduleDirective" },
-            { value: "requiresModuleDirective" },
-            { value: "exportsModuleDirective" },
-            { value: "opensModuleDirective" },
-            { value: "usesModuleDirective" },
-            { value: "providesModuleDirective" },
-            { value: "requiresModifier" },
-            { value: "isModuleCompilationUnit" },
-            { value: "primitiveType" },
-            { value: "numericType" },
-            { value: "integralType" },
-            { value: "floatingPointType" },
-            { value: "referenceType" },
-            { value: "classOrInterfaceType" },
-            { value: "classType" },
-            { value: "interfaceType" },
-            { value: "typeVariable" },
-            { value: "dims" },
-            { value: "typeParameter" },
-            { value: "typeParameterModifier" },
-            { value: "typeBound" },
-            { value: "additionalBound" },
-            { value: "typeArguments" },
-            { value: "typeArgumentList" },
-            { value: "typeArgument" },
-            { value: "wildcard" },
-            { value: "wildcardBounds" }
-        ],
-        description: "Prettify from the entrypoint, allowing to use prettier on snippet."
-    }
-};

package/dist/parser.js

@@ -1,6 +0,0 @@
-"use strict";
-var javaParser = require("java-parser");
-function parse(text, parsers, opts) {
-    return javaParser.parse(text, opts.entrypoint);
-}
-module.exports = parse;

package/dist/printer.js

@@ -1,8 +0,0 @@
-"use strict";
-var createPrettierDoc = require("./cst-printer").createPrettierDoc;
-// eslint-disable-next-line no-unused-vars
-function genericPrint(path, options, print) {
-    var node = path.getValue();
-    return createPrettierDoc(node, options);
-}
-module.exports = genericPrint;

package/dist/printers/arrays.js

@@ -1,49 +0,0 @@
-"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.ArraysPrettierVisitor = void 0;
-var printer_utils_1 = require("./printer-utils");
-var doc_1 = require("prettier/doc");
-var base_cst_printer_1 = require("../base-cst-printer");
-var line = doc_1.builders.line;
-var ArraysPrettierVisitor = /** @class */ (function (_super) {
-    __extends(ArraysPrettierVisitor, _super);
-    function ArraysPrettierVisitor() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    ArraysPrettierVisitor.prototype.arrayInitializer = function (ctx) {
-        var optionalVariableInitializerList = this.visit(ctx.variableInitializerList);
-        return (0, printer_utils_1.printArrayList)({
-            list: optionalVariableInitializerList,
-            extraComma: ctx.Comma,
-            LCurly: ctx.LCurly[0],
-            RCurly: ctx.RCurly[0],
-            trailingComma: this.prettierOptions.trailingComma
-        });
-    };
-    ArraysPrettierVisitor.prototype.variableInitializerList = function (ctx) {
-        var variableInitializers = this.mapVisit(ctx.variableInitializer);
-        var commas = ctx.Comma
-            ? ctx.Comma.map(function (comma) {
-                return (0, printer_utils_1.rejectAndConcat)([comma, line]);
-            })
-            : [];
-        return (0, printer_utils_1.rejectAndJoinSeps)(commas, variableInitializers);
-    };
-    return ArraysPrettierVisitor;
-}(base_cst_printer_1.BaseCstPrettierPrinter));
-exports.ArraysPrettierVisitor = ArraysPrettierVisitor;