@warp-drive/core 5.8.0-alpha.19 → 5.8.0-alpha.21

package/declarations/graph/-private/-edge-definition.d.ts

@@ -75,10 +75,15 @@ export declare function temporaryConvertToLegacy(field: ResourceField | Collecti
 export interface UpgradedMeta {
 	kind: "implicit" | RelationshipFieldKind;
 	/**
-	* The field name on `this` record
+	* The field sourceKey on `this` record,
+	* name if sourceKey is not set.
 	*/
 	key: string;
 	/**
+	* The field name on `this` record
+	*/
+	name: string;
+	/**
 	* The `type` of the related record
 	*
 	*/
@@ -91,10 +96,15 @@ export interface UpgradedMeta {
 	isLinksMode: boolean;
 	inverseKind: "implicit" | RelationshipFieldKind;
 	/**
-	* The field name on the opposing record
+	* The field sourceKey on the opposing record,
+	* name if sourceKey is not set.
 	*/
 	inverseKey: string;
 	/**
+	* The field name on the opposing record,
+	*/
+	inverseName: string;
+	/**
 	* The `type` of `this` record
 	*/
 	inverseType: string;

package/declarations/types/schema/fields.d.ts

@@ -1285,6 +1285,9 @@ export interface LegacyBelongsToField {
 		*
 		* If null, the relationship is unidirectional.
 		*
+		* If the inverse field definition uses a sourceKey,
+		* this should still be the name of the field, not the sourceKey.
+		*
 		* @public
 		*/
 		inverse: string | null;
@@ -1433,6 +1436,9 @@ export interface LinksModeBelongsToField {
 		*
 		* If null, the relationship is unidirectional.
 		*
+		* If the inverse field definition uses a sourceKey,
+		* this should still be the name of the field, not the sourceKey.
+		*
 		* @public
 		*/
 		inverse: string | null;
@@ -1604,6 +1610,9 @@ export interface LegacyHasManyField {
 		*
 		* If null, the relationship is unidirectional.
 		*
+		* If the inverse field definition uses a sourceKey,
+		* this should still be the name of the field, not the sourceKey.
+		*
 		* @public
 		*/
 		inverse: string | null;
@@ -1777,6 +1786,9 @@ export interface LinksModeHasManyField {
 		*
 		* If null, the relationship is unidirectional.
 		*
+		* If the inverse field definition uses a sourceKey,
+		* this should still be the name of the field, not the sourceKey.
+		*
 		* @public
 		*/
 		inverse: string | null;

package/dist/graph/-private.js

@@ -349,6 +349,7 @@ function implicitKeyFor(type, key) {
 function syncMeta(definition, inverseDefinition) {
   definition.inverseKind = inverseDefinition.kind;
   definition.inverseKey = inverseDefinition.key;
+  definition.inverseName = inverseDefinition.name;
   definition.inverseType = inverseDefinition.type;
   definition.inverseIsAsync = inverseDefinition.isAsync;
   definition.inverseIsCollection = inverseDefinition.isCollection;
@@ -366,7 +367,8 @@ function upgradeMeta(meta) {
   const niceMeta = {};
   const options = meta.options;
   niceMeta.kind = meta.kind;
-  niceMeta.key = meta.name;
+  niceMeta.key = meta.sourceKey ?? meta.name;
+  niceMeta.name = meta.name;
   niceMeta.type = meta.type;
   macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
     if (!test) {
@@ -379,6 +381,7 @@ function upgradeMeta(meta) {
   niceMeta.isPolymorphic = options && !!options.polymorphic;
   niceMeta.isLinksMode = options.linksMode ?? false;
   niceMeta.inverseKey = options && options.inverse || STR_LATER;
+  niceMeta.inverseName = options && options.inverse || STR_LATER;
   niceMeta.inverseType = STR_LATER;
   niceMeta.inverseIsAsync = BOOL_LATER;
   niceMeta.inverseIsImplicit = options && options.inverse === null || BOOL_LATER;
@@ -502,12 +505,13 @@ function upgradeDefinition(graph, key, propertyName, isImplicit = false) {
     }
   })(!isImplicit) : {};
   const relationships = storeWrapper.schema.fields(key);
+  const relationshipsBySourceKey = storeWrapper.schema.cacheFields?.(key) ?? relationships;
   macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
     if (!test) {
       throw new Error(`Expected to have a relationship definition for ${type} but none was found.`);
     }
   })(relationships) : {};
-  const meta = relationships.get(propertyName);
+  const meta = relationshipsBySourceKey.get(propertyName);
   if (!meta) {
     // TODO potentially we should just be permissive here since this is an implicit relationship
     // and not require the lookup table to be populated
@@ -564,6 +568,7 @@ function upgradeDefinition(graph, key, propertyName, isImplicit = false) {
         kind: 'belongsTo',
         // this must be updated when we find the first belongsTo or hasMany definition that matches
         key: definition.inverseKey,
+        name: definition.inverseName,
         type: type,
         isAsync: false,
         // this must be updated when we find the first belongsTo or hasMany definition that matches
@@ -578,6 +583,7 @@ function upgradeDefinition(graph, key, propertyName, isImplicit = false) {
       inverseDefinition = null;
     } else {
       // CASE: We have an explicit inverse or were able to resolve one
+      // for the inverse we use "name" for lookup not "sourceKey"
       const inverseDefinitions = storeWrapper.schema.fields({
         type: inverseType
       });
@@ -710,7 +716,8 @@ function upgradeDefinition(graph, key, propertyName, isImplicit = false) {
   return info;
 }
 function inverseForRelationship(store, resourceKey, key) {
-  const definition = store.schema.fields(resourceKey).get(key);
+  const fields = store.schema.fields(resourceKey);
+  const definition = fields.get(key);
   if (!definition) {
     return null;
   }

package/dist/types/-private.js

@@ -1,6 +1,6 @@
 import { macroCondition, getGlobalConfig } from '@embroider/macros';
 const name = "@warp-drive/core";
-const version = "5.8.0-alpha.19";
+const version = "5.8.0-alpha.21";
 
 // 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.8.0-alpha.19",
+  "version": "5.8.0-alpha.21",
   "description": "Core package for WarpDrive | All the Universal Basics",
   "keywords": [
     "ember-addon"
@@ -37,13 +37,13 @@
   },
   "dependencies": {
     "@embroider/macros": "^1.18.1",
-    "@warp-drive/build-config": "5.8.0-alpha.19"
+    "@warp-drive/build-config": "5.8.0-alpha.21"
   },
   "devDependencies": {
     "@babel/core": "^7.28.3",
     "@babel/plugin-transform-typescript": "^7.28.0",
     "@babel/preset-typescript": "^7.27.1",
-    "@warp-drive/internal-config": "5.8.0-alpha.19",
+    "@warp-drive/internal-config": "5.8.0-alpha.21",
     "decorator-transforms": "^2.3.0",
     "ember-source": "~6.6.0",
     "expect-type": "^1.2.2",