fix(@umijs/plugins): model files may be collected more than once in some cases

[liuwenzhuang]

...this.getModels({
  base: join(this.api.paths.absPagesPath),
  pattern: '**/models/**/*.{ts,tsx,js,jsx}',
}),
...this.getModels({
  base: join(this.api.paths.absPagesPath),
  pattern: '**/model.{ts,tsx,js,jsx}',
})

model 文件的路径为 src/pages/**/models/model.ts 时，这两个 pattern 会重复收集 model 文件。

[vercel]

The latest updates on your projects. Learn more about Vercel for Git ↗︎

1 Skipped Deployment

Name	Status	Preview	Comments	Updated (UTC)
umi	⬜️ Ignored (Inspect)	Visit Preview		Jul 8, 2024 1:18am

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Walkthrough

这次变更主要涉及在 packages/plugins/src/utils/modelUtils.ts 中引入 lodash 来替代原先的扩展操作符进行数组操作。具体地，ModelUtils 类中构建 models 数组的逻辑从使用扩展操作符转换为使用 lodash.uniq 来确保文件路径的唯一性。

Changes

文件路径	变更摘要
packages/plugins/src/utils/modelUtils.ts	将原有的扩展操作符替换为 lodash.uniq 方法以确保模型路径唯一性，同时修改了相应的导入语句。

Sequence Diagram(s)

这次更改主要集中在代码内部的数组操作逻辑，并未显著影响控制流程，故无需生成时序图。

Poem

🐇代码变更漫天飞，
模型独一心不累。
lodash 加入真高效，
唯一路径常相随。
chalk 搭档也不累，
胜似云中兔儿飞。

---

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share

• X
• Mastodon
• Reddit
• LinkedIn

Tips

Chat

There are 3 ways to chat with CodeRabbit:

• Review comments: Directly reply to a review comment made by CodeRabbit. Example:
  • I pushed a fix in commit <commit_id>.
  • Generate unit testing code for this file.
  • Open a follow-up GitHub issue for this discussion.
• Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
  • @coderabbitai generate unit testing code for this file.
  • @coderabbitai modularize this function.
• PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
  • @coderabbitai generate interesting stats about this repository and render them as a table.
  • @coderabbitai show all the console.log statements in this repository.
  • @coderabbitai read src/utils.ts and generate unit testing code.
  • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
  • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

• @coderabbitai pause to pause the reviews on a PR.
• @coderabbitai resume to resume the paused reviews.
• @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
• @coderabbitai full review to do a full review from scratch and review all the files again.
• @coderabbitai summary to regenerate the summary of the PR.
• @coderabbitai resolve resolve all the CodeRabbit review comments.
• @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
• @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

• You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
• Please see the configuration documentation for more information.
• If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

• Visit our Documentation for detailed information on how to use CodeRabbit.
• Join our Discord Community to get help, request features, and share feedback.
• Follow us on X/Twitter for updates and announcements.

[coderabbitai]

Actionable comments posted: 0

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between c0da93f and a2c84a3.

Files selected for processing (1)

• packages/plugins/src/utils/modelUtils.ts (2 hunks)

Additional comments not posted (2)

packages/plugins/src/utils/modelUtils.ts (2)

14-14: 导入 lodash 是必要的。

导入 lodash 是为了使用 lodash.uniq 函数来确保模型文件路径的唯一性，这是一种有效的方式。

---

129-152: 使用 lodash.uniq 确保模型文件路径的唯一性。

使用 lodash.uniq 来确保模型文件路径的唯一性是一种有效的方式，解决了模型文件可能被多次收集的问题。

[fz6m]

1. 合并一下 master 最新的代码，原来的 CI 有问题。

2. 不要直接添加 uniq 在上面，会造成一层缩进和大脑理解困难，拆成先获取文件列表（变量 1 ，如 modelFiles ），之后 uniq （变量 2 ，如 modelUniqFiles），再做 models 生成（现有变量）。

[liuwenzhuang]

1. 合并一下 master 最新的代码，原来的 CI 有问题。
2. 不要直接添加 uniq 在上面，会造成一层缩进和大脑理解困难，拆成先获取文件列表（变量 1 ，如 modelFiles ），之后 uniq （变量 2 ，如 modelUniqFiles），再做 models 生成（现有变量）。

已修改

[sorrycc]

e2e 挂了，我先 revert 下，有需要重新再提。

[fz6m]

目测这里拿到全部路径之后需要进行一遍 winPath ，之后再 uniq ，不然 windows 的 e2e 就挂了 ？

有空的话可以再提交一遍试试。