Merge pull request #20734 from emberjs/circularity

working to remove circular dependencies

Author: ef4

packages/@ember/-internals/glimmer/lib/component-managers/curly.ts

@@ -260,6 +260,7 @@ export default class CurlyComponentManager
 
     beginTrackFrame();
     let props = processComponentArgs(capturedArgs);
+    props[ARGS] = capturedArgs;
     let argsTag = endTrackFrame();
 
     // Alias `id` argument to `elementId` property on the component instance.

packages/@ember/-internals/glimmer/lib/components/link-to.ts

@@ -2,8 +2,8 @@ import type Route from '@ember/routing/route';
 import type { RouterState, RoutingService } from '@ember/routing/-internals';
 import { isSimpleClick } from '@ember/-internals/views';
 import { assert, debugFreeze, inspect, warn } from '@ember/debug';
-import { getEngineParent } from '@ember/engine';
-import EngineInstance from '@ember/engine/instance';
+import { getEngineParent } from '@ember/engine/parent';
+import type EngineInstance from '@ember/engine/instance';
 import { flaggedInstrument } from '@ember/instrumentation';
 import { action } from '@ember/object';
 import { service } from '@ember/service';
@@ -494,13 +494,13 @@ class _LinkTo extends InternalComponent {
   }
 
   private get isEngine(): boolean {
-    let owner = this.owner;
-    return owner instanceof EngineInstance && getEngineParent(owner) !== undefined;
+    let owner = this.owner as EngineInstance;
+    return getEngineParent(owner) !== undefined;
   }
 
   private get engineMountPoint(): string | undefined {
-    let owner = this.owner;
-    return owner instanceof EngineInstance ? owner.mountPoint : undefined;
+    let owner = this.owner as EngineInstance;
+    return owner.mountPoint;
   }
 
   private classFor(state: 'active' | 'loading' | 'disabled'): string {

packages/@ember/-internals/glimmer/lib/templates/input.ts

@@ -1,5 +1,5 @@
 import { precompileTemplate } from '@ember/template-compilation';
-import { on } from '@ember/modifier';
+import { on } from '@ember/modifier/on';
 export default precompileTemplate(
   `<input
   {{!-- for compatibility --}}

packages/@ember/-internals/glimmer/lib/templates/link-to.ts

@@ -1,5 +1,5 @@
 import { precompileTemplate } from '@ember/template-compilation';
-import { on } from '@ember/modifier';
+import { on } from '@ember/modifier/on';
 
 export default precompileTemplate(
   `<a

packages/@ember/-internals/glimmer/lib/templates/textarea.ts

@@ -1,5 +1,5 @@
 import { precompileTemplate } from '@ember/template-compilation';
-import { on } from '@ember/modifier';
+import { on } from '@ember/modifier/on';
 
 export default precompileTemplate(
   `<textarea

packages/@ember/-internals/glimmer/lib/utils/process-args.ts

@@ -3,7 +3,6 @@ import type { CapturedNamedArguments } from '@glimmer/interfaces';
 import type { Reference } from '@glimmer/reference';
 import { isUpdatableRef, updateRef, valueForRef } from '@glimmer/reference';
 import { assert } from '@ember/debug';
-import { ARGS } from '../component-managers/curly';
 import { ACTIONS } from '../helpers/action';
 
 // ComponentArgs takes EvaluatedNamedArgs and converts them into the
@@ -13,8 +12,6 @@ export function processComponentArgs(namedArgs: CapturedNamedArguments) {
   let attrs = Object.create(null);
   let props = Object.create(null);
 
-  props[ARGS] = namedArgs;
-
   for (let name in namedArgs) {
     let ref = namedArgs[name];
     assert('expected ref', ref);

packages/@ember/-internals/glimmer/lib/utils/to-bool.ts

@@ -1,4 +1,4 @@
-import { isHTMLSafe } from '@ember/-internals/glimmer';
+import { isHTMLSafe } from './string';
 import { get, tagForProperty } from '@ember/-internals/metal';
 import { isArray } from '@ember/array';
 import { isProxy } from '@ember/-internals/utils';

packages/@ember/-internals/metal/lib/array.ts

@@ -12,13 +12,7 @@ interface ObservedObject {
   _revalidate?: () => void;
 }
 
-export function objectAt<T>(array: T[] | EmberArray<T>, index: number): T | undefined {
-  if (Array.isArray(array)) {
-    return array[index];
-  } else {
-    return array.objectAt(index);
-  }
-}
+export { objectAt } from './object-at';
 
 // Ideally, we'd use MutableArray.detect but for unknown reasons this causes
 // the node tests to fail strangely.

packages/@ember/-internals/metal/lib/chain-tags.ts

@@ -10,7 +10,7 @@ import {
   updateTag,
   validateTag,
 } from '@glimmer/validator';
-import { objectAt } from './array';
+import { objectAt } from './object-at';
 import { tagForProperty } from './tags';
 
 export const CHAIN_PASS_THROUGH = new WeakSet();

packages/@ember/-internals/metal/lib/object-at.ts

@@ -0,0 +1,9 @@
+import type EmberArray from '@ember/array';
+
+export function objectAt<T>(array: T[] | EmberArray<T>, index: number): T | undefined {
+  if (Array.isArray(array)) {
+    return array[index];
+  } else {
+    return array.objectAt(index);
+  }
+}