@warp-drive/legacy 5.8.0-alpha.20 → 5.8.0-alpha.21

package/declarations/model/-private/legacy-relationships-support.d.ts

@@ -38,8 +38,8 @@ export declare class LegacySupport {
 	_updatePromiseProxyFor(kind: "belongsTo", key: string, args: {
 		promise: Promise<OpaqueRecordInstance | null>;
 	}): PromiseBelongsTo;
-	referenceFor(kind: "belongsTo", name: string): BelongsToReference;
-	referenceFor(kind: "hasMany", name: string): HasManyReference;
+	referenceFor(kind: "belongsTo", key: string): BelongsToReference;
+	referenceFor(kind: "hasMany", key: string): HasManyReference;
 	_findHasManyByJsonApiResource(resource: CollectionResourceRelationship, parentIdentifier: ResourceKey, relationship: CollectionEdge, options?: BaseFinderOptions): Promise<void | unknown[]> | void;
 	_findBelongsToByJsonApiResource(resource: SingleResourceRelationship, parentIdentifier: ResourceKey, relationship: ResourceEdge, options?: BaseFinderOptions): Promise<ResourceKey | null>;
 	destroy(): void;

package/dist/{errors-COviC59J.js → errors-B9CDPh3R.js}

@@ -1581,28 +1581,31 @@ class LegacySupport {
     this.cache.mutate(mutation);
   }
   _findBelongsTo(key, resource, relationship, options) {
+    const name = getRealFieldName(this, key);
+
     // TODO @runspired follow up if parent isNew then we should not be attempting load here
     // TODO @runspired follow up on whether this should be in the relationship requests cache
-    return this._findBelongsToByJsonApiResource(resource, this.identifier, relationship, options).then(identifier => handleCompletedRelationshipRequest(this, key, relationship, identifier), e => handleCompletedRelationshipRequest(this, key, relationship, null, e));
+    return this._findBelongsToByJsonApiResource(resource, this.identifier, relationship, options).then(identifier => handleCompletedRelationshipRequest(this, name, relationship, identifier), e => handleCompletedRelationshipRequest(this, name, relationship, null, e));
   }
   reloadBelongsTo(key, options) {
     const loadingPromise = this._relationshipPromisesCache[key];
     if (loadingPromise) {
       return loadingPromise;
     }
-    const relationship = this.graph.get(this.identifier, key);
+    const name = getRealFieldName(this, key);
+    const resource = this.store.cache.getRelationship(this.identifier, name);
+    const relationship = this.graph.get(this.identifier, name);
     macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
       if (!test) {
-        throw new Error(`Expected ${key} to be a belongs-to relationship`);
+        throw new Error(`Expected ${key === name ? name : `${key} (source: ${name})`} to be a belongs-to relationship`);
       }
     })(isBelongsTo(relationship)) : {};
-    const resource = this.cache.getRelationship(this.identifier, key);
     relationship.state.hasFailedLoadAttempt = false;
     relationship.state.shouldForceReload = true;
