Include default_version by default

app/adapters/crate.js

@@ -37,7 +37,7 @@ export default class CrateAdapter extends ApplicationAdapter {
 function setDefaultInclude(query) {
   if (query.include === undefined) {
     // This ensures `crate.versions` are always fetched from another request.
-    query.include = 'keywords,categories,downloads';
+    query.include = 'keywords,categories,downloads,default_version';
   }
 
   return query;

app/adapters/version.js

@@ -6,4 +6,12 @@ export default class VersionAdapter extends ApplicationAdapter {
     let num = snapshot.record.num;
     return `/${this.namespace}/crates/${crateName}/${num}`;
   }
+
+  queryRecord(_store, _type, query) {
+    let { name, num } = query ?? {};
+    let baseUrl = this.buildURL('crate', name);
+    let url = `${baseUrl}/${num}`;
+    let data = { ...query, name: undefined, num: undefined };
+    return this.ajax(url, 'GET', { data });
+  }
 }

app/models/crate.js

@@ -67,6 +67,14 @@ export default class Crate extends Model {
     return Object.fromEntries(versions.slice().map(v => [v.id, v]));
   }
 
+  /** @return {Map<string, import("../models/version").default>} */
+  @cached
+  get loadedVersionsByNum() {
+    let versionsRef = this.hasMany('versions');
+    let values = versionsRef.value();
+    return new Map(values?.map(ref => [ref.num, ref]));
+  }
+
   @cached get releaseTrackSet() {
     let map = new Map();
     let { versionsObj: versions, versionIdsBySemver } = this;

app/routes/crate/dependencies.js

@@ -6,11 +6,8 @@ export default class VersionRoute extends Route {
 
   async model() {
     let crate = this.modelFor('crate');
-    let versions = await crate.loadVersionsTask.perform();
-
     let { default_version } = crate;
-    let version = versions.find(version => version.num === default_version) ?? versions.lastObject;
 
-    this.router.replaceWith('crate.version-dependencies', crate, version.num);
+    this.router.replaceWith('crate.version-dependencies', crate, default_version);
   }
 }

app/routes/crate/version-dependencies.js

@@ -2,21 +2,23 @@ import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 
 export default class VersionRoute extends Route {
+  @service store;
   @service router;
 
   async model(params, transition) {
     let crate = this.modelFor('crate');
 
-    let versions;
-    try {
-      versions = await crate.loadVersionsTask.perform();
-    } catch (error) {
-      let title = `${crate.name}: Failed to load version data`;
-      return this.router.replaceWith('catch-all', { transition, error, title, tryAgain: true });
-    }
-
     let requestedVersion = params.version_num;
-    let version = versions.find(version => version.num === requestedVersion);
+    let version =
+      crate.loadedVersionsByNum.get(requestedVersion) ??
+      (await this.store
+        .queryRecord('version', {
+          name: crate.id,
+          num: requestedVersion,
+        })
+        .catch(() => {
+          // ignored
+        }));
     if (!version) {
       let title = `${crate.name}: Version ${requestedVersion} not found`;
       return this.router.replaceWith('catch-all', { transition, title });
@@ -32,6 +34,17 @@ export default class VersionRoute extends Route {
     return version;
   }
 
+  async afterModel(_resolvedModel, transition) {
+    let crate = this.modelFor('crate');
+    // TODO: Resolved version without waiting for versions to be resolved
+    try {
+      await crate.loadVersionsTask.perform();
+    } catch (error) {
+      let title = `${crate.name}: Failed to load version data`;
+      return this.router.replaceWith('catch-all', { transition, error, title, tryAgain: true });
+    }
+  }
+
   setupController(controller, model) {
     controller.set('version', model);
     controller.set('crate', this.modelFor('crate'));

app/routes/crate/version.js

@@ -10,10 +10,12 @@ import { AjaxError } from '../../utils/ajax';
 export default class VersionRoute extends Route {
   @service router;
   @service sentry;
+  @service store;
 
   async model(params, transition) {
     let crate = this.modelFor('crate');
 
+    // TODO: Resolved version without waiting for versions to be resolved
     let versions;
     try {
       versions = await crate.loadVersionsTask.perform();
@@ -25,14 +27,33 @@ export default class VersionRoute extends Route {
     let version;
     let requestedVersion = params.version_num;
     if (requestedVersion) {
-      version = versions.find(version => version.num === requestedVersion);
+      version =
+        crate.loadedVersionsByNum.get(requestedVersion) ??
+        (await this.store
+          .queryRecord('version', {
+            name: crate.id,
+            num: requestedVersion,
+          })
+          .catch(() => {
+            // ignored
+          }));
+
       if (!version) {
         let title = `${crate.name}: Version ${requestedVersion} not found`;
         return this.router.replaceWith('catch-all', { transition, title });
       }
     } else {
       let { default_version } = crate;
-      version = versions.find(version => version.num === default_version);
+      version =
+        crate.loadedVersionsByNum.get(default_version) ??
+        (await this.store
+          .queryRecord('version', {
+            name: crate.id,
+            num: default_version,
+          })
+          .catch(() => {
+            // ignored
+          }));
 
       if (!version) {
         let versionNums = versions.map(it => it.num);

e2e/acceptance/crate-dependencies.spec.ts

@@ -71,7 +71,7 @@ test.describe('Acceptance | crate dependencies page', { tag: '@acceptance' }, ()
   test('shows an error page if versions fail to load', async ({ page, mirage, ember }) => {
     await mirage.addHook(server => {
       let crate = server.create('crate', { name: 'foo' });
-      server.create('version', { crate, num: '2.0.0' });
+      server.create('version', { crate, num: '1.0.0' });
       server.get('/api/v1/crates/:crate_name/versions', {}, 500);
     });
 

tests/acceptance/crate-dependencies-test.js

@@ -74,7 +74,7 @@ module('Acceptance | crate dependencies page', function (hooks) {
 
   test('shows an error page if versions fail to load', async function (assert) {
     let crate = this.server.create('crate', { name: 'foo' });
-    this.server.create('version', { crate, num: '2.0.0' });
+    this.server.create('version', { crate, num: '1.0.0' });
 
     this.server.get('/api/v1/crates/:crate_name/versions', {}, 500);
 

tests/adapters/crate-test.js

@@ -23,20 +23,28 @@ module('Adapter | crate', function (hooks) {
     assert.strictEqual(bar?.name, 'bar');
   });
 
-  test('findRecord requests do not include versions by default', async function (assert) {
-    let _foo = this.server.create('crate', { name: 'foo' });
-    let version = this.server.create('version', { crate: _foo });
+  test('findRecord requests only include `default_version` by default', async function (assert) {
+    let crate = this.server.create('crate', { name: 'foo' });
+    let versions = [
+      this.server.create('version', { crate, num: '0.0.1' }),
+      this.server.create('version', { crate, num: '0.0.2' }),
+      this.server.create('version', { crate, num: '0.0.3' }),
+    ];
+    let default_version = versions.find(v => v.num === '0.0.3');
 
     let store = this.owner.lookup('service:store');
 
     let foo = await store.findRecord('crate', 'foo');
     assert.strictEqual(foo?.name, 'foo');
 
-    // versions should not be loaded yet
+    // Only `defaul_version` should be loaded
     let versionsRef = foo.hasMany('versions');
-    assert.deepEqual(versionsRef.ids(), []);
+    assert.deepEqual(versionsRef.ids(), [default_version.id]);
 
     await versionsRef.load();
-    assert.deepEqual(versionsRef.ids(), [version.id]);
+    assert.deepEqual(
+      versionsRef.ids(),
+      versions.map(v => v.id),
+    );
   });
 });