Sync with template-lint

Author: NullVoxPopuli

README.md

@@ -253,7 +253,7 @@ rules in templates can be disabled with eslint directives with mustache or html
 | [template-no-obsolete-elements](docs/rules/template-no-obsolete-elements.md)                                       | disallow obsolete HTML elements                                              |    |    |    |
 | [template-no-outlet-outside-routes](docs/rules/template-no-outlet-outside-routes.md)                               | disallow {{outlet}} outside of route templates                               |    |    |    |
 | [template-no-page-title-component](docs/rules/template-no-page-title-component.md)                                 | disallow usage of ember-page-title component                                 |    |    |    |
-| [template-require-has-block-helper](docs/rules/template-require-has-block-helper.md)                               | require (has-block) helper usage instead of hasBlock property                |    |    |    |
+| [template-require-has-block-helper](docs/rules/template-require-has-block-helper.md)                               | require (has-block) helper usage instead of hasBlock property                |    | 🔧 |    |
 | [template-require-iframe-src-attribute](docs/rules/template-require-iframe-src-attribute.md)                       | require iframe elements to have src attribute                                |    | 🔧 |    |
 | [template-require-splattributes](docs/rules/template-require-splattributes.md)                                     | require splattributes usage in component templates                           |    |    |    |
 | [template-require-strict-mode](docs/rules/template-require-strict-mode.md)                                         | require templates to be in strict mode                                       |    |    |    |

docs/rules/template-require-has-block-helper.md

@@ -1,54 +1,67 @@
 # ember/template-require-has-block-helper
 
