Managed adapter lint fixes (#366)

* lint fixes

* enable husky

Author: Idokah

.eslintrc.json

@@ -61,7 +61,8 @@
             "@typescript-eslint/no-unused-vars": [ "error", { "ignoreRestSiblings": true, "argsIgnorePattern": "^_" } ],
             "@typescript-eslint/no-explicit-any": "off",
             "@typescript-eslint/ban-ts-comment": "warn",
-            "eol-last": [ "error", "always" ]
+            "eol-last": [ "error", "always" ], 
+            "@typescript-eslint/no-empty-interface": "off"
           }
         }
       ]

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-#npx lint-staged --allow-empty
+npx lint-staged --allow-empty

apps/velo-external-db/test/drivers/data_api_rest_test_support.ts

@@ -1,10 +1,9 @@
 import { Item } from '@wix-velo/velo-external-db-types'
-import { Options, QueryRequest, QueryV2 } from 'libs/velo-external-db-core/src/spi-model/data_source'
 
 const axios = require('axios').create({
     baseURL: 'http://localhost:8080'
 })
 
 export const givenItems = async(items: Item[], collectionName: string, auth: any) => await axios.post('/data/insert/bulk', { collectionName: collectionName, items: items }, auth)
 
-export const expectAllDataIn = async(collectionName: string, auth: any) => (await axios.post('/data/find', { collectionName: collectionName, filter: '', sort: '', skip: 0, limit: 25 }, auth)).data
+export const expectAllDataIn = async(collectionName: string, auth: any) => (await axios.post('/data/find', { collectionName: collectionName, filter: '', sort: '', skip: 0, limit: 25 }, auth)).data

apps/velo-external-db/test/e2e/app_auth.e2e.spec.ts

@@ -1,6 +1,5 @@
 import { Uninitialized, gen } from '@wix-velo/test-commons'
-import { authVisitor, authOwnerWithoutJwt, errorResponseWith } from '@wix-velo/external-db-testkit'
-import each from 'jest-each'
+import { authOwnerWithoutJwt, errorResponseWith } from '@wix-velo/external-db-testkit'
 import { initApp, teardownApp, dbTeardown, setupDb, currentDbImplementationName } from '../resources/e2e_resources'
 
 

apps/velo-external-db/test/e2e/app_data.e2e.spec.ts

@@ -1,16 +1,17 @@
 import { Uninitialized, gen as genCommon } from '@wix-velo/test-commons'
 import { SchemaOperations } from '@wix-velo/velo-external-db-types'
+import { dataSpi } from '@wix-velo/velo-external-db-core'
 const { UpdateImmediately, DeleteImmediately, Truncate, Aggregate, FindWithSort, Projection } = SchemaOperations
 import { testIfSupportedOperationsIncludes } from '@wix-velo/test-commons'
 import * as gen from '../gen'
 import * as schema from '../drivers/schema_api_rest_test_support'
-import * as data from '../drivers/data_api_rest_test_support'
 import * as matchers from '../drivers/schema_api_rest_matchers'
 import { authAdmin, authOwner, authVisitor } from '@wix-velo/external-db-testkit'
 import * as authorization from '../drivers/authorization_test_support'
 import Chance = require('chance')
 import { initApp, teardownApp, dbTeardown, setupDb, currentDbImplementationName, supportedOperations } from '../resources/e2e_resources'
-import { Options, QueryRequest, QueryV2, CountRequest, QueryResponsePart, UpdateRequest, TruncateRequest, RemoveRequest, RemoveResponsePart, InsertRequest, Group } from 'libs/velo-external-db-core/src/spi-model/data_source'
+
+
 import axios from 'axios'
 import { streamToArray } from '@wix-velo/test-commons'
 
@@ -33,29 +34,29 @@ const queryRequest = (collectionName, sort, fields, filter?: any) => ({
             offset: 0,
         },
         cursorPaging: null
-    } as QueryV2,
+    } as dataSpi.QueryV2,
     includeReferencedItems: [],
     options: {
         consistentRead: false,
         appOptions: {},
-    } as Options,
+    } as dataSpi.Options,
     omitTotalCount: false
