diff --git a/src/custom-nodes/control-flow-flattening-nodes/control-flow-storage-nodes/CallExpressionControlFlowStorageCallNode.ts b/src/custom-nodes/control-flow-flattening-nodes/control-flow-storage-nodes/CallExpressionControlFlowStorageCallNode.ts index bde93dd2..09fbfd0a 100644 --- a/src/custom-nodes/control-flow-flattening-nodes/control-flow-storage-nodes/CallExpressionControlFlowStorageCallNode.ts +++ b/src/custom-nodes/control-flow-flattening-nodes/control-flow-storage-nodes/CallExpressionControlFlowStorageCallNode.ts @@ -2,7 +2,10 @@ import { inject, injectable, } from 'inversify'; import { ServiceIdentifiers } from '../../../container/ServiceIdentifiers'; import * as ESTree from 'estree'; + +// tslint:disable import { Expression } from 'estree'; +// tslint:enable import { TIdentifierNamesGeneratorFactory } from '../../../types/container/generators/TIdentifierNamesGeneratorFactory'; import { TStatement } from '../../../types/node/TStatement'; @@ -65,7 +68,7 @@ export class CallExpressionControlFlowStorageCallNode extends AbstractCustomNode public initialize ( controlFlowStorageName: string, controlFlowStorageKey: string, - callee: Expression, + callee: ESTree.Expression, expressionArguments: (ESTree.Expression | ESTree.SpreadElement)[] ): void { this.controlFlowStorageName = controlFlowStorageName; diff --git a/src/custom-nodes/string-array-nodes/StringArrayCallsWrapper.ts b/src/custom-nodes/string-array-nodes/StringArrayCallsWrapper.ts index 7e460253..f549528e 100644 --- a/src/custom-nodes/string-array-nodes/StringArrayCallsWrapper.ts +++ b/src/custom-nodes/string-array-nodes/StringArrayCallsWrapper.ts @@ -153,8 +153,6 @@ export class StringArrayCallsWrapper extends AbstractCustomNode { stringArrayCallsWrapperName: this.stringArrayCallsWrapperName } ); - - break; } return decodeStringArrayTemplate; diff --git a/src/declarations/ESTree.d.ts b/src/declarations/ESTree.d.ts index 4bdbd656..44fe24f8 100644 --- a/src/declarations/ESTree.d.ts +++ b/src/declarations/ESTree.d.ts @@ -1,7 +1,6 @@ /* tslint:disable:interface-name */ import * as escodegen from 'escodegen-wallaby'; -import * as ESTree from 'estree'; declare module 'estree' { export interface BaseNodeMetadata { diff --git a/src/node-transformers/converting-transformers/TemplateLiteralTransformer.ts b/src/node-transformers/converting-transformers/TemplateLiteralTransformer.ts index 36eb8084..d91dbc93 100644 --- a/src/node-transformers/converting-transformers/TemplateLiteralTransformer.ts +++ b/src/node-transformers/converting-transformers/TemplateLiteralTransformer.ts @@ -101,7 +101,7 @@ export class TemplateLiteralTransformer extends AbstractNodeTransformer { ); nodes.forEach((node: ESTree.Literal | ESTree.Expression) => { - root = NodeFactory.binaryExpressionNode('+', root, node); + root = NodeFactory.binaryExpressionNode('+', root, node); }); return root; diff --git a/tslint.json b/tslint.json index 95e5e763..c199a392 100644 --- a/tslint.json +++ b/tslint.json @@ -53,12 +53,13 @@ "always-prefix" ], "interface-over-type-literal": true, + "import-name": false, "import-spacing": true, "jsdoc-format": true, "label-position": true, "max-classes-per-file": [true, 1], "max-func-body-length": [true, 200], - "max-line-length": [true, 150], + "max-line-length": false, "member-access": [true], "member-ordering": [ true, @@ -101,6 +102,7 @@ "no-ex-assign": true, "no-extra-boolean-cast": true, "no-extra-semi": true, + "no-import-side-effect": false, "no-inferrable-types": false, "no-inner-declarations": [true, "both"], "no-implicit-dependencies": false, @@ -142,6 +144,7 @@ "no-useless-files": true, "no-var-keyword": true, "no-var-requires": true, + "non-literal-require": false, "max-file-line-count": [true, 500], "object-curly-spacing": [true, "always"], "object-literal-sort-keys": false,