Fixed .length errors in formatMissingRules (#70)

* Fixed .length errors in formatMissingRules

Two problems:\n* It's `rulesDirectory`, not `ruleDirectories`...

`tslint.json` rule values that didn't provide `ruleArguments` weren't being given `[]` as defaults when being parsed. Added a unit test for this.

Fixes #69. _Nice._

* Fixed import order in convertRules.ts

I should automate this eventually...

Author: Josh Goldberg

src/conversion/convertConfig.test.ts

@@ -14,7 +14,7 @@ const createStubDependencies = (
 const createStubOriginalConfigurationsData = () => ({
     tslint: {
         rules: [],
-        ruleDirectories: [],
+        rulesDirectory: [],
     },
 });
 

src/creation/formatConvertedRules.test.ts

@@ -2,7 +2,7 @@ import { createEmptyConversionResults } from "../conversion/conversionResults.st
 import { formatConvertedRules } from "./formatConvertedRules";
 
 const originalConfiguration = {
-    ruleDirectories: [],
+    rulesDirectory: [],
     rules: {},
 };
 

src/creation/formatConvertedRules.ts

@@ -19,7 +19,7 @@ export const formatConvertedRules = (
     if (conversionResults.missing.length !== 0) {
         output["@typescript-eslint/tslint/config"] = formatMissingRules(
             conversionResults.missing,
-            tslintConfiguration.ruleDirectories,
+            tslintConfiguration.rulesDirectory,
         );
     }
 

src/creation/formatMissingRules.test.ts

@@ -111,7 +111,7 @@ describe("formatMissingRules", () => {
 
     it("includes rule directories when there are rule directories", () => {
         // Arrange
-        const ruleDirectories = ["./path/to/rules"];
+        const rulesDirectory = ["./path/to/rules"];
         const missing: TSLintRuleOptions[] = [
             {
                 ruleArguments: [],
@@ -121,13 +121,13 @@ describe("formatMissingRules", () => {
         ];
 
         // Act
-        const output = formatMissingRules(missing, ruleDirectories);
+        const output = formatMissingRules(missing, rulesDirectory);
 
         // Assert
         expect(output).toEqual([
             "error",
             {
-                ruleDirectories,
+                rulesDirectory,
                 rules: {
                     "tslint-rule-a": true,
                 },

src/creation/formatMissingRules.ts

@@ -1,6 +1,6 @@
 import { TSLintRuleOptions } from "../rules/types";
 
-export const formatMissingRules = (missing: TSLintRuleOptions[], ruleDirectories: string[]) => {
+export const formatMissingRules = (missing: TSLintRuleOptions[], rulesDirectory: string[]) => {
     const rules: { [i: string]: unknown } = {};
 
     for (const rule of missing.sort((a, b) => a.ruleName.localeCompare(b.ruleName))) {
@@ -12,7 +12,7 @@ export const formatMissingRules = (missing: TSLintRuleOptions[], ruleDirectories
     return [
         "error",
         {
-            ...(ruleDirectories.length !== 0 && { ruleDirectories }),
+            ...(rulesDirectory.length !== 0 && { rulesDirectory }),
             rules,
         },
     ];

src/creation/writeConversionResults.test.ts

@@ -3,7 +3,7 @@ import { writeConversionResults } from "./writeConversionResults";
 
 const originalConfigurations = {
     tslint: {
-        ruleDirectories: [],
+        rulesDirectory: [],
         rules: {},
     },
 };

src/input/findOriginalConfigurations.test.ts

@@ -20,7 +20,7 @@ const createDependencies = (overrides: Partial<FindOriginalConfigurationsDepende
         devDependencies: {},
     }),
     findTSLintConfiguration: async () => ({
-        ruleDirectories: [],
+        rulesDirectory: [],
         rules: {},
     }),
     findTypeScriptConfiguration: async () => ({
@@ -64,7 +64,7 @@ describe("findOriginalConfigurations", () => {
         expect(result).toEqual({
             data: {
                 tslint: {
-                    ruleDirectories: [],
+                    rulesDirectory: [],
                     rules: {},
                 },
             },
@@ -91,7 +91,7 @@ describe("findOriginalConfigurations", () => {
                     devDependencies: {},
                 },
                 tslint: {
-                    ruleDirectories: [],
+                    rulesDirectory: [],
                     rules: {},
                 },
                 typescript: {

src/input/findTSLintConfiguration.ts

@@ -2,7 +2,7 @@ import { Exec } from "../adapters/exec";
 import { findConfiguration } from "./findConfiguration";
 
 export type TSLintConfiguration = {
-    ruleDirectories: string[];
+    rulesDirectory: string[];
     rules: TSLintConfigurationRules;
 };
 
@@ -11,7 +11,7 @@ export type TSLintConfigurationRules = {
 };
 
 const defaultTSLintConfiguration = {
-    ruleDirectories: [],
+    rulesDirectory: [],
     rules: {},
 };
 

src/input/findTslintConfiguration.test.ts

@@ -53,7 +53,7 @@ describe("findTSLintConfiguration", () => {
 
         // Assert
         expect(result).toEqual({
-            ruleDirectories: [],
+            rulesDirectory: [],
             rules: {},
         });
     });

src/rules/convertRules.ts

@@ -1,10 +1,11 @@
 import { TSLintConfigurationRules } from "../input/findTSLintConfiguration";
 import { ConversionError } from "./conversionError";
+import { RuleConverter } from "./converter";
 import { convertRule } from "./convertRule";
 import { convertRuleSeverity } from "./convertRuleSeverity";
-import { TSLintRuleOptions, ESLintRuleOptions } from "./types";
-import { RuleConverter } from "./converter";
+import { formatRawTslintRule } from "./formatRawTslintRule";
 import { RuleMerger } from "./merger";
+import { TSLintRuleOptions, ESLintRuleOptions } from "./types";
 
 export type ConvertRulesDependencies = {
     converters: Map<string, RuleConverter>;
@@ -28,11 +29,9 @@ export const convertRules = (
     const packages = new Set<string>();
 
     for (const [ruleName, value] of Object.entries(rawTslintRules)) {
-        const tslintRule = {
-            ruleName,
-            ...value,
-        };
+        const tslintRule = formatRawTslintRule(ruleName, value);
         const conversion = convertRule(tslintRule, dependencies.converters);
+
         if (conversion === undefined) {
             if (tslintRule.ruleSeverity !== "off") {
                 missing.push(tslintRule);