@willbooster/tree-sitter-php 1.0.4 → 1.1.0

package/README.md

@@ -1,16 +1,19 @@
 # @willbooster/tree-sitter-php
 
+[![npm version](https://img.shields.io/npm/v/@willbooster/tree-sitter-php.svg)](https://www.npmjs.com/package/@willbooster/tree-sitter-php)
+[![license](https://img.shields.io/npm/l/@willbooster/tree-sitter-php.svg)](https://www.npmjs.com/package/@willbooster/tree-sitter-php)
 [![Test](https://github.com/WillBooster/tree-sitter-php/actions/workflows/test.yml/badge.svg)](https://github.com/WillBooster/tree-sitter-php/actions/workflows/test.yml)
 [![Test rust](https://github.com/WillBooster/tree-sitter-php/actions/workflows/test-rust.yml/badge.svg)](https://github.com/WillBooster/tree-sitter-php/actions/workflows/test-rust.yml)
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
-[![wbfy](https://img.shields.io/badge/wbfy-20.36.11-1e90ff.svg)](https://github.com/WillBooster/shared/tree/main/packages/wbfy)
+[![wbfy](https://img.shields.io/badge/wbfy-20.41.8-1e90ff.svg)](https://github.com/WillBooster/shared/tree/main/packages/wbfy)
 [![crates.io](https://img.shields.io/crates/v/willbooster-tree-sitter-php.svg)](https://crates.io/crates/willbooster-tree-sitter-php)
 
 PHP grammars for [tree-sitter](https://github.com/tree-sitter/tree-sitter), forked from
 [tree-sitter/tree-sitter-php](https://github.com/tree-sitter/tree-sitter-php). We are grateful
 to its authors and contributors. This is not an official release of that project.
 
-This fork builds on upstream's version 0.24.2 grammars and queries with support for absolute grouped namespace imports.
+This fork builds on upstream's version 0.24.2 grammars and queries with support for absolute grouped namespace imports
+and asymmetric visibility in constructor property promotion.
 Its external scanner adapts to the generated array API and fixes incremental heredoc parsing. It generates the parsers with the
 [WillBooster/tree-sitter](https://github.com/WillBooster/tree-sitter) generator. The parsers carry that fork's own ABI
 number, so they load only with its runtime (`willbooster-tree-sitter`, `@willbooster/web-tree-sitter`), version 2.0.0

package/common/define-grammar.js

@@ -563,9 +563,11 @@ module.exports = function defineGrammar(dialect) {
 
       property_promotion_parameter: $ => seq(
         optional(field('attributes', $.attribute_list)),
-        field('visibility', $.visibility_modifier),
-        field('readonly', optional($.readonly_modifier)),
-        field('type', optional($.type)), // Note: callable is not a valid type here, but instead of complicating the parser, we defer this checking to any intelligence using the parser
+        repeat1(choice(
+          field('visibility', $.visibility_modifier),
+          field('readonly', $.readonly_modifier),
+        )),
+        optional(field('type', $.type)), // Note: callable is not a valid type here, but instead of complicating the parser, we defer this checking to any intelligence using the parser
         field('name', choice($.by_ref, $.variable_name)),
         optional(seq('=', field('default_value', $.expression))),
         optional($.property_hook_list),
@@ -1263,12 +1265,11 @@ module.exports = function defineGrammar(dialect) {
 
       variadic_placeholder: _ => '...',
 
+      argument_placeholder: _ => '?',
+
       arguments: $ => seq(
         '(',
-        optional(choice(
-          seq(commaSep1($.argument), optional(',')),
-          $.variadic_placeholder,
-        )),
+        optional(seq(commaSep1(choice($.argument, $.variadic_placeholder)), optional(','))),
         ')',
       ),
 
@@ -1279,6 +1280,7 @@ module.exports = function defineGrammar(dialect) {
           alias($.relative_scope, $.name),
           $.variadic_unpacking,
           $.expression,
+          $.argument_placeholder,
         ),
       ),
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-php",
-  "version": "1.0.4",
+  "version": "1.1.0",
   "description": "PHP grammar for tree-sitter",
   "keywords": [
     "incremental",
@@ -59,7 +59,6 @@
     "playwright": "1.64.0",
     "semantic-release": "25.0.9",
     "sort-package-json": "4.0.0",
-    "typescript": "7.0.2",
     "vitest": "5.0.3",
     "wrangler": "4.149.0"
   },

package/php/src/node-types.json

@@ -566,6 +566,10 @@
       "multiple": false,
       "required": true,
       "types": [
+        {
+          "type": "argument_placeholder",
+          "named": true
+        },
         {
           "type": "expression",
           "named": true
@@ -581,6 +585,11 @@
       ]
     }
   },
+  {
+    "type": "argument_placeholder",
+    "named": true,
+    "fields": {}
+  },
   {
     "type": "arguments",
     "named": true,
@@ -4188,7 +4197,7 @@
         ]
       },
       "readonly": {
-        "multiple": false,
+        "multiple": true,
         "required": false,
         "types": [
           {
@@ -4208,8 +4217,8 @@
         ]
       },
       "visibility": {
-        "multiple": false,
-        "required": true,
+        "multiple": true,
+        "required": false,
         "types": [
           {
             "type": "visibility_modifier",

package/php_only/src/node-types.json

@@ -566,6 +566,10 @@
       "multiple": false,
       "required": true,
       "types": [
+        {
+          "type": "argument_placeholder",
+          "named": true
+        },
         {
           "type": "expression",
           "named": true
@@ -581,6 +585,11 @@
       ]
     }
   },
+  {
+    "type": "argument_placeholder",
+    "named": true,
+    "fields": {}
+  },
   {
     "type": "arguments",
     "named": true,
@@ -4188,7 +4197,7 @@
         ]
       },
       "readonly": {
-        "multiple": false,
+        "multiple": true,
         "required": false,
         "types": [
           {
@@ -4208,8 +4217,8 @@
         ]
       },
       "visibility": {
-        "multiple": false,
-        "required": true,
+        "multiple": true,
+        "required": false,
         "types": [
           {
             "type": "visibility_modifier",

package/tree-sitter.json

@@ -33,7 +33,7 @@
     }
   ],
   "metadata": {
-    "version": "1.0.4",
+    "version": "1.1.0",
     "license": "MIT",
     "description": "PHP grammar for tree-sitter",
     "authors": [