♻️ Refactoring code.

Remove Object.assign in favor of spread operator.
pencil-js · Dec 19, 2018 · 600648c · 600648c
1 parent 17e1cb3
commit 600648c
Show file tree

Hide file tree

Showing 31 changed files with 159 additions and 109 deletions.
diff --git a/drawingTests/allInputs/expected.png b/drawingTests/allInputs/expected.png
diff --git a/modules/arc/arc.js b/modules/arc/arc.js
@@ -42,12 +42,14 @@ export default class Arc extends Component {
      * @inheritDoc
      */
     toJSON () {
-        return Object.assign(super.toJSON(), {
-            horizontalRadius: this.horizontalRadius,
-            verticalRadius: this.verticalRadius,
-            startAngle: this.startAngle,
-            endAngle: this.endAngle,
-        });
+        const { horizontalRadius, verticalRadius, startAngle, endAngle } = this;
+        return {
+            ...super.toJSON(),
+            horizontalRadius,
+            verticalRadius,
+            startAngle,
+            endAngle,
+        };
     }
 
     /**
@@ -68,9 +70,10 @@ export default class Arc extends Component {
      * @return {LineOptions}
      */
     static get defaultOptions () {
-        return Object.assign(Line.defaultOptions, {
+        return {
+            ...Line.defaultOptions,
             join: null,
-        });
+        };
     }
 
     /**

diff --git a/modules/button/button.js b/modules/button/button.js
@@ -65,9 +65,11 @@ export default class Button extends Input {
      * @return {ButtonOptions}
      */
     static get defaultOptions () {
-        return Object.assign(super.defaultOptions, Text.defaultOptions, {
+        return {
+            ...Text.defaultOptions,
+            ...super.defaultOptions,
             value: "",
-        });
+        };
     }
 
     /**

diff --git a/modules/checkbox/checkbox.js b/modules/checkbox/checkbox.js
@@ -76,10 +76,11 @@ export default class Checkbox extends Input {
      * @return {CheckboxOptions}
      */
     static get defaultOptions () {
-        return Object.assign(super.defaultOptions, {
+        return {
+            ...super.defaultOptions,
             size: 20,
             value: false,
-        });
+        };
     }
 
     /**

diff --git a/modules/circle/circle.js b/modules/circle/circle.js
@@ -47,9 +47,11 @@ export default class Circle extends Ellipse {
      * @inheritDoc
      */
     toJSON () {
-        const json = Object.assign(super.toJSON(), {
-            radius: this.radius,
-        });
+        const { radius } = this;
+        const json = {
+            ...super.toJSON(),
+            radius,
+        };
         delete json.horizontalRadius;
         delete json.verticalRadius;
         return json;

diff --git a/modules/component/component.js b/modules/component/component.js
@@ -99,13 +99,14 @@ export default class Component extends Container {
      * @return {ComponentOptions}
      */
     static get defaultOptions () {
-        return Object.assign(super.defaultOptions, {
+        return {
+            ...super.defaultOptions,
             fill: "#000",
             stroke: null,
             strokeWidth: 2,
             cursor: Component.cursors.default,
             join: Component.joins.miter,
-        });
+        };
     }
 
     /**

diff --git a/modules/container/container.js b/modules/container/container.js
@@ -28,7 +28,10 @@ export default class Container extends EventEmitter {
         /**
          * @type {ContainerOptions}
          */
-        this.options = Object.assign(this.constructor.defaultOptions, options);
+        this.options = {
+            ...this.constructor.defaultOptions,
+            ...options,
+        };
         this.options.rotationAnchor = Position.from(this.options.rotationAnchor);
         /**
          * @type {Array<Container>}
@@ -370,14 +373,14 @@ export default class Container extends EventEmitter {
         Object.keys(this.options).forEach((key) => {
             const value = this.options[key];
             if (!(value && value.equals ? value.equals(defaultOptions[key]) : Object.is(value, defaultOptions[key]))) {
-                optionsCopy[key] = value && value.toJSON ? value.toJSON() : value;
+                optionsCopy[key] = value;
             }
         });
 
-        const json = Object.assign({
+        const json = {
             constructor: this.constructor.name,
             position: this.position,
-        });
+        };
         if (this.children.length) {
             json.children = this.children.map(child => child.toJSON());
         }
@@ -438,11 +441,12 @@ export default class Container extends EventEmitter {
      * @return {ContainerEvent}
      */
     static get events () {
-        return Object.assign(super.events, {
+        return {
+            ...super.events,
             attach: "attach",
             detach: "detach",
             draw: "draw",
-        });
+        };
     }
 
     /**

diff --git a/modules/container/container.test.js b/modules/container/container.test.js
@@ -260,7 +260,7 @@ test("toJSON", (t) => {
     const json = t.context.toJSON();
 
     t.is(json.children, undefined);
-    t.deepEqual(json.position, [10, 20]);
+    t.deepEqual(json.position, t.context.position);
     t.is(json.options, undefined);
     t.is(json.constructor, "Container");
 
@@ -272,7 +272,7 @@ test("toJSON", (t) => {
     const reJson = specific.toJSON();
     t.deepEqual(reJson.options, {
         opacity: 0.5,
-        rotationAnchor: [10, 20],
+        rotationAnchor: specific.options.rotationAnchor,
     });
     t.is(reJson.children.length, 1);
 });

diff --git a/modules/draggable/draggable.js b/modules/draggable/draggable.js
@@ -26,10 +26,11 @@ Component.prototype.draggable = function draggable (options) {
         this.options.cursor = Component.cursors.grab;
     }
     this.isDraggable = true;
-    const mergedOptions = Object.assign({
+    const mergedOptions = {
         x: true,
         y: true,
-    }, options);
+        ...options,
+    };
 
     let startPosition = null;
     let originPosition = null;

diff --git a/modules/image/image.js b/modules/image/image.js
@@ -106,9 +106,11 @@ export default class Image extends Rectangle {
      * @inheritDoc
      */
     toJSON () {
-        return Object.assign(super.toJSON(), {
-            url: this.url,
-        });
+        const { url } = this;
+        return {
+            ...super.toJSON(),
+            url,
+        };
     }
 
     /**
@@ -143,8 +145,9 @@ export default class Image extends Rectangle {
      * @return {RectangleOptions}
      */
     static get defaultOptions () {
-        return Object.assign(super.defaultOptions, {
+        return {
+            ...super.defaultOptions,
             fill: null,
-        });
+        };
     }
 }
diff --git a/modules/input/input.js b/modules/input/input.js
@@ -99,13 +99,14 @@ export default class Input extends Container {
      * @return {InputOptions}
      */
     static get defaultOptions () {
-        return Object.assign(super.defaultOptions, {
+        return {
+            ...super.defaultOptions,
             value: null,
             fill: "#444",
             background: "#f6f6f6",
             border: "#aaa",
             hover: "#dcdcdc",
-        });
+        };
     }
 
     /**
@@ -117,8 +118,9 @@ export default class Input extends Container {
      * @return {InputEvents}
      */
     static get events () {
-        return Object.assign(super.events, {
+        return {
+            ...super.events,
             change: "change",
-        });
+        };
     }
 }
diff --git a/modules/line/line.js b/modules/line/line.js
@@ -54,9 +54,11 @@ export default class Line extends Component {
      * @inheritDoc
      */
     toJSON () {
-        return Object.assign(super.toJSON(), {
-            points: this.points,
-        });
+        const { points } = this;
+        return {
+            ...super.toJSON(),
+            points,
+        };
     }
 
     /**
@@ -78,12 +80,13 @@ export default class Line extends Component {
      * @return {LineOptions}
      */
     static get defaultOptions () {
-        const options = Object.assign(super.defaultOptions, {
+        const options = {
+            ...super.defaultOptions,
             cap: Line.caps.round,
             join: Line.joins.round,
             fill: null,
             cursor: null,
-        });
+        };
         options.stroke = super.defaultOptions.fill;
         return options;
     }

diff --git a/modules/path/path.js b/modules/path/path.js
@@ -70,7 +70,10 @@ export default class Path extends Component {
 
         if (!isClosed) {
             // Overrides options to work like a line if not closed
-            this.options = Object.assign(Line.defaultOptions, options);
+            this.options = {
+                ...Line.defaultOptions,
+                ...options,
+            };
         }
 
         this.instructions = instructions;
@@ -120,10 +123,12 @@ export default class Path extends Component {
      * @inheritDoc
      */
     toJSON () {
-        return Object.assign(super.toJSON(), {
-            instructions: this.instructions.map(instruction => instruction.toJSON()),
-            isClosed: this.isClosed,
-        });
+        const { instructions, isClosed } = this;
+        return {
+            ...super.toJSON(),
+            instructions,
+            isClosed,
+        };
     }
 
     /**

diff --git a/modules/pencil.js/pencil.js b/modules/pencil.js/pencil.js
@@ -89,7 +89,7 @@ function from (json) {
 }
 
 // Export all under namespace
-export default Object.assign({
+export default {
     EventEmitter,
     Component,
     Input,
@@ -104,7 +104,8 @@ export default Object.assign({
     version,
     author,
     homepage,
-}, exportableClasses);
+    ...exportableClasses,
+};
 
 // Named exports
 export {

diff --git a/modules/polygon/polygon.js b/modules/polygon/polygon.js
@@ -41,9 +41,11 @@ export default class Polygon extends Component {
      * @inheritDoc
      */
     toJSON () {
-        return Object.assign(super.toJSON(), {
-            points: this.points,
-        });
+        const { points } = this;
+        return {
+            ...super.toJSON(),
+            points,
+        };
     }
 
     /**

diff --git a/modules/polygon/polygon.test.js b/modules/polygon/polygon.test.js
@@ -33,10 +33,7 @@ test("trace", (t) => {
 test("toJSON", (t) => {
     const json = t.context.toJSON();
 
-    t.deepEqual(json.points, [
-        [100, 200],
-        [300, 400],
-    ]);
+    t.deepEqual(json.points, t.context.points);
     t.is(json.constructor, "Polygon");
 });
 

diff --git a/modules/position/position.js b/modules/position/position.js
@@ -200,7 +200,11 @@ export default class Position {
      * @return {Array<Number>}
      */
     toJSON () {
-        return [truncate(this.x), truncate(this.y)];
+        const { x, y } = this;
+        return [
+            truncate(x),
+            truncate(y),
+        ];
     }
 
     /**

diff --git a/modules/progress-bar/progress-bar.js b/modules/progress-bar/progress-bar.js
@@ -95,11 +95,12 @@ export default class ProgressBar extends Input {
      * @return {SliderOptions}
      */
     static get defaultOptions () {
-        return Object.assign(super.defaultOptions, {
+        return {
+            ...super.defaultOptions,
             value: 0,
             width: 200,
             speed: 0.3,
-        });
+        };
     }
 
     /**