From cf679a8370207accc79bcfaecfecf5bd983ee3cf Mon Sep 17 00:00:00 2001 From: Jordan Kiesel Date: Sat, 14 Nov 2026 18:52:54 -0700 Subject: [PATCH] fix: update dependencies, namely tree-sitter-java-orchard to resolve bugs --- package.json | 26 ++++---- src/comments.ts | 9 ++- src/node-types.ts | 82 +++++++++++++---------- src/printers/blocks-and-statements.ts | 6 ++ src/printers/expressions.ts | 2 +- src/printers/helpers.ts | 5 +- src/printers/lexical-structure.ts | 42 ++++++------ test/unit-test/text-blocks/_input.java | 18 ++++++ test/unit-test/text-blocks/_output.java | 18 ++++++ yarn.lock | 86 +++++++++++++++---------- 10 files changed, 186 insertions(+), 108 deletions(-) diff --git a/package.json b/package.json index 1cd6f279..8b196abc 100644 --- a/package.json +++ b/package.json @@ -58,24 +58,24 @@ "devDependencies": { "@eslint/js": "^10.0.1", "@types/chai": "^5.2.3", - "@types/emscripten": "^1.41.5", + "@types/emscripten": "^1.41.6", "@types/mocha": "^10.0.10", - "@types/node": "^26.0.0", - "chai": "^6.2.2", - "eslint": "^10.1.0", - "globals": "^17.4.0", + "@types/node": "^26.6.6", + "chai": "^6.3.0", + "eslint": "^10.15.0", + "globals": "^17.14.0", "husky": "^9.1.7", - "lerna": "^10.0.0", - "lint-staged": "^17.0.2", + "lerna": "^10.1.1", + "lint-staged": "^17.6.0", "mitata": "^1.0.34", - "mocha": "^12.0.0", - "postcss": "^8.5.15", - "prettier": "^3.8.1", + "mocha": "^12.0.3", + "postcss": "^8.5.33", + "prettier": "^3.10.1", "prettier-plugin-css-order": "^2.2.0", - "tree-sitter-java-orchard": "0.5.23", - "tsdown": "^0.23.0", + "tree-sitter-java-orchard": "0.5.25", + "tsdown": "^0.23.7", "typescript": "^6.0.3", - "typescript-eslint": "^8.57.1" + "typescript-eslint": "^8.72.2" }, "peerDependencies": { "prettier": "^3.0.0" diff --git a/src/comments.ts b/src/comments.ts index 84dd1fcf..def3ab94 100644 --- a/src/comments.ts +++ b/src/comments.ts @@ -73,11 +73,14 @@ export function canAttachComment(node: SyntaxNode, ancestors: SyntaxNode[]) { } switch (node.type) { case SyntaxType.EnumBodyDeclarations: - case SyntaxType.EscapeSequence: case SyntaxType.Modifier: - case SyntaxType.MultilineStringFragment: case SyntaxType.Program: - case SyntaxType.StringFragment: + case SyntaxType.StringTemplateBegin: + case SyntaxType.StringTemplateEnd: + case SyntaxType.StringTemplateMid: + case SyntaxType.TextBlockTemplateBegin: + case SyntaxType.TextBlockTemplateEnd: + case SyntaxType.TextBlockTemplateMid: case SyntaxType.Visibility: return false; case SyntaxType.ParenthesizedExpression: { diff --git a/src/node-types.ts b/src/node-types.ts index 9fdcf587..5a2b2b6f 100644 --- a/src/node-types.ts +++ b/src/node-types.ts @@ -120,7 +120,6 @@ export const enum SyntaxType { Modifiers = "modifiers", ModuleBody = "module_body", ModuleDeclaration = "module_declaration", - MultilineStringFragment = "multiline_string_fragment", ObjectCreationExpression = "object_creation_expression", OpensModuleDirective = "opens_module_directive", PackageDeclaration = "package_declaration", @@ -143,7 +142,6 @@ export const enum SyntaxType { ScopedTypeIdentifier = "scoped_type_identifier", SpreadParameter = "spread_parameter", StaticInitializer = "static_initializer", - StringInterpolation = "string_interpolation", StringLiteral = "string_literal", SuperInterfaces = "super_interfaces", Superclass = "superclass", @@ -179,7 +177,6 @@ export const enum SyntaxType { CharacterLiteral = "character_literal", DecimalFloatingPointLiteral = "decimal_floating_point_literal", DecimalIntegerLiteral = "decimal_integer_literal", - EscapeSequence = "escape_sequence", False = "false", HexFloatingPointLiteral = "hex_floating_point_literal", HexIntegerLiteral = "hex_integer_literal", @@ -187,8 +184,13 @@ export const enum SyntaxType { LineComment = "line_comment", NullLiteral = "null_literal", OctalIntegerLiteral = "octal_integer_literal", - StringFragment = "string_fragment", + StringTemplateBegin = "string_template_begin", + StringTemplateEnd = "string_template_end", + StringTemplateMid = "string_template_mid", Super = "super", + TextBlockTemplateBegin = "text_block_template_begin", + TextBlockTemplateEnd = "text_block_template_end", + TextBlockTemplateMid = "text_block_template_mid", This = "this", True = "true", TypeIdentifier = "type_identifier", @@ -203,8 +205,6 @@ export type NamedType = Exclude; export type UnnamedType = | "!" | "!=" - | '"' - | '"""' | "%" | "%=" | "&" @@ -243,9 +243,7 @@ export type UnnamedType = | ">>>=" | "?" | "@" - | "@interface" | "[" - | "\\{" | "]" | "^" | "^=" @@ -415,7 +413,6 @@ export type SyntaxNode = | ModifiersNode | ModuleBodyNode | ModuleDeclarationNode - | MultilineStringFragmentNode | ObjectCreationExpressionNode | OpensModuleDirectiveNode | PackageDeclarationNode @@ -438,7 +435,6 @@ export type SyntaxNode = | ScopedTypeIdentifierNode | SpreadParameterNode | StaticInitializerNode - | StringInterpolationNode | StringLiteralNode | SuperInterfacesNode | SuperclassNode @@ -470,8 +466,6 @@ export type SyntaxNode = | YieldStatementNode | UnnamedNode<"!"> | UnnamedNode<"!="> - | UnnamedNode<'"'> - | UnnamedNode<'"""'> | UnnamedNode<"%"> | UnnamedNode<"%="> | UnnamedNode<"&"> @@ -510,9 +504,7 @@ export type SyntaxNode = | UnnamedNode<">>>="> | UnnamedNode<"?"> | UnnamedNode<"@"> - | UnnamedNode<"@interface"> | UnnamedNode<"["> - | UnnamedNode<"\\{"> | UnnamedNode<"]"> | UnnamedNode<"^"> | UnnamedNode<"^="> @@ -535,7 +527,6 @@ export type SyntaxNode = | UnnamedNode<"double"> | UnnamedNode<"else"> | UnnamedNode<"enum"> - | EscapeSequenceNode | UnnamedNode<"exports"> | UnnamedNode<"extends"> | FalseNode @@ -574,10 +565,15 @@ export type SyntaxNode = | UnnamedNode<"short"> | UnnamedNode<"static"> | UnnamedNode<"strictfp"> - | StringFragmentNode + | StringTemplateBeginNode + | StringTemplateEndNode + | StringTemplateMidNode | SuperNode | UnnamedNode<"switch"> | UnnamedNode<"synchronized"> + | TextBlockTemplateBeginNode + | TextBlockTemplateEndNode + | TextBlockTemplateMidNode | ThisNode | UnnamedNode<"throw"> | UnnamedNode<"throws"> @@ -767,7 +763,11 @@ export interface AssertStatementNode extends NamedNodeBase { export interface AssignmentExpressionNode extends NamedNodeBase { type: SyntaxType.AssignmentExpression; - leftNode: ArrayAccessNode | FieldAccessNode | IdentifierNode; + leftNode: + | ArrayAccessNode + | FieldAccessNode + | IdentifierNode + | ParenthesizedExpressionNode; operatorNode: | UnnamedNode<"%="> | UnnamedNode<"&="> @@ -824,8 +824,16 @@ export interface BreakStatementNode extends NamedNodeBase { export interface CastExpressionNode extends NamedNodeBase { type: SyntaxType.CastExpression; - typeNodes: TypeNode[]; - valueNode: ExpressionNode; + typeNodes: ( + TypeNode | BooleanTypeNode | FloatingPointTypeNode | IntegralTypeNode + )[]; + valueNode: + | CastExpressionNode + | LambdaExpressionNode + | ExpressionNode + | SwitchExpressionNode + | UnaryExpressionNode + | UpdateExpressionNode; } export interface CatchClauseNode extends NamedNodeBase { @@ -1118,10 +1126,6 @@ export interface ModuleDeclarationNode extends NamedNodeBase { nameNode: IdentifierNode | ScopedIdentifierNode; } -export interface MultilineStringFragmentNode extends NamedNodeBase { - type: SyntaxType.MultilineStringFragment; -} - export interface ObjectCreationExpressionNode extends NamedNodeBase { type: SyntaxType.ObjectCreationExpression; argumentsNode: ArgumentListNode; @@ -1233,10 +1237,6 @@ export interface StaticInitializerNode extends NamedNodeBase { type: SyntaxType.StaticInitializer; } -export interface StringInterpolationNode extends NamedNodeBase { - type: SyntaxType.StringInterpolation; -} - export interface StringLiteralNode extends NamedNodeBase { type: SyntaxType.StringLiteral; } @@ -1397,10 +1397,6 @@ export interface DecimalIntegerLiteralNode extends NamedNodeBase { type: SyntaxType.DecimalIntegerLiteral; } -export interface EscapeSequenceNode extends NamedNodeBase { - type: SyntaxType.EscapeSequence; -} - export interface FalseNode extends NamedNodeBase { type: SyntaxType.False; } @@ -1429,14 +1425,34 @@ export interface OctalIntegerLiteralNode extends NamedNodeBase { type: SyntaxType.OctalIntegerLiteral; } -export interface StringFragmentNode extends NamedNodeBase { - type: SyntaxType.StringFragment; +export interface StringTemplateBeginNode extends NamedNodeBase { + type: SyntaxType.StringTemplateBegin; +} + +export interface StringTemplateEndNode extends NamedNodeBase { + type: SyntaxType.StringTemplateEnd; +} + +export interface StringTemplateMidNode extends NamedNodeBase { + type: SyntaxType.StringTemplateMid; } export interface SuperNode extends NamedNodeBase { type: SyntaxType.Super; } +export interface TextBlockTemplateBeginNode extends NamedNodeBase { + type: SyntaxType.TextBlockTemplateBegin; +} + +export interface TextBlockTemplateEndNode extends NamedNodeBase { + type: SyntaxType.TextBlockTemplateEnd; +} + +export interface TextBlockTemplateMidNode extends NamedNodeBase { + type: SyntaxType.TextBlockTemplateMid; +} + export interface ThisNode extends NamedNodeBase { type: SyntaxType.This; } diff --git a/src/printers/blocks-and-statements.ts b/src/printers/blocks-and-statements.ts index 39573b33..45d4ab20 100644 --- a/src/printers/blocks-and-statements.ts +++ b/src/printers/blocks-and-statements.ts @@ -139,6 +139,12 @@ export default { values.push(print(child)); } }, "namedChildren"); + const hasDefault = path.node.children.some( + ({ type }) => type === "default" + ); + if (hasDefault) { + values.push("default"); + } const hasMultipleValues = values.length > 1; const label = hasMultipleValues diff --git a/src/printers/expressions.ts b/src/printers/expressions.ts index 37a7c0ee..dd5816d6 100644 --- a/src/printers/expressions.ts +++ b/src/printers/expressions.ts @@ -1648,7 +1648,7 @@ function shouldExtraIndentForTernaryExpression( function isStringLiteral(node: NamedNode) { return ( - node.type === SyntaxType.StringLiteral && node.children[0].value === '"' + node.type === SyntaxType.StringLiteral && !node.value.startsWith('"""') ); } diff --git a/src/printers/helpers.ts b/src/printers/helpers.ts index 938a4952..146cc73d 100644 --- a/src/printers/helpers.ts +++ b/src/printers/helpers.ts @@ -633,10 +633,7 @@ export function embedTextBlock( path: NamedNodePath, options: Options ) { - const hasInterpolations = path.node.namedChildren.some( - ({ type }) => type === SyntaxType.StringInterpolation - ); - if (hasInterpolations || path.node.children[0].value === '"') { + if (path.node.children.length > 0 || !path.node.value.startsWith('"""')) { return null; } diff --git a/src/printers/lexical-structure.ts b/src/printers/lexical-structure.ts index 62852316..855f0f16 100644 --- a/src/printers/lexical-structure.ts +++ b/src/printers/lexical-structure.ts @@ -11,32 +11,32 @@ const { group, hardline, indent, join, softline } = builders; export default { string_literal(path, print) { - const hasInterpolations = path.node.namedChildren.some( - ({ type }) => type === SyntaxType.StringInterpolation - ); - if (hasInterpolations || path.node.children[0].value === '"') { - return path.map(print, "children"); + if (path.node.children.length > 0) { + return path.map( + child => + child.node.type === SyntaxType.BinaryExpression || + child.node.type === SyntaxType.TernaryExpression + ? group([indent([softline, print(child)]), softline]) + : print(child), + "children" + ); } - return printTextBlock( - join(hardline, textBlockContents(path.node).split("\n")) - ); - }, - - string_fragment: printValue, - multiline_string_fragment: printValue, - - string_interpolation(path, print) { - const expressionType = path.node.namedChildren[0].type; - const expression = path.call(print, "namedChildren", 0); + if (path.node.value.startsWith('"""')) { + return printTextBlock( + join(hardline, textBlockContents(path.node).split("\n")) + ); + } - return expressionType === SyntaxType.BinaryExpression || - expressionType === SyntaxType.TernaryExpression - ? group(["\\{", indent([softline, expression]), softline, "}"]) - : ["\\{", expression, "}"]; + return path.node.value; }, - escape_sequence: printValue, + string_template_begin: printValue, + string_template_mid: printValue, + string_template_end: printValue, + text_block_template_begin: printValue, + text_block_template_mid: printValue, + text_block_template_end: printValue, character_literal: printValue, binary_integer_literal: printValue, decimal_integer_literal: printValue, diff --git a/test/unit-test/text-blocks/_input.java b/test/unit-test/text-blocks/_input.java index 9f474a22..66b47a63 100644 --- a/test/unit-test/text-blocks/_input.java +++ b/test/unit-test/text-blocks/_input.java @@ -159,4 +159,22 @@ void unsupported() { function f(){let i=0;} """; } + + void comments() { + """ + /* a "b" c */ + x"""; + + """ + // a "b + x"""; + + """ + /* a \\n b */ + x"""; + + """ + // a \\ b + x"""; + } } diff --git a/test/unit-test/text-blocks/_output.java b/test/unit-test/text-blocks/_output.java index 02b6608b..f794229b 100644 --- a/test/unit-test/text-blocks/_output.java +++ b/test/unit-test/text-blocks/_output.java @@ -172,4 +172,22 @@ void unsupported() { function f(){let i=0;} """; } + + void comments() { + """ + /* a "b" c */ + x"""; + + """ + // a "b + x"""; + + """ + /* a \\n b */ + x"""; + + """ + // a \\ b + x"""; + } } diff --git a/yarn.lock b/yarn.lock index 287ced3c..fdb6682a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -153,14 +153,14 @@ resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.2.tgz#bccdf615bcf7b6e8db830ec0b8d21c9a25de597b" integrity sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew== -"@eslint/config-array@^0.23.5": - version "0.23.5" - resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.23.5.tgz#56e86d243049195d8acc0c06a1b3dfdc3fa3de95" - integrity sha512-Y3kKLvC1dvTOT+oGlqNQ1XLqK6D1HU2YXPc52NmAlJZbMMWDzGYXMiPRJ8TYD39muD/OTjlZmNJ4ib7dvSrMBA== +"@eslint/config-array@^0.23.6": + version "0.23.6" + resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.23.6.tgz#cf69071fd9dc0950e90c352e2716fa8a26e631a4" + integrity sha512-WrTH7nioI9QPY4NZGnsywmecswJdgeq4BCM76qok9VgjTO29ZgUzUvcuJLVPYVQM4uDbaPBU0M33R9DIxI8X3w== dependencies: "@eslint/object-schema" "^3.0.5" debug "^4.3.1" - minimatch "^10.2.4" + minimatch "^11.0.5" "@eslint/config-helpers@^0.7.0": version "0.7.0" @@ -381,6 +381,11 @@ dependencies: minipass "^7.0.4" +"@isaacs/nonrecursive-glob-match@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@isaacs/nonrecursive-glob-match/-/nonrecursive-glob-match-1.1.0.tgz#b1d69b8938aab4c292f7fde628c47dc1dbd737ef" + integrity sha512-GPm/Dbvk5RLmhRnxXIa7nTpK0xtl4E0wj0MslsuNiJ1FIROU+2+9lgUC/dgF7Ey4QCWhfEsgxilMRMCdHPfDfw== + "@isaacs/string-locale-compare@^1.1.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz#291c227e93fd407a96ecd59879a35809120e432b" @@ -972,7 +977,7 @@ resolved "https://registry.yarnpkg.com/@types/deep-eql/-/deep-eql-4.0.2.tgz#334311971d3a07121e7eb91b684a605e7eea9cbd" integrity sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw== -"@types/emscripten@^1.41.5": +"@types/emscripten@^1.41.6": version "1.41.6" resolved "https://registry.yarnpkg.com/@types/emscripten/-/emscripten-1.41.6.tgz#0d852a4c29fc2c035ed9232f00135717f1a920f1" integrity sha512-uN+9i8bFT5CUcZfyIEYDrSueACEyKGbUs5kC/72DGlZZoinh84sJfVV0i8UOJD1asdzkvLPBRrKs41kZ8MdEXg== @@ -997,7 +1002,7 @@ resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-10.0.10.tgz#91f62905e8d23cbd66225312f239454a23bebfa0" integrity sha512-xPyYSz1cMPnJQhl0CLMH68j3gprKZaTjG3s5Vi+fDgx+uhG9NOXwbVt52eFS8ECyXhyKcjDLCBEqBExKuiZb7Q== -"@types/node@^26.0.0": +"@types/node@^26.6.6": version "26.6.6" resolved "https://registry.yarnpkg.com/@types/node/-/node-26.6.6.tgz#9ed7b5817e728ed9216ef7c5b7d373fe3b777104" integrity sha512-MzQj+8Kx3XI40OmUAE6Qoh58ZMNstNNMwn2nfd3qWsfe7nDNSqJNzes4njhz6AHwrSHOffSLwXU6yb474Q4aog== @@ -1268,6 +1273,13 @@ brace-expansion@5.0.12: dependencies: balanced-match "^4.0.2" +brace-expansion@^5.0.12: + version "5.0.13" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-5.0.13.tgz#e2d4497370f7e385e6f96b57bd7ff11d77d85851" + integrity sha512-Vh3dmFbc4wZeox7M9I/0L9GfFd83Su4+yCck/OF9Gi/P/dAHn0RT7X4K9R7gMNMhDck3DvhR6QXsnQdjjgwNvQ== + dependencies: + balanced-match "^4.0.2" + brace-expansion@^5.0.5, brace-expansion@^5.0.8: version "5.0.9" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-5.0.9.tgz#7c72438809b5fa5babf54199a1f1c281a6984fcf" @@ -1332,7 +1344,7 @@ callsites@^3.0.0: resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== -chai@^6.2.2: +chai@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/chai/-/chai-6.3.0.tgz#91f89eb789c2bb1ae1787d78c8518e1d3cebfc07" integrity sha512-XWAtwJ6OHO+tj0EKCs0Y2UamnyOxseZWltU4x2U2wh8g4AigdjwvtUjvLP2tqkA/avxHEtzxNaqGq/YGNwckKg== @@ -1724,14 +1736,14 @@ eslint-visitor-keys@^5.0.0, eslint-visitor-keys@^5.0.1: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz#9e3c9489697824d2d4ce3a8ad12628f91e9f59be" integrity sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA== -eslint@^10.1.0: - version "10.14.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-10.14.0.tgz#b7574df08d11d9eaa04222f09606674a0ea51db9" - integrity sha512-T0pNsxkb9IKmtQjhpK3d7nWOpFv+YHuMbTJnSVMoQblF0onvXfErrtp4V1jHtsQPan7dKaGVD0q1WCXnzMF31A== +eslint@^10.15.0: + version "10.15.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-10.15.0.tgz#dd29a7f78bc47cb7107a40acd3350f19c9089435" + integrity sha512-+5Wg4p+ze3sG1WErYgUO/3H1IQIfFBymVUA0Fo/XTeBOLS6UQIUekpSJ8sdRkn7O7wjh84b55w/roqavH2aScg== dependencies: "@eslint-community/eslint-utils" "^4.8.0" "@eslint-community/regexpp" "^4.12.2" - "@eslint/config-array" "^0.23.5" + "@eslint/config-array" "^0.23.6" "@eslint/config-helpers" "^0.7.0" "@eslint/core" "^1.2.1" "@eslint/plugin-kit" "^0.7.3" @@ -1756,7 +1768,7 @@ eslint@^10.1.0: imurmurhash "^0.1.4" is-glob "^4.0.0" json-stable-stringify-without-jsonify "^1.0.1" - minimatch "^10.2.6" + minimatch "^11.0.5" natural-compare "^1.4.0" optionator "^0.9.3" @@ -2007,7 +2019,7 @@ glob@^13.0.0, glob@^13.0.6: minipass "^7.1.3" path-scurry "^2.0.2" -globals@^17.4.0: +globals@^17.14.0: version "17.14.0" resolved "https://registry.yarnpkg.com/globals/-/globals-17.14.0.tgz#5bbbe515622ba24229bd94d4a7c441740e1b50dd" integrity sha512-UtdkTVyAJePQv0J2M9Xe4L0ruNSDV314XiIJsADI2Zf40bcdAonE/D/OhAU8AT99oij9mhLByb+NvA3QWZYgCg== @@ -2375,7 +2387,7 @@ keyv@^5.6.0: dependencies: "@keyv/serialize" "^1.1.1" -lerna@^10.0.0: +lerna@^10.1.1: version "10.1.1" resolved "https://registry.yarnpkg.com/lerna/-/lerna-10.1.1.tgz#20555f0903238397d8e67e0964cfb8c590edd22f" integrity sha512-WDGaMGDGj5jV0n6Yx2zuBDWH0ym6toUE6w+maaPLqeMd3ncDRN+NJMcVWImVdUKCIHRk2Xk+X7QQkFXdHKsscA== @@ -2467,7 +2479,7 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== -lint-staged@^17.0.2: +lint-staged@^17.6.0: version "17.6.0" resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-17.6.0.tgz#756fa50b4d4d9032ab05f64ef899eee81e44d421" integrity sha512-nOhBfYkZEwkFtNzD5pK9s9LkcWoxJ+whLzEnhqi9nl7zTB5n7tg8+9iYgMGx2Wm3VlLu8cbNj0RACzY+nWi5iQ== @@ -2540,13 +2552,21 @@ minimatch@10.2.5: dependencies: brace-expansion "^5.0.5" -minimatch@10.2.6, minimatch@^10.0.3, minimatch@^10.2.1, minimatch@^10.2.2, minimatch@^10.2.4, minimatch@^10.2.6: +minimatch@10.2.6, minimatch@^10.0.3, minimatch@^10.2.1, minimatch@^10.2.2: version "10.2.6" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.2.6.tgz#fd956bbe0b77241e9f15ac5dccb1c638060968ef" integrity sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A== dependencies: brace-expansion "^5.0.8" +minimatch@^11.0.5: + version "11.0.8" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-11.0.8.tgz#715fc3509cd7f76ed9af2f702a98411b1b0288c8" + integrity sha512-nFQuYSTVrGvysVBps5Ih+0BdnYFN/Cj3C816r6+p7yK+FHrVLGE4O4N9AFwykrlNlvM2HYt+Rad1Uiro6h88Ig== + dependencies: + "@isaacs/nonrecursive-glob-match" "^1.1.0" + brace-expansion "^5.0.12" + minimist@1.2.8, minimist@^1.2.6, minimist@^1.2.8: version "1.2.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" @@ -2615,7 +2635,7 @@ mitata@^1.0.34: resolved "https://registry.yarnpkg.com/mitata/-/mitata-1.0.34.tgz#131f500d58c0bdc958095ab64f637d6fe1cf101a" integrity sha512-Mc3zrtNBKIMeHSCQ0XqRLo1vbdIx1wvFV9c8NJAiyho6AjNfMY8bVhbS12bwciUdd1t4rj8099CH3N3NFahaUA== -mocha@^12.0.0: +mocha@^12.0.3: version "12.0.3" resolved "https://registry.yarnpkg.com/mocha/-/mocha-12.0.3.tgz#f3022f5684f5a8306323dd5ab4d0f881a90cd031" integrity sha512-beammieDdiWdkjANWeWPpkxUROYGi5FN88fPOkLiticz7HTg3Y+Pho3EYE6SUdcuWnZ3h2WD8EXCA55JF4o6wg== @@ -3130,10 +3150,10 @@ postcss-selector-parser@^7.0.0: cssesc "^3.0.0" util-deprecate "^1.0.2" -postcss@^8.5.15: - version "8.5.32" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.32.tgz#fbccef8388a0c77508c713bfd37728d646595803" - integrity sha512-LJlKCCAUFKOuZxipUdYw1NzIITEsPcgyOG9LkvRJvuKj/bRzbuRY0ARXvL0pWGpsZvn8jku+LMep2eU0seHp8g== +postcss@^8.5.33: + version "8.5.33" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.33.tgz#088a2fee1bdee7ea1ffaf8abb4288513e7097ab0" + integrity sha512-RVHEU9/Pp1Fnjr/MpAJsZoADukCKhfIi15OunEYiGktIkYLkPVvC1sioWolGDS7XByMTx9m/IGbro0Js13zhnQ== dependencies: nanoid "^3.3.20" picocolors "^1.1.1" @@ -3153,10 +3173,10 @@ prettier-plugin-css-order@^2.2.0: postcss-less "^6.0.0" postcss-scss "^4.0.9" -prettier@^3.8.1: - version "3.9.10" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.9.10.tgz#ac378e432f1a7381518f2e080816bbaefa38d585" - integrity sha512-skGHTH1Yb9QvaTC4hWnRTzEYtCpApF0UMBPz+t/0ZPzP8ihefo/btKd+QA7pUE0fEwA1SbS/NmhyEcstdXOIdA== +prettier@^3.10.1: + version "3.10.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.10.1.tgz#00b1c1872f9650ec22093d5bdafdca0fe6760f77" + integrity sha512-70vp3ZUYoPlFbF9uiTdXHUUCGEIp7d4+6p+8DYbkm2jP7x/3i/paXVF6dopSI3zd/CEitrZN1rc4i85xWmmXlg== pretty-ms@^9.3.0: version "9.3.1" @@ -3582,10 +3602,10 @@ tmp@0.2.7: resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.7.tgz#26f4db11d1601ce8012dcb8a798ece1c06a99059" integrity sha512-e0votIpp4Uo2AJYSzVHV6xCcawuiez3DzqDAbrTc3YxBkplN6e+dM13ZeIcZnDg/QpSuU2zfZ3rzwY8ukEnaXw== -tree-sitter-java-orchard@0.5.23: - version "0.5.23" - resolved "https://registry.yarnpkg.com/tree-sitter-java-orchard/-/tree-sitter-java-orchard-0.5.23.tgz#5ae1a88a28fa0ab18e24610f128299bdf8116279" - integrity sha512-iBQC5zfeDFSLJ1rSgKudgkiSFE1SkGXcNA1FUWqvuuaOV8gZGc6uOTw2aWlZjdXj6dOEMqn54fuhwaByOAV+QQ== +tree-sitter-java-orchard@0.5.25: + version "0.5.25" + resolved "https://registry.yarnpkg.com/tree-sitter-java-orchard/-/tree-sitter-java-orchard-0.5.25.tgz#49892fac0caaeffa70ed33fb4dd588e1bfd5fe39" + integrity sha512-weKqBjzgvdmQoxaTUgshJuPM6rokcNOyEEMUjqPrjxj6hYbXOpcra34jLRu1B6p1ArPoJAXdFqXg/vKOqnfLXw== dependencies: node-addon-api "^8.5.0" node-gyp-build "^4.8.4" @@ -3609,7 +3629,7 @@ tsconfig-paths@4.2.0: minimist "^1.2.6" strip-bom "^3.0.0" -tsdown@^0.23.0: +tsdown@^0.23.7: version "0.23.7" resolved "https://registry.yarnpkg.com/tsdown/-/tsdown-0.23.7.tgz#b8d2a8cf21dc19d4c5adc728f8000e21f0d1a5d8" integrity sha512-w9nmWyEimfqQ7/HpVeKTldAeBvWGXiaWyNP7xaxSrr0GhKxsngEyTWqk1nOruRqvqRSkdpMMkpV2BcoWfLB4Uw== @@ -3650,7 +3670,7 @@ type-check@^0.4.0, type-check@~0.4.0: dependencies: prelude-ls "^1.2.1" -typescript-eslint@^8.57.1: +typescript-eslint@^8.72.2: version "8.72.2" resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.72.2.tgz#6d6ddec82c376cdf32a939fad17ec8100be5f00c" integrity sha512-c/+AKMW1KB81r28Sp0AAdcyXj5dzNmAsZFcsrxKbZTKmcBK2xIwBR31dcSYSDu3bKmzXe8GKrSxO+eDQ401Uzg==