-    const promise = this._findBelongsTo(key, resource, relationship, options);
-    if (this._relationshipProxyCache[key]) {
+    const promise = this._findBelongsTo(name, resource, relationship, options);
+    if (this._relationshipProxyCache[name]) {
       // @ts-expect-error
-      return this._updatePromiseProxyFor('belongsTo', key, {
+      return this._updatePromiseProxyFor('belongsTo', name, {
         promise
       });
     }
@@ -1610,10 +1613,10 @@ class LegacySupport {
   }
   getBelongsTo(key, options) {
     const {
-      identifier,
-      cache
+      identifier
     } = this;
-    const resource = cache.getRelationship(this.identifier, key);
+    const name = getRealFieldName(this, key);
+    const resource = this.store.cache.getRelationship(this.identifier, name);
     const relatedIdentifier = resource && resource.data ? resource.data : null;
     macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
       if (!test) {
@@ -1621,10 +1624,10 @@ class LegacySupport {
       }
     })(!relatedIdentifier || isResourceKey(relatedIdentifier)) : {};
     const store = this.store;
-    const relationship = this.graph.get(this.identifier, key);
+    const relationship = this.graph.get(this.identifier, name);
     macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
       if (!test) {
-        throw new Error(`Expected ${key} to be a belongs-to relationship`);
+        throw new Error(`Expected ${key === name ? name : `${key} (source: ${name})`} to be a belongs-to relationship`);
       }
     })(isBelongsTo(relationship)) : {};
     const isAsync = relationship.definition.isAsync;
@@ -1636,11 +1639,11 @@ class LegacySupport {
     };
     if (isAsync) {
       if (relationship.state.hasFailedLoadAttempt) {
-        return this._relationshipProxyCache[key];
+        return this._relationshipProxyCache[name];
       }
-      const promise = this._findBelongsTo(key, resource, relationship, options);
+      const promise = this._findBelongsTo(name, resource, relationship, options);
       const isLoaded = relatedIdentifier && store._instanceCache.recordIsLoaded(relatedIdentifier);
-      return this._updatePromiseProxyFor('belongsTo', key, {
+      return this._updatePromiseProxyFor('belongsTo', name, {
         promise,
         content: isLoaded ? store._instanceCache.getRecord(relatedIdentifier) : null,
         _belongsToState
@@ -1651,7 +1654,7 @@ class LegacySupport {
       } else {
         macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
           if (!test) {
-            throw new Error(`You looked up the '${key}' relationship on a '${identifier.type}' with id ${identifier.id || 'null'} but some of the associated records were not loaded. Either make sure they are all loaded together with the parent record, or specify that the relationship is async (\`belongsTo(<type>, { async: true, inverse: <inverse> })\`)`);
+            throw new Error(`You looked up the '${key === name ? name : `${key} (source: ${name})`}' relationship on a '${identifier.type}' with id ${identifier.id || 'null'} but some of the associated records were not loaded. Either make sure they are all loaded together with the parent record, or specify that the relationship is async (\`belongsTo(<type>, { async: true, inverse: <inverse> })\`)`);
           }
         })(store._instanceCache.recordIsLoaded(relatedIdentifier, true)) : {};
         return store._instanceCache.getRecord(relatedIdentifier);
@@ -1659,10 +1662,11 @@ class LegacySupport {
     }
   }
   setDirtyBelongsTo(key, value) {
+    const name = getRealFieldName(this, key);
     return this.cache.mutate({
       op: 'replaceRelatedRecord',
       record: this.identifier,
-      field: key,
+      field: name,
       value: extractIdentifierFromRecord(value)
     },
     // @ts-expect-error
@@ -1688,13 +1692,15 @@ class LegacySupport {
     return [identifiers, jsonApi];
   }
   getManyArray(key, definition) {
+    const name = getRealFieldName(this, key);
     if (this.graph) {
-      let manyArray = this._manyArrayCache[key];
+      let manyArray = this._manyArrayCache[name];
       if (!definition) {
-        definition = this.graph.get(this.identifier, key).definition;
+        definition = this.graph.get(this.identifier, name).definition;
       }
       if (!manyArray) {
-        const [identifiers, doc] = this._getCurrentState(this.identifier, key);
+        const [identifiers, doc] = this._getCurrentState(this.identifier, name);
+        const field = getField(this, name);
         manyArray = createLegacyManyArray({
           store: this.store,
           // @ts-expect-error Typescript doesn't have a way for us to thread the generic backwards so it infers unknown instead of T
@@ -1705,12 +1711,12 @@ class LegacySupport {
           editable: true,
           isAsync: definition.isAsync,
           isPolymorphic: definition.isPolymorphic,
-          field: this.store.schema.fields(this.identifier).get(key),
+          field: field,
           identifier: this.identifier,
           links: doc.links || null,
           meta: doc.meta || null
         });
-        this._manyArrayCache[key] = manyArray;
+        this._manyArrayCache[name] = manyArray;
       }
       return manyArray;
     }
@@ -1721,19 +1727,20 @@ class LegacySupport {
     })() : {};
   }
   fetchAsyncHasMany(key, relationship, manyArray, options) {
+    const name = getRealFieldName(this, key);
     if (this.graph) {
-      let loadingPromise = this._relationshipPromisesCache[key];
+      let loadingPromise = this._relationshipPromisesCache[name];
       if (loadingPromise) {
         return loadingPromise;
       }
-      const jsonApi = this.cache.getRelationship(this.identifier, key);
+      const jsonApi = this.cache.getRelationship(this.identifier, name);
       const promise = this._findHasManyByJsonApiResource(jsonApi, this.identifier, relationship, options);
       if (!promise) {
         manyArray.isLoaded = true;
         return Promise.resolve(manyArray);
       }
-      loadingPromise = promise.then(() => handleCompletedRelationshipRequest(this, key, relationship, manyArray), e => handleCompletedRelationshipRequest(this, key, relationship, manyArray, e));
-      this._relationshipPromisesCache[key] = loadingPromise;
+      loadingPromise = promise.then(() => handleCompletedRelationshipRequest(this, name, relationship, manyArray), e => handleCompletedRelationshipRequest(this, name, relationship, manyArray, e));
+      this._relationshipPromisesCache[name] = loadingPromise;
       return loadingPromise;
     }
     macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
@@ -1743,22 +1750,23 @@ class LegacySupport {
     })() : {};
   }
   reloadHasMany(key, options) {
+    const name = getRealFieldName(this, key);
     if (this.graph) {
-      const loadingPromise = this._relationshipPromisesCache[key];
+      const loadingPromise = this._relationshipPromisesCache[name];
       if (loadingPromise) {
         return loadingPromise;
       }
-      const relationship = this.graph.get(this.identifier, key);
+      const relationship = this.graph.get(this.identifier, name);
       const {
         definition,
         state
       } = relationship;
       state.hasFailedLoadAttempt = false;
       state.shouldForceReload = true;
-      const manyArray = this.getManyArray(key, definition);
-      const promise = this.fetchAsyncHasMany(key, relationship, manyArray, options);
-      if (this._relationshipProxyCache[key]) {
-        return this._updatePromiseProxyFor('hasMany', key, {
+      const manyArray = this.getManyArray(name, definition);
+      const promise = this.fetchAsyncHasMany(name, relationship, manyArray, options);
+      if (this._relationshipProxyCache[name]) {
+        return this._updatePromiseProxyFor('hasMany', name, {
           promise
         });
       }
@@ -1771,26 +1779,27 @@ class LegacySupport {
     })() : {};
   }
   getHasMany(key, options) {
+    const name = getRealFieldName(this, key);
     if (this.graph) {
-      const relationship = this.graph.get(this.identifier, key);
+      const relationship = this.graph.get(this.identifier, name);
       const {
         definition,
         state
       } = relationship;
-      const manyArray = this.getManyArray(key, definition);
+      const manyArray = this.getManyArray(name, definition);
       if (definition.isAsync) {
         if (state.hasFailedLoadAttempt) {
-          return this._relationshipProxyCache[key];
+          return this._relationshipProxyCache[name];
         }
-        const promise = this.fetchAsyncHasMany(key, relationship, manyArray, options);
-        return this._updatePromiseProxyFor('hasMany', key, {
+        const promise = this.fetchAsyncHasMany(name, relationship, manyArray, options);
+        return this._updatePromiseProxyFor('hasMany', name, {
           promise,
           content: manyArray
         });
       } else {
         macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
           if (!test) {
-            throw new Error(`You looked up the '${key}' relationship on a '${this.identifier.type}' with id ${this.identifier.id || 'null'} but some of the associated records were not loaded. Either make sure they are all loaded together with the parent record, or specify that the relationship is async ('hasMany(<type>, { async: true, inverse: <inverse> })')`);
+            throw new Error(`You looked up the '${key === name ? name : `${key} (source: ${name})`}' relationship on a '${this.identifier.type}' with id ${this.identifier.id || 'null'} but some of the associated records were not loaded. Either make sure they are all loaded together with the parent record, or specify that the relationship is async ('hasMany(<type>, { async: true, inverse: <inverse> })')`);
           }
         })(!anyUnloaded(this.store, relationship)) : {};
         return manyArray;
@@ -1841,7 +1850,8 @@ class LegacySupport {
     }
     return promiseProxy;
   }
-  referenceFor(kind, name) {
+  referenceFor(kind, key) {
+    const name = getRealFieldName(this, key);
     let reference = this.references[name];
     if (!reference) {
       if (!this.graph) {
@@ -1865,16 +1875,16 @@ class LegacySupport {
           const actualRelationshipKind = relationship.definition.kind;
           macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
             if (!test) {
-              throw new Error(`You tried to get the '${name}' relationship on a '${modelName}' via record.${kind}('${name}'), but the relationship is of kind '${actualRelationshipKind}'. Use record.${actualRelationshipKind}('${name}') instead.`);
+              throw new Error(`You tried to get the '${key === name ? name : `${key} (source: ${name})`}' relationship on a '${modelName}' via record.${kind}('${key}'), but the relationship is of kind '${actualRelationshipKind}'. Use record.${actualRelationshipKind}('${key}') instead.`);
             }
           })(actualRelationshipKind === kind) : {};
         }
       }
       const relationshipKind = relationship.definition.kind;
       if (relationshipKind === 'belongsTo') {
-        reference = new BelongsToReference(this.store, graph, identifier, relationship, name);
+        reference = new BelongsToReference(this.store, graph, identifier, relationship, key);
       } else if (relationshipKind === 'hasMany') {
-        reference = new HasManyReference(this.store, graph, identifier, relationship, name);
+        reference = new HasManyReference(this.store, graph, identifier, relationship, key);
       }
       this.references[name] = reference;
     }
@@ -1991,12 +2001,13 @@ class LegacySupport {
       return Promise.resolve(null);
     }
     const key = relationship.definition.key;
+    const name = getRealFieldName(this, key);
 
     // interleaved promises mean that we MUST cache this here
     // in order to prevent infinite re-render if the request
     // fails.
-    if (this._pending[key]) {
-      return this._pending[key];
+    if (this._pending[name]) {
+      return this._pending[name];
     }
     const identifier = resource.data ? resource.data : null;
     macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
@@ -2046,10 +2057,10 @@ class LegacySupport {
         }
       };
       const future = this.store.request(req);
-      this._pending[key] = future.then(doc => field.options.linksMode ? doc.content.data : doc.content).finally(() => {
-        this._pending[key] = undefined;
+      this._pending[name] = future.then(doc => field.options.linksMode ? doc.content.data : doc.content).finally(() => {
+        this._pending[name] = undefined;
       });
-      return this._pending[key];
+      return this._pending[name];
     }
     const preferLocalCache = hasReceivedData && allInverseRecordsAreLoaded && !isEmpty;
     const hasLocalPartialData = hasDematerializedInverse || isEmpty && resource.data;
@@ -2076,7 +2087,7 @@ class LegacySupport {
         }
       })(identifier) : {};
       options.reload = options.reload || !attemptLocalCache || undefined;
-      this._pending[key] = this.store.request({
+      this._pending[name] = this.store.request({
         op: 'findBelongsTo',
         records: [identifier],
         data: request,
@@ -2084,9 +2095,9 @@ class LegacySupport {
           [Symbol.for('wd:skip-cache')]: true
         }
       }).then(doc => doc.content).finally(() => {
-        this._pending[key] = undefined;
+        this._pending[name] = undefined;
       });
-      return this._pending[key];
+      return this._pending[name];
     }
 
     // we were explicitly told we have no data and no links.
@@ -2213,6 +2224,17 @@ function areAllInverseRecordsLoaded(store, resource) {
 function isBelongsTo(relationship) {
   return relationship.definition.kind === 'belongsTo';
 }
+function getField(context, key) {
+  const {
+    identifier,
+    store
+  } = context;
+  return store.schema.fields(identifier).get(key) ?? store.schema.cacheFields?.(identifier).get(key);
+}
+function getRealFieldName(context, key) {
+  const field = getField(context, key);
+  return field ? field.sourceKey ?? field.name : key;
+}
 
 // we force the type here to our own construct because mixin and extend patterns
 // lose generic signatures. We also do this because we need to Omit `clear` from

package/dist/{hooks-Bp8SIQBU.js → hooks-CQXyievu.js}

@@ -1,6 +1,6 @@
 import { setOwner, getOwner } from '@ember/application';
 import { assertPrivateStore, setRecordIdentifier, StoreMap } from '@warp-drive/core/store/-private';
-import { g as getModelFactory } from "./schema-provider-JlCneqZH.js";
+import { g as getModelFactory } from "./schema-provider-BnVr_CnJ.js";
 import { n as normalizeModelName } from "./util-Dul6TZts.js";
 import { macroCondition, getGlobalConfig } from '@embroider/macros';
 function instantiateRecord(identifier, createRecordArgs) {

package/dist/index.js

@@ -9,9 +9,9 @@ import '@ember/debug';
 import '@warp-drive/utilities/string';
 import { macroCondition, getGlobalConfig } from '@embroider/macros';
 import '@warp-drive/core/store/-private';
-import "./errors-COviC59J.js";
-import "./schema-provider-JlCneqZH.js";
-import { i as instantiateRecord, t as teardownRecord, m as modelFor } from "./hooks-Bp8SIQBU.js";
+import "./errors-B9CDPh3R.js";
+import "./schema-provider-BnVr_CnJ.js";
+import { i as instantiateRecord, t as teardownRecord, m as modelFor } from "./hooks-CQXyievu.js";
 import { registerDerivations as registerDerivations$1, DelegatingSchemaService } from './model/migration-support.js';
 import { F as FragmentExtension, a as FragmentArrayExtension, f as fragmentsModelFor } from "./model-for-B0TSd9HU.js";
 import { restoreDeprecatedStoreBehaviors } from './store.js';

package/dist/model/-private.js

@@ -1 +1 @@
-export { E as Errors, L as LEGACY_SUPPORT, P as PromiseBelongsTo, a as PromiseManyArray, l as lookupLegacySupport } from "../errors-COviC59J.js";
+export { E as Errors, L as LEGACY_SUPPORT, P as PromiseBelongsTo, a as PromiseManyArray, l as lookupLegacySupport } from "../errors-B9CDPh3R.js";

package/dist/model/migration-support.js

@@ -4,8 +4,8 @@ import { Context } from '@warp-drive/core/reactive/-private';
 import { notifyInternalSignal, assertPrivateStore } from '@warp-drive/core/store/-private';
 import { getOrSetGlobal } from '@warp-drive/core/types/-private';
 import { Type } from '@warp-drive/core/types/symbols';
-import { l as lookupLegacySupport, E as Errors } from "../errors-COviC59J.js";
-import { b as buildSchema, u as unloadRecord, s as serialize, _ as _save, a as save, r as rollbackAttributes, c as _reload, d as reload, h as hasMany, e as _destroyRecord, f as destroyRecord, i as deleteRecord, R as RecordState, j as changedAttributes, k as belongsTo, l as createSnapshot } from "../schema-provider-JlCneqZH.js";
+import { l as lookupLegacySupport, E as Errors } from "../errors-B9CDPh3R.js";
+import { b as buildSchema, u as unloadRecord, s as serialize, _ as _save, a as save, r as rollbackAttributes, c as _reload, d as reload, h as hasMany, e as _destroyRecord, f as destroyRecord, i as deleteRecord, R as RecordState, j as changedAttributes, k as belongsTo, l as createSnapshot } from "../schema-provider-BnVr_CnJ.js";
 import { macroCondition, getGlobalConfig } from '@embroider/macros';
 
 /**

package/dist/model.js

@@ -5,10 +5,10 @@ import { i as isElementDescriptor, n as normalizeModelName } from "./util-Dul6TZ
 import { macroCondition, getGlobalConfig } from '@embroider/macros';
 import { warn, deprecate } from '@ember/debug';
 import { assertPrivateStore } from '@warp-drive/core/store/-private';
-import { l as lookupLegacySupport } from "./errors-COviC59J.js";
+import { l as lookupLegacySupport } from "./errors-B9CDPh3R.js";
 import { singularize, dasherize } from '@warp-drive/utilities/string';
-export { M as Model, b as buildSchema, M as default, m as restoreDeprecatedModelRequestBehaviors } from "./schema-provider-JlCneqZH.js";
-export { i as instantiateRecord, m as modelFor, t as teardownRecord } from "./hooks-Bp8SIQBU.js";
+export { M as Model, b as buildSchema, M as default, m as restoreDeprecatedModelRequestBehaviors } from "./schema-provider-BnVr_CnJ.js";
+export { i as instantiateRecord, m as modelFor, t as teardownRecord } from "./hooks-CQXyievu.js";
 function _attr(type, options) {
   if (typeof type === 'object') {
     options = type;

package/dist/{schema-provider-JlCneqZH.js → schema-provider-BnVr_CnJ.js}

@@ -4,7 +4,7 @@ import EmberObject from '@ember/object';
 import { recordIdentifierFor, storeFor } from '@warp-drive/core';
 import { assertPrivateStore, notifyInternalSignal, peekInternalSignal, withSignalStore, recordIdentifierFor as recordIdentifierFor$1, gate, memoized, defineSignal, coerceId, entangleSignal, defineGate } from '@warp-drive/core/store/-private';
 import { RecordStore } from '@warp-drive/core/types/symbols';
-import { l as lookupLegacySupport, L as LEGACY_SUPPORT, E as Errors } from "./errors-COviC59J.js";
+import { l as lookupLegacySupport, L as LEGACY_SUPPORT, E as Errors } from "./errors-B9CDPh3R.js";
 import { u as upgradeStore, F as FetchManager } from "./-private-B1pSSN52.js";
 import { macroCondition, getGlobalConfig } from '@embroider/macros';
 import { cacheFor } from '@ember/object/internals';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@warp-drive/legacy",
-  "version": "5.8.0-alpha.20",
+  "version": "5.8.0-alpha.21",
   "description": "Decommissioned Packages for WarpDrive | Things your app might still want to maintain use of for a little longer.",
   "keywords": [
     "ember-addon"
@@ -32,8 +32,8 @@
     }
   },
   "peerDependencies": {
-    "@warp-drive/core": "5.8.0-alpha.20",
-    "@warp-drive/utilities": "5.8.0-alpha.20"
+    "@warp-drive/core": "5.8.0-alpha.21",
+    "@warp-drive/utilities": "5.8.0-alpha.21"
   },
   "dependencies": {
     "@embroider/macros": "^1.18.1"
@@ -43,9 +43,9 @@
     "@babel/plugin-transform-typescript": "^7.28.0",
     "@babel/preset-typescript": "^7.27.1",
     "@types/jquery": "^3.5.33",
-    "@warp-drive/internal-config": "5.8.0-alpha.20",
-    "@warp-drive/core": "5.8.0-alpha.20",
-    "@warp-drive/utilities": "5.8.0-alpha.20",
+    "@warp-drive/internal-config": "5.8.0-alpha.21",
+    "@warp-drive/core": "5.8.0-alpha.21",
+    "@warp-drive/utilities": "5.8.0-alpha.21",
     "ember-source": "~6.6.0",
     "decorator-transforms": "^2.3.0",
     "expect-type": "^1.2.2",