@warp-drive-mirror/json-api 5.7.0-alpha.2 → 5.7.0-alpha.4

package/dist/index.js

@@ -1374,11 +1374,8 @@ class JSONAPICache {
       }
       upgradeCapabilities(this._capabilities);
       const store = this._capabilities._store;
-      const attrs = this._capabilities.schema.fields(identifier);
+      const attrs = getCacheFields(this, identifier);
       attrs.forEach((attr, key) => {
-        if (attr.kind === 'alias') {
-          return;
-        }
         if (key in attributes && attributes[key] !== undefined) {
           return;
         }
@@ -1435,7 +1432,7 @@ class JSONAPICache {
       }
       upgradeCapabilities(this._capabilities);
       const store = this._capabilities._store;
-      const attrs = this._capabilities.schema.fields(identifier);
+      const attrs = getCacheFields(this, identifier);
       attrs.forEach((attr, key) => {
         if (key in attributes && attributes[key] !== undefined) {
           return;
@@ -1629,8 +1626,7 @@ class JSONAPICache {
     cached.isNew = true;
     const createOptions = {};
     if (options !== undefined) {
-      const storeWrapper = this._capabilities;
-      const fields = storeWrapper.schema.fields(identifier);
+      const fields = getCacheFields(this, identifier);
       const graph = this.__graph;
       const propertyNames = Object.keys(options);
       for (let i = 0; i < propertyNames.length; i++) {
@@ -1720,7 +1716,7 @@ class JSONAPICache {
     if (macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG)) {
       if (macroCondition(!getGlobalConfig().WarpDriveMirror.deprecations.DEPRECATE_RELATIONSHIP_REMOTE_UPDATE_CLEARING_LOCAL_STATE)) {
         // save off info about saved relationships
-        const fields = this._capabilities.schema.fields(identifier);
+        const fields = getCacheFields(this, identifier);
         fields.forEach((schema, name) => {
           if (schema.kind === 'belongsTo') {
             if (this.__graph._isDirty(identifier, name)) {
@@ -1790,7 +1786,7 @@ class JSONAPICache {
         throw error;
       }
     }
-    const fields = this._capabilities.schema.fields(identifier);
+    const fields = getCacheFields(this, identifier);
     cached.isNew = false;
     let newCanonicalAttributes;
     if (data) {
@@ -1997,7 +1993,7 @@ class JSONAPICache {
       } else if (cached.defaultAttrs && attribute in cached.defaultAttrs) {
         return cached.defaultAttrs[attribute];
       } else {
-        const attrSchema = this._capabilities.schema.fields(identifier).get(attribute);
+        const attrSchema = getCacheFields(this, identifier).get(attribute);
         upgradeCapabilities(this._capabilities);
         const defaultValue = getDefaultValue(attrSchema, identifier, this._capabilities._store);
         if (schemaHasLegacyDefaultValueFn(attrSchema)) {
@@ -2064,7 +2060,7 @@ class JSONAPICache {
       } else if (cached.defaultAttrs && attribute in cached.defaultAttrs) {
         return cached.defaultAttrs[attribute];
       } else {
-        const attrSchema = this._capabilities.schema.fields(identifier).get(attribute);
+        const attrSchema = getCacheFields(this, identifier).get(attribute);
         upgradeCapabilities(this._capabilities);
         const defaultValue = getDefaultValue(attrSchema, identifier, this._capabilities._store);
         if (schemaHasLegacyDefaultValueFn(attrSchema)) {
@@ -2719,11 +2715,6 @@ function hasLegacyDefaultValueFn(options) {
   return !!options && typeof options.defaultValue === 'function';
 }
 function getDefaultValue(schema, identifier, store) {
-  macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
-    if (!test) {
-      throw new Error(`AliasFields should not be directly accessed from the cache`);
-    }
-  })(schema?.kind !== 'alias') : {};
   const options = schema?.options;
   if (!schema || !options && !schema.type) {
     return;
@@ -3055,7 +3046,7 @@ function cacheUpsert(cache, identifier, data, calculateChanges) {
     cache._capabilities.notifyChange(identifier, 'identity', null);
     cache._capabilities.notifyChange(identifier, 'state', null);
   }
-  const fields = cache._capabilities.schema.fields(identifier);
+  const fields = getCacheFields(cache, identifier);
 
   // if no cache entry existed, no record exists / property has been accessed
   // and thus we do not need to notify changes to any properties.
@@ -3124,7 +3115,7 @@ function patchCache(Cache, op) {
       {
         if (isRecord) {
           if ('field' in op) {
-            const field = Cache._capabilities.schema.fields(op.record).get(op.field);
+            const field = getCacheFields(Cache, op.record).get(op.field);
             macroCondition(getGlobalConfig().WarpDriveMirror.env.DEBUG) ? (test => {
               if (!test) {
                 throw new Error(`Expected ${op.field} to be a field on ${op.record.type}`);
@@ -3227,5 +3218,13 @@ function patchCache(Cache, op) {
     }
   }
 }
+function getCacheFields(cache, identifier) {
+  if (cache._capabilities.schema.cacheFields) {
+    return cache._capabilities.schema.cacheFields(identifier);
+  }
+
+  // the model schema service cannot process fields that are not cache fields
+  return cache._capabilities.schema.fields(identifier);
+}
 
 export { JSONAPICache };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@warp-drive-mirror/json-api",
-  "version": "5.7.0-alpha.2",
+  "version": "5.7.0-alpha.4",
   "description": "A {JSON:API} Cache Implementation for WarpDrive",
   "keywords": [
     "ember-addon"
@@ -32,7 +32,7 @@
     }
   },
   "peerDependencies": {
-    "@warp-drive-mirror/core": "5.7.0-alpha.2"
+    "@warp-drive-mirror/core": "5.7.0-alpha.4"
   },
   "dependencies": {
     "@embroider/macros": "^1.16.12",
@@ -44,8 +44,8 @@
     "@babel/plugin-transform-typescript": "^7.27.0",
     "@babel/preset-typescript": "^7.27.0",
     "@types/json-to-ast": "^2.1.4",
-    "@warp-drive/internal-config": "5.7.0-alpha.2",
-    "@warp-drive-mirror/core": "5.7.0-alpha.2",
+    "@warp-drive/internal-config": "5.7.0-alpha.4",
+    "@warp-drive-mirror/core": "5.7.0-alpha.4",
     "decorator-transforms": "^2.3.0",
     "expect-type": "^1.2.1",
     "typescript": "^5.8.3",