Files
supabase/apps/studio/components/interfaces/Database/Schemas/Schemas.utils.ts
Charis d4079083fc chore(studio): drop @supabase/postgres-meta in favor of @supabase/pg-meta (#45844)
## I have read the
[CONTRIBUTING.md](https://github.com/supabase/supabase/blob/master/CONTRIBUTING.md)
file.

YES

## What kind of change does this PR introduce?

Refactor / dependency cleanup.

## What is the current behavior?

`apps/studio` lists both `@supabase/pg-meta` (workspace package) as a
runtime dep and `@supabase/postgres-meta` (external npm package,
`^0.64.4`) as a devDependency. The external package is used only for
type imports across 44 files — there is no runtime usage and no codegen
pipeline that needs it.

## What is the new behavior?

Every `Postgres*` type import (`PostgresTable`, `PostgresColumn`,
`PostgresPolicy`, `PostgresTrigger`, `PostgresView`,
`PostgresMaterializedView`, `PostgresForeignTable`, `PostgresSchema`,
`PostgresPublication`, `PostgresRelationship`, `PostgresPrimaryKey`) is
replaced with its `PG*` counterpart from `@supabase/pg-meta`, and the
external dep is removed from \`apps/studio/package.json\`. Top-level
type re-exports were added to \`packages/pg-meta/src/index.ts\` so
consumers can import directly from the package root.

Two latent issues surfaced by the stricter pg-meta types are also fixed:
- \`data/foreign-tables/foreign-tables-query.ts\` was casting
foreign-table results as \`PostgresView[]\`; corrected to
\`PGForeignTable[]\`.
- \`pg-meta\`'s \`PGTrigger\` Zod schema declared
\`orientation\`/\`activation\` as \`z.string()\`, inconsistent with
pg-meta's own \`getDatabaseTriggerUpdateSQL\` helper that requires the
narrow literal unions; tightened to \`z.enum\`.

## Additional context

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

* **Chores**
* Updated internal TypeScript type definitions across the codebase to
use the latest type system from `@supabase/pg-meta`.
  * Removed `@supabase/postgres-meta` dependency.
* Enhanced type validation for database triggers and schemas to enforce
stricter constraints.

[![Review Change
Stack](https://storage.googleapis.com/coderabbit_public_assets/review-stack-in-coderabbit-ui.svg)](https://app.coderabbit.ai/change-stack/supabase/supabase/pull/45844)

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
2026-05-13 16:07:10 +00:00

295 lines
8.0 KiB
TypeScript

import dagre from '@dagrejs/dagre'
import type { PGSchema, PGTable } from '@supabase/pg-meta'
import { Edge, Node, Position } from '@xyflow/react'
import { uniqBy } from 'lodash'
import '@xyflow/react/dist/style.css'
import { LOCAL_STORAGE_KEYS } from 'common'
import { TableNodeData } from './Schemas.constants'
import { TABLE_NODE_ROW_HEIGHT, TABLE_NODE_WIDTH } from './SchemaTableNode'
import { tryParseJson } from '@/lib/helpers'
const NODE_SEP = 25
const RANK_SEP = 50
export async function getGraphDataFromTables(
ref?: string,
schema?: PGSchema,
tables?: PGTable[]
): Promise<{
nodes: Node<TableNodeData>[]
edges: Edge[]
}> {
if (!tables?.length) {
return { nodes: [], edges: [] }
}
const nodes = tables.map((table) => {
const columns = (table.columns || []).map((column) => {
return {
id: column.id,
isPrimary: table.primary_keys.some((pk) => pk.name === column.name),
name: column.name,
format: column.format,
isNullable: column.is_nullable,
isUnique: column.is_unique,
isUpdateable: column.is_updatable,
isIdentity: column.is_identity,
description: column.comment ?? '',
}
})
const data: TableNodeData = {
ref,
id: table.id,
name: table.name,
description: table.comment ?? '',
schema: table.schema,
isForeign: false,
columns,
}
return {
data,
id: `${table.id}`,
type: 'table',
position: { x: 0, y: 0 },
}
})
const edges: Edge[] = []
const currentSchema = tables[0].schema
const uniqueRelationships = uniqBy(
tables.flatMap((t) => t.relationships),
'id'
)
for (const rel of uniqueRelationships) {
// TODO: Support [external->this] relationship?
if (rel.source_schema !== currentSchema) {
continue
}
// Create additional [this->foreign] node that we can point to on the graph.
if (rel.target_table_schema !== currentSchema) {
const targetId = `${rel.target_table_schema}.${rel.target_table_name}.${rel.target_column_name}`
const targetNode = nodes.find((n) => n.id === targetId)
if (!targetNode) {
const data: TableNodeData = {
id: rel.id,
ref: ref!,
schema: rel.target_table_schema,
name: targetId,
description: '',
isForeign: true,
columns: [],
}
nodes.push({
id: targetId,
type: 'table',
data: data,
position: { x: 0, y: 0 },
})
}
const [source, sourceHandle] = findTablesHandleIds(
tables,
rel.source_table_name,
rel.source_column_name
)
if (source) {
edges.push({
id: String(rel.id),
source,
sourceHandle,
target: targetId,
targetHandle: targetId,
deletable: false,
data: {
sourceName: rel.source_table_name,
sourceSchemaName: rel.source_schema,
sourceColumnName: rel.source_column_name,
targetName: rel.target_table_name,
targetSchemaName: rel.target_table_schema,
targetColumnName: rel.target_column_name,
},
})
}
continue
}
const [source, sourceHandle] = findTablesHandleIds(
tables,
rel.source_table_name,
rel.source_column_name
)
const [target, targetHandle] = findTablesHandleIds(
tables,
rel.target_table_name,
rel.target_column_name
)
// We do not support [external->this] flow currently.
if (source && target) {
edges.push({
id: String(rel.id),
source,
sourceHandle,
target,
targetHandle,
type: 'default',
data: {
sourceName: rel.source_table_name,
sourceSchemaName: rel.source_schema,
sourceColumnName: rel.source_column_name,
targetName: rel.target_table_name,
targetSchemaName: rel.target_table_schema,
targetColumnName: rel.target_column_name,
},
})
}
}
const savedPositionsLocalStorage = localStorage.getItem(
LOCAL_STORAGE_KEYS.SCHEMA_VISUALIZER_POSITIONS(ref ?? 'project', schema?.id ?? 0)
)
const savedPositions = tryParseJson(savedPositionsLocalStorage)
return !!savedPositions
? getLayoutedElementsViaLocalStorage(nodes, edges, savedPositions)
: getLayoutedElementsViaDagre(nodes, edges)
}
function findTablesHandleIds(
tables: PGTable[],
table_name: string,
column_name: string
): [string?, string?] {
for (const table of tables) {
if (table_name !== table.name) continue
for (const column of table.columns || []) {
if (column_name !== column.name) continue
return [String(table.id), column.id]
}
}
return []
}
export const getLayoutedElementsViaDagre = (nodes: Node<TableNodeData>[], edges: Edge[]) => {
const dagreGraph = new dagre.graphlib.Graph()
dagreGraph.setDefaultEdgeLabel(() => ({}))
dagreGraph.setGraph({
rankdir: 'LR',
align: 'UR',
nodesep: NODE_SEP,
ranksep: RANK_SEP,
})
nodes.forEach((node) => {
dagreGraph.setNode(node.id, {
width: TABLE_NODE_WIDTH / 2,
height: (TABLE_NODE_ROW_HEIGHT / 2) * (node.data.columns.length + 1), // columns + header
})
})
edges.forEach((edge) => {
dagreGraph.setEdge(edge.source, edge.target)
})
dagre.layout(dagreGraph)
nodes.forEach((node) => {
const nodeWithPosition = dagreGraph.node(node.id)
node.targetPosition = Position.Left
node.sourcePosition = Position.Right
// We are shifting the dagre node position (anchor=center center) to the top left
// so it matches the React Flow node anchor point (top left).
node.position = {
x: nodeWithPosition.x - nodeWithPosition.width / 2,
y: nodeWithPosition.y - nodeWithPosition.height / 2,
}
return node
})
return { nodes, edges }
}
const getLayoutedElementsViaLocalStorage = (
nodes: Node<TableNodeData>[],
edges: Edge[],
positions: { [key: string]: { x: number; y: number } }
) => {
// [Joshen] Potentially look into auto fitting new nodes?
// https://github.com/xyflow/xyflow/issues/1113
const nodesWithNoSavedPositons = nodes.filter((n) => !(n.id in positions))
let newNodeCount = 0
let basePosition = {
x: 0,
y: -(NODE_SEP + TABLE_NODE_ROW_HEIGHT + nodesWithNoSavedPositons.length * 10),
}
nodes.forEach((node) => {
const existingPosition = positions?.[node.id]
node.targetPosition = Position.Left
node.sourcePosition = Position.Right
if (existingPosition) {
node.position = existingPosition
} else {
node.position = {
x: basePosition.x + newNodeCount * 10,
y: basePosition.y + newNodeCount * 10,
}
newNodeCount += 1
}
})
return { nodes, edges }
}
export const getTableDefinitionAsMarkdown = (table: TableNodeData) => {
let markdown = `## Table \`${escapeForMarkdown(table.name)}\`\n\n`
if (table.description) {
markdown += `${table.description}\n\n`
}
markdown += `### Columns\n\n`
markdown += `| Name | Type | Constraints |\n`
markdown += `|------|------|-------------|\n`
return table.columns.reduce((current, column) => {
current += `| \`${escapeForMarkdown(column.name)}\` | \`${escapeForMarkdown(column.format)}\` | ${column.isPrimary ? 'Primary' : ''}${column.isNullable ? ' Nullable' : ''}${column.isUnique ? ' Unique' : ''}${column.isIdentity ? ' Identity' : ''} |\n`
return current
}, markdown)
}
export const getSchemaAsMarkdown = (schema: string, tables: TableNodeData[]) => {
return tables.reduce((current, table) => {
if (table.schema === schema) {
current += `${getTableDefinitionAsMarkdown(table)}\n`
}
return current
}, '')
}
const escapeForMarkdown = (str: string) => {
return (
str
// Escape backslashes first so later escapes are not ambiguous
.replace(/\\/g, '\\\\')
// Escape backticks and pipes for markdown tables
.replace(/([|`])/g, '\\$1')
// Remove new lines
.replace(/\n/g, ' ')
)
}