Sync with template-lint

Author: NullVoxPopuli

docs/rules/template-no-unnecessary-curly-parens.md

@@ -6,13 +6,9 @@
 
 Disallow unnecessary parentheses enclosing statements in curlies. When invoking a helper with arguments, the outer parentheses around the entire expression are unnecessary.
 
-## Rule Details
-
-This rule flags `{{(helper args)}}` where the parentheses around the helper call can be removed, becoming `{{helper args}}`.
-
 ## Examples
 
-Examples of **incorrect** code for this rule:
+This rule **forbids** the following:
 
 ```gjs
 <template>
@@ -26,26 +22,17 @@ Examples of **incorrect** code for this rule:
 </template>
 ```
 
-Examples of **correct** code for this rule:
-
-```gjs
-<template>
-  {{concat "a" "b"}}
-</template>
-```
+This rule **allows** the following:
 
 ```gjs
 <template>
+  {{foo}}
   {{(foo)}}
-</template>
-```
-
-```gjs
-<template>
-  {{this.property}}
+  {{concat "a" "b"}}
+  {{concat (capitalize "foo") "-bar"}}
 </template>
 ```
 
 ## References
 
-- [eslint-plugin-ember template-no-unnecessary-curly-parens](https://github.com/ember-cli/eslint-plugin-ember/blob/master/docs/rules/template-no-unnecessary-curly-parens.md)
+- Ember's [Helper Functions](https://guides.emberjs.com/release/components/helper-functions/) guide

lib/rules/template-no-unnecessary-curly-parens.js

@@ -21,7 +21,7 @@ module.exports = {
     fixable: 'code',
     schema: [],
     messages: {
-      noUnnecessaryCurlyParens: 'Unnecessary parentheses enclosing statement.',
+      noUnnecessaryCurlyParens: 'Unnecessary parentheses enclosing statement',
     },
     originallyFrom: {
       name: 'ember-template-lint',

tests/lib/rules/template-no-unnecessary-curly-parens.js

@@ -5,62 +5,63 @@
 const rule = require('../../../lib/rules/template-no-unnecessary-curly-parens');
 const RuleTester = require('eslint').RuleTester;
 
-const ruleTester = new RuleTester({
+const validHbs = [
+  '{{foo}}',
+  '{{this.foo}}',
+  '{{(helper)}}',
+  '{{(this.helper)}}',
+  '{{concat "a" "b"}}',
+  '{{concat (capitalize "foo") "-bar"}}',
+];
+
+const invalidHbs = [
+  {
+    code: '<FooBar @x="{{index}}X{{(someHelper foo)}}" />',
+    output: '<FooBar @x="{{index}}X{{someHelper foo}}" />',
+    errors: [{ messageId: 'noUnnecessaryCurlyParens' }],
+  },
+  {
+    code: '<FooBar @x="{{index}}XY{{(someHelper foo)}}" />',
+    output: '<FooBar @x="{{index}}XY{{someHelper foo}}" />',
+    errors: [{ messageId: 'noUnnecessaryCurlyParens' }],
+  },
+  {
+    code: '<FooBar @x="{{index}}--{{(someHelper foo)}}" />',
+    output: '<FooBar @x="{{index}}--{{someHelper foo}}" />',
+    errors: [{ messageId: 'noUnnecessaryCurlyParens' }],
+  },
+  {
+    code: '{{(concat "a" "b")}}',
+    output: '{{concat "a" "b"}}',
+    errors: [{ messageId: 'noUnnecessaryCurlyParens' }],
+  },
+  {
+    code: '{{(helper a="b")}}',
+    output: '{{helper a="b"}}',
+    errors: [{ messageId: 'noUnnecessaryCurlyParens' }],
+  },
+];
+
+function wrapTemplate(entry) {
+  if (typeof entry === 'string') {
+    return `<template>${entry}</template>`;
+  }
+
+  return {
+    ...entry,
+    code: `<template>${entry.code}</template>`,
+    output: entry.output ? `<template>${entry.output}</template>` : entry.output,
+  };
+}
+
+const gjsRuleTester = new RuleTester({
   parser: require.resolve('ember-eslint-parser'),
   parserOptions: { ecmaVersion: 2022, sourceType: 'module' },
 });
 
-ruleTester.run('template-no-unnecessary-curly-parens', rule, {
-  valid: [
-    '<template>{{helper param}}</template>',
-    '<template>{{#if condition}}text{{/if}}</template>',
-    '<template>{{this.property}}</template>',
-
-    '<template>{{foo}}</template>',
-    '<template>{{this.foo}}</template>',
-    '<template>{{(helper)}}</template>',
-    '<template>{{(this.helper)}}</template>',
-    '<template>{{concat "a" "b"}}</template>',
-    '<template>{{concat (capitalize "foo") "-bar"}}</template>',
-  ],
-  invalid: [
-    {
-      code: '<template>{{(helper value)}}</template>',
-      output: '<template>{{helper value}}</template>',
-      errors: [{ messageId: 'noUnnecessaryCurlyParens' }],
-    },
-    {
-      code: '<template>{{(concat "a" "b")}}</template>',
-      output: '<template>{{concat "a" "b"}}</template>',
-      errors: [{ messageId: 'noUnnecessaryCurlyParens' }],
-    },
-    {
-      code: '<template>{{(if condition "yes" "no")}}</template>',
-      output: '<template>{{if condition "yes" "no"}}</template>',
-      errors: [{ messageId: 'noUnnecessaryCurlyParens' }],
-    },
-
-    {
-      code: '<template><FooBar @x="{{index}}X{{(someHelper foo)}}" /></template>',
-      output: '<template><FooBar @x="{{index}}X{{someHelper foo}}" /></template>',
-      errors: [{ messageId: 'noUnnecessaryCurlyParens' }],
-    },
-    {
-      code: '<template><FooBar @x="{{index}}XY{{(someHelper foo)}}" /></template>',
-      output: '<template><FooBar @x="{{index}}XY{{someHelper foo}}" /></template>',
-      errors: [{ messageId: 'noUnnecessaryCurlyParens' }],
-    },
-    {
-      code: '<template><FooBar @x="{{index}}--{{(someHelper foo)}}" /></template>',
-      output: '<template><FooBar @x="{{index}}--{{someHelper foo}}" /></template>',
-      errors: [{ messageId: 'noUnnecessaryCurlyParens' }],
-    },
-    {
-      code: '<template>{{(helper a="b")}}</template>',
-      output: '<template>{{helper a="b"}}</template>',
-      errors: [{ messageId: 'noUnnecessaryCurlyParens' }],
-    },
-  ],
+gjsRuleTester.run('template-no-unnecessary-curly-parens', rule, {
+  valid: validHbs.map(wrapTemplate),
+  invalid: invalidHbs.map(wrapTemplate),
 });
 
 const hbsRuleTester = new RuleTester({
@@ -72,39 +73,6 @@ const hbsRuleTester = new RuleTester({
 });
 
 hbsRuleTester.run('template-no-unnecessary-curly-parens', rule, {
-  valid: [
-    '{{foo}}',
-    '{{this.foo}}',
-    '{{(helper)}}',
-    '{{(this.helper)}}',
-    '{{concat "a" "b"}}',
-    '{{concat (capitalize "foo") "-bar"}}',
-  ],
-  invalid: [
-    {
-      code: '<FooBar @x="{{index}}X{{(someHelper foo)}}" />',
-      output: '<FooBar @x="{{index}}X{{someHelper foo}}" />',
-      errors: [{ message: 'Unnecessary parentheses enclosing statement.' }],
-    },
-    {
-      code: '<FooBar @x="{{index}}XY{{(someHelper foo)}}" />',
-      output: '<FooBar @x="{{index}}XY{{someHelper foo}}" />',
-      errors: [{ message: 'Unnecessary parentheses enclosing statement.' }],
-    },
-    {
-      code: '<FooBar @x="{{index}}--{{(someHelper foo)}}" />',
-      output: '<FooBar @x="{{index}}--{{someHelper foo}}" />',
-      errors: [{ message: 'Unnecessary parentheses enclosing statement.' }],
-    },
-    {
-      code: '{{(concat "a" "b")}}',
-      output: '{{concat "a" "b"}}',
-      errors: [{ message: 'Unnecessary parentheses enclosing statement.' }],
-    },
-    {
-      code: '{{(helper a="b")}}',
-      output: '{{helper a="b"}}',
-      errors: [{ message: 'Unnecessary parentheses enclosing statement.' }],
-    },
-  ],
+  valid: validHbs,
+  invalid: invalidHbs,
 });