Fix Ember.typeof replace with custom typeof (emberjs#1052)

* replace Ember.typeOf with own simple typeof * Update mixin.scss * fix comments * use Object.prototype * fix quotes * detect asyncfunction as function * fix * fix * last fix
nummi · Apr 1, 2020 · 8d05d55 · 8d05d55
1 parent 8fde5a4
commit 8d05d55
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 25 deletions.
diff --git a/app/components/object-inspector/property.js b/app/components/object-inspector/property.js
@@ -26,11 +26,11 @@ export default Component.extend({
 
   isObject: equal('valueType', 'type-object'),
 
-  isInstance: equal('valueType', 'type-instance'),
-
   isComputedProperty: alias('model.isComputed'),
 
-  isFunction: equal('valueType', 'type-function'),
+  isFunction: computed('valueType', function () {
+    return this.valueType === 'type-function' || this.valueType === 'type-asyncfunction';
+  }),
 
   isArray: equal('valueType', 'type-array'),
 
@@ -81,8 +81,7 @@ export default Component.extend({
   }),
 
   canDig() {
-    return this.isInstance
-      || this.isObject
+    return this.isObject
       || this.isEmberObject
       || this.isArray
   },

diff --git a/app/components/object-inspector/sort-properties.js b/app/components/object-inspector/sort-properties.js
@@ -36,7 +36,7 @@ export default Component.extend({
   sorted: sort('props', 'sortProperties'),
 
   props: map('properties', function (p) {
-    set(p, 'isFunction', p.value.type === 'type-function');
+    set(p, 'isFunction', p.value.type === 'type-function' || p.value.type === 'type-asyncfunction');
     if (p.name == parseInt(p.name)) {
       set(p, 'name', parseInt(p.name));
     }

diff --git a/app/styles/mixin.scss b/app/styles/mixin.scss
@@ -180,7 +180,6 @@ $mixin-left-padding: 22px;
 
 .mixin__property .type-ember-object,
 .mixin__property .type-object,
-.mixin__property .type-instance,
 .mixin__property .type-array {
   cursor: pointer;
 }

diff --git a/ember_debug/adapters/web-extension.js b/ember_debug/adapters/web-extension.js
@@ -1,7 +1,8 @@
 import BasicAdapter from './basic';
+import { typeOf } from '../utils/type-check';
 
 const Ember = window.Ember;
-const { run, typeOf } = Ember;
+const { run } = Ember;
 const { isArray } = Array;
 const { keys } = Object;
 

diff --git a/ember_debug/libs/glimmer-tree.js b/ember_debug/libs/glimmer-tree.js
@@ -24,15 +24,17 @@
  *
  * @class GlimmerTree
  */
+
 const Ember = window.Ember;
+import { typeOf } from '../utils/type-check';
 import {
   modelName as getModelName,
   shortModelName as getShortModelName,
   shortControllerName as getShortControllerName,
   shortViewName as getShortViewName
 } from 'ember-debug/utils/name-functions';
 
-const { Object: EmberObject, typeOf, isNone, Controller, ViewUtils, get, A } = Ember;
+const { Object: EmberObject, isNone, Controller, ViewUtils, get, A } = Ember;
 const { getRootViews, getChildViews, getViewBoundingClientRect } = ViewUtils;
 
 export default class {

diff --git a/ember_debug/models/promise.js b/ember_debug/models/promise.js
@@ -1,5 +1,7 @@
+import { typeOf } from '../utils/type-check';
+
 const Ember = window.Ember;
-const { typeOf, Object: EmberObject, computed, A } = Ember;
+const { Object: EmberObject, computed, A } = Ember;
 
 const dateComputed = function() {
   return computed({

diff --git a/ember_debug/object-inspector.js b/ember_debug/object-inspector.js
@@ -1,10 +1,11 @@
 import PortMixin from 'ember-debug/mixins/port-mixin';
 import { compareVersion } from 'ember-debug/utils/version';
 import { isComputed, isDescriptor, getDescriptorFor } from 'ember-debug/utils/type-check';
+import { typeOf } from './utils/type-check';
 
 const Ember = window.Ember;
 const {
-  Object: EmberObject, inspect: emberInspect, meta: emberMeta, typeOf: emberTypeOf,
+  Object: EmberObject, inspect: emberInspect, meta: emberMeta,
   computed, get, set, guidFor, isNone,
   cacheFor, VERSION
 } = Ember;
@@ -29,18 +30,6 @@ try {
 
 const keys = Object.keys || Ember.keys;
 
-/**
- * workaround to support detection of `[object AsyncFunction]` as a function
- * @param value
- * @returns {string}
- */
-function typeOf(value) {
-  if (typeof value === 'function') {
-    return 'function';
-  }
-  return emberTypeOf(value);
-}
-
 /**
  * Determine the type and get the value of the passed property
  * @param {*} object The parent object we will look for `key` on
@@ -111,7 +100,7 @@ function inspect(value) {
         if (v === 'toString') {
           continue;
         } // ignore useless items
-        if (typeOf(v) === 'function') {
+        if (typeOf(v).includes('function')) {
           v = 'function() { ... }';
         }
         if (typeOf(v) === 'array') {

diff --git a/ember_debug/utils/type-check.js b/ember_debug/utils/type-check.js
@@ -49,3 +49,8 @@ export function getDescriptorFor(object, key) {
 
   return object[key];
 }
+
+
+export function typeOf(obj) {
+  return Object.prototype.toString.call(obj).match(/\s([a-zA-Z]+)/)[1].toLowerCase();
+}
diff --git a/ember_debug/view-debug.js b/ember_debug/view-debug.js
@@ -1,6 +1,7 @@
 /* eslint no-cond-assign:0 */
 import PortMixin from 'ember-debug/mixins/port-mixin';
 import GlimmerTree from 'ember-debug/libs/glimmer-tree';
+import { typeOf } from './utils/type-check';
 
 const Ember = window.Ember;
 
@@ -9,7 +10,6 @@ const {
   computed,
   run,
   Object: EmberObject,
-  typeOf,
   Component,
   String
 } = Ember;