Raplaced validator with Deno module validator4oak

deno.jsonc

@@ -1,6 +1,6 @@
 {
   "name": "@switcherapi/switcher-searchdocs",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "A remote document search engine that uses Skimming for Deno",
   "tasks": {
     "run": "deno run --allow-net --allow-env --allow-read src/index.ts",
@@ -13,5 +13,6 @@
     "lcov": "deno coverage coverage --lcov --output=coverage/report.lcov",
     "clean": "rm -rf ./npm ./coverage",
     "cover": "deno task clean && deno task test && deno task lcov && genhtml -o coverage/html coverage/report.lcov"
-  }
+  },
+  "lock": false
 }

sonar-project.properties

@@ -1,7 +1,7 @@
 sonar.projectKey=switcherapi_switcher-searchdocs
 sonar.projectName=switcher-searchdocs
 sonar.organization=switcherapi
-sonar.projectVersion=1.0.1
+sonar.projectVersion=1.0.2
 
 sonar.javascript.lcov.reportPaths=coverage/report.lcov
 

src/api-docs/swagger-info.ts

@@ -1,6 +1,6 @@
 export default {
   title: 'Switcher SearchDocs API',
-  version: 'v1.0.1',
+  version: 'v1.0.2',
   description: 'SearchDocs API powered by Deno, Oak and Skimming Module .',
   contact: {
     name: 'Roger Floriano (petruki)',

src/deps.ts

@@ -1,7 +1,8 @@
-export { Application, Router } from 'https://deno.land/x/oak@v14.1.1/mod.ts';
-export type { Middleware, Next } from 'https://deno.land/x/oak@v14.1.1/mod.ts';
-export { Context } from 'https://deno.land/x/oak@v14.1.1/context.ts';
+export { Application, Router } from 'https://deno.land/x/oak@14.2.0/mod.ts';
+export type { Middleware, Next } from 'https://deno.land/x/oak@14.2.0/mod.ts';
+export { Context } from 'https://deno.land/x/oak@14.2.0/context.ts';
 export { load } from 'https://deno.land/std@0.218.2/dotenv/mod.ts';
 export { bold, cyan, green } from 'https://deno.land/std@0.218.2/fmt/colors.ts';
 export { Skimming } from 'https://deno.land/x/skimming@v1.0.12/mod.ts';
 export type { Output } from 'https://deno.land/x/skimming@v1.0.12/mod.ts';
+export { ValidatorFn, ValidatorMiddleware } from 'https://deno.land/x/validator4oak@v1.0.0/mod.ts';

src/routes/searchdocs.ts

@@ -1,6 +1,5 @@
-import { Context, Router } from '../deps.ts';
+import { Context, Router, ValidatorFn, ValidatorMiddleware } from '../deps.ts';
 import { toSearchDocsRequestDto, toSearchDocsResponseDto } from '../dto/mapper.ts';
-import Validator from '../middleware/validator.ts';
 import { getEnv, responseError, responseSuccess } from '../utils.ts';
 import SearchDocsService from '../services/searchdocs.ts';
 import { SearchDocsQueryParams } from '../dto/request.ts';
@@ -9,18 +8,23 @@ const router = new Router();
 let service: SearchDocsService;
 
 const { ignoreCase, previewLength, query, regex, skipCache, trimContent, url } = SearchDocsQueryParams;
-const { checkParam, required, hasLenght, isUrl, isBoolean, isNumeric } = Validator;
+const { query: checkQuery, useErrorHandler } = ValidatorMiddleware.createMiddleware();
+const { hasLenght, isUrl, isBoolean, isNumeric } = ValidatorFn.createValidator();
+
+useErrorHandler((context: Context, error: string) => {
+  return responseError(context, new Error(error), 422);
+});
 
 router.get(
   '/',
-  checkParam([
-    { key: query, validators: [required(), hasLenght({ max: 100 })] },
-    { key: url, validators: [isUrl()] },
-    { key: previewLength, validators: [isNumeric()] },
-    { key: ignoreCase, validators: [isBoolean()] },
-    { key: trimContent, validators: [isBoolean()] },
-    { key: regex, validators: [isBoolean()] },
-    { key: skipCache, validators: [isBoolean()] },
+  checkQuery([
+    { key: query, validators: [hasLenght({ max: 100 })] },
+    { key: url, validators: [isUrl()], optional: true },
+    { key: previewLength, validators: [isNumeric()], optional: true },
+    { key: ignoreCase, validators: [isBoolean()], optional: true },
+    { key: trimContent, validators: [isBoolean()], optional: true },
+    { key: regex, validators: [isBoolean()], optional: true },
+    { key: skipCache, validators: [isBoolean()], optional: true },
   ]),
   async (context: Context) => {
     try {
@@ -33,14 +37,14 @@ router.get(
   },
 );
 
-const getService = () => {
+function getService() {
   if (!service) {
     const expireDuration = parseInt(getEnv('APP_CACHE_EXP_DURATION', '30'));
     const size = parseInt(getEnv('APP_CACHE_SIZE', '100'));
     service = new SearchDocsService({ expireDuration, size });
   }
 
   return service;
-};
+}
 
 export default router;

test/deps.ts

@@ -1,5 +1,5 @@
-export { testing } from 'https://deno.land/x/oak@v14.1.1/mod.ts';
-export type { Middleware } from 'https://deno.land/x/oak@v14.1.1/mod.ts';
+export { testing } from 'https://deno.land/x/oak@14.2.0/mod.ts';
+export type { Middleware } from 'https://deno.land/x/oak@14.2.0/mod.ts';
 export { assert, assertEquals, assertFalse, assertObjectMatch } from 'https://deno.land/std@0.218.2/assert/mod.ts';
 export { superoak } from 'https://deno.land/x/superoak@4.8.1/mod.ts';
 export type { IResponse } from 'https://deno.land/x/superoak@4.8.1/mod.ts';

test/routes/searchdocs.test.ts

@@ -60,9 +60,9 @@ Deno.test({
     const request = await superoak(app);
     const response = await request.get(`/`)
       .send()
-      .expect(400);
+      .expect(422);
 
-    assertEquals(response.body.error, 'Invalid query input. Cause: it is empty.');
+    assertEquals(response.body.error, 'Invalid query input. Cause: it is required.');
   },
 });
 
@@ -77,7 +77,7 @@ Deno.test({
       .send()
       .expect(422);
 
-    assertEquals(response.body.error, 'Invalid query input. Cause: it is greater than 100 characters.');
+    assertEquals(response.body.error, 'Invalid query input. Cause: it exceeds the maximum length of 100.');
   },
 });