@hiliosai/sdk 0.1.20 → 0.1.22

package/dist/index.d.ts

@@ -156,14 +156,6 @@ declare abstract class AbstractDatasource<TContext = AppContext> implements Base
     }): Promise<R>;
 }
 
-interface PrismaClientLike {
-    $connect(): Promise<void>;
-    $disconnect(): Promise<void>;
-    $queryRaw: any;
-    $transaction: any;
-    $extends: any;
-    [key: string]: any;
-}
 interface SoftDeleteExtension {
     softDelete: {
         [model: string]: {
@@ -180,10 +172,25 @@ interface AuditTrailExtension {
     };
 }
 interface TenantExtension {
-    $tenant: {
-        setContext: (tenantId: string) => void;
-        getCurrentTenant: () => string | null;
-    };
+    $setTenant: (tenantId: string) => void;
+    $getCurrentTenant: () => string | null;
+    $clearTenant: () => void;
+    $enableBypassMode: () => void;
+    $disableBypassMode: () => void;
+    $enableStrictMode: () => void;
+    $disableStrictMode: () => void;
+    $withBypassMode: <T>(fn: () => Promise<T>) => Promise<T>;
+    $withTenant: <T>(tenantId: string, fn: () => Promise<T>) => Promise<T>;
+    $withSystemMode: <T>(fn: () => Promise<T>) => Promise<T>;
+}
+type PrismaClientWithTenant<T = any> = T & TenantExtension;
+interface PrismaClientLike extends Partial<TenantExtension> {
+    $connect(): Promise<void>;
+    $disconnect(): Promise<void>;
+    $queryRaw: any;
+    $transaction: any;
+    $extends: any;
+    [key: string]: any;
 }
 declare global {
     var __prisma: PrismaClientLike | undefined;
@@ -232,6 +239,8 @@ declare class PrismaDatasource<TPrismaClient extends PrismaClientLike = PrismaCl
     protected applyExtensions(client: TPrismaClient): TPrismaClient;
     /**
      * Get extended client with all applied extensions
+     * Note: Since extensions are already applied in initializePrismaClient,
+     * this just returns the client directly to avoid double-applying extensions
      */
     get extendedClient(): TPrismaClient;
     /**
@@ -241,6 +250,7 @@ declare class PrismaDatasource<TPrismaClient extends PrismaClientLike = PrismaCl
     /**
      * Called automatically when context is injected
      * Sets tenant context from service context if available
+     * Skips update if currently in bypass mode to avoid overriding admin operations
      */
     private updateTenantFromContext;
     /**
@@ -318,23 +328,6 @@ declare const softDeleteExtension: {
     };
 };
 
-/**
- * Multi-Tenant Extension for Prisma
- * Automatically filters queries by tenant context for multi-tenant applications
- *
- * Usage:
- * ```typescript
- * import { createTenantExtension } from './extensions/tenant.extension';
- *
- * class MyPrismaDS extends PrismaDatasource<PrismaClient> {
- *   protected applyExtensions(client: PrismaClient) {
- *     return client.$extends(createTenantExtension());
- *   }
- * }
- * ```
- *
- * Requires models to have `tenantId String` field
- */
 declare function createTenantExtension(): {
     name: string;
     client: {
@@ -909,4 +902,4 @@ declare function DatasourceMixin(datasourceConstructors?: DatasourceConstructorR
 
 declare function omit<T extends Record<string, unknown>, K extends keyof T>(obj: T, keys: K[]): Omit<T, K>;
 
-export { AbstractDatasource, type ActionHandler, type ActionSchemaWithContext, type ActionWithPermissions, type AppContext, type AppMeta, type AuditTrailExtension, type BaseDatasource, type BaseSpec, CHANNELS, type CarouselItem, type ChannelSendOptions, ContextHelpersMiddleware, CreateHealthCheckMiddleware, DEFAULT_DATASOURCE_CACHE_TTL, type DatasourceConstructorRegistry, type DatasourceContext, type DatasourceInstanceRegistry, type DatasourceInstanceTypes, DatasourceMixin, type Env, HEALTH_CHECK_DEFAULTS, INTEGRATION_CHANNELS, IntegrationCapability, type IntegrationChannelName, type IntegrationConfig, type IntegrationMessageFailedPayload, type IntegrationMessageReceivedPayload, type IntegrationMessageSentPayload, IntegrationPlatform, type IntegrationRegisteredPayload, type IntegrationServiceConfig, type IntegrationServiceSchema, IntegrationStatus, type IntegrationUnregisteredPayload, MemoizeMixin, type MemoizeMixinOptions, type Message, type MessageAttachment, type MessageButton, type MessageContent, MessageContentType, type MessageDirection, type MessageParticipant, type MessageStatus, type MessageType, NAMESPACE, PERMISSIONS, type Permission, type PermissionHelpers, PermissionsMiddleware, type PlatformMessage, PrismaDatasource, REDIS_URL, ROLE_PERMISSIONS, type SendResult, type SendToChannelMethod, type ServiceActionsSchema, type ServiceConfig, type ServiceSchema, type ServiceWithDatasources, type SoftDeleteExtension, type Tenant, type TenantExtension, type User, UserRole, type WebhookEvent, createDatasourceMiddleware, createTenantExtension, defineIntegration, defineService, isDev, isProd, isTest, configs as moleculer, nodeEnv, omit, retryExtension, softDeleteExtension };
+export { AbstractDatasource, type ActionHandler, type ActionSchemaWithContext, type ActionWithPermissions, type AppContext, type AppMeta, type AuditTrailExtension, type BaseDatasource, type BaseSpec, CHANNELS, type CarouselItem, type ChannelSendOptions, ContextHelpersMiddleware, CreateHealthCheckMiddleware, DEFAULT_DATASOURCE_CACHE_TTL, type DatasourceConstructorRegistry, type DatasourceContext, type DatasourceInstanceRegistry, type DatasourceInstanceTypes, DatasourceMixin, type Env, HEALTH_CHECK_DEFAULTS, INTEGRATION_CHANNELS, IntegrationCapability, type IntegrationChannelName, type IntegrationConfig, type IntegrationMessageFailedPayload, type IntegrationMessageReceivedPayload, type IntegrationMessageSentPayload, IntegrationPlatform, type IntegrationRegisteredPayload, type IntegrationServiceConfig, type IntegrationServiceSchema, IntegrationStatus, type IntegrationUnregisteredPayload, MemoizeMixin, type MemoizeMixinOptions, type Message, type MessageAttachment, type MessageButton, type MessageContent, MessageContentType, type MessageDirection, type MessageParticipant, type MessageStatus, type MessageType, NAMESPACE, PERMISSIONS, type Permission, type PermissionHelpers, PermissionsMiddleware, type PlatformMessage, type PrismaClientWithTenant, PrismaDatasource, REDIS_URL, ROLE_PERMISSIONS, type SendResult, type SendToChannelMethod, type ServiceActionsSchema, type ServiceConfig, type ServiceSchema, type ServiceWithDatasources, type SoftDeleteExtension, type Tenant, type TenantExtension, type User, UserRole, type WebhookEvent, createDatasourceMiddleware, createTenantExtension, defineIntegration, defineService, isDev, isProd, isTest, configs as moleculer, nodeEnv, omit, retryExtension, softDeleteExtension };

package/dist/index.js

@@ -1417,12 +1417,16 @@ var AbstractDatasource = class {
 };
 
 // src/datasources/extensions/tenant.extension.ts
+var globalTenantContext = {
+  currentTenantId: null,
+  bypassMode: false,
+  strictMode: false
+};
+function isInBypassMode() {
+  return globalTenantContext.bypassMode;
+}
 function createTenantExtension() {
-  const tenantContext = {
-    currentTenantId: null,
-    bypassMode: false,
-    strictMode: false
-  };
+  const tenantContext = globalTenantContext;
   return {
     name: "Tenant",
     client: {
@@ -1621,9 +1625,11 @@ var PrismaDatasource = class extends AbstractDatasource {
   }
   /**
    * Get extended client with all applied extensions
+   * Note: Since extensions are already applied in initializePrismaClient,
+   * this just returns the client directly to avoid double-applying extensions
    */
   get extendedClient() {
-    return this.applyExtensions(this.client);
+    return this.client;
   }
   /**
    * Initialize datasource - called after broker injection
@@ -1634,8 +1640,12 @@ var PrismaDatasource = class extends AbstractDatasource {
   /**
    * Called automatically when context is injected
    * Sets tenant context from service context if available
+   * Skips update if currently in bypass mode to avoid overriding admin operations
    */
   updateTenantFromContext() {
+    if (isInBypassMode()) {
+      return;
+    }
     const tenantId = this.context?.meta?.tenantId;
     if (tenantId && typeof tenantId === "string") {
       this.setTenantContext(tenantId);
@@ -1675,9 +1685,8 @@ var PrismaDatasource = class extends AbstractDatasource {
   async healthCheck() {
     try {
       this.broker.logger.info("Running Prisma health check");
-      const client = this.client;
-      if (client.$withSystemMode) {
-        await client.$withSystemMode(async () => {
+      if (this.client.$withSystemMode) {
+        await this.client.$withSystemMode(async () => {
           await this.client.$queryRaw`SELECT 1`;
         });
       } else {
@@ -1737,9 +1746,8 @@ var PrismaDatasource = class extends AbstractDatasource {
    */
   setTenantContext(tenantId) {
     this._client ?? (this._client = this.initializePrismaClient());
-    const tenantClient = this._client;
-    if (tenantClient.$setTenant) {
-      tenantClient.$setTenant(tenantId);
+    if (this._client.$setTenant) {
+      this._client.$setTenant(tenantId);
       this.broker.logger.debug("Tenant context set:", { tenantId });
     } else {
       this.broker.logger.warn(
@@ -1754,9 +1762,8 @@ var PrismaDatasource = class extends AbstractDatasource {
     if (!this._client) {
       return null;
     }
-    const tenantClient = this._client;
-    if (tenantClient.$getCurrentTenant) {
-      return tenantClient.$getCurrentTenant();
+    if (this._client.$getCurrentTenant) {
+      return this._client.$getCurrentTenant();
     }
     return null;
   }
@@ -1772,9 +1779,8 @@ var PrismaDatasource = class extends AbstractDatasource {
       if (previousTenant) {
         this.setTenantContext(previousTenant);
       } else {
-        const tenantClient = this.client;
-        if (tenantClient.$clearTenant) {
-          tenantClient.$clearTenant();
+        if (this.client.$clearTenant) {
+          this.client.$clearTenant();
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hiliosai/sdk",
-  "version": "0.1.20",
+  "version": "0.1.22",
   "type": "module",
   "license": "UNLICENSED",
   "main": "./dist/index.js",