chore: initial refactoring

packages/client/src/actions/account.ts

@@ -17,6 +17,7 @@ import type {
   CreateAccountWithUsernameResult,
   EnableSignlessResult,
   MuteRequest,
+  Paginated,
   RecommendAccountRequest,
   RemoveSignlessResult,
   ReportAccountRequest,
@@ -52,7 +53,6 @@ import type { ResultAsync } from '@lens-protocol/types';
 
 import type { AnyClient, SessionClient } from '../clients';
 import type { UnauthenticatedError, UnexpectedError } from '../errors';
-import type { Paginated } from '../types';
 
 /**
  * Fetch an Account.

packages/client/src/actions/accountManager.ts

@@ -4,6 +4,7 @@ import type {
   AddAccountManagerRequest,
   AddAccountManagerResult,
   HideManagedAccountRequest,
+  Paginated,
   RemoveAccountManagerRequest,
   RemoveAccountManagerResult,
   UnhideManagedAccountRequest,
@@ -22,7 +23,6 @@ import type { ResultAsync } from '@lens-protocol/types';
 
 import type { SessionClient } from '../clients';
 import type { UnauthenticatedError, UnexpectedError } from '../errors';
-import type { Paginated } from '../types';
 
 /**
  * Fetch Account Managers.

packages/client/src/actions/authentication.ts

@@ -1,6 +1,7 @@
 import type {
   AuthenticatedSession,
   AuthenticatedSessionsRequest,
+  Paginated,
   RefreshRequest,
   RefreshResult,
   RevokeAuthenticationRequest,
@@ -20,7 +21,6 @@ import type { ResultAsync } from '@lens-protocol/types';
 
 import type { AnyClient, SessionClient } from '../clients';
 import type { UnauthenticatedError, UnexpectedError } from '../errors';
-import type { Paginated } from '../types';
 
 /**
  * Get the AuthenticatedSession associated with the authenticated Account.

packages/client/src/actions/follow.ts

@@ -2,6 +2,7 @@ import type {
   CreateFollowRequest,
   CreateUnfollowRequest,
   FollowResult,
+  Paginated,
   UnfollowResult,
 } from '@lens-protocol/graphql';
 import {
@@ -23,7 +24,6 @@ import type { FollowStatusRequest } from '@lens-protocol/graphql';
 import type { FollowStatusResult } from '@lens-protocol/graphql';
 import type { AnyClient, SessionClient } from '../clients';
 import type { UnauthenticatedError, UnexpectedError } from '../errors';
-import type { Paginated } from '../types';
 
 /**
  * Follow an Account

packages/client/src/actions/notifications.ts

@@ -1,10 +1,9 @@
-import type { Notification, NotificationsRequest } from '@lens-protocol/graphql';
+import type { Notification, NotificationsRequest, Paginated } from '@lens-protocol/graphql';
 import { NotificationsQuery } from '@lens-protocol/graphql';
 import type { ResultAsync } from '@lens-protocol/types';
 
 import type { SessionClient } from '../clients';
 import type { UnexpectedError } from '../errors';
-import type { Paginated } from '../types';
 
 /**
  * Fetch notifications for the authenticated Account.

packages/client/src/actions/posts.ts

@@ -2,6 +2,7 @@ import type {
   AccountPostReaction,
   ActionInfo,
   AnyPost,
+  Paginated,
   Post,
   PostActionsRequest,
   PostBookmarksRequest,
@@ -20,7 +21,6 @@ import type { ResultAsync } from '@lens-protocol/types';
 
 import type { AnyClient, SessionClient } from '../clients';
 import type { UnauthenticatedError, UnexpectedError } from '../errors';
-import type { Paginated } from '../types';
 
 /**
  * Fetch a Post.

packages/client/src/actions/timeline.ts

@@ -1,4 +1,5 @@
 import type {
+  Paginated,
   Post,
   TimelineHighlightsRequest,
   TimelineItem,
@@ -9,7 +10,6 @@ import type { ResultAsync } from '@lens-protocol/types';
 
 import type { AnyClient } from '../clients';
 import type { UnexpectedError } from '../errors';
-import type { Paginated } from '../types';
 
 /**
  * Fetch timeline from an account.

packages/client/src/actions/username.ts

@@ -3,6 +3,7 @@ import type {
   AssignUsernameToAccountResult,
   CreateUsernameRequest,
   CreateUsernameResult,
+  Paginated,
   UnassignUsernameFromAccountRequest,
   UnassignUsernameToAccountResult,
   Username,
@@ -22,7 +23,6 @@ import type { SessionClient } from '../clients';
 import type { UnauthenticatedError, UnexpectedError } from '../errors';
 
 import type { AnyClient } from '../clients';
-import type { Paginated } from '../types';
 
 /**
  * Create a username

packages/client/src/clients.ts

@@ -3,6 +3,7 @@ import type {
   AuthenticationChallenge,
   ChallengeRequest,
   SignedAuthChallenge,
+  StandardData,
 } from '@lens-protocol/graphql';
 import type { Credentials, IStorage } from '@lens-protocol/storage';
 import { createCredentialsStorage } from '@lens-protocol/storage';
@@ -28,6 +29,7 @@ import {
 } from '@urql/core';
 import { type Logger, getLogger } from 'loglevel';
 
+import type { Account } from '@lens-protocol/graphql';
 import { type AuthenticatedUser, authenticatedUser } from './AuthenticatedUser';
 import { transactionStatus } from './actions';
 import type { ClientConfig } from './config';
@@ -42,7 +44,6 @@ import {
   hasExtensionCode,
 } from './errors';
 import { decodeIdToken } from './tokens';
-import type { StandardData } from './types';
 import { delay } from './utils';
 
 function takeValue<T>({
@@ -59,14 +60,14 @@ export type LoginParams = ChallengeRequest & {
   signMessage: SignMessage;
 };
 
-abstract class AbstractClient<TError> {
+abstract class AbstractClient<TContext extends Context, TError> {
   protected readonly urql: UrqlClient;
 
   protected readonly logger: Logger;
 
   protected readonly credentials: IStorage<Credentials>;
 
-  protected constructor(public readonly context: Context) {
+  protected constructor(public readonly context: TContext) {
     this.credentials = createCredentialsStorage(context.storage, context.environment.name);
 
     this.logger = getLogger(this.constructor.name);
@@ -99,12 +100,12 @@ abstract class AbstractClient<TError> {
   /**
    * Asserts that the client is a {@link PublicClient}.
    */
-  public abstract isPublicClient(): this is PublicClient;
+  public abstract isPublicClient(): this is PublicClient<TContext>;
 
   /**
    *  that the client is a {@link SessionClient}.
    */
-  public abstract isSessionClient(): this is SessionClient;
+  public abstract isSessionClient(): this is SessionClient<TContext>;
 
   public abstract query<TValue, TVariables extends AnyVariables>(
     document: TypedDocumentNode<StandardData<TValue>, TVariables>,
@@ -144,13 +145,16 @@ abstract class AbstractClient<TError> {
 /**
  * A client to interact with the public access queries and mutations of the Lens GraphQL API.
  */
-export class PublicClient extends AbstractClient<UnexpectedError> {
+export class PublicClient<TContext extends Context = Context> extends AbstractClient<
+  TContext,
+  UnexpectedError
+> {
   /**
    * The current session client.
    *
    * This could be the {@link PublicClient} itself if the user is not authenticated, or a {@link SessionClient} if the user is authenticated.
    */
-  public currentSession: PublicClient | SessionClient = this;
+  public currentSession: PublicClient<TContext> | SessionClient<TContext> = this;
 
   /**
    * Create a new instance of the {@link PublicClient}.
@@ -165,7 +169,7 @@ export class PublicClient extends AbstractClient<UnexpectedError> {
    * @param options - The options to configure the client.
    * @returns The new instance of the client.
    */
-  static create(options: ClientConfig): PublicClient {
+  static create(options: ClientConfig): PublicClient<Context> {
     return new PublicClient(configureContext(options));
   }
 
@@ -181,7 +185,7 @@ export class PublicClient extends AbstractClient<UnexpectedError> {
    */
   authenticate(
     request: SignedAuthChallenge,
-  ): ResultAsync<SessionClient, AuthenticationError | UnexpectedError> {
+  ): ResultAsync<SessionClient<TContext>, AuthenticationError | UnexpectedError> {
     return this.mutation(AuthenticateMutation, { request })
       .andThen((result) => {
         if (result.__typename === 'AuthenticationTokens') {
@@ -205,7 +209,7 @@ export class PublicClient extends AbstractClient<UnexpectedError> {
     signMessage,
     ...request
   }: LoginParams): ResultAsync<
-    SessionClient,
+    SessionClient<TContext>,
     AuthenticationError | SigningError | UnexpectedError
   > {
     return this.challenge(request)
@@ -232,7 +236,7 @@ export class PublicClient extends AbstractClient<UnexpectedError> {
    *
    * @returns The session client if available.
    */
-  resumeSession(): ResultAsync<SessionClient, UnauthenticatedError> {
+  resumeSession(): ResultAsync<SessionClient<TContext>, UnauthenticatedError> {
     return ResultAsync.fromSafePromise(this.credentials.get()).andThen((credentials) => {
       if (!credentials) {
         return new UnauthenticatedError('No credentials found').asResultAsync();
@@ -244,14 +248,14 @@ export class PublicClient extends AbstractClient<UnexpectedError> {
   /**
    * {@inheritDoc AbstractClient.isPublicClient}
    */
-  public override isPublicClient(): this is PublicClient {
+  public override isPublicClient(): this is PublicClient<TContext> {
     return true;
   }
 
   /**
    * {@inheritDoc AbstractClient.isSessionClient}
    */
-  public override isSessionClient(): this is SessionClient {
+  public override isSessionClient(): this is SessionClient<TContext> {
     return false;
   }
 
@@ -289,12 +293,15 @@ export class PublicClient extends AbstractClient<UnexpectedError> {
  *
  * @privateRemarks Intentionally not exported.
  */
-class SessionClient extends AbstractClient<UnauthenticatedError | UnexpectedError> {
-  public get parent(): PublicClient {
+class SessionClient<TContext extends Context = Context> extends AbstractClient<
+  TContext,
+  UnauthenticatedError | UnexpectedError
+> {
+  public get parent(): PublicClient<TContext> {
     return this._parent;
   }
 
-  constructor(private readonly _parent: PublicClient) {
+  constructor(private readonly _parent: PublicClient<TContext>) {
     super(_parent.context);
     _parent.currentSession = this;
   }
@@ -328,14 +335,14 @@ class SessionClient extends AbstractClient<UnauthenticatedError | UnexpectedErro
   /**
    * {@inheritDoc AbstractClient.isPublicClient}
    */
-  public override isPublicClient(): this is PublicClient {
+  public override isPublicClient(): this is PublicClient<TContext> {
     return false;
   }
 
   /**
    * {@inheritDoc AbstractClient.isSessionClient}
    */
-  public override isSessionClient(): this is SessionClient {
+  public override isSessionClient(): this is SessionClient<TContext> {
     return true;
   }
 
@@ -431,7 +438,8 @@ class SessionClient extends AbstractClient<UnauthenticatedError | UnexpectedErro
       ...base,
       headers: {
         ...base.headers,
-        Authorization: `Bearer ${credentials.accessToken}`,
+        'x-access-token': credentials.accessToken,
+        // Authorization: `Bearer ${this.tokens.accessToken}`,
       },
     };
   }
@@ -456,4 +464,6 @@ export type { SessionClient };
 /**
  * Any client that can be used to interact with the Lens GraphQL API.
  */
-export type AnyClient = PublicClient | SessionClient;
+export type AnyClient<TContext extends Context = Context> =
+  | PublicClient<TContext>
+  | SessionClient<TContext>;

packages/client/src/types.ts

@@ -56,19 +56,3 @@ export type DelegableOperationHandler<T extends string, E extends string> = (
 export type OperationHandler<T extends string, E extends string> =
   | RestrictedOperationHandler<E>
   | DelegableOperationHandler<T, E>;
-
-/**
- * A standardized data object.
- *
- * All GQL operations should alias their results to `value` to ensure interoperability
- * with this client interface.
- */
-export type StandardData<T> = { value: T };
-
-/**
- * A paginated list of items.
- */
-export type Paginated<T> = {
-  items: readonly T[];
-  pageInfo: PaginatedResultInfo;
-};

packages/graphql/src/common.ts

@@ -0,0 +1,17 @@
+import type { PaginatedResultInfo } from './fragments';
+
+/**
+ * A paginated list of items.
+ */
+export type Paginated<T> = {
+  items: readonly T[];
+  pageInfo: PaginatedResultInfo;
+};
+
+/**
+ * A standardized data object.
+ *
+ * All GQL operations should alias their results to `value` to ensure interoperability
+ * with this client interface.
+ */
+export type StandardData<T> = { value: T };