fix lint issues

Author: zebzhao

package.json

@@ -1,19 +1,20 @@
 {
+  "name": "angular2-query-builder",
   "version": "0.4.2",
   "description": "A modernized Angular 2+ query builder based on jquery QueryBuilder",
-  "main": "./dist/index.umd.js",
-  "module": "./dist/index.js",
-  "typings": "./dist/index.d.ts",
+  "main": "./dist/angular2-query-builder/bundles/angular2-query-builder.umd.js",
+  "module": "./dist/angular2-query-builder/esm5/angular2-query-builder.js",
+  "typings": "./dist/angular2-query-builder.d.ts",
   "license": "MIT",
   "private": false,
   "keywords": [
     "angular",
-    "angular2",
+    "angular8",
     "query",
     "builder",
     "jquery",
     "querybuilder",
-    "ng"
+    "visual"
   ],
   "author": {
     "name": "Zeb Zhao",
@@ -32,7 +33,7 @@
     "start": "ng serve",
     "build": "ng build angular2-query-builder",
     "build:watch": "ng build angular2-query-builder --watch=true",
-    "test": "ng test",
+    "test": "ng test --watch=false",
     "lint": "ng lint",
     "e2e": "ng e2e",
     "ngcompile": "npm run build",

projects/angular2-query-builder/src/lib/query-builder/query-builder.component.ts

@@ -552,36 +552,6 @@ export class QueryBuilderComponent implements OnInit, OnChanges, ControlValueAcc
     this.handleDataChange();
   }
 
-  private calculateFieldChangeValue(
-    currentField: Field,
-    nextField: Field,
-    currentValue: any
-  ): any {
-
-    if (this.config.calculateFieldChangeValue != null) {
-      return this.config.calculateFieldChangeValue(
-        currentField, nextField, currentValue);
-    }
-
-    const canKeepValue = () => {
-      if (currentField == null || nextField == null) {
-        return false;
-      }
-      return currentField.type === nextField.type
-        && this.defaultPersistValueTypes.indexOf(currentField.type) !== -1;
-    };
-
-    if (this.persistValueOnFieldChange && canKeepValue()) {
-      return currentValue;
-    }
-
-    if (nextField && nextField.defaultValue !== undefined) {
-      return this.getDefaultValue(nextField.defaultValue);
-    }
-
-    return undefined;
-  }
-
   changeEntity(entityValue: string, rule: Rule, index: number, data: RuleSet): void {
     if (this.disabled) {
       return;
@@ -759,6 +729,36 @@ export class QueryBuilderComponent implements OnInit, OnChanges, ControlValueAcc
     return this.inputContextCache.get(rule);
   }
 
+  private calculateFieldChangeValue(
+    currentField: Field,
+    nextField: Field,
+    currentValue: any
+  ): any {
+
+    if (this.config.calculateFieldChangeValue != null) {
+      return this.config.calculateFieldChangeValue(
+        currentField, nextField, currentValue);
+    }
+
+    const canKeepValue = () => {
+      if (currentField == null || nextField == null) {
+        return false;
+      }
+      return currentField.type === nextField.type
+        && this.defaultPersistValueTypes.indexOf(currentField.type) !== -1;
+    };
+
+    if (this.persistValueOnFieldChange && canKeepValue()) {
+      return currentValue;
+    }
+
+    if (nextField && nextField.defaultValue !== undefined) {
+      return this.getDefaultValue(nextField.defaultValue);
+    }
+
+    return undefined;
+  }
+
   private checkEmptyRuleInRuleset(ruleset: RuleSet): boolean {
     if (!ruleset || !ruleset.rules || ruleset.rules.length === 0) {
       return true;

tslint.json

@@ -5,11 +5,9 @@
     "component-class-suffix": true,
     "directive-class-suffix": true,
     "interface-name": false,
-    "invoke-injectable": true,
     "max-line-length": [true, 160],
     "no-access-missing-member": false,
     "member-access": false,
-    "no-attribute-parameter-decorator": true,
     "no-console": [true, "time", "timeEnd", "trace"],
     "no-forward-ref": false,
     "no-input-rename": true,
@@ -19,12 +17,8 @@
     "object-literal-shorthand": false,
     "object-literal-sort-keys": false,
     "ordered-imports": false,
-    "pipe-naming": [true, "camelCase", "my"],
     "quotemark": [true, "single", "avoid-escape"],
     "trailing-comma": [false, {"multiline": "always", "singleline": "never"}],
-    "use-host-property-decorator": true,
-    "use-input-property-decorator": true,
-    "use-output-property-decorator": true,
     "use-pipe-transform-interface": true,
     "variable-name": [true, "allow-leading-underscore", "ban-keywords", "check-format"]
   }