Merge pull request #10 from highcharts/v1.0.6

v1.0.6

lib/rules/no-highcharts-namespace.js

@@ -0,0 +1,66 @@
+/*
+ * @fileoverview The global Highcharts namespace should not be used, as it makes
+ * type modifications difficult. Instead write declarations in `.d.ts` files
+ * and make use of `declare module...` in `.ts` files for further extension.
+ */
+'use strict';
+
+const message = 'Do not use the global Highcharts namespace for declarations.';
+
+//------------------------------------------------------------------------------
+// Rule Definition
+//------------------------------------------------------------------------------
+
+module.exports = {
+    meta: {
+        docs: {
+            description: message,
+            category: 'Migration',
+            recommended: false
+        },
+        fixable: null,  // or "code" or "whitespace"
+        schema: [
+            // fill in your schema
+        ]
+    },
+
+    create: function (context) {
+
+        // variables should be defined here
+        const code = context.getSourceCode().lines.join('\n');
+
+        //----------------------------------------------------------------------
+        // Helpers
+        //----------------------------------------------------------------------
+        const program = (node) => {
+
+            const regex = /namespace (Highcharts)/g;
+
+            let match;
+
+            while (match = regex.exec(code)) {
+                const codeBefore = code.substr(0, regex.lastIndex - match[1].length);
+                const linesBefore = codeBefore.split('\n');
+                const line = linesBefore[linesBefore.length - 1];
+
+                context.report({
+                    node: node,
+                    loc: {
+                        line: linesBefore.length,
+                        column: line.length
+                    },
+                    message: message
+                });
+            }
+        };
+
+        //----------------------------------------------------------------------
+        // Public
+        //----------------------------------------------------------------------
+        return {
+
+            Program: program
+
+        };
+    }
+};

lib/rules/no-highcharts-object.js

@@ -1,11 +1,11 @@
 /*
  * @fileoverview The global Highcharts object should not be used, as it breaks
- * in module mode. Instead make use of import of the Globals file as an H
+ * in module mode. Instead make use of import of the `Core/Globals` file as an H
  * object.
  */
 'use strict';
 
-const message = 'Do not use global Highcharts object to access utility functions.';
+const message = 'Do not use the global Highcharts object to access utility functions.';
 
 //------------------------------------------------------------------------------
 // Rule Definition
@@ -34,37 +34,34 @@ module.exports = {
         //----------------------------------------------------------------------
         const program = (node) => {
 
-            const regex1 = /import Highcharts from/;
-
-            if (regex1.test(code)) {
+            if (/import Highcharts from/.test(code)) {
                 return;
             }
 
-            const regex2 = /Highcharts\.(?:[a-z])/g;
-            const regex3 = /^\s+(?:\/\/|\/\*|\*)/;
-            const regex4 = /\: |as |[\|\<'"]$/;
+            const regex = /Highcharts\.[a-z]/g;
+
+            let match;
 
-            while (regex2.exec(code, regex2.lastIndex)) {
+            while (match = regex.exec(code)) {
 
-                const codeBefore = code.substr(0, regex2.lastIndex - 12);
+                const codeBefore = code.substr(0, regex.lastIndex - match[0].length);
                 const linesBefore = codeBefore.split('\n');
                 const line = linesBefore[linesBefore.length - 1];
 
                 if (
-                    regex3.test(line) ||
-                    regex4.test(line)
+                    (line.match(/['"]/g) || []).length % 2 === 1 ||
+                    /^\s*(?:\/\/|\/\*|\*)/.test(line) ||
+                    /\: |as |[\|\<'"]$/.test(line)
                 ) {
                     continue;
                 }
 
-                const loc = {
-                    line: linesBefore.length,
-                    column: line.length
-                };
-
                 context.report({
                     node: node,
-                    loc: loc,
+                    loc: {
+                        line: linesBefore.length,
+                        column: line.length
+                    },
                     message: message
                 });
             }

lib/rules/no-mixin.js

@@ -0,0 +1,64 @@
+/*
+ * @fileoverview Create and use events instead of mixins modifications.
+ */
+'use strict';
+
+const message = 'Do not use mixins.';
+
+//------------------------------------------------------------------------------
+// Rule Definition
+//------------------------------------------------------------------------------
+
+module.exports = {
+    meta: {
+        docs: {
+            description: message,
+            category: 'Migration',
+            recommended: false
+        },
+        fixable: null,  // or "code" or "whitespace"
+        schema: [
+            // fill in your schema
+        ]
+    },
+
+    create: function (context) {
+
+        // variables should be defined here
+        const code = context.getSourceCode().lines.join('\n');
+
+        //----------------------------------------------------------------------
+        // Helpers
+        //----------------------------------------------------------------------
+        const program = (node) => {
+
+            const regex = /(?:import|from)\s+\'[^']*\/(Mixins\/)/g;
+
+            let match;
+
+            while (match = regex.exec(code)) {
+                const codeBefore = code.substr(0, regex.lastIndex - match[1].length);
+                const linesBefore = codeBefore.split('\n');
+                const line = linesBefore[linesBefore.length - 1];
+
+                context.report({
+                    node: node,
+                    loc: {
+                        line: linesBefore.length,
+                        column: line.length
+                    },
+                    message: message
+                });
+            }
+        };
+
+        //----------------------------------------------------------------------
+        // Public
+        //----------------------------------------------------------------------
+        return {
+
+            Program: program
+
+        };
+    }
+};

lib/rules/no-optional-chaining.js

@@ -35,9 +35,10 @@ module.exports = {
         const program = (node) => {
 
             const pattern = /\?\.[\w\[\(]/g;
-            const match = pattern.exec(code);
 
-            if (match) {
+            let match;
+
+            while (match = pattern.exec(code)) {
                 const codeBefore = code.substr(0, pattern.lastIndex - match[0].length);
                 const linesBefore = codeBefore.split('\n');
                 const line = linesBefore[linesBefore.length - 1];

lib/rules/no-wrap.js

@@ -0,0 +1,64 @@
+/*
+ * @fileoverview Create and use events instead of wrap modifications.
+ */
+'use strict';
+
+const message = 'Do not use wrap.';
+
+//------------------------------------------------------------------------------
+// Rule Definition
+//------------------------------------------------------------------------------
+
+module.exports = {
+    meta: {
+        docs: {
+            description: message,
+            category: 'Migration',
+            recommended: false
+        },
+        fixable: null,  // or "code" or "whitespace"
+        schema: [
+            // fill in your schema
+        ]
+    },
+
+    create: function (context) {
+
+        // variables should be defined here
+        const code = context.getSourceCode().lines.join('\n');
+
+        //----------------------------------------------------------------------
+        // Helpers
+        //----------------------------------------------------------------------
+        const program = (node) => {
+
+            const regex = /(?:^|\s)(wrap\s*\()/g;
+
+            let match;
+
+            while (match = regex.exec(code)) {
+                const codeBefore = code.substr(0, regex.lastIndex - match[1].length);
+                const linesBefore = codeBefore.split('\n');
+                const line = linesBefore[linesBefore.length - 1];
+
+                context.report({
+                    node: node,
+                    loc: {
+                        line: linesBefore.length,
+                        column: line.length
+                    },
+                    message: message
+                });
+            }
+        };
+
+        //----------------------------------------------------------------------
+        // Public
+        //----------------------------------------------------------------------
+        return {
+
+            Program: program
+
+        };
+    }
+};