Updated to use eslint from fbjs-scripts

.eslintrc

@@ -1,6 +1,5 @@
 {
-    "browser": true,
+    "extends": "./node_modules/fbjs-scripts/eslint/.eslintrc",
-    "shadow": true,
     "globals": {
         "jasmine": true,
         "describe": true,
@@ -17,159 +16,5 @@
         "console": true,
         "setTimeout": true,
         "define": true
-    },
-    "rules": {
-        "comma-dangle": 2,
-        "no-cond-assign": 2,
-        "no-console": 0,
-        "no-constant-condition": 2,
-        "no-control-regex": 2,
-        "no-debugger": 2,
-        "no-dupe-args": 2,
-        "no-dupe-keys": 2,
-        "no-duplicate-case": 2,
-        "no-empty-class": 0,
-        "no-empty": 2,
-        "no-ex-assign": 2,
-        "no-extra-boolean-cast": 2,
-        "no-extra-parens": 0,
-        "no-extra-semi": 2,
-        "no-func-assign": 2,
-        "no-inner-declarations": 2,
-        "no-invalid-regexp": 2,
-        "no-irregular-whitespace": 2,
-        "no-negated-in-lhs": 2,
-        "no-obj-calls": 2,
-        "no-regex-spaces": 2,
-        "no-reserved-keys": 0,
-        "no-sparse-arrays": 2,
-        "no-unreachable": 2,
-        "use-isnan": 2,
-        "valid-jsdoc": 2,
-        "valid-typeof": 2,
-        "block-scoped-var": 0,
-        "complexity": 2,
-        "consistent-return": 2,
-        "curly": 2,
-        "default-case": 0,
-        "dot-notation": 2,
-        "dot-location": 0,
-        "eqeqeq": [2, "allow-null"],
-        "guard-for-in": 0,
-        "no-alert": 2,
-        "no-caller": 2,
-        "no-div-regex": 2,
-        "no-else-return": 0,
-        "no-empty-label": 2,
-        "no-eq-null": 0,
-        "no-eval": 2,
-        "no-extend-native": 2,
-        "no-extra-bind": 2,
-        "no-fallthrough": 2,
-        "no-floating-decimal": 2,
-        "no-implied-eval": 2,
-        "no-iterator": 2,
-        "no-labels": 2,
-        "no-lone-blocks": 2,
-        "no-loop-func": 2,
-        "no-multi-spaces": 0,
-        "no-multi-str": 2,
-        "no-native-reassign": 2,
-        "no-new-func": 2,
-        "no-new-wrappers": 2,
-        "no-new": 2,
-        "no-octal-escape": 2,
-        "no-octal": 2,
-        "no-param-reassign": 0,
-        "no-process-env": 2,
-        "no-proto": 2,
-        "no-redeclare": 0,
-        "no-return-assign": 2,
-        "no-script-url": 2,
-        "no-self-compare": 0,
-        "no-sequences": 2,
-        "no-throw-literal": 2,
-        "no-unused-expressions": 2,
-        "no-void": 2,
-        "no-warning-comments": 0,
-        "no-with": 2,
-        "radix": 2,
-        "vars-on-top": 0,
-        "wrap-iife": 0,
-        "yoda": 2,
-        "strict": 0,
-        "no-catch-shadow": 2,
-        "no-delete-var": 2,
-        "no-label-var": 2,
-        "no-shadow-restricted-names": 2,
-        "no-shadow": 0,
-        "no-undef-init": 2,
-        "no-undef": 0,
-        "no-undefined": 0,
-        "no-unused-vars": 2,
-        "no-use-before-define": 0,
-        "handle-callback-err": 2,
-        "no-mixed-requires": 2,
-        "no-new-require": 2,
-        "no-path-concat": 0,
-        "no-process-exit": 2,
-        "no-restricted-modules": 2,
-        "no-sync": 0,
-        "brace-style": 0,
-        "camelcase": 2,
-        "comma-spacing": 2,
-        "comma-style": 2,
-        "consistent-this": 2,
-        "eol-last": 2,
-        "func-names": 0,
-        "func-style": 0,
-        "indent": [2, 2, {"SwitchCase": 1}],
-        "key-spacing": 2,
-        "linebreak-style": 2,
-        "new-cap": 2,
-        "new-parens": 2,
-        "newline-after-var": 0,
-        "no-array-constructor": 2,
-        "no-continue": 0,
-        "no-inline-comments": 0,
-        "no-lonely-if": 2,
-        "no-mixed-spaces-and-tabs": 2,
-        "no-multiple-empty-lines": 2,
-        "no-nested-ternary": 2,
-        "no-new-object": 2,
-        "no-spaced-func": 2,
-        "no-ternary": 0,
-        "no-trailing-spaces": 0,
-        "no-underscore-dangle": 0,
-        "no-unneeded-ternary": 2,
-        "no-wrap-func": 0,
-        "one-var": 0,
-        "operator-assignment": 2,
-        "operator-linebreak": 0,
-        "padded-blocks": 0,
-        "quote-props": 0,
-        "quotes": [2, "single"],
-        "semi-spacing": 2,
-        "semi": 0,
-        "sort-vars": 0,
-        "space-after-keywords": 2,
-        "space-before-blocks": 2,
-        "space-before-function-paren": 0,
-        "space-in-brackets": 0,
-        "space-in-parens": 0,
-        "space-infix-ops": 2,
-        "space-return-throw-case": 2,
-        "space-unary-ops": 2,
-        "spaced-line-comment": 0,
-        "wrap-regex": 2,
-        "generator-star-spacing": 2,
-        "no-var": 0,
-        "object-shorthand": 0,
-        "max-depth": 2,
-        "max-len": 0,
-        "max-params": 0,
-        "max-statements": 0,
-        "no-bitwise": 2,
-        "no-plusplus": 0
     }
 }

