@niledatabase/server 5.0.0-alpha.29 → 5.0.0-alpha.30

package/dist/index.d.mts

@@ -538,8 +538,13 @@ declare class Server {
      * Basically means you want to disregard cookies and do everything manually
      * If we elect to DDL, we don't want to use tenant id or user id, so remove those.
      */
-    withContext(context?: ContextParams): Promise<this>;
-    withContext<T>(context: ContextParams, fn: (sdk: this) => Promise<T>): Promise<T>;
+    withContext(context?: PartialContext): Promise<this>;
+    withContext<T>(context: PartialContext, fn: (sdk: this) => Promise<T>): Promise<T>;
+    /**
+     * Creates a context without a user id and a tenant id, but keeps the headers around for auth at least.
+     */
+    noContext(): Promise<this>;
+    noContext<T>(fn: (sdk: this) => Promise<T>): Promise<T>;
     /**
      *
      * @returns the last used (basically global) context object, useful for debugging or making your own context
@@ -564,9 +569,6 @@ type PartialContext = {
     userId?: string | undefined | null;
     preserveHeaders?: boolean;
 };
-type ContextParams = PartialContext & {
-    ddl?: boolean;
-};
 type CTX = {
     run: <T>(ctx: Partial<Context>, fn: () => T) => T;
     get: () => Context;
@@ -812,4 +814,4 @@ declare const USER_COOKIE = "nile.user-id";
 declare const HEADER_ORIGIN = "nile-origin";
 declare const HEADER_SECURE_COOKIES = "nile-secure-cookies";
 
-export { type APIError, APIErrorErrorCodeEnum, type ActiveSession, type AfterCreate, type CTX, type CTXHandlerType, type Context, type ContextParams, type ContextReturn, type CreateBasicUserRequest, type CreateTenantUserRequest, type Extension, type ExtensionResult, ExtensionState, HEADER_ORIGIN, HEADER_SECURE_COOKIES, type Invite, type JWT, type LoggerType, type LoginUserResponse, type LoginUserResponseToken, LoginUserResponseTokenTypeEnum, create as Nile, type NileConfig, type NileDb, type NileHandlers, type NilePoolConfig, type NileRequest, type NileResponse, type Opts, type PartialContext, type Providers, type RouteFunctions, type RouteReturn, Server, TENANT_COOKIE, type Tenant, USER_COOKIE, type User, parseCSRF, parseCallback, parseResetToken, parseTenantId, parseToken };
+export { type APIError, APIErrorErrorCodeEnum, type ActiveSession, type AfterCreate, type CTX, type CTXHandlerType, type Context, type ContextReturn, type CreateBasicUserRequest, type CreateTenantUserRequest, type Extension, type ExtensionResult, ExtensionState, HEADER_ORIGIN, HEADER_SECURE_COOKIES, type Invite, type JWT, type LoggerType, type LoginUserResponse, type LoginUserResponseToken, LoginUserResponseTokenTypeEnum, create as Nile, type NileConfig, type NileDb, type NileHandlers, type NilePoolConfig, type NileRequest, type NileResponse, type Opts, type PartialContext, type Providers, type RouteFunctions, type RouteReturn, Server, TENANT_COOKIE, type Tenant, USER_COOKIE, type User, parseCSRF, parseCallback, parseResetToken, parseTenantId, parseToken };

package/dist/index.d.ts

@@ -538,8 +538,13 @@ declare class Server {
      * Basically means you want to disregard cookies and do everything manually
      * If we elect to DDL, we don't want to use tenant id or user id, so remove those.
      */
-    withContext(context?: ContextParams): Promise<this>;
-    withContext<T>(context: ContextParams, fn: (sdk: this) => Promise<T>): Promise<T>;
+    withContext(context?: PartialContext): Promise<this>;
+    withContext<T>(context: PartialContext, fn: (sdk: this) => Promise<T>): Promise<T>;
+    /**
+     * Creates a context without a user id and a tenant id, but keeps the headers around for auth at least.
+     */
+    noContext(): Promise<this>;
+    noContext<T>(fn: (sdk: this) => Promise<T>): Promise<T>;
     /**
      *
      * @returns the last used (basically global) context object, useful for debugging or making your own context
@@ -564,9 +569,6 @@ type PartialContext = {
     userId?: string | undefined | null;
     preserveHeaders?: boolean;
 };
-type ContextParams = PartialContext & {
-    ddl?: boolean;
-};
 type CTX = {
     run: <T>(ctx: Partial<Context>, fn: () => T) => T;
     get: () => Context;
@@ -812,4 +814,4 @@ declare const USER_COOKIE = "nile.user-id";
 declare const HEADER_ORIGIN = "nile-origin";
 declare const HEADER_SECURE_COOKIES = "nile-secure-cookies";
 
-export { type APIError, APIErrorErrorCodeEnum, type ActiveSession, type AfterCreate, type CTX, type CTXHandlerType, type Context, type ContextParams, type ContextReturn, type CreateBasicUserRequest, type CreateTenantUserRequest, type Extension, type ExtensionResult, ExtensionState, HEADER_ORIGIN, HEADER_SECURE_COOKIES, type Invite, type JWT, type LoggerType, type LoginUserResponse, type LoginUserResponseToken, LoginUserResponseTokenTypeEnum, create as Nile, type NileConfig, type NileDb, type NileHandlers, type NilePoolConfig, type NileRequest, type NileResponse, type Opts, type PartialContext, type Providers, type RouteFunctions, type RouteReturn, Server, TENANT_COOKIE, type Tenant, USER_COOKIE, type User, parseCSRF, parseCallback, parseResetToken, parseTenantId, parseToken };
+export { type APIError, APIErrorErrorCodeEnum, type ActiveSession, type AfterCreate, type CTX, type CTXHandlerType, type Context, type ContextReturn, type CreateBasicUserRequest, type CreateTenantUserRequest, type Extension, type ExtensionResult, ExtensionState, HEADER_ORIGIN, HEADER_SECURE_COOKIES, type Invite, type JWT, type LoggerType, type LoginUserResponse, type LoginUserResponseToken, LoginUserResponseTokenTypeEnum, create as Nile, type NileConfig, type NileDb, type NileHandlers, type NilePoolConfig, type NileRequest, type NileResponse, type Opts, type PartialContext, type Providers, type RouteFunctions, type RouteReturn, Server, TENANT_COOKIE, type Tenant, USER_COOKIE, type User, parseCSRF, parseCallback, parseResetToken, parseTenantId, parseToken };

package/dist/index.js

@@ -357,9 +357,8 @@ var ctx = {
         }
       }
     }
-    if ("tenantId" in partial)
-      store.tenantId = partial.tenantId ?? store.tenantId;
-    if ("userId" in partial) store.userId = partial.userId ?? store.userId;
+    if ("tenantId" in partial) store.tenantId = partial.tenantId;
+    if ("userId" in partial) store.userId = partial.userId;
     if ("preserveHeaders" in partial)
       store.preserveHeaders = Boolean(partial.preserveHeaders);
     silly(`[SET] ${serializeContext(store)}`);
@@ -391,14 +390,14 @@ function withNileContext(config, fn, name = "unknown") {
       mergedHeaders.set(key17, value);
     });
   }
-  const tenantId = "tenantId" in initialContext && initialContext.tenantId;
-  const userId = "userId" in initialContext && initialContext.userId;
-  const preserveHeaders = "preserveHeaders" in initialContext && initialContext.preserveHeaders;
+  const hasTenantId = "tenantId" in initialContext;
+  const hasUserId = "userId" in initialContext;
+  const hasPreserveHeaders = "preserveHeaders" in initialContext;
   const context = {
     headers: mergedHeaders,
-    tenantId: tenantId ? tenantId : existing.tenantId,
-    userId: userId ? userId : existing.userId,
-    preserveHeaders: preserveHeaders ? preserveHeaders : existing.preserveHeaders ?? false
+    tenantId: hasTenantId ? initialContext.tenantId : existing.tenantId,
+    userId: hasUserId ? initialContext.userId : existing.userId,
+    preserveHeaders: hasPreserveHeaders ? Boolean(initialContext.preserveHeaders) : existing.preserveHeaders ?? false
   };
   silly(`${name} [INITIAL - Partial<Context>] ${serializeContext(context)}`);
   return ctx.run(context, async () => {
@@ -2250,8 +2249,7 @@ function makeAfterCreate(config, id) {
       });
       done(e, conn);
     });
-    const tenantId = config.context.tenantId;
-    const userId = config.context.userId;
+    const { tenantId, userId } = ctx.getLastUsed();
     if (tenantId) {
       const query = [`SET nile.tenant_id = '${tenantId}'`];
       if (userId) {
@@ -2319,7 +2317,8 @@ var DBManager = class {
   };
   getConnection = (config) => {
     const { info } = Logger(config)("[DBManager]");
-    const id = this.makeId(config.context.tenantId, config.context.userId);
+    const { tenantId, userId } = ctx.getLastUsed();
+    const id = this.makeId(tenantId, userId);
     const existing = this.connections.get(id);
     info(`# of instances: ${this.connections.size}`);
     if (existing) {
@@ -3423,8 +3422,6 @@ var Server = class {
   #config;
   #handlers;
   #manager;
-  // #headers: undefined | Headers;
-  // #preserveHeaders: boolean;
   constructor(config) {
     this.#config = new Config({
       ...config,
@@ -3480,6 +3477,7 @@ var Server = class {
     }
   }
   get db() {
+    this.#config.context = { ...this.getContext() };
     const pool = this.#manager.getConnection(this.#config);
     return Object.assign(pool, {
       clearConnections: () => {
@@ -3519,16 +3517,12 @@ var Server = class {
     this.#config.paths = paths;
   }
   async withContext(context, fn) {
-    const { ddl, ...ctx2 } = context ?? defaultContext;
-    this.#config.context = { ...ctx2 };
+    const { ...initialContext } = context ?? defaultContext;
+    this.#config.context = { ...initialContext };
     const preserve = (context && "preserveHeaders" in context && context.preserveHeaders) ?? true;
     if (preserve) {
       this.#config.context = { ...this.getContext(), ...context };
     }
-    if (ddl) {
-      delete this.#config.context.tenantId;
-      delete this.#config.context.userId;
-    }
     return withNileContext(this.#config, async () => {
       if (fn) {
         return fn(this);
@@ -3536,6 +3530,17 @@ var Server = class {
       return this;
     });
   }
+  async noContext(fn) {
+    this.#config.context.tenantId = void 0;
+    this.#config.context.userId = void 0;
+    return withNileContext(this.#config, async () => {
+      ctx.set({ userId: void 0, tenantId: void 0 });
+      if (fn) {
+        return fn(this);
+      }
+      return this;
+    });
+  }
   /**
    *
    * @returns the last used (basically global) context object, useful for debugging or making your own context
@@ -3545,6 +3550,7 @@ var Server = class {
   }
   /**
    * Merge headers together
+   * Saves them in a singleton for use in a request later. It's basically the "default" value
    * Internally, passed a NileConfig, externally, should be using Headers
    */
   #handleHeaders(config) {