Replace computed properties with macro-decorators

app/components/crate-header.js

@@ -1,11 +1,9 @@
-import { computed } from '@ember/object';
 import { inject as service } from '@ember/service';
 import Component from '@glimmer/component';
 
 export default class CrateHeader extends Component {
   @service session;
 
-  @computed('args.crate.owner_user', 'session.currentUser.id')
   get isOwner() {
     return this.args.crate.owner_user.findBy('id', this.session.currentUser?.id);
   }

app/components/settings/api-tokens.js

@@ -1,19 +1,18 @@
 import { action } from '@ember/object';
-import { sort } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 
 import { task } from 'ember-concurrency';
+import { sortBy } from 'macro-decorators';
 
 export default class ApiTokens extends Component {
   @service store;
   @service notifications;
 
   @tracked newToken;
 
-  tokenSort = ['created_at:desc'];
-  @sort('args.tokens', 'tokenSort') sortedTokens;
+  @sortBy('args.tokens', 'created_at', false) sortedTokens;
 
   @action startNewToken() {
     this.newToken = this.store.createRecord('api-token');

app/components/version-list/row.js

@@ -1,4 +1,4 @@
-import { action, computed } from '@ember/object';
+import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
@@ -37,7 +37,6 @@ export default class VersionRow extends Component {
     return title;
   }
 
-  @computed('args.version.crate.owner_user', 'session.currentUser.id')
   get isOwner() {
     return this.args.version.crate?.owner_user?.findBy('id', this.session.currentUser?.id);
   }

app/controllers/categories.js

@@ -1,20 +1,20 @@
 import Controller from '@ember/controller';
-import { computed } from '@ember/object';
-import { readOnly } from '@ember/object/computed';
+import { tracked } from '@glimmer/tracking';
+
+import { reads } from 'macro-decorators';
 
 import { pagination } from '../utils/pagination';
 
 export default class CategoriesController extends Controller {
   queryParams = ['page', 'per_page', 'sort'];
-  page = '1';
-  per_page = 100;
-  sort = 'alpha';
+  @tracked page = '1';
+  @tracked per_page = 100;
+  @tracked sort = 'alpha';
 
-  @readOnly('model.meta.total') totalItems;
+  @reads('model.meta.total') totalItems;
 
   @pagination() pagination;
 
-  @computed('sort')
   get currentSortBy() {
     return this.sort === 'crates' ? '# Crates' : 'Alphabetical';
   }

app/controllers/category/index.js

@@ -1,22 +1,22 @@
 import Controller from '@ember/controller';
-import { computed } from '@ember/object';
-import { readOnly } from '@ember/object/computed';
+import { tracked } from '@glimmer/tracking';
+
+import { reads } from 'macro-decorators';
 
 import { pagination } from '../../utils/pagination';
 
 export default class CategoryIndexController extends Controller {
   queryParams = ['page', 'per_page', 'sort'];
-  page = '1';
-  per_page = 10;
-  sort = 'recent-downloads';
+  @tracked page = '1';
+  @tracked per_page = 10;
+  @tracked sort = 'recent-downloads';
 
-  @readOnly('model.meta.total') totalItems;
+  @reads('model.meta.total') totalItems;
 
   @pagination() pagination;
 
   category = null;
 
-  @computed('sort')
   get currentSortBy() {
     if (this.sort === 'downloads') {
       return 'All-Time Downloads';

app/controllers/crate/reverse-dependencies.js

@@ -1,15 +1,17 @@
 import Controller from '@ember/controller';
-import { readOnly } from '@ember/object/computed';
+import { tracked } from '@glimmer/tracking';
+
+import { reads } from 'macro-decorators';
 
 import { pagination } from '../../utils/pagination';
 
 export default class ReverseDependenciesController extends Controller {
   queryParams = ['page', 'per_page'];
-  page = '1';
-  per_page = 10;
-  crate = null;
+  @tracked page = '1';
+  @tracked per_page = 10;
+  @tracked crate = null;
 
-  @readOnly('model.meta.total') totalItems;
+  @reads('model.meta.total') totalItems;
 
   @pagination() pagination;
 }

app/controllers/crate/version.js

@@ -1,14 +1,12 @@
 import Controller from '@ember/controller';
-import { computed } from '@ember/object';
-import { alias } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
 
 import { task } from 'ember-concurrency';
+import { alias } from 'macro-decorators';
 
 export default class CrateVersionController extends Controller {
   @service session;
 
-  @computed('requestedVersion', 'currentVersion', 'crate')
   get downloadsContext() {
     return this.requestedVersion ? this.currentVersion : this.crate;
   }
@@ -18,7 +16,6 @@ export default class CrateVersionController extends Controller {
   @alias('model.requestedVersion') requestedVersion;
   @alias('model.version') currentVersion;
 
-  @computed('crate.owner_user', 'session.currentUser.id')
   get isOwner() {
     return this.crate.owner_user.findBy('id', this.session.currentUser?.id);
   }

app/controllers/crates.js

@@ -1,21 +1,22 @@
 import Controller from '@ember/controller';
-import { action, computed } from '@ember/object';
-import { readOnly } from '@ember/object/computed';
+import { action } from '@ember/object';
+import { tracked } from '@glimmer/tracking';
+
+import { reads } from 'macro-decorators';
 
 import { pagination } from '../utils/pagination';
 
 export default class CratesController extends Controller {
   queryParams = ['letter', 'page', 'per_page', 'sort'];
-  letter = null;
-  page = '1';
-  per_page = 50;
-  sort = 'alpha';
+  @tracked letter = null;
+  @tracked page = '1';
+  @tracked per_page = 50;
+  @tracked sort = 'alpha';
   alphabet = [...'ABCDEFGHIJKLMNOPQRSTUVWXYZ'];
 
-  @readOnly('model.meta.total') totalItems;
+  @reads('model.meta.total') totalItems;
   @pagination() pagination;
 
-  @computed('sort')
   get currentSortBy() {
     if (this.sort === 'downloads') {
       return 'All-Time Downloads';

app/controllers/dashboard.js

@@ -1,9 +1,8 @@
 import { A } from '@ember/array';
 import Controller from '@ember/controller';
-import { computed } from '@ember/object';
-import { alias } from '@ember/object/computed';
 
 import { task } from 'ember-concurrency';
+import { alias } from 'macro-decorators';
 
 import ajax from '../utils/ajax';
 
@@ -17,22 +16,18 @@ export default class DashboardController extends Controller {
   @alias('model.myFollowing') myFollowing;
   @alias('model.myStats') myStats;
 
-  @computed('myCrates.[]')
   get visibleCrates() {
     return this.myCrates.slice(0, TO_SHOW);
   }
 
-  @computed('myFollowing.[]')
   get visibleFollowing() {
     return this.myFollowing.slice(0, TO_SHOW);
   }
 
-  @computed('myCrates.[]')
   get hasMoreCrates() {
     return this.myCrates.length > TO_SHOW;
   }
 
-  @computed('myFollowing.[]')
   get hasMoreFollowing() {
     return this.myFollowing.length > TO_SHOW;
   }

app/controllers/index.js

@@ -1,16 +1,15 @@
 import Controller from '@ember/controller';
-import { action, computed } from '@ember/object';
-import { readOnly } from '@ember/object/computed';
+import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 
 import { task } from 'ember-concurrency';
+import { reads } from 'macro-decorators';
 
 export default class IndexController extends Controller {
   @service fetcher;
 
-  @readOnly('dataTask.lastSuccessful.value') model;
+  @reads('dataTask.lastSuccessful.value') model;
 
-  @computed('dataTask.{lastSuccessful,isRunning}')
   get hasData() {
     return this.dataTask.lastSuccessful && !this.dataTask.isRunning;
   }

app/controllers/keyword/index.js

@@ -1,20 +1,20 @@
 import Controller from '@ember/controller';
-import { computed } from '@ember/object';
-import { readOnly } from '@ember/object/computed';
+import { tracked } from '@glimmer/tracking';
+
+import { reads } from 'macro-decorators';
 
 import { pagination } from '../../utils/pagination';
 
 export default class KeywordIndexController extends Controller {
   queryParams = ['page', 'per_page', 'sort'];
-  page = '1';
-  per_page = 10;
-  sort = 'recent-downloads';
+  @tracked page = '1';
+  @tracked per_page = 10;
+  @tracked sort = 'recent-downloads';
 
-  @readOnly('model.meta.total') totalItems;
+  @reads('model.meta.total') totalItems;
 
   @pagination() pagination;
 
-  @computed('sort')
   get currentSortBy() {
     if (this.sort === 'downloads') {
       return 'All-Time Downloads';

app/controllers/keywords.js

@@ -1,20 +1,20 @@
 import Controller from '@ember/controller';
-import { computed } from '@ember/object';
-import { readOnly } from '@ember/object/computed';
+import { tracked } from '@glimmer/tracking';
+
+import { reads } from 'macro-decorators';
 
 import { pagination } from '../utils/pagination';
 
 export default class KeywordsController extends Controller {
   queryParams = ['page', 'per_page', 'sort'];
-  page = '1';
-  per_page = 10;
-  sort = 'crates';
+  @tracked page = '1';
+  @tracked per_page = 10;
+  @tracked sort = 'crates';
 
-  @readOnly('model.meta.total') totalItems;
+  @reads('model.meta.total') totalItems;
 
   @pagination() pagination;
 
-  @computed('sort')
   get currentSortBy() {
     return this.sort === 'crates' ? '# Crates' : 'Alphabetical';
   }

app/controllers/me/crates.js

@@ -1,22 +1,22 @@
 import Controller from '@ember/controller';
-import { computed } from '@ember/object';
-import { readOnly } from '@ember/object/computed';
+import { tracked } from '@glimmer/tracking';
+
+import { reads } from 'macro-decorators';
 
 import { pagination } from '../../utils/pagination';
 
 // TODO: reduce duplicatoin with controllers/crates
 
 export default class MeCratesController extends Controller {
   queryParams = ['page', 'per_page', 'sort'];
-  page = '1';
-  per_page = 10;
-  sort = 'alpha';
+  @tracked page = '1';
+  @tracked per_page = 10;
+  @tracked sort = 'alpha';
 
-  @readOnly('model.meta.total') totalItems;
+  @reads('model.meta.total') totalItems;
 
   @pagination() pagination;
 
-  @computed('sort')
   get currentSortBy() {
     if (this.sort === 'downloads') {
       return 'All-Time Downloads';

app/controllers/me/following.js

@@ -1,22 +1,22 @@
 import Controller from '@ember/controller';
-import { computed } from '@ember/object';
-import { readOnly } from '@ember/object/computed';
+import { tracked } from '@glimmer/tracking';
+
+import { reads } from 'macro-decorators';
 
 import { pagination } from '../../utils/pagination';
 
 // TODO: reduce duplicatoin with controllers/me/crates
 
 export default class FollowingController extends Controller {
   queryParams = ['page', 'per_page', 'sort'];
-  page = '1';
-  per_page = 10;
-  sort = 'alpha';
+  @tracked page = '1';
+  @tracked per_page = 10;
+  @tracked sort = 'alpha';
 
-  @readOnly('model.meta.total') totalItems;
+  @reads('model.meta.total') totalItems;
 
   @pagination() pagination;
 
-  @computed('sort')
   get currentSortBy() {
     return this.sort === 'downloads' ? 'Downloads' : 'Alphabetical';
   }

app/controllers/me/index.js

@@ -1,8 +1,9 @@
 import Controller from '@ember/controller';
-import { action, computed } from '@ember/object';
-import { alias } from '@ember/object/computed';
+import { action } from '@ember/object';
 import Ember from 'ember';
 
+import { alias } from 'macro-decorators';
+
 import ajax from '../../utils/ajax';
 
 export default class MeIndexController extends Controller {
@@ -13,7 +14,6 @@ export default class MeIndexController extends Controller {
   emailNotificationsError = false;
   emailNotificationsSuccess = false;
 
-  @computed
   get hasEmailNotificationFeature() {
     return Ember.testing;
   }