wip

Author: mohitxskull

package.json

@@ -5,7 +5,7 @@
   "type": "module",
   "scripts": {
     "build": "turbo build",
-    "build:pkg": "turbo build --filter=./packages/* --filter=!./packages/cobalt --filter=!./packages/cobalt-next && turbo build --filter=./packages/cobalt --filter=./packages/cobalt-next",
+    "build:pkg": "turbo build --filter=./packages/* --filter=!./packages/cobalt --filter=!./packages/gate_next --filter=!./packages/gate_tan && turbo build --filter=./packages/cobalt --filter=./packages/gate_next --filter=./packages/gate_tan",
     "dev": "turbo dev",
     "dev:playground": "turbo dev --filter=./playground/*",
     "lint": "turbo lint",

packages/blueprint_lib/src/types.ts

@@ -4,29 +4,31 @@ import type { MultipartFile } from '@adonisjs/bodyparser/types'
 import { Constructor } from '@adonisjs/core/types/container'
 
 export type EndpointIO = {
-  output: Record<string, any>
-  input?: {
-    params?: Record<string, any>
-    query?: Record<string, any>
-    headers?: Record<string, any>
-    cookies?: Record<string, any>
-    [key: string]: any // Allow for other input properties
-  }
+  output: any
+  input: any
 }
 
 export type Endpoint<IO extends EndpointIO> = {
   url: (options?: {
-    params?: NonNullable<IO['input']>['params']
-    query?: NonNullable<IO['input']>['query']
+    params?: 'input' extends keyof IO
+      ? 'params' extends keyof IO['input']
+        ? IO['input']['params']
+        : undefined
+      : undefined
+    query?: 'input' extends keyof IO
+      ? 'query' extends keyof IO['input']
+        ? IO['input']['query']
+        : undefined
+      : undefined
   }) => string
   method: string
   form?: boolean
   io: IO
 }
 
-export type ApiEndpoints = Record<string, Endpoint<any>>
+export type ApiEndpoints = Record<string, Endpoint<EndpointIO>>
 
-export type EndpointKeys<ROUTES extends ApiEndpoints> = keyof ROUTES
+export type EndpointKeys<Endpoints extends ApiEndpoints> = keyof Endpoints
 
 // ===============
 // https://github.com/Julien-R44/tuyau/blob/main/packages/utils/src/types.ts

packages/cobalt/src/components/form/index.tsx

@@ -1,7 +1,5 @@
 export { HeadScript } from './head_script.js'
 
-export { Form } from './form/index.js'
-
 export { QueryLoader } from './query_loader.js'
 export type { QueryLoaderProps } from './query_loader.js'
 

packages/cobalt/src/components/index.ts

@@ -1,19 +1,32 @@
-import { Config, Header, Token } from './types.js'
+import { Header, Token } from './types.js'
 import axios, { type AxiosRequestConfig, AxiosInstance, AxiosResponse, isAxiosError } from 'axios'
 import qs from 'qs'
 import { GateError } from './error.js'
-import { ApiEndpoints, EndpointKeys } from '@folie/blueprint-lib'
+import { ApiEndpoints } from '@folie/blueprint-lib'
 
 export class Gate<const Endpoints extends ApiEndpoints> {
   #axios: AxiosInstance
 
-  #config: Config<Endpoints>
+  #endpoints: Endpoints
+  #baseURL: string
 
-  constructor(config: Config<Endpoints>) {
-    this.#config = config
+  #token?: Token
+  #header?: Header
+
+  constructor(config: { baseURL: URL; endpoints: Endpoints; token?: Token; header?: Header }) {
+    this.#endpoints = config.endpoints
+    this.#baseURL = config.baseURL.origin
+
+    if (config.token) {
+      this.#token = config.token
+    }
+
+    if (config.header) {
+      this.#header = config.header
+    }
 
     this.#axios = axios.create({
-      baseURL: this.#config.baseURL.origin,
+      baseURL: config.baseURL.origin,
       headers: {
         'Content-Type': 'application/json',
       },
@@ -22,15 +35,15 @@ export class Gate<const Endpoints extends ApiEndpoints> {
   }
 
   setToken(token: Token) {
-    this.#config.token = token
+    this.#token = token
   }
 
   setHeader(header: Header) {
-    this.#config.header = header
+    this.#header = header
   }
 
   token(custom?: Token) {
-    const target = custom || this.#config.token
+    const target = custom || this.#token
 
     if (typeof target === 'string') {
       return target
@@ -42,7 +55,7 @@ export class Gate<const Endpoints extends ApiEndpoints> {
   }
 
   header(custom?: Header) {
-    const target = custom || this.#config.header
+    const target = custom || this.#header
 
     if (typeof target === 'object') {
       return target
@@ -54,7 +67,7 @@ export class Gate<const Endpoints extends ApiEndpoints> {
   }
 
   async #call<
-    EK extends EndpointKeys<Endpoints>,
+    EK extends keyof Endpoints,
     EP extends Endpoints[EK],
     IN extends EP['io']['input'],
     OUT extends EP['io']['output'],
@@ -67,7 +80,7 @@ export class Gate<const Endpoints extends ApiEndpoints> {
     }
   ): Promise<OUT> {
     try {
-      const endpoint = this.#config.endpoints[endpointKey]
+      const endpoint = this.#endpoints[endpointKey]
 
       const [token, header] = await Promise.all([
         this.token(options?.token),
@@ -110,7 +123,7 @@ export class Gate<const Endpoints extends ApiEndpoints> {
     }
   }
 
-  async #safeCall<EK extends EndpointKeys<Endpoints>, EP extends Endpoints[EK]>(
+  async #safeCall<EK extends keyof Endpoints, EP extends Endpoints[EK]>(
     endpointKey: EK,
     input: EP['io']['input']
   ): Promise<[EP['io']['output'], null] | [null, GateError]> {
@@ -127,23 +140,17 @@ export class Gate<const Endpoints extends ApiEndpoints> {
     }
   }
 
-  endpoint<RK extends EndpointKeys<Endpoints>>(endpointKey: RK) {
+  endpoint<EK extends keyof Endpoints>(endpointKey: EK) {
     return {
-      call: (input: Endpoints[RK]['io']['input']) => this.#call(endpointKey, input),
-      safeCall: (input: Endpoints[RK]['io']['input']) => this.#safeCall(endpointKey, input),
+      call: (input: Endpoints[EK]['io']['input']) => this.#call(endpointKey, input),
+      safeCall: (input: Endpoints[EK]['io']['input']) => this.#safeCall(endpointKey, input),
     } as const
   }
 
-  url<EK extends EndpointKeys<Endpoints>, EP extends Endpoints[EK]>(
+  url<EK extends keyof Endpoints, EP extends Endpoints[EK]>(
     endpointKey: EK,
-    options?: {
-      params?: NonNullable<EP['io']['input']>['params']
-      query?: NonNullable<EP['io']['input']>['query']
-    }
+    options?: Parameters<EP['url']>[0]
   ) {
-    return new URL(
-      this.#config.endpoints[endpointKey].url({ params: options?.params, query: options?.query }),
-      this.#config.baseURL
-    )
+    return new URL(this.#endpoints[endpointKey].url(options), this.#baseURL)
   }
 }

packages/gate/src/client.ts

@@ -1,14 +1,5 @@
-import { ApiEndpoints } from '@folie/blueprint-lib'
-
 export type MaybePromise<T> = T | Promise<T>
 
 export type Token = string | (() => MaybePromise<string | null>)
 
 export type Header = Record<string, string> | (() => MaybePromise<Record<string, string> | null>)
-
-export type Config<Endpoints extends ApiEndpoints> = {
-  baseURL: URL
-  endpoints: Endpoints
-  token?: Token
-  header?: Header
-}

packages/gate/src/types.ts

@@ -7,6 +7,6 @@
 |
 */
 
-export { CobaltNextServer } from './src/server.js'
-export { CobaltNextClient } from './src/client.js'
+export { GateNextServer } from './src/server.js'
+export { GateNextClient } from './src/client.js'
 export { NextServerError } from './src/next_server_error.js'

packages/cobalt-next/.prettierignore renamed to packages/gate_next/.prettierignore

@@ -1,5 +1,5 @@
 {
-  "name": "@folie/cobalt-next",
+  "name": "@folie/gate-next",
   "description": "",
   "version": "0.0.0",
   "engines": {

packages/cobalt-next/bin/playground.ts renamed to packages/gate_next/bin/playground.ts

@@ -5,7 +5,7 @@ import {
 } from 'cookies-next'
 import { useRouter } from 'next/router.js'
 
-export class CobaltNextClient<
+export class GateNextClient<
   CookieKeys extends Record<string, string>,
   ParamKeys extends readonly [...string[]],
 > {

packages/cobalt-next/bin/test.ts renamed to packages/gate_next/bin/test.ts

@@ -6,7 +6,7 @@ import { ApiEndpoints, EndpointKeys } from '@folie/blueprint-lib'
 import { CheckpointParams } from './types.js'
 import { NextServerError } from './next_server_error.js'
 
-export class CobaltNextServer<
+export class GateNextServer<
   const Endpoints extends ApiEndpoints,
   SessionEndpointKey extends EndpointKeys<Endpoints>,
 > {
@@ -100,7 +100,7 @@ export class CobaltNextServer<
       api: Gate<Endpoints>
     }) => Promise<GetServerSidePropsResult<T>>,
     options?: {
-      checkpointCondition?:
+      checkpoint?:
         | ((params: {
             ctx: GetServerSidePropsContext
             session: Endpoints[SessionEndpointKey]['io']['output'] | null
@@ -116,9 +116,9 @@ export class CobaltNextServer<
           deleteCookie(this.sessionConfig.cookie, ctx)
         }
 
-        if (options?.checkpointCondition) {
-          if (typeof options?.checkpointCondition === 'function') {
-            const condition = options?.checkpointCondition({ ctx, session })
+        if (options?.checkpoint) {
+          if (typeof options?.checkpoint === 'function') {
+            const condition = options?.checkpoint({ ctx, session })
 
             if (condition.allow === false) {
               return {

packages/cobalt-next/eslint.config.js renamed to packages/gate_next/eslint.config.js

@@ -13,7 +13,7 @@
   ],
   "exports": {
     ".": "./build/index.js",
-    "./components": "./build/components/index.js"
+    "./components": "./build/src/components/index.js"
   },
   "scripts": {
     "clean": "del-cli build",

packages/cobalt-next/index.ts renamed to packages/gate_next/index.ts

@@ -1,4 +1,4 @@
-import { ApiEndpoints, EndpointKeys } from '@folie/blueprint-lib'
+import { ApiEndpoints } from '@folie/blueprint-lib'
 import { Gate } from '@folie/gate'
 import {
   UndefinedInitialDataOptions,
@@ -32,19 +32,16 @@ export class GateTan<const Endpoints extends ApiEndpoints> {
     this.notification = params.notification
   }
 
-  queryKey = <EK extends EndpointKeys<Endpoints>, EP extends Endpoints[EK]['io']>(params: {
-    endpoint: EK
-    options?: {
-      params?: NonNullable<EP['input']>['params']
-      query?: NonNullable<EP['input']>['query']
-    }
-  }) => {
-    const endpoint = this.endpoints[params.endpoint]
+  queryKey = <EK extends keyof Endpoints, EP extends Endpoints[EK]>(
+    endpointKey: EK,
+    options?: Parameters<EP['url']>[0]
+  ) => {
+    const endpoint = this.endpoints[endpointKey]
 
-    return [endpoint.method, endpoint.url(params.options)]
+    return [endpoint.method, endpoint.url(options)]
   }
 
-  useQuery = <EK extends EndpointKeys<Endpoints>, EP extends Endpoints[EK]['io']>(
+  useQuery = <EK extends keyof Endpoints, EP extends Endpoints[EK]['io']>(
     params: {
       endpoint: EK
       input: EP['input']
@@ -57,20 +54,17 @@ export class GateTan<const Endpoints extends ApiEndpoints> {
       ...rest,
 
       // Permanent
-      queryKey: this.queryKey({
-        endpoint: endpoint,
-        options: {
-          params: input?.params,
-          query: input?.query,
-        },
+      queryKey: this.queryKey(endpoint, {
+        params: input?.params,
+        query: input?.query,
       }),
       queryFn: () => this.gate.endpoint(endpoint).call(input),
     })
 
     return internalQuery
   }
 
-  useMutation = <EK extends EndpointKeys<Endpoints>, EP extends Endpoints[EK]['io']>(
+  useMutation = <EK extends keyof Endpoints, EP extends Endpoints[EK]['io']>(
     params: CobaltUseMutationParams<Endpoints, EK, EP>
   ) => {
     const { endpoint, form, onSuccess, onError, ...rest } = params
@@ -124,7 +118,7 @@ export class GateTan<const Endpoints extends ApiEndpoints> {
     return internalMutation
   }
 
-  useList = <EK extends EndpointKeys<Endpoints>, EP extends Endpoints[EK]['io']>(
+  useList = <EK extends keyof Endpoints, EP extends Endpoints[EK]['io']>(
     params: {
       endpoint: EK
       input?: EP['input']
@@ -152,7 +146,7 @@ export class GateTan<const Endpoints extends ApiEndpoints> {
     return [internalQueryCall, [internalBody, setInternalBody]] as const
   }
 
-  useForm = <EK extends EndpointKeys<Endpoints>, EP extends Endpoints[EK]['io']>(
+  useForm = <EK extends keyof Endpoints, EP extends Endpoints[EK]['io']>(
     params: UseFormInput<NonNullable<EP['input']>> & {
       endpoint: EK
 

packages/cobalt-next/package.json renamed to packages/gate_next/package.json

@@ -18,6 +18,8 @@
     "@folie/cobalt": "workspace:*",
     "@folie/cobalt-animation": "workspace:*",
     "@folie/gate": "workspace:*",
+    "@folie/gate-tan": "workspace:*",
+    "@folie/gate-next": "workspace:*",
     "@folie/lib": "workspace:*",
     "@mantine/core": "^7.16.1",
     "@mantine/dates": "^7.16.1",