@warp-drive/core 5.7.0-alpha.16 → 5.7.0-alpha.18

package/declarations/reactive/-private/document.d.ts

@@ -79,7 +79,7 @@ export declare class ReactiveDocument<T> {
 	* @param {Object} options
 	* @return {Promise<Document>}
 	*/
-	fetch(options?: RequestInfo<ReactiveDocument<T>, T>): Promise<ReactiveDocument<T>>;
+	fetch(options?: RequestInfo<ReactiveDocument<T>>): Promise<ReactiveDocument<T>>;
 	/**
 	* Fetches the next link for this document, returning a promise that resolves
 	* with the new document when the request completes, or null  if there is no
@@ -89,7 +89,7 @@ export declare class ReactiveDocument<T> {
 	* @param {Object} options
 	* @return {Promise<Document | null>}
 	*/
-	next(options?: RequestInfo<ReactiveDocument<T>, T>): Promise<ReactiveDocument<T> | null>;
+	next(options?: RequestInfo<ReactiveDocument<T>>): Promise<ReactiveDocument<T> | null>;
 	/**
 	* Fetches the prev link for this document, returning a promise that resolves
 	* with the new document when the request completes, or null if there is no
@@ -99,7 +99,7 @@ export declare class ReactiveDocument<T> {
 	* @param {Object} options
 	* @return {Promise<Document | null>}
 	*/
-	prev(options: RequestInfo<ReactiveDocument<T>, T>): Promise<ReactiveDocument<T> | null>;
+	prev(options: RequestInfo<ReactiveDocument<T>>): Promise<ReactiveDocument<T> | null>;
 	/**
 	* Fetches the first link for this document, returning a promise that resolves
 	* with the new document when the request completes, or null if there is no
@@ -109,7 +109,7 @@ export declare class ReactiveDocument<T> {
 	* @param {Object} options
 	* @return {Promise<Document | null>}
 	*/
-	first(options: RequestInfo<ReactiveDocument<T>, T>): Promise<ReactiveDocument<T> | null>;
+	first(options: RequestInfo<ReactiveDocument<T>>): Promise<ReactiveDocument<T> | null>;
 	/**
 	* Fetches the last link for this document, returning a promise that resolves
 	* with the new document when the request completes, or null if there is no
@@ -119,7 +119,7 @@ export declare class ReactiveDocument<T> {
 	* @param {Object} options
 	* @return {Promise<Document | null>}
 	*/
-	last(options: RequestInfo<ReactiveDocument<T>, T>): Promise<ReactiveDocument<T> | null>;
+	last(options: RequestInfo<ReactiveDocument<T>>): Promise<ReactiveDocument<T> | null>;
 	/**
 	* Implemented for `JSON.stringify` support.
 	*

package/declarations/request/-private/manager.d.ts

@@ -145,10 +145,7 @@ export declare class RequestManager {
 	* @param {RequestInfo} request
 	* @return {Future}
 	*/
-	request<
-		RT,
-		T = unknown
-	>(request: RequestInfo<RT, T>): Future<RT>;
+	request<RT>(request: RequestInfo<RT>): Future<RT>;
 	/**
 	* This method exists so that the RequestManager can be created
 	* can be created by container/factory systems that expect to

package/declarations/store/-private/cache-handler/handler.d.ts

@@ -3,17 +3,11 @@ import type { ImmutableRequestInfo, RequestContext } from "../../../types/reques
 import type { ResourceIdentifierObject } from "../../../types/spec/json-api-raw.js";
 import type { RequestSignature } from "../../../types/symbols.js";
 import type { Store } from "../store-service.js";
-export type LooseStoreRequestInfo<
-	RT = unknown,
-	T = unknown
-> = Omit<ImmutableRequestInfo<RT, T>, "records" | "headers" | typeof RequestSignature> & {
+export type LooseStoreRequestInfo<RT = unknown> = Omit<ImmutableRequestInfo<RT>, "records" | "headers" | typeof RequestSignature> & {
 	records?: ResourceIdentifierObject[];
 	headers?: Headers;
 };
-export type StoreRequestInput<
-	RT = unknown,
-	T = unknown
-> = ImmutableRequestInfo<RT, T> | LooseStoreRequestInfo<RT, T>;
+export type StoreRequestInput<RT = unknown> = ImmutableRequestInfo<RT> | LooseStoreRequestInfo<RT>;
 export interface StoreRequestContext extends RequestContext {
 	request: ImmutableRequestInfo & {
 		store: Store;

package/declarations/store/-private/new-core-tmp/request-state.d.ts

@@ -1,5 +1,6 @@
 import type { Future } from "../../../request.js";
 import type { ImmutableRequestInfo, ResponseInfo, StructuredErrorDocument } from "../../../types/request.js";
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 import type { PendingPromise, RejectedPromise, ResolvedPromise } from "./promise-state.js";
 /**
 * Lazily consumes the stream of a request, providing a number of
@@ -69,17 +70,14 @@ export interface PendingRequest extends PendingPromise {
 * Extends the {@link ResolvedPromise} interface.
 *
 */
-export interface ResolvedRequest<
-	RT,
-	T
-> extends ResolvedPromise<RT> {
+export interface ResolvedRequest<RT> extends ResolvedPromise<RT> {
 	/**
 	* Whether the request is cancelled.
 	*
 	*/
 	isCancelled: false;
 	loadingState: RequestLoadingState;
-	request: ImmutableRequestInfo<RT, T> | null;
+	request: ImmutableRequestInfo<RT> | null;
 	response: Response | ResponseInfo | null;
 }
 /**
@@ -92,7 +90,6 @@ export interface ResolvedRequest<
 */
 export interface RejectedRequest<
 	RT,
-	T,
 	E extends StructuredErrorDocument = StructuredErrorDocument
 > extends RejectedPromise<E> {
 	/**
@@ -101,7 +98,7 @@ export interface RejectedRequest<
 	*/
 	isCancelled: false;
 	loadingState: RequestLoadingState;
-	request: ImmutableRequestInfo<RT, T> | null;
+	request: ImmutableRequestInfo<RT> | null;
 	response: Response | ResponseInfo | null;
 }
 /**
@@ -112,7 +109,6 @@ export interface RejectedRequest<
 */
 export interface CancelledRequest<
 	RT,
-	T,
 	E extends StructuredErrorDocument = StructuredErrorDocument
 > {
 	/**
@@ -175,21 +171,21 @@ export interface CancelledRequest<
 	*/
 	isCancelled: true;
 	loadingState: RequestLoadingState;
-	request: ImmutableRequestInfo<RT, T> | null;
+	request: ImmutableRequestInfo<RT> | null;
 	response: Response | ResponseInfo | null;
 }
 /**
-* RequestState extends the concept of PromiseState to provide a reactive
-* wrapper for a request `Future` which allows you write declarative code
+* RequestState extends the concept of {@link PromiseState} to provide a reactive
+* wrapper for a request {@link Future} which allows you write declarative code
 * around a Future's control flow.
 *
 * It is useful in both Template and JavaScript contexts, allowing you
 * to quickly derive behaviors and data from pending, error and success
 * states.
 *
-* The key difference between a Promise and a Future is that Futures provide
-* access to a stream of their content, the identity of the request (if any)
-* as well as the ability to attempt to abort the request.
+* The key difference between a {@link Promise} and a Future is that Futures provide
+* access to a {@link ReadableStream | stream} of their content, the {@link RequestKey} of the request (if any)
+* as well as the ability to attempt to {@link Future.abort | abort} the request.
 *
 * ```ts
 * interface Future<T> extends Promise<T>> {
@@ -201,7 +197,7 @@ export interface CancelledRequest<
 *
 * These additional APIs allow us to craft even richer state experiences.
 *
-* To get the state of a request, use `getRequestState`.
+* To get the state of a request, use {@link getRequestState}.
 *
 * See also:
 * - {@link PendingRequest}
@@ -212,14 +208,12 @@ export interface CancelledRequest<
 */
 export type RequestCacheRequestState<
 	RT = unknown,
-	T = unknown,
 	E extends StructuredErrorDocument = StructuredErrorDocument
-> = PendingRequest | ResolvedRequest<RT, T> | RejectedRequest<RT, T, E> | CancelledRequest<RT, T, E>;
+> = PendingRequest | ResolvedRequest<RT> | RejectedRequest<RT, E> | CancelledRequest<RT, E>;
 export declare function createRequestState<
 	RT,
-	T,
 	E
->(future: Future<RT>): Readonly<RequestCacheRequestState<RT, T, StructuredErrorDocument<E>>>;
+>(future: Future<RT>): Readonly<RequestCacheRequestState<RT, StructuredErrorDocument<E>>>;
 /**
 * `getRequestState` can be used in both JavaScript and Template contexts.
 *
@@ -272,6 +266,5 @@ export declare function createRequestState<
 */
 export declare function getRequestState<
 	RT,
-	T,
 	E
->(future: Future<RT>): Readonly<RequestCacheRequestState<RT, T, StructuredErrorDocument<E>>>;
+>(future: Future<RT>): Readonly<RequestCacheRequestState<RT, StructuredErrorDocument<E>>>;

package/declarations/store/-private/new-core-tmp/request-subscription.d.ts

@@ -22,7 +22,6 @@ type ContentFeatures<RT> = {
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export interface SubscriptionArgs<
 	RT,
-	T,
 	E
 > {
 	/**
@@ -37,7 +36,7 @@ export interface SubscriptionArgs<
 	* like the component to also initiate the request.
 	*
 	*/
-	query?: StoreRequestInput<RT, T>;
+	query?: StoreRequestInput<RT>;
 	/**
 	* The autorefresh behavior for the request. This can be a boolean, or any
 	* combination of the following values: `'online'`, `'interval'`, `'invalid'`.
@@ -80,7 +79,6 @@ export interface SubscriptionArgs<
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export interface RequestSubscription<
 	RT,
-	T,
 	E
 > {
 	/**
@@ -96,7 +94,6 @@ export interface RequestSubscription<
 */
 export declare class RequestSubscription<
 	RT,
-	T,
 	E
 > {
 	/**
@@ -183,7 +180,7 @@ export declare class RequestSubscription<
 	private _args;
 	/** @internal */
 	store: Store | RequestManager;
-	constructor(store: Store | RequestManager, args: SubscriptionArgs<RT, T, E>);
+	constructor(store: Store | RequestManager, args: SubscriptionArgs<RT, E>);
 	/**
 	* @internal
 	*/
@@ -250,12 +247,11 @@ export declare class RequestSubscription<
 	*/
 	get _request(): Future<RT>;
 	get request(): Future<RT>;
-	get reqState(): RequestState<RT, T, StructuredErrorDocument<E>>;
+	get reqState(): RequestState<RT, StructuredErrorDocument<E>>;
 	get result(): RT;
 }
 export declare function createRequestSubscription<
 	RT,
-	T,
 	E
->(store: Store | RequestManager, args: SubscriptionArgs<RT, T, E>): RequestSubscription<RT, T, E>;
+>(store: Store | RequestManager, args: SubscriptionArgs<RT, E>): RequestSubscription<RT, E>;
 export {};

package/declarations/store/-private/store-service.d.ts

@@ -509,10 +509,7 @@ export declare class Store extends BaseClass {
 	*
 	* @public
 	*/
-	request<
-		RT,
-		T = unknown
-	>(requestConfig: StoreRequestInput<RT, T>): Future<RT>;
+	request<RT>(requestConfig: StoreRequestInput<RT>): Future<RT>;
 	/**
 	Creates a new record in the current store.
 	

package/declarations/types/request.d.ts

@@ -1,6 +1,6 @@
 import type { ResourceKey } from "./identifier.js";
 import type { QueryParamsSerializationOptions } from "./params.js";
-import type { ExtractSuggestedCacheTypes, TypedRecordInstance, TypeFromInstanceOrString } from "./record.js";
+import type { TypeFromInstanceOrString } from "./record.js";
 import type { ResourceIdentifierObject } from "./spec/json-api-raw.js";
 import type { RequestSignature } from "./symbols.js";
 type Store = unknown;
@@ -13,7 +13,7 @@ export type HTTPMethod = "QUERY" | "GET" | "OPTIONS" | "POST" | "PUT" | "PATCH"
 * Use these options to adjust CacheHandler behavior for a request.
 *
 */
-export type CacheOptions<T = unknown> = {
+export type CacheOptions = {
 	/**
 	* A key that uniquely identifies this request. If not present, the url wil be used
 	* as the key for any GET request, while all other requests will not be cached.
@@ -47,7 +47,10 @@ export type CacheOptions<T = unknown> = {
 	* than to invalidate findRecord requests for one.
 	*
 	*/
-	types?: T extends TypedRecordInstance ? ExtractSuggestedCacheTypes<T>[] : string[];
+	// TODO: Ideally this would be T extends TypedRecordInstance ? ExtractSuggestedCacheTypes<T>[] : string[];
+	// but that leads to `Type instantiation is excessively deep and possibly infinite.`
+	// issues when `T` has many properties.
+	types?: string[];
 	/**
 	* If true, the request will never be handled by the cache-manager and thus
 	* will never resolve from cache nor update the cache.
@@ -65,31 +68,25 @@ export type FindRecordRequestOptions<
 	url: string;
 	method: "GET";
 	headers: Headers;
-	cacheOptions?: CacheOptions<T>;
+	cacheOptions?: CacheOptions;
 	op: "findRecord";
 	records: [ResourceIdentifierObject<TypeFromInstanceOrString<T>>];
 	[RequestSignature]?: RT;
 };
-export type QueryRequestOptions<
-	RT = unknown,
-	T = unknown
-> = {
+export type QueryRequestOptions<RT = unknown> = {
 	url: string;
 	method: "GET";
 	headers: Headers;
-	cacheOptions?: CacheOptions<T>;
+	cacheOptions?: CacheOptions;
 	op: "query";
 	[RequestSignature]?: RT;
 };
-export type PostQueryRequestOptions<
-	RT = unknown,
-	T = unknown
-> = {
+export type PostQueryRequestOptions<RT = unknown> = {
 	url: string;
 	method: "POST" | "QUERY";
 	headers: Headers;
 	body?: string | BodyInit | FormData;
-	cacheOptions: CacheOptions<T> & {
+	cacheOptions: CacheOptions & {
 		key: string;
 	};
 	op: "query";
@@ -271,10 +268,7 @@ export interface ImmutableHeaders extends Headers {
 * properties specific to the RequestManager's capabilities.
 *
 */
-export interface RequestInfo<
-	RT = unknown,
-	T = unknown
-> extends Request {
+export interface RequestInfo<RT = unknown> extends Request {
 	/**
 	* If provided, used instead of the AbortController auto-configured for each request by the RequestManager
 	*
@@ -283,7 +277,7 @@ export interface RequestInfo<
 	/**
 	* @see {@link CacheOptions}
 	*/
-	cacheOptions?: CacheOptions<T>;
+	cacheOptions?: CacheOptions;
 	store?: Store;
 	op?: string;
 	/**
@@ -316,11 +310,8 @@ export interface RequestInfo<
 * Immutable version of {@link RequestInfo}. This is what is passed to handlers.
 *
 */
-export type ImmutableRequestInfo<
-	RT = unknown,
-	T = unknown
-> = Readonly<Omit<RequestInfo<RT, T>, "controller">> & {
-	readonly cacheOptions?: Readonly<CacheOptions<T>>;
+export type ImmutableRequestInfo<RT = unknown> = Readonly<Omit<RequestInfo<RT>, "controller">> & {
+	readonly cacheOptions?: Readonly<CacheOptions>;
 	readonly headers?: ImmutableHeaders;
 	readonly data?: Readonly<Record<string, unknown>>;
 	readonly options?: Readonly<Record<string, unknown>>;

package/dist/index.js

@@ -3,7 +3,7 @@ import { a as cloneResponseProperties, I as IS_CACHE_HANDLER, b as assertValidRe
 import { macroCondition, getGlobalConfig } from '@embroider/macros';
 import { w as waitFor } from "./configure-B48bFHOl.js";
 import { peekUniversalTransient, setUniversalTransient } from './types/-private.js';
-export { C as CacheHandler, S as Store, r as recordIdentifierFor, M as setIdentifierForgetMethod, K as setIdentifierGenerationMethod, N as setIdentifierResetMethod, L as setIdentifierUpdateMethod, O as setKeyInfoForResource, s as storeFor } from "./request-state-CQ0Q6d1V.js";
+export { C as CacheHandler, S as Store, r as recordIdentifierFor, M as setIdentifierForgetMethod, K as setIdentifierGenerationMethod, N as setIdentifierResetMethod, L as setIdentifierUpdateMethod, O as setKeyInfoForResource, s as storeFor } from "./request-state-0_fVMu9R.js";
 import '@ember/debug';
 import './utils/string.js';
 import "./symbols-sql1_mdx.js";

package/dist/reactive.js

@@ -1,5 +1,5 @@
-import { F as ReactiveResource, G as isNonIdentityCacheableField, H as getFieldCacheKeyStrict, r as recordIdentifierFor, z as withSignalStore } from "./request-state-CQ0Q6d1V.js";
-export { I as checkout, J as commit } from "./request-state-CQ0Q6d1V.js";
+import { F as ReactiveResource, G as isNonIdentityCacheableField, H as getFieldCacheKeyStrict, r as recordIdentifierFor, z as withSignalStore } from "./request-state-0_fVMu9R.js";
+export { I as checkout, J as commit } from "./request-state-0_fVMu9R.js";
 import { isResourceSchema } from './types/schema/fields.js';
 import { D as Destroy, C as Context } from "./symbols-sql1_mdx.js";
 export { a as Checkout } from "./symbols-sql1_mdx.js";

package/dist/{request-state-CQ0Q6d1V.js → request-state-0_fVMu9R.js}

@@ -9445,7 +9445,7 @@ class RequestSubscription {
         }
       })(!request.store || request.store === this.store) : {};
       const store = request.store || this.store;
-      const requester = wasStoreRequest && 'requestManager' in store ? store.requestManager : store;
+      const requester = !wasStoreRequest && 'requestManager' in store ? store.requestManager : store;
       this._isUpdating = true;
       this._latestRequest = requester.request(request);
       if (val !== 'refresh') {
@@ -9839,17 +9839,17 @@ defineNonEnumerableSignal(RequestLoadingState.prototype, '_lastPacketTime', 0);
  */
 
 /**
- * RequestState extends the concept of PromiseState to provide a reactive
- * wrapper for a request `Future` which allows you write declarative code
+ * RequestState extends the concept of {@link PromiseState} to provide a reactive
+ * wrapper for a request {@link Future} which allows you write declarative code
  * around a Future's control flow.
  *
  * It is useful in both Template and JavaScript contexts, allowing you
  * to quickly derive behaviors and data from pending, error and success
  * states.
  *
- * The key difference between a Promise and a Future is that Futures provide
- * access to a stream of their content, the identity of the request (if any)
- * as well as the ability to attempt to abort the request.
+ * The key difference between a {@link Promise} and a Future is that Futures provide
+ * access to a {@link ReadableStream | stream} of their content, the {@link RequestKey} of the request (if any)
+ * as well as the ability to attempt to {@link Future.abort | abort} the request.
  *
  * ```ts
  * interface Future<T> extends Promise<T>> {
@@ -9861,7 +9861,7 @@ defineNonEnumerableSignal(RequestLoadingState.prototype, '_lastPacketTime', 0);
  *
  * These additional APIs allow us to craft even richer state experiences.
  *
- * To get the state of a request, use `getRequestState`.
+ * To get the state of a request, use {@link getRequestState}.
  *
  * See also:
  * - {@link PendingRequest}

package/dist/store/-private.js

@@ -1,2 +1,2 @@
-export { C as CacheHandler, D as DISPOSE, R as RecordArrayManager, x as Signals, S as Store, g as StoreMap, _ as _clearCaches, n as _deprecatingNormalize, b as coerceId, c as constructResource, B as consumeInternalSignal, h as createLegacyManyArray, m as createRequestSubscription, v as defineGate, w as defineNonEnumerableSignal, u as defineSignal, e as ensureStringId, t as entangleSignal, f as fastPush, q as gate, E as getOrCreateInternalSignal, k as getPromiseState, o as getRequestState, a as isRequestKey, i as isResourceKey, l as log, j as logGroup, p as memoized, A as notifyInternalSignal, y as peekInternalSignal, r as recordIdentifierFor, d as setRecordIdentifier, s as storeFor, z as withSignalStore } from "../request-state-CQ0Q6d1V.js";
+export { C as CacheHandler, D as DISPOSE, R as RecordArrayManager, x as Signals, S as Store, g as StoreMap, _ as _clearCaches, n as _deprecatingNormalize, b as coerceId, c as constructResource, B as consumeInternalSignal, h as createLegacyManyArray, m as createRequestSubscription, v as defineGate, w as defineNonEnumerableSignal, u as defineSignal, e as ensureStringId, t as entangleSignal, f as fastPush, q as gate, E as getOrCreateInternalSignal, k as getPromiseState, o as getRequestState, a as isRequestKey, i as isResourceKey, l as log, j as logGroup, p as memoized, A as notifyInternalSignal, y as peekInternalSignal, r as recordIdentifierFor, d as setRecordIdentifier, s as storeFor, z as withSignalStore } from "../request-state-0_fVMu9R.js";
 export { A as ARRAY_SIGNAL, O as OBJECT_SIGNAL, c as createMemo, w as waitFor } from "../configure-B48bFHOl.js";

package/dist/types/-private.js

@@ -1,6 +1,6 @@
 import { macroCondition, getGlobalConfig } from '@embroider/macros';
 const name = "@warp-drive/core";
-const version = "5.7.0-alpha.16";
+const version = "5.7.0-alpha.18";
 
 // in testing mode, we utilize globals to ensure only one copy exists of
 // these maps, due to bugs in ember-auto-import

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@warp-drive/core",
-  "version": "5.7.0-alpha.16",
+  "version": "5.7.0-alpha.18",
   "description": "Core package for WarpDrive | All the Universal Basics",
   "keywords": [
     "ember-addon"
@@ -37,13 +37,13 @@
   },
   "dependencies": {
     "@embroider/macros": "^1.16.12",
-    "@warp-drive/build-config": "5.7.0-alpha.16"
+    "@warp-drive/build-config": "5.7.0-alpha.18"
   },
   "devDependencies": {
     "@babel/core": "^7.26.10",
     "@babel/plugin-transform-typescript": "^7.27.0",
     "@babel/preset-typescript": "^7.27.0",
-    "@warp-drive/internal-config": "5.7.0-alpha.16",
+    "@warp-drive/internal-config": "5.7.0-alpha.18",
     "decorator-transforms": "^2.3.0",
     "ember-source": "~6.3.0",
     "expect-type": "^1.2.1",