@warp-drive/core 5.7.0-alpha.26 → 5.7.0-alpha.27

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

@@ -26,7 +26,7 @@ export declare class ContextOwner {
 	setResponse(response: ResponseInfo | Response | null): void;
 }
 export declare class Context {
-	#private;
+	private ___owner;
 	request: ImmutableRequestInfo;
 	id: number;
 	private _isCacheHandler;

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

@@ -94,7 +94,8 @@ import { IS_CACHE_HANDLER } from "./utils.js";
 * @public
 */
 export declare class RequestManager {
-	#private;
+	/** @internal */
+	private _handlers;
 	/** @internal */
 	_hasCacheHandler: boolean;
 	/**

package/declarations/store/-private/managers/cache-manager.d.ts

@@ -28,8 +28,8 @@ import type { StoreRequestContext } from "../cache-handler/handler.js";
 * @public
 */
 export declare class CacheManager implements Cache {
-	#private;
 	version: "2";
+	private ___cache;
 	constructor(cache: Cache);
 	// Cache Management
 	// ================

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

@@ -43,7 +43,7 @@ export interface RequestArgs<
 	* different from the store provided via context.
 	*
 	*/
-	store?: Store;
+	store?: Store | RequestManager;
 }
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export interface SubscriptionArgs<

package/dist/{context-DbdT1mON.js → context-Bh-MA_tH.js}

@@ -639,19 +639,18 @@ class ContextOwner {
   }
 }
 class Context {
-  #owner;
   constructor(owner, isCacheHandler) {
     this.id = owner.requestId;
-    this.#owner = owner;
+    this.___owner = owner;
     this.request = owner.enhancedRequest;
     this._isCacheHandler = isCacheHandler;
     this._finalized = false;
   }
   setStream(stream) {
-    this.#owner.setStream(stream);
+    this.___owner.setStream(stream);
   }
   setResponse(response) {
-    this.#owner.setResponse(response);
+    this.___owner.setResponse(response);
   }
   setIdentifier(identifier) {
     macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
@@ -659,10 +658,10 @@ class Context {
         throw new Error(`setIdentifier may only be used synchronously from a CacheHandler`);
       }
     })(identifier && this._isCacheHandler && !this._finalized) : {};
-    this.#owner.god.identifier = identifier;
+    this.___owner.god.identifier = identifier;
   }
   get hasRequestedStream() {
-    return this.#owner.hasRequestedStream;
+    return this.___owner.hasRequestedStream;
   }
   _finalize() {
     this._finalized = true;

package/dist/index.js

@@ -1,10 +1,10 @@
 import { setLogging, getRuntimeConfig } from './types/runtime.js';
-import { a as cloneResponseProperties, I as IS_CACHE_HANDLER, b as assertValidRequest, e as executeNextHandler, d as getRequestResult, u as upgradePromise, s as setPromiseResult, f as clearRequestResult } from "./context-DbdT1mON.js";
+import { a as cloneResponseProperties, I as IS_CACHE_HANDLER, b as assertValidRequest, e as executeNextHandler, d as getRequestResult, u as upgradePromise, s as setPromiseResult, f as clearRequestResult } from "./context-Bh-MA_tH.js";
 import { macroCondition, getGlobalConfig } from '@embroider/macros';
 import { w as waitFor } from "./configure-B48bFHOl.js";
 import { peekUniversalTransient, setUniversalTransient } from './types/-private.js';
 import { EnableHydration } from './types/request.js';
-export { C as CacheHandler, S as Store, r as recordIdentifierFor, N as setIdentifierForgetMethod, L as setIdentifierGenerationMethod, O as setIdentifierResetMethod, M as setIdentifierUpdateMethod, P as setKeyInfoForResource, s as storeFor } from "./request-state-CqVrgUM0.js";
+export { C as CacheHandler, S as Store, r as recordIdentifierFor, N as setIdentifierForgetMethod, L as setIdentifierGenerationMethod, O as setIdentifierResetMethod, M as setIdentifierUpdateMethod, P as setKeyInfoForResource, s as storeFor } from "./request-state-DAjbHWcs.js";
 import '@ember/debug';
 import './utils/string.js';
 import "./symbols-sql1_mdx.js";
@@ -189,7 +189,7 @@ function isDict(v) {
 }
 class RequestManager {
   /** @internal */
-  #handlers = [];
+
   /** @internal */
 
   /**
@@ -207,6 +207,7 @@ class RequestManager {
     Object.assign(this, options);
     this._pending = new Map();
     this._deduped = new Map();
+    this._handlers = [];
   }
 
   /**
@@ -223,13 +224,13 @@ class RequestManager {
       if (this._hasCacheHandler) {
         throw new Error(`\`RequestManager.useCache(<handler>)\` May only be invoked once.`);
       }
-      if (Object.isFrozen(this.#handlers)) {
+      if (Object.isFrozen(this._handlers)) {
         throw new Error(`\`RequestManager.useCache(<handler>)\` May only be invoked prior to any request having been made.`);
       }
       this._hasCacheHandler = true;
     }
     cacheHandler[IS_CACHE_HANDLER] = true;
-    this.#handlers.unshift(cacheHandler);
+    this._handlers.unshift(cacheHandler);
     return this;
   }
 
@@ -243,7 +244,7 @@ class RequestManager {
    * @public
    */
   use(newHandlers) {
-    const handlers = this.#handlers;
+    const handlers = this._handlers;
     if (macroCondition(getGlobalConfig().WarpDrive.env.DEBUG)) {
       if (Object.isFrozen(handlers)) {
         throw new Error(`Cannot add a Handler to a RequestManager after a request has been made`);
@@ -269,7 +270,7 @@ class RequestManager {
    * @public
    */
   request(request) {
-    const handlers = this.#handlers;
+    const handlers = this._handlers;
     if (macroCondition(getGlobalConfig().WarpDrive.env.DEBUG)) {
       if (!Object.isFrozen(handlers)) {
         Object.freeze(handlers);

package/dist/reactive.js

@@ -1,5 +1,5 @@
-import { G as ReactiveResource, H as isNonIdentityCacheableField, I as getFieldCacheKeyStrict, r as recordIdentifierFor, A as withSignalStore } from "./request-state-CqVrgUM0.js";
-export { J as checkout, K as commit } from "./request-state-CqVrgUM0.js";
+import { G as ReactiveResource, H as isNonIdentityCacheableField, I as getFieldCacheKeyStrict, r as recordIdentifierFor, A as withSignalStore } from "./request-state-DAjbHWcs.js";
+export { J as checkout, K as commit } from "./request-state-DAjbHWcs.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-CqVrgUM0.js → request-state-DAjbHWcs.js}

@@ -7,7 +7,7 @@ import { CACHE_OWNER, DEBUG_STALE_CACHE_OWNER, DEBUG_KEY_TYPE, DEBUG_CLIENT_ORIG
 import { dasherize } from './utils/string.js';
 import { S as SOURCE, C as Context, D as Destroy, a as Checkout, b as Commit } from "./symbols-sql1_mdx.js";
 import { a as createSignal, b as consumeSignal, n as notifySignal, c as createMemo, A as ARRAY_SIGNAL, O as OBJECT_SIGNAL, d as willSyncFlushWatchers } from "./configure-B48bFHOl.js";
-import { g as getPromiseResult, s as setPromiseResult } from "./context-DbdT1mON.js";
+import { g as getPromiseResult, s as setPromiseResult } from "./context-Bh-MA_tH.js";
 import { RecordStore } from './types/symbols.js';
 const INITIALIZER_PROTO = {
   isInitializer: true
@@ -4219,9 +4219,8 @@ function unloadRecord(instances, identifier) {
  */
 class CacheManager {
   version = '2';
-  #cache;
   constructor(cache) {
-    this.#cache = cache;
+    this.___cache = cache;
   }
 
   // Cache Management
@@ -4250,7 +4249,7 @@ class CacheManager {
    * @public
    */
   put(doc) {
-    return this.#cache.put(doc);
+    return this.___cache.put(doc);
   }
 
   /**
@@ -4261,7 +4260,7 @@ class CacheManager {
    * @return {void}
    */
   patch(op) {
-    this.#cache.patch(op);
+    this.___cache.patch(op);
   }
 
   /**
@@ -4272,7 +4271,7 @@ class CacheManager {
    * @param mutation
    */
   mutate(mutation) {
-    this.#cache.mutate(mutation);
+    this.___cache.mutate(mutation);
   }
 
   /**
@@ -4308,10 +4307,10 @@ class CacheManager {
    */
 
   peek(cacheKey) {
-    return this.#cache.peek(cacheKey);
+    return this.___cache.peek(cacheKey);
   }
   peekRemoteState(cacheKey) {
-    return this.#cache.peekRemoteState(cacheKey);
+    return this.___cache.peekRemoteState(cacheKey);
   }
   /**
    * Peek the Cache for the existing request data associated with
@@ -4322,7 +4321,7 @@ class CacheManager {
    * @public
    */
   peekRequest(key) {
-    return this.#cache.peekRequest(key);
+    return this.___cache.peekRequest(key);
   }
 
   /**
@@ -4332,7 +4331,7 @@ class CacheManager {
    * @return if `hasRecord` is true then calculated key changes should be returned
    */
   upsert(key, data, hasRecord) {
-    return this.#cache.upsert(key, data, hasRecord);
+    return this.___cache.upsert(key, data, hasRecord);
   }
 
   // Cache Forking Support
@@ -4349,7 +4348,7 @@ class CacheManager {
    * @return {Promise<Cache>}
    */
   fork() {
-    return this.#cache.fork();
+    return this.___cache.fork();
   }
 
   /**
@@ -4364,7 +4363,7 @@ class CacheManager {
    * @return {Promise<void>}
    */
   merge(cache) {
-    return this.#cache.merge(cache);
+    return this.___cache.merge(cache);
   }
 
   /**
@@ -4400,7 +4399,7 @@ class CacheManager {
    * @public
    */
   diff() {
-    return this.#cache.diff();
+    return this.___cache.diff();
   }
 
   // SSR Support
@@ -4415,7 +4414,7 @@ class CacheManager {
    * @public
    */
   dump() {
-    return this.#cache.dump();
+    return this.___cache.dump();
   }
 
   /**
@@ -4435,7 +4434,7 @@ class CacheManager {
    * @public
    */
   hydrate(stream) {
-    return this.#cache.hydrate(stream);
+    return this.___cache.hydrate(stream);
   }
 
   // Cache
@@ -4453,7 +4452,7 @@ class CacheManager {
    * @public
    */
   clientDidCreate(key, options) {
-    return this.#cache.clientDidCreate(key, options);
+    return this.___cache.clientDidCreate(key, options);
   }
 
   /**
@@ -4464,7 +4463,7 @@ class CacheManager {
    * @param key
    */
   willCommit(key, context) {
-    this.#cache.willCommit(key, context);
+    this.___cache.willCommit(key, context);
   }
 
   /**
@@ -4474,7 +4473,7 @@ class CacheManager {
    * @public
    */
   didCommit(key, result) {
-    return this.#cache.didCommit(key, result);
+    return this.___cache.didCommit(key, result);
   }
 
   /**
@@ -4484,7 +4483,7 @@ class CacheManager {
    * @public
    */
   commitWasRejected(key, errors) {
-    this.#cache.commitWasRejected(key, errors);
+    this.___cache.commitWasRejected(key, errors);
   }
 
   /**
@@ -4494,7 +4493,7 @@ class CacheManager {
    * @public
    */
   unloadRecord(key) {
-    this.#cache.unloadRecord(key);
+    this.___cache.unloadRecord(key);
   }
 
   // Granular Resource Data APIs
@@ -4506,7 +4505,7 @@ class CacheManager {
    * @public
    */
   getAttr(key, propertyName) {
-    return this.#cache.getAttr(key, propertyName);
+    return this.___cache.getAttr(key, propertyName);
   }
 
   /**
@@ -4515,7 +4514,7 @@ class CacheManager {
    * @public
    */
   getRemoteAttr(key, propertyName) {
-    return this.#cache.getRemoteAttr(key, propertyName);
+    return this.___cache.getRemoteAttr(key, propertyName);
   }
 
   /**
@@ -4524,7 +4523,7 @@ class CacheManager {
    * @public
    */
   setAttr(key, propertyName, value) {
-    this.#cache.setAttr(key, propertyName, value);
+    this.___cache.setAttr(key, propertyName, value);
   }
 
   /**
@@ -4533,7 +4532,7 @@ class CacheManager {
    * @public
    */
   changedAttrs(key) {
-    return this.#cache.changedAttrs(key);
+    return this.___cache.changedAttrs(key);
   }
 
   /**
@@ -4542,7 +4541,7 @@ class CacheManager {
    * @public
    */
   hasChangedAttrs(key) {
-    return this.#cache.hasChangedAttrs(key);
+    return this.___cache.hasChangedAttrs(key);
   }
 
   /**
@@ -4552,7 +4551,7 @@ class CacheManager {
    * @return the names of attributes that were restored
    */
   rollbackAttrs(key) {
-    return this.#cache.rollbackAttrs(key);
+    return this.___cache.rollbackAttrs(key);
   }
 
   // Relationships
@@ -4583,7 +4582,7 @@ class CacheManager {
    * @public
    */
   changedRelationships(key) {
-    return this.#cache.changedRelationships(key);
+    return this.___cache.changedRelationships(key);
   }
 
   /**
@@ -4592,7 +4591,7 @@ class CacheManager {
    * @public
    */
   hasChangedRelationships(key) {
-    return this.#cache.hasChangedRelationships(key);
+    return this.___cache.hasChangedRelationships(key);
   }
 
   /**
@@ -4606,7 +4605,7 @@ class CacheManager {
    * @return the names of relationships that were restored
    */
   rollbackRelationships(key) {
-    return this.#cache.rollbackRelationships(key);
+    return this.___cache.rollbackRelationships(key);
   }
 
   /**
@@ -4616,7 +4615,7 @@ class CacheManager {
    * @return resource relationship object
    */
   getRelationship(key, propertyName) {
-    return this.#cache.getRelationship(key, propertyName);
+    return this.___cache.getRelationship(key, propertyName);
   }
 
   /**
@@ -4626,7 +4625,7 @@ class CacheManager {
    * @return resource relationship object
    */
   getRemoteRelationship(key, propertyName) {
-    return this.#cache.getRemoteRelationship(key, propertyName);
+    return this.___cache.getRemoteRelationship(key, propertyName);
   }
 
   // Resource State
@@ -4639,7 +4638,7 @@ class CacheManager {
    * @public
    */
   setIsDeleted(key, isDeleted) {
-    this.#cache.setIsDeleted(key, isDeleted);
+    this.___cache.setIsDeleted(key, isDeleted);
   }
 
   /**
@@ -4648,7 +4647,7 @@ class CacheManager {
    * @public
    */
   getErrors(key) {
-    return this.#cache.getErrors(key);
+    return this.___cache.getErrors(key);
   }
 
   /**
@@ -4657,7 +4656,7 @@ class CacheManager {
    * @public
    */
   isEmpty(key) {
-    return this.#cache.isEmpty(key);
+    return this.___cache.isEmpty(key);
   }
 
   /**
@@ -4667,7 +4666,7 @@ class CacheManager {
    * @public
    */
   isNew(key) {
-    return this.#cache.isNew(key);
+    return this.___cache.isNew(key);
   }
 
   /**
@@ -4677,7 +4676,7 @@ class CacheManager {
    * @public
    */
   isDeleted(key) {
-    return this.#cache.isDeleted(key);
+    return this.___cache.isDeleted(key);
   }
 
   /**
@@ -4687,7 +4686,7 @@ class CacheManager {
    * @public
    */
   isDeletionCommitted(key) {
-    return this.#cache.isDeletionCommitted(key);
+    return this.___cache.isDeletionCommitted(key);
   }
 }
 function isCacheOperationValue(value) {
@@ -8273,6 +8272,7 @@ const CacheHandler = {
         });
         store.notifications.notify(identifier, 'state', null);
       }
+      store.requestManager._pending.set(context.id, promise);
       return promise;
     }
 

package/dist/request.js

@@ -1 +1 @@
-export { c as createDeferred, g as getPromiseResult, s as setPromiseResult } from "./context-DbdT1mON.js";
+export { c as createDeferred, g as getPromiseResult, s as setPromiseResult } from "./context-Bh-MA_tH.js";

package/dist/store/-private.js

@@ -1,2 +1,2 @@
-export { C as CacheHandler, D as DISPOSE, R as RecordArrayManager, y as Signals, S as Store, g as StoreMap, _ as _clearCaches, n as _deprecatingNormalize, b as coerceId, c as constructResource, E as consumeInternalSignal, h as createLegacyManyArray, m as createRequestSubscription, w as defineGate, x as defineNonEnumerableSignal, v as defineSignal, e as ensureStringId, u as entangleSignal, f as fastPush, t as gate, F as getOrCreateInternalSignal, k as getPromiseState, o as getRequestState, a as isRequestKey, i as isResourceKey, l as log, j as logGroup, q as memoized, B as notifyInternalSignal, z as peekInternalSignal, r as recordIdentifierFor, d as setRecordIdentifier, p as signal, s as storeFor, A as withSignalStore } from "../request-state-CqVrgUM0.js";
+export { C as CacheHandler, D as DISPOSE, R as RecordArrayManager, y as Signals, S as Store, g as StoreMap, _ as _clearCaches, n as _deprecatingNormalize, b as coerceId, c as constructResource, E as consumeInternalSignal, h as createLegacyManyArray, m as createRequestSubscription, w as defineGate, x as defineNonEnumerableSignal, v as defineSignal, e as ensureStringId, u as entangleSignal, f as fastPush, t as gate, F as getOrCreateInternalSignal, k as getPromiseState, o as getRequestState, a as isRequestKey, i as isResourceKey, l as log, j as logGroup, q as memoized, B as notifyInternalSignal, z as peekInternalSignal, r as recordIdentifierFor, d as setRecordIdentifier, p as signal, s as storeFor, A as withSignalStore } from "../request-state-DAjbHWcs.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.26";
+const version = "5.7.0-alpha.27";
 
 // 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.26",
+  "version": "5.7.0-alpha.27",
   "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.26"
+    "@warp-drive/build-config": "5.7.0-alpha.27"
   },
   "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.26",
+    "@warp-drive/internal-config": "5.7.0-alpha.27",
     "decorator-transforms": "^2.3.0",
     "ember-source": "~6.3.0",
     "expect-type": "^1.2.1",