refactor: updates types to be more accurate

adonis-typings/hash.ts

@@ -81,16 +81,22 @@ declare module '@ioc:Adonis/Core/Hash' {
     list: { [P in keyof HashList]: HashList[P]['config'] },
   }
 
+  export type DriverMethod<T, K extends keyof HashDriverContract> = T extends HashDriverContract
+    ? HashDriverContract[K]
+    : never
+
   /**
    * Hash mananger interface
    */
-  export interface HashContract extends ManagerContract<
+  export interface HashContract<
+    DefaultDriver = HashList[HashConfigContract['default']]['implementation']
+  > extends ManagerContract<
     HashDriverContract,
     { [P in keyof HashList]: HashList[P]['implementation'] }
   > {
-    hash (value: string): ReturnType<HashDriverContract['hash']>
-    verify (hashedValue: string, plainValue: string): ReturnType<HashDriverContract['verify']>
-    needsReHash (hashedValue: string): ReturnType<HashDriverContract['needsReHash']>
+    hash (value: string): ReturnType<DriverMethod<DefaultDriver, 'hash'>>
+    verify (hashedValue: string, plainValue: string): ReturnType<DriverMethod<DefaultDriver, 'verify'>>
+    needsReHash (hashedValue: string): ReturnType<DriverMethod<DefaultDriver, 'needsReHash'>>
   }
 
   const Hash: HashContract

src/Drivers/Argon.ts

@@ -1,5 +1,5 @@
 /*
-* @poppinss/hash
+* @adonisjs/hash
 *
 * (c) Harminder Virk <[email protected]>
 *

src/Drivers/Bcrypt.ts

@@ -1,5 +1,5 @@
 /*
-* @poppinss/hash
+* @adonisjs/hash
 *
 * (c) Harminder Virk <[email protected]>
 *

src/Hash.ts

@@ -1,5 +1,5 @@
 /*
-* @poppinss/hash
+* @adonisjs/hash
 *
 * (c) Harminder Virk <[email protected]>
 *
@@ -10,15 +10,20 @@
 /// <reference path="../adonis-typings/hash.ts" />
 
 import { Manager } from '@poppinss/manager'
-import { HashContract, HashDriverContract, HashConfigContract, HashList } from '@ioc:Adonis/Core/Hash'
+import {
+  HashContract,
+  HashDriverContract,
+  HashConfigContract,
+  HashList,
+} from '@ioc:Adonis/Core/Hash'
 
 /**
  * The Hash module exposes the API to hash values using an underlying
  * Hash driver.
  */
 export class Hash <Config extends HashConfigContract>
   extends Manager<HashDriverContract, { [P in keyof HashList]: HashList[P]['implementation'] }>
-  implements HashContract
+  implements HashContract<HashDriverContract>
 {
   constructor (container: any, public config: Config) {
     super(container)
@@ -69,7 +74,7 @@ export class Hash <Config extends HashConfigContract>
   /**
    * Hash value using the default driver
    */
-  public hash (value: string) {
+  public hash (value: string): never | any {
     return this.use().hash(value)
   }
 

standlone.ts

@@ -1,10 +1,10 @@
 /*
- * @poppinss/hash
- *
- * (c) Harminder Virk <[email protected]>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+* @adonisjs/hash
+*
+* (c) Harminder Virk <[email protected]>
+*
+* For the full copyright and license information, please view the LICENSE
+* file that was distributed with this source code.
 */
 
 export { Hash } from './src/Hash'

test/argon2.spec.ts

@@ -1,5 +1,5 @@
 /*
-* @poppinss/hash
+* @adonisjs/hash
 *
 * (c) Harminder Virk <[email protected]>
 *

test/bcrypt.spec.ts

@@ -1,5 +1,5 @@
 /*
-* @poppinss/hash
+* @adonisjs/hash
 *
 * (c) Harminder Virk <[email protected]>
 *

test/hash.spec.ts

@@ -1,5 +1,5 @@
 /*
- * @poppinss/hash
+* @adonisjs/hash
  *
  * (c) Harminder Virk <[email protected]>
  *