update ember-data related syntax

addon/adapters/-addon-docs.js

@@ -2,17 +2,17 @@ import Adapter from '@ember-data/adapter';
 import config from 'ember-get-config';
 import fetch from 'fetch';
 
-export default Adapter.extend({
-  defaultSerializer: '-addon-docs',
-  namespace: `${config.rootURL.replace(/\/$/, '')}/docs`,
+export default class AddonDocsAdapter extends Adapter {
+  defaultSerializer = '-addon-docs';
+  namespace = `${config.rootURL.replace(/\/$/, '')}/docs`;
 
   shouldBackgroundReloadAll() {
     return false;
-  },
+  }
 
   shouldBackgroundReloadRecord() {
     return false;
-  },
+  }
 
   findRecord(store, modelClass, id, snapshot) {
     if (modelClass.modelName === 'project') {
@@ -22,5 +22,5 @@ export default Adapter.extend({
     } else {
       return store.peekRecord(modelClass.modelName, id);
     }
-  },
-});
+  }
+}

addon/adapters/class.js

@@ -1,2 +1 @@
-import BaseAdapter from './-addon-docs';
-export default BaseAdapter.extend();
+export { default } from './-addon-docs';

addon/adapters/component.js

@@ -1,2 +1 @@
-import BaseAdapter from './-addon-docs';
-export default BaseAdapter.extend();
+export { default } from './-addon-docs';

addon/adapters/module.js

@@ -1,2 +1 @@
-import BaseAdapter from './-addon-docs';
-export default BaseAdapter.extend();
+export { default } from './-addon-docs';

addon/adapters/project.js

@@ -1,2 +1 @@
-import BaseAdapter from './-addon-docs';
-export default BaseAdapter.extend();
+export { default } from './-addon-docs';

addon/models/class.js

@@ -2,108 +2,134 @@ import Model, { attr, belongsTo } from '@ember-data/model';
 import { filterBy, or, union } from '@ember/object/computed';
 import { memberUnion, hasMemberType } from '../utils/computed';
 