Gruntfile.js

@@ -25,8 +25,7 @@ module.exports = function(grunt) {
     config.cTestCompile = 'cl -nologo -Zi -Tpsrc/__tests__/Layout-test.c -Tpsrc/Layout.c -Tpsrc/Layout-test-utils.c -link -incremental:no -out:"<%= config.cTestOutput %>"';
     config.cTestExecute = '<%= config.cTestOutput %>';
     config.cTestClean = ['<%= config.cTestOutput %>', '*.obj', '*.pdb'];
-  }
+  } else {
-  else {
     // GCC build (OSX, Linux, ...), assumes gcc is in the path.
     config.cTestOutput = 'c_test';
     config.cTestCompile = 'gcc -std=c99 -Werror -Wno-padded src/__tests__/Layout-test.c src/Layout.c src/Layout-test-utils.c -lm -o "./<%= config.cTestOutput %>"';
@@ -119,9 +118,8 @@ module.exports = function(grunt) {
               '#ifdef CSS_LAYOUT_IMPLEMENTATION',
               src,
               '#endif // CSS_LAYOUT_IMPLEMENTATION'
-            ].join('\n')
+            ].join('\n');
-          }
+          } else {
-          else {
             return src;
           }
         }

package.json

@@ -24,6 +24,8 @@
   },
   "homepage": "https://github.com/facebook/css-layout",
   "devDependencies": {
+    "babel-eslint": "^4.1.3",
+    "fbjs-scripts": "^0.2.2",
     "grunt": "^0.4.5",
     "grunt-cli": "^0.1.13",
     "grunt-contrib-clean": "^0.6.0",

src/CSharpTranspiler.js

@@ -56,7 +56,7 @@ function __transpileToCSharpCommon(code) {
     // additional case conversions
 
     .replace(/(CSSConstants|CSSWrap|CSSJustify|CSSAlign|CSSPositionType)\.([_A-Z]+)/g,
-        function (str, match1, match2) {
+        function(str, match1, match2) {
           return match1 + '.' + constantToPascalCase(match2);
         });
 }
@@ -67,35 +67,35 @@ function __transpileSingleTestToCSharp(code) {
     .replace(/CSS_FLEX_DIRECTION_/g, 'CSSFlexDirection.')
     .replace(/CSS_WRAP/g, 'CSSWrap.WRAP')
     .replace(/new_test_css_node/g, 'new TestCSSNode')
-    .replace( // style.position[CSS_TOP] => style.position[CSSLayout.POSITION_TOP]
+    .replace(// style.position[CSS_TOP] => style.position[CSSLayout.POSITION_TOP]
         /(style|layout)\.position\[CSS_(LEFT|TOP|RIGHT|BOTTOM)\]/g,
-        function (str, match1, match2) {
+        function(str, match1, match2) {
           return match1 + '.position[POSITION_' + match2 + ']';
         })
-    .replace( // style.dimensions[CSS_WIDTH] => style.dimensions[CSSLayout.DIMENSION_WIDTH]
+    .replace(// style.dimensions[CSS_WIDTH] => style.dimensions[CSSLayout.DIMENSION_WIDTH]
         /(style|layout)\.dimensions\[CSS_(WIDTH|HEIGHT)\]/g,
-        function (str, match1, match2) {
+        function(str, match1, match2) {
           return match1 + '.dimensions[DIMENSION_' + match2 + ']';
         })
-    .replace( // style.maxDimensions[CSS_WIDTH] => style.maxWidth
+    .replace(// style.maxDimensions[CSS_WIDTH] => style.maxWidth
         /(style|layout)\.maxDimensions\[CSS_(WIDTH|HEIGHT)\]/g,
-        function (str, match1, match2) {
+        function(str, match1, match2) {
           return match1 + '.max' + match2.substr(0, 1).toUpperCase() + match2.substr(1).toLowerCase();
         })
-    .replace( // style.minDimensions[CSS_WIDTH] => style.minWidth
+    .replace(// style.minDimensions[CSS_WIDTH] => style.minWidth
         /(style|layout)\.minDimensions\[CSS_(WIDTH|HEIGHT)\]/g,
-        function (str, match1, match2) {
+        function(str, match1, match2) {
           return match1 + '.min' + match2.substr(0, 1).toUpperCase() + match2.substr(1).toLowerCase();
         })
-    .replace( // style.margin[CSS_TOP] = 12.3 => style.margin[Spacing.TOP].set(12.3)
+    .replace(// style.margin[CSS_TOP] = 12.3 => style.margin[Spacing.TOP].set(12.3)
         /style\.(margin|border|padding)\[CSS_(TOP|BOTTOM|LEFT|RIGHT|START|END)\]\s+=\s+(-?[\.\d]+)/g,
-        function (str, match1, match2, match3) {
+        function(str, match1, match2, match3) {
           var propertyCap = match1.charAt(0).toUpperCase() + match1.slice(1);
           return 'set' + propertyCap + '(Spacing.' + match2 + ', ' + match3 + ')';
         })
-    .replace( // style.margin[CSS_TOP] => style.margin[Spacing.TOP]
+    .replace(// style.margin[CSS_TOP] => style.margin[Spacing.TOP]
         /style\.(margin|border|padding)\[CSS_(TOP|BOTTOM|LEFT|RIGHT|START|END)\]/g,
-        function (str, match1, match2) {
+        function(str, match1, match2) {
           return 'style.' + match1 + '.get(Spacing.' + match2 + ')';
         })
     .replace(/get_child\(.*context\,\s([^\)]+)\)/g, 'getChildAt($1)')
@@ -103,9 +103,9 @@ function __transpileSingleTestToCSharp(code) {
     .replace(/css_node_t(\s)\*/g, 'TestCSSNode$1')
     .replace(/\->/g, '.')
     .replace(/(\d+\.\d+)/g, '$1f')
-    .replace( // style.flex_direction => style.flexDirection
+    .replace(// style.flex_direction => style.flexDirection
         /style\.([^_\[\]\s]+)_(\w)(\w+)/g,
-        function (str, match1, match2, match3) {
+        function(str, match1, match2, match3) {
           return 'style.' + match1 + match2.toUpperCase() + match3;
         })
     .replace(/(\w+)\.measure\s+=\s+.+/, '$1.setMeasureFunction(sTestMeasureFunction);')
@@ -113,7 +113,7 @@ function __transpileSingleTestToCSharp(code) {
     // additional case conversions
 
     .replace(/(CSSWrap|CSSFlexDirection)\.([_A-Z]+)/g,
-        function (str, match1, match2) {
+        function(str, match1, match2) {
           return match1 + '.' + constantToPascalCase(match2);
         });
 }
@@ -129,7 +129,7 @@ function constantToPascalCase(str) {
   return str[0] + str.substr(1)
     .toLowerCase()
     .replace(/_(.)/g,
-      function (_, m) { return m.toUpperCase(); });
+      function(_, m) { return m.toUpperCase(); });
 }
 
 var CSharpTranspiler = {
@@ -168,7 +168,7 @@ var CSharpTranspiler = {
     }
     return allTestsInCSharp.join('\n\n');
   }
-}
+};
 
 if (typeof module !== 'undefined') {
   module.exports = CSharpTranspiler;

src/JavaTranspiler.js

@@ -51,7 +51,7 @@ function __transpileToJavaCommon(code) {
     .replace(/isUndefined\((.+?)\)/g, 'Float.isNaN\($1\)')
     .replace(/\/\*\(c\)!([^*]+)\*\//g, '')
     .replace(/var\/\*\(java\)!([^*]+)\*\//g, '$1')
-    .replace(/\/\*\(java\)!([^*]+)\*\//g, '$1')
+    .replace(/\/\*\(java\)!([^*]+)\*\//g, '$1');
 }
 
 function __transpileSingleTestToJava(code) {
@@ -60,35 +60,35 @@ function __transpileSingleTestToJava(code) {
     .replace(/CSS_FLEX_DIRECTION_/g, 'CSSFlexDirection.')
     .replace(/CSS_WRAP/g, 'CSSWrap.WRAP')
     .replace(/new_test_css_node/g, 'new TestCSSNode')
-    .replace( // style.position[CSS_TOP] => style.position[CSSLayout.POSITION_TOP]
+    .replace(// style.position[CSS_TOP] => style.position[CSSLayout.POSITION_TOP]
         /(style|layout)\.position\[CSS_(LEFT|TOP|RIGHT|BOTTOM)\]/g,
-        function (str, match1, match2) {
+        function(str, match1, match2) {
           return match1 + '.position[POSITION_' + match2 + ']';
         })
-    .replace( // style.dimensions[CSS_WIDTH] => style.dimensions[CSSLayout.DIMENSION_WIDTH]
+    .replace(// style.dimensions[CSS_WIDTH] => style.dimensions[CSSLayout.DIMENSION_WIDTH]
         /(style|layout)\.dimensions\[CSS_(WIDTH|HEIGHT)\]/g,
-        function (str, match1, match2) {
+        function(str, match1, match2) {
           return match1 + '.dimensions[DIMENSION_' + match2 + ']';
         })
-    .replace( // style.maxDimensions[CSS_WIDTH] => style.maxWidth
+    .replace(// style.maxDimensions[CSS_WIDTH] => style.maxWidth
         /(style|layout)\.maxDimensions\[CSS_(WIDTH|HEIGHT)\]/g,
-        function (str, match1, match2) {
+        function(str, match1, match2) {
           return match1 + '.max' + match2.substr(0, 1).toUpperCase() + match2.substr(1).toLowerCase();
         })
-    .replace( // style.minDimensions[CSS_WIDTH] => style.minWidth
+    .replace(// style.minDimensions[CSS_WIDTH] => style.minWidth
         /(style|layout)\.minDimensions\[CSS_(WIDTH|HEIGHT)\]/g,
-        function (str, match1, match2) {
+        function(str, match1, match2) {
           return match1 + '.min' + match2.substr(0, 1).toUpperCase() + match2.substr(1).toLowerCase();
         })
-    .replace( // style.margin[CSS_TOP] = 12.3 => style.margin[Spacing.TOP].set(12.3)
+    .replace(// style.margin[CSS_TOP] = 12.3 => style.margin[Spacing.TOP].set(12.3)
         /style\.(margin|border|padding)\[CSS_(TOP|BOTTOM|LEFT|RIGHT|START|END)\]\s+=\s+(-?[\.\d]+)/g,
-        function (str, match1, match2, match3) {
+        function(str, match1, match2, match3) {
           var propertyCap = match1.charAt(0).toUpperCase() + match1.slice(1);
           return 'set' + propertyCap + '(Spacing.' + match2 + ', ' + match3 + ')';
         })
-    .replace( // style.margin[CSS_TOP] => style.margin[Spacing.TOP]
+    .replace(// style.margin[CSS_TOP] => style.margin[Spacing.TOP]
         /style\.(margin|border|padding)\[CSS_(TOP|BOTTOM|LEFT|RIGHT|START|END)\]/g,
-        function (str, match1, match2) {
+        function(str, match1, match2) {
           return 'style.' + match1 + '.get(Spacing.' + match2 + ')';
         })
     .replace(/get_child\(.*context\,\s([^\)]+)\)/g, 'getChildAt($1)')
@@ -96,9 +96,9 @@ function __transpileSingleTestToJava(code) {
     .replace(/css_node_t(\s)\*/g, 'TestCSSNode$1')
     .replace(/\->/g, '.')
     .replace(/(\d+\.\d+)/g, '$1f')
-    .replace( // style.flex_direction => style.flexDirection
+    .replace(// style.flex_direction => style.flexDirection
         /style\.([^_\[\]\s]+)_(\w)(\w+)/g,
-        function (str, match1, match2, match3) {
+        function(str, match1, match2, match3) {
           return 'style.' + match1 + match2.toUpperCase() + match3;
         })
     .replace(/(\w+)\.measure\s+=\s+.+/, '$1.setMeasureFunction(sTestMeasureFunction);');

src/Layout-test-utils.js

@@ -23,13 +23,13 @@ var layoutTestUtils = (function() {
   var testMeasurePrecision = 1.0;
 
   if (typeof jasmine !== 'undefined') {
-    jasmine.matchersUtil.buildFailureMessage = function () {
+    jasmine.matchersUtil.buildFailureMessage = function() {
-      var args = Array.prototype.slice.call(arguments, 0),
+      var args = Array.prototype.slice.call(arguments, 0);
-        matcherName = args[0],
+      var matcherName = args[0];
-        isNot = args[1],
+      var isNot = args[1];
-        actual = args[2],
+      var actual = args[2];
-        expected = args.slice(3),
+      var expected = args.slice(3);
-        englishyPredicate = matcherName.replace(/[A-Z]/g, function(s) { return ' ' + s.toLowerCase(); });
+      var englishyPredicate = matcherName.replace(/[A-Z]/g, function(s) { return ' ' + s.toLowerCase(); });
 
       var pp = function(node) {
         return jasmine.pp(node)
@@ -278,8 +278,7 @@ var layoutTestUtils = (function() {
       var val = obj[key];
       if (typeof val === 'number') {
         obj[key] = Math.floor((val * testMeasurePrecision) + 0.5) / testMeasurePrecision;
-      }
+      } else if (typeof val === 'object') {
-      else if (typeof val === 'object') {
         inplaceRoundNumbersInObject(val);
       }
     }
@@ -386,7 +385,7 @@ var layoutTestUtils = (function() {
     document.body.appendChild(iframeText);
 
     var body = iframeText.contentDocument.body;
-    if (width === undefined || width !== width) {
+    if (width === undefined || isNaN(width)) {
       width = Infinity;
     }
 
@@ -490,7 +489,7 @@ var layoutTestUtils = (function() {
     reduceTest: reduceTest,
     text: function(text) {
       var fn = function(width) {
-        if (width === undefined || width !== width) {
+        if (width === undefined || isNaN(width)) {
           width = Infinity;
         }
 

src/Layout.c

@@ -989,7 +989,10 @@ static void layoutNodeImpl(css_node_t *node, float parentMaxWidth, css_direction
         // For a relative children, we're either using alignItems (parent) or
         // alignSelf (child) in order to determine the position in the cross axis
         if (child->style.position_type == CSS_POSITION_RELATIVE) {
+          /*eslint-disable */
+          // This variable is intentionally re-defined as the code is transpiled to a block scope language
           css_align_t alignItem = getAlignItem(node, child);
+          /*eslint-enable */
           if (alignItem == CSS_ALIGN_STRETCH) {
             // You can only stretch if the dimension has not already been set
             // previously.

src/Layout.js

@@ -911,7 +911,10 @@ var computeLayout = (function() {
           // For a relative children, we're either using alignItems (parent) or
           // alignSelf (child) in order to determine the position in the cross axis
           if (getPositionType(child) === CSS_POSITION_RELATIVE) {
+            /*eslint-disable */
+            // This variable is intentionally re-defined as the code is transpiled to a block scope language
             var/*css_align_t*/ alignItem = getAlignItem(node, child);
+            /*eslint-enable */
             if (alignItem === CSS_ALIGN_STRETCH) {
               // You can only stretch if the dimension has not already been set
               // previously.

src/csharp/Facebook.CSSLayout/LayoutEngine.cs

@@ -718,7 +718,10 @@ namespace Facebook.CSSLayout
             // For a relative children, we're either using alignItems (parent) or
             // alignSelf (child) in order to determine the position in the cross axis
             if (child.style.positionType == CSSPositionType.Relative) {
+              /*eslint-disable */
+              // This variable is intentionally re-defined as the code is transpiled to a block scope language
               CSSAlign alignItem = getAlignItem(node, child);
+              /*eslint-enable */
               if (alignItem == CSSAlign.Stretch) {
                 // You can only stretch if the dimension has not already been set
                 // previously.

src/css-layout.js

@@ -3,7 +3,7 @@
 //
 // This file uses the following specific UMD implementation:
 // https://github.com/umdjs/umd/blob/master/returnExports.js
-(function (root, factory) {
+(function(root, factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module.
     define([], factory);
@@ -16,11 +16,14 @@
     // Browser globals (root is window)
     root.computeLayout = factory();
   }
-}(this, function () {
+}(this, function() {
   // @@include('./Layout.js')
 
   return function(node) {
+    /*eslint-disable */
+    // disabling ESLint because this code relies on the above include
     computeLayout.fillNodes(node);
     computeLayout.computeLayout(node);
+    /*eslint-enable */
   };
 }));

src/java/src/com/facebook/csslayout/LayoutEngine.java

@@ -692,7 +692,10 @@ public class LayoutEngine {
           // For a relative children, we're either using alignItems (parent) or
           // alignSelf (child) in order to determine the position in the cross axis
           if (child.style.positionType == CSSPositionType.RELATIVE) {
+            /*eslint-disable */
+            // This variable is intentionally re-defined as the code is transpiled to a block scope language
             CSSAlign alignItem = getAlignItem(node, child);
+            /*eslint-enable */
             if (alignItem == CSSAlign.STRETCH) {
               // You can only stretch if the dimension has not already been set
               // previously.