rawsql-ts 0.11.0-beta → 0.11.2-beta

package/dist/src/transformers/JsonMappingUnifier.js

@@ -0,0 +1,216 @@
+"use strict";
+/**
+ * Unified JSON Mapping processor that supports both legacy and model-driven formats.
+ *
+ * @deprecated Use JsonMappingConverter instead. This module is kept for backward compatibility.
+ * This module provides backward compatibility while encouraging migration to the model-driven format.
+ * It automatically detects the input format and normalizes to a consistent internal representation.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.detectMappingFormat = detectMappingFormat;
+exports.processJsonMapping = processJsonMapping;
+exports.unifyJsonMapping = unifyJsonMapping;
+exports.isModelDrivenFormat = isModelDrivenFormat;
+exports.isUnifiedFormat = isUnifiedFormat;
+exports.isLegacyFormat = isLegacyFormat;
+exports.suggestModelDrivenMigration = suggestModelDrivenMigration;
+const JsonMappingConverter_1 = require("./JsonMappingConverter");
+/**
+ * Detects the format of a JSON mapping configuration.
+ *
+ * @param input - The mapping configuration to analyze
+ * @returns The detected format type
+ */
+function detectMappingFormat(input) {
+    // Model-driven format: has typeInfo and structure
+    if (input.typeInfo && input.structure) {
+        return 'model-driven';
+    }
+    // Unified format: has rootName and rootEntity
+    if (input.rootName && input.rootEntity) {
+        return 'unified';
+    }
+    // Legacy format: direct JsonMapping structure
+    if (input.columns || input.relationships) {
+        return 'legacy';
+    }
+    // Default fallback
+    return 'legacy';
+}
+/**
+ * Converts legacy unified format to JsonMapping.
+ *
+ * @param input - Unified format mapping configuration
+ * @returns Converted JsonMapping
+ */
+function convertUnifiedFormat(input) {
+    if (!input.rootEntity) {
+        throw new Error('Unified format requires rootEntity');
+    }
+    const result = {
+        rootName: input.rootName || 'root',
+        rootEntity: {
+            id: input.rootEntity.id || 'root',
+            name: input.rootEntity.name || 'Root',
+            columns: input.rootEntity.columns || {}
+        },
+        nestedEntities: []
+    };
+    // Convert nestedEntities
+    if (input.nestedEntities && Array.isArray(input.nestedEntities)) {
+        result.nestedEntities = input.nestedEntities.map(entity => ({
+            id: entity.id || entity.propertyName || 'nested',
+            name: entity.name || entity.propertyName || 'Nested',
+            parentId: entity.parentId || result.rootEntity.id,
+            propertyName: entity.propertyName || 'nested',
+            relationshipType: entity.relationshipType || 'object',
+            columns: entity.columns || {}
+        }));
+    }
+    return result;
+}
+/**
+ * Converts legacy format directly to JsonMapping.
+ *
+ * @param input - Legacy format mapping configuration
+ * @returns JsonMapping
+ */
+function convertLegacyFormat(input) {
+    const result = {
+        rootName: input.rootName || 'root',
+        rootEntity: {
+            id: 'root',
+            name: input.rootName || 'Root',
+            columns: input.columns || {}
+        },
+        nestedEntities: []
+    };
+    // Convert relationships to nestedEntities
+    if (input.relationships && typeof input.relationships === 'object') {
+        for (const [propertyName, relationship] of Object.entries(input.relationships)) {
+            // Type assertion for legacy relationship format
+            const rel = relationship;
+            result.nestedEntities.push({
+                id: propertyName,
+                name: propertyName.charAt(0).toUpperCase() + propertyName.slice(1),
+                parentId: 'root',
+                propertyName,
+                relationshipType: rel.type === 'hasMany' ? 'array' : 'object',
+                columns: rel.columns || {}
+            });
+        }
+    }
+    return result;
+}
+/**
+ * Main processor that unifies all JSON mapping formats into a consistent JsonMapping.
+ *
+ * @deprecated Use JsonMappingConverter.convert() instead.
+ *
+ * Features:
+ * - Automatic format detection
+ * - Backward compatibility with all existing formats
+ * - Metadata preservation for advanced features
+ * - Zero external dependencies
+ *
+ * @param input - Any supported JSON mapping format
+ * @returns Unified processing result with JsonMapping and metadata
+ */
+function processJsonMapping(input) {
+    var _a;
+    // Runtime deprecation warning
+    console.warn('⚠️ DEPRECATED: processJsonMapping() is deprecated. Use JsonMappingConverter.convert() instead.');
+    console.warn('Migration guide: https://github.com/mk3008/rawsql-ts/blob/main/docs/migration-guide.md');
+    // Check for legacy format with columns and relationships
+    if ((input.columns || input.relationships) && !input.rootName && !input.rootEntity) {
+        const jsonMapping = convertLegacyFormat(input);
+        return {
+            format: 'legacy',
+            jsonMapping,
+            originalInput: input,
+            metadata: {}
+        };
+    }
+    const converter = new JsonMappingConverter_1.JsonMappingConverter();
+    const result = converter.convert(input);
+    // Map converter formats to unifier formats for backward compatibility
+    let format = result.format;
+    // If it's detected as 'legacy' by converter but has rootName and rootEntity, it's 'unified' format
+    if (result.format === 'legacy' && input.rootName && input.rootEntity) {
+        format = 'unified';
+    }
+    return {
+        format,
+        jsonMapping: result.mapping,
+        originalInput: input,
+        metadata: {
+            typeInfo: (_a = result.metadata) === null || _a === void 0 ? void 0 : _a.typeInfo,
+            typeProtection: result.typeProtection
+        }
+    };
+}
+/**
+ * Convenience function for direct JsonMapping extraction.
+ *
+ * @deprecated Use JsonMappingConverter.toLegacyMapping() instead.
+ *
+ * @param input - Any supported JSON mapping format
+ * @returns JsonMapping ready for use with PostgresJsonQueryBuilder
+ */
+function unifyJsonMapping(input) {
+    // Runtime deprecation warning
+    console.warn('⚠️ DEPRECATED: unifyJsonMapping() is deprecated. Use JsonMappingConverter.toLegacyMapping() instead.');
+    console.warn('Migration guide: https://github.com/mk3008/rawsql-ts/blob/main/docs/migration-guide.md');
+    const converter = new JsonMappingConverter_1.JsonMappingConverter();
+    return converter.toLegacyMapping(input);
+}
+/**
+ * Type guard to check if input uses model-driven format.
+ *
+ * @param input - Mapping input to check
+ * @returns True if input is model-driven format
+ */
+function isModelDrivenFormat(input) {
+    return detectMappingFormat(input) === 'model-driven';
+}
+/**
+ * Type guard to check if input uses unified format.
+ *
+ * @param input - Mapping input to check
+ * @returns True if input is unified format
+ */
+function isUnifiedFormat(input) {
+    return detectMappingFormat(input) === 'unified';
+}
+/**
+ * Type guard to check if input uses legacy format.
+ *
+ * @param input - Mapping input to check
+ * @returns True if input is legacy format
+ */
+function isLegacyFormat(input) {
+    return detectMappingFormat(input) === 'legacy';
+}
+/**
+ * Migration helper that suggests upgrading to model-driven format.
+ *
+ * @param input - Current mapping configuration
+ * @returns Suggestions for migration (if applicable)
+ */
+function suggestModelDrivenMigration(input) {
+    const format = detectMappingFormat(input);
+    const suggestions = [];
+    if (format !== 'model-driven') {
+        suggestions.push('Consider migrating to model-driven JSON mapping format');
+        suggestions.push('Benefits: Better type safety, IDE support, and future-proof design');
+        suggestions.push('See: Model-Driven JSON Mapping Guide for migration instructions');
+        if (format === 'unified') {
+            suggestions.push('Your current unified format can be automatically converted');
+        }
+        if (format === 'legacy') {
+            suggestions.push('Legacy format support will be maintained but new features target model-driven format');
+        }
+    }
+    return suggestions;
+}
+//# sourceMappingURL=JsonMappingUnifier.js.map

