fix: npm audit vulnerabilities warning (#62)

amzn · Oct 28, 2019 · c44cc76 · c44cc76
1 parent 99b636a
commit c44cc76
Show file tree

Hide file tree

Showing 17 changed files with 7,065 additions and 6,200 deletions.
diff --git a/index.js b/index.js
@@ -1 +1 @@
-module.exports = Object.assign({}, require('./models'), require('./utils'));
+module.exports = { ...require('./models'), ...require('./utils') };
diff --git a/models/Artboard/Artboard.js b/models/Artboard/Artboard.js
@@ -38,7 +38,8 @@ class Artboard extends Group {
    * @property {Color.Model} backgroundColor
    */
   static get Model() {
-    return Object.assign({}, Group.Model, {
+    return {
+      ...Group.Model,
       _class: 'artboard',
       shouldBreakMaskChain: true,
       backgroundColor: {},
@@ -49,7 +50,7 @@ class Artboard extends Group {
       includeInCloudUpload: true,
       isFlowHome: false,
       resizesContent: false,
-    });
+    };
   }
 
   /**

diff --git a/models/AttributedString/AttributedString.js b/models/AttributedString/AttributedString.js
@@ -43,14 +43,7 @@ class AttributedString {
       Object.assign(this, {
         _class: 'attributedString',
         string: args.string || '',
-        attributes: args.attributes || [
-          new StringAttribute(
-            Object.assign({}, args, {
-              location: 0,
-              length: args.string.length,
-            })
-          ),
-        ],
+        attributes: args.attributes || [new StringAttribute({ ...args, location: 0, length: args.string.length })],
       });
     }
   }

diff --git a/models/Bitmap/Bitmap.js b/models/Bitmap/Bitmap.js
@@ -39,7 +39,8 @@ class Bitmap extends Layer {
    * @property {Object} image
    */
   static get Model() {
-    return Object.assign({}, Layer.Model, {
+    return {
+      ...Layer.Model,
       _class: 'bitmap',
       fillReplacesImage: false,
       hasClippingMask: false,
@@ -54,7 +55,7 @@ class Bitmap extends Layer {
         _ref_class: 'MSImageData',
         _ref: '',
       },
-    });
+    };
   }
 
   /**

diff --git a/models/Group/Group.js b/models/Group/Group.js
@@ -26,12 +26,13 @@ class Group extends Layer {
    * @mixes Layer.Model
    */
   static get Model() {
-    return Object.assign({}, Layer.Model, {
+    return {
+      ...Layer.Model,
       _class: 'group',
       layerListExpandedType: 2,
       resizingConstraint: 63,
       hasClickThrough: false,
-    });
+    };
   }
 
   /**

diff --git a/models/Oval/Oval.js b/models/Oval/Oval.js
@@ -43,13 +43,7 @@ class Oval extends Layer {
    * @property {String[]} points
    */
   static get Model() {
-    return Object.assign({}, Layer.Model, {
-      _class: 'oval',
-      edited: false,
-      isClosed: true,
-      pointRadiusBehaviour: 1,
-      points: [],
-    });
+    return { ...Layer.Model, _class: 'oval', edited: false, isClosed: true, pointRadiusBehaviour: 1, points: [] };
   }
 
   /**

diff --git a/models/Page/Page.js b/models/Page/Page.js
@@ -24,9 +24,7 @@ class Page extends Group {
    * @mixes Group.Model
    */
   static get Model() {
-    return Object.assign({}, Group.Model, {
-      _class: 'page',
-    });
+    return { ...Group.Model, _class: 'page' };
   }
 
   /**

diff --git a/models/Rectangle/Rectangle.js b/models/Rectangle/Rectangle.js
@@ -33,15 +33,16 @@ class Rectangle extends Layer {
    * @property {boolean} hasConvertedToNewRoundCorners
    */
   static get Model() {
-    return Object.assign({}, Layer.Model, {
+    return {
+      ...Layer.Model,
       _class: 'rectangle',
       edited: false,
       isClosed: true,
       pointRadiusBehaviour: 1,
       points: [],
       fixedRadius: 0,
       hasConvertedToNewRoundCorners: true,
-    });
+    };
   }
 
   /**

diff --git a/models/ShapeGroup/ShapeGroup.js b/models/ShapeGroup/ShapeGroup.js
@@ -21,13 +21,14 @@ const Style = require('../Style');
 
 class ShapeGroup extends Layer {
   static get Model() {
-    return Object.assign({}, Layer.Model, {
+    return {
+      ...Layer.Model,
       _class: 'shapeGroup',
       layerListExpandedType: 1,
       clippingMaskMode: 0,
       hasClippingMask: false,
       windingRule: 1,
-    });
+    };
   }
 
   constructor(args, json) {

diff --git a/models/ShapePath/ShapePath.js b/models/ShapePath/ShapePath.js
@@ -28,13 +28,7 @@ class ShapePath extends Layer {
    * @property {String[]} points
    */
   static get Model() {
-    return Object.assign({}, Layer.Model, {
-      _class: 'shapePath',
-      edited: true,
-      isClosed: false,
-      pointRadiusBehaviour: 1,
-      points: [],
-    });
+    return { ...Layer.Model, _class: 'shapePath', edited: true, isClosed: false, pointRadiusBehaviour: 1, points: [] };
   }
 
   /**

diff --git a/models/SymbolInstance/SymbolInstance.js b/models/SymbolInstance/SymbolInstance.js
@@ -28,11 +28,7 @@ class SymbolInstance extends Layer {
    * @property {overrideValue[]} overrideValues
    */
   static get Model() {
-    return Object.assign({}, Layer.Model, {
-      _class: 'symbolInstance',
-      symbolID: '',
-      overrideValues: [],
-    });
+    return { ...Layer.Model, _class: 'symbolInstance', symbolID: '', overrideValues: [] };
   }
 
   /**

diff --git a/models/SymbolMaster/SymbolMaster.js b/models/SymbolMaster/SymbolMaster.js
@@ -82,11 +82,7 @@ class SymbolMaster extends Artboard {
   }
 
   createInstance(args) {
-    const symbolInstance = new SymbolInstance(
-      Object.assign({}, args, {
-        symbolID: this.symbolID,
-      })
-    );
+    const symbolInstance = new SymbolInstance({ ...args, symbolID: this.symbolID });
 
     symbolInstance.overrideValues = this.overrideProperties.map(prop => ({
       _class: 'overrideValue',

diff --git a/models/Text/Text.js b/models/Text/Text.js
@@ -36,14 +36,15 @@ class Text extends Layer {
    * @property {boolean} dontSynchroniseWithSymbol
    */
   static get Model() {
-    return Object.assign({}, Layer.Model, {
+    return {
+      ...Layer.Model,
       automaticallyDrawOnUnderlyingPath: false,
       dontSynchroniseWithSymbol: false,
       attributedString: AttributedString.Model,
       glyphBounds: '{{5, 15}, {122, 55}}',
       lineSpacingBehaviour: 2,
       textBehaviour: 2,
-    });
+    };
   }
 
   /**

diff --git a/models/User/User.js b/models/User/User.js
@@ -54,14 +54,11 @@ class User {
    * @returns {this}
    */
   addPage(pageID, opts = {}) {
-    this[pageID] = Object.assign(
-      {},
-      {
-        scrollOrigin: '{100, 100}',
-        zoomValue: 1,
-      },
-      opts
-    );
+    this[pageID] = {
+      scrollOrigin: '{100, 100}',
+      zoomValue: 1,
+      ...opts,
+    };
     return this;
   }
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		module.exports = Object.assign({}, require('./models'), require('./utils'));
		module.exports = { ...require('./models'), ...require('./utils') };