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

package/dist/index.mjs

@@ -351,9 +351,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)}`);
@@ -385,14 +384,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 () => {
@@ -2244,8 +2243,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) {
@@ -2313,7 +2311,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) {
@@ -3417,8 +3416,6 @@ var Server = class {
   #config;
   #handlers;
   #manager;
-  // #headers: undefined | Headers;
-  // #preserveHeaders: boolean;
   constructor(config) {
     this.#config = new Config({
       ...config,
@@ -3474,6 +3471,7 @@ var Server = class {
     }
   }
   get db() {
+    this.#config.context = { ...this.getContext() };
     const pool = this.#manager.getConnection(this.#config);
     return Object.assign(pool, {
       clearConnections: () => {
@@ -3513,16 +3511,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);
@@ -3530,6 +3524,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
@@ -3539,6 +3544,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) {