-export default Model.extend({
-  parentClass: belongsTo('class', { async: false, inverse: null }),
-
-  isClass: true,
-
-  name: attr(),
-  file: attr(),
-  exportType: attr(),
-  description: attr(),
-  lineNumber: attr(),
-  access: attr(),
-
-  accessors: attr(),
-  methods: attr(),
-  fields: attr(),
-  tags: attr(),
-
-  publicAccessors: filterBy('accessors', 'access', 'public'),
-  publicMethods: filterBy('methods', 'access', 'public'),
-  publicFields: filterBy('fields', 'access', 'public'),
-
-  privateAccessors: filterBy('accessors', 'access', 'private'),
-  privateMethods: filterBy('methods', 'access', 'private'),
-  privateFields: filterBy('fields', 'access', 'private'),
-
-  protectedAccessors: filterBy('accessors', 'access', 'protected'),
-  protectedMethods: filterBy('methods', 'access', 'protected'),
-  protectedFields: filterBy('fields', 'access', 'protected'),
-
-  allPublicAccessors: memberUnion(
-    'parentClass.allPublicAccessors',
-    'publicAccessors'
-  ),
-  allPublicMethods: memberUnion(
-    'parentClass.allPublicMethods',
-    'publicMethods'
-  ),
-  allPublicFields: memberUnion('parentClass.allPublicFields', 'publicFields'),
-
-  allPrivateAccessors: memberUnion(
-    'parentClass.allPrivateAccessors',
-    'privateAccessors'
-  ),
-  allPrivateMethods: memberUnion(
-    'parentClass.allPrivateMethods',
-    'privateMethods'
-  ),
-  allPrivateFields: memberUnion(
-    'parentClass.allPrivateFields',
-    'privateFields'
-  ),
-
-  allProtectedAccessors: memberUnion(
-    'parentClass.allProtectedAccessors',
-    'protectedAccessors'
-  ),
-  allProtectedMethods: memberUnion(
-    'parentClass.allProtectedMethods',
-    'protectedMethods'
-  ),
-  allProtectedFields: memberUnion(
-    'parentClass.allProtectedFields',
-    'protectedFields'
-  ),
-
-  allAccessors: union(
-    'allPublicAccessors',
-    'allPrivateAccessors',
-    'allProtectedAccessors'
-  ),
-  allMethods: union(
-    'allPublicMethods',
-    'allPrivateMethods',
-    'allProtectedMethods'
-  ),
-  allFields: union('allPublicFields', 'allPrivateFields', 'allProtectedFields'),
-
-  hasInherited: or(
+export default class Class extends Model {
+  @belongsTo('class', { async: false, inverse: null })
+  parentClass;
+
+  isClass = true;
+
+  @attr
+  name;
+
+  @attr
+  file;
+
+  @attr
+  exportType;
+
+  @attr
+  description;
+
+  @attr
+  lineNumber;
+
+  @attr
+  access;
+
+  @attr
+  accessors;
+
+  @attr
+  methods;
+
+  @attr
+  fields;
+
+  @attr
+  tags;
+
+  @filterBy('accessors', 'access', 'public')
+  publicAccessors;
+
+  @filterBy('methods', 'access', 'public')
+  publicMethods;
+
+  @filterBy('fields', 'access', 'public')
+  publicFields;
+
+  @filterBy('accessors', 'access', 'private')
+  privateAccessors;
+
+  @filterBy('methods', 'access', 'private')
+  privateMethods;
+
+  @filterBy('fields', 'access', 'private')
+  privateFields;
+
+  @filterBy('accessors', 'access', 'protected')
+  protectedAccessors;
+
+  @filterBy('methods', 'access', 'protected')
+  protectedMethods;
+
+  @filterBy('fields', 'access', 'protected')
+  protectedFields;
+
+  @memberUnion('parentClass.allPublicAccessors', 'publicAccessors')
+  allPublicAccessors;
+
+  @memberUnion('parentClass.allPublicMethods', 'publicMethods')
+  allPublicMethods;
+
+  @memberUnion('parentClass.allPublicFields', 'publicFields')
+  allPublicFields;
+
+  @memberUnion('parentClass.allPrivateAccessors', 'privateAccessors')
+  allPrivateAccessors;
+
+  @memberUnion('parentClass.allPrivateMethods', 'privateMethods')
+  allPrivateMethods;
+
+  @memberUnion('parentClass.allPrivateFields', 'privateFields')
+  allPrivateFields;
+
+  @memberUnion('parentClass.allProtectedAccessors', 'protectedAccessors')
+  allProtectedAccessors;
+
+  @memberUnion('parentClass.allProtectedMethods', 'protectedMethods')
+  allProtectedMethods;
+
+  @memberUnion('parentClass.allProtectedFields', 'protectedFields')
+  allProtectedFields;
+
+  @union('allPublicAccessors', 'allPrivateAccessors', 'allProtectedAccessors')
+  allAccessors;
+
+  @union('allPublicMethods', 'allPrivateMethods', 'allProtectedMethods')
+  allMethods;
+
+  @union('allPublicFields', 'allPrivateFields', 'allProtectedFields')
+  allFields;
+
+  @or(
     'parentClass.allAccessors.length',
     'parentClass.allMethods.length',
     'parentClass.allFields.length'
-  ),
+  )
+  hasInherited;
 
-  hasPrivate: or(
+  @or(
     'allPrivateAccessors.length',
     'allPrivateMethods.length',
     'allPrivateFields.length'
-  ),
+  )
+  hasPrivate;
 
-  hasProtected: or(
+  @or(
     'allProtectedAccessors.length',
     'allProtectedMethods.length',
     'allProtectedFields.length'
-  ),
+  )
+  hasProtected;
 
-  hasDeprecated: hasMemberType(
+  @hasMemberType(
     'allFields',
     'allAccessors',
     'allMethods',
 
     function (member) {
       return member.tags && member.tags.find((t) => t.name === 'deprecated');
     }
-  ),
-});
+  )
+  hasDeprecated;
+}

