Merge pull request #2953 from jgonggrijp/extendscript-precedence

Parenthesize mixed expressions of || and &&

Author: jgonggrijp

modules/.eslintrc

@@ -8,5 +8,13 @@
   ],
   "extends": [
     "plugin:import/errors"
-  ]
+  ],
+  "rules": {
+    "no-mixed-operators": [
+      "error",
+      {
+        "groups": [["&&", "||"]]
+      }
+    ]
+  }
 }

modules/_collectNonEnumProps.js

@@ -25,7 +25,7 @@ export default function collectNonEnumProps(obj, keys) {
   keys = emulatedSet(keys);
   var nonEnumIdx = nonEnumerableProps.length;
   var constructor = obj.constructor;
-  var proto = isFunction(constructor) && constructor.prototype || ObjProto;
+  var proto = (isFunction(constructor) && constructor.prototype) || ObjProto;
 
   // Constructor is a special case.
   var prop = 'constructor';

modules/_setup.js

@@ -4,8 +4,8 @@ export var VERSION = '1.13.2';
 // Establish the root object, `window` (`self`) in the browser, `global`
 // on the server, or `this` in some virtual machines. We use `self`
 // instead of `window` for `WebWorker` support.
-export var root = typeof self == 'object' && self.self === self && self ||
-          typeof global == 'object' && global.global === global && global ||
+export var root = (typeof self == 'object' && self.self === self && self) ||
+          (typeof global == 'object' && global.global === global && global) ||
           Function('return this')() ||
           {};
 

modules/isObject.js

@@ -1,5 +1,5 @@
 // Is a given variable an object?
 export default function isObject(obj) {
   var type = typeof obj;
-  return type === 'function' || type === 'object' && !!obj;
+  return type === 'function' || (type === 'object' && !!obj);
 }

modules/max.js

@@ -7,7 +7,7 @@ import each from './each.js';
 export default function max(obj, iteratee, context) {
   var result = -Infinity, lastComputed = -Infinity,
       value, computed;
-  if (iteratee == null || typeof iteratee == 'number' && typeof obj[0] != 'object' && obj != null) {
+  if (iteratee == null || (typeof iteratee == 'number' && typeof obj[0] != 'object' && obj != null)) {
     obj = isArrayLike(obj) ? obj : values(obj);
     for (var i = 0, length = obj.length; i < length; i++) {
       value = obj[i];
@@ -19,7 +19,7 @@ export default function max(obj, iteratee, context) {
     iteratee = cb(iteratee, context);
     each(obj, function(v, index, list) {
       computed = iteratee(v, index, list);
-      if (computed > lastComputed || computed === -Infinity && result === -Infinity) {
+      if (computed > lastComputed || (computed === -Infinity && result === -Infinity)) {
         result = v;
         lastComputed = computed;
       }

modules/min.js

@@ -7,7 +7,7 @@ import each from './each.js';
 export default function min(obj, iteratee, context) {
   var result = Infinity, lastComputed = Infinity,
       value, computed;
-  if (iteratee == null || typeof iteratee == 'number' && typeof obj[0] != 'object' && obj != null) {
+  if (iteratee == null || (typeof iteratee == 'number' && typeof obj[0] != 'object' && obj != null)) {
     obj = isArrayLike(obj) ? obj : values(obj);
     for (var i = 0, length = obj.length; i < length; i++) {
       value = obj[i];
@@ -19,7 +19,7 @@ export default function min(obj, iteratee, context) {
     iteratee = cb(iteratee, context);
     each(obj, function(v, index, list) {
       computed = iteratee(v, index, list);
-      if (computed < lastComputed || computed === Infinity && result === Infinity) {
+      if (computed < lastComputed || (computed === Infinity && result === Infinity)) {
         result = v;
         lastComputed = computed;
       }

modules/unzip.js

@@ -5,7 +5,7 @@ import pluck from './pluck.js';
 // Complement of zip. Unzip accepts an array of arrays and groups
 // each array's elements on shared indices.
 export default function unzip(array) {
-  var length = array && max(array, getLength).length || 0;
+  var length = (array && max(array, getLength).length) || 0;
   var result = Array(length);
 
   for (var index = 0; index < length; index++) {

underscore-esm.js

@@ -11,8 +11,8 @@ var VERSION = '1.13.2';
 // Establish the root object, `window` (`self`) in the browser, `global`
 // on the server, or `this` in some virtual machines. We use `self`
 // instead of `window` for `WebWorker` support.
-var root = typeof self == 'object' && self.self === self && self ||
-          typeof global == 'object' && global.global === global && global ||
+var root = (typeof self == 'object' && self.self === self && self) ||
+          (typeof global == 'object' && global.global === global && global) ||
           Function('return this')() ||
           {};
 
@@ -80,7 +80,7 @@ function restArguments(func, startIndex) {
 // Is a given variable an object?
 function isObject(obj) {
   var type = typeof obj;
-  return type === 'function' || type === 'object' && !!obj;
+  return type === 'function' || (type === 'object' && !!obj);
 }
 
 // Is a given value equal to null?
@@ -257,7 +257,7 @@ function collectNonEnumProps(obj, keys) {
   keys = emulatedSet(keys);
   var nonEnumIdx = nonEnumerableProps.length;
   var constructor = obj.constructor;
-  var proto = isFunction$1(constructor) && constructor.prototype || ObjProto;
+  var proto = (isFunction$1(constructor) && constructor.prototype) || ObjProto;
 
   // Constructor is a special case.
   var prop = 'constructor';
@@ -1460,7 +1460,7 @@ function where(obj, attrs) {
 function max(obj, iteratee, context) {
   var result = -Infinity, lastComputed = -Infinity,
       value, computed;
-  if (iteratee == null || typeof iteratee == 'number' && typeof obj[0] != 'object' && obj != null) {
+  if (iteratee == null || (typeof iteratee == 'number' && typeof obj[0] != 'object' && obj != null)) {
     obj = isArrayLike(obj) ? obj : values(obj);
     for (var i = 0, length = obj.length; i < length; i++) {
       value = obj[i];
@@ -1472,7 +1472,7 @@ function max(obj, iteratee, context) {
     iteratee = cb(iteratee, context);
     each(obj, function(v, index, list) {
       computed = iteratee(v, index, list);
-      if (computed > lastComputed || computed === -Infinity && result === -Infinity) {
+      if (computed > lastComputed || (computed === -Infinity && result === -Infinity)) {
         result = v;
         lastComputed = computed;
       }
@@ -1485,7 +1485,7 @@ function max(obj, iteratee, context) {
 function min(obj, iteratee, context) {
   var result = Infinity, lastComputed = Infinity,
       value, computed;
-  if (iteratee == null || typeof iteratee == 'number' && typeof obj[0] != 'object' && obj != null) {
+  if (iteratee == null || (typeof iteratee == 'number' && typeof obj[0] != 'object' && obj != null)) {
     obj = isArrayLike(obj) ? obj : values(obj);
     for (var i = 0, length = obj.length; i < length; i++) {
       value = obj[i];
@@ -1497,7 +1497,7 @@ function min(obj, iteratee, context) {
     iteratee = cb(iteratee, context);
     each(obj, function(v, index, list) {
       computed = iteratee(v, index, list);
-      if (computed < lastComputed || computed === Infinity && result === Infinity) {
+      if (computed < lastComputed || (computed === Infinity && result === Infinity)) {
         result = v;
         lastComputed = computed;
       }
@@ -1765,7 +1765,7 @@ function intersection(array) {
 // Complement of zip. Unzip accepts an array of arrays and groups
 // each array's elements on shared indices.
 function unzip(array) {
-  var length = array && max(array, getLength).length || 0;
+  var length = (array && max(array, getLength).length) || 0;
   var result = Array(length);
 
   for (var index = 0; index < length; index++) {