refactor: Improve the editor assets endpoint #45714

dcalhoun · 2025-10-30T20:36:07Z

Tip

I recommend reviewing each commit individually to simplify code review.

Important

#45715 builds upon this, so any manual testing should be performed on that branch.

Refactor existing code to use appropriate string methods, improve organization, and ensure restored global state. The majority of the changes are relocating existing code. The only new code is a try/final block and string utility usage.

Proposed changes:

Prefer str_contains and str_starts_with over strpos.
Reduce get_items() complexity by extracting disparate functions.
Wrap core logic with try/final to ensure global state restoration.

Other information:

Have you written new tests for your changes, if applicable?
Have you checked the E2E test CI results, and verified that your changes do not break them?
Have you tested your changes on WordPress.com, if applicable (if so, you'll see a generated comment below with a script to run)?

Jetpack product discussion

N/A

Does this pull request change what data or activity we track or use?

No

Testing instructions:

Verify existing automated tests pass.
Smoke test the endpoint by submitting requests via the API Console or curl.

Simplify existing logic with helpful utilities.

Extract various work to simplify the primary function.

github-actions · 2025-10-30T20:36:59Z

Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.

To test on WoA, go to the Plugins menu on a WoA dev site. Click on the "Upload" button and follow the upgrade flow to be able to upload, install, and activate the Jetpack Beta plugin. Once the plugin is active, go to Jetpack > Jetpack Beta, select your plugin (Jetpack), and enable the refactor/improve-editor-assets-endpoint branch.
To test on Simple, run the following command on your sandbox:

bin/jetpack-downloader test jetpack refactor/improve-editor-assets-endpoint

Interested in more tips and information?

In your local development environment, use the jetpack rsync command to sync your changes to a WoA dev blog.
Read more about our development workflow here: PCYsg-eg0-p2
Figure out when your changes will be shipped to customers here: PCYsg-eg5-p2

github-actions · 2025-10-30T20:37:08Z

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

✅ Include a description of your PR changes.
✅ Add a "[Status]" label (In Progress, Needs Review, ...).
✅ Add a "[Type]" label (Bug, Enhancement, Janitorial, Task).
✅ Add testing instructions.
✅ Specify whether this PR includes any changes to data or privacy.
✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖

Follow this PR Review Process:

Ensure all required checks appearing at the bottom of this PR are passing.
Make sure to test your changes on all platforms that it applies to. You're responsible for the quality of the code you ship.
You can use GitHub's Reviewers functionality to request a review.
When it's reviewed and merged, you will be pinged in Slack to deploy the changes to WordPress.com simple once the build is done.

If you have questions about anything, reach out in #jetpack-developers for guidance!

Jetpack plugin:

No scheduled milestone found for this plugin.

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

jp-launch-control · 2025-10-30T20:45:44Z

Code Coverage Summary

Coverage changed in 1 file.

File	Coverage	Δ%	Δ Uncovered
projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-block-editor-assets.php	179/189 (94.71%)	0.56%	0 💚

Full summary · PHP report · JS report

dcalhoun · 2025-10-31T19:05:58Z

...k/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-block-editor-assets.php

 			array_keys( WP_Block_Type_Registry::get_instance()->get_all_registered() ),
 			function ( $block_name ) {
-				return strpos( $block_name, 'core/' ) === 0;
+				return str_starts_with( $block_name, 'core/' );


This and similar changes merely change generic string utilities to more explicit ones to better communicate intent.

dcalhoun · 2025-10-31T19:06:57Z

...k/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-block-editor-assets.php

+		} finally {
+			// Always restore original asset state, even if an exception occurred
+			$wp_styles  = $current_wp_styles;
+			$wp_scripts = $current_wp_scripts;
+		}


This try/finally block as added to ensure global state is restored in the event of an error. It will likely have no impact, but felt worthwhile nonetheless.

dcalhoun · 2025-10-31T19:07:29Z

...k/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-block-editor-assets.php

These changes solely relocate existing code, aside from the inline comments noting otherwise.

kean

LGTM

dcalhoun added 3 commits October 30, 2025 15:06

refactor: Prefer str_contains and str_starts_with over strpos

b285254

Simplify existing logic with helpful utilities.

refactor: Reduce endpoint get_items() complexity

943b62c

Extract various work to simplify the primary function.

changelog

bae3fa2

dcalhoun added [Status] In Progress [Type] Janitorial [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ labels Oct 30, 2025

dcalhoun commented Oct 31, 2025

View reviewed changes

dcalhoun mentioned this pull request Oct 31, 2025

feat: Filter editor assets endpoint with exclude parameter #45715

Open

3 tasks

dcalhoun marked this pull request as ready for review October 31, 2025 19:16

dcalhoun mentioned this pull request Oct 31, 2025

feat: Bundled editor supports plugins wordpress-mobile/GutenbergKit#209

Open

kean approved these changes Nov 3, 2025

View reviewed changes

dcalhoun added [Status] Ready to Merge Go ahead, you can push that green button! and removed [Status] In Progress labels Nov 4, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

refactor: Improve the editor assets endpoint #45714

refactor: Improve the editor assets endpoint #45714

dcalhoun commented Oct 30, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Oct 30, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Oct 30, 2025 •

edited

Loading

Uh oh!

jp-launch-control bot commented Oct 30, 2025

Uh oh!

dcalhoun Oct 31, 2025

Uh oh!

dcalhoun Oct 31, 2025

Uh oh!

dcalhoun Oct 31, 2025

Uh oh!

kean left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

refactor: Improve the editor assets endpoint #45714

Are you sure you want to change the base?

refactor: Improve the editor assets endpoint #45714

Conversation

dcalhoun commented Oct 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Proposed changes:

Other information:

Jetpack product discussion

Does this pull request change what data or activity we track or use?

Testing instructions:

Uh oh!

github-actions bot commented Oct 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Oct 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jp-launch-control bot commented Oct 30, 2025

Code Coverage Summary

Uh oh!

dcalhoun Oct 31, 2025

Choose a reason for hiding this comment

Uh oh!

dcalhoun Oct 31, 2025

Choose a reason for hiding this comment

Uh oh!

dcalhoun Oct 31, 2025

Choose a reason for hiding this comment

Uh oh!

kean left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

dcalhoun commented Oct 30, 2025 •

edited

Loading

github-actions bot commented Oct 30, 2025 •

edited

Loading

github-actions bot commented Oct 30, 2025 •

edited

Loading