linkgress-orm 0.1.17 → 0.1.19

package/dist/query/query-builder.js

@@ -27,6 +27,7 @@ var FieldType;
     FieldType[FieldType["FIELD_REF_MAPPER"] = 6] = "FIELD_REF_MAPPER";
     FieldType[FieldType["FIELD_REF_NO_MAPPER"] = 7] = "FIELD_REF_NO_MAPPER";
     FieldType[FieldType["SIMPLE"] = 8] = "SIMPLE";
+    FieldType[FieldType["COLLECTION_SINGLE"] = 9] = "COLLECTION_SINGLE";
 })(FieldType || (FieldType = {}));
 /**
  * Performance utility: Get column name map from schema, using cached version if available
@@ -175,7 +176,7 @@ class QueryBuilder {
      * Multiple where() calls are chained with AND logic
      */
     where(condition) {
-        const mockRow = this.createMockRow();
+        const mockRow = this._createMockRow();
         const newCondition = condition(mockRow);
         if (this.whereCond) {
             this.whereCond = (0, conditions_1.and)(this.whereCond, newCondition);
@@ -194,8 +195,9 @@ class QueryBuilder {
     }
     /**
      * Create mock row for analysis
+     * @internal - Also used by DbEntityTable.props() to avoid code duplication
      */
-    createMockRow() {
+    _createMockRow() {
         // Performance: Return cached mock if available
         if (this._cachedMockRow) {
             return this._cachedMockRow;
@@ -245,24 +247,27 @@ class QueryBuilder {
                 targetSchema = getTargetSchemaForRelation(this.schema, relName, relConfig);
             }
             if (relConfig.type === 'many') {
+                // Non-enumerable to prevent Object.entries triggering getters (avoids stack overflow)
                 Object.defineProperty(mock, relName, {
                     get: () => {
                         return new CollectionQueryBuilder(relName, relConfig.targetTable, relConfig.foreignKey || relConfig.foreignKeys?.[0] || '', this.schema.name, targetSchema, this.schemaRegistry // Pass schema registry for nested navigation resolution
                         );
                     },
-                    enumerable: true,
+                    enumerable: false,
                     configurable: true,
                 });
             }
             else {
                 // Single reference navigation (many-to-one, one-to-one)
+                // Non-enumerable to prevent Object.entries triggering getters (avoids stack overflow
+                // with circular relations like User->Posts->User)
                 Object.defineProperty(mock, relName, {
                     get: () => {
                         const refBuilder = new ReferenceQueryBuilder(relName, relConfig.targetTable, relConfig.foreignKeys || [relConfig.foreignKey || ''], relConfig.matches || [], relConfig.isMandatory ?? false, targetSchema, this.schemaRegistry // Pass schema registry for nested navigation resolution
                         );
                         return refBuilder.createMockTargetRow();
                     },
-                    enumerable: true,
+                    enumerable: false,
                     configurable: true,
                 });
             }
@@ -293,7 +298,7 @@ class QueryBuilder {
         const rightAlias = `${rightSchema.name}_${this.joinCounter}`;
         const newJoinCounter = this.joinCounter + 1;
         // Create mock rows for condition evaluation
-        const mockLeft = this.createMockRow();
+        const mockLeft = this._createMockRow();
         const mockRight = this.createMockRowForTable(rightSchema, rightAlias);
         const joinCondition = condition(mockLeft, mockRight);
         // Add the join to the list
@@ -306,7 +311,7 @@ class QueryBuilder {
             }];
         // Store schemas for creating fresh mocks in the selector
         const leftSchema = this.schema;
-        const createLeftMock = () => this.createMockRow();
+        const createLeftMock = () => this._createMockRow();
         const createRightMock = () => this.createMockRowForTable(rightSchema, rightAlias);
         // Create a selector wrapper that generates fresh mocks and calls the user's selector
         const wrappedSelector = (row) => {
@@ -342,7 +347,7 @@ class QueryBuilder {
         const rightAlias = `${rightSchema.name}_${this.joinCounter}`;
         const newJoinCounter = this.joinCounter + 1;
         // Create mock rows for condition evaluation
-        const mockLeft = this.createMockRow();
+        const mockLeft = this._createMockRow();
         const mockRight = this.createMockRowForTable(rightSchema, rightAlias);
         const joinCondition = condition(mockLeft, mockRight);
         // Add the join to the list
@@ -355,7 +360,7 @@ class QueryBuilder {
             }];
         // Store schemas for creating fresh mocks in the selector
         const leftSchema = this.schema;
-        const createLeftMock = () => this.createMockRow();
+        const createLeftMock = () => this._createMockRow();
         const createRightMock = () => this.createMockRowForTable(rightSchema, rightAlias);
         // Create a selector wrapper that generates fresh mocks and calls the user's selector
         const wrappedSelector = (row) => {
@@ -404,22 +409,24 @@ class QueryBuilder {
             const targetSchema = getTargetSchemaForRelation(schema, relName, relConfig);
             if (relConfig.type === 'many') {
                 // Collection navigation
+                // Non-enumerable to prevent Object.entries triggering getters (avoids stack overflow)
                 Object.defineProperty(mock, relName, {
                     get: () => {
                         return new CollectionQueryBuilder(relName, relConfig.targetTable, relConfig.foreignKey || relConfig.foreignKeys?.[0] || '', schema.name, targetSchema);
                     },
-                    enumerable: true,
+                    enumerable: false,
                     configurable: true,
                 });
             }
             else {
                 // Single reference navigation
+                // Non-enumerable to prevent Object.entries triggering getters (avoids stack overflow)
                 Object.defineProperty(mock, relName, {
                     get: () => {
                         const refBuilder = new ReferenceQueryBuilder(relName, relConfig.targetTable, relConfig.foreignKeys || [relConfig.foreignKey || ''], relConfig.matches || [], relConfig.isMandatory ?? false, targetSchema);
                         return refBuilder.createMockTargetRow();
                     },
-                    enumerable: true,
+                    enumerable: false,
                     configurable: true,
                 });
             }
@@ -441,7 +448,7 @@ class QueryBuilder {
         return this;
     }
     orderBy(selector) {
-        const mockRow = this.createMockRow();
+        const mockRow = this._createMockRow();
         const result = selector(mockRow);
         (0, query_utils_1.parseOrderBy)(result, this.orderByFields);
         return this;
@@ -497,7 +504,7 @@ class SelectQueryBuilder {
      * Note: The row parameter represents the selected shape (after select())
      */
     where(condition) {
-        const mockRow = this.createMockRow();
+        const mockRow = this._createMockRow();
         // Apply the selector to get the selected shape that the user sees in the WHERE condition
         const selectedMock = this.selector(mockRow);
         // Wrap in proxy - for WHERE, we preserve original column names
@@ -545,7 +552,7 @@ class SelectQueryBuilder {
         return this;
     }
     orderBy(selector) {
-        const mockRow = this.createMockRow();
+        const mockRow = this._createMockRow();
         const selectedMock = this.selector(mockRow);
         // Wrap selectedMock in a proxy that returns FieldRefs for property access
         const fieldRefProxy = this.createFieldRefProxy(selectedMock);
@@ -577,7 +584,7 @@ class SelectQueryBuilder {
     leftJoinSubquery(subquery, alias, condition, selector) {
         const newJoinCounter = this.joinCounter + 1;
         // Create mock for the current selection (left side)
-        const mockRow = this.createMockRow();
+        const mockRow = this._createMockRow();
         const mockLeftSelection = this.selector(mockRow);
         // Create mock for the subquery result (right side)
         // For subqueries, we create a mock based on the result type
@@ -621,7 +628,7 @@ class SelectQueryBuilder {
         const newJoinCounter = this.joinCounter + 1;
         // Create mock for the current selection (left side)
         // IMPORTANT: We call the selector with the mock row to get a result that contains FieldRef objects
-        const mockRow = this.createMockRow();
+        const mockRow = this._createMockRow();
         const mockLeftSelection = this.selector(mockRow);
         // The mockLeftSelection now contains FieldRef objects (with __fieldName, __dbColumnName, __tableAlias)
         // These FieldRef objects preserve the table context
@@ -652,7 +659,7 @@ class SelectQueryBuilder {
     leftJoinCte(cte, condition, selector) {
         const newJoinCounter = this.joinCounter + 1;
         // Create mock for the current selection (left side)
-        const mockRow = this.createMockRow();
+        const mockRow = this._createMockRow();
         const mockLeftSelection = this.selector(mockRow);
         // Create mock for the CTE columns (right side)
         const mockRight = this.createMockRowForCte(cte);
@@ -685,7 +692,7 @@ class SelectQueryBuilder {
     innerJoinSubquery(subquery, alias, condition, selector) {
         const newJoinCounter = this.joinCounter + 1;
         // Create mock for the current selection (left side)
-        const mockRow = this.createMockRow();
+        const mockRow = this._createMockRow();
         const mockLeftSelection = this.selector(mockRow);
         // Create mock for the subquery result (right side)
         const mockRight = this.createMockRowForSubquery(alias, subquery);
@@ -727,7 +734,7 @@ class SelectQueryBuilder {
         const rightAlias = `${rightSchema.name}_${this.joinCounter}`;
         const newJoinCounter = this.joinCounter + 1;
         // Create mock for the current selection (left side)
-        const mockRow = this.createMockRow();
+        const mockRow = this._createMockRow();
         const mockLeftSelection = this.selector(mockRow);
         // Create mock for the right table
         const mockRight = this.createMockRowForTable(rightSchema, rightAlias);
@@ -784,22 +791,24 @@ class SelectQueryBuilder {
             const targetSchema = getTargetSchemaForRelation(schema, relName, relConfig);
             if (relConfig.type === 'many') {
                 // Collection navigation
+                // Non-enumerable to prevent Object.entries triggering getters (avoids stack overflow)
                 Object.defineProperty(mock, relName, {
                     get: () => {
                         return new CollectionQueryBuilder(relName, relConfig.targetTable, relConfig.foreignKey || relConfig.foreignKeys?.[0] || '', schema.name, targetSchema);
                     },
-                    enumerable: true,
+                    enumerable: false,
                     configurable: true,
                 });
             }
             else {
                 // Single reference navigation
+                // Non-enumerable to prevent Object.entries triggering getters (avoids stack overflow)
                 Object.defineProperty(mock, relName, {
                     get: () => {
                         const refBuilder = new ReferenceQueryBuilder(relName, relConfig.targetTable, relConfig.foreignKeys || [relConfig.foreignKey || ''], relConfig.matches || [], relConfig.isMandatory ?? false, targetSchema);
                         return refBuilder.createMockTargetRow();
                     },
-                    enumerable: true,
+                    enumerable: false,
                     configurable: true,
                 });
             }
@@ -936,13 +945,13 @@ class SelectQueryBuilder {
         // If selector is provided, apply it to determine the field
         let fieldToAggregate;
         if (selector) {
-            const mockRow = this.createMockRow();
+            const mockRow = this._createMockRow();
             const mockSelection = this.selector(mockRow);
             fieldToAggregate = selector(mockSelection);
         }
         else {
             // No selector - use the current selection
-            const mockRow = this.createMockRow();
+            const mockRow = this._createMockRow();
             fieldToAggregate = this.selector(mockRow);
         }
         // Build aggregation query
@@ -967,13 +976,13 @@ class SelectQueryBuilder {
         // If selector is provided, apply it to determine the field
         let fieldToAggregate;
         if (selector) {
-            const mockRow = this.createMockRow();
+            const mockRow = this._createMockRow();
             const mockSelection = this.selector(mockRow);
             fieldToAggregate = selector(mockSelection);
         }
         else {
             // No selector - use the current selection
-            const mockRow = this.createMockRow();
+            const mockRow = this._createMockRow();
             fieldToAggregate = this.selector(mockRow);
         }
         // Build aggregation query
@@ -998,13 +1007,13 @@ class SelectQueryBuilder {
         // If selector is provided, apply it to determine the field
         let fieldToAggregate;
         if (selector) {
-            const mockRow = this.createMockRow();
+            const mockRow = this._createMockRow();
             const mockSelection = this.selector(mockRow);
             fieldToAggregate = selector(mockSelection);
         }
         else {
             // No selector - use the current selection
-            const mockRow = this.createMockRow();
+            const mockRow = this._createMockRow();
             fieldToAggregate = this.selector(mockRow);
         }
         // Build aggregation query
@@ -1052,7 +1061,7 @@ class SelectQueryBuilder {
             executor: this.executor,
         }));
         // Analyze the selector to extract nested queries
-        const mockRow = tracer.trace('createMockRow', () => this.createMockRow());
+        const mockRow = tracer.trace('createMockRow', () => this._createMockRow());
         const selectionResult = tracer.trace('evaluateSelector', () => this.selector(mockRow));
         // Check if we're using temp table strategy and have collections
         const collections = tracer.trace('detectCollections', () => this.detectCollections(selectionResult));
@@ -1319,7 +1328,7 @@ class SelectQueryBuilder {
         const baseSelection = {};
         const collectionNames = new Set(collections.map(c => c.name));
         // Always ensure we have the primary key in the base selection with a known alias
-        const mockRow = this.createMockRow();
+        const mockRow = this._createMockRow();
         baseSelection['__pk_id'] = mockRow.id; // Add primary key with a known alias
         for (const [key, value] of Object.entries(selection)) {
             if (!collectionNames.has(key)) {
@@ -1413,6 +1422,10 @@ class SelectQueryBuilder {
             // Array aggregation
             return [];
         }
+        else if (builder.isSingleResult()) {
+            // firstOrDefault() - single item
+            return null;
+        }
         else {
             // JSONB aggregation (object array)
             return [];
@@ -1467,8 +1480,10 @@ class SelectQueryBuilder {
             }
             const condBuilder = new conditions_1.ConditionBuilder();
             const { sql: whereSql, params: whereParams } = condBuilder.build(queryBuilder.whereCond, 1);
-            // Build RETURNING clause
-            const returningClause = queryBuilder.buildDeleteReturningClause(returning);
+            // Build RETURNING clause (not needed for count-only)
+            const returningClause = returning !== 'count'
+                ? queryBuilder.buildDeleteReturningClause(returning)
+                : undefined;
             const qualifiedTableName = queryBuilder.getQualifiedTableName(queryBuilder.schema.name, queryBuilder.schema.schema);
             let sql = `DELETE FROM ${qualifiedTableName} WHERE ${whereSql}`;
             if (returningClause) {
@@ -1477,6 +1492,10 @@ class SelectQueryBuilder {
             const result = queryBuilder.executor
                 ? await queryBuilder.executor.query(sql, whereParams)
                 : await queryBuilder.client.query(sql, whereParams);
+            // Return affected count
+            if (returning === 'count') {
+                return result.rowCount ?? 0;
+            }
             if (!returningClause) {
                 return undefined;
             }
@@ -1486,6 +1505,13 @@ class SelectQueryBuilder {
             then(onfulfilled, onrejected) {
                 return executeDelete(undefined).then(onfulfilled, onrejected);
             },
+            affectedCount() {
+                return {
+                    then(onfulfilled, onrejected) {
+                        return executeDelete('count').then(onfulfilled, onrejected);
+                    }
+                };
+            },
             returning(selector) {
                 const returningConfig = selector ?? true;
                 return {
@@ -1544,8 +1570,10 @@ class SelectQueryBuilder {
             const condBuilder = new conditions_1.ConditionBuilder();
             const { sql: whereSql, params: whereParams } = condBuilder.build(queryBuilder.whereCond, paramIndex);
             values.push(...whereParams);
-            // Build RETURNING clause
-            const returningClause = queryBuilder.buildDeleteReturningClause(returning);
+            // Build RETURNING clause (not needed for count-only)
+            const returningClause = returning !== 'count'
+                ? queryBuilder.buildDeleteReturningClause(returning)
+                : undefined;
             const qualifiedTableName = queryBuilder.getQualifiedTableName(queryBuilder.schema.name, queryBuilder.schema.schema);
             let sql = `UPDATE ${qualifiedTableName} SET ${setClauses.join(', ')} WHERE ${whereSql}`;
             if (returningClause) {
@@ -1554,6 +1582,10 @@ class SelectQueryBuilder {
             const result = queryBuilder.executor
                 ? await queryBuilder.executor.query(sql, values)
                 : await queryBuilder.client.query(sql, values);
+            // Return affected count
+            if (returning === 'count') {
+                return result.rowCount ?? 0;
+            }
             if (!returningClause) {
                 return undefined;
             }
@@ -1563,6 +1595,13 @@ class SelectQueryBuilder {
             then(onfulfilled, onrejected) {
                 return executeUpdate(undefined).then(onfulfilled, onrejected);
             },
+            affectedCount() {
+                return {
+                    then(onfulfilled, onrejected) {
+                        return executeUpdate('count').then(onfulfilled, onrejected);
+                    }
+                };
+            },
             returning(selector) {
                 const returningConfig = selector ?? true;
                 return {
@@ -1588,7 +1627,7 @@ class SelectQueryBuilder {
             return { sql, columns };
         }
         // Selector function - extract selected columns
-        const mockRow = this.createMockRow();
+        const mockRow = this._createMockRow();
         const selectedMock = this.selector(mockRow);
         const selection = returning(selectedMock);
         if (typeof selection === 'object' && selection !== null) {
@@ -1647,8 +1686,9 @@ class SelectQueryBuilder {
     }
     /**
      * Create mock row for analysis
+     * @internal
      */
-    createMockRow() {
+    _createMockRow() {
         const mock = {};
         const tableAlias = this.schema.name;
         // Performance: Use pre-computed column name map if available
@@ -1730,18 +1770,20 @@ class SelectQueryBuilder {
                 targetSchema = getTargetSchemaForRelation(this.schema, relName, relConfig);
             }
             if (relConfig.type === 'many') {
+                // Non-enumerable to prevent Object.entries triggering getters (avoids stack overflow)
                 Object.defineProperty(mock, relName, {
                     get: () => {
                         return new CollectionQueryBuilder(relName, relConfig.targetTable, relConfig.foreignKey || relConfig.foreignKeys?.[0] || '', this.schema.name, targetSchema, // Pass the target schema directly
                         this.schemaRegistry // Pass schema registry for nested resolution
                         );
                     },
-                    enumerable: true,
+                    enumerable: false,
                     configurable: true,
                 });
             }
             else {
                 // For single reference (many-to-one), create a ReferenceQueryBuilder
+                // Non-enumerable to prevent Object.entries triggering getters (avoids stack overflow)
                 Object.defineProperty(mock, relName, {
                     get: () => {
                         const refBuilder = new ReferenceQueryBuilder(relName, relConfig.targetTable, relConfig.foreignKeys || [relConfig.foreignKey || ''], relConfig.matches || [], relConfig.isMandatory ?? false, targetSchema, // Pass the target schema directly
@@ -1750,7 +1792,7 @@ class SelectQueryBuilder {
                         // Return a mock object that exposes the target table's columns
                         return refBuilder.createMockTargetRow();
                     },
-                    enumerable: true,
+                    enumerable: false,
                     configurable: true,
                 });
             }
@@ -2436,9 +2478,18 @@ class SelectQueryBuilder {
                 }
                 else {
                     const isArrayAgg = value && typeof value === 'object' && 'isArrayAggregation' in value && value.isArrayAggregation();
+                    const isSingleResult = value instanceof CollectionQueryBuilder && value.isSingleResult();
                     if (isArrayAgg) {
                         fieldConfigs.push({ key, type: 2 /* FieldType.COLLECTION_ARRAY */, value });
                     }
+                    else if (isSingleResult) {
+                        fieldConfigs.push({
+                            key,
+                            type: 9 /* FieldType.COLLECTION_SINGLE */,
+                            value,
+                            collectionBuilder: value
+                        });
+                    }
                     else {
                         fieldConfigs.push({
                             key,
@@ -2549,6 +2600,18 @@ class SelectQueryBuilder {
                         }
                         break;
                     }
+                    case 9 /* FieldType.COLLECTION_SINGLE */: {
+                        // firstOrDefault() - return first item or null
+                        const items = rawValue || [];
+                        if (config.collectionBuilder && items.length > 0) {
+                            const transformedItems = this.transformCollectionItems(items, config.collectionBuilder);
+                            result[key] = transformedItems[0] ?? null;
+                        }
+                        else {
+                            result[key] = items[0] ?? null;
+                        }
+                        break;
+                    }
                     case 4 /* FieldType.CTE_AGGREGATION */: {
                         const items = rawValue || [];
                         if (config.innerMetadata && !disableMappers) {
@@ -2851,7 +2914,7 @@ class SelectQueryBuilder {
                 executor: this.executor,
             };
             // Analyze the selector to extract nested queries
-            const mockRow = this.createMockRow();
+            const mockRow = this._createMockRow();
             const selectionResult = this.selector(mockRow);
             // Build the query
             const { sql } = this.buildQuery(selectionResult, context);
@@ -2862,7 +2925,7 @@ class SelectQueryBuilder {
         // For table subqueries, preserve the selection metadata (includes SqlFragments with mappers)
         let selectionMetadata;
         if (mode === 'table') {
-            const mockRow = this.createMockRow();
+            const mockRow = this._createMockRow();
             selectionMetadata = this.selector(mockRow);
         }
         // Extract outer field refs from the WHERE condition
@@ -3005,6 +3068,7 @@ class ReferenceQueryBuilder {
                     }
                     if (relConfig.type === 'many') {
                         // Collection navigation
+                        // Non-enumerable to prevent Object.entries triggering getters (avoids stack overflow)
                         Object.defineProperty(mock, relName, {
                             get: () => {
                                 const fk = relConfig.foreignKey || relConfig.foreignKeys?.[0] || '';
@@ -3012,12 +3076,14 @@ class ReferenceQueryBuilder {
                                 this.schemaRegistry // Pass schema registry for nested resolution
                                 );
                             },
-                            enumerable: true,
+                            enumerable: false,
                             configurable: true,
                         });
                     }
                     else {
                         // Reference navigation
+                        // Non-enumerable to prevent Object.entries triggering getters (avoids stack overflow
+                        // with circular relations like User->Posts->User)
                         Object.defineProperty(mock, relName, {
                             get: () => {
                                 const refBuilder = new ReferenceQueryBuilder(relName, relConfig.targetTable, relConfig.foreignKeys || [relConfig.foreignKey || ''], relConfig.matches || [], relConfig.isMandatory ?? false, nestedTargetSchema, // Pass the target schema directly
@@ -3025,7 +3091,7 @@ class ReferenceQueryBuilder {
                                 );
                                 return refBuilder.createMockTargetRow();
                             },
-                            enumerable: true,
+                            enumerable: false,
                             configurable: true,
                         });
                     }
@@ -3142,6 +3208,7 @@ class CollectionQueryBuilder {
                 for (const [relName, relConfig] of Object.entries(this.targetTableSchema.relations)) {
                     if (relConfig.type === 'many') {
                         // Collection navigation
+                        // Non-enumerable to prevent Object.entries triggering getters (avoids stack overflow)
                         Object.defineProperty(mock, relName, {
                             get: () => {
                                 // Don't call build() - it returns schema without relations
@@ -3150,12 +3217,13 @@ class CollectionQueryBuilder {
                                 this.schemaRegistry // Pass schema registry for nested resolution
                                 );
                             },
-                            enumerable: true,
+                            enumerable: false,
                             configurable: true,
                         });
                     }
                     else {
                         // Reference navigation
+                        // Non-enumerable to prevent Object.entries triggering getters (avoids stack overflow)
                         Object.defineProperty(mock, relName, {
                             get: () => {
                                 // Don't call build() - it returns schema without relations
@@ -3165,7 +3233,7 @@ class CollectionQueryBuilder {
                                 );
                                 return refBuilder.createMockTargetRow();
                             },
-                            enumerable: true,
+                            enumerable: false,
                             configurable: true,
                         });
                     }
@@ -3282,6 +3350,18 @@ class CollectionQueryBuilder {
         // At runtime, this is still a CollectionQueryBuilder, but TypeScript sees it as CollectionResult
         return this;
     }
+    /**
+     * Get first item from collection or null if empty
+     * Automatically applies LIMIT 1 and returns a single item instead of array
+     */
+    firstOrDefault(name) {
+        if (name) {
+            this.asName = name;
+        }
+        this.limitValue = 1;
+        this.isMarkedAsList = false; // Single item, not a list
+        return this;
+    }
     /**
      * Get target table schema
      */
@@ -3300,6 +3380,12 @@ class CollectionQueryBuilder {
     isScalarAggregation() {
         return this.aggregationType !== undefined;
     }
+    /**
+     * Check if this is a single item result (firstOrDefault)
+     */
+    isSingleResult() {
+        return !this.isMarkedAsList && this.limitValue === 1;
+    }
     /**
      * Get the aggregation type
      */