-> **HBS Only**: This rule applies to classic `.hbs` template files only (loose mode). It is not relevant for `gjs`/`gts` files (strict mode), where these patterns cannot occur.
+🔧 This rule is automatically fixable by the [`--fix` CLI option](https://eslint.org/docs/latest/user-guide/command-line-interface#--fix).
 
 <!-- end auto-generated rule header -->
 
-Requires usage of the `(has-block)` helper instead of the `hasBlock` property.
+In Ember 3.26 the properties `hasBlock` and `hasBlockParams` were deprecated. Their replacement is to use `has-block` and `has-block-params` helpers instead.
 
-## Rule Details
+This rule prevents the usage of `hasBlock` and `hasBlockParams` and suggests using `has-block` or `has-block-params` instead.
 
-The `(has-block)` helper is the preferred way to check if a block was provided to a component.
+For more information about this deprecation you can view the [RFC](https://github.com/emberjs/rfcs/blob/master/text/0689-deprecate-has-block.md) or its entry on the [Deprecations page](https://deprecations.emberjs.com/v3.x/#toc_has-block-and-has-block-params).
 
 ## Examples
 
-Examples of **incorrect** code for this rule:
+This rule **forbids** the following:
 
-```hbs
-{{#if hasBlock}}
-  {{yield}}
-{{/if}}
+```gjs
+<template>
+  {{hasBlock}}
+  {{#if hasBlock}}
+
+  {{/if}}
+</template>
 ```
 
-```hbs
-{{#if this.hasBlock}}
-  {{yield}}
-{{/if}}
+```gjs
+<template>
+  {{hasBlockParams}}
+  {{#if hasBlockParams}}
+
+  {{/if}}
+</template>
 ```
 
-Examples of **correct** code for this rule:
+This rule **allows** the following:
 
-```hbs
-{{#if (has-block)}}
-  {{yield}}
-{{/if}}
+```gjs
+<template>
+  {{has-block}}
+  {{#if (has-block)}}
+
+  {{/if}}
+</template>
 ```
 
-```hbs
-{{#if (has-block 'inverse')}}
-  {{yield to='inverse'}}
-{{/if}}
+```gjs
+<template>
+  {{has-block-params}}
+  {{#if (has-block-params)}}
+
+  {{/if}}
+</template>
 ```
 
 ## Migration
 
-- `{{hasBlock}}`-> `{{has-block}}
-- `{{hasBlockParams}}`-> `{{has-block-params}}
-- `{{#if hasBlock}} {{/if}}`-> `{{#if (has-block)}} {{/if}}`
-- `{{#if (hasBlock "inverse")}} {{/if}}`-> `{{#if (has-block "inverse")}} {{/if}}`
-- `{{#if hasBlockParams}} {{/if}}`-> `{{#if (has-block-params)}} {{/if}}`
-- `{{#if (hasBlockParams "inverse")}} {{/if}}`-> `{{#if (has-block-params "inverse")}} {{/if}}`
+- `{{hasBlock}}` -> `{{has-block}}`
+- `{{hasBlockParams}}` -> `{{has-block-params}}`
+- `{{#if hasBlock}} {{/if}}` -> `{{#if (has-block)}} {{/if}}`
+- `{{#if (hasBlock "inverse")}} {{/if}}` -> `{{#if (has-block "inverse")}} {{/if}}`
+- `{{#if hasBlockParams}} {{/if}}` -> `{{#if (has-block-params)}} {{/if}}`
+- `{{#if (hasBlockParams "inverse")}} {{/if}}` -> `{{#if (has-block-params "inverse")}} {{/if}}`
 
 ## References
 
-- [eslint-plugin-ember template-require-has-block-helper](https://github.com/ember-cli/eslint-plugin-ember/blob/master/docs/rules/template-require-has-block-helper.md)
+- [RFC](https://github.com/emberjs/rfcs/blob/master/text/0689-deprecate-has-block.md)
+- [Deprecation information](https://deprecations.emberjs.com/v3.x/#toc_has-block-and-has-block-params)

lib/rules/template-require-has-block-helper.js

@@ -1,18 +1,46 @@
+const TRANSFORMATIONS = {
+  hasBlock: 'has-block',
+  hasBlockParams: 'has-block-params',
+};
+
+function getErrorMessage(name) {
+  return `\`${name}\` is deprecated. Use the \`${TRANSFORMATIONS[name]}\` helper instead.`;
+}
+
+function shouldWrapInSubExpression(node) {
+  const parent = node.parent;
+
+  if (!parent) {
+    return false;
+  }
+
+  if (parent.type === 'GlimmerBlockStatement') {
+    return true;
+  }
+
+  if (
+    (parent.type === 'GlimmerMustacheStatement' || parent.type === 'GlimmerSubExpression') &&
+    parent.path !== node
+  ) {
+    return true;
+  }
+
+  return false;
+}
+
 /** @type {import('eslint').Rule.RuleModule} */
 module.exports = {
   meta: {
     type: 'suggestion',
     docs: {
       description: 'require (has-block) helper usage instead of hasBlock property',
       category: 'Best Practices',
+      fixable: true,
       url: 'https://github.com/ember-cli/eslint-plugin-ember/tree/master/docs/rules/template-require-has-block-helper.md',
-      templateMode: 'loose',
+      templateMode: 'both',
     },
-    fixable: null,
+    fixable: 'code',
     schema: [],
-    messages: {
-      useHasBlockHelper: 'Use (has-block) helper instead of hasBlock property.',
-    },
     originallyFrom: {
       name: 'ember-template-lint',
       rule: 'lib/rules/require-has-block-helper.js',
@@ -24,15 +52,18 @@ module.exports = {
   create(context) {
     return {
       GlimmerPathExpression(node) {
-        if (
-          node.original === 'hasBlock' ||
-          node.original === 'this.hasBlock' ||
-          node.original === 'hasBlockParams' ||
-          node.original === 'this.hasBlockParams'
-        ) {
+        const replacement = TRANSFORMATIONS[node.original];
+
+        if (replacement) {
           context.report({
             node,
-            messageId: 'useHasBlockHelper',
+            message: getErrorMessage(node.original),
+            fix(fixer) {
+              return fixer.replaceTextRange(
+                node.range,
+                shouldWrapInSubExpression(node) ? `(${replacement})` : replacement
+              );
+            },
           });
         }
       },