Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: parse template name error #880

Merged
merged 2 commits into from
Oct 30, 2024

Conversation

chilingling
Copy link
Member

@chilingling chilingling commented Oct 25, 2024

English | 简体中文

PR

PR Checklist

Please check if your PR fulfills the following requirements:

  • The commit message follows our Commit Message Guidelines
  • Tests for the changes have been added (for bug fixes / features)
  • Docs have been added / updated (for bug fixes / features)
  • Built its own designer, fully self-validated

PR Type

What kind of change does this PR introduce?

  • Bugfix
  • Feature
  • Code style update (formatting, local variables)
  • Refactoring (no functional changes, no api changes)
  • Build related changes
  • CI related changes
  • Documentation content changes
  • Other... Please describe:

Background and solution

What is the current behavior?

  1. 解决读取 template 模板参数错误的 bug。context.template -> options.template
  2. 解决单元测试场景中,文件出码得到的并不是 base64,而是文件路径的导致的出码模板错误。

Issue Number: N/A

What is the new behavior?

Does this PR introduce a breaking change?

  • Yes
  • No

Other information

Summary by CodeRabbit

  • New Features

    • Enhanced template generation logic, allowing for conditional inclusion of favicon data.
  • Bug Fixes

    • Improved error handling for base64 data processing to prevent abrupt failures.
  • Refactor

    • Updated the source of template variables for better flexibility in plugin behavior.

Copy link
Contributor

coderabbitai bot commented Oct 25, 2024

Walkthrough

The changes in this pull request involve modifications to the genTemplatePlugin and generateTemplate functions within the Vue generator. The genTemplatePlugin function now sources the template variable from options?.template instead of context?.template, while maintaining existing control flow. In the generateTemplate function, the return structure has been adjusted to conditionally include a favicon based on valid data, and error handling for base64 data has been modified to allow for graceful failures instead of throwing errors.

Changes

File Path Change Summary
packages/vue-generator/src/plugins/genTemplatePlugin.js Updated template source from context?.template to options?.template. Retained existing logic for handling results.
packages/vue-generator/src/templates/vue-template/index.js Restructured generateTemplate return value to use a res array with conditional favicon inclusion. Modified error handling in base64ToBlob to use try-catch for graceful failure.

Possibly related PRs

  • fix: change namespace 2 export module #837: The changes in this PR involve modifications to the generateApp function and the transition from a namespace to a module export, which may relate to the overall structure and functionality of the Vue generator, similar to the changes in the genTemplatePlugin function in the main PR.

Suggested labels

ready_for_review

Suggested reviewers

  • rhlin
  • yy-wow

🐰 In a world of templates, we hop and play,
With options now guiding our crafty way.
Favicon’s a friend, when valid, it stays,
And errors, once daunting, now softly sway.
So let’s generate joy, in each file we lay! 🌟


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between e3111a4 and d98ec13.

📒 Files selected for processing (1)
  • packages/vue-generator/src/templates/vue-template/index.js (3 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • packages/vue-generator/src/templates/vue-template/index.js

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
🪧 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>, please review it.
    • 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 gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @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 using 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.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration 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.

@chilingling chilingling added the bug Something isn't working label Oct 25, 2024
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 2

🧹 Outside diff range and nitpick comments (2)
packages/vue-generator/src/plugins/genTemplatePlugin.js (1)

Line range hint 1-34: Consider documenting template resolution precedence.

The plugin has multiple ways to resolve templates:

  1. Function from options.template
  2. String from options.template
  3. Default template

Consider adding JSDoc comments to document this precedence for better maintainability.

Example documentation:

+/**
+ * Generates template code based on the following precedence:
+ * 1. If options.template is a function, executes it with (schema, context)
+ * 2. If options.template is a string, looks up in templateMap
+ * 3. Falls back to 'default' template if none specified
+ * @param {Object} options Plugin options
+ * @param {string|Function} [options.template='default'] Template name or generator function
+ * @returns {Object} Plugin configuration
+ */
 function genTemplatePlugin(options = {}) {
packages/vue-generator/src/templates/vue-template/index.js (1)

Line range hint 76-173: LGTM! Consider extracting template configuration.

The restructuring with conditional favicon handling is a good improvement. However, the large array of static template files could be extracted for better maintainability.

Consider moving the template configuration to a separate file:

// templateConfig.js
export const defaultTemplates = [
  {
    fileType: 'md',
    fileName: 'README.md',
    path: '.',
    template: readmeFile
  },
  // ... other templates
]

// index.js
import { defaultTemplates } from './templateConfig'

export function generateTemplate(schema) {
  const res = defaultTemplates.map(({ template, ...config }) => ({
    ...config,
    fileContent: template ? getTemplate(schema, template) : template
  }))

  const faviconData = base64ToBlob(logoImage)
  if (faviconData) {
    res.push({
      fileType: 'image/x-icon',
      fileName: 'favicon.ico',
      path: './public',
      fileContent: faviconData
    })
  }

  return res
}
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 12bfefc and e3111a4.

📒 Files selected for processing (2)
  • packages/vue-generator/src/plugins/genTemplatePlugin.js (1 hunks)
  • packages/vue-generator/src/templates/vue-template/index.js (3 hunks)
🔇 Additional comments (1)
packages/vue-generator/src/plugins/genTemplatePlugin.js (1)

21-21: LGTM! Moving template configuration to options is more appropriate.

The change from context?.template to options?.template is architecturally sound as configuration values belong in options rather than context. This also maintains backward compatibility by falling back to 'default'.

Let's verify if there are any direct uses of context.template that might be affected:

✅ Verification successful

The change from context.template to options.template is safe and architecturally sound

The verification confirms that:

  1. There are no direct references to context.template in the codebase
  2. The template configuration is properly passed through config.pluginConfig?.template in generateApp.js
  3. The change maintains the plugin's contract while improving architectural clarity by moving configuration to options
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Search for any direct references to context.template
rg -l "context\.template" --type js

Length of output: 37


Script:

#!/bin/bash
# Let's try a broader search to find any references to template property access
rg "\.template" --type js -A 2 -B 2

# Also search for imports or requires of genTemplatePlugin to understand usage
rg "genTemplatePlugin" --type js

Length of output: 4738

@hexqi hexqi merged commit f152e32 into opentiny:develop Oct 30, 2024
1 check passed
chilingling added a commit to chilingling/tiny-engine that referenced this pull request Dec 4, 2024
* fix: parse template name error

* fix: add detection for test env
kevinmoch pushed a commit that referenced this pull request Dec 4, 2024
* fix: parse template name error

* fix: add detection for test env
@coderabbitai coderabbitai bot mentioned this pull request Dec 7, 2024
14 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants