@rovela-ai/sdk 0.1.24 → 0.1.26

package/dist/core/db/queries.js

@@ -1,20 +1,18 @@
 /**
  * @rovela/sdk/core/db/queries
  *
- * Type-safe query helpers with automatic tenant isolation
- * All queries are scoped to the current tenant
+ * Type-safe query helpers for e-commerce stores
+ * Each store has its own database (via Neon branches) - no tenant filtering needed
  */
 import { eq, and, desc, asc, ilike, sql, inArray } from 'drizzle-orm';
-import { getDb, getTenantId } from './client';
+import { getDb } from './client';
 import * as schema from './schema';
 /**
  * Find products with filtering, sorting, and pagination
- * Automatically scoped to current tenant
  */
 export async function findProducts(options = {}) {
     const db = getDb();
-    const tenantId = getTenantId();
-    const conditions = [eq(schema.products.tenantId, tenantId)];
+    const conditions = [];
     if (options.categoryId) {
         conditions.push(eq(schema.products.categoryId, options.categoryId));
     }
@@ -43,7 +41,7 @@ export async function findProducts(options = {}) {
     const query = db
         .select()
         .from(schema.products)
-        .where(and(...conditions))
+        .where(conditions.length > 0 ? and(...conditions) : undefined)
         .orderBy(orderBy);
     if (options.limit) {
         query.limit(options.limit);
@@ -58,11 +56,10 @@ export async function findProducts(options = {}) {
  */
 export async function findProductBySlug(slug) {
     const db = getDb();
-    const tenantId = getTenantId();
     const result = await db
         .select()
         .from(schema.products)
-        .where(and(eq(schema.products.tenantId, tenantId), eq(schema.products.slug, slug)))
+        .where(eq(schema.products.slug, slug))
         .limit(1);
     return result[0] || null;
 }
@@ -71,11 +68,10 @@ export async function findProductBySlug(slug) {
  */
 export async function findProductById(id) {
     const db = getDb();
-    const tenantId = getTenantId();
     const result = await db
         .select()
         .from(schema.products)
-        .where(and(eq(schema.products.tenantId, tenantId), eq(schema.products.id, id)))
+        .where(eq(schema.products.id, id))
         .limit(1);
     return result[0] || null;
 }
@@ -94,8 +90,7 @@ export async function findProductVariants(productId) {
  */
 export async function countProducts(options = {}) {
     const db = getDb();
-    const tenantId = getTenantId();
-    const conditions = [eq(schema.products.tenantId, tenantId)];
+    const conditions = [];
     if (options.categoryId) {
         conditions.push(eq(schema.products.categoryId, options.categoryId));
     }
@@ -108,22 +103,20 @@ export async function countProducts(options = {}) {
     const result = await db
         .select({ count: sql `count(*)` })
         .from(schema.products)
-        .where(and(...conditions));
+        .where(conditions.length > 0 ? and(...conditions) : undefined);
     return Number(result[0]?.count || 0);
 }
 // =============================================================================
 // Categories
 // =============================================================================
 /**
- * Find all categories for the current tenant
+ * Find all categories
  */
 export async function findCategories() {
     const db = getDb();
-    const tenantId = getTenantId();
     return db
         .select()
         .from(schema.categories)
-        .where(eq(schema.categories.tenantId, tenantId))
         .orderBy(asc(schema.categories.order), asc(schema.categories.name));
 }
 /**
@@ -131,11 +124,10 @@ export async function findCategories() {
  */
 export async function findCategoryBySlug(slug) {
     const db = getDb();
-    const tenantId = getTenantId();
     const result = await db
         .select()
         .from(schema.categories)
-        .where(and(eq(schema.categories.tenantId, tenantId), eq(schema.categories.slug, slug)))
+        .where(eq(schema.categories.slug, slug))
         .limit(1);
     return result[0] || null;
 }
@@ -144,8 +136,7 @@ export async function findCategoryBySlug(slug) {
  */
 export async function findOrders(options = {}) {
     const db = getDb();
-    const tenantId = getTenantId();
-    const conditions = [eq(schema.orders.tenantId, tenantId)];
+    const conditions = [];
     if (options.status) {
         conditions.push(eq(schema.orders.status, options.status));
     }
@@ -155,7 +146,7 @@ export async function findOrders(options = {}) {
     const query = db
         .select()
         .from(schema.orders)
-        .where(and(...conditions))
+        .where(conditions.length > 0 ? and(...conditions) : undefined)
         .orderBy(desc(schema.orders.createdAt));
     if (options.limit) {
         query.limit(options.limit);
@@ -170,11 +161,10 @@ export async function findOrders(options = {}) {
  */
 export async function findOrderById(id) {
     const db = getDb();
-    const tenantId = getTenantId();
     const order = await db
         .select()
         .from(schema.orders)
-        .where(and(eq(schema.orders.tenantId, tenantId), eq(schema.orders.id, id)))
+        .where(eq(schema.orders.id, id))
         .limit(1);
     if (!order[0])
         return null;
@@ -205,11 +195,10 @@ export async function findOrderItems(orderId) {
  */
 export async function findCustomerByEmail(email) {
     const db = getDb();
-    const tenantId = getTenantId();
     const result = await db
         .select()
         .from(schema.customers)
-        .where(and(eq(schema.customers.tenantId, tenantId), eq(schema.customers.email, email.toLowerCase())))
+        .where(eq(schema.customers.email, email.toLowerCase()))
         .limit(1);
     return result[0] || null;
 }
@@ -218,11 +207,10 @@ export async function findCustomerByEmail(email) {
  */
 export async function findCustomerById(id) {
     const db = getDb();
-    const tenantId = getTenantId();
     const result = await db
         .select()
         .from(schema.customers)
-        .where(and(eq(schema.customers.tenantId, tenantId), eq(schema.customers.id, id)))
+        .where(eq(schema.customers.id, id))
         .limit(1);
     return result[0] || null;
 }
@@ -231,15 +219,14 @@ export async function findCustomerById(id) {
  */
 export async function findCustomers(options = {}) {
     const db = getDb();
-    const tenantId = getTenantId();
-    const conditions = [eq(schema.customers.tenantId, tenantId)];
+    const conditions = [];
     if (options.search) {
         conditions.push(ilike(schema.customers.email, `%${options.search}%`));
     }
     const query = db
         .select()
         .from(schema.customers)
-        .where(and(...conditions))
+        .where(conditions.length > 0 ? and(...conditions) : undefined)
         .orderBy(desc(schema.customers.createdAt));
     if (options.limit) {
         query.limit(options.limit);
@@ -257,11 +244,10 @@ export async function findCustomers(options = {}) {
  */
 export async function findAdminByEmail(email) {
     const db = getDb();
-    const tenantId = getTenantId();
     const result = await db
         .select()
         .from(schema.storeAdmins)
-        .where(and(eq(schema.storeAdmins.tenantId, tenantId), eq(schema.storeAdmins.email, email.toLowerCase())))
+        .where(eq(schema.storeAdmins.email, email.toLowerCase()))
         .limit(1);
     return result[0] || null;
 }
@@ -273,28 +259,25 @@ export async function findAdminByEmail(email) {
  */
 export async function getStoreStats() {
     const db = getDb();
-    const tenantId = getTenantId();
     const [productCount, orderCount, customerCount, revenue] = await Promise.all([
         // Total products
         db
             .select({ count: sql `count(*)` })
             .from(schema.products)
-            .where(and(eq(schema.products.tenantId, tenantId), eq(schema.products.status, 'active'))),
+            .where(eq(schema.products.status, 'active')),
         // Total orders
         db
             .select({ count: sql `count(*)` })
-            .from(schema.orders)
-            .where(eq(schema.orders.tenantId, tenantId)),
+            .from(schema.orders),
         // Total customers
         db
             .select({ count: sql `count(*)` })
-            .from(schema.customers)
-            .where(eq(schema.customers.tenantId, tenantId)),
+            .from(schema.customers),
         // Total revenue (paid orders only)
         db
             .select({ total: sql `COALESCE(SUM(total), 0)` })
             .from(schema.orders)
-            .where(and(eq(schema.orders.tenantId, tenantId), inArray(schema.orders.status, ['paid', 'shipped', 'delivered']))),
+            .where(inArray(schema.orders.status, ['paid', 'shipped', 'delivered'])),
     ]);
     return {
         products: Number(productCount[0]?.count || 0),
@@ -308,7 +291,6 @@ export async function getStoreStats() {
  */
 export async function getLowStockProducts(threshold = 10) {
     const db = getDb();
-    const tenantId = getTenantId();
     // Get products with variants that have low stock
     const lowStockVariants = await db
         .select({
@@ -317,7 +299,7 @@ export async function getLowStockProducts(threshold = 10) {
     })
         .from(schema.productVariants)
         .innerJoin(schema.products, eq(schema.productVariants.productId, schema.products.id))
-        .where(and(eq(schema.products.tenantId, tenantId), eq(schema.products.status, 'active'), sql `${schema.productVariants.inventory} < ${threshold}`))
+        .where(and(eq(schema.products.status, 'active'), sql `${schema.productVariants.inventory} < ${threshold}`))
         .orderBy(asc(schema.productVariants.inventory));
     return lowStockVariants;
 }
@@ -326,11 +308,9 @@ export async function getLowStockProducts(threshold = 10) {
  */
 export async function getRecentOrders(limit = 5) {
     const db = getDb();
-    const tenantId = getTenantId();
     return db
         .select()
         .from(schema.orders)
-        .where(eq(schema.orders.tenantId, tenantId))
         .orderBy(desc(schema.orders.createdAt))
         .limit(limit);
 }
@@ -342,10 +322,9 @@ export async function getRecentOrders(limit = 5) {
  */
 export async function createOrder(data) {
     const db = getDb();
-    const tenantId = getTenantId();
     const [order] = await db
         .insert(schema.orders)
-        .values({ ...data, tenantId })
+        .values(data)
         .returning();
     return order;
 }
@@ -364,11 +343,10 @@ export async function createOrderItems(items) {
  */
 export async function updateOrderStatus(orderId, status) {
     const db = getDb();
-    const tenantId = getTenantId();
     const [order] = await db
         .update(schema.orders)
         .set({ status, updatedAt: new Date() })
-        .where(and(eq(schema.orders.tenantId, tenantId), eq(schema.orders.id, orderId)))
+        .where(eq(schema.orders.id, orderId))
         .returning();
     return order || null;
 }
@@ -378,11 +356,10 @@ export async function updateOrderStatus(orderId, status) {
  */
 export async function findOrderByPaymentIntent(paymentIntentId) {
     const db = getDb();
-    const tenantId = getTenantId();
     const [order] = await db
         .select()
         .from(schema.orders)
-        .where(and(eq(schema.orders.tenantId, tenantId), eq(schema.orders.stripePaymentIntentId, paymentIntentId)))
+        .where(eq(schema.orders.stripePaymentIntentId, paymentIntentId))
         .limit(1);
     return order || null;
 }
@@ -394,10 +371,9 @@ export async function findOrderByPaymentIntent(paymentIntentId) {
  */
 export async function createProduct(data) {
     const db = getDb();
-    const tenantId = getTenantId();
     const [product] = await db
         .insert(schema.products)
-        .values({ ...data, tenantId })
+        .values(data)
         .returning();
     return product;
 }
@@ -406,11 +382,10 @@ export async function createProduct(data) {
  */
 export async function updateProduct(id, data) {
     const db = getDb();
-    const tenantId = getTenantId();
     const [product] = await db
         .update(schema.products)
         .set({ ...data, updatedAt: new Date() })
-        .where(and(eq(schema.products.tenantId, tenantId), eq(schema.products.id, id)))
+        .where(eq(schema.products.id, id))
         .returning();
     return product || null;
 }
@@ -430,10 +405,9 @@ export async function deleteProduct(id) {
  */
 export async function hardDeleteProduct(id) {
     const db = getDb();
-    const tenantId = getTenantId();
     const result = await db
         .delete(schema.products)
-        .where(and(eq(schema.products.tenantId, tenantId), eq(schema.products.id, id)))
+        .where(eq(schema.products.id, id))
         .returning({ id: schema.products.id });
     return result.length > 0;
 }
@@ -504,11 +478,10 @@ export async function findVariantById(id) {
  */
 export async function findCategoryById(id) {
     const db = getDb();
-    const tenantId = getTenantId();
     const [category] = await db
         .select()
         .from(schema.categories)
-        .where(and(eq(schema.categories.tenantId, tenantId), eq(schema.categories.id, id)))
+        .where(eq(schema.categories.id, id))
         .limit(1);
     return category || null;
 }
@@ -517,10 +490,9 @@ export async function findCategoryById(id) {
  */
 export async function createCategory(data) {
     const db = getDb();
-    const tenantId = getTenantId();
     const [category] = await db
         .insert(schema.categories)
-        .values({ ...data, tenantId })
+        .values(data)
         .returning();
     return category;
 }
@@ -529,11 +501,10 @@ export async function createCategory(data) {
  */
 export async function updateCategory(id, data) {
     const db = getDb();
-    const tenantId = getTenantId();
     const [category] = await db
         .update(schema.categories)
         .set(data)
-        .where(and(eq(schema.categories.tenantId, tenantId), eq(schema.categories.id, id)))
+        .where(eq(schema.categories.id, id))
         .returning();
     return category || null;
 }
@@ -542,42 +513,38 @@ export async function updateCategory(id, data) {
  */
 export async function deleteCategory(id) {
     const db = getDb();
-    const tenantId = getTenantId();
     const result = await db
         .delete(schema.categories)
-        .where(and(eq(schema.categories.tenantId, tenantId), eq(schema.categories.id, id)))
+        .where(eq(schema.categories.id, id))
         .returning({ id: schema.categories.id });
     return result.length > 0;
 }
 /**
- * Count categories for the current tenant
+ * Count categories
  */
 export async function countCategories() {
     const db = getDb();
-    const tenantId = getTenantId();
     const result = await db
         .select({ count: sql `count(*)` })
-        .from(schema.categories)
-        .where(eq(schema.categories.tenantId, tenantId));
+        .from(schema.categories);
     return Number(result[0]?.count || 0);
 }
 // =============================================================================
 // Customer Queries (for admin module)
 // =============================================================================
 /**
- * Count customers for the current tenant with optional search
+ * Count customers with optional search
  */
 export async function countCustomers(options = {}) {
     const db = getDb();
-    const tenantId = getTenantId();
-    const conditions = [eq(schema.customers.tenantId, tenantId)];
+    const conditions = [];
     if (options.search) {
         conditions.push(ilike(schema.customers.email, `%${options.search}%`));
     }
     const result = await db
         .select({ count: sql `count(*)` })
         .from(schema.customers)
-        .where(and(...conditions));
+        .where(conditions.length > 0 ? and(...conditions) : undefined);
     return Number(result[0]?.count || 0);
 }
 /**
@@ -585,11 +552,10 @@ export async function countCustomers(options = {}) {
  */
 export async function findCustomerOrders(customerId) {
     const db = getDb();
-    const tenantId = getTenantId();
     return db
         .select()
         .from(schema.orders)
-        .where(and(eq(schema.orders.tenantId, tenantId), eq(schema.orders.customerId, customerId)))
+        .where(eq(schema.orders.customerId, customerId))
         .orderBy(desc(schema.orders.createdAt));
 }
 /**
@@ -609,7 +575,6 @@ export async function findCustomerOrders(customerId) {
  */
 export async function deleteCustomer(id) {
     const db = getDb();
-    const tenantId = getTenantId();
     // Anonymize customer data instead of hard delete
     const result = await db
         .update(schema.customers)
@@ -620,7 +585,7 @@ export async function deleteCustomer(id) {
         emailVerified: null,
         stripeCustomerId: null,
     })
-        .where(and(eq(schema.customers.tenantId, tenantId), eq(schema.customers.id, id)))
+        .where(eq(schema.customers.id, id))
         .returning({ id: schema.customers.id });
     return result.length > 0;
 }
@@ -632,15 +597,14 @@ export async function deleteCustomer(id) {
  */
 export async function countOrders(options = {}) {
     const db = getDb();
-    const tenantId = getTenantId();
-    const conditions = [eq(schema.orders.tenantId, tenantId)];
+    const conditions = [];
     if (options.status) {
         conditions.push(eq(schema.orders.status, options.status));
     }
     const result = await db
         .select({ count: sql `count(*)` })
         .from(schema.orders)
-        .where(and(...conditions));
+        .where(conditions.length > 0 ? and(...conditions) : undefined);
     return Number(result[0]?.count || 0);
 }
 /**
@@ -648,7 +612,6 @@ export async function countOrders(options = {}) {
  */
 export async function getRevenueByPeriod(days) {
     const db = getDb();
-    const tenantId = getTenantId();
     const startDate = new Date();
     startDate.setDate(startDate.getDate() - days);
     const result = await db
@@ -657,7 +620,7 @@ export async function getRevenueByPeriod(days) {
         revenue: sql `COALESCE(SUM(${schema.orders.total}), 0)`,
     })
         .from(schema.orders)
-        .where(and(eq(schema.orders.tenantId, tenantId), inArray(schema.orders.status, ['paid', 'shipped', 'delivered']), sql `${schema.orders.createdAt} >= ${startDate.toISOString()}`))
+        .where(and(inArray(schema.orders.status, ['paid', 'shipped', 'delivered']), sql `${schema.orders.createdAt} >= ${startDate.toISOString()}`))
         .groupBy(sql `DATE(${schema.orders.createdAt})`)
         .orderBy(sql `DATE(${schema.orders.createdAt})`);
     return result.map((r) => ({
@@ -670,14 +633,12 @@ export async function getRevenueByPeriod(days) {
  */
 export async function getOrdersByStatus() {
     const db = getDb();
-    const tenantId = getTenantId();
     const result = await db
         .select({
         status: schema.orders.status,
         count: sql `count(*)`,
     })
         .from(schema.orders)
-        .where(eq(schema.orders.tenantId, tenantId))
         .groupBy(schema.orders.status);
     return result.map((r) => ({
         status: r.status,
@@ -685,16 +646,15 @@ export async function getOrdersByStatus() {
     }));
 }
 /**
- * Find store settings for the current tenant.
+ * Find store settings.
  * Returns null if no settings exist (first time access).
+ * Each store has only one settings row.
  */
 export async function findSettings() {
     const db = getDb();
-    const tenantId = getTenantId();
     const [settings] = await db
         .select()
         .from(schema.storeSettings)
-        .where(eq(schema.storeSettings.tenantId, tenantId))
         .limit(1);
     if (!settings)
         return null;
@@ -712,15 +672,17 @@ export async function findSettings() {
     };
 }
 /**
- * Upsert (create or update) store settings for the current tenant.
- * Uses ON CONFLICT to update if row already exists.
+ * Upsert (create or update) store settings.
+ * Each store has only one settings row.
  */
 export async function upsertSettings(data) {
     const db = getDb();
-    const tenantId = getTenantId();
-    // Build the values object
+    // Check if settings exist
+    const existing = await db
+        .select({ id: schema.storeSettings.id })
+        .from(schema.storeSettings)
+        .limit(1);
     const values = {
-        tenantId,
         storeName: data.storeName ?? undefined,
         storeEmail: data.storeEmail ?? undefined,
         storeCurrency: data.storeCurrency ?? undefined,
@@ -735,25 +697,22 @@ export async function upsertSettings(data) {
             : undefined,
         updatedAt: new Date(),
     };
-    // Use raw SQL for upsert since Drizzle's onConflict syntax varies
-    const [result] = await db
-        .insert(schema.storeSettings)
-        .values(values)
-        .onConflictDoUpdate({
-        target: schema.storeSettings.tenantId,
-        set: {
-            storeName: sql `COALESCE(EXCLUDED.store_name, ${schema.storeSettings.storeName})`,
-            storeEmail: sql `COALESCE(EXCLUDED.store_email, ${schema.storeSettings.storeEmail})`,
-            storeCurrency: sql `COALESCE(EXCLUDED.store_currency, ${schema.storeSettings.storeCurrency})`,
-            storeTimezone: sql `COALESCE(EXCLUDED.store_timezone, ${schema.storeSettings.storeTimezone})`,
-            taxEnabled: sql `COALESCE(EXCLUDED.tax_enabled, ${schema.storeSettings.taxEnabled})`,
-            taxRate: sql `COALESCE(EXCLUDED.tax_rate, ${schema.storeSettings.taxRate})`,
-            shippingEnabled: sql `COALESCE(EXCLUDED.shipping_enabled, ${schema.storeSettings.shippingEnabled})`,
-            freeShippingThreshold: sql `COALESCE(EXCLUDED.free_shipping_threshold, ${schema.storeSettings.freeShippingThreshold})`,
-            updatedAt: new Date(),
-        },
-    })
-        .returning();
+    let result;
+    if (existing.length > 0) {
+        // Update existing
+        [result] = await db
+            .update(schema.storeSettings)
+            .set(values)
+            .where(eq(schema.storeSettings.id, existing[0].id))
+            .returning();
+    }
+    else {
+        // Insert new
+        [result] = await db
+            .insert(schema.storeSettings)
+            .values(values)
+            .returning();
+    }
     return {
         storeName: result.storeName,
         storeEmail: result.storeEmail,