Merge pull request #80 from Turbo87/has-block

NullVoxPopuli · web-flow · commit bee303d981a5 · 2019-12-15T09:02:25.000-05:00
Fix `hasBlock` handling
diff --git a/transforms/no-implicit-this/__testfixtures__/has-block.input.hbs b/transforms/no-implicit-this/__testfixtures__/has-block.input.hbs
@@ -0,0 +1,8 @@
+{{if hasBlock "block"}}
+{{#if hasBlock}}block{{/if}}
+{{if (has-block) "block"}}
+{{#if (has-block)}}block{{/if}}
+{{if (has-block "main") "block"}}
+{{#if (has-block "main")}}block{{/if}}
+{{if (has-block-params "main") "block"}}
+{{#if (has-block-params "main")}}block{{/if}}
diff --git a/transforms/no-implicit-this/__testfixtures__/has-block.output.hbs b/transforms/no-implicit-this/__testfixtures__/has-block.output.hbs
@@ -0,0 +1,8 @@
+{{if hasBlock "block"}}
+{{#if hasBlock}}block{{/if}}
+{{if (has-block) "block"}}
+{{#if (has-block)}}block{{/if}}
+{{if (has-block "main") "block"}}
+{{#if (has-block "main")}}block{{/if}}
+{{if (has-block-params "main") "block"}}
+{{#if (has-block-params "main")}}block{{/if}}
diff --git a/transforms/no-implicit-this/helpers/known-helpers.js b/transforms/no-implicit-this/helpers/known-helpers.js
@@ -12,7 +12,7 @@ const KNOWN_HELPERS = [
   'get',
   'hash',
   'has-block',
-  'hasBlock',
+  'has-block-params',
   'if',
   'if-unless',
   'in-element',
diff --git a/transforms/no-implicit-this/helpers/plugin.js b/transforms/no-implicit-this/helpers/plugin.js
@@ -55,6 +55,9 @@ function transformPlugin(env, options = {}) {
     let firstPart = node.parts[0];
     if (scopedParams.includes(firstPart)) return;
 
+    // skip `hasBlock` keyword
+    if (node.original === 'hasBlock') return;
+
     // add `this.` prefix
     Object.assign(node, b.path(`this.${node.original}`));
   }

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,9 @@ function transformPlugin(env, options = {}) {`
`55`	`55`	`let firstPart = node.parts[0];`
`56`	`56`	`if (scopedParams.includes(firstPart)) return;`
`57`	`57`
	`58`	+ // skip `hasBlock` keyword
	`59`	`+ if (node.original === 'hasBlock') return;`
	`60`	`+`
`58`	`61`	// add `this.` prefix
`59`	`62`	Object.assign(node, b.path(`this.${node.original}`));
`60`	`63`	`}`