package/dist/src/transformers/JsonMappingUnifier.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"JsonMappingUnifier.js","sourceRoot":"","sources":["../../../src/transformers/JsonMappingUnifier.ts"],"names":[],"mappings":"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"}

package/dist/src/transformers/ModelDrivenJsonMapping.d.ts

@@ -0,0 +1,62 @@
+/**
+ * Model-driven JSON mapping structure that mirrors TypeScript model definitions.
+ * This approach provides intuitive, hierarchical mapping that closely resembles the target data structure.
+ */
+import { JsonMapping } from './PostgresJsonQueryBuilder';
+/**
+ * Supported field types for database column mapping.
+ */
+export type FieldType = 'string' | 'number' | 'boolean' | 'object' | 'array' | 'auto';
+/**
+ * Field mapping configuration that can be either a simple column name or enhanced mapping with type control.
+ */
+export type FieldMapping = string | {
+    column: string;
+    type?: FieldType;
+} | {
+    from: string;
+    type?: FieldType;
+};
+/**
+ * Nested object or array structure definition.
+ */
+export interface NestedStructure {
+    type: 'object' | 'array';
+    from: string;
+    structure: StructureFields;
+}
+/**
+ * Structure fields can contain either field mappings or nested structures.
+ */
+export type StructureFields = {
+    [key: string]: FieldMapping | NestedStructure;
+};
+/**
+ * Model-driven JSON mapping that mirrors TypeScript interface structure.
+ * This design makes it easy to understand the relationship between models and database columns.
+ */
+export interface ModelDrivenJsonMapping {
+    typeInfo: {
+        interface: string;
+        importPath: string;
+    };
+    structure: StructureFields;
+}
+/**
+ * Type protection configuration extracted from the model-driven mapping.
+ */
+export interface TypeProtectionConfig {
+    protectedStringFields: string[];
+}
+/**
+ * Convert a model-driven JSON mapping to the traditional JsonMapping format.
+ * This enables backward compatibility with existing PostgresJsonQueryBuilder.
+ */
+export declare function convertModelDrivenMapping(modelMapping: ModelDrivenJsonMapping): {
+    jsonMapping: JsonMapping;
+    typeProtection: TypeProtectionConfig;
+};
+/**
+ * Validate that a model-driven mapping structure is well-formed.
+ */
+export declare function validateModelDrivenMapping(mapping: ModelDrivenJsonMapping): string[];

