Merge pull request #17649 from pzuraq/revert-decorator-refactors

[BUGFIX beta] Revert decorator refactors

.eslintrc.js

@@ -2,7 +2,6 @@ const path = require('path');
 
 module.exports = {
   root: true,
-  parser: 'babel-eslint',
   extends: [
     'eslint:recommended',
     'prettier',

broccoli/packages.js

@@ -16,7 +16,6 @@ const WriteFile = require('broccoli-file-creator');
 const StringReplace = require('broccoli-string-replace');
 const GlimmerTemplatePrecompiler = require('./glimmer-template-compiler');
 const VERSION_PLACEHOLDER = /VERSION_STRING_PLACEHOLDER/g;
-const transfromBabelPlugins = require('./transforms/transform-babel-plugins');
 
 const debugTree = BroccoliDebug.buildDebugCallback('ember-source');
 
@@ -84,13 +83,6 @@ module.exports.getPackagesES = function getPackagesES() {
     exclude: ['**/*.ts'],
   });
 
-  // tsc / typescript handles decorators and class properties on its own
-  // so for non ts, transpile the proposal features (decorators, etc)
-  let transpiledProposals = debugTree(
-    transfromBabelPlugins(debugTree(nonTypeScriptContents, `get-packages-es:babel-plugins:input`)),
-    `get-packages-es:babel-plugins:output`
-  );
-
   let typescriptContents = new Funnel(debuggedCompiledTemplatesAndTypeScript, {
     include: ['**/*.ts'],
   });
@@ -103,7 +95,7 @@ module.exports.getPackagesES = function getPackagesES() {
 
   let debuggedCompiledTypescript = debugTree(typescriptCompiled, `get-packages-es:ts:output`);
 
-  let mergedFinalOutput = new MergeTrees([transpiledProposals, debuggedCompiledTypescript], {
+  let mergedFinalOutput = new MergeTrees([nonTypeScriptContents, debuggedCompiledTypescript], {
     overwrite: true,
   });
 

package.json

@@ -77,8 +77,6 @@
   },
   "devDependencies": {
     "@babel/helper-module-imports": "^7.0.0",
-    "@babel/plugin-proposal-class-properties": "^7.3.3",
-    "@babel/plugin-proposal-decorators": "^7.3.0",
     "@babel/plugin-transform-arrow-functions": "^7.2.0",
     "@babel/plugin-transform-block-scoping": "^7.2.0",
     "@babel/plugin-transform-classes": "^7.3.3",
@@ -103,7 +101,6 @@
     "@types/rsvp": "^4.0.2",
     "auto-dist-tag": "^1.0.0",
     "aws-sdk": "^2.404.0",
-    "babel-eslint": "^10.0.1",
     "babel-plugin-debug-macros": "^0.3.0",
     "babel-plugin-filter-imports": "^2.0.4",
     "babel-plugin-module-resolver": "^3.2.0",

packages/@ember/-internals/meta/index.ts

@@ -1,6 +1,8 @@
 export {
   counters,
   deleteMeta,
+  descriptorFor,
+  isDescriptor,
   Meta,
   meta,
   MetaCounters,

packages/@ember/-internals/meta/lib/meta.ts

@@ -965,6 +965,48 @@ if (DEBUG) {
   meta._counters = counters;
 }
 
+/**
+  Returns the CP descriptor assocaited with `obj` and `keyName`, if any.
+
+  @method descriptorFor
+  @param {Object} obj the object to check
+  @param {String} keyName the key to check
+  @return {Descriptor}
+  @private
+*/
+export function descriptorFor(obj: object, keyName: string, _meta?: Meta | null) {
+  assert('Cannot call `descriptorFor` on null', obj !== null);
+  assert('Cannot call `descriptorFor` on undefined', obj !== undefined);
+  assert(
+    `Cannot call \`descriptorFor\` on ${typeof obj}`,
+    typeof obj === 'object' || typeof obj === 'function'
+  );
+
+  let meta = _meta === undefined ? peekMeta(obj) : _meta;
+
+  if (meta !== null) {
+    return meta.peekDescriptors(keyName);
+  }
+}
+
+/**
+  Check whether a value is a CP descriptor.
+
+  @method isDescriptor
+  @param {any} possibleDesc the value to check
+  @return {boolean}
+  @private
+*/
+export function isDescriptor(possibleDesc: any | undefined | null): boolean {
+  // TODO make this return `possibleDesc is Descriptor`
+  return (
+    possibleDesc !== undefined &&
+    possibleDesc !== null &&
+    typeof possibleDesc === 'object' &&
+    possibleDesc.isDescriptor === true
+  );
+}
+
 export { counters };
 
 function indexOfListener(

packages/@ember/-internals/metal/index.ts

@@ -1,4 +1,4 @@
-export { default as computed, _globalsComputed, ComputedProperty } from './lib/computed';
+export { default as computed, ComputedProperty, _globalsComputed } from './lib/computed';
 export { getCacheFor, getCachedValueFor, peekCacheFor } from './lib/computed_cache';
 export { default as alias } from './lib/alias';
 export { deprecateProperty } from './lib/deprecate_property';
@@ -28,13 +28,7 @@ export {
   overrideChains,
   PROPERTY_DID_CHANGE,
 } from './lib/property_events';
-export { defineProperty } from './lib/properties';
-export { nativeDescDecorator } from './lib/decorator';
-export {
-  descriptorForProperty,
-  isComputedDecorator,
-  setComputedDecorator,
-} from './lib/descriptor_map';
+export { defineProperty, Descriptor } from './lib/properties';
 export { watchKey, unwatchKey } from './lib/watch_key';
 export { ChainNode, finishChains, removeChainWatcher } from './lib/chains';
 export { watchPath, unwatchPath } from './lib/watch_path';
@@ -46,10 +40,11 @@ export { default as expandProperties } from './lib/expand_properties';
 
 export { addObserver, removeObserver } from './lib/observer';
 export { Mixin, aliasMethod, mixin, observer, applyMixin } from './lib/mixin';
-export { default as inject, DEBUG_INJECTION_FUNCTIONS } from './lib/injected_property';
+export { default as InjectedProperty } from './lib/injected_property';
 export { setHasViews, tagForProperty, tagFor, markObjectAsDirty } from './lib/tags';
 export { default as runInTransaction, didRender, assertNotRendered } from './lib/transaction';
-export { tracked, getCurrentTracker, setCurrentTracker } from './lib/tracked';
+export { default as descriptor } from './lib/descriptor';
+export { tracked } from './lib/tracked';
 
 export {
   NAMESPACES,

packages/@ember/-internals/metal/lib/alias.ts

@@ -2,51 +2,25 @@ import { Meta, meta as metaFor } from '@ember/-internals/meta';
 import { inspect } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import EmberError from '@ember/error';
+import { ComputedProperty } from './computed';
 import { getCachedValueFor, getCacheFor } from './computed_cache';
 import {
   addDependentKeys,
-  ComputedDescriptor,
-  Decorator,
-  makeComputedDecorator,
+  DescriptorWithDependentKeys,
   removeDependentKeys,
-} from './decorator';
-import { descriptorForDecorator } from './descriptor_map';
-import { defineProperty } from './properties';
+} from './dependent_keys';
+import { defineProperty, Descriptor } from './properties';
 import { get } from './property_get';
 import { set } from './property_set';
 
 const CONSUMED = Object.freeze({});
 
-export type AliasDecorator = Decorator & PropertyDecorator & AliasDecoratorImpl;
-
-export default function alias(altKey: string): AliasDecorator {
-  return makeComputedDecorator(new AliasedProperty(altKey), AliasDecoratorImpl) as AliasDecorator;
-}
-
-// TODO: This class can be svelted once `meta` has been deprecated
-class AliasDecoratorImpl extends Function {
-  readOnly(this: Decorator) {
-    (descriptorForDecorator(this) as AliasedProperty).readOnly();
-    return this;
-  }
-
-  oneWay(this: Decorator) {
-    (descriptorForDecorator(this) as AliasedProperty).oneWay();
-    return this;
-  }
-
-  meta(this: Decorator, meta?: any): any {
-    let prop = descriptorForDecorator(this) as AliasedProperty;
-
-    if (arguments.length === 0) {
-      return prop._meta || {};
-    } else {
-      prop._meta = meta;
-    }
-  }
+export default function alias(altKey: string): AliasedProperty {
+  return new AliasedProperty(altKey);
 }
 
-export class AliasedProperty extends ComputedDescriptor {
+export class AliasedProperty extends Descriptor implements DescriptorWithDependentKeys {
+  readonly _dependentKeys: string[];
   readonly altKey: string;
 
   constructor(altKey: string) {
@@ -55,10 +29,9 @@ export class AliasedProperty extends ComputedDescriptor {
     this._dependentKeys = [altKey];
   }
 
-  setup(obj: object, keyName: string, propertyDesc: PropertyDescriptor, meta: Meta): void {
+  setup(obj: object, keyName: string, meta: Meta): void {
     assert(`Setting alias '${keyName}' on self`, this.altKey !== keyName);
-    super.setup(obj, keyName, propertyDesc, meta);
-
+    super.setup(obj, keyName, meta);
     if (meta.peekWatching(keyName) > 0) {
       this.consume(obj, keyName, meta);
     }
@@ -101,12 +74,14 @@ export class AliasedProperty extends ComputedDescriptor {
     return set(obj, this.altKey, value);
   }
 
-  readOnly(): void {
+  readOnly(): this {
     this.set = AliasedProperty_readOnlySet;
+    return this;
   }
 
-  oneWay(): void {
+  oneWay(): this {
     this.set = AliasedProperty_oneWaySet;
+    return this;
   }
 }
 
@@ -119,3 +94,7 @@ function AliasedProperty_oneWaySet(obj: object, keyName: string, value: any): an
   defineProperty(obj, keyName, null);
   return set(obj, keyName, value);
 }
+
+// Backwards compatibility with Ember Data.
+(AliasedProperty.prototype as any)._meta = undefined;
+(AliasedProperty.prototype as any).meta = ComputedProperty.prototype.meta;

packages/@ember/-internals/metal/lib/chains.ts

@@ -1,6 +1,5 @@
-import { Meta, meta as metaFor, peekMeta } from '@ember/-internals/meta';
+import { descriptorFor, Meta, meta as metaFor, peekMeta } from '@ember/-internals/meta';
 import { getCachedValueFor } from './computed_cache';
-import { descriptorForProperty } from './descriptor_map';
 import { eachProxyFor } from './each_proxy';
 import { get } from './property_get';
 import { unwatchKey, watchKey } from './watch_key';
@@ -10,7 +9,7 @@ function isObject(obj: any): obj is object {
 }
 
 function isVolatile(obj: any, keyName: string, meta?: Meta | null): boolean {
-  let desc = descriptorForProperty(obj, keyName, meta);
+  let desc = descriptorFor(obj, keyName, meta);
   return !(desc !== undefined && desc._volatile === false);
 }