Skip to content

Commit 041f260

Browse files
committed
Remove copy & Copyable
Part of emberjs#19617
1 parent 3d93487 commit 041f260

File tree

9 files changed

+2
-299
lines changed

9 files changed

+2
-299
lines changed

packages/@ember/-internals/runtime/index.js

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
export { default as Object, FrameworkObject } from './lib/system/object';
22
export { default as RegistryProxyMixin } from './lib/mixins/registry_proxy';
33
export { default as ContainerProxyMixin } from './lib/mixins/container_proxy';
4-
export { default as copy } from './lib/copy';
54
export { default as compare } from './lib/compare';
65
export { default as isEqual } from './lib/is-equal';
76
export {
@@ -19,7 +18,6 @@ export { default as ArrayProxy } from './lib/system/array_proxy';
1918
export { default as ObjectProxy } from './lib/system/object_proxy';
2019
export { default as CoreObject } from './lib/system/core_object';
2120
export { default as ActionHandler } from './lib/mixins/action_handler';
22-
export { default as Copyable } from './lib/mixins/copyable';
2321
export { default as Enumerable } from './lib/mixins/enumerable';
2422
export { default as _ProxyMixin, contentFor as _contentFor } from './lib/mixins/-proxy';
2523
export { default as Observable } from './lib/mixins/observable';

packages/@ember/-internals/runtime/lib/copy.js

-120
This file was deleted.

packages/@ember/-internals/runtime/lib/mixins/copyable.js

-34
This file was deleted.

packages/@ember/-internals/runtime/tests/copyable-array/copy-test.js

-12
This file was deleted.

packages/@ember/-internals/runtime/tests/core/copy_test.js

-64
This file was deleted.

packages/@ember/-internals/runtime/tests/helpers/array.js

+2-59
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@ import EmberArray, { A as emberA, MutableArray } from '../../lib/mixins/array';
33
import { generateGuid, guidFor } from '@ember/-internals/utils';
44
import {
55
get,
6-
set,
76
computed,
87
addArrayObserver,
98
removeArrayObserver,
109
arrayContentWillChange,
1110
arrayContentDidChange,
1211
} from '@ember/-internals/metal';
1312
import EmberObject from '../../lib/system/object';
14-
import Copyable from '../../lib/mixins/copyable';
1513
import { moduleFor } from 'internal-test-helpers';
1614

1715
export function newFixture(cnt) {
@@ -147,42 +145,6 @@ class NativeArrayHelpers extends AbstractArrayHelper {
147145
}
148146
}
149147

150-
class CopyableNativeArray extends AbstractArrayHelper {
151-
newObject() {
152-
return emberA([generateGuid()]);
153-
}
154-
155-
isEqual(a, b) {
156-
if (!(a instanceof Array)) {
157-
return false;
158-
}
159-
160-
if (!(b instanceof Array)) {
161-
return false;
162-
}
163-
164-
if (a.length !== b.length) {
165-
return false;
166-
}
167-
168-
return a[0] === b[0];
169-
}
170-
}
171-
172-
class CopyableArray extends AbstractArrayHelper {
173-
newObject() {
174-
return CopyableObject.create();
175-
}
176-
177-
isEqual(a, b) {
178-
if (!(a instanceof CopyableObject) || !(b instanceof CopyableObject)) {
179-
return false;
180-
}
181-
182-
return get(a, 'id') === get(b, 'id');
183-
}
184-
}
185-
186148
class ArrayProxyHelpers extends AbstractArrayHelper {
187149
newObject(ary) {
188150
return ArrayProxy.create({ content: emberA(super.newObject(ary)) });
@@ -271,21 +233,6 @@ const TestMutableArray = EmberObject.extend(MutableArray, {
271233
},
272234
});
273235

274-
const CopyableObject = EmberObject.extend(Copyable, {
275-
id: null,
276-
277-
init() {
278-
this._super(...arguments);
279-
set(this, 'id', generateGuid());
280-
},
281-
282-
copy() {
283-
let ret = CopyableObject.create();
284-
set(ret, 'id', get(this, 'id'));
285-
return ret;
286-
},
287-
});
288-
289236
class MutableArrayHelpers extends NativeArrayHelpers {
290237
newObject(ary) {
291238
return TestMutableArray.create(super.newObject(ary));
@@ -316,15 +263,11 @@ export function runArrayTests(name, Tests, ...types) {
316263
case 'MutableArray':
317264
moduleFor(`MutableArray: ${name}`, Tests, MutableArrayHelpers);
318265
break;
319-
case 'CopyableArray':
320-
moduleFor(`CopyableArray: ${name}`, Tests, CopyableArray);
321-
break;
322-
case 'CopyableNativeArray':
323-
moduleFor(`CopyableNativeArray: ${name}`, Tests, CopyableNativeArray);
324-
break;
325266
case 'NativeArray':
326267
moduleFor(`NativeArray: ${name}`, Tests, NativeArrayHelpers);
327268
break;
269+
default:
270+
throw new Error(`runArrayTests passed unexpected type ${type}`);
328271
}
329272
});
330273
} else {

packages/@ember/object/internals.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
export { getCachedValueFor as cacheFor } from '@ember/-internals/metal';
2-
export { copy } from '@ember/-internals/runtime';
32
export { guidFor } from '@ember/-internals/utils';

packages/ember/index.js

-5
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,8 @@ import {
4141
RegistryProxyMixin,
4242
ContainerProxyMixin,
4343
compare,
44-
copy,
4544
isEqual,
4645
Array as EmberArray,
47-
Copyable,
4846
MutableEnumerable,
4947
MutableArray,
5048
TargetActionSupport,
@@ -397,8 +395,6 @@ Ember.Object = EmberObject;
397395
Ember._RegistryProxyMixin = RegistryProxyMixin;
398396
Ember._ContainerProxyMixin = ContainerProxyMixin;
399397
Ember.compare = compare;
400-
Ember.copy = copy;
401-
Ember.isEqual = isEqual;
402398

403399
/**
404400
@module ember
@@ -430,7 +426,6 @@ Ember.ObjectProxy = ObjectProxy;
430426
Ember.ActionHandler = ActionHandler;
431427
Ember.CoreObject = CoreObject;
432428
Ember.NativeArray = NativeArray;
433-
Ember.Copyable = Copyable;
434429
Ember.MutableEnumerable = MutableEnumerable;
435430
Ember.MutableArray = MutableArray;
436431
Ember.Evented = Evented;

packages/ember/tests/reexports_test.js

-2
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,6 @@ let allExports = [
351351

352352
// @ember/object/internals
353353
['cacheFor', '@ember/object/internals', 'cacheFor'],
354-
['copy', '@ember/object/internals', 'copy'],
355354
['guidFor', '@ember/object/internals', 'guidFor'],
356355

357356
// @ember/object/mixin
@@ -546,7 +545,6 @@ let allExports = [
546545
['Comparable', '@ember/-internals/runtime'],
547546
['ActionHandler', '@ember/-internals/runtime'],
548547
['NativeArray', '@ember/-internals/runtime'],
549-
['Copyable', '@ember/-internals/runtime'],
550548
['MutableEnumerable', '@ember/-internals/runtime'],
551549
EMBER_MODERNIZED_BUILT_IN_COMPONENTS
552550
? null

0 commit comments

Comments
 (0)