package/dist/src/transformers/ModelDrivenJsonMapping.js

@@ -0,0 +1,122 @@
+"use strict";
+/**
+ * Model-driven JSON mapping structure that mirrors TypeScript model definitions.
+ * This approach provides intuitive, hierarchical mapping that closely resembles the target data structure.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertModelDrivenMapping = convertModelDrivenMapping;
+exports.validateModelDrivenMapping = validateModelDrivenMapping;
+/**
+ * Convert a model-driven JSON mapping to the traditional JsonMapping format.
+ * This enables backward compatibility with existing PostgresJsonQueryBuilder.
+ */
+function convertModelDrivenMapping(modelMapping) {
+    const protectedStringFields = [];
+    let entityIdCounter = 0;
+    const propertyNameCounters = {};
+    // Generate unique entity IDs
+    const generateEntityId = () => `entity_${++entityIdCounter}`;
+    // Generate unique property names to avoid JSON key conflicts
+    const generateUniquePropertyName = (baseName) => {
+        if (!propertyNameCounters[baseName]) {
+            propertyNameCounters[baseName] = 0;
+        }
+        propertyNameCounters[baseName]++;
+        return propertyNameCounters[baseName] === 1 ? baseName : `${baseName}_${propertyNameCounters[baseName]}`;
+    };
+    // Helper function to process structure fields and extract entities
+    const processStructure = (structure, parentId = null) => {
+        const columns = {};
+        const nestedEntities = [];
+        for (const [fieldName, config] of Object.entries(structure)) {
+            if (typeof config === 'string') {
+                // Simple field mapping: "fieldName": "column_name"
+                columns[fieldName] = config;
+            }
+            else if ('column' in config && typeof config.column === 'string' && !('type' in config && (config.type === 'object' || config.type === 'array'))) {
+                // Enhanced field mapping: "fieldName": { "column": "column_name", "type": "string" }
+                const fieldConfig = config;
+                if (typeof fieldConfig === 'object' && 'column' in fieldConfig) {
+                    columns[fieldName] = fieldConfig.column;
+                    if (fieldConfig.type === 'string') {
+                        protectedStringFields.push(fieldConfig.column);
+                    }
+                }
+            }
+            else if ('from' in config && typeof config.from === 'string' && !('type' in config && (config.type === 'object' || config.type === 'array'))) {
+                // Legacy field mapping: "fieldName": { "from": "column_name", "type": "string" }
+                const fieldConfig = config;
+                if (typeof fieldConfig === 'object' && 'from' in fieldConfig) {
+                    columns[fieldName] = fieldConfig.from;
+                    if (fieldConfig.type === 'string') {
+                        protectedStringFields.push(fieldConfig.from);
+                    }
+                }
+            }
+            else if ('type' in config && (config.type === 'object' || config.type === 'array')) {
+                // Nested structure: object or array
+                const nestedStructure = config;
+                const uniquePropertyName = generateUniquePropertyName(fieldName);
+                // Generate globally unique entity ID to ensure unique JSON column names
+                const entityId = generateEntityId();
+                const processedNested = processStructure(nestedStructure.structure, entityId);
+                nestedEntities.push({
+                    id: entityId, // Use unique ID to avoid column conflicts
+                    name: fieldName.charAt(0).toUpperCase() + fieldName.slice(1), // Capitalize first letter
+                    parentId: parentId || 'root',
+                    propertyName: uniquePropertyName,
+                    originalPropertyName: fieldName, // Store original name for final mapping
+                    relationshipType: nestedStructure.type,
+                    columns: processedNested.columns
+                });
+                // Add nested entities from deeper levels
+                nestedEntities.push(...processedNested.nestedEntities.map(entity => ({
+                    ...entity,
+                    parentId: entity.parentId === 'root' ? entityId : entity.parentId
+                })));
+            }
+        }
+        return { columns, nestedEntities };
+    };
+    // Process the root structure
+    const processed = processStructure(modelMapping.structure); // Build the traditional JsonMapping
+    const jsonMapping = {
+        rootName: 'root', // Default root name
+        rootEntity: {
+            id: 'root',
+            name: 'Root',
+            columns: processed.columns
+        },
+        nestedEntities: processed.nestedEntities
+    };
+    // Add typeInfo for backward compatibility
+    jsonMapping.typeInfo = modelMapping.typeInfo;
+    return {
+        jsonMapping,
+        typeProtection: { protectedStringFields }
+    };
+}
+/**
+ * Validate that a model-driven mapping structure is well-formed.
+ */
+function validateModelDrivenMapping(mapping) {
+    const errors = [];
+    // Validate typeInfo
+    if (!mapping.typeInfo) {
+        errors.push('typeInfo is required');
+    }
+    else {
+        if (!mapping.typeInfo.interface) {
+            errors.push('typeInfo.interface is required');
+        }
+        if (!mapping.typeInfo.importPath) {
+            errors.push('typeInfo.importPath is required');
+        }
+    }
+    // Validate structure
+    if (!mapping.structure || typeof mapping.structure !== 'object') {
+        errors.push('structure is required and must be an object');
+    }
+    return errors;
+}
+//# sourceMappingURL=ModelDrivenJsonMapping.js.map

