Fixed regression bug when copy dont copy class (#53)

* Fixed regression bug when copy dont copy class

* Bump version

* Update test libs to last version

* Delete run test in nodejs 6. Because this version old

Author: Andrey Marchenko

.travis.yml

@@ -1,8 +1,6 @@
 language: node_js
 node_js:
-  - "6"
   - "8"
   - "10"
-script: 
+script:
   - npm run test:ci
-  

jest.config.js

@@ -1,23 +1,17 @@
 // eslint-disable-next-line import/no-commonjs
+
 module.exports = {
     timers: 'fake',
+    preset: 'ts-jest',
     testURL: 'http://localhost/',
-    transform: {
-        '^.+\\.tsx?$': 'ts-jest',
-        '^.+\\.jsx?$': 'babel-jest'
-    },
     globals: {
         'ts-jest': {
-            useBabelrc: true,
-            tsConfigFile: 'tsconfig.json'
+            tsConfig: {
+                esModuleInterop: true
+            }
         }
     },
     testMatch: [
-        '**/__tests__/*.+(ts|tsx|js|jsx)'
-    ],
-    moduleFileExtensions: [
-        'ts',
-        'tsx',
-        'js'
+        '**/__tests__/*.+(ts|tsx|js|jsx)',
     ]
-};
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinkoff/utils",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "author": "Tinkoff team",
   "scripts": {
     "release": "node ./releaseUtils/index.js",
@@ -29,9 +29,8 @@
     "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
     "@babel/preset-env": "^7.0.0",
     "@babel/preset-react": "^7.0.0",
-    "@types/jest": "^23.3.1",
+    "@types/jest": "^24.0.18",
     "babel-core": "^7.0.0-bridge.0",
-    "babel-jest": "^23.4.2",
     "babel-plugin-transform-es2015-modules-simple-commonjs": "^0.3.0",
     "benchmark": "^2.1.4",
     "chalk": "^2.4.1",
@@ -44,15 +43,15 @@
     "fs-extra": "^6.0.1",
     "gh-pages": "^1.2.0",
     "inquirer": "^5.2.0",
-    "jest": "^23.0.0",
-    "jsdom": "^11.12.0",
+    "jest": "^24.9.0",
+    "jsdom": "^15.1.1",
     "ora": "^2.1.0",
     "prettier": "^1.16.4",
     "react": "^16.9.0",
     "react-is": "^16.9.0",
     "recursive-readdir-sync": "^1.0.6",
-    "ts-jest": "^23.1.3",
-    "typescript": "^3.0.1",
+    "ts-jest": "^24.1.0",
+    "typescript": "^3.6.3",
     "walker": "^1.0.7"
   },
   "peerDependencies": {

src/__tests__/clone.ts

@@ -47,4 +47,16 @@ describe('utils/clone', () => {
         expect(result.elem).toBe(elem);
         expect(result.memElem).toBe(memElem);
     });
+
+    it('should copy class', () => {
+        class User {
+            constructor(public firstName: string, public lastName: string) { }
+        }
+
+        const obj = { user: new User('Tom', 'John') }
+        const result = clone(obj);
+
+        expect(result).toEqual(obj);
+        expect(result.user).not.toBe(obj.user);
+    })
 });

src/clone.ts

@@ -1,7 +1,8 @@
 import type from './type';
 import mapObj from './object/map';
 import mapArr from './array/map';
-import isPlainObject from './is/plainObject';
+import isReactElement from './is/reactElement';
+import isReactComponent from './is/reactComponent';
 
 interface Clone {
     <T>(x: T): T;
@@ -33,10 +34,12 @@ const cloneRegExp = (pattern: RegExp) =>
 const clone = (x) => {
     switch (type(x)) {
         case 'Object':
-            if (isPlainObject(x)) {
+            // Skip clone react object
+            if (isReactComponent(x) || isReactElement(x)) {
+                break;
+            } else {
                 return mapObj(clone, x);
             }
-            break;
         case 'Array':
             return mapArr(clone, x);
         case 'Date':

src/is/__tests__/reactComponent.ts

@@ -1,19 +1,19 @@
-const { createElement, PureComponent, memo, lazy } = require('react');
+describe('utils/is/reactComponent', () => {
+    const { createElement, PureComponent, memo, lazy } = require('react');
 
-let mockReactIs;
+    let mockReactIs;
 
-jest.mock('react-is', () => mockReactIs);
+    jest.mock('react-is', () => mockReactIs);
 
-class Component extends PureComponent {}
+    class Component extends PureComponent { }
 
-describe('utils/is/reactComponent', () => {
     beforeEach(() => {
         jest.resetModules();
     });
 
     it('test', () => {
         mockReactIs = require.requireActual('react-is');
-        const isReactComponent = require('../reactComponent');
+        const isReactComponent = require('../reactComponent').default;
 
         expect(isReactComponent({ test: 'i' })).toBe(false);
         expect(isReactComponent(createElement('i'))).toBe(false);
@@ -27,7 +27,7 @@ describe('utils/is/reactComponent', () => {
 
     it('test when react-is not defined', () => {
         mockReactIs = null;
-        const isReactComponent = require('../reactComponent');
+        const isReactComponent = require('../reactComponent').default;
 
         expect(isReactComponent({ test: 'i' })).toBe(false);
         expect(isReactComponent(createElement('i'))).toBe(true);

src/is/__tests__/reactElement.ts

@@ -1,19 +1,19 @@
-const { createElement, PureComponent } = require('react');
+describe('utils/is/reactElement', () => {
+    const { createElement, PureComponent } = require('react');
 
-let mockReactIs;
+    let mockReactIs;
 
-jest.mock('react-is', () => mockReactIs);
+    jest.mock('react-is', () => mockReactIs);
 
-class Component extends PureComponent {}
+    class Component extends PureComponent { }
 
-describe('utils/is/reactElement', () => {
     beforeEach(() => {
         jest.resetModules();
     });
 
     it('test', () => {
         mockReactIs = require.requireActual('react-is');
-        const isReactElement = require('../reactElement');
+        const isReactElement = require('../reactElement').default;
 
         expect(isReactElement('test')).toBe(false);
         expect(isReactElement({})).toBe(false);
@@ -24,7 +24,7 @@ describe('utils/is/reactElement', () => {
 
     it('test when is-react not defined', () => {
         mockReactIs = null;
-        const isReactElement = require('../reactElement');
+        const isReactElement = require('../reactElement').default;
 
         expect(isReactElement('test')).toBe(false);
         expect(isReactElement({})).toBe(false);