Clean up imports

Author: wagenet

packages/@ember/-internals/container/index.ts

@@ -5,5 +5,17 @@ The public API, specified on the application namespace should be considered the
   @private
 */
 
-export { default as Registry, privatize } from './lib/registry';
-export { default as Container, getFactoryFor, setFactoryFor, INIT_FACTORY } from './lib/container';
+export {
+  default as Registry,
+  Resolver,
+  ResolverClass,
+  TypeOptions,
+  privatize,
+} from './lib/registry';
+export {
+  default as Container,
+  getFactoryFor,
+  setFactoryFor,
+  FactoryManager,
+  INIT_FACTORY,
+} from './lib/container';

packages/@ember/-internals/extension-support/lib/container_debug_adapter.ts

@@ -1,9 +1,12 @@
 import { classify, dasherize } from '@ember/string';
-import type { NativeArray } from '@ember/-internals/runtime';
-import { A as emberA, typeOf, Namespace, Object as EmberObject } from '@ember/-internals/runtime';
+import { A as emberA } from '@ember/array';
+import type { NativeArray } from '@ember/array';
+import Namespace from '@ember/application/namespace';
+import EmberObject from '@ember/object';
+import { typeOf } from '@ember/-internals/runtime';
 import type { Owner } from '@ember/-internals/owner';
 import { getOwner } from '@ember/-internals/owner';
-import type { Resolver } from '@ember/-internals/container/lib/registry';
+import type { Resolver } from '@ember/-internals/container';
 
 /**
 @module @ember/debug

packages/@ember/-internals/extension-support/lib/data_adapter.ts

@@ -1,10 +1,11 @@
 import type { Owner } from '@ember/-internals/owner';
 import { getOwner } from '@ember/-internals/owner';
 import { _backburner } from '@ember/runloop';
-import { get } from '@ember/-internals/metal';
+import EmberObject, { get } from '@ember/object';
 import { dasherize } from '@ember/string';
-import type { NativeArray } from '@ember/-internals/runtime';
-import { Namespace, Object as EmberObject, A as emberA } from '@ember/-internals/runtime';
+import type { NativeArray } from '@ember/array';
+import { A as emberA } from '@ember/array';
+import Namespace from '@ember/application/namespace';
 import type { Cache } from '@glimmer/validator';
 import { consumeTag, createCache, getValue, tagFor, untrack } from '@glimmer/validator';
 import type { ContainerDebugAdapter } from '..';

packages/@ember/-internals/glimmer/index.ts

@@ -299,9 +299,16 @@ export { default as Input } from './lib/components/input';
 export { default as LinkTo } from './lib/components/link-to';
 export { default as Textarea } from './lib/components/textarea';
 export { default as Component } from './lib/component';
-export { default as Helper, helper } from './lib/helper';
+export {
+  default as Helper,
+  helper,
+  HelperFactory,
+  HelperFunction,
+  SimpleHelper,
+} from './lib/helper';
+export { ActionState } from './lib/modifiers/action';
 export { SafeString, escapeExpression, htmlSafe, isHTMLSafe } from './lib/utils/string';
-export { Renderer, _resetRenderers, renderSettled } from './lib/renderer';
+export { Renderer, View, _resetRenderers, renderSettled } from './lib/renderer';
 export {
   getTemplate,
   setTemplate,
@@ -316,7 +323,7 @@ export { DOMChanges, NodeDOMTreeConstruction, DOMTreeConstruction } from './lib/
 // TODO just test these through public API
 // a lot of these are testing how a problem was solved
 // rather than the problem was solved
-export { default as OutletView } from './lib/views/outlet';
+export { default as OutletView, BootEnvironment } from './lib/views/outlet';
 export { OutletState } from './lib/utils/outlet';
 export {
   componentCapabilities,

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

@@ -1,5 +1,6 @@
-import { get, PROPERTY_DID_CHANGE } from '@ember/-internals/metal';
-import type { PropertyDidChange } from '@ember/-internals/metal/lib/property_events';
+import { PROPERTY_DID_CHANGE } from '@ember/-internals/metal';
+import type { PropertyDidChange } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 import { getOwner } from '@ember/-internals/owner';
 import { TargetActionSupport } from '@ember/-internals/runtime';
 import {

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

@@ -1,4 +1,5 @@
-import type { Route, RouterState, RoutingService } from '@ember/-internals/routing';
+import type { RouterState, RoutingService } from '@ember/-internals/routing';
+import type Route from '@ember/routing/route';
 import { isSimpleClick } from '@ember/-internals/views';
 import { assert, debugFreeze, inspect, warn } from '@ember/debug';
 import { getEngineParent } from '@ember/engine';

packages/@ember/-internals/glimmer/lib/environment.ts

@@ -1,11 +1,12 @@
 import { ENV } from '@ember/-internals/environment';
-import { get, set, _getProp, _setProp } from '@ember/-internals/metal';
+import { get, set } from '@ember/object';
+import { _getProp, _setProp } from '@ember/-internals/metal';
 import type { Owner } from '@ember/-internals/owner';
 import { getDebugName } from '@ember/-internals/utils';
 import { constructStyleDeprecationMessage } from '@ember/-internals/views';
 import { EMBER_DEFAULT_HELPER_MANAGER } from '@ember/canary-features';
 import { assert, deprecate, warn } from '@ember/debug';
-import type { DeprecationOptions } from '@ember/debug/lib/deprecate';
+import type { DeprecationOptions } from '@ember/debug';
 import { schedule, _backburner } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
 import setGlobalContext from '@glimmer/global-context';

packages/@ember/-internals/glimmer/lib/helper.ts

@@ -2,7 +2,7 @@
 @module @ember/component
 */
 
-import type { FactoryManager } from '@ember/-internals/container/lib/container';
+import type { FactoryManager } from '@ember/-internals/container';
 import type { Factory, Owner } from '@ember/-internals/owner';
 import { setOwner } from '@ember/-internals/owner';
 import { FrameworkObject } from '@ember/-internals/runtime';

packages/@ember/-internals/glimmer/lib/helpers/action.ts

@@ -1,7 +1,7 @@
 /**
 @module ember
 */
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 import type { AnyFn } from '@ember/-internals/utils/types';
 import { assert } from '@ember/debug';
 import { flaggedInstrument } from '@ember/instrumentation';

packages/@ember/-internals/glimmer/lib/resolver.ts

@@ -1,5 +1,5 @@
 import { privatize as P } from '@ember/-internals/container';
-import type { TypeOptions } from '@ember/-internals/container/lib/registry';
+import type { TypeOptions } from '@ember/-internals/container';
 import { ENV } from '@ember/-internals/environment';
 import type { Factory, Owner } from '@ember/-internals/owner';
 import { isFactory } from '@ember/-internals/owner';