fix typings

Author: nicolasmelo1

examples/with-auth/src/core/index.ts

@@ -1,11 +1,11 @@
 import { domain } from '@palmares/core';
 import { Response, path, serverDomainModifier } from '@palmares/server';
-import { getAdapters } from 'packages/auth/dist/src/conf';
 
 export default domain('core', import.meta.dirname, {
   modifiers: [serverDomainModifier],
+
   getRoutes: () =>
     path('/test').get(async () => {
-     return getAdapters();
+      return Response.json({ message: 'hello' });
     })
 });

examples/with-auth/src/settings.ts

@@ -8,7 +8,13 @@ import { dirname, resolve } from 'path';
 
 import PasswordAuthAdapter, { passwordAdapter } from '@palmares/password-auth';
 import CoreDomain from './core';
-import defineAuthDomain, { Auth, AuthAdapter } from '@palmares/auth';
+import defineAuthDomain, { AuthAdapters, getAuth } from '@palmares/auth';
+
+declare global {
+  namespace Palmares {
+    interface PAuth extends AuthAdapters<[ReturnType<typeof PasswordAuthAdapter.new>]> {}
+  }
+}
 
 export default defineSettings({
   basePath: dirname(resolve(import.meta.dirname)),
@@ -32,7 +38,7 @@ export default defineSettings({
     [
       ServerDomain,
       {
-      servers: {
+        servers: {
           default: {
             server: ExpressServerAdapter,
             debug: true,
@@ -57,25 +63,13 @@ export default defineSettings({
       }
     ],
     defineAuthDomain({
-      adapters: [passwordAdapter.new({
-        prefix: 'my-prefix',
-        suffix: 'my-suffix'
-      })]
+      adapters: [
+        passwordAdapter.new({
+          prefix: 'my-prefix',
+          suffix: 'my-suffix'
+        })
+      ]
     }),
     CoreDomain
   ]
 });
-
-declare global {
-  namespace Palmares {
-    interface PAuth {
-      adapters: [ReturnType<typeof PasswordAuthAdapter.new>]
-    }
-  }
-}
-
-const auth = Auth
-
-type test2 = Palmares.PAuth['adapters'][number]
-
-type test3 = ReturnType<typeof PasswordAuthAdapter.new>

packages/auth/src/auth.ts

@@ -1,9 +1,12 @@
 import { getAdapters } from './conf';
 
+import type { AuthAdapters } from '.';
 import type { AdapterMethods, AuthAdapter } from './adapter';
 
-type AuthProxy<TAdapters> = {
-  // [KAdapter in TAdapters[number] as KAdapter['name']]: KAdapter['methods'];
+type AuthProxy<TAdapters extends readonly (AuthAdapter | unknown)[]> = {
+  [KAdapter in TAdapters[number] as KAdapter extends AuthAdapter
+    ? KAdapter['name']
+    : never]: KAdapter extends AuthAdapter ? KAdapter['methods'] : never;
 };
 
 const createAdapterProxy = <TMethods extends AdapterMethods>(methods: TMethods): TMethods =>
@@ -16,13 +19,14 @@ const createAdapterProxy = <TMethods extends AdapterMethods>(methods: TMethods):
     }
   });
 
-type GetAdapters = ReturnType<typeof getAdapters>;
-
-const createAuthProxy = <TAdapters = Palmares.PAuth extends { adapters: any } ? true : false>(adapters: GetAdapters) =>
-  new Proxy(
+export function getAuth<TAdapters extends AuthAdapters & Palmares.PAuth = AuthAdapters & Palmares.PAuth>(): AuthProxy<
+  TAdapters['adapters']
+> {
+  return new Proxy(
     {},
     {
       get(_, adapterName: string) {
+        const adapters = getAdapters();
         const adapter = adapters.find((a) => a.name === adapterName);
 
         if (adapter) {
@@ -32,6 +36,5 @@ const createAuthProxy = <TAdapters = Palmares.PAuth extends { adapters: any } ?
         throw new Error(`Adapter "${adapterName}" not found`);
       }
     }
-  ) as AuthProxy<TAdapters>;
-
-export const Auth = createAuthProxy(getAdapters());
+  ) as any;
+}

packages/auth/src/index.ts

@@ -1,5 +1,7 @@
 import { defineAuthDomain } from './domain';
 
+import type { AuthAdapter } from './adapter';
+
 export { authAdapter, AuthAdapter, type AdapterMethods } from './adapter';
 export {
   AuthenticationFailedException,
@@ -14,7 +16,11 @@ export {
 } from './exceptions';
 export type { AuthConfigurationType, AuthAdapterType } from './types';
 
-export { Auth } from './auth';
+export { Auth, getAuth } from './auth';
 export { defineAuthDomain as default };
 
+export interface AuthAdapters<TAdapters extends readonly (AuthAdapter | unknown)[] = unknown[]> {
+  adapters: TAdapters;
+}
+
 export { getAdapters } from './conf';

packages/schemas/__tests__/src/core/array.test.ts

@@ -1,23 +1,21 @@
-import type { ZodSchemaAdapter } from '@palmares/zod-schema';
-
 import * as p from '@palmares/schemas';
 import { describe } from '@palmares/tests';
+
 import type JestTestAdapter from '@palmares/jest-tests';
+import type { ZodSchemaAdapter } from '@palmares/zod-schema';
 
 declare global {
   namespace Palmares {
     interface PSchemaAdapter extends ZodSchemaAdapter {}
   }
-};
-
+}
 
 describe<JestTestAdapter>('Array Tests', ({ test }) => {
   test('optional', async ({ expect }) => {
     const arraySchema = p.array([p.number()]);
     const tupleSchema = p.array(p.number(), p.string());
     const arraySchemaWithCustomMessage = p.array([p.number()]).nonOptional({ message: 'hello' });
     const tupleSchemaWithCustomMessage = p.array(p.number(), p.string()).nonOptional({ message: 'hello' });
-    
     const [
       { errors: errorsArrayOnFail },
       { errors: errorsTupleOnFail },
@@ -91,7 +89,7 @@ describe<JestTestAdapter>('Array Tests', ({ test }) => {
 
     console.log(data);
     expect(data[0]).toBe('hey');
-    expect(data[1]).toBe(1)
+    expect(data[1]).toBe(1);
   });
 
   test('min length', async ({ expect }) => {