chore: merge main into modular branch

[ewanharris]

Description

Merges main into modular models feature branch as we have some conflicts in the package-lock

References

Review Checklist

• [x] I have clicked on "allow edits by maintainers".
• [ ] I have added documentation for new/changed functionality in this PR or in a PR to openfga.dev [Provide a link to any relevant PRs in the references section above]
• [x] The correct base branch is being used, if not main
• [ ] I have added tests to validate that the change in functionality is working as expected

[ewanharris]

Will implement Java to the point to get the new DSL tests to pass