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: generate code accessor scenario #972

Merged
merged 2 commits into from
Dec 31, 2024

Conversation

chilingling
Copy link
Member

@chilingling chilingling commented Dec 27, 2024

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?

【问题描述】
状态变量包含 getter 或者 getter 的时候,初始化变量defaultValue出码不正确。

比如:

{
  "state": {
    "test": {
        "defaultValue": "ccc",
        "accessor": {
            "getter": {
                "type": "JSFunction",
                "value": "this.state.test = this.props.xxx"
             }
         }
    }
  }
}

出码成:

<script setup>
// ...

const state = reactive({
   test: ccc // <-  这里缺少了双引号
})
</script>

【问题分析】
针对有 accessor 场景的 defaultValue 没有进行分析处理。

【解决方案】
针对 accessor 场景的 defaultValue,如果是复杂值,使用 transformObjType 方法进行递归处理。如果是字符串,需要进行转义。

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

    • Introduced a new Vue single-file component named Accessor.vue with various reactive state properties and a template.
    • Added a new JSON schema for the "Page" component defining its structure and properties.
  • Tests

    • Added a test case to validate the tagName functionality in the Vue SFC generator.
  • Bug Fixes

    • Enhanced handling of non-object types and nested structures in the transformation logic.

修复 state  accessor 出码的bug
Copy link
Contributor

coderabbitai bot commented Dec 27, 2024

Warning

There were issues while running some tools. Please review the errors and either fix the tool’s configuration or disable the tool if it’s a critical failure.

🔧 eslint

If the error stems from missing dependencies, add them to the package.json file. For unrecoverable errors (e.g., due to private dependencies), disable the tool in the CodeRabbit configuration.

packages/vue-generator/test/testcases/sfc/accessor/expected/Accessor.vue