package/dist/src/transformers/ModelDrivenJsonMapping.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ModelDrivenJsonMapping.js","sourceRoot":"","sources":["../../../src/transformers/ModelDrivenJsonMapping.ts"],"names":[],"mappings":"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"}

package/dist/src/transformers/PostgresArrayEntityCteBuilder.d.ts

@@ -1,97 +1,138 @@
 import { CommonTable } from '../models/Clause';
 import { JsonMapping } from './PostgresJsonQueryBuilder';
-import { ProcessableEntity } from './PostgresObjectEntityCteBuilder';
+import { ProcessableEntity, JsonColumnMapping } from './PostgresObjectEntityCteBuilder';
 /**
- * PostgreSQL-specific builder for creating CTEs for array entities (array relationships).
- * This class handles the creation of CTEs that build JSON/JSONB arrays for child entities,
- * processing them from the deepest level up to ensure proper dependency ordering.
+ * Builds CTEs for array entities using depth-first processing and row compression.
  *
- * Features:
- * - Depth-based CTE naming (cte_array_depth_N)
- * - Row compression using GROUP BY operations
- * - JSONB/JSON array aggregation
- * - Hierarchical processing of nested arrays
- * - Column exclusion to avoid duplication
- *
- * Why depth calculation is critical:
- * 1. Array entities can be nested at multiple levels. We must process the deepest
- *    (most distant) arrays first to ensure their JSON representations are available
- *    when building their parent arrays.
- * 2. Array entity processing is essentially a row compression operation using GROUP BY.
- *    Unlike parent entities which use column compression, arrays require grouping
- *    to aggregate multiple rows into JSON arrays.
- *
- * Example hierarchy:
- * Order (root, depth 0)
- *   └─ Items (array, depth 1)
- *       └─ Details (array, depth 2)
- *
- * Processing order: depth 2 → depth 1 → depth 0
+ * Core concepts:
+ * - Column Compression: OBJECT relationships (user_id, user_name → user_json)
+ * - Row Compression: ARRAY relationships (multiple rows → JSON array via GROUP BY)
+ * - Depth-First: Process deepest arrays first for dependency ordering
+ * - GROUP BY Exclusion: Exclude array-internal columns to prevent over-grouping
  */
 export declare class PostgresArrayEntityCteBuilder {
     private static readonly CTE_ARRAY_PREFIX;
+    private static readonly JSON_FUNCTIONS;
     /**
-     * Build CTEs for all array entities in the correct dependency order
-     * @param ctesSoFar Array of CTEs built so far (starts with the initial CTE)
-     * @param aliasOfCteToBuildUpon Alias of the CTE from which the current array CTE will select
+     * Builds CTEs for all array entities using depth-first processing.
+     * Collects arrays by depth, processes deepest first, chains CTEs.
+     *
+     * @param ctesSoFar Array of CTEs built so far
+     * @param aliasOfCteToBuildUpon Alias of the CTE to build upon
      * @param allEntities Map of all entities in the mapping
      * @param mapping The JSON mapping configuration
-     * @returns Object containing the updated list of all CTEs and the alias of the last CTE created
+     * @param columnMappings Optional mappings from object entity IDs to generated JSON column names
+     * @returns Object containing updated CTEs and last CTE alias
      */
-    buildArrayEntityCtes(ctesSoFar: CommonTable[], aliasOfCteToBuildUpon: string, allEntities: Map<string, ProcessableEntity>, mapping: JsonMapping): {
+    buildArrayEntityCtes(ctesSoFar: CommonTable[], aliasOfCteToBuildUpon: string, allEntities: Map<string, ProcessableEntity>, mapping: JsonMapping, columnMappings?: JsonColumnMapping[]): {
         updatedCtes: CommonTable[];
         lastCteAlias: string;
     };
     /**
-     * Collect all array entities and calculate their depth from root.
-     *
-     * Depth calculation ensures proper processing order where deeper nested
-     * arrays are processed first, making their aggregated data available
-     * for parent array processing.
+     * Collects array entities and calculates depth for dependency ordering.
+     * Depth = distance from root. Deeper arrays processed first.
      *
      * @param mapping The JSON mapping configuration
      * @param allEntities Map of all entities in the mapping
-     * @returns Array of array entity information with calculated depths, sorted deepest first
+     * @returns Array of array entity information with depths, sorted deepest first
      */
     private collectAndSortArrayEntities;
     /**
-     * Group array entities by their depth level.
-     *
-     * Grouping by depth allows us to:
-     * - Process all entities at the same level in a single CTE
-     * - Optimize query performance by reducing the number of CTEs
-     * - Maintain clear dependency ordering
+     * Groups array entities by depth level for batch processing.
      *
      * @param arrayInfos Array of array entity information with depths
      * @returns Map of depth level to entities at that depth
      */
     private groupEntitiesByDepth;
     /**
-     * Build a CTE that processes all array entities at a specific depth level.
-     *
-     * This method creates a single CTE that aggregates multiple array entities
-     * at the same depth, using GROUP BY to compress rows into JSON arrays.
+     * Builds CTE for specific depth level using row compression.
+     * Uses GROUP BY to aggregate multiple rows into JSON arrays.
+     * Excludes array-internal columns from GROUP BY to prevent over-grouping.
      *
      * @param infos Array entities at this depth level
      * @param currentCteAlias Alias of the CTE to build upon
      * @param currentCtes All CTEs built so far
      * @param depth Current depth level being processed
      * @param mapping JSON mapping configuration
+     * @param columnMappings Optional mappings from object entity IDs to generated JSON column names
      * @returns The new CTE and its alias
      */
     private buildDepthCte;
     /**
-     * Build JSON aggregation function for an array entity.
-     *
-     * This method creates a jsonb_agg or json_agg function call that aggregates
-     * the entity's columns into a JSON array. It also handles nested relationships
-     * by including child entity properties in the JSON object.
+     * Creates jsonb_agg function for array entity.
+     * Handles entity columns and nested child relationships.
+     * Uses originalPropertyName to avoid sequential numbering.
      *
      * @param entity The array entity being processed
      * @param nestedEntities All nested entities from the mapping
      * @param allEntities Map of all entities (not used in current implementation)
-     * @param useJsonb Whether to use JSONB functions
+     * @param columnMappings Mappings from object entity IDs to generated JSON column names
      * @returns Object containing the JSON aggregation function
      */
     private buildAggregationDetailsForArrayEntity;
+    /**
+     * Collects array entity columns by depth for GROUP BY exclusion strategy.
+     *
+     * @param mapping The JSON mapping configuration containing all entities
+     * @param currentDepth The current aggregation depth being processed
+     * @returns A map where keys are depth levels and values are sets of column names
+     */
+    private collectArrayEntityColumnsByDepth;
+    /**
+     * Calculates entity depth by traversing up to root.
+     *
+     * @param entity The entity to calculate depth for
+     * @param mapping The JSON mapping containing all entities
+     * @returns The depth level (0 for root level, 1 for first level, etc.)
+     */
+    private calculateEntityDepth;
+    /**
+     * Adds entity columns to depth set.
+     *
+     * @param entity The entity whose columns should be added
+     * @param depth The depth level to add columns to
+     * @param arrayEntitiesByDepth The map to update
+     */
+    private addEntityColumnsToDepthSet;
+    /**
+     * Recursively collects columns from descendant entities.
+     *
+     * @param parentEntityId The ID of the parent entity
+     * @param targetDepth The depth level to assign collected columns to
+     * @param mapping The JSON mapping containing all entities
+     * @param arrayEntitiesByDepth The map to update with collected columns
+     */
+    private collectDescendantColumns;
+    /**
+     * Implements GROUP BY exclusion strategy for array aggregation.
+     * Excludes current array columns and array-internal object JSON columns.
+     *
+     * @param prevSelects SELECT variables from the previous CTE
+     * @param arrayColumns Columns that are being aggregated (should be excluded from GROUP BY)
+     * @param arrayEntitiesByDepth Map of depth levels to their column sets
+     * @param currentDepth The current aggregation depth being processed
+     * @param selectItems Output array for SELECT items
+     * @param groupByItems Output array for GROUP BY items
+     * @param arrayInternalObjectColumns JSON columns from objects within arrays being processed
+     */
+    private processSelectVariablesForGroupBy;
+    /**
+     * Determines if column should be included in GROUP BY clause.
+     * Applies depth-based filtering and special handling for JSON columns.
+     *
+     * @param columnName The name of the column to evaluate
+     * @param arrayEntitiesByDepth Map of depth levels to their column sets
+     * @param currentDepth The current aggregation depth
+     * @returns True if the column should be included in GROUP BY, false otherwise
+     */
+    private shouldIncludeColumnInGroupBy;
+    /**
+     * Applies heuristics for entity JSON column inclusion in GROUP BY.
+     * Uses entity numbering patterns to identify deeply nested entities.
+     *
+     * @param columnName The JSON column name (expected format: entity_N_json)
+     * @param currentDepth The current aggregation depth
+     * @returns True if the JSON column should be included, false otherwise
+     */
+    private shouldIncludeJsonColumn;
 }