fix: refactor private names and regexes

Author: jeremenichelli

src/get-from-element.js

@@ -2,12 +2,10 @@ import Matrix from './matrix'
 import { identity } from './constants'
 
 // regexp to detect transform matrices
-const matrixRegEx = /^(matrix\()/g
-const matrix3dRegEx = /^(matrix3d\()/g
+const matrixRegEx = /^(matrix(3d)?\()/g
 
 // regexp to strip matrix notation
-const matrixCleanRegEx = /^(matrix\()|\)/g
-const matrix3dCleanRegEx = /^(matrix3d\()|\)/g
+const matrixCleanRegEx = /^(matrix(3d)?\()|\)/g
 
 // regexp to split values
 const stripRegEx = /,\s|,/g
@@ -39,9 +37,9 @@ const getMatrixFromElement = (el) => {
   }
 
   // handle 3d matrix
-  if (matrix3dRegEx.test(transformMatrix)) {
+  if (matrixRegEx.test(transformMatrix)) {
     const stringMatrix = transformMatrix
-      .replace(matrix3dCleanRegEx, '')
+      .replace(matrixCleanRegEx, '')
       .split(stripRegEx)
     const numberedMatrix = stringMatrix.map((n) => parseFloat(n))
 

src/matrix.js

@@ -45,8 +45,8 @@ function getRotateMatrix(alpha) {
  */
 export default class Matrix {
   constructor(matrixRepresentation) {
-    this.__array__ = matrixRepresentation
-    this.__string__ = getMatrixString(matrixRepresentation)
+    this.__a = matrixRepresentation
+    this.__s = getMatrixString(matrixRepresentation)
   }
 
   /**
@@ -55,7 +55,7 @@ export default class Matrix {
    * @returns {string} matrix as matrix3d trasnform string
    */
   toString() {
-    return this.__string__
+    return this.__s
   }
 
   /**
@@ -64,7 +64,7 @@ export default class Matrix {
    * @returns {Array} array of arrays of the current status of the matrix
    */
   toArray() {
-    return this.__array__
+    return this.__a
   }
 
   /**
@@ -79,8 +79,8 @@ export default class Matrix {
     const scaleMatrix = getScaleMatrix(x, y, z)
     const calculatedMatrix = multiply(this.toArray(), scaleMatrix)
 
-    this.__array__ = calculatedMatrix
-    this.__string__ = getMatrixString(calculatedMatrix)
+    this.__a = calculatedMatrix
+    this.__s = getMatrixString(calculatedMatrix)
 
     return this
   }
@@ -97,8 +97,13 @@ export default class Matrix {
     const translateMatrix = getTranslateMatrix(x, y, z)
     const calculatedMatrix = multiply(this.toArray(), translateMatrix)
 
-    this.__array__ = calculatedMatrix
-    this.__string__ = getMatrixString(calculatedMatrix)
+    /*
+     * private fields minified to have less impact on bundle size
+     * __a hoists the array representation of the matrix
+     * __s hoists the string representation of the matrix
+     */
+    this.__a = calculatedMatrix
+    this.__s = getMatrixString(calculatedMatrix)
 
     return this
   }
@@ -113,8 +118,8 @@ export default class Matrix {
     const rotateMatrix = getRotateMatrix(alpha)
     const calculatedMatrix = multiply(this.toArray(), rotateMatrix)
 
-    this.__array__ = calculatedMatrix
-    this.__string__ = getMatrixString(calculatedMatrix)
+    this.__a = calculatedMatrix
+    this.__s = getMatrixString(calculatedMatrix)
 
     return this
   }
@@ -130,8 +135,8 @@ export default class Matrix {
     const skewMatrix = getSkewMatrix(alpha, beta)
     const calculatedMatrix = multiply(this.toArray(), skewMatrix)
 
-    this.__array__ = calculatedMatrix
-    this.__string__ = getMatrixString(calculatedMatrix)
+    this.__a = calculatedMatrix
+    this.__s = getMatrixString(calculatedMatrix)
 
     return this
   }