addon/models/component.js

@@ -1,67 +1,72 @@
 import { attr } from '@ember-data/model';
 import { filterBy, or } from '@ember/object/computed';
 import { dasherize } from '@ember/string';
-import { computed } from '@ember/object';
 
 import Class from './class';
 import { memberUnion, hasMemberType } from '../utils/computed';
 
-export default Class.extend({
-  isComponent: true,
+export default class Component extends Class {
+  isComponent = true;
 
-  yields: attr(),
-  arguments: attr(),
+  @attr
+  yields;
 
-  overloadedYields: or('yields', 'inheritedYields'),
+  @attr
+  arguments;
 
-  publicArguments: filterBy('arguments', 'access', 'public'),
-  privateArguments: filterBy('arguments', 'access', 'private'),
-  protectedArguments: filterBy('arguments', 'access', 'protected'),
+  @or('yields', 'inheritedYields')
+  overloadedYields;
 
-  allPublicArguments: memberUnion(
-    'parentClass.allPublicArguments',
-    'publicArguments'
-  ),
-  allPrivateArguments: memberUnion(
-    'parentClass.allPrivateArguments',
-    'privateArguments'
-  ),
-  allProtectedArguments: memberUnion(
-    'parentClass.allProtectedArguments',
-    'protectedArguments'
-  ),
+  @filterBy('arguments', 'access', 'public')
+  publicArguments;
 
-  allArguments: memberUnion('parentClass.allArguments', 'arguments'),
+  @filterBy('arguments', 'access', 'private')
+  privateArguments;
 
-  hasInherited: or(
+  @filterBy('arguments', 'access', 'protected')
+  protectedArguments;
+
+  @memberUnion('parentClass.allPublicArguments', 'publicArguments')
+  allPublicArguments;
+
+  @memberUnion('parentClass.allPrivateArguments', 'privateArguments')
+  allPrivateArguments;
+
+  @memberUnion('parentClass.allProtectedArguments', 'protectedArguments')
+  allProtectedArguments;
+
+  @memberUnion('parentClass.allArguments', 'arguments')
+  allArguments;
+
+  @or(
     'parentClass.overloadedYields.length',
     'parentClass.allArguments.length',
     'parentClass.allAccessors.length',
     'parentClass.allMethods.length',
     'parentClass.allFields.length'
-  ),
+  )
+  hasInherited;
 
-  hasInternal: or(
-    'allAccessors.length',
-    'allMethods.length',
-    'allFields.length'
-  ),
+  @or('allAccessors.length', 'allMethods.length', 'allFields.length')
+  hasInternal;
 
-  hasPrivate: or(
+  @or(
     'allPrivateAccessors.length',
     'allPrivateArguments.length',
     'allPrivateMethods.length',
     'allPrivateFields.length'
-  ),
+  )
+  hasPrivate;
 
-  hasProtected: or(
+  @or(
     'allProtectedAccessors.length',
     'allProtectedArguments.length',
     'allProtectedMethods.length',
     'allProtectedFields.length'
-  ),
+  )
+  hasProtected;
 
-  hasDeprecated: hasMemberType(
+  @hasMemberType(
     'allAccessors',
     'allArguments',
     'allMethods',
@@ -70,7 +75,8 @@ export default Class.extend({
     function (member) {
       return member.tags && member.tags.find((t) => t.name === 'deprecated');
     }
-  ),
+  )
+  hasDeprecated;
 
   /*
     This gives us a way to link to a model, since we don't always link by the actual ID:
@@ -79,7 +85,7 @@ export default Class.extend({
 
     Possible refactoring is to always link by actual ID, and implement redirects.
   */
-  routingId: computed('name', function () {
+  get routingId() {
     return `components/${dasherize(this.name)}`;
-  }),
-});
+  }
+}