@fachkraftfreund/n8n-nodes-supabase 1.3.10 → 1.3.12

package/dist/nodes/Supabase/Supabase.node.js

@@ -594,6 +594,36 @@ class Supabase {
                                     default: 'left',
                                     description: 'Left returns all rows even without a match; Inner only returns rows with a match',
                                 },
+                                {
+                                    displayName: 'Order By',
+                                    name: 'orderBy',
+                                    type: 'string',
+                                    default: '',
+                                    placeholder: 'created_at',
+                                    description: 'Column in the joined table to order by (leave empty for no ordering)',
+                                },
+                                {
+                                    displayName: 'Order Ascending',
+                                    name: 'orderAscending',
+                                    type: 'boolean',
+                                    default: false,
+                                    description: 'Whether to sort in ascending order (default descending, useful for "latest first")',
+                                    displayOptions: {
+                                        hide: {
+                                            orderBy: [''],
+                                        },
+                                    },
+                                },
+                                {
+                                    displayName: 'Limit',
+                                    name: 'limit',
+                                    type: 'number',
+                                    typeOptions: {
+                                        minValue: 0,
+                                    },
+                                    default: 0,
+                                    description: 'Max rows to return from the joined table per parent row (0 = no limit). Set to 1 to get only the latest match.',
+                                },
                             ],
                         },
                     ],

package/dist/nodes/Supabase/SupabaseCsvExport.node.js

@@ -54,7 +54,8 @@ function streamWrite(stream, data) {
         }
     });
 }
