Sync with template-lint

Author: NullVoxPopuli

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

@@ -6,16 +6,12 @@
 
 Strings need not be wrapped in curly braces (mustache expressions).
 
-## Rule Details
-
-This rule detects unnecessary mustache expressions wrapping simple string literals. It checks both **attribute values** and **text content**.
-
 ## Examples
 
 This rule **forbids** the following:
 
 ```gjs
-<template><FooBar class={{'btn'}} /></template>
+<template><FooBar class={{"btn"}} /></template>
 ```
 
 ```gjs
@@ -25,11 +21,11 @@ This rule **forbids** the following:
 This rule **allows** the following:
 
 ```gjs
-<template><FooBar class='btn' /></template>
+<template><FooBar class="btn" /></template>
 ```
 
 ```gjs
-<template><FooBar class='btn'>Hello</FooBar></template>
+<template><FooBar class="btn">Hello</FooBar></template>
 ```
 
 ## References

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

@@ -5,14 +5,12 @@ module.exports = {
     docs: {
       description: 'disallow unnecessary curly braces in string interpolations',
       category: 'Style',
-      recommendedGjs: false,
-      recommendedGts: false,
       url: 'https://github.com/ember-cli/eslint-plugin-ember/tree/master/docs/rules/template-no-unnecessary-curly-strings.md',
       templateMode: 'both',
     },
     fixable: 'code',
     schema: [],
-    messages: { unnecessary: 'Unnecessary curly braces in string.' },
+    messages: { unnecessary: 'Unnecessary curly braces around string' },
     originallyFrom: {
       name: 'ember-template-lint',
       rule: 'lib/rules/no-unnecessary-curly-strings.js',

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

@@ -1,47 +1,57 @@
 const rule = require('../../../lib/rules/template-no-unnecessary-curly-strings');
 const RuleTester = require('eslint').RuleTester;
 
-const ruleTester = new RuleTester({
+const validHbs = [
+  '<FooBar class="btn" />',
+  '{{foo}}',
+  '{{(foo)}}',
+  '{{this.calculate 1 2 op="add"}}',
+  '{{get address part}}',
+  'foo',
+  '"foo"',
+  '<FooBar value=12345 />',
+  '<FooBar value=null />',
+  '<FooBar value=true />',
+  '<FooBar value=undefined />',
+  '<FooBar value={{12345}} />',
+  '<FooBar value={{null}} />',
+  '<FooBar value={{true}} />',
+  '<FooBar value={{undefined}} />',
+];
+
+const invalidHbs = [
+  {
+    code: '<FooBar class={{"btn"}} @fooArg={{\'barbaz\'}} />',
+    output: '<FooBar class="btn" @fooArg=\'barbaz\' />',
+    errors: [{ messageId: 'unnecessary' }, { messageId: 'unnecessary' }],
+  },
+  {
+    code: '<FooBar class="btn">{{"Foo"}}</FooBar>',
+    output: '<FooBar class="btn">Foo</FooBar>',
+    errors: [{ messageId: 'unnecessary' }],
+  },
+];
+
+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-strings', rule, {
-  valid: [
-    '<template><div class="foo"></div></template>',
-    '<template><FooBar class="btn" /></template>',
-    '<template>{{foo}}</template>',
-    '<template>{{(foo)}}</template>',
-    '<template>{{this.calculate 1 2 op="add"}}</template>',
-    '<template>{{get address part}}</template>',
-    '<template>foo</template>',
-    '<template>"foo"</template>',
-    '<template><FooBar value=12345 /></template>',
-    '<template><FooBar value=null /></template>',
-    '<template><FooBar value=true /></template>',
-    '<template><FooBar value=undefined /></template>',
-    '<template><FooBar value={{12345}} /></template>',
-    '<template><FooBar value={{null}} /></template>',
-    '<template><FooBar value={{true}} /></template>',
-    '<template><FooBar value={{undefined}} /></template>',
-  ],
-  invalid: [
-    {
-      code: '<template><div class={{"foo"}}></div></template>',
-      output: '<template><div class="foo"></div></template>',
-      errors: [{ messageId: 'unnecessary' }],
-    },
 
-    {
-      code: '<template><FooBar class={{"btn"}} @fooArg={{\'barbaz\'}} /></template>',
-      output: '<template><FooBar class="btn" @fooArg=\'barbaz\' /></template>',
-      errors: [{ messageId: 'unnecessary' }, { messageId: 'unnecessary' }],
-    },
-    {
-      code: '<template><FooBar class="btn">{{"Foo"}}</FooBar></template>',
-      output: '<template><FooBar class="btn">Foo</FooBar></template>',
-      errors: [{ messageId: 'unnecessary' }],
-    },
-  ],
+gjsRuleTester.run('template-no-unnecessary-curly-strings', rule, {
+  valid: validHbs.map(wrapTemplate),
+  invalid: invalidHbs.map(wrapTemplate),
 });
 
 const hbsRuleTester = new RuleTester({
@@ -53,36 +63,6 @@ const hbsRuleTester = new RuleTester({
 });
 
 hbsRuleTester.run('template-no-unnecessary-curly-strings', rule, {
-  valid: [
-    '<FooBar class="btn" />',
-    '{{foo}}',
-    '{{(foo)}}',
-    '{{this.calculate 1 2 op="add"}}',
-    '{{get address part}}',
-    'foo',
-    '"foo"',
-    '<FooBar value=12345 />',
-    '<FooBar value=null />',
-    '<FooBar value=true />',
-    '<FooBar value=undefined />',
-    '<FooBar value={{12345}} />',
-    '<FooBar value={{null}} />',
-    '<FooBar value={{true}} />',
-    '<FooBar value={{undefined}} />',
-  ],
-  invalid: [
-    {
-      code: '<FooBar class={{"btn"}} @fooArg={{\'barbaz\'}} />',
-      output: '<FooBar class="btn" @fooArg=\'barbaz\' />',
-      errors: [
-        { message: 'Unnecessary curly braces in string.' },
-        { message: 'Unnecessary curly braces in string.' },
-      ],
-    },
-    {
-      code: '<FooBar class="btn">{{"Foo"}}</FooBar>',
-      output: '<FooBar class="btn">Foo</FooBar>',
-      errors: [{ message: 'Unnecessary curly braces in string.' }],
-    },
-  ],
+  valid: validHbs,
+  invalid: invalidHbs,
 });