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

package/declarations/store/-private/managers/record-array-manager.d.ts

@@ -1,5 +1,5 @@
 import type { LocalRelationshipOperation } from "../../../types/graph.js";
-import type { StableDocumentIdentifier, StableRecordIdentifier } from "../../../types/identifier.js";
+import type { RequestKey, ResourceKey } from "../../../types/identifier.js";
 import type { ImmutableRequestInfo } from "../../../types/request.js";
 import type { CollectionResourceDocument } from "../../../types/spec/json-api-raw.js";
 import type { LegacyLiveArray } from "../record-arrays/legacy-live-array.js";
@@ -50,13 +50,13 @@ interface LegacyQueryInit {
 	query: ImmutableRequestInfo | Record<string, unknown>;
 }
 interface AnonymousRequestCollectionInit {
-	source: StableRecordIdentifier[];
+	source: ResourceKey[];
 }
 interface RequestCollectionInit {
-	source: StableRecordIdentifier[];
-	requestKey: StableDocumentIdentifier;
+	source: ResourceKey[];
+	requestKey: RequestKey;
 }
-type ChangeSet = Map<StableRecordIdentifier, "add" | "del">;
+type ChangeSet = Map<ResourceKey, "add" | "del">;
 /**
 @class RecordArrayManager
 @internal
@@ -68,7 +68,7 @@ export declare class RecordArrayManager {
 	/**
 	*
 	*/
-	_set: Map<ReactiveResourceArray, Set<StableRecordIdentifier>>;
+	_set: Map<ReactiveResourceArray, Set<ResourceKey>>;
 	/**
 	* LiveArray (peekAll/findAll) array instances
 	* keyed by their ResourceType.
@@ -84,11 +84,11 @@ export declare class RecordArrayManager {
 	*/
 	_pending: Map<ReactiveResourceArray, ChangeSet>;
 	/**
-	* An inverse map from StableRecordIdentifier to the list
+	* An inverse map from ResourceKey to the list
 	* of arrays it can be found in, useful for fast updates
 	* when state changes to a resource occur.
 	*/
-	_identifiers: Map<StableRecordIdentifier, Set<ReactiveResourceArray>>;
+	_identifiers: Map<ResourceKey, Set<ReactiveResourceArray>>;
 	/**
 	* When we do not yet have a LiveArray, this keeps track of
 	* the added/removed identifiers to enable us to more efficiently
@@ -114,7 +114,7 @@ export declare class RecordArrayManager {
 	* an exclusion list. Any entry not in the list would be considered
 	* visible.
 	*/
-	_visibilitySet: Map<StableRecordIdentifier, boolean>;
+	_visibilitySet: Map<ResourceKey, boolean>;
 	constructor(options: {
 		store: Store;
 	});
@@ -134,15 +134,15 @@ export declare class RecordArrayManager {
 	getCollection(config: AnonymousRequestCollectionInit): ReactiveResourceArray;
 	getCollection(config: RequestCollectionInit): ReactiveResourceArray;
 	dirtyArray(array: ReactiveResourceArray, delta: number, shouldSyncFromCache: boolean): void;
-	_getPendingFor(identifier: StableRecordIdentifier, includeManaged: boolean, isRemove?: boolean): Map<ReactiveResourceArray, ChangeSet> | void;
-	populateManagedArray(array: ReactiveResourceArray, identifiers: StableRecordIdentifier[], payload: CollectionResourceDocument | null): void;
-	identifierAdded(identifier: StableRecordIdentifier): void;
-	identifierRemoved(identifier: StableRecordIdentifier): void;
-	identifierChanged(identifier: StableRecordIdentifier): void;
+	_getPendingFor(identifier: ResourceKey, includeManaged: boolean, isRemove?: boolean): Map<ReactiveResourceArray, ChangeSet> | void;
+	populateManagedArray(array: ReactiveResourceArray, identifiers: ResourceKey[], payload: CollectionResourceDocument | null): void;
+	identifierAdded(identifier: ResourceKey): void;
+	identifierRemoved(identifier: ResourceKey): void;
+	identifierChanged(identifier: ResourceKey): void;
 	pause(): void;
 	resume(): void;
 	clear(isClear?: boolean): void;
 	destroy(): void;
 }