-function buildSelectQuery(supabase, table, selectFields, filters, sort) {
+function buildSelectQuery(supabase, table, selectFields, filters, sort, joins) {
+    var _a;
     let query = supabase.from(table).select(selectFields);
     for (const filter of filters) {
         const operator = (0, supabaseClient_2.convertFilterOperator)(filter.operator);
@@ -63,6 +64,21 @@ function buildSelectQuery(supabase, table, selectFields, filters, sort) {
     for (const s of sort) {
         query = query.order(s.column, { ascending: s.ascending });
     }
+    if (joins) {
+        for (const j of joins) {
+            if (!j.table)
+                continue;
+            if (j.orderBy) {
+                query = query.order(j.orderBy, {
+                    ascending: (_a = j.orderAscending) !== null && _a !== void 0 ? _a : false,
+                    referencedTable: j.table,
+                });
+            }
+            if (j.limit && j.limit > 0) {
+                query = query.limit(j.limit, { referencedTable: j.table });
+            }
+        }
+    }
     return query;
 }
 function parseFilters(context, itemIndex) {
@@ -91,17 +107,18 @@ function parseFilters(context, itemIndex) {
         throw new Error('Invalid advanced filters JSON');
     }
 }
-const BATCH_SIZE = 1000;
-async function* fetchBatches(supabase, table, selectFields, filters, sort, hostUrl, returnAll, limit) {
+const DEFAULT_BATCH_SIZE = 1000;
+async function* fetchBatches(supabase, table, selectFields, filters, sort, hostUrl, returnAll, limit, joins) {
     const overhead = (0, supabaseClient_2.estimateUrlOverhead)(hostUrl, table, selectFields, filters, sort);
     const maxInChars = Math.max(500, supabaseClient_2.MAX_SAFE_URL_LENGTH - overhead);
     const maxItems = (0, supabaseClient_2.computeMaxIdsPerChunk)(selectFields);
     const filterChunks = (0, supabaseClient_2.expandChunkedFilters)(filters, maxInChars, maxItems);
+    const BATCH_SIZE = (0, supabaseClient_2.computeBatchSize)(selectFields);
     const hasIdColumn = selectFields === '*' || selectFields.split(',').some((f) => f.trim() === 'id');
     let totalYielded = 0;
     const maxRows = returnAll ? Infinity : limit;
     const startTime = Date.now();
-    console.log(`[Supabase CSV] starting export table=${table} returnAll=${returnAll} chunks=${filterChunks.length} keyset=${hasIdColumn}`);
+    console.log(`[Supabase CSV] starting export table=${table} returnAll=${returnAll} chunks=${filterChunks.length} keyset=${hasIdColumn} batchSize=${BATCH_SIZE}`);
     for (let ci = 0; ci < filterChunks.length; ci++) {
         const chunkFilters = filterChunks[ci];
         if (totalYielded >= maxRows)
@@ -112,7 +129,7 @@ async function* fetchBatches(supabase, table, selectFields, filters, sort, hostU
             if (hasIdColumn) {
                 let lastId = null;
                 while (hasMore) {
-                    let query = buildSelectQuery(supabase, table, selectFields, chunkFilters, []);
+                    let query = buildSelectQuery(supabase, table, selectFields, chunkFilters, [], joins);
                     if (lastId !== null)
                         query = query.gt('id', lastId);
                     query = query.order('id', { ascending: true }).limit(BATCH_SIZE);
@@ -138,7 +155,7 @@ async function* fetchBatches(supabase, table, selectFields, filters, sort, hostU
             else {
                 let offset = 0;
                 while (hasMore) {
-                    const query = buildSelectQuery(supabase, table, selectFields, chunkFilters, sort);
+                    const query = buildSelectQuery(supabase, table, selectFields, chunkFilters, sort, joins);
                     const { data, error } = await query.range(offset, offset + BATCH_SIZE - 1);
                     if (error)
                         throw new Error((0, supabaseClient_2.formatSupabaseError)(error));
@@ -163,7 +180,7 @@ async function* fetchBatches(supabase, table, selectFields, filters, sort, hostU
             const remaining = maxRows - totalYielded;
             if (remaining <= 0)
                 break;
-            const query = buildSelectQuery(supabase, table, selectFields, chunkFilters, sort);
+            const query = buildSelectQuery(supabase, table, selectFields, chunkFilters, sort, joins);
             const { data, error } = await query.limit(remaining);
             if (error)
                 throw new Error((0, supabaseClient_2.formatSupabaseError)(error));
@@ -256,6 +273,36 @@ class SupabaseCsvExport {
                                     ],
                                     default: 'left',
                                 },
+                                {
+                                    displayName: 'Order By',
+                                    name: 'orderBy',
+                                    type: 'string',
+                                    default: '',
+                                    placeholder: 'created_at',
+                                    description: 'Column in the joined table to order by (leave empty for no ordering)',
+                                },
+                                {
+                                    displayName: 'Order Ascending',
+                                    name: 'orderAscending',
+                                    type: 'boolean',
+                                    default: false,
+                                    description: 'Whether to sort in ascending order (default descending, useful for "latest first")',
+                                    displayOptions: {
+                                        hide: {
+                                            orderBy: [''],
+                                        },
+                                    },
+                                },
+                                {
+                                    displayName: 'Limit',
+                                    name: 'limit',
+                                    type: 'number',
+                                    typeOptions: {
+                                        minValue: 0,
+                                    },
+                                    default: 0,
+                                    description: 'Max rows from the joined table per parent row (0 = no limit, 1 = latest only)',
+                                },
                             ],
                         },
                     ],
@@ -619,7 +666,7 @@ class SupabaseCsvExport {
                     throw new n8n_workflow_1.NodeOperationError(this.getNode(), `Transform code syntax error: ${msg}`);
                 }
             }
-            for await (const batch of fetchBatches(supabase, table, selectWithJoins, filters, sort, credentials.host, returnAll, limit)) {
+            for await (const batch of fetchBatches(supabase, table, selectWithJoins, filters, sort, credentials.host, returnAll, limit, joins)) {
                 let rows = batch;
                 if (transformFn) {
                     try {

package/dist/nodes/Supabase/operations/database/index.js

@@ -315,7 +315,8 @@ function getFilters(context, itemIndex) {
         throw new Error('Invalid advanced filters JSON');
     }
 }
-function buildReadQuery(supabase, table, returnFields, filters, sort, options) {
+function buildReadQuery(supabase, table, returnFields, filters, sort, options, joins) {
+    var _a;
     const selectFields = returnFields && returnFields !== '*' ? returnFields : '*';
     let query = supabase.from(table).select(selectFields, options);
     for (const filter of filters) {
@@ -325,6 +326,21 @@ function buildReadQuery(supabase, table, returnFields, filters, sort, options) {
     for (const sortField of sort) {
         query = query.order(sortField.column, { ascending: sortField.ascending });
     }
+    if (joins) {
+        for (const j of joins) {
+            if (!j.table)
+                continue;
+            if (j.orderBy) {
+                query = query.order(j.orderBy, {
+                    ascending: (_a = j.orderAscending) !== null && _a !== void 0 ? _a : false,
+                    referencedTable: j.table,
+                });
+            }
+            if (j.limit && j.limit > 0) {
+                query = query.limit(j.limit, { referencedTable: j.table });
+            }
+        }
+    }
     return query;
 }
 async function handleRead(supabase, itemIndex, hostUrl) {
@@ -353,10 +369,10 @@ async function handleRead(supabase, itemIndex, hostUrl) {
     const maxInChars = Math.max(500, supabaseClient_1.MAX_SAFE_URL_LENGTH - overhead);
     const maxItems = (0, supabaseClient_1.computeMaxIdsPerChunk)(selectWithJoins);
     const filterChunks = (0, supabaseClient_1.expandChunkedFilters)(filters, maxInChars, maxItems);
-    console.log(`[Supabase READ] item=${itemIndex} table=${table} returnAll=${returnAll} chunks=${filterChunks.length} maxItems=${maxItems} maxInChars=${maxInChars}`);
+    const batchSize = (0, supabaseClient_1.computeBatchSize)(selectWithJoins);
+    console.log(`[Supabase READ] item=${itemIndex} table=${table} returnAll=${returnAll} chunks=${filterChunks.length} maxItems=${maxItems} maxInChars=${maxInChars} batchSize=${batchSize}`);
     const returnData = [];
     if (returnAll) {
-        const batchSize = 1000;
         const selectFields = returnFields && returnFields !== '*' ? returnFields : '*';
         const hasIdColumn = selectFields === '*' || selectFields.split(',').some(f => f.trim() === 'id');
         for (let ci = 0; ci < filterChunks.length; ci++) {
@@ -370,7 +386,7 @@ async function handleRead(supabase, itemIndex, hostUrl) {
             if (hasIdColumn) {
                 let lastId = null;
                 while (hasMore) {
-                    let query = buildReadQuery(supabase, table, selectWithJoins, chunkFilters, []);
+                    let query = buildReadQuery(supabase, table, selectWithJoins, chunkFilters, [], undefined, joins);
                     if (lastId !== null) {
                         query = query.gt('id', lastId);
                     }
@@ -398,7 +414,7 @@ async function handleRead(supabase, itemIndex, hostUrl) {
             else {
                 let batchOffset = 0;
                 while (hasMore) {
-                    const query = buildReadQuery(supabase, table, selectWithJoins, chunkFilters, sort);
+                    const query = buildReadQuery(supabase, table, selectWithJoins, chunkFilters, sort, undefined, joins);
                     const { data, error } = await query.range(batchOffset, batchOffset + batchSize - 1);
                     if (error) {
                         console.log(`[Supabase READ] chunk ${ci + 1} batch ${batchCount + 1} FAILED after ${Date.now() - chunkStart}ms: ${(0, supabaseClient_1.formatSupabaseError)(error)}`);
@@ -447,7 +463,7 @@ async function handleRead(supabase, itemIndex, hostUrl) {
         const userOffset = this.getNodeParameter('offset', itemIndex, 0);
         const isMultiChunk = filterChunks.length > 1;
         for (const chunkFilters of filterChunks) {
-            let query = buildReadQuery(supabase, table, selectWithJoins, chunkFilters, sort);
+            let query = buildReadQuery(supabase, table, selectWithJoins, chunkFilters, sort, undefined, joins);
             if (isMultiChunk) {
                 query = query.limit(userOffset + limit);
             }

package/dist/nodes/Supabase/utils/supabaseClient.d.ts

@@ -14,6 +14,7 @@ export declare function convertFilterOperator(operator: string): string;
 export declare function normalizeFilterValue(operator: string, value: string | number | boolean | null | unknown[]): string | number | boolean | null;
 export declare const MAX_SAFE_URL_LENGTH = 7500;
 export declare function computeMaxIdsPerChunk(selectFields?: string): number;
+export declare function computeBatchSize(selectFields?: string): number;
 export declare function estimateUrlOverhead(hostUrl: string, table: string, selectFields?: string, filters?: IRowFilter[], sort?: IRowSort[]): number;
 export declare function chunkInFilterValues(values: unknown[], maxChars: number, maxItems?: number): unknown[][];
 export declare function expandChunkedFilters(filters: IRowFilter[], maxInChars?: number, maxItems?: number): IRowFilter[][];

package/dist/nodes/Supabase/utils/supabaseClient.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.expandChunkedFilters = exports.chunkInFilterValues = exports.estimateUrlOverhead = exports.computeMaxIdsPerChunk = exports.MAX_SAFE_URL_LENGTH = exports.normalizeFilterValue = exports.convertFilterOperator = exports.validateColumnName = exports.validateTableName = exports.sanitizeColumnName = exports.isNetworkError = exports.isAuthError = exports.formatSupabaseError = exports.getDatabaseUrl = exports.getStorageUrl = exports.validateCredentials = exports.createSupabaseClient = void 0;
+exports.expandChunkedFilters = exports.chunkInFilterValues = exports.estimateUrlOverhead = exports.computeBatchSize = exports.computeMaxIdsPerChunk = exports.MAX_SAFE_URL_LENGTH = exports.normalizeFilterValue = exports.convertFilterOperator = exports.validateColumnName = exports.validateTableName = exports.sanitizeColumnName = exports.isNetworkError = exports.isAuthError = exports.formatSupabaseError = exports.getDatabaseUrl = exports.getStorageUrl = exports.validateCredentials = exports.createSupabaseClient = void 0;
 const supabase_js_1 = require("@supabase/supabase-js");
 function createSupabaseClient(credentials) {
     const client = (0, supabase_js_1.createClient)(credentials.host, credentials.serviceKey, {
@@ -171,6 +171,16 @@ function computeMaxIdsPerChunk(selectFields) {
     return Math.max(100, Math.floor(BASE_LIMIT / (1 + joinCount * 1.5)));
 }
 exports.computeMaxIdsPerChunk = computeMaxIdsPerChunk;
+function computeBatchSize(selectFields) {
+    const BASE = 2000;
+    if (!selectFields || selectFields === '*')
+        return BASE;
+    const joinCount = (selectFields.match(/\(/g) || []).length;
+    if (joinCount === 0)
+        return BASE;
+    return Math.max(50, Math.floor(BASE / (1 + joinCount * 0.5)));
+}
+exports.computeBatchSize = computeBatchSize;
 function estimateUrlOverhead(hostUrl, table, selectFields, filters, sort) {
     let overhead = hostUrl.length + '/rest/v1/'.length + table.length + 1;
     if (selectFields) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fachkraftfreund/n8n-nodes-supabase",
-  "version": "1.3.10",
+  "version": "1.3.12",
   "description": "Comprehensive n8n community node for Supabase with database and storage operations",
   "keywords": [
     "n8n-community-node-package",