Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/rules/converters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ import { convertRestrictPlusOperands } from "./converters/restrict-plus-operands
import { convertSemicolon } from "./converters/semicolon";
import { convertSpaceBeforeFunctionParen } from "./converters/space-before-function-paren";
import { convertSpaceWithinParens } from "./converters/space-within-parens";
import { convertStrictBooleanExpressions } from "./converters/strict-boolean-expressions";
import { convertSwitchDefault } from "./converters/switch-default";
import { convertTripleEquals } from "./converters/triple-equals";
import { convertTypedefWhitespace } from "./converters/typedef-whitespace";
Expand Down Expand Up @@ -242,6 +243,7 @@ export const converters = new Map([
["semicolon", convertSemicolon],
["space-before-function-paren", convertSpaceBeforeFunctionParen],
["space-within-parens", convertSpaceWithinParens],
["strict-boolean-expressions", convertStrictBooleanExpressions],
["switch-default", convertSwitchDefault],
["triple-equals", convertTripleEquals],
["type-literal-delimiter", convertTypeLiteralDelimiter],
Expand All @@ -262,10 +264,6 @@ export const converters = new Map([
// TSLint core rules:
// ["ban", convertBan], // no-restricted-properties
// ["import-blacklist", convertImportBlacklist], // no-restricted-imports
// ["no-duplicate-variable", convertNoDuplicateVariable], // no-redeclare
// ["no-void-expression", convertNoVoidExpression], // (no exact equivalent)
// ["quotemark", convertQuotemark], // quotes
// ["triple-equals", convertTripleEquals], // eqeqeq

// tslint-microsoft-contrib rules:
// ["max-func-body-length", convertMaxFuncBodyLength],
Expand Down
37 changes: 37 additions & 0 deletions src/rules/converters/strict-boolean-expressions.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import { RuleConverter } from "../converter";

export const ForbiddenOtherNonBooleanTypes =
"String, number, enum, and mixed union types are now forbidden.";

export const convertStrictBooleanExpressions: RuleConverter = tslintRule => {
const notices: string[] = [];
const ruleArguments: { [key: string]: boolean } = {};

if (tslintRule.ruleArguments.length >= 2 || tslintRule.ruleArguments[0] === true) {
notices.push(ForbiddenOtherNonBooleanTypes);
tslintRule.ruleArguments.forEach(ruleArgument => {
switch (ruleArgument) {
case "allow-undefined-union":
case "allow-boolean-or-undefined":
case "allow-null-union":
ruleArguments["allowNullable"] = true;
break;
case "ignore-rhs":
ruleArguments["ignoreRhs"] = true;
break;
default:
break;
}
});
}

return {
rules: [
{
ruleName: "@typescript-eslint/strict-boolean-expressions",
ruleArguments: Object.keys(ruleArguments).length !== 0 ? [ruleArguments] : [],
notices,
},
],
};
};
109 changes: 109 additions & 0 deletions src/rules/converters/tests/strict-boolean-expressions.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
import {
convertStrictBooleanExpressions,
ForbiddenOtherNonBooleanTypes,
} from "../strict-boolean-expressions";

describe(convertStrictBooleanExpressions, () => {
test("conversion without arguments", () => {
const result = convertStrictBooleanExpressions({
ruleArguments: [],
});

expect(result).toEqual({
rules: [
{
ruleName: "@typescript-eslint/strict-boolean-expressions",
ruleArguments: [],
notices: [],
},
],
});
});

test("conversion with true argument", () => {
const result = convertStrictBooleanExpressions({
ruleArguments: [true],
});

expect(result).toEqual({
rules: [
{
ruleName: "@typescript-eslint/strict-boolean-expressions",
ruleArguments: [],
notices: [ForbiddenOtherNonBooleanTypes],
},
],
});
});

test("conversion with allow-undefined-union argument", () => {
const result = convertStrictBooleanExpressions({
ruleArguments: [true, "allow-undefined-union"],
});

expect(result).toEqual({
rules: [
{
ruleName: "@typescript-eslint/strict-boolean-expressions",
ruleArguments: [
{
allowNullable: true,
},
],
notices: [ForbiddenOtherNonBooleanTypes],
},
],
});
});

test("conversion with ignore-rhs argument", () => {
const result = convertStrictBooleanExpressions({
ruleArguments: [true, "ignore-rhs"],
});

expect(result).toEqual({
rules: [
{
ruleName: "@typescript-eslint/strict-boolean-expressions",
ruleArguments: [
{
ignoreRhs: true,
},
],
notices: [ForbiddenOtherNonBooleanTypes],
},
],
});
});

test("conversion with all arguments", () => {
const result = convertStrictBooleanExpressions({
ruleArguments: [
true,
"allow-undefined-union",
"allow-boolean-or-undefined",
"allow-null-union",
"ignore-rhs",
"allow-string",
"allow-enum",
"allow-number",
"allow-mix",
],
});

expect(result).toEqual({
rules: [
{
ruleName: "@typescript-eslint/strict-boolean-expressions",
ruleArguments: [
{
allowNullable: true,
ignoreRhs: true,
},
],
notices: [ForbiddenOtherNonBooleanTypes],
},
],
});
});
});