-} as QueryRequest)
+} as dataSpi.QueryRequest)
 
 
 
 const queryCollectionAsArray = (collectionName, sort, fields, filter?: any) => axiosInstance.post('/data/query', 
             queryRequest(collectionName, sort, fields, filter), 
-            {responseType: 'stream', transformRequest: authVisitor.transformRequest}).then(response => streamToArray(response.data))
+            { responseType: 'stream', transformRequest: authVisitor.transformRequest }).then(response => streamToArray(response.data))
 
 const countRequest = (collectionName) => ({
     collectionId: collectionName,
     filter: '',
     options: {
         consistentRead: false,
         appOptions: {},
-    } as Options,
-}) as CountRequest  
+    } as dataSpi.Options,
+}) as dataSpi.CountRequest  
 
 const updateRequest = (collectionName, items) => ({
     // collection name
@@ -67,8 +68,8 @@ const updateRequest = (collectionName, items) => ({
    options: {
         consistentRead: false,
         appOptions: {},
-    } as Options,
-}) as UpdateRequest
+    } as dataSpi.Options,
+}) as dataSpi.UpdateRequest
 
 const insertRequest = (collectionName, items, overwriteExisting) => ({
     collectionId: collectionName,
@@ -77,13 +78,13 @@ const insertRequest = (collectionName, items, overwriteExisting) => ({
     options: {
         consistentRead: false,
         appOptions: {},
-    } as Options,
-} as InsertRequest)
+    } as dataSpi.Options,
+} as dataSpi.InsertRequest)
 
-const givenItems = async (items, collectionName, auth) => 
-    axiosInstance.post('/data/insert', insertRequest(collectionName, items, false),  {responseType: 'stream', transformRequest: auth.transformRequest})
+const givenItems = async(items, collectionName, auth) => 
+    axiosInstance.post('/data/insert', insertRequest(collectionName, items, false),  { responseType: 'stream', transformRequest: auth.transformRequest })
 
