@warp-drive/core 5.9.0-alpha.18 → 5.9.0-alpha.19

package/dist/unpkg/prod-deprecated/{index-CZkDXZog.js → index-CplZl2hv.js}

@@ -6361,6 +6361,9 @@ class ReactiveResource {
         if (prop === Destroy || prop === Checkout) {
           return true;
         }
+        if (prop === identityField?.name) {
+          return true;
+        }
         return fields.has(prop);
       },
       getOwnPropertyDescriptor(target, prop) {
@@ -7057,6 +7060,18 @@ class SchemaService {
 
   /** @internal */
 
+  /**
+   * Tracks, per abstract type, the relationship fields that concrete
+   * implementers have contributed via `options.as`, along with the type
+   * that contributed each one (for assertion messages). This is
+   * independent of whatever schema (synthesized or user-registered)
+   * currently occupies `_schemas` for that type, so that these fields
+   * survive regardless of the order in which the abstract type's
+   * implementers and its own (optional) concrete schema are registered.
+   *
+   * @internal
+   */
+
   /** @internal */
 
   /** @internal */
@@ -7068,6 +7083,7 @@ class SchemaService {
     this._derivations = new Map();
     this._traits = new Map();
     this._modes = new Map();
+    this._abstractImplementerFields = new Map();
     this._extensions = {
       object: new Map(),
       array: new Map()
@@ -7113,12 +7129,33 @@ class SchemaService {
     const fields = new Map();
     const relationships = {};
     const attributes = {};
+    const abstractImplementations = [];
     for (const field of schema.fields) {
       fields.set(field.name, field);
       if (field.kind === 'attribute') {
         attributes[field.name] = field;
       } else if (field.kind === 'belongsTo' || field.kind === 'hasMany') {
         relationships[field.name] = field;
+        if (field.options?.as) {
+          abstractImplementations.push(field);
+        }
+      }
+    }
+
+    // This type may already be known as an abstract polymorphic type,
+    // implemented by other concrete types via `options.as`, from before it
+    // ever had a schema of its own (see `_registerAbstractTypeImplementation`).
+    // Carry those previously-contributed fields forward so that registering
+    // a "real" schema for the type - whenever that happens to occur - never
+    // erases the relationships its implementers depend on.
+    const implementerFields = this._abstractImplementerFields.get(schema.type);
+    if (implementerFields) {
+      for (const [name, contribution] of implementerFields) {
+        const ownField = fields.get(name);
+        if (!ownField) {
+          fields.set(name, contribution.field);
+          relationships[name] = contribution.field;
+        }
       }
     }
     const cacheFields = null;
@@ -7137,6 +7174,92 @@ class SchemaService {
       internalSchema.cacheFields = getCacheFields(internalSchema);
     }
     this._schemas.set(schema.type, internalSchema);
+
+    // A relationship field's `as` option marks it as a valid concrete
+    // implementer of an abstract polymorphic type (e.g. `as: 'commentable'`).
+    // That abstract type may never be given its own schema by the user - it
+    // may exist only to be implemented by concrete types like this one - or
+    // it may already have (or later receive) a schema of its own, e.g. if it
+    // turns out to also be a real, directly-resolvable resource. Either way,
+    // ensure it has a schema with this field present, so that it behaves
+    // like any other registered resource (`hasResource`, `fields`, etc.)
+    // instead of requiring special-casing wherever abstract relationship
+    // types are resolved.
+    for (const field of abstractImplementations) {
+      this._registerAbstractTypeImplementation(field, schema.type);
+    }
+  }
+
+  /** @internal */
+  _registerAbstractTypeImplementation(field, implementer) {
+    const abstractType = field.options.as;
+    let implementerFields = this._abstractImplementerFields.get(abstractType);
+    if (!implementerFields) {
+      implementerFields = new Map();
+      this._abstractImplementerFields.set(abstractType, implementerFields);
+    }
+
+    // Unlike the original approach this replaced, `as` is *not* stripped here:
+    // the field as synthesized onto the abstract type's own schema keeps
+    // `options.as === abstractType`, redundant/self-referential as that is.
+    // This keeps every contributor - implementers and the abstract type's
+    // own schema alike - declaring the same thing, which is what
+    // `assertConsistentAbstractFieldShape` checks, and it is also what lets
+    // `assertPolymorphicType` (which reads a field's declared `as` off
+    // whatever `schema.fields()` serves for its type) correctly permit the
+    // abstract type itself to be pushed directly into this relationship.
+    const abstractField = {
+      ...field
+    };
+    const contribution = {
+      field: abstractField,
+      source: implementer
+    };
+
+    // all concrete implementations of an abstract type are required to
+    // share the same shape for the field that implements it, so the first
+    // one registered is as good a canonical source as any - but a later,
+    // differently-shaped one is almost certainly a mistake rather than an
+    // intentional override, so we catch it rather than silently ignoring it.
+    const existingImplementer = implementerFields.get(field.name);
+    if (existingImplementer) {
+      return;
+    }
+    implementerFields.set(field.name, contribution);
+    let abstractSchema = this._schemas.get(abstractType);
+    if (!abstractSchema) {
+      abstractSchema = {
+        original: {
+          legacy: true,
+          identity: {
+            kind: '@id',
+            name: 'id'
+          },
+          type: abstractType,
+          fields: []
+        },
+        finalized: true,
+        fields: new Map(),
+        cacheFields: new Map(),
+        relationships: {},
+        attributes: {},
+        traits: new Set()
+      };
+      this._schemas.set(abstractType, abstractSchema);
+    }
+    const existingAbstractField = abstractSchema.fields.get(field.name);
+    if (existingAbstractField) {
+      return;
+    }
+    abstractSchema.fields.set(field.name, abstractField);
+    abstractSchema.relationships[field.name] = abstractField;
+
+    // If the schema is mid-finalization (traits pending), finalizeResource
+    // will recompute cacheFields from the current `fields` map anyway; avoid
+    // doing so prematurely from a partially-resolved set of fields.
+    if (abstractSchema.finalized) {
+      abstractSchema.cacheFields = getCacheFields(abstractSchema);
+    }
   }
 
   /**
@@ -7780,7 +7903,29 @@ globalThis.setWarpDriveIsMaybeMirage = setIsMaybeMirage;
  */
 function useRecommendedStore(options, StoreKlass = Store) {
   return class AppStore extends StoreKlass {
-    requestManager = new RequestManager().use([...(options.handlers ?? []), Fetch]).useCache(CacheHandler);
+    constructor(createArgs) {
+      super(createArgs);
+      // installed via defineProperty (rather than a class field/accessor) so that
+      // this lazy override of the inherited `requestManager` field does not
+      // conflict with the documented pattern of assigning it directly on
+      // consumer-authored Store subclasses. The setter preserves the ability
+      // to replace `requestManager` outright after construction.
+      let requestManager;
+      Object.defineProperty(this, 'requestManager', {
+        configurable: true,
+        enumerable: true,
+        get: () => {
+          if (!requestManager) {
+            const handlers = typeof options.handlers === 'function' ? options.handlers(this) : options.handlers ?? [];
+            requestManager = new RequestManager().use([...handlers, Fetch]).useCache(CacheHandler);
+          }
+          return requestManager;
+        },
+        set: value => {
+          requestManager = value;
+        }
+      });
+    }
     lifetimes = options.policy ?? new DefaultCachePolicy({
       apiCacheHardExpires: 15 * 60 * 1000,
       // 15 minutes

package/dist/unpkg/prod-deprecated/index.js

@@ -1,4 +1,4 @@
-export { C as CacheHandler, F as Fetch, x as RequestManager, b as Store, d as cacheKeyFor, d as recordIdentifierFor, B as setIdentifierForgetMethod, z as setIdentifierGenerationMethod, D as setIdentifierResetMethod, A as setIdentifierUpdateMethod, E as setKeyInfoForResource, s as storeFor, y as useRecommendedStore } from "./index-CZkDXZog.js";
+export { C as CacheHandler, F as Fetch, x as RequestManager, b as Store, d as cacheKeyFor, d as recordIdentifierFor, B as setIdentifierForgetMethod, z as setIdentifierGenerationMethod, D as setIdentifierResetMethod, A as setIdentifierUpdateMethod, E as setKeyInfoForResource, s as storeFor, y as useRecommendedStore } from "./index-CplZl2hv.js";
 import './types/-private.js';
 import "./-leaked-BNVttukY.js";
 import './store.js';

package/dist/unpkg/prod-deprecated/reactive.js

@@ -1,4 +1,4 @@
-export { S as SchemaService, c as checkout, a as commit, f as fromIdentity, i as instantiateRecord, r as registerDerivations, t as teardownRecord, w as withDefaults } from "./index-CZkDXZog.js";
+export { S as SchemaService, c as checkout, a as commit, f as fromIdentity, i as instantiateRecord, r as registerDerivations, t as teardownRecord, w as withDefaults } from "./index-CplZl2hv.js";
 export { C as Checkout } from "./-private-3C1OkYtZ.js";
 export { c as createRequestSubscription, a as getPromiseState, g as getRequestState } from "./-leaked-BNVttukY.js";
 import './types/-private.js';

package/dist/unpkg/prod-deprecated/store/-private.js

@@ -1,4 +1,4 @@
-export { C as CacheHandler, R as RecordArrayManager, b as Store, q as StoreMap, _ as _clearCaches, u as _deprecatingNormalize, o as assertPrivateCapabilities, m as assertPrivateStore, j as coerceId, h as constructResource, v as createLegacyManyArray, k as ensureStringId, l as fastPush, n as isPrivateStore, g as isRequestKey, e as isResourceKey, d as recordIdentifierFor, p as setRecordIdentifier, s as storeFor } from "../index-CZkDXZog.js";
+export { C as CacheHandler, R as RecordArrayManager, b as Store, q as StoreMap, _ as _clearCaches, u as _deprecatingNormalize, o as assertPrivateCapabilities, m as assertPrivateStore, j as coerceId, h as constructResource, v as createLegacyManyArray, k as ensureStringId, l as fastPush, n as isPrivateStore, g as isRequestKey, e as isResourceKey, d as recordIdentifierFor, p as setRecordIdentifier, s as storeFor } from "../index-CplZl2hv.js";
 const TEXT_COLORS = {
   TEXT: 'inherit',
   notify: ['white', 'white', 'inherit', 'magenta', 'inherit'],

package/dist/unpkg/prod-deprecated/types/-private.js

@@ -1,5 +1,5 @@
 const name = "@warp-drive/core";
-const version = "5.9.0-alpha.18";
+const version = "5.9.0-alpha.19";
 
 // 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.9.0-alpha.18",
+  "version": "5.9.0-alpha.19",
   "description": "Core package for WarpDrive | All the Universal Basics",
   "keywords": [
     "ember-addon"
@@ -45,13 +45,13 @@
   },
   "dependencies": {
     "@embroider/macros": "^1.19.6",
-    "@warp-drive/build-config": "5.9.0-alpha.18"
+    "@warp-drive/build-config": "5.9.0-alpha.19"
   },
   "devDependencies": {
     "@babel/core": "^7.28.3",
     "@babel/plugin-transform-typescript": "^7.28.0",
     "@babel/preset-typescript": "^7.27.1",
-    "@warp-drive/internal-config": "5.9.0-alpha.18",
+    "@warp-drive/internal-config": "5.9.0-alpha.19",
     "decorator-transforms": "^2.3.0",
     "ember-source": "~6.12.0",
     "expect-type": "^1.2.2",