Updated packages to lint for optional chaining (#300)

Josh Goldberg · web-flow · commit 428b2f94a06a · 2019-12-22T18:18:05.000-05:00
* Updated all packages to latest

* Brought in optional chaining and such
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -26,8 +26,11 @@ module.exports = {
         "@typescript-eslint/no-parameter-properties": "off",
         "@typescript-eslint/no-type-alias": "off",
         "@typescript-eslint/no-unnecessary-condition": "off",
+        "@typescript-eslint/no-untyped-public-signature": "off",
         "@typescript-eslint/no-use-before-define": "off",
         "@typescript-eslint/require-await": "off",
+        "@typescript-eslint/restrict-template-expressions": "off",
+        "@typescript-eslint/return-await": "off",
         "@typescript-eslint/strict-boolean-expressions": "off",
         "@typescript-eslint/typedef": "off",
         "no-else-return": "error",
diff --git a/babel.config.js b/babel.config.js
@@ -1,3 +1,7 @@
 module.exports = {
     presets: [["@babel/preset-env", { targets: { node: "current" } }], "@babel/preset-typescript"],
+    plugins: [
+        "@babel/plugin-proposal-nullish-coalescing-operator",
+        "@babel/plugin-proposal-optional-chaining",
+    ],
 };
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -11,22 +11,24 @@
         "commander": "4.0.1",
         "strip-json-comments": "^3.0.1",
         "tslint": "5.20.1",
-        "typescript": "3.7.2"
+        "typescript": "3.7.4"
     },
     "devDependencies": {
-        "@babel/core": "7.7.2",
-        "@babel/preset-env": "7.7.1",
-        "@babel/preset-typescript": "7.7.2",
-        "@types/jest": "24.0.23",
-        "@types/node": "12.12.7",
-        "@typescript-eslint/eslint-plugin": "2.7.0",
-        "@typescript-eslint/parser": "2.7.0",
+        "@babel/core": "7.7.7",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.7.4",
+        "@babel/plugin-proposal-optional-chaining": "^7.7.5",
+        "@babel/preset-env": "7.7.7",
+        "@babel/preset-typescript": "7.7.7",
+        "@types/jest": "24.0.24",
+        "@types/node": "12.12.21",
+        "@typescript-eslint/eslint-plugin": "2.12.0",
+        "@typescript-eslint/parser": "2.12.0",
         "babel-jest": "24.9.0",
-        "eslint": "6.6.0",
-        "eslint-config-prettier": "6.5.0",
-        "husky": "3.0.9",
+        "eslint": "6.8.0",
+        "eslint-config-prettier": "6.7.0",
+        "husky": "3.1.0",
         "jest": "24.9.0",
-        "lint-staged": "9.4.3",
+        "lint-staged": "9.5.0",
         "prettier": "1.19.1",
         "strip-ansi": "6.0.0"
     },
diff --git a/src/creation/writeConversionResults.ts b/src/creation/writeConversionResults.ts
@@ -23,7 +23,7 @@ export const writeConversionResults = async (
     }
 
     const output = {
-        ...(eslint && eslint.full),
+        ...eslint?.full,
         env: createEnv(originalConfigurations),
         ...(eslint && { globals: eslint.raw.globals }),
         parser: "@typescript-eslint/parser",
@@ -33,7 +33,7 @@ export const writeConversionResults = async (
         },
         plugins,
         rules: {
-            ...(eslint && eslint.full.rules),
+            ...eslint?.full.rules,
             ...formatConvertedRules(ruleConversionResults, tslint.full),
         },
     };
diff --git a/src/input/findESLintConfiguration.ts b/src/input/findESLintConfiguration.ts
@@ -41,7 +41,7 @@ export const findESLintConfiguration = async (
     dependencies: FindESLintConfigurationDependencies,
     rawSettings: Pick<TSLintToESLintSettings, "config" | "eslint">,
 ): Promise<OriginalConfigurations<ESLintConfiguration> | Error> => {
-    const filePath = rawSettings.eslint || rawSettings.config;
+    const filePath = rawSettings.eslint ?? rawSettings.config;
     const [rawConfiguration, reportedConfiguration] = await Promise.all([
         findRawConfiguration<ESLintConfiguration>(dependencies.importer, filePath, {
             extends: [],
diff --git a/src/input/findEditorConfiguration.ts b/src/input/findEditorConfiguration.ts
@@ -13,7 +13,7 @@ export const findEditorConfiguration = async (
     dependencies: FindEditorConfigurationDependencies,
     config: string | undefined,
 ): Promise<DeepPartial<EditorConfiguration> | Error> => {
-    const filePath = config || DEFAULT_VSCODE_SETTINGS_PATH;
+    const filePath = config ?? DEFAULT_VSCODE_SETTINGS_PATH;
     const rawConfiguration = await findRawConfiguration<DeepPartial<EditorConfiguration>>(
         dependencies.importer,
         filePath,
diff --git a/src/input/findPackagesConfiguration.ts b/src/input/findPackagesConfiguration.ts
@@ -24,7 +24,7 @@ export const findPackagesConfiguration = async (
     const rawConfiguration = await findReportedConfiguration<PackagesConfiguration>(
         dependencies.exec,
         "cat",
-        config || "./package.json",
+        config ?? "./package.json",
     );
 
     return rawConfiguration instanceof Error
diff --git a/src/input/findTSLintConfiguration.ts b/src/input/findTSLintConfiguration.ts
@@ -22,13 +22,13 @@ export const findTSLintConfiguration = async (
     dependencies: FindTSLintConfigurationDependencies,
     config: string | undefined,
 ) => {
-    const filePath = config || "./tslint.json";
+    const filePath = config ?? "./tslint.json";
     const [rawConfiguration, reportedConfiguration] = await Promise.all([
         findRawConfiguration<Partial<TSLintConfiguration>>(dependencies.importer, filePath),
         findReportedConfiguration<TSLintConfiguration>(
             dependencies.exec,
             "tslint --print-config",
-            config || "./tslint.json",
+            filePath,
         ),
     ]);
 
diff --git a/src/input/findTypeScriptConfiguration.ts b/src/input/findTypeScriptConfiguration.ts
@@ -23,7 +23,7 @@ export const findTypeScriptConfiguration = async (
     const rawConfiguration = await findReportedConfiguration<TypeScriptConfiguration>(
         dependencies.exec,
         "tsc --showConfig -p",
-        config || "./tsconfig.json",
+        config ?? "./tsconfig.json",
     );
 
     return rawConfiguration instanceof Error
diff --git a/src/rules/convertRules.ts b/src/rules/convertRules.ts
@@ -62,8 +62,8 @@ export const convertRules = (
             if (merger === undefined) {
                 failed.push(ConversionError.forMerger(changes.ruleName));
             } else {
-                const existingNotices = existingConversion.notices || [];
-                const newNotices = newConversion.notices || [];
+                const existingNotices = existingConversion.notices ?? [];
+                const newNotices = newConversion.notices ?? [];
 
                 converted.set(changes.ruleName, {
                     ...existingConversion,
diff --git a/src/rules/converters/trailing-comma.ts b/src/rules/converters/trailing-comma.ts
@@ -16,7 +16,7 @@ export const convertTrailingComma: RuleConverter = tslintRule => {
             {
                 ruleName: "comma-dangle",
                 ...(eslintArgs && { ruleArguments: [eslintArgs] }),
-                ...(notices && notices.length && { notices }),
+                ...(notices?.length && { notices }),
             },
         ],
     };
@@ -71,7 +71,7 @@ function collectKeys(
     multiline: TSLintObject | undefined,
 ): { [key: string]: ESLintStringValue } {
     const hasSingleline = Boolean(singleline);
-    const hasSinglelineAndFieldExist = Boolean(singleline && singleline[key]);
+    const hasSinglelineAndFieldExist = Boolean(singleline?.[key]);
     const hasSinglelineAlways = Boolean(singleline && singleline[key] === "always");
     const hasMultilineAlways = Boolean(multiline && multiline[key] === "always");
 
diff --git a/src/rules/mergers/ban-types.ts b/src/rules/mergers/ban-types.ts
@@ -9,8 +9,8 @@ export const mergeBanTypes: RuleMerger = (existingOptions, newOptions) => {
     return [
         {
             types: {
-                ...(existingOptions && existingOptions[0].types),
-                ...(newOptions && newOptions[0].types),
+                ...existingOptions?.[0].types,
+                ...newOptions?.[0].types,
             },
         },
     ];
diff --git a/src/rules/mergers/member-delimiter-style.ts b/src/rules/mergers/member-delimiter-style.ts
@@ -5,7 +5,7 @@ export const mergeNoMemberDelimiterStyle: RuleMerger = (existingOptions, newOpti
         return [];
     }
 
-    return [merge((existingOptions || [])[0] || {}, (newOptions || [])[0] || {})];
+    return [merge((existingOptions ?? [])[0] ?? {}, (newOptions ?? [])[0] ?? {})];
 };
 
 const merge = (...objs: Record<string, any>[]) =>
diff --git a/tsconfig.json b/tsconfig.json
@@ -21,5 +21,6 @@
         "strictPropertyInitialization": true,
         "target": "es2015"
     },
-    "exclude": ["test/tests/**/*"]
+    "exclude": ["test/tests/**/*"],
+    "include": ["src/**/*"]
 }