Oops! Something went wrong! :(

ESLint: 8.57.1

Error: Cannot read config file: /packages/vue-generator/.eslintrc.cjs
Error: Cannot find module '@rushstack/eslint-patch/modern-module-resolution'
Require stack:

  • /packages/vue-generator/.eslintrc.cjs
  • /node_modules/.pnpm/@eslint[email protected]/node_modules/@eslint/eslintrc/dist/eslintrc.cjs
  • /node_modules/.pnpm/[email protected]/node_modules/eslint/lib/cli-engine/cli-engine.js
  • /node_modules/.pnpm/[email protected]/node_modules/eslint/lib/eslint/eslint.js
  • /node_modules/.pnpm/[email protected]/node_modules/eslint/lib/eslint/index.js
  • /node_modules/.pnpm/[email protected]/node_modules/eslint/lib/cli.js
  • /node_modules/.pnpm/[email protected]/node_modules/eslint/bin/eslint.js
    at Module._resolveFilename (node:internal/modules/cjs/loader:1248:15)
    at Module._load (node:internal/modules/cjs/loader:1074:27)
    at TracingChannel.traceSync (node:diagnostics_channel:315:14)
    at wrapModuleLoad (node:internal/modules/cjs/loader:217:24)
    at Module.require (node:internal/modules/cjs/loader:1339:12)
    at require (node:internal/modules/helpers:135:16)
    at Object. (/packages/vue-generator/.eslintrc.cjs:4:1)
    at Module._compile (node:internal/modules/cjs/loader:1546:14)
    at Module._extensions..js (node:internal/modules/cjs/loader:1691:10)
    at Module.load (node:internal/modules/cjs/loader:1317:32)

Walkthrough

This pull request introduces modifications to the Vue generator's attribute handling logic, specifically in the transformObjType function. The changes focus on improving the transformation of object types and default values, ensuring consistent object structure and more robust handling of nested structures. A new test case and corresponding Vue component have been added to validate the functionality of state accessors in the code generation process.

Changes

File Change Summary
packages/vue-generator/src/generator/vue/sfc/generateAttribute.js Modified transformObjType function to return objects with a consistent structure and improve handling of defaultValue for objects with accessors. Logic updated for several functions without changing their signatures.
packages/vue-generator/test/testcases/sfc/accessor/accessor.test.js Added new test case to validate tagName functionality in Vue SFC generator.
packages/vue-generator/test/testcases/sfc/accessor/expected/Accessor.vue New Vue component demonstrating state accessor code generation.
packages/vue-generator/test/testcases/sfc/accessor/schema.json New JSON schema defining component structure with state properties and accessors.

Possibly related PRs

Suggested labels

ready_for_review, refactor-main

Suggested reviewers

  • hexqi
  • rhlin

Poem

🐰 A rabbit's tale of code so neat,
Transforming objects, making logic sweet
Accessors dance, types align just right
Vue generator shines with newfound might
Code generation, a magical art! 🌟


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 generate docstrings to generate docstrings for this PR. (Beta)
  • @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.

@github-actions github-actions bot added the bug Something isn't working label Dec 27, 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: 1

🧹 Nitpick comments (6)
packages/vue-generator/test/testcases/sfc/accessor/accessor.test.js (2)

1-5: Use a named import for clarity.
While everything here is correct, consider making the imports more descriptive by grouping them or indicating their purpose, for example:

-import { expect, test } from 'vitest'
-import { genSFCWithDefaultPlugin } from '@/generator/vue/sfc'
-import schema from './schema.json'
-import { formatCode } from '@/utils/formatCode'
+import {
+  expect,
+  test,
+} from 'vitest'
+import {
+  genSFCWithDefaultPlugin,
+} from '@/generator/vue/sfc'
+import schema from './schema.json'
+import {
+  formatCode,
+} from '@/utils/formatCode'

This can improve maintainability and readability as the file grows.


6-11: Consider adding negative test cases.
The current test verifies the expected snapshot for the generated code. For more robust coverage, add scenarios with invalid or unexpected input to ensure the generator gracefully handles errors.

packages/vue-generator/test/testcases/sfc/accessor/expected/Accessor.vue (3)

1-5: Localized text considerations.
"测试 state accessor 出码场景" appears as static text. If internationalization is intended throughout your application, consider wrapping this text with a translation function to maintain consistency.


19-30: Potential large-state complexity.
This reactive state object has numerous properties that transform on watchers. While this is acceptable for smaller-scale apps, consider factoring these properties or watchers into separate composables if the component grows in complexity to keep it modular.


33-67: Watchers reassigning properties.
All watchers use essentially the same logic: reassigning each state property to a concatenated string of firstName and lastName. If the number of watchers grows, consider a single computed property or a composable approach to reduce duplication and potential drift across watchers.

packages/vue-generator/test/testcases/sfc/accessor/schema.json (1)

1-14: Schema clarity.
The general structure is good. Including a brief comment explaining "Page" vs. "Accessor" naming helps maintain clarity for future contributors.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 7f05029 and d040e6b.

📒 Files selected for processing (4)
  • packages/vue-generator/src/generator/vue/sfc/generateAttribute.js (2 hunks)
  • packages/vue-generator/test/testcases/sfc/accessor/accessor.test.js (1 hunks)
  • packages/vue-generator/test/testcases/sfc/accessor/expected/Accessor.vue (1 hunks)
  • packages/vue-generator/test/testcases/sfc/accessor/schema.json (1 hunks)
🔇 Additional comments (3)
packages/vue-generator/test/testcases/sfc/accessor/expected/Accessor.vue (1)

7-17: Validate injection source.
Here, code is injecting from vue.inject(I18nInjectionKey). Ensure that I18nInjectionKey is provided at a higher level in the component tree to avoid runtime errors.

packages/vue-generator/src/generator/vue/sfc/generateAttribute.js (2)

382-384: Uniform return shape.
This addition ensures a uniform return object, preventing the code from crashing when non-object types are encountered. The implementation is valid.


418-429: Graceful handling of default values with accessors.
The transformation logic for defaultValue is robust, covering strings and nested objects. However, confirm that all accessor use-cases (e.g., arrays or computed properties) are tested.

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: 1

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between d040e6b and e27f408.

📒 Files selected for processing (2)
  • packages/vue-generator/test/testcases/sfc/accessor/expected/Accessor.vue (1 hunks)
  • packages/vue-generator/test/testcases/sfc/accessor/schema.json (1 hunks)
🔇 Additional comments (5)
packages/vue-generator/test/testcases/sfc/accessor/expected/Accessor.vue (3)

1-5: LGTM! Template structure matches schema definition.


19-30: LGTM! State initialization matches schema definition.


74-74: LGTM! Empty style section matches schema definition.

packages/vue-generator/test/testcases/sfc/accessor/schema.json (2)

1-14: LGTM! Basic component structure is well-defined.

The component structure, including name, filename, children, and empty sections for lifecycle and methods, is correctly defined.

Also applies to: 98-101


18-97: ⚠️ Potential issue

Incorrect implementation of getters in state accessors.

There are several issues with the state accessor definitions:

  1. The "getter" functions are actually performing mutations instead of returning values
  2. All accessors convert values to strings, which may cause type-related issues
  3. The implementation pattern was previously flagged for the objVal property

Consider implementing proper getters that return computed values:

  "nullValue": {
    "defaultValue": null,
    "accessor": {
      "getter": {
        "type": "JSFunction",
-       "value": "function() { this.state.nullValue = `${this.state.firstName} ${this.state.lastName}` }"
+       "value": "function() { return null }"
      }
    }
  },
  "numberValue": {
    "defaultValue": 0,
    "accessor": {
      "getter": {
        "type": "JSFunction",
-       "value": "function() { this.state.numberValue = `${this.state.firstName} ${this.state.lastName}` }"
+       "value": "function() { return this.state.firstName.length + this.state.lastName.length }"
      }
    }
  }

Let's verify if this pattern is used elsewhere in the codebase:

}
],
"state": {
"firstName": "Opentiny",
Copy link
Collaborator

Choose a reason for hiding this comment

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

测试用例缺少js表达式的, 比如
image

Copy link
Member Author

Choose a reason for hiding this comment

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

@hexqi hexqi merged commit da356e1 into opentiny:release/v2.1.0 Dec 31, 2024
4 checks passed
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.

3 participants