@teleporthq/teleport-plugin-next-data-source 0.42.9 → 0.42.10

package/src/fetchers/mongodb.ts

@@ -1,4 +1,8 @@
-import { replaceSecretReference, generateDateFormatterCode } from '../utils'
+import {
+  replaceSecretReference,
+  generateDateFormatterCode,
+  generateSafeJSONParseCode,
+} from '../utils'
 
 export const validateMongoDBConfig = (
   config: Record<string, unknown>
@@ -67,6 +71,99 @@ export const generateMongoDBFetcher = (
 
   return `import { MongoClient, ObjectId } from 'mongodb'
 
+${generateSafeJSONParseCode()}
+
+// Helper function to process filters
+const processFilters = (filters, filter) => {
+  if (!filters) return
+  
+  const parsedFilters = safeJSONParse(filters)
+  
+  if (Array.isArray(parsedFilters)) {
+    parsedFilters.forEach((filterItem) => {
+      if (!filterItem.source || filterItem.destination === undefined) return
+      
+      const field = filterItem.source
+      const value = filterItem.destination
+      const operand = filterItem.operand || '='
+      
+      // Handle _id specially
+      const processValue = (v) => {
+        if (field === '_id' && typeof v === 'string') {
+          try {
+            return new ObjectId(v)
+          } catch (e) {
+            return v
+          }
+        }
+        return v
+      }
+      
+      if (Array.isArray(value)) {
+        const processedValues = value.map(processValue)
+        if (operand === '!=') {
+          filter[field] = { $nin: processedValues }
+        } else {
+          filter[field] = { $in: processedValues }
+        }
+      } else {
+        const processedValue = processValue(value)
+        
+        // Handle null values
+        if (processedValue === null) {
+          if (operand === '=') {
+            filter[field] = null
+          } else if (operand === '!=') {
+            filter[field] = { $ne: null }
+          }
+        } else {
+          // Map operand to MongoDB operators
+          switch (operand) {
+            case '=':
+              filter[field] = processedValue
+              break
+            case '!=':
+              filter[field] = { $ne: processedValue }
+              break
+            case '>':
+              filter[field] = { $gt: processedValue }
+              break
+            case '>=':
+              filter[field] = { $gte: processedValue }
+              break
+            case '<':
+              filter[field] = { $lt: processedValue }
+              break
+            case '<=':
+              filter[field] = { $lte: processedValue }
+              break
+            default:
+              filter[field] = processedValue
+          }
+        }
+      }
+    })
+  } else {
+    Object.entries(parsedFilters).forEach(([key, value]) => {
+      if (key === '_id') {
+        if (Array.isArray(value)) {
+          filter[key] = {
+            $in: value.map((id) => (typeof id === 'string' ? new ObjectId(id) : id))
+          }
+        } else if (typeof value === 'string') {
+          filter[key] = new ObjectId(value)
+        } else {
+          filter[key] = value
+        }
+      } else if (Array.isArray(value)) {
+        filter[key] = { $in: value }
+      } else {
+        filter[key] = value
+      }
+    })
+  }
+}
+
 ${generateDateFormatterCode()}
 
 export default async function handler(req, res) {
@@ -82,7 +179,7 @@ export default async function handler(req, res) {
     const db = client.db(${JSON.stringify(database)})
     const collection = db.collection('${tableName}')
     
-    const { query, queryColumns, limit, page, perPage, sortBy, sortOrder, filters, offset } = req.query
+    const { query, queryColumns, limit, page, perPage, sortBy, sortOrder, filters, sorts, offset } = req.query
     
     const filter = {}
     
@@ -91,7 +188,7 @@ export default async function handler(req, res) {
       
       if (queryColumns) {
         // Use specified columns
-        columns = JSON.parse(queryColumns)
+        columns = safeJSONParse(queryColumns)
       } else {
         // Fallback: Get all field names from a sample document
         try {
@@ -113,30 +210,26 @@ export default async function handler(req, res) {
       }
     }
     
-    if (filters) {
-      const parsedFilters = JSON.parse(filters)
-      Object.entries(parsedFilters).forEach(([key, value]) => {
-        if (key === '_id') {
-          if (Array.isArray(value)) {
-            filter[key] = {
-              $in: value.map((id) => (typeof id === 'string' ? new ObjectId(id) : id))
-            }
-          } else if (typeof value === 'string') {
-            filter[key] = new ObjectId(value)
-          } else {
-            filter[key] = value
-          }
-        } else if (Array.isArray(value)) {
-          filter[key] = { $in: value }
-        } else {
-          filter[key] = value
-        }
-      })
-    }
+    // Apply filters using helper function
+    processFilters(filters, filter)
     
     let cursor = collection.find(filter)
     
-    if (sortBy) {
+    // Handle sorts - new array format
+    if (sorts) {
+      const parsedSorts = safeJSONParse(sorts)
+      if (Array.isArray(parsedSorts) && parsedSorts.length > 0) {
+        const sortObject = {}
+        parsedSorts.forEach((sort) => {
+          if (sort.field) {
+            sortObject[sort.field] = sort.order?.toLowerCase() === 'desc' ? -1 : 1
+          }
+        })
+        if (Object.keys(sortObject).length > 0) {
+          cursor = cursor.sort(sortObject)
+        }
+      }
+    } else if (sortBy) {
       const sortOrderValue = sortOrder?.toLowerCase() === 'desc' ? -1 : 1
       cursor = cursor.sort({ [sortBy]: sortOrderValue })
     }
@@ -181,15 +274,34 @@ export default async function handler(req, res) {
 }
 
 // tslint:disable-next-line:variable-name
-export const generateMongoDBCountFetcher = (_config: any, tableName: string): string => {
+export const generateMongoDBCountFetcher = (config: any, tableName: string): string => {
+  const mongoConfig = config as MongoDBConfig
+  const hasUsername = mongoConfig?.username
+  const database = mongoConfig?.database
+
+  // Build connection string from parts if not provided
+  let connectionString = mongoConfig.connectionString
+  if (!connectionString) {
+    connectionString = `mongodb://${
+      hasUsername ? `${mongoConfig.username}:${mongoConfig.password}@` : ''
+    }${mongoConfig.host}:${mongoConfig.port || 27017}/${database}`
+  }
+
   return `
 async function getCount(req, res) {
-  const client = getClient()
-  const db = client.db()
-
+  let client = null
   try {
-    const { query, queryColumns, filters } = req.query
+    const url = ${replaceSecretReference(connectionString)}
+    client = new MongoClient(url, {
+      connectTimeoutMS: 30000,
+      serverSelectionTimeoutMS: 30000
+    })
+    
+    await client.connect()
+    const db = client.db(${JSON.stringify(database)})
     const collection = db.collection('${tableName}')
+    
+    const { query, queryColumns, filters } = req.query
     const filter = {}
 
     if (query) {
@@ -197,7 +309,8 @@ async function getCount(req, res) {
       
       if (queryColumns) {
         // Use specified columns
-        columns = typeof queryColumns === 'string' ? JSON.parse(queryColumns) : (Array.isArray(queryColumns) ? queryColumns : [queryColumns])
+        const parsed = safeJSONParse(queryColumns)
+        columns = Array.isArray(parsed) ? parsed : [parsed]
       } else {
         // Fallback: Get all field names from a sample document
         try {
@@ -218,12 +331,8 @@ async function getCount(req, res) {
       }
     }
 
-    if (filters) {
-      const parsedFilters = JSON.parse(filters)
-      for (const f of parsedFilters) {
-        filter[f.column] = f.value
-      }
-    }
+    // Apply filters using helper function
+    processFilters(filters, filter)
 
     const count = await collection.countDocuments(filter)
 
@@ -239,6 +348,14 @@ async function getCount(req, res) {
       error: error.message || 'Failed to get count',
       timestamp: Date.now()
     })
+  } finally {
+    if (client) {
+      try {
+        await client.close()
+      } catch (error) {
+        console.error('Error closing MongoDB client:', error)
+      }
+    }
   }
 }
 `

package/src/fetchers/mysql.ts

@@ -1,4 +1,8 @@
-import { replaceSecretReference, generateDateFormatterCode } from '../utils'
+import {
+  replaceSecretReference,
+  generateDateFormatterCode,
+  generateSafeJSONParseCode,
+} from '../utils'
 
 interface MySQLConfig {
   host?: string
@@ -57,13 +61,68 @@ const getConnection = () => {
   })
 }
 
+${generateSafeJSONParseCode()}
+
+// Helper function to process filters and build conditions
+const processFilters = (filters, conditions, queryParams) => {
+  if (!filters) return
+  
+  const parsedFilters = safeJSONParse(filters)
+  
+  if (Array.isArray(parsedFilters)) {
+    parsedFilters.forEach((filter) => {
+      if (!filter.source || filter.destination === undefined) return
+      
+      const field = mysql.escapeId(filter.source)
+      const value = filter.destination
+      const operand = filter.operand || '='
+      
+      if (Array.isArray(value)) {
+        if (value.length === 0) return
+        const placeholders = value.map(() => '?').join(', ')
+        queryParams.push(...value)
+        if (operand === '!=') {
+          conditions.push(\`\${field} NOT IN (\${placeholders})\`)
+        } else {
+          conditions.push(\`\${field} IN (\${placeholders})\`)
+        }
+      } else {
+        if (value === null) {
+          if (operand === '=') {
+            conditions.push(\`\${field} IS NULL\`)
+          } else if (operand === '!=') {
+            conditions.push(\`\${field} IS NOT NULL\`)
+          }
+        } else {
+          // Validate operator to prevent SQL injection
+          const validOps = ['=', '!=', '>', '<', '>=', '<=']
+          const sqlOperator = validOps.includes(operand) ? operand : '='
+          conditions.push(\`\${field} \${sqlOperator} ?\`)
+          queryParams.push(value)
+        }
+      }
+    })
+  } else {
+    Object.entries(parsedFilters).forEach(([key, value]) => {
+      if (Array.isArray(value)) {
+        const placeholders = value.map(() => '?').join(', ')
+        queryParams.push(...value)
+        conditions.push(\`\${mysql.escapeId(key)} IN (\${placeholders})\`)
+      } else {
+        conditions.push(\`\${mysql.escapeId(key)} = ?\`)
+        queryParams.push(value)
+      }
+    })
+  }
+}
+
 ${generateDateFormatterCode()}
 
 export default async function handler(req, res) {
   const connection = await getConnection()
   
   try {
-    const { query, queryColumns, limit, page, perPage, sortBy, sortOrder, filters, offset } = req.query
+    const { query, queryColumns, limit, page, perPage, sortBy, sortOrder, filters, sorts, offset } = req.query
     
     const conditions = []
     const queryParams = []
@@ -73,7 +132,7 @@ export default async function handler(req, res) {
       
       if (queryColumns) {
         // Use specified columns
-        columns = JSON.parse(queryColumns)
+        columns = safeJSONParse(queryColumns)
       } else {
         // Fallback: Get all columns from information_schema
         try {
@@ -97,19 +156,8 @@ export default async function handler(req, res) {
       }
     }
     
-    if (filters) {
-      const parsedFilters = JSON.parse(filters)
-      Object.entries(parsedFilters).forEach(([key, value]) => {
-        if (Array.isArray(value)) {
-          const placeholders = value.map(() => '?').join(', ')
-          queryParams.push(...value)
-          conditions.push(\`\${mysql.escapeId(key)} IN (\${placeholders})\`)
-        } else {
-          conditions.push(\`\${mysql.escapeId(key)} = ?\`)
-          queryParams.push(value)
-        }
-      })
-    }
+    // Apply filters using helper function
+    processFilters(filters, conditions, queryParams)
     
     let sql = \`SELECT * FROM \${mysql.escapeId('${tableName}')}\`
     
@@ -117,7 +165,21 @@ export default async function handler(req, res) {
       sql += \` WHERE \${conditions.join(' AND ')}\`
     }
     
-    if (sortBy) {
+    // Handle sorts - new array format
+    if (sorts) {
+      const parsedSorts = safeJSONParse(sorts)
+      if (Array.isArray(parsedSorts) && parsedSorts.length > 0) {
+        const orderClauses = parsedSorts.map((sort) => {
+          if (!sort.field) return null
+          const order = sort.order?.toUpperCase() === 'DESC' ? 'DESC' : 'ASC'
+          return \`\${mysql.escapeId(sort.field)} \${order}\`
+        }).filter(Boolean)
+        
+        if (orderClauses.length > 0) {
+          sql += \` ORDER BY \${orderClauses.join(', ')}\`
+        }
+      }
+    } else if (sortBy) {
       sql += \` ORDER BY \${mysql.escapeId(sortBy)} \${sortOrder?.toUpperCase() || 'ASC'}\`
     }
     
@@ -184,7 +246,8 @@ async function getCount(req, res) {
       
       if (queryColumns) {
         // Use specified columns
-        columns = typeof queryColumns === 'string' ? JSON.parse(queryColumns) : (Array.isArray(queryColumns) ? queryColumns : [queryColumns])
+        const parsed = safeJSONParse(queryColumns)
+        columns = Array.isArray(parsed) ? parsed : [parsed]
       } else {
         // Fallback: Get all columns from information_schema
         try {
@@ -208,13 +271,8 @@ async function getCount(req, res) {
       }
     }
 
-    if (filters) {
-      const parsedFilters = JSON.parse(filters)
-      for (const filter of parsedFilters) {
-        conditions.push(\`\${filter.column} \${filter.operator} ?\`)
-        queryParams.push(filter.value)
-      }
-    }
+    // Apply filters using helper function
+    processFilters(filters, conditions, queryParams)
 
     let countSql = \`SELECT COUNT(*) as count FROM ${tableName}\`
     if (conditions.length > 0) {

package/src/fetchers/postgresql.ts

@@ -1,4 +1,8 @@
-import { replaceSecretReference, generateDateFormatterCode } from '../utils'
+import {
+  replaceSecretReference,
+  generateDateFormatterCode,
+  generateSafeJSONParseCode,
+} from '../utils'
 
 interface PostgreSQLConfig {
   host?: string
@@ -43,6 +47,64 @@ const getClient = () => {
   })
 }
 
+${generateSafeJSONParseCode()}
+
+// Helper function to process filters and build conditions
+const processFilters = (filters, conditions, queryParams, paramIndex) => {
+  if (!filters) return paramIndex
+  
+  const parsedFilters = safeJSONParse(filters)
+  
+  if (Array.isArray(parsedFilters)) {
+    parsedFilters.forEach((filter) => {
+      if (!filter.source || filter.destination === undefined) return
+      
+      const field = filter.source
+      const value = filter.destination
+      const operand = filter.operand || '='
+      
+      if (Array.isArray(value)) {
+        if (value.length === 0) return
+        const placeholders = value.map(() => \`$\${paramIndex++}\`)
+        queryParams.push(...value)
+        if (operand === '!=') {
+          conditions.push(\`\${field} NOT IN (\${placeholders.join(', ')})\`)
+        } else {
+          conditions.push(\`\${field} IN (\${placeholders.join(', ')})\`)
+        }
+      } else {
+        if (value === null) {
+          if (operand === '=') {
+            conditions.push(\`\${field} IS NULL\`)
+          } else if (operand === '!=') {
+            conditions.push(\`\${field} IS NOT NULL\`)
+          }
+        } else {
+          const validOps = ['=', '!=', '>', '<', '>=', '<=']
+          const sqlOperator = validOps.includes(operand) ? operand : '='
+          conditions.push(\`\${field} \${sqlOperator} $\${paramIndex}\`)
+          queryParams.push(value)
+          paramIndex++
+        }
+      }
+    })
+  } else {
+    Object.entries(parsedFilters).forEach(([key, value]) => {
+      if (Array.isArray(value)) {
+        const placeholders = value.map(() => \`$\${paramIndex++}\`)
+        queryParams.push(...value)
+        conditions.push(\`\${key} IN (\${placeholders.join(', ')})\`)
+      } else {
+        conditions.push(\`\${key} = $\${paramIndex}\`)
+        queryParams.push(value)
+        paramIndex++
+      }
+    })
+  }
+  
+  return paramIndex
+}
+
 ${generateDateFormatterCode()}
 
 export default async function handler(req, res) {
@@ -52,7 +114,7 @@ export default async function handler(req, res) {
     await client.connect()
     ${schema ? `await client.query('SET search_path TO ${schema}')` : ''}
     
-    const { query, queryColumns, limit, page, perPage, sortBy, sortOrder, filters, offset } = req.query
+    const { query, queryColumns, limit, page, perPage, sortBy, sortOrder, filters, sorts, offset } = req.query
     
     const conditions = []
     const queryParams = []
@@ -63,7 +125,7 @@ export default async function handler(req, res) {
       
       if (queryColumns) {
         // Use specified columns
-        columns = JSON.parse(queryColumns)
+        columns = safeJSONParse(queryColumns)
       } else {
         // Fallback: Get all columns from information_schema
         try {
@@ -97,20 +159,8 @@ export default async function handler(req, res) {
       }
     }
     
-    if (filters) {
-      const parsedFilters = JSON.parse(filters)
-      Object.entries(parsedFilters).forEach(([key, value]) => {
-        if (Array.isArray(value)) {
-          const placeholders = value.map(() => \`$\${paramIndex++}\`)
-          queryParams.push(...value)
-          conditions.push(\`\${key} IN (\${placeholders.join(', ')})\`)
-        } else {
-          conditions.push(\`\${key} = $\${paramIndex}\`)
-          queryParams.push(value)
-          paramIndex++
-        }
-      })
-    }
+    // Apply filters using helper function
+    paramIndex = processFilters(filters, conditions, queryParams, paramIndex)
     
     let sql = \`SELECT * FROM ${tableName}\`
     
@@ -118,7 +168,21 @@ export default async function handler(req, res) {
       sql += \` WHERE \${conditions.join(' AND ')}\`
     }
     
-    if (sortBy) {
+    // Handle sorts - new array format
+    if (sorts) {
+      const parsedSorts = safeJSONParse(sorts)
+      if (Array.isArray(parsedSorts) && parsedSorts.length > 0) {
+        const orderClauses = parsedSorts.map((sort) => {
+          if (!sort.field) return null
+          const order = sort.order?.toUpperCase() === 'DESC' ? 'DESC' : 'ASC'
+          return \`\${sort.field} \${order}\`
+        }).filter(Boolean)
+        
+        if (orderClauses.length > 0) {
+          sql += \` ORDER BY \${orderClauses.join(', ')}\`
+        }
+      }
+    } else if (sortBy) {
       sql += \` ORDER BY \${sortBy} \${sortOrder?.toUpperCase() || 'ASC'}\`
     }
     
@@ -188,7 +252,8 @@ async function getCount(req, res) {
       
       if (queryColumns) {
         // Use specified columns
-        columns = typeof queryColumns === 'string' ? JSON.parse(queryColumns) : (Array.isArray(queryColumns) ? queryColumns : [queryColumns])
+        const parsed = safeJSONParse(queryColumns)
+        columns = Array.isArray(parsed) ? parsed : [parsed]
       } else {
         // Fallback: Get all columns from information_schema
         try {
@@ -220,13 +285,8 @@ async function getCount(req, res) {
       }
     }
 
-    if (filters) {
-      const parsedFilters = JSON.parse(filters)
-      for (const filter of parsedFilters) {
-        conditions.push(\`\${filter.column} \${filter.operator} $\${paramIndex++}\`)
-        queryParams.push(filter.value)
-      }
-    }
+    // Apply filters using helper function
+    paramIndex = processFilters(filters, conditions, queryParams, paramIndex)
 
     let countSql = \`SELECT COUNT(*) FROM ${tableName}\`
     if (conditions.length > 0) {

package/src/fetchers/redis.ts

@@ -1,4 +1,8 @@
-import { replaceSecretReference, generateDateFormatterCode } from '../utils'
+import {
+  replaceSecretReference,
+  generateDateFormatterCode,
+  generateSafeJSONParseCode,
+} from '../utils'
 
 export const validateRedisConfig = (
   config: Record<string, unknown>
@@ -63,6 +67,8 @@ export const generateRedisFetcher = (config: Record<string, unknown>): string =>
 
   return `import { createClient } from 'redis'
 
+${generateSafeJSONParseCode()}
+
 ${generateDateFormatterCode()}
 
 export default async function handler(req, res) {
@@ -76,9 +82,23 @@ export default async function handler(req, res) {
     
     await client.connect()
     
-    const { query, limit, page, perPage, sortBy, sortOrder, filters, offset } = req.query
+    const { query, limit, page, perPage, sortBy, sortOrder, filters, sorts, offset } = req.query
+    
+    let pattern = query || '*'
+    
+    // Extract pattern from filters if available (new format)
+    if (filters) {
+      const parsedFilters = safeJSONParse(filters)
+      if (Array.isArray(parsedFilters)) {
+        const patternFilter = parsedFilters.find(f => f.source === 'pattern')
+        if (patternFilter) {
+          pattern = patternFilter.destination || pattern
+        }
+      } else {
+        pattern = parsedFilters.pattern || pattern
+      }
+    }
     
-    const pattern = (filters && JSON.parse(filters).pattern) || query || '*'
     const keys = await client.keys(pattern)
     
     const limitValue = limit || perPage || 100
@@ -119,7 +139,23 @@ export default async function handler(req, res) {
       })
     }
     
-    if (sortBy) {
+    // Handle sorts - new array format
+    if (sorts) {
+      const parsedSorts = safeJSONParse(sorts)
+      if (Array.isArray(parsedSorts) && parsedSorts.length > 0) {
+        const primarySort = parsedSorts[0]
+        if (primarySort.field) {
+          const sortOrderValue = primarySort.order?.toLowerCase() === 'desc' ? -1 : 1
+          results.sort((a, b) => {
+            const aVal = a[primarySort.field]
+            const bVal = b[primarySort.field]
+            if (aVal < bVal) return -sortOrderValue
+            if (aVal > bVal) return sortOrderValue
+            return 0
+          })
+        }
+      }
+    } else if (sortBy) {
       const sortOrderValue = sortOrder?.toLowerCase() === 'desc' ? -1 : 1
       results.sort((a, b) => {
         const aVal = a[sortBy]