Skip to content

Commit

Permalink
refactor: remove validator
Browse files Browse the repository at this point in the history
  • Loading branch information
thetutlage committed Jul 4, 2023
1 parent 93e7feb commit ddbcbc4
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 58 deletions.
10 changes: 0 additions & 10 deletions legacy/validator.ts

This file was deleted.

2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
"./providers/app_provider": "./build/providers/app_provider.js",
"./providers/hash_provider": "./build/providers/hash_provider.js",
"./providers/http_provider": "./build/providers/http_provider.js",
"./legacy/validator": "./build/legacy/validator.js",
"./helpers": "./build/src/helpers/main.js",
"./helpers/is": "./build/src/helpers/is.js",
"./helpers/types": "./build/src/helpers/types.js",
Expand Down Expand Up @@ -143,7 +142,6 @@
"@adonisjs/hash": "^8.3.1-3",
"@adonisjs/http-server": "^6.8.2-7",
"@adonisjs/logger": "^5.4.2-3",
"@adonisjs/validator": "^13.0.2-2",
"@paralleldrive/cuid2": "^2.2.0",
"@poppinss/macroable": "^1.0.0-7",
"@poppinss/utils": "^6.5.0-3",
Expand Down
13 changes: 0 additions & 13 deletions providers/app_provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

import { Config } from '../modules/config.js'
import { Logger } from '../modules/logger.js'
import { validator } from '../legacy/validator.js'
import { Encryption } from '../modules/encryption.js'
import type { ApplicationService, LoggerService } from '../src/types.js'

Expand Down Expand Up @@ -97,14 +96,6 @@ export default class AppServiceProvider {
this.app.container.alias('encryption', Encryption)
}

/**
* Configure the validator
*/
protected async configureValidator() {
const config = await this.app.container.make('config')
validator.configure(config.get('validator', {}))
}

/**
* Registers bindings
*/
Expand All @@ -118,8 +109,4 @@ export default class AppServiceProvider {
this.registerEncryption()
this.registerTestUtils()
}

async boot() {
await this.configureValidator()
}
}
33 changes: 0 additions & 33 deletions tests/providers.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { test } from '@japa/runner'
import { Config } from '../modules/config.js'
import { Emitter } from '../modules/events.js'
import { Kernel } from '../modules/ace/kernel.js'
import { validator } from '../legacy/validator.js'
import { Router, Server } from '../modules/http.js'
import { TestUtils } from '../src/test_utils/main.js'
import { Encryption } from '../modules/encryption.js'
Expand Down Expand Up @@ -185,36 +184,4 @@ test.group('Providers', () => {
assert.instanceOf(logger, Logger)
assert.strictEqual(logger, loggerService.use())
})

test('configure validator', async ({ assert }) => {
const ignitor = new IgnitorFactory()
.withCoreConfig()
.merge({
rcFileContents: {
providers: [
'./providers/app_provider.js',
'./providers/hash_provider.js',
'./providers/http_provider.js',
],
},
})
.merge({
config: {
validator: {
reporter: validator.reporters.jsonapi,
},
},
})
.create(BASE_URL, {
importer: (filePath) => {
return import(new URL(filePath, new URL('../', import.meta.url)).href)
},
})

const app = ignitor.createApp('web')
await app.init()
await app.boot()

assert.deepEqual(validator.config.reporter, validator.reporters.jsonapi)
})
})

0 comments on commit ddbcbc4

Please sign in to comment.