Merge pull request #21281 from NullVoxPopuli-ai-agent/nvp/remove-compile-export

Remove compile from internal-test-helpers public exports

Author: NullVoxPopuli

packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js

@@ -4,7 +4,7 @@ import EmberObject from '@ember/object';
 
 import { set, setProperties } from '@ember/object';
 
-import { Component, compile } from '../../utils/helpers';
+import { Component } from '../../utils/helpers';
 import { template } from '@ember/template-compiler/runtime';
 import templateOnly from '@ember/component/template-only';
 import { precompileTemplate } from '@ember/template-compilation';
@@ -679,7 +679,7 @@ moduleFor(
         // attempting to compile this template will throw
         this.owner.register(
           'component:test-harness',
-          setComponentTemplate(compile('<foo.bar />'), class extends Component {})
+          template('<foo.bar />', { component: class extends Component {}, strictMode: false })
         );
       }, /Error: You used foo.bar as a tag name, but foo is not in scope/);
     }

packages/@ember/-internals/glimmer/tests/integration/components/append-test.js

@@ -4,7 +4,7 @@ import { set } from '@ember/object';
 import { setComponentTemplate } from '@glimmer/manager';
 
 import { precompileTemplate } from '@ember/template-compilation';
-import { Component, compile } from '../../utils/helpers';
+import { Component } from '../../utils/helpers';
 
 class AbstractAppendTest extends RenderingTestCase {
   constructor() {
@@ -44,7 +44,7 @@ class AbstractAppendTest extends RenderingTestCase {
 
     let componentsByName = {};
 
-    let createLogger = (name, template) => {
+    let createLogger = (name, compiledTemplate) => {
       function pushHook(hookName) {
         hooks.push([name, hookName]);
       }
@@ -112,7 +112,7 @@ class AbstractAppendTest extends RenderingTestCase {
 
       let local = class extends LoggerComponent {};
 
-      setComponentTemplate(compile(template), local);
+      setComponentTemplate(compiledTemplate, local);
 
       this.owner.register(`component:${name}`, local);
 
@@ -121,20 +121,20 @@ class AbstractAppendTest extends RenderingTestCase {
 
     createLogger(
       'x-parent',
-      `[parent: {{this.foo}}]
+      precompileTemplate(`[parent: {{this.foo}}]
        [parent: {{this.parentValue}}
 
         <XChild @bar={{this.foo}} @childValue={{this.childValue}}>
          [yielded: {{this.foo}}]
         </XChild>
-      `
+      `)
     );
     createLogger(
       'x-child',
-      `
+      precompileTemplate(`
       [child: {{this.bar}}]
       [child: {{this.childValue}}]
-      {{yield}}`
+      {{yield}}`)
     );
 
     this.render(
@@ -353,8 +353,8 @@ class AbstractAppendTest extends RenderingTestCase {
 
       this.owner.register(`component:${name}`, ExtendedClass);
 
-      if (typeof resolveableTemplate === 'string') {
-        this.owner.register(`template:components/${name}`, compile(resolveableTemplate));
+      if (resolveableTemplate) {
+        this.owner.register(`template:components/${name}`, resolveableTemplate);
       }
     };
 
@@ -363,16 +363,17 @@ class AbstractAppendTest extends RenderingTestCase {
         layoutName = 'components/x-parent';
       },
 
-      resolveableTemplate:
-        '[parent: {{this.foo}}]{{#x-child bar=this.foo}}[yielded: {{this.foo}}]{{/x-child}}',
+      resolveableTemplate: precompileTemplate(
+        '[parent: {{this.foo}}]{{#x-child bar=this.foo}}[yielded: {{this.foo}}]{{/x-child}}'
+      ),
     });
 
     registerLoggerComponent('x-child', {
       ComponentClass: class extends Component {
         tagName = '';
       },
 
-      resolveableTemplate: '[child: {{this.bar}}]{{yield}}',
+      resolveableTemplate: precompileTemplate('[child: {{this.bar}}]{{yield}}'),
     });
 
     let XParent;

packages/@ember/-internals/glimmer/tests/integration/components/render-component-test.ts

@@ -13,8 +13,8 @@ import {
 
 import { Input, Textarea } from '@ember/component';
 import { precompileTemplate } from '@ember/template-compilation';
-import { compile } from 'internal-test-helpers';
 import { template } from '@ember/template-compiler/runtime';
+import { template as compileTimeTemplate } from '@ember/template-compiler';
 import { setComponentTemplate } from '@glimmer/manager';
 import templateOnly from '@ember/component/template-only';
 import { array, concat, fn, get, hash, on } from '@glimmer/runtime';
@@ -242,12 +242,20 @@ moduleFor(
       this.renderComponent(Root, { expect: '<div>Hello, world!</div>' });
     }
 
-    '@test Can shadow keywords'() {
-      let ifComponent = setComponentTemplate(precompileTemplate('Hello, world!'), templateOnly());
-      let Bar = setComponentTemplate(
-        compile('{{#if}}{{/if}}', { strictMode: true }, { if: ifComponent }),
-        templateOnly()
-      );
+    '@test Can shadow keywords (runtime)'() {
+      let each = setComponentTemplate(precompileTemplate('Hello, world!'), templateOnly());
+      let Bar = template('{{#each}}{{/each}}', {
+        scope: () => ({ each }),
+      });
+
+      this.renderComponent(Bar, { expect: 'Hello, world!' });
+    }
+
+    '@test Can shadow keywords (compile-time)'() {
+      let each = setComponentTemplate(precompileTemplate('Hello, world!'), templateOnly());
+      let Bar = compileTimeTemplate('{{#each}}{{/each}}', {
+        scope: () => ({ each }),
+      });
 
       this.renderComponent(Bar, { expect: 'Hello, world!' });
     }

packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js

@@ -1,5 +1,4 @@
 import {
-  compile,
   moduleFor,
   ApplicationTestCase,
   RenderingTestCase,
@@ -10,6 +9,8 @@ import {
 import { Input, Textarea } from '@ember/component';
 import { LinkTo } from '@ember/routing';
 import { precompileTemplate } from '@ember/template-compilation';
+import { template } from '@ember/template-compiler/runtime';
+import { template as compileTimeTemplate } from '@ember/template-compiler';
 import { setComponentTemplate } from '@glimmer/manager';
 import templateOnly from '@ember/component/template-only';
 import { hash, array, concat, get, on, fn } from '@glimmer/runtime';
@@ -60,12 +61,24 @@ moduleFor(
       this.assertStableRerender();
     }
 
-    '@test Can shadow keywords'() {
-      let ifComponent = setComponentTemplate(precompileTemplate('Hello, world!'), templateOnly());
-      let Bar = setComponentTemplate(
-        compile('{{#if}}{{/if}}', { strictMode: true }, { if: ifComponent }),
-        templateOnly()
-      );
+    '@test Can shadow keywords (runtime)'() {
+      let each = setComponentTemplate(precompileTemplate('Hello, world!'), templateOnly());
+      let Bar = template('{{#each}}{{/each}}', {
+        scope: () => ({ each }),
+      });
+
+      this.owner.register('component:bar', Bar);
+
+      this.render('<Bar/>');
+      this.assertHTML('Hello, world!');
+      this.assertStableRerender();
+    }
+
+    '@test Can shadow keywords (compile-time)'() {
+      let each = setComponentTemplate(precompileTemplate('Hello, world!'), templateOnly());
+      let Bar = compileTimeTemplate('{{#each}}{{/each}}', {
+        scope: () => ({ each }),
+      });
 
       this.owner.register('component:bar', Bar);
 

packages/@ember/-internals/glimmer/tests/utils/helpers.js

@@ -1,5 +1,4 @@
 export { precompile } from 'ember-template-compiler';
-export { compile } from 'internal-test-helpers';
 
 export {
   Helper,

packages/internal-test-helpers/index.ts

@@ -20,7 +20,6 @@ export {
 } from './lib/ember-dev/deprecation';
 export { defineSimpleHelper, defineSimpleModifier } from './lib/define-template-values';
 export { testIf, testUnless } from './lib/conditional-test';
-export { default as compile } from './lib/compile';
 export { equalsElement, classes, styles, regex } from './lib/matchers';
 export { runAppend, runDestroy, runTask, runTaskNext, runLoopSettled } from './lib/run';
 export { getContext, setContext, unsetContext } from './lib/test-context';