chore: update imports to support RFC tweaks (#8501)

* chore: update imports to support RFC tweaks

* fix lint

* fix lint

packages/-ember-data/addon/-private/index.ts

@@ -4,8 +4,8 @@ import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
 import ObjectProxy from '@ember/object/proxy';
 
 import { LegacyNetworkHandler } from '@ember-data/legacy-compat';
-import { RequestManager } from '@ember-data/request';
-import { Fetch } from '@ember-data/request/fetch';
+import RequestManager from '@ember-data/request';
+import Fetch from '@ember-data/request/fetch';
 import BaseStore from '@ember-data/store';
 
 export class Store extends BaseStore {

packages/json-api/src/-private/cache.ts

@@ -89,7 +89,7 @@ function makeCache(): CachedResource {
   This is the cache implementation used by `ember-data`.
 
   ```js
-  import { Cache } from '@ember-data/json-api';
+  import Cache from '@ember-data/json-api';
   import Store from '@ember-data/store';
 
   export default class extends Store {

packages/json-api/src/index.ts

@@ -1,4 +1,4 @@
-export { default as Cache } from './-private/cache';
+export { default } from './-private/cache';
 
 /**
   This package provides the default cache implementation used

packages/request/README.md

@@ -34,8 +34,8 @@ A `RequestManager` provides a request/response flow in which configured handlers
 The RequestManager on its own does not know how to fulfill requests. For this we must register at least one handler. A basic `Fetch` handler is provided that will take the request options provided and execute `fetch`.
 
 ```ts
-import { RequestManager } from '@ember-data/request';
-import { Fetch } from '@ember-data/request/fetch';
+import RequestManager from '@ember-data/request';
+import Fetch from '@ember-data/request/fetch';
 import { apiUrl } from './config';
 
 // ... create manager and add our Fetch handler
@@ -311,8 +311,8 @@ Most applications will desire to have a single `RequestManager` instance, which
 
 *services/request.ts*
 ```ts
-import { RequestManager } from '@ember-data/request';
-import { Fetch } from '@ember-data/request/fetch';
+import RequestManager from '@ember-data/request';
+import Fetch from '@ember-data/request/fetch';
 import Auth from 'ember-simple-auth/ember-data-handler';
 
 export default class extends RequestManager {
@@ -329,8 +329,8 @@ To have a request service unique to a Store:
 
 ```ts
 import Store from '@ember-data/store';
-import { RequestManager } from '@ember-data/request';
-import { Fetch } from '@ember-data/request/fetch';
+import RequestManager from '@ember-data/request';
+import Fetch from '@ember-data/request/fetch';
 
 class extends Store {
   requestManager = new RequestManager();
@@ -348,15 +348,15 @@ If using the package [ember-data](https://github.com/emberjs/data/tree/main/pack
 
 ```ts
 import Store from '@ember-data/store';
-import { RequestManager } from '@ember-data/request';
-import { LegacyHandler } from '@ember-data/legacy-network-handler';
+import RequestManager from '@ember-data/request';
+import { LegacyNetworkHandler } from '@ember-data/legacy-compat';
 
 export default class extends Store {
   requestManager = new RequestManager();
 
   constructor(args) {
     super(args);
-    this.requestManager.use([LegacyHandler]);
+    this.requestManager.use([LegacyNetworkHandler]);
   }
 }
 ```

packages/request/src/-private/manager.ts

@@ -30,8 +30,8 @@ A `RequestManager` provides a request/response flow in which configured handlers
 The RequestManager on its own does not know how to fulfill requests. For this we must register at least one handler. A basic `Fetch` handler is provided that will take the request options provided and execute `fetch`.
 
 ```ts
-import { RequestManager } from '@ember-data/request';
-import { Fetch } from '@ember-data/request/fetch';
+import RequestManager from '@ember-data/request';
+import Fetch from '@ember-data/request/fetch';
 import { apiUrl } from './config';
 
 // ... create manager and add our Fetch handler
@@ -258,8 +258,8 @@ Most applications will desire to have a single `RequestManager` instance, which
 
 *services/request.ts*
 ```ts
-import { RequestManager } from '@ember-data/request';
-import { Fetch } from '@ember-data/request/fetch';
+import RequestManager from '@ember-data/request';
+import Fetch from '@ember-data/request/fetch';
 import Auth from 'ember-simple-auth/ember-data-handler';
 
 export default class extends RequestManager {
@@ -276,8 +276,8 @@ To have a request service unique to a Store:
 
 ```ts
 import Store from '@ember-data/store';
-import { RequestManager } from '@ember-data/request';
-import { Fetch } from '@ember-data/request/fetch';
+import RequestManager from '@ember-data/request';
+import Fetch from '@ember-data/request/fetch';
 
 class extends Store {
   requestManager = new RequestManager();
@@ -295,15 +295,15 @@ If using the package [ember-data](https://github.com/emberjs/data/tree/main/pack
 
 ```ts
 import Store from '@ember-data/store';
-import { RequestManager } from '@ember-data/request';
-import { LegacyHandler } from '@ember-data/legacy-network-handler';
+import RequestManager from '@ember-data/request';
+import { LegacyNetworkHandler } from '@ember-data/legacy-compat';
 
 export default class extends Store {
   requestManager = new RequestManager();
 
   constructor(args) {
     super(args);
-    this.requestManager.use([LegacyHandler]);
+    this.requestManager.use([LegacyNetworkHandler]);
   }
 }
 ```
@@ -326,7 +326,7 @@ import { Future, GenericCreateArgs, Handler, RequestInfo } from './types';
 import { executeNextHandler } from './utils';
 /**
  * ```js
- * import { RequestManager } from '@ember-data/request';
+ * import RequestManager from '@ember-data/request';
  * ```
  *
  * A RequestManager provides a request/response flow in which configured
@@ -342,8 +342,8 @@ import { executeNextHandler } from './utils';
  * For example:
  *
  * ```ts
- * import { RequestManager } from '@ember-data/request';
- * import { Fetch } from '@ember-data/request/fetch';
+ * import RequestManager from '@ember-data/request';
+ * import Fetch from '@ember-data/request/fetch';
  * import Auth from 'ember-simple-auth/ember-data-handler';
  * import Config from './config';
  *

packages/request/src/-private/types.ts

@@ -56,27 +56,41 @@ export type Deferred<T> = {
 };
 
 /**
+ * A Future is a Promise which resolves to a StructuredDocument
+ * while providing the ability to `abort` the underlying request,
+ * `getStream` the response before the outer promise resolves;
+ *
  * @class Future
- * @internal
+ * @extends Promise
+ * @public
  */
 export type Future<T> = Promise<StructuredDataDocument<T>> & {
   /**
    * Cancel this request by firing the AbortController's signal.
    *
    * @method abort
-   * @internal
+   * @public
    * @returns {void}
    */
   abort(): void;
   /**
    * Get the response stream, if any, once made available.
    *
    * @method getStream
-   * @internal
+   * @public
    * @returns {Promise<ReadableStream | null>}
    */
   getStream(): Promise<ReadableStream | null>;
 
+  /**
+   *  Run a callback when this request completes. Use sparingly,
+   *  mostly useful for instrumentation and infrastructure.
+   *
+   * @method onFinalize
+   * @param cb the callback to run
+   * @public
+   * @returns void
+   */
   onFinalize(cb: () => void): void;
 };
 

packages/request/src/fetch.ts

@@ -20,19 +20,21 @@ const _fetch: typeof fetch =
  * `fetch` call presuming the response to be `json`.
  *
  * ```ts
- * import { Fetch } from '@ember-data/request/fetch';
+ * import Fetch from '@ember-data/request/fetch';
  *
  * manager.use([Fetch]);
  * ```
  *
  * @class Fetch
  * @public
  */
-export const Fetch = {
+const Fetch = {
   async request(context: Context) {
     const response = await _fetch(context.request.url!, context.request);
     context.setResponse(response);
 
     return response.json();
   },
 };
+
+export default Fetch;

packages/request/src/index.ts

@@ -1,2 +1,2 @@
-export { RequestManager } from './-private/manager';
+export { RequestManager as default } from './-private/manager';
 export { createDeferred } from './-private/future';

packages/store/README.md

@@ -69,7 +69,7 @@ The package `@ember-data/json-api` provides a `JSON:API` cache we can use. After
 
 ```js
 import Store from '@ember-data/store';
-import { Cache } from '@ember-data/json-api';
+import Cache from '@ember-data/json-api';
 
 class extends Store {
   createCache(storeWrapper) {

packages/store/src/-private/store-service.ts

@@ -8,7 +8,7 @@ import { _backburner as emberBackburner } from '@ember/runloop';
 import { importSync } from '@embroider/macros';
 
 import { DEBUG, TESTING } from '@ember-data/env';
-import type { Cache as CacheClass } from '@ember-data/json-api';
+import type CacheClass from '@ember-data/json-api';
 import type FetchManager from '@ember-data/legacy-compat/legacy-network-handler/fetch-manager';
 import type DSModelClass from '@ember-data/model';
 import {
@@ -25,7 +25,7 @@ import {
   DEPRECATE_STORE_FIND,
   DEPRECATE_V1_RECORD_DATA,
 } from '@ember-data/private-build-infra/deprecations';
-import type { RequestManager } from '@ember-data/request';
+import type RequestManager from '@ember-data/request';
 import type { Future } from '@ember-data/request/-private/types';
 import type { Cache, CacheV1 } from '@ember-data/types/q/cache';
 import type { CacheStoreWrapper } from '@ember-data/types/q/cache-store-wrapper';
@@ -200,8 +200,8 @@ class Store {
    *
    * ```ts
    * import Store from '@ember-data/store';
-   * import { RequestManager } from '@ember-data/request';
-   * import { Fetch } from '@ember/data/request/fetch';
+   * import RequestManager from '@ember-data/request';
+   * import Fetch from '@ember/data/request/fetch';
    *
    * class extends Store {
    *   constructor() {
@@ -2361,7 +2361,7 @@ class Store {
   createCache(storeWrapper: CacheStoreWrapper): Cache {
     if (HAS_JSON_API_PACKAGE) {
       if (_Cache === undefined) {
-        _Cache = (importSync('@ember-data/json-api') as typeof import('@ember-data/json-api')).Cache;
+        _Cache = (importSync('@ember-data/json-api') as typeof import('@ember-data/json-api')).default;
       }
 
       return new _Cache(storeWrapper);

packages/store/src/index.ts

@@ -29,7 +29,7 @@
  *
  * ```js
  * import Store from '@ember-data/store';
- * import { Cache } from '@ember-data/json-api';
+ * import Cache from '@ember-data/json-api';
  *
  * class extends Store {
  *   createCache(storeWrapper) {

tests/adapter-encapsulation/app/services/store.js

@@ -1,6 +1,6 @@
-import { Cache } from '@ember-data/json-api';
+import Cache from '@ember-data/json-api';
 import { LegacyNetworkHandler } from '@ember-data/legacy-compat';
-import { RequestManager } from '@ember-data/request';
+import RequestManager from '@ember-data/request';
 import Store from '@ember-data/store';
 
 export default class DefaultStore extends Store {

tests/docs/fixtures/expected.js

@@ -344,6 +344,9 @@ module.exports = {
     '(public) @ember-data/request RequestManager#request',
     '(public) @ember-data/request RequestManager#use',
     '(public) @ember-data/request RequestManager#useCache',
+    '(public) @ember-data/request Future#abort',
+    '(public) @ember-data/request Future#getStream',
+    '(public) @ember-data/request Future#onFinalize',
     '(public) @ember-data/serializer Serializer#normalize',
     '(public) @ember-data/serializer Serializer#normalizeResponse',
     '(public) @ember-data/serializer Serializer#serialize',

tests/graph/app/services/store.ts

@@ -1,6 +1,6 @@
 import { LegacyNetworkHandler } from '@ember-data/legacy-compat';
-import { RequestManager } from '@ember-data/request';
-import { Fetch } from '@ember-data/request/fetch';
+import RequestManager from '@ember-data/request';
+import Fetch from '@ember-data/request/fetch';
 import BaseStore from '@ember-data/store';
 
 export default class Store extends BaseStore {

tests/json-api/tests/integration/cache/documents-test.ts

@@ -2,7 +2,7 @@ import { module, test } from 'qunit';
 
 import { setupTest } from 'ember-qunit';
 
-import { Cache } from '@ember-data/json-api';
+import Cache from '@ember-data/json-api';
 import Store from '@ember-data/store';
 import type { NotificationType } from '@ember-data/store/-private/managers/notification-manager';
 import type {

tests/request/tests/integration/abort-test.ts

@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 
-import { RequestManager } from '@ember-data/request';
+import RequestManager from '@ember-data/request';
 import type { Context } from '@ember-data/request/-private/context';
 import type { Future, Handler, NextFn, RequestInfo } from '@ember-data/request/-private/types';
 

tests/request/tests/integration/custom-abort-test.ts

@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 
-import { RequestManager } from '@ember-data/request';
+import RequestManager from '@ember-data/request';
 import type { Context } from '@ember-data/request/-private/context';
 import type { Future, Handler, NextFn, RequestInfo } from '@ember-data/request/-private/types';
 

tests/request/tests/integration/error-propagation-test.ts

@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 
-import { RequestManager } from '@ember-data/request';
+import RequestManager from '@ember-data/request';
 import type { Context } from '@ember-data/request/-private/context';
 import type { Future, Handler, NextFn, StructuredErrorDocument } from '@ember-data/request/-private/types';
 

tests/request/tests/integration/graceful-dev-errors-test.ts

@@ -4,7 +4,7 @@
 
 import { module, test } from 'qunit';
 
-import { RequestManager } from '@ember-data/request';
+import RequestManager from '@ember-data/request';
 import type { Context } from '@ember-data/request/-private/context';
 import type { Handler, NextFn } from '@ember-data/request/-private/types';
 

tests/request/tests/integration/graceful-dev-handler-errors-test.ts

@@ -4,7 +4,7 @@
 
 import { module, test } from 'qunit';
 
-import { RequestManager } from '@ember-data/request';
+import RequestManager from '@ember-data/request';
 import type { Context } from '@ember-data/request/-private/context';
 import type { Handler, NextFn } from '@ember-data/request/-private/types';
 

tests/request/tests/integration/immutability-test.ts

@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 
-import { RequestManager } from '@ember-data/request';
+import RequestManager from '@ember-data/request';
 import type { Context } from '@ember-data/request/-private/context';
 import type { Handler, NextFn } from '@ember-data/request/-private/types';
 

tests/request/tests/integration/response-currying-test.ts

@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 
-import { RequestManager } from '@ember-data/request';
+import RequestManager from '@ember-data/request';
 import type { Context } from '@ember-data/request/-private/context';
 import type { Handler, NextFn } from '@ember-data/request/-private/types';
 

tests/request/tests/integration/response-test.ts

@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 
-import { RequestManager } from '@ember-data/request';
+import RequestManager from '@ember-data/request';
 import type { Context } from '@ember-data/request/-private/context';
 import type { Handler, NextFn } from '@ember-data/request/-private/types';
 

tests/request/tests/integration/service-test.ts

@@ -9,7 +9,7 @@ import { module, test } from 'qunit';
 
 import { setupTest } from 'ember-qunit';
 
-import { RequestManager } from '@ember-data/request';
+import RequestManager from '@ember-data/request';
 
 module('RequestManager | Ember Service Setup', function (hooks: NestedHooks) {
   setupTest(hooks);

tests/request/tests/integration/setup-test.ts

@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 
-import { RequestManager } from '@ember-data/request';
+import RequestManager from '@ember-data/request';
 import type { Context as HandlerRequestContext } from '@ember-data/request/-private/context';
 import type { NextFn } from '@ember-data/request/-private/types';