-export declare function disassociateIdentifier(ArraysCache: Map<StableRecordIdentifier, Set<ReactiveResourceArray>>, array: ReactiveResourceArray, identifier: StableRecordIdentifier): void;
+export declare function disassociateIdentifier(ArraysCache: Map<ResourceKey, Set<ReactiveResourceArray>>, array: ReactiveResourceArray, identifier: ResourceKey): void;
 export {};

package/declarations/store/-private/network/request-cache.d.ts

@@ -1,4 +1,4 @@
-import type { StableRecordIdentifier } from "../../../types/identifier.js";
+import type { ResourceKey } from "../../../types/identifier.js";
 import type { FindRecordOptions } from "../../-types/q/store.js";
 import type { Store } from "../store-service.js";
 declare const Touching: "___(unique) Symbol(Touching)";
@@ -6,7 +6,7 @@ export declare const RequestPromise: "___(unique) Symbol(RequestPromise)";
 export interface Operation {
 	op: string;
 	options: FindRecordOptions | undefined;
-	recordIdentifier: StableRecordIdentifier;
+	recordIdentifier: ResourceKey;
 }
 export interface FindRecordQuery extends Operation {
 	op: "findRecord";
@@ -30,7 +30,7 @@ export interface Response {
 	data: unknown;
 }
 interface InternalRequest extends RequestCacheRequestState {
-	[Touching]: StableRecordIdentifier[];
+	[Touching]: ResourceKey[];
 	[RequestPromise]?: Promise<unknown>;
 }
 export type RequestSubscription = (requestState: RequestCacheRequestState) => void;
@@ -43,14 +43,14 @@ export type RequestSubscription = (requestState: RequestCacheRequestState) => vo
 */
 export declare class RequestStateService {
 	/** @internal */
-	_pending: Map<StableRecordIdentifier, InternalRequest[]>;
+	_pending: Map<ResourceKey, InternalRequest[]>;
 	private _done;
 	private _subscriptions;
 	private _toFlush;
 	private _store;
 	constructor(store: Store);
 	/** @internal */
-	_clearEntries(identifier: StableRecordIdentifier): void;
+	_clearEntries(identifier: ResourceKey): void;
 	/** @internal */
 	_enqueue<T>(promise: Promise<T>, queryRequest: Request): Promise<T>;
 	private _triggerSubscriptions;
@@ -83,25 +83,25 @@ export declare class RequestStateService {
 	* design.
 	*
 	* @public
-	* @param {StableRecordIdentifier} identifier
+	* @param {ResourceKey} identifier
 	* @param {(state: RequestCacheRequestState) => void} callback
 	*/
-	subscribeForRecord(identifier: StableRecordIdentifier, callback: RequestSubscription): void;
+	subscribeForRecord(identifier: ResourceKey, callback: RequestSubscription): void;
 	/**
 	* Retrieve all active requests for a given resource identity.
 	*
 	* @public
-	* @param {StableRecordIdentifier} identifier
+	* @param {ResourceKey} identifier
 	* @return {RequestCacheRequestState[]} an array of request states for any pending requests for the given identifier
 	*/
-	getPendingRequestsForRecord(identifier: StableRecordIdentifier): RequestCacheRequestState[];
+	getPendingRequestsForRecord(identifier: ResourceKey): RequestCacheRequestState[];
 	/**
 	* Retrieve the last completed request for a given resource identity.
 	*
 	* @public
-	* @param {StableRecordIdentifier} identifier
+	* @param {ResourceKey} identifier
 	* @return {RequestCacheRequestState | null} the state of the most recent request for the given identifier
 	*/
-	getLastRequestForRecord(identifier: StableRecordIdentifier): RequestCacheRequestState | null;
+	getLastRequestForRecord(identifier: ResourceKey): RequestCacheRequestState | null;
 }
 export {};

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

@@ -0,0 +1,24 @@
+import type { RequestKey } from "../../../types/identifier.js";
+import type { Store } from "../store-service.js";
+/**
+* Creates an {@link ExpensiveSubscription} for the {@link RequestKey}
+* if one does not already exist and adds a watcher to it.
+*
+* Returns a cleanup function. This should be called on-mount by a component
+* that wants to subscribe to a request and cleanup should be called on dismount.
+*
+* ::: warning ⚠️ Avoid Using If Your App Supports Fine-grained Reactivity
+* This mechanism should never be used by frameworks or libraries
+* that support fine-grained reactivity.
+* :::
+*
+* `ExpensiveSubscription` is a mechanism for non-reactive
+* frameworks such as `react` to integrate with WarpDrive, for instance
+* by treating a request as an [external store](https://react.dev/reference/react/useSyncExternalStore)
+*
+* `ExpensiveSubscription` is expensive *because* it doubles the number
+* of notification callbacks required for each resource contained in
+* the request being subscribed to. The more requests in-use, the more
+* this cost adds up.
+*/
+export declare function getExpensiveRequestSubscription(store: Store, requestKey: RequestKey, callback: () => void): () => void;

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

@@ -195,7 +195,7 @@ export interface CancelledRequest<
 * interface Future<T> extends Promise<T>> {
 *   getStream(): Promise<ReadableStream>;
 *   abort(): void;
-*   lid: StableDocumentIdentifier | null;
+*   lid: RequestKey | null;
 * }
 * ```
 *

package/declarations/store/-private/record-arrays/-utils.d.ts

@@ -1,6 +1,6 @@
 import type { BaseFinderOptions } from "../../../types.js";
 import type { LocalRelationshipOperation } from "../../../types/graph.js";
-import type { StableRecordIdentifier } from "../../../types/identifier.js";
+import type { ResourceKey } from "../../../types/identifier.js";
 import type { Store } from "../store-service.js";
 import type { NativeProxy } from "./native-proxy-type-fix.js";
 import type { ReactiveResourceArray } from "./resource-array.js";
@@ -66,8 +66,8 @@ export type KeyType = string | symbol | number;
 export declare function isArrayGetter<T>(prop: KeyType): prop is keyof Array<T>;
 export declare function isArraySetter<T>(prop: KeyType): prop is keyof Array<T>;
 export declare function convertToInt(prop: KeyType): number | null;
-export type ForEachCB<T> = (record: T, index: number, context: typeof NativeProxy<StableRecordIdentifier[], T[]>) => void;
-export declare function safeForEach<T>(instance: typeof NativeProxy<StableRecordIdentifier[], T[]>, arr: StableRecordIdentifier[], store: Store, callback: ForEachCB<T>, target: unknown): typeof NativeProxy<StableRecordIdentifier[], T[]>;
+export type ForEachCB<T> = (record: T, index: number, context: typeof NativeProxy<ResourceKey[], T[]>) => void;
+export declare function safeForEach<T>(instance: typeof NativeProxy<ResourceKey[], T[]>, arr: ResourceKey[], store: Store, callback: ForEachCB<T>, target: unknown): typeof NativeProxy<ResourceKey[], T[]>;
 type PromiseTo<T> = Omit<Promise<T>, typeof Symbol.toStringTag>;
 type PromiseManyArray<T> = {
 	length: number;

package/declarations/store/-private/record-arrays/legacy-live-array.d.ts

@@ -1,4 +1,4 @@
-import type { StableRecordIdentifier } from "../../../types/identifier.js";
+import type { ResourceKey } from "../../../types/identifier.js";
 import type { TypeFromInstanceOrString } from "../../../types/record.js";
 import type { Store } from "../store-service.js";
 import type { LegacyArray, MinimumManager } from "./-utils.js";
@@ -78,7 +78,7 @@ export interface LegacyLiveArray<T = unknown> extends LegacyArray<T> {
 export interface LegacyLiveArrayCreateOptions {
 	store: Store;
 	manager: MinimumManager;
-	source: StableRecordIdentifier[];
+	source: ResourceKey[];
 	type: string;
 }
 /**

package/declarations/store/-private/record-arrays/legacy-many-array.d.ts

@@ -1,4 +1,4 @@
-import type { BaseFinderOptions, StableRecordIdentifier } from "../../../types.js";
+import type { BaseFinderOptions, ResourceKey } from "../../../types.js";
 import type { TypedRecordInstance, TypeFromInstance } from "../../../types/record.js";
 import type { LegacyHasManyField, LinksModeHasManyField } from "../../../types/schema/fields.js";
 import type { Links, Meta, PaginationLinks } from "../../../types/spec/json-api-raw.js";
@@ -127,7 +127,7 @@ export interface LegacyManyArrayCreateOptions extends LegacyLiveArrayCreateOptio
 	isAsync: boolean;
 	isPolymorphic: boolean;
 	field: LegacyHasManyField | LinksModeHasManyField;
-	identifier: StableRecordIdentifier;
+	identifier: ResourceKey;
 	links: Links | PaginationLinks | null;
 	meta: Meta | null;
 }

package/declarations/store/-private/record-arrays/resource-array.d.ts

@@ -1,6 +1,6 @@
 import type { ExtensionDef } from "../../../reactive.js";
 import { Context } from "../../../reactive/-private.js";
-import type { StableDocumentIdentifier, StableRecordIdentifier } from "../../../types/identifier.js";
+import type { RequestKey, ResourceKey } from "../../../types/identifier.js";
 import type { ObjectValue } from "../../../types/json/raw.js";
 import type { CollectionField } from "../../../types/schema/fields.js";
 import type { SignalStore, WarpDriveSignal } from "../new-core-tmp/reactivity/internal.js";
@@ -14,7 +14,7 @@ interface ReactiveResourceArrayCreateOptions {
 	store: Store;
 	manager: MinimumManager;
 	editable: boolean;
-	source: StableRecordIdentifier[];
+	source: ResourceKey[];
 	// reactive, passed in
 	data: ObjectValue | null;
 	// non-reactive, passed in
@@ -23,11 +23,11 @@ interface ReactiveResourceArrayCreateOptions {
 	// not-accessible except by the context
 	options: Record<string, unknown> | null;
 	destroy: null | ((this: ReactiveResourceArray, clear: boolean) => void);
-	mutate: null | ((target: StableRecordIdentifier[], receiver: typeof NativeProxy<StableRecordIdentifier[], unknown[]>, prop: string, args: unknown[], _SIGNAL: WarpDriveSignal) => unknown);
+	mutate: null | ((target: ResourceKey[], receiver: typeof NativeProxy<ResourceKey[], unknown[]>, prop: string, args: unknown[], _SIGNAL: WarpDriveSignal) => unknown);
 }
 interface ReactiveResourceArrayContext extends ReactiveResourceArrayCreateOptions {
 	destroy: (this: ReactiveResourceArray, clear: boolean) => void;
-	mutate: (target: StableRecordIdentifier[], receiver: typeof NativeProxy<StableRecordIdentifier[], unknown[]>, prop: string, args: unknown[], _SIGNAL: WarpDriveSignal) => unknown;
+	mutate: (target: ResourceKey[], receiver: typeof NativeProxy<ResourceKey[], unknown[]>, prop: string, args: unknown[], _SIGNAL: WarpDriveSignal) => unknown;
 	// generated
 	signals: SignalStore;
 	signal: WarpDriveSignal;
@@ -48,7 +48,7 @@ export interface ReactiveResourceArray<T = unknown> extends Omit<Array<T>, "[]">
 	/** @internal */
 	[Context]: ReactiveResourceArrayContext;
 }
-export interface TargetArray extends Array<StableRecordIdentifier> {
+export interface TargetArray extends Array<ResourceKey> {
 	/** @internal */
 	[Context]: ReactiveResourceArrayContext;
 }
@@ -58,9 +58,9 @@ export interface ReactiveRequestCollectionCreateArgs {
 	// passed in
 	store: Store;
 	manager: MinimumManager;
-	source: StableRecordIdentifier[];
+	source: ResourceKey[];
 	options: {
-		requestKey: StableDocumentIdentifier;
+		requestKey: RequestKey;
 	} | null;
 }
 export declare function createRequestCollection(config: ReactiveRequestCollectionCreateArgs): ReactiveResourceArray;
@@ -68,10 +68,10 @@ export interface ReactiveRelatedCollectionCreateArgs {
 	// passed in
 	store: Store;
 	manager: MinimumManager;
-	source: StableRecordIdentifier[];
+	source: ResourceKey[];
 	// not-accessible except by the context
 	options: {
-		resourceKey: StableRecordIdentifier;
+		resourceKey: ResourceKey;
 		path: string[];
 		field: CollectionField;
 	};

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

@@ -2,7 +2,7 @@ import type { Graph } from "../../graph/-private.js";
 import type { Future } from "../../request.js";
 import type { RequestManager } from "../../request/-private/manager.js";
 import type { Cache } from "../../types/cache.js";
-import type { StableExistingRecordIdentifier, StableRecordIdentifier } from "../../types/identifier.js";
+import type { PersistedResourceKey, ResourceKey } from "../../types/identifier.js";
 import type { TypedRecordInstance, TypeFromInstance } from "../../types/record.js";
 import type { CollectionResourceDocument, EmptyResourceDocument, JsonApiDocument, ResourceIdentifierObject, SingleResourceDocument } from "../../types/spec/json-api-raw.js";
 import type { Type } from "../../types/symbols.js";
@@ -11,8 +11,8 @@ import type { OpaqueRecordInstance } from "../-types/q/record-instance.js";
 import type { SchemaService } from "../-types/q/schema-service.js";
 import type { StoreRequestInput } from "./cache-handler/handler.js";
 import type { CachePolicy } from "./cache-handler/types.js";
-import { IdentifierCache } from "./caches/identifier-cache.js";
 import { InstanceCache, storeFor } from "./caches/instance-cache.js";
+import { CacheKeyManager } from "./managers/cache-key-manager.js";
 import NotificationManager from "./managers/notification-manager.js";
 import { RecordArrayManager } from "./managers/record-array-manager.js";
 import { RequestStateService } from "./network/request-cache.js";
@@ -79,7 +79,7 @@ export interface Store {
 	* @public
 	*/
 	// eslint-disable-next-line @typescript-eslint/no-unused-vars
-	instantiateRecord<T>(identifier: StableRecordIdentifier, createRecordArgs: {
+	instantiateRecord<T>(identifier: ResourceKey, createRecordArgs: {
 		[key: string]: unknown;
 	}): OpaqueRecordInstance;
 	/**
@@ -193,11 +193,11 @@ export interface Store {
 	*     return this._schema.hasResource(resource);
 	*   }
 	*
-	*   attributesDefinitionFor(identifier: RecordIdentifier | { type: string }): AttributesSchema {
+	*   attributesDefinitionFor(identifier: ResourceKey | { type: string }): AttributesSchema {
 	*     return this._schema.attributesDefinitionFor(identifier);
 	*   }
 	*
-	*   relationshipsDefinitionFor(identifier: RecordIdentifier | { type: string }): RelationshipsSchema {
+	*   relationshipsDefinitionFor(identifier: ResourceKey | { type: string }): RelationshipsSchema {
 	*     const schema = AbstractSchemas.get(identifier.type);
 	*     return schema || this._schema.relationshipsDefinitionFor(identifier);
 	*   }
@@ -247,11 +247,11 @@ export interface Store {
 	*     return this._schema.hasResource(resource);
 	*   }
 	*
-	*   attributesDefinitionFor(identifier: RecordIdentifier | { type: string }): AttributesSchema {
+	*   attributesDefinitionFor(identifier: ResourceKey | { type: string }): AttributesSchema {
 	*     return this._schema.attributesDefinitionFor(identifier);
 	*   }
 	*
-	*   relationshipsDefinitionFor(identifier: RecordIdentifier | { type: string }): RelationshipsSchema {
+	*   relationshipsDefinitionFor(identifier: ResourceKey | { type: string }): RelationshipsSchema {
 	*     const schema = AbstractSchemas.get(identifier.type);
 	*     return schema || this._schema.relationshipsDefinitionFor(identifier);
 	*   }
@@ -317,15 +317,16 @@ export declare class Store extends BaseClass {
 	/** @internal */
 	_schema: SchemaService;
 	/**
-	* Provides access to the IdentifierCache instance
+	* Provides access to the CacheKeyManager
 	* for this store.
 	*
-	* The IdentifierCache can be used to generate or
-	* retrieve a stable unique identifier for any resource.
+	* The CacheKeyManager can be used to generate or
+	* retrieve a stable unique CacheKey for any resource
+	* or request.
 	*
 	* @public
 	*/
-	readonly identifierCache: IdentifierCache;
+	readonly cacheKeyManager: CacheKeyManager;
 	/**
 	* Provides access to the requestManager instance associated
 	* with this Store instance.
@@ -356,7 +357,7 @@ export declare class Store extends BaseClass {
 	*
 	* Note, when defined, these methods will only be invoked if a
 	* cache key exists for the request, either because the request
-	* contains `cacheOptions.key` or because the [IdentifierCache](/ember-data/release/classes/IdentifierCache)
+	* contains `cacheOptions.key` or because the [CacheKeyManager](/ember-data/release/classes/CacheKeyManager)
 	* was able to generate a key for the request using the configured
 	* [generation method](/ember-data/release/functions/@ember-data%2Fstore/setIdentifierGenerationMethod).
 	*
@@ -365,12 +366,12 @@ export declare class Store extends BaseClass {
 	* ```ts
 	* store.lifetimes = {
 	*   // make the request and ignore the current cache state
-	*   isHardExpired(identifier: StableDocumentIdentifier): boolean {
+	*   isHardExpired(key: RequestKey): boolean {
 	*     return false;
 	*   }
 	*
 	*   // make the request in the background if true, return cache state
-	*   isSoftExpired(identifier: StableDocumentIdentifier): boolean {
+	*   isSoftExpired(key: RequestKey): boolean {
 	*     return false;
 	*   }
 	* }
@@ -420,6 +421,8 @@ export declare class Store extends BaseClass {
 	get isDestroyed(): boolean;
 	/** @internal */
 	set isDestroyed(value: boolean);
+	/** @deprecated use {@link Store.cacheKeyManager} */
+	get identifierCache(): CacheKeyManager;
 	/**
 	@private
 	*/
@@ -866,9 +869,9 @@ export declare class Store extends BaseClass {
 	
 	@private
 	@param {Object} jsonApiDoc
-	@return {StableRecordIdentifier|Array<StableRecordIdentifier>|null} identifiers for the primary records that had data loaded
+	@return {ResourceKey|Array<ResourceKey>|null} identifiers for the primary records that had data loaded
 	*/
-	_push(jsonApiDoc: JsonApiDocument, asyncFlush?: boolean): StableExistingRecordIdentifier | StableExistingRecordIdentifier[] | null;
+	_push(jsonApiDoc: JsonApiDocument, asyncFlush?: boolean): PersistedResourceKey | PersistedResourceKey[] | null;
 	/**
 	* Returns the cache instance associated to this Store, instantiates the Cache
 	* if necessary via `Store.createCache`

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

@@ -3,7 +3,7 @@ export { storeFor } from "./-private/store-service.js";
 export { recordIdentifierFor } from "./-private/caches/instance-cache.js";
 export { CacheHandler, type StoreRequestContext } from "./-private/cache-handler/handler.js";
 export { type CachePolicy } from "./-private/cache-handler/types.js";
-export { isStableIdentifier, isDocumentIdentifier } from "./-private/caches/identifier-cache.js";
+export { isResourceKey, isRequestKey } from "./-private/managers/cache-key-manager.js";
 export { constructResource } from "./-private/utils/construct-resource.js";
 export type { InstanceCache } from "./-private/caches/instance-cache.js";
 export type { FindRecordQuery, Request, SaveRecordMutation, RequestCacheRequestState, RequestStateService } from "./-private/network/request-cache.js";

package/declarations/store/-types/q/cache-capabilities-manager.d.ts

@@ -1,5 +1,5 @@
-import type { StableDocumentIdentifier, StableRecordIdentifier } from "../../../types/identifier.js";
-import type { IdentifierCache } from "../../-private/caches/identifier-cache.js";
+import type { RequestKey, ResourceKey } from "../../../types/identifier.js";
+import type { CacheKeyManager } from "../../-private/managers/cache-key-manager.js";
 import type { NotificationType } from "../../-private/managers/notification-manager.js";
 import type { SchemaService } from "./schema-service.js";
 /**
@@ -11,22 +11,21 @@ import type { SchemaService } from "./schema-service.js";
 *
 * This class cannot be directly instantiated.
 *
-* @class CacheCapabilitiesManager
 * @public
 */
 export type CacheCapabilitiesManager = {
 	/**
-	* Provides access to the IdentifierCache instance
+	* Provides access to the CacheKeyManager instance
 	* for this Store instance.
 	*
-	* The IdentifierCache can be used to peek, generate or
+	* The CacheKeyManager can be used to peek, generate or
 	* retrieve a stable unique identifier for any resource.
 	*
-	* @property identifierCache
-	* @type {IdentifierCache}
 	* @public
 	*/
-	identifierCache: IdentifierCache;
+	cacheKeyManager: CacheKeyManager;
+	/** @deprecated use {@link CacheCapabilitiesManager.cacheKeyManager} */
+	identifierCache: CacheKeyManager;
 	/**
 	* DEPRECATED - use the schema property
 	*
@@ -36,7 +35,7 @@ export type CacheCapabilitiesManager = {
 	* The SchemaService can be used to query for
 	* information about the schema of a resource.
 	*
-	* @deprecated
+	* @deprecated use {@link CacheCapabilitiesManager.schema}
 	* @public
 	*/
 	getSchemaDefinitionService(): SchemaService;
@@ -55,30 +54,25 @@ export type CacheCapabilitiesManager = {
 	* Update the `id` for the record corresponding to the identifier
 	* This operation can only be done for records whose `id` is `null`.
 	*
-	* @param {StableRecordIdentifier} identifier;
-	* @param {String} id;
 	* @public
 	*/
-	setRecordId(identifier: StableRecordIdentifier, id: string): void;
+	setRecordId(identifier: ResourceKey, id: string): void;
 	/**
 	* Signal to the store that the specified record may be considered fully
 	* removed from the cache. Generally this means that not only does no
 	* data exist for the identified resource, no known relationships still
 	* point to it either.
 	*
-	* @param {StableRecordIdentifier} identifier
 	* @public
 	*/
-	disconnectRecord(identifier: StableRecordIdentifier): void;
+	disconnectRecord(identifier: ResourceKey): void;
 	/**
 	* Use this method to determine if the Store has an instantiated record associated
 	* with an identifier.
 	*
-	* @param identifier
-	* @return {Boolean}
 	* @public
 	*/
-	hasRecord(identifier: StableRecordIdentifier): boolean;
+	hasRecord(identifier: ResourceKey): boolean;
 	/**
 	* Notify subscribers of the NotificationManager that cache state has changed.
 	*
@@ -87,13 +81,10 @@ export type CacheCapabilitiesManager = {
 	*
 	* No other namespaces currently expect the `key` argument.
 	*
-	* @param {StableRecordIdentifier} identifier
-	* @param {'attributes' | 'relationships' | 'identity' | 'errors' | 'meta' | 'state'} namespace
-	* @param {string|undefined} key
 	* @public
 	*/
-	notifyChange(identifier: StableRecordIdentifier, namespace: "added" | "removed", key: null): void;
-	notifyChange(identifier: StableDocumentIdentifier, namespace: "added" | "updated" | "removed", key: null): void;
-	notifyChange(identifier: StableRecordIdentifier, namespace: NotificationType, key: string | null): void;
-	notifyChange(identifier: StableRecordIdentifier | StableDocumentIdentifier, namespace: NotificationType | "added" | "removed" | "updated", key: string | null): void;
+	notifyChange(identifier: ResourceKey, namespace: "added" | "removed", key: null): void;
+	notifyChange(identifier: RequestKey, namespace: "added" | "updated" | "removed", key: null): void;
+	notifyChange(identifier: ResourceKey, namespace: NotificationType, key: string | null): void;
+	notifyChange(identifier: ResourceKey | RequestKey, namespace: NotificationType | "added" | "removed" | "updated", key: string | null): void;
 };

package/declarations/store/-types/q/identifier.d.ts

@@ -1,20 +1,23 @@
-import type { IdentifierBucket, StableIdentifier, StableRecordIdentifier } from "../../../types/identifier.js";
+import type { CacheKeyType, RequestKey, ResourceKey } from "../../../types/identifier.js";
 import type { ImmutableRequestInfo } from "../../../types/request.js";
 export interface GenerationMethod {
 	(data: ImmutableRequestInfo, bucket: "document"): string | null;
 	(data: unknown | {
 		type: string;
 	}, bucket: "record"): string;
-	(data: unknown, bucket: IdentifierBucket): string | null;
+	(data: unknown, bucket: CacheKeyType): string | null;
 }
 export type UpdateMethod = {
-	(identifier: StableRecordIdentifier, newData: unknown, bucket: "record"): void;
-	(identifier: StableIdentifier, newData: unknown, bucket: never): void;
+	(identifier: ResourceKey, newData: unknown, bucket: "record"): void;
+	(identifier: RequestKey, newData: unknown, bucket: "document"): void;
+	(identifier: {
+		lid: string;
+	}, newData: unknown, bucket: never): void;
 };
-export type ForgetMethod = (identifier: StableIdentifier | StableRecordIdentifier, bucket: IdentifierBucket) => void;
+export type ForgetMethod = (identifier: RequestKey | ResourceKey, bucket: CacheKeyType) => void;
 export type ResetMethod = () => void;
 export type KeyInfo = {
 	id: string | null;
 	type: string;
 };
-export type KeyInfoMethod = (resource: unknown, known: StableRecordIdentifier | null) => KeyInfo;
+export type KeyInfoMethod = (resource: unknown, known: ResourceKey | null) => KeyInfo;

package/declarations/store/-types/q/schema-service.d.ts

@@ -1,6 +1,6 @@
 import type { CAUTION_MEGA_DANGER_ZONE_Extension, ProcessedExtension } from "../../../reactive.js";
 import type { ExtensibleField } from "../../../reactive/-private/schema.js";
-import type { RecordIdentifier, StableRecordIdentifier } from "../../../types/identifier.js";
+import type { ResourceKey } from "../../../types/identifier.js";
 import type { ObjectValue } from "../../../types/json/raw.js";
 import type { Derivation, HashFn, Transformation } from "../../../types/schema/concepts.js";
 import type { ArrayField, CacheableFieldSchema, DerivedField, FieldSchema, GenericField, HashField, IdentityField, LegacyAttributeField, LegacyRelationshipField, ObjectField, Schema, Trait } from "../../../types/schema/fields.js";
@@ -74,7 +74,7 @@ export interface SchemaService {
 	*
 	* @public
 	*/
-	hasResource(resource: ObjectWithStringTypeProperty | StableRecordIdentifier): boolean;
+	hasResource(resource: ObjectWithStringTypeProperty | ResourceKey): boolean;
 	/**
 	* Queries whether the SchemaService recognizes `type` as a resource trait
 	*
@@ -86,7 +86,7 @@ export interface SchemaService {
 	*
 	* @public
 	*/
-	resourceHasTrait(resource: ObjectWithStringTypeProperty | StableRecordIdentifier, trait: string): boolean;
+	resourceHasTrait(resource: ObjectWithStringTypeProperty | ResourceKey, trait: string): boolean;
 	/**
 	* Queries for the fields of a given resource type or resource identity.
 	*
@@ -94,7 +94,7 @@ export interface SchemaService {
 	*
 	* @public
 	*/
-	fields(resource: ObjectWithStringTypeProperty | StableRecordIdentifier): Map<string, FieldSchema>;
+	fields(resource: ObjectWithStringTypeProperty | ResourceKey): Map<string, FieldSchema>;
 	/**
 	* Queries for the fields of a given resource type or resource identity.
 	*
@@ -102,7 +102,7 @@ export interface SchemaService {
 	*
 	* @public
 	*/
-	cacheFields?(resource: ObjectWithStringTypeProperty | StableRecordIdentifier): Map<string, Exclude<CacheableFieldSchema, IdentityField>>;
+	cacheFields?(resource: ObjectWithStringTypeProperty | ResourceKey): Map<string, Exclude<CacheableFieldSchema, IdentityField>>;
 	/**
 	* Returns the transformation registered with the name provided
 	* by `field.type`. Validates that the field is a valid transformable.
@@ -129,7 +129,7 @@ export interface SchemaService {
 	*
 	* @public
 	*/
-	resource(resource: ObjectWithStringTypeProperty | StableRecordIdentifier): Schema;
+	resource(resource: ObjectWithStringTypeProperty | ResourceKey): Schema;
 	/**
 	* Enables registration of multiple Schemas at once.
 	*
@@ -253,7 +253,7 @@ export interface SchemaService {
 	* @public
 	* @deprecated
 	*/
-	attributesDefinitionFor?(identifier: RecordIdentifier | ObjectWithStringTypeProperty): AttributesSchema;
+	attributesDefinitionFor?(key: ResourceKey | ObjectWithStringTypeProperty): AttributesSchema;
 	/**
 	* DEPRECATED - use `fields` instead
 	*
@@ -332,7 +332,7 @@ export interface SchemaService {
 	* @public
 	* @deprecated
 	*/
-	relationshipsDefinitionFor?(identifier: RecordIdentifier | ObjectWithStringTypeProperty): RelationshipsSchema;
+	relationshipsDefinitionFor?(key: ResourceKey | ObjectWithStringTypeProperty): RelationshipsSchema;
 	/**
 	* Returns all known resource types
 	*
@@ -350,7 +350,7 @@ export interface SchemaService {
 	*
 	* @public
 	*/
-	CAUTION_MEGA_DANGER_ZONE_resourceExtensions?(resource: StableRecordIdentifier | {
+	CAUTION_MEGA_DANGER_ZONE_resourceExtensions?(resource: ResourceKey | {
 		type: string;
 	}): null | ProcessedExtension["features"];
 	/**