-const pagingMetadata = (total, count) => ({pagingMetadata: {count: count, offset:0, total: total, tooManyToCount: false}} as QueryResponsePart)
+const pagingMetadata = (total, count) => ({ pagingMetadata: { count: count, offset: 0, total: total, tooManyToCount: false } } as dataSpi.QueryResponsePart)
 
 describe(`Velo External DB Data REST API: ${currentDbImplementationName()}`,  () => {
     beforeAll(async() => {
@@ -100,7 +101,7 @@ describe(`Velo External DB Data REST API: ${currentDbImplementationName()}`,  ()
         await givenItems([ctx.item, ctx.anotherItem], ctx.collectionName, authAdmin)
         await authorization.givenCollectionWithVisitorReadPolicy(ctx.collectionName)
 
-        const itemsByOrder = [ctx.item, ctx.anotherItem].sort((a,b) => (a[ctx.column.name] > b[ctx.column.name]) ? 1 : -1).map(item => ({item}))
+        const itemsByOrder = [ctx.item, ctx.anotherItem].sort((a, b) => (a[ctx.column.name] > b[ctx.column.name]) ? 1 : -1).map(item => ({ item }))
 
         await expect(queryCollectionAsArray(ctx.collectionName, [{ fieldName: ctx.column.name, order: 'ASC' }], undefined)).resolves.toEqual(
             ([...itemsByOrder, pagingMetadata(2, 2)])
@@ -110,14 +111,9 @@ describe(`Velo External DB Data REST API: ${currentDbImplementationName()}`,  ()
     testIfSupportedOperationsIncludes(supportedOperations, [ Projection ])('find api with projection', async() => {
         await schema.givenCollection(ctx.collectionName, [ctx.column], authOwner)
         await givenItems([ctx.item ], ctx.collectionName, authAdmin)
-
-        const response = await axiosInstance.post('/data/query', 
-            queryRequest(ctx.collectionName, [], [ctx.column.name]), 
-            {responseType: 'stream', transformRequest: authVisitor.transformRequest}
-        ) 
-                
+       
         await expect(queryCollectionAsArray(ctx.collectionName, [], [ctx.column.name])).resolves.toEqual(
-            expect.arrayContaining([{item: {[ctx.column.name]: ctx.item[ctx.column.name]}}, pagingMetadata(1, 1)])
+            expect.arrayContaining([{ item: { [ctx.column.name]: ctx.item[ctx.column.name] } }, pagingMetadata(1, 1)])
         )                
     })
 
@@ -126,9 +122,9 @@ describe(`Velo External DB Data REST API: ${currentDbImplementationName()}`,  ()
     test('insert api', async() => {
         await schema.givenCollection(ctx.collectionName, [ctx.column], authOwner)
 
-        const response = await axiosInstance.post('/data/insert', insertRequest(ctx.collectionName, ctx.items, false),  {responseType: 'stream', transformRequest: authAdmin.transformRequest})
+        const response = await axiosInstance.post('/data/insert', insertRequest(ctx.collectionName, ctx.items, false),  { responseType: 'stream', transformRequest: authAdmin.transformRequest })
 
-        const expectedItems = ctx.items.map(item => ({item: item} as QueryResponsePart))
+        const expectedItems = ctx.items.map(item => ({ item: item } as dataSpi.QueryResponsePart))
 
         await expect(streamToArray(response.data)).resolves.toEqual(expectedItems)
         await expect(queryCollectionAsArray(ctx.collectionName, [], undefined)).resolves.toEqual(expect.arrayContaining(
@@ -143,9 +139,9 @@ describe(`Velo External DB Data REST API: ${currentDbImplementationName()}`,  ()
         await schema.givenCollection(ctx.collectionName, [ctx.column], authOwner)
         await givenItems([ ctx.items[0] ], ctx.collectionName, authAdmin)
 
-        const response = axiosInstance.post('/data/insert', insertRequest(ctx.collectionName, ctx.items, false),  {responseType: 'stream', transformRequest: authAdmin.transformRequest})
+        const response = axiosInstance.post('/data/insert', insertRequest(ctx.collectionName, ctx.items, false),  { responseType: 'stream', transformRequest: authAdmin.transformRequest })
 
-        const expectedItems = [QueryResponsePart.item(ctx.items[0])]
+        const expectedItems = [dataSpi.QueryResponsePart.item(ctx.items[0])]
 
         await expect(response).rejects.toThrow('400')
 
@@ -161,8 +157,8 @@ describe(`Velo External DB Data REST API: ${currentDbImplementationName()}`,  ()
         await schema.givenCollection(ctx.collectionName, [ctx.column], authOwner)
         await givenItems([ ctx.item ], ctx.collectionName, authAdmin)
 
-        const response = await axiosInstance.post('/data/insert', insertRequest(ctx.collectionName, [ctx.modifiedItem], true),  {responseType: 'stream', transformRequest: authAdmin.transformRequest})
-        const expectedItems = [QueryResponsePart.item(ctx.modifiedItem)]
+        const response = await axiosInstance.post('/data/insert', insertRequest(ctx.collectionName, [ctx.modifiedItem], true),  { responseType: 'stream', transformRequest: authAdmin.transformRequest })
+        const expectedItems = [dataSpi.QueryResponsePart.item(ctx.modifiedItem)]
 
         await expect(streamToArray(response.data)).resolves.toEqual(expectedItems)
         await expect(queryCollectionAsArray(ctx.collectionName, [], undefined)).resolves.toEqual(expect.arrayContaining(
@@ -192,7 +188,7 @@ describe(`Velo External DB Data REST API: ${currentDbImplementationName()}`,  ()
                         sum: ctx.numberColumns[1].name
                     }
                 ]
-            } as Group,
+            } as dataSpi.Group,
             finalFilter: {
                 $and: [
                     { myAvg: { $gt: 0 } },
@@ -202,12 +198,12 @@ describe(`Velo External DB Data REST API: ${currentDbImplementationName()}`,  ()
         }, { responseType: 'stream', ...authAdmin })
 
         await expect(streamToArray(response.data)).resolves.toEqual(
-            expect.arrayContaining([{item: { 
+            expect.arrayContaining([{ item: { 
                 _id: ctx.numberItem._id,
                 _owner: ctx.numberItem._owner,
                 myAvg: ctx.numberItem[ctx.numberColumns[0].name],
                 mySum: ctx.numberItem[ctx.numberColumns[1].name]
-                }},
+                } },
                 pagingMetadata(1, 1)
         ]))
     })
@@ -218,9 +214,9 @@ describe(`Velo External DB Data REST API: ${currentDbImplementationName()}`,  ()
 
         const response = await axiosInstance.post('/data/remove', { 
             collectionId: ctx.collectionName, itemIds: ctx.items.map((i: { _id: any }) => i._id) 
-        } as RemoveRequest, {responseType: 'stream', transformRequest: authAdmin.transformRequest})
+        } as dataSpi.RemoveRequest, { responseType: 'stream', transformRequest: authAdmin.transformRequest })
 
-        const expectedItems = ctx.items.map(item => ({item: item} as RemoveResponsePart))
+        const expectedItems = ctx.items.map(item => ({ item: item } as dataSpi.RemoveResponsePart))
 
         await expect(streamToArray(response.data)).resolves.toEqual(expect.arrayContaining(expectedItems))
         await expect(queryCollectionAsArray(ctx.collectionName, [], undefined)).resolves.toEqual([pagingMetadata(0, 0)])
@@ -231,11 +227,11 @@ describe(`Velo External DB Data REST API: ${currentDbImplementationName()}`,  ()
         await givenItems([ctx.item], ctx.collectionName, authAdmin) 
 
         const filter = {
-            _id: {$eq: ctx.item._id}
+            _id: { $eq: ctx.item._id }
         }
 
         await expect(queryCollectionAsArray(ctx.collectionName, undefined, undefined, filter)).resolves.toEqual(
-            ([...[QueryResponsePart.item(ctx.item)], pagingMetadata(1, 1)])
+            ([...[dataSpi.QueryResponsePart.item(ctx.item)], pagingMetadata(1, 1)])
         )
     })
 
@@ -244,7 +240,7 @@ describe(`Velo External DB Data REST API: ${currentDbImplementationName()}`,  ()
         await givenItems([ctx.item], ctx.collectionName, authAdmin)
 
         const filter = {
-            _id: {$eq: 'wrong'}
+            _id: { $eq: 'wrong' }
         }
 
         await expect(queryCollectionAsArray(ctx.collectionName, undefined, undefined, filter)).resolves.toEqual(
@@ -257,27 +253,27 @@ describe(`Velo External DB Data REST API: ${currentDbImplementationName()}`,  ()
         await givenItems([ctx.item], ctx.collectionName, authAdmin)
 
         const filter = {
-            _id: {$eq: ctx.item._id}
+            _id: { $eq: ctx.item._id }
         }
 
         await expect(queryCollectionAsArray(ctx.collectionName, undefined, [ctx.column.name], filter)).resolves.toEqual(
-            ([QueryResponsePart.item({[ctx.column.name]: ctx.item[ctx.column.name]}), pagingMetadata(1, 1)])
+            ([dataSpi.QueryResponsePart.item({ [ctx.column.name]: ctx.item[ctx.column.name] }), pagingMetadata(1, 1)])
         )
     })
 
     testIfSupportedOperationsIncludes(supportedOperations, [ UpdateImmediately ])('update api', async() => {
         await schema.givenCollection(ctx.collectionName, [ctx.column], authOwner)
         await givenItems(ctx.items, ctx.collectionName, authAdmin)
-        const response = await axiosInstance.post('/data/update', updateRequest(ctx.collectionName, ctx.modifiedItems),  {responseType: 'stream', transformRequest: authAdmin.transformRequest})
+        const response = await axiosInstance.post('/data/update', updateRequest(ctx.collectionName, ctx.modifiedItems),  { responseType: 'stream', transformRequest: authAdmin.transformRequest })
 
-        const expectedItems = ctx.modifiedItems.map(item => ({item: item} as QueryResponsePart))
+        const expectedItems = ctx.modifiedItems.map(item => ({ item: item } as dataSpi.QueryResponsePart))
 
         await expect(streamToArray(response.data)).resolves.toEqual(expectedItems)
 
         await expect(queryCollectionAsArray(ctx.collectionName, [], undefined)).resolves.toEqual(expect.arrayContaining(
             [ 
                 ...expectedItems, 
-                pagingMetadata(ctx.modifiedItems.length,ctx.modifiedItems.length)
+                pagingMetadata(ctx.modifiedItems.length, ctx.modifiedItems.length)
             ]))
     })
 
@@ -291,7 +287,7 @@ describe(`Velo External DB Data REST API: ${currentDbImplementationName()}`,  ()
     testIfSupportedOperationsIncludes(supportedOperations, [ Truncate ])('truncate api', async() => {
         await schema.givenCollection(ctx.collectionName, [ctx.column], authOwner)
         await givenItems([ctx.item, ctx.anotherItem], ctx.collectionName, authAdmin)
-        await axiosInstance.post('/data/truncate', { collectionId: ctx.collectionName } as TruncateRequest, authAdmin)
+        await axiosInstance.post('/data/truncate', { collectionId: ctx.collectionName } as dataSpi.TruncateRequest, authAdmin)
         await expect(queryCollectionAsArray(ctx.collectionName, [], undefined)).resolves.toEqual([pagingMetadata(0, 0)])
     })
 

libs/external-db-google-sheets/src/supported_operations.ts

@@ -2,4 +2,4 @@ import { SchemaOperations } from '@wix-velo/velo-external-db-types'
 
 const { List, ListHeaders, Create, Drop, AddColumn, Describe, Projection } = SchemaOperations
 
-export const supportedOperations =  [ List, ListHeaders, Create, Drop, AddColumn, Describe, Projection ]
+export const supportedOperations =  [ List, ListHeaders, Create, Drop, AddColumn, Describe, Projection ]

libs/external-db-google-sheets/tests/drivers/sql_filter_transformer_test_support.ts

@@ -8,7 +8,7 @@ export const filterParser = {
 }
 
 
-export const stubEmptyFilterFor = (filter: any) => {    
+export const stubEmptyFilterFor = (_filter: any) => {    
 }
 
 
@@ -24,7 +24,7 @@ export const givenAllFieldsProjectionFor = (projection: any) => {
     when(filterParser.projection).calledWith(projection).mockReturnValue(undefined)        
 }
 
-export const stubEmptyFilterAndSortFor = (filter: any) => {    
+export const stubEmptyFilterAndSortFor = (_filter: any) => {    
 }
 
 export const givenFilterByIdWith = (id:any, filter: any) => {

libs/external-db-google-sheets/tests/google_sheets_test_utils.js

@@ -68,4 +68,4 @@ const batchUpdateFunctions = ( request, doc ) => {
 }
 
 
-module.exports = { changeUrl, numToColumnLetter, addNewSheetToDoc, deleteSheetFromDoc, deleteRowFromSheet, setHeaderToSheet, updateRow, batchUpdateFunctions }
+module.exports = { changeUrl, numToColumnLetter, addNewSheetToDoc, deleteSheetFromDoc, deleteRowFromSheet, setHeaderToSheet, updateRow, batchUpdateFunctions }

libs/test-commons/src/index.ts

@@ -1,3 +1,3 @@
 export * from './libs/test-commons'
 export * as gen from './libs/gen'
-export { authConfig } from "./libs/auth-config.json";
+export { authConfig } from './libs/auth-config.json'

libs/test-commons/src/libs/test-commons.ts

@@ -20,20 +20,20 @@ export const testSupportedOperations = (supportedOperations: SchemaOperations[],
     })
 }
 
-export const streamToArray = async (stream: any) => {
+export const streamToArray = async(stream: any) => {
 
     return new Promise((resolve, reject) => {
         const arr: any[] = []
 
         stream.on('data', (data: any) => {
             arr.push(JSON.parse(data.toString()))
-        });
+        })
 
         stream.on('end', () => {
             resolve(arr)
-        });
+        })
 
         stream.on('error', (err: Error) => reject(err))
 
     })
-}
+}