Merge pull request #229 from chantouchsek/fix/fix-return-type-of-base-service

Fix return correct type of base service and add lint staged

Author: chantouchsek

.husky/.gitignore

@@ -0,0 +1 @@
+_

.husky/pre-commit

@@ -2,4 +2,4 @@
 . "$(dirname "$0")/_/husky.sh"
 . "$(dirname "$0")/common.sh"
 
-yarn lint && yarn test
+npx lint-staged

jest.config.ts

@@ -7,8 +7,8 @@ const config: InitialOptionsTsJest = {
     global: {
       lines: 100,
       functions: 100,
-      branches: 90,
-      statements: 99,
+      branches: 93.44,
+      statements: 99.39,
     },
   },
   testEnvironment: 'node',

package.json

@@ -12,7 +12,7 @@
     "watch": "tsc -w",
     "start": "nodemon",
     "release": "standard-version && git push --follow-tags origin main && yarn publish",
-    "prepublish": "yarn test && yarn build",
+    "prepublish": "yarn lint && yarn test && yarn build",
     "clean": "rimraf dist",
     "prepare": "husky install",
     "lint:js": "eslint --ext \".js,.ts\" --ignore-path .gitignore .",
@@ -54,18 +54,19 @@
     "@types/jest": "^27.4.0",
     "@types/node": "^17.0.7",
     "@types/qs": "^6.9.7",
-    "@typescript-eslint/eslint-plugin": "^4.33.0",
-    "@typescript-eslint/parser": "^4.31.1",
+    "@typescript-eslint/eslint-plugin": "^5.9.0",
+    "@typescript-eslint/parser": "^5.9.0",
     "@vue/test-utils": "^1.2.2",
     "axios": "^0.24.0",
     "axios-mock-adapter": "^1.20.0",
-    "eslint": "^7.32.0",
+    "eslint": "^8.6.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-import": "^2.24.2",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-promise": "^6.0.0",
     "husky": "^7.0.4",
     "jest": "^27.4.5",
+    "lint-staged": ">=10",
     "nodemon": "^2.0.12",
     "nuxt-edge": "^2.16.0-27217455.034b9901",
     "prettier": "^2.4.1",
@@ -83,5 +84,9 @@
     "camelcase-keys": "^7.0.1",
     "qs": "^6.10.2",
     "snakecase-keys": "^5.1.2"
+  },
+  "lint-staged": {
+    "*.{js,ts}": "eslint --cache",
+    "*.**": "prettier --check --ignore-unknown"
   }
 }

src/core/BaseProxy.ts

@@ -245,7 +245,7 @@ class BaseProxy {
    * Set parameters by keys
    * @param {Object} parameters
    */
-  setParameters(parameters: ParametersType): BaseProxy {
+  setParameters(parameters: ParametersType): this {
     Object.keys(parameters).forEach((key) => {
       this.parameters[key] = parameters[key]
     })
@@ -257,7 +257,7 @@ class BaseProxy {
    * @param {string} parameter
    * @param {Object|string|Array} value
    */
-  setParameter(parameter: string, value?: any): BaseProxy {
+  setParameter(parameter: string, value?: any): this {
     if (!value) {
       const options: IParseOptions = Object.assign({}, this.$parsedQs, {
         comma: true,
@@ -275,7 +275,7 @@ class BaseProxy {
    * Remove parameters by keys
    * @param {Array<Object>>} parameters
    */
-  removeParameters(parameters = [] as any[]): BaseProxy {
+  removeParameters(parameters = [] as any[]): this {
     if (!parameters.length) {
       this.parameters = []
     } else {
@@ -290,7 +290,7 @@ class BaseProxy {
    * Remove parameters
    * @param {string} parameter
    */
-  removeParameter(parameter: string): BaseProxy {
+  removeParameter(parameter: string): this {
     delete this.parameters[parameter]
     return this
   }

src/core/Validator.ts

@@ -46,7 +46,7 @@ class Validator {
     return this.get(field)[0]
   }
 
-  firstBy(obj: Record<string, any>, field?: string) {
+  firstBy(obj: Record<string, any>, field?: string): string {
     let value
     if (!field) {
       value = obj[Object.keys(obj)[0]]