@pgsql/transform 18.14.1 → 18.15.1

package/esm/facts.js

@@ -1,393 +1,7 @@
-import { walkSqlAst } from '@pgsql/traverse';
-import { parseSql, transformSync, walkPlpgsqlAst } from 'plpgsql-parser';
-const SECURITY_TAGS = new Set([
-    'CreatePolicyStmt',
-    'AlterPolicyStmt',
-    'GrantStmt',
-    'GrantRoleStmt',
-    'AlterDefaultPrivilegesStmt',
-    'SecLabelStmt',
-    'AlterOwnerStmt',
-    'CreateRoleStmt',
-    'AlterRoleStmt'
-]);
-const KIND_BY_TAG = {
-    CreateSchemaStmt: 'schema',
-    CreateExtensionStmt: 'extension',
-    CreateStmt: 'table',
-    ViewStmt: 'view',
-    IndexStmt: 'index',
-    CompositeTypeStmt: 'type',
-    CreateEnumStmt: 'type',
-    CreateDomainStmt: 'type',
-    CreateRangeStmt: 'type',
-    DefineStmt: 'type',
-    CreateFunctionStmt: 'function',
-    CreateTrigStmt: 'trigger',
-    CreateEventTrigStmt: 'trigger',
-    CreatePolicyStmt: 'policy',
-    AlterPolicyStmt: 'policy',
-    GrantStmt: 'grant',
-    GrantRoleStmt: 'grant',
-    AlterDefaultPrivilegesStmt: 'grant',
-    CommentStmt: 'comment',
-    InsertStmt: 'seed_dml',
-    UpdateStmt: 'seed_dml',
-    DeleteStmt: 'seed_dml'
-};
-function qn(schema, name) {
-    return { schema: schema ?? null, name };
-}
 /**
- * Read the `SCHEMA <name>` clause of a `CreateExtensionStmt` from its options
- * (`{ DefElem: { defname: 'schema', arg: { String: { sval } } } }`), or `null`
- * when the statement specifies no schema.
+ * The statement-classification facts layer now lives in `@pgsql/semantics`.
+ * It is re-exported here so existing `@pgsql/transform` consumers — and this
+ * package's own drivers (`qualify`, `restructure`, `naming`, `graph`) — keep
+ * importing the same symbols from the same paths.
  */
-function extensionSchemaOption(options) {
-    if (!Array.isArray(options))
-        return null;
-    for (const opt of options) {
-        const def = opt?.DefElem;
-        if (def?.defname === 'schema') {
-            const sval = def.arg?.String?.sval;
-            return typeof sval === 'string' ? sval : null;
-        }
-    }
-    return null;
-}
-function nameListToQualified(names) {
-    if (!Array.isArray(names) || names.length === 0)
-        return null;
-    const parts = names
-        .map((n) => n?.String?.sval)
-        .filter((s) => typeof s === 'string');
-    if (parts.length === 0)
-        return null;
-    if (parts.length === 1)
-        return qn(null, parts[0]);
-    return qn(parts[parts.length - 2], parts[parts.length - 1]);
-}
-function isCatalogSchema(schema) {
-    return schema === 'pg_catalog' || schema === 'information_schema';
-}
-function pushRef(refs, ref) {
-    if (!ref || !ref.schema || isCatalogSchema(ref.schema))
-        return;
-    if (refs.some(r => r.schema === ref.schema && r.name === ref.name))
-        return;
-    refs.push(ref);
-}
-function collectRoles(node, roles) {
-    const push = (role) => {
-        if (typeof role === 'string' && role.length > 0 && !roles.includes(role)) {
-            roles.push(role);
-        }
-    };
-    if (Array.isArray(node?.grantees)) {
-        for (const g of node.grantees)
-            push(g?.RoleSpec?.rolename);
-    }
-    if (Array.isArray(node?.roles)) {
-        for (const r of node.roles)
-            push(r?.RoleSpec?.rolename);
-    }
-    push(node?.newowner?.rolename);
-    push(node?.role?.rolename);
-}
-/**
- * Create a read-only visitor that accumulates references, roles and FK
- * targets into the provided facts object.
- */
-function createFactsVisitor(facts, bodyRefs) {
-    const push = (ref) => {
-        pushRef(facts.references, ref);
-        if (bodyRefs)
-            pushRef(bodyRefs, ref);
-    };
-    return {
-        RangeVar: (path) => {
-            const node = path.node;
-            if (node.schemaname) {
-                push(qn(node.schemaname, node.relname));
-            }
-        },
-        FuncCall: (path) => {
-            push(nameListToQualified(path.node.funcname));
-        },
-        TypeName: (path) => {
-            push(nameListToQualified(path.node.names));
-        },
-        ColumnRef: (path) => {
-            // schema.table.column references carry cross-schema information
-            const fields = path.node.fields;
-            if (Array.isArray(fields) && fields.length >= 3) {
-                const parts = fields
-                    .map((f) => f?.String?.sval)
-                    .filter((s) => typeof s === 'string');
-                if (parts.length >= 3) {
-                    push(qn(parts[0], parts[1]));
-                }
-            }
-        },
-        Constraint: (path) => {
-            const node = path.node;
-            if (node.contype === 'CONSTR_FOREIGN' && node.pktable) {
-                const target = qn(node.pktable.schemaname ?? null, node.pktable.relname);
-                if (!facts.fkTargets.some(t => t.schema === target.schema && t.name === target.name)) {
-                    facts.fkTargets.push(target);
-                }
-                if (target.schema)
-                    pushRef(facts.references, target);
-            }
-        }
-    };
-}
-function classifyOne(nodeTag, node) {
-    const facts = {
-        kind: KIND_BY_TAG[nodeTag] ?? 'other',
-        nodeTag,
-        creates: [],
-        references: [],
-        referencedSchemas: [],
-        roles: [],
-        fkTargets: [],
-        bodyReferences: [],
-        securityRelevant: SECURITY_TAGS.has(nodeTag),
-        securityDefiner: false,
-        dynamicSql: false,
-        span: { start: 0, len: 0 }
-    };
-    switch (nodeTag) {
-        case 'CreateSchemaStmt':
-            facts.creates.push(qn(null, node.schemaname));
-            break;
-        case 'CreateExtensionStmt':
-            facts.extension = {
-                name: node.extname,
-                schema: extensionSchemaOption(node.options),
-                action: 'create',
-                ifNotExists: node.if_not_exists === true
-            };
-            break;
-        case 'CreateStmt':
-        case 'ViewStmt': {
-            const rel = nodeTag === 'ViewStmt' ? node.view : node.relation;
-            if (rel)
-                facts.creates.push(qn(rel.schemaname ?? null, rel.relname));
-            break;
-        }
-        case 'IndexStmt':
-            if (node.relation) {
-                facts.creates.push(qn(node.relation.schemaname ?? null, node.idxname ?? node.relation.relname));
-            }
-            break;
-        case 'CreateFunctionStmt': {
-            const name = nameListToQualified(node.funcname);
-            if (name)
-                facts.creates.push(name);
-            for (const opt of node.options ?? []) {
-                const def = opt?.DefElem;
-                if (def?.defname === 'security' && def?.arg?.Boolean?.boolval === true) {
-                    facts.securityDefiner = true;
-                }
-            }
-            break;
-        }
-        case 'CreateTrigStmt':
-            if (node.relation) {
-                // Trigger names are only unique per table; qualify with the table.
-                facts.creates.push(qn(node.relation.schemaname ?? null, `${node.relation.relname}.${node.trigname}`));
-            }
-            pushRef(facts.references, nameListToQualified(node.funcname));
-            break;
-        case 'CreatePolicyStmt':
-        case 'AlterPolicyStmt':
-            if (node.table) {
-                // Policy names are only unique per table; qualify with the table.
-                facts.creates.push(qn(node.table.schemaname ?? null, `${node.table.relname}.${node.policy_name}`));
-                // The guarded table lives on `node.table`; the generic RangeVar walker
-                // does not descend into it, so capture the reference explicitly.
-                if (node.table.schemaname) {
-                    pushRef(facts.references, qn(node.table.schemaname, node.table.relname));
-                }
-            }
-            break;
-        case 'CreateSeqStmt':
-            if (node.sequence) {
-                facts.creates.push(qn(node.sequence.schemaname ?? null, node.sequence.relname));
-            }
-            break;
-        case 'CompositeTypeStmt':
-            if (node.typevar) {
-                facts.creates.push(qn(node.typevar.schemaname ?? null, node.typevar.relname));
-            }
-            break;
-        case 'CreateEnumStmt':
-        case 'CreateRangeStmt': {
-            const name = nameListToQualified(node.typeName);
-            if (name)
-                facts.creates.push(name);
-            break;
-        }
-        case 'CreateDomainStmt': {
-            // `typeName` on a domain is the base type; the name is `domainname`.
-            const name = nameListToQualified(node.domainname);
-            if (name)
-                facts.creates.push(name);
-            break;
-        }
-        case 'AlterObjectSchemaStmt':
-            // ALTER EXTENSION <name> SET SCHEMA <newschema>. Other object types
-            // (TABLE/TYPE/FUNCTION ... SET SCHEMA) keep their default classification.
-            if (node.objectType === 'OBJECT_EXTENSION') {
-                const name = node.object?.String?.sval;
-                if (typeof name === 'string') {
-                    facts.kind = 'extension';
-                    facts.extension = {
-                        name,
-                        schema: typeof node.newschema === 'string' ? node.newschema : null,
-                        action: 'set_schema'
-                    };
-                }
-            }
-            break;
-        case 'DropStmt':
-            // DROP EXTENSION <name> [, ...]. Extension names are bare String nodes.
-            // Other DROP object types keep their default classification. When
-            // several extensions are dropped in one statement the first names the
-            // fact; the full list stays available via the raw node.
-            if (node.removeType === 'OBJECT_EXTENSION' && Array.isArray(node.objects)) {
-                const name = node.objects[0]?.String?.sval;
-                if (typeof name === 'string') {
-                    facts.kind = 'extension';
-                    facts.extension = { name, schema: null, action: 'drop' };
-                }
-            }
-            break;
-        case 'AlterTableStmt': {
-            if (node.relation) {
-                facts.creates.push(qn(node.relation.schemaname ?? null, node.relation.relname));
-            }
-            const cmds = node.cmds ?? [];
-            for (const cmd of cmds) {
-                const subtype = cmd?.AlterTableCmd?.subtype;
-                if (subtype === 'AT_EnableRowSecurity' || subtype === 'AT_ForceRowSecurity' ||
-                    subtype === 'AT_DisableRowSecurity' || subtype === 'AT_NoForceRowSecurity') {
-                    facts.kind = 'rls_enable';
-                    facts.securityRelevant = true;
-                }
-                else if (subtype === 'AT_AddConstraint') {
-                    const contype = cmd?.AlterTableCmd?.def?.Constraint?.contype;
-                    facts.kind = contype === 'CONSTR_FOREIGN' ? 'fk_constraint' : 'constraint';
-                }
-                else if (subtype === 'AT_ChangeOwner') {
-                    facts.securityRelevant = true;
-                    const owner = cmd?.AlterTableCmd?.newowner?.rolename;
-                    if (owner && !facts.roles.includes(owner))
-                        facts.roles.push(owner);
-                }
-            }
-            break;
-        }
-        case 'InsertStmt':
-        case 'UpdateStmt':
-        case 'DeleteStmt':
-            if (node.relation) {
-                facts.creates.push(qn(node.relation.schemaname ?? null, node.relation.relname));
-            }
-            break;
-        default:
-            break;
-    }
-    collectRoles(node, facts.roles);
-    return facts;
-}
-/** Read a `CreateFunctionStmt` DefElem option's scalar/list value. */
-function functionOption(node, defname) {
-    for (const opt of node.options ?? []) {
-        if (opt?.DefElem?.defname === defname)
-            return opt.DefElem.arg;
-    }
-    return undefined;
-}
-/**
- * Collect references from a `LANGUAGE sql` function body supplied as a string
- * literal (`AS $$ ... $$`). That body is an opaque String node the AST walker
- * never parses, so — mirroring the schema transformer's body rewrite — parse
- * it standalone and walk each statement with the facts visitor. The standard
- * `BEGIN ATOMIC` / `RETURN` `sql_body` form is already part of the AST and is
- * covered by the outer walk, so only the string form needs this.
- */
-function collectSqlBodyReferences(node, facts) {
-    const language = functionOption(node, 'language')?.String?.sval;
-    if (typeof language !== 'string' || language.toLowerCase() !== 'sql')
-        return;
-    const asArg = functionOption(node, 'as');
-    const items = asArg?.List?.items ?? [];
-    const body = items[0]?.String?.sval;
-    if (typeof body !== 'string')
-        return;
-    try {
-        const stmts = parseSql(body)?.stmts ?? [];
-        const visitor = createFactsVisitor(facts, facts.bodyReferences);
-        for (const stmt of stmts) {
-            if (stmt?.stmt)
-                walkSqlAst(stmt.stmt, visitor);
-        }
-    }
-    catch {
-        // A non-parseable body (C symbol name, etc.) contributes no references.
-    }
-}
-/**
- * Classify each top-level statement in a SQL script into {@link StatementFacts}.
- *
- * Uses the same parser stack as the schema transformer (pgsql AST walk plus
- * hydrated PL/pgSQL body walk), so references inside function bodies are
- * included. The input SQL is never modified.
- */
-export function classifyStatements(sql) {
-    const allFacts = [];
-    transformSync(sql, (ctx) => {
-        const stmts = ctx.sql?.stmts ?? [];
-        for (const stmt of stmts) {
-            const stmtNode = stmt?.stmt;
-            const nodeTag = stmtNode ? Object.keys(stmtNode)[0] : 'other';
-            const node = stmtNode?.[nodeTag] ?? {};
-            const facts = classifyOne(nodeTag, node);
-            const start = stmt?.stmt_location ?? 0;
-            facts.span = { start, len: stmt?.stmt_len ?? Math.max(0, sql.length - start) };
-            if (stmtNode) {
-                facts.stmt = stmtNode;
-                walkSqlAst(stmtNode, createFactsVisitor(facts));
-            }
-            if (nodeTag === 'CreateFunctionStmt') {
-                collectSqlBodyReferences(node, facts);
-            }
-            allFacts.push(facts);
-        }
-        for (const fn of ctx.functions ?? []) {
-            const facts = allFacts[fn.stmtIndex];
-            if (!facts || !fn.plpgsql?.hydrated)
-                continue;
-            // Refs already found outside the body (signature types, defaults)
-            // constrain deploy order and are not body-only.
-            const outer = new Set(facts.references.map(r => `${r.schema ?? '?'}.${r.name}`));
-            walkPlpgsqlAst(fn.plpgsql.hydrated, {
-                PLpgSQL_stmt_dynexecute: () => { facts.dynamicSql = true; },
-                PLpgSQL_stmt_dynfors: () => { facts.dynamicSql = true; }
-            }, {
-                walkSqlExpressions: true,
-                sqlVisitor: createFactsVisitor(facts, facts.bodyReferences)
-            });
-            facts.bodyReferences = facts.bodyReferences.filter(r => !outer.has(`${r.schema ?? '?'}.${r.name}`));
-        }
-    }, { hydrate: true });
-    for (const facts of allFacts) {
-        const selfRef = (r) => facts.creates.some(c => c.schema === r.schema && c.name === r.name);
-        facts.references = facts.references.filter(r => !selfRef(r));
-        facts.bodyReferences = facts.bodyReferences.filter(r => !selfRef(r));
-        facts.referencedSchemas = [...new Set(facts.references.map(r => r.schema).filter(Boolean))];
-    }
-    return allFacts;
-}
+export * from '@pgsql/semantics';

package/facts.d.ts

@@ -1,128 +1,7 @@
 /**
- * A (possibly schema-qualified) object name extracted from a statement.
+ * The statement-classification facts layer now lives in `@pgsql/semantics`.
+ * It is re-exported here so existing `@pgsql/transform` consumers — and this
+ * package's own drivers (`qualify`, `restructure`, `naming`, `graph`) — keep
+ * importing the same symbols from the same paths.
  */
-export interface QualifiedName {
-    schema: string | null;
-    name: string;
-}
-/**
- * Coarse statement classification used for tier/package sorting.
- */
-export type StatementKind = 'schema' | 'extension' | 'table' | 'view' | 'index' | 'type' | 'function' | 'trigger' | 'policy' | 'grant' | 'rls_enable' | 'fk_constraint' | 'constraint' | 'comment' | 'seed_dml' | 'other';
-/**
- * The action a statement performs on a PostgreSQL extension.
- *
- * - `create` — `CREATE EXTENSION` (`CreateExtensionStmt`).
- * - `set_schema` — `ALTER EXTENSION ... SET SCHEMA` (`AlterObjectSchemaStmt`
- *   with `objectType: OBJECT_EXTENSION`); only succeeds for relocatable
- *   extensions, so it is surfaced as its own action.
- * - `drop` — `DROP EXTENSION` (`DropStmt` with `removeType: OBJECT_EXTENSION`).
- */
-export type ExtensionAction = 'create' | 'set_schema' | 'drop';
-/**
- * Facts about an extension-level statement. Unlike ordinary objects, an
- * extension is installed into exactly one schema and its member objects are
- * renamed with it, so the relevant fact is the extension name plus the schema
- * it is (being) placed in.
- */
-export interface ExtensionFact {
-    /** The extension name (`CREATE EXTENSION <name>`). */
-    name: string;
-    /**
-     * The schema the statement places the extension in, or `null` when none is
-     * specified (`CREATE EXTENSION <name>` with no `SCHEMA` clause installs into
-     * the current default — typically `public` or the extension's fixed schema).
-     * `DROP EXTENSION` carries no schema.
-     */
-    schema: string | null;
-    /** Which extension operation this statement performs. */
-    action: ExtensionAction;
-    /** `CREATE EXTENSION IF NOT EXISTS`. */
-    ifNotExists?: boolean;
-}
-/**
- * AST-derived facts about a single top-level SQL statement.
- *
- * Read-only: classification never modifies the statement. Facts are the
- * substrate for classifier-driven slicing (schema / functionality / security
- * tiers) — replacing path/name-glob decisions with computed properties like
- * "this trigger function references billing".
- */
-export interface StatementFacts {
-    /** Coarse category of the statement. */
-    kind: StatementKind;
-    /** The raw parser node tag (e.g. `CreateStmt`, `CreatePolicyStmt`). */
-    nodeTag: string;
-    /** Objects this statement creates or directly targets. */
-    creates: QualifiedName[];
-    /**
-     * Schema-qualified objects this statement references — tables, functions
-     * and types reached anywhere in the statement, including PL/pgSQL bodies.
-     * Unqualified references are omitted (they resolve via search_path and
-     * carry no cross-schema information).
-     */
-    references: QualifiedName[];
-    /**
-     * The subset of `references` reached only inside a PL/pgSQL body. These
-     * are late-binding: Postgres resolves them at call time, not at CREATE
-     * time, so they do not constrain deploy order (and legitimately form
-     * recursion cycles between functions).
-     */
-    bodyReferences: QualifiedName[];
-    /** Distinct schemas reached by `references`. */
-    referencedSchemas: string[];
-    /** Role names granted to, owning, or bound by this statement. */
-    roles: string[];
-    /**
-     * For extension-level statements (`kind: 'extension'`): the extension being
-     * created, relocated, or dropped. Absent for every other statement.
-     */
-    extension?: ExtensionFact;
-    /** Foreign-key target tables (from column/table FK constraints). */
-    fkTargets: QualifiedName[];
-    /**
-     * Whether the statement is part of the security surface: policies, grants,
-     * RLS enable/force, security labels, ownership.
-     */
-    securityRelevant: boolean;
-    /** For functions: declared with SECURITY DEFINER. */
-    securityDefiner: boolean;
-    /**
-     * For functions: the body executes dynamic SQL (EXECUTE / EXECUTE ... USING
-     * / FOR ... IN EXECUTE). Analogous to `eval` — references inside the
-     * dynamic string are invisible to the AST, so edges from this statement
-     * are incomplete and slicing should treat it conservatively.
-     */
-    dynamicSql: boolean;
-    /**
-     * The statement's source span in the classified script, as reported by the
-     * parser: `start` is the byte offset of the statement's first token, `len`
-     * runs to the end of the statement (the parser excludes the trailing `;`;
-     * for the final statement the span extends to the end of the script).
-     * `sql.slice(span.start, span.start + span.len)` is the statement's
-     * verbatim source, so consumers can carry original text alongside the
-     * facts without a second parse.
-     */
-    span: StatementSpan;
-    /**
-     * The raw parsed statement node (`{ CreateStmt: {...} }` etc.), exactly as
-     * the parser produced it. Facts are still read-only — the node is carried
-     * so consumers like `revertFor`/`verifyFor` can derive inverse or
-     * existence-check statements without a second parse. Absent only for
-     * facts constructed by hand.
-     */
-    stmt?: Record<string, any>;
-}
-/** A statement's location in the source script (byte offsets). */
-export interface StatementSpan {
-    start: number;
-    len: number;
-}
-/**
- * Classify each top-level statement in a SQL script into {@link StatementFacts}.
- *
- * Uses the same parser stack as the schema transformer (pgsql AST walk plus
- * hydrated PL/pgSQL body walk), so references inside function bodies are
- * included. The input SQL is never modified.
- */
-export declare function classifyStatements(sql: string): StatementFacts[];
+export * from '@pgsql/semantics';

package/facts.js

@@ -1,396 +1,23 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.classifyStatements = classifyStatements;
-const traverse_1 = require("@pgsql/traverse");
-const plpgsql_parser_1 = require("plpgsql-parser");
-const SECURITY_TAGS = new Set([
-    'CreatePolicyStmt',
-    'AlterPolicyStmt',
-    'GrantStmt',
-    'GrantRoleStmt',
-    'AlterDefaultPrivilegesStmt',
-    'SecLabelStmt',
-    'AlterOwnerStmt',
-    'CreateRoleStmt',
-    'AlterRoleStmt'
-]);
-const KIND_BY_TAG = {
-    CreateSchemaStmt: 'schema',
-    CreateExtensionStmt: 'extension',
-    CreateStmt: 'table',
-    ViewStmt: 'view',
-    IndexStmt: 'index',
-    CompositeTypeStmt: 'type',
-    CreateEnumStmt: 'type',
-    CreateDomainStmt: 'type',
-    CreateRangeStmt: 'type',
-    DefineStmt: 'type',
-    CreateFunctionStmt: 'function',
-    CreateTrigStmt: 'trigger',
-    CreateEventTrigStmt: 'trigger',
-    CreatePolicyStmt: 'policy',
-    AlterPolicyStmt: 'policy',
-    GrantStmt: 'grant',
-    GrantRoleStmt: 'grant',
-    AlterDefaultPrivilegesStmt: 'grant',
-    CommentStmt: 'comment',
-    InsertStmt: 'seed_dml',
-    UpdateStmt: 'seed_dml',
-    DeleteStmt: 'seed_dml'
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-function qn(schema, name) {
-    return { schema: schema ?? null, name };
-}
-/**
- * Read the `SCHEMA <name>` clause of a `CreateExtensionStmt` from its options
- * (`{ DefElem: { defname: 'schema', arg: { String: { sval } } } }`), or `null`
- * when the statement specifies no schema.
- */
-function extensionSchemaOption(options) {
-    if (!Array.isArray(options))
-        return null;
-    for (const opt of options) {
-        const def = opt?.DefElem;
-        if (def?.defname === 'schema') {
-            const sval = def.arg?.String?.sval;
-            return typeof sval === 'string' ? sval : null;
-        }
-    }
-    return null;
-}
-function nameListToQualified(names) {
-    if (!Array.isArray(names) || names.length === 0)
-        return null;
-    const parts = names
-        .map((n) => n?.String?.sval)
-        .filter((s) => typeof s === 'string');
-    if (parts.length === 0)
-        return null;
-    if (parts.length === 1)
-        return qn(null, parts[0]);
-    return qn(parts[parts.length - 2], parts[parts.length - 1]);
-}
-function isCatalogSchema(schema) {
-    return schema === 'pg_catalog' || schema === 'information_schema';
-}
-function pushRef(refs, ref) {
-    if (!ref || !ref.schema || isCatalogSchema(ref.schema))
-        return;
-    if (refs.some(r => r.schema === ref.schema && r.name === ref.name))
-        return;
-    refs.push(ref);
-}
-function collectRoles(node, roles) {
-    const push = (role) => {
-        if (typeof role === 'string' && role.length > 0 && !roles.includes(role)) {
-            roles.push(role);
-        }
-    };
-    if (Array.isArray(node?.grantees)) {
-        for (const g of node.grantees)
-            push(g?.RoleSpec?.rolename);
-    }
-    if (Array.isArray(node?.roles)) {
-        for (const r of node.roles)
-            push(r?.RoleSpec?.rolename);
-    }
-    push(node?.newowner?.rolename);
-    push(node?.role?.rolename);
-}
-/**
- * Create a read-only visitor that accumulates references, roles and FK
- * targets into the provided facts object.
- */
-function createFactsVisitor(facts, bodyRefs) {
-    const push = (ref) => {
-        pushRef(facts.references, ref);
-        if (bodyRefs)
-            pushRef(bodyRefs, ref);
-    };
-    return {
-        RangeVar: (path) => {
-            const node = path.node;
-            if (node.schemaname) {
-                push(qn(node.schemaname, node.relname));
-            }
-        },
-        FuncCall: (path) => {
-            push(nameListToQualified(path.node.funcname));
-        },
-        TypeName: (path) => {
-            push(nameListToQualified(path.node.names));
-        },
-        ColumnRef: (path) => {
-            // schema.table.column references carry cross-schema information
-            const fields = path.node.fields;
-            if (Array.isArray(fields) && fields.length >= 3) {
-                const parts = fields
-                    .map((f) => f?.String?.sval)
-                    .filter((s) => typeof s === 'string');
-                if (parts.length >= 3) {
-                    push(qn(parts[0], parts[1]));
-                }
-            }
-        },
-        Constraint: (path) => {
-            const node = path.node;
-            if (node.contype === 'CONSTR_FOREIGN' && node.pktable) {
-                const target = qn(node.pktable.schemaname ?? null, node.pktable.relname);
-                if (!facts.fkTargets.some(t => t.schema === target.schema && t.name === target.name)) {
-                    facts.fkTargets.push(target);
-                }
-                if (target.schema)
-                    pushRef(facts.references, target);
-            }
-        }
-    };
-}
-function classifyOne(nodeTag, node) {
-    const facts = {
-        kind: KIND_BY_TAG[nodeTag] ?? 'other',
-        nodeTag,
-        creates: [],
-        references: [],
-        referencedSchemas: [],
-        roles: [],
-        fkTargets: [],
-        bodyReferences: [],
-        securityRelevant: SECURITY_TAGS.has(nodeTag),
-        securityDefiner: false,
-        dynamicSql: false,
-        span: { start: 0, len: 0 }
-    };
-    switch (nodeTag) {
-        case 'CreateSchemaStmt':
-            facts.creates.push(qn(null, node.schemaname));
-            break;
-        case 'CreateExtensionStmt':
-            facts.extension = {
-                name: node.extname,
-                schema: extensionSchemaOption(node.options),
-                action: 'create',
-                ifNotExists: node.if_not_exists === true
-            };
-            break;
-        case 'CreateStmt':
-        case 'ViewStmt': {
-            const rel = nodeTag === 'ViewStmt' ? node.view : node.relation;
-            if (rel)
-                facts.creates.push(qn(rel.schemaname ?? null, rel.relname));
-            break;
-        }
-        case 'IndexStmt':
-            if (node.relation) {
-                facts.creates.push(qn(node.relation.schemaname ?? null, node.idxname ?? node.relation.relname));
-            }
-            break;
-        case 'CreateFunctionStmt': {
-            const name = nameListToQualified(node.funcname);
-            if (name)
-                facts.creates.push(name);
-            for (const opt of node.options ?? []) {
-                const def = opt?.DefElem;
-                if (def?.defname === 'security' && def?.arg?.Boolean?.boolval === true) {
-                    facts.securityDefiner = true;
-                }
-            }
-            break;
-        }
-        case 'CreateTrigStmt':
-            if (node.relation) {
-                // Trigger names are only unique per table; qualify with the table.
-                facts.creates.push(qn(node.relation.schemaname ?? null, `${node.relation.relname}.${node.trigname}`));
-            }
-            pushRef(facts.references, nameListToQualified(node.funcname));
-            break;
-        case 'CreatePolicyStmt':
-        case 'AlterPolicyStmt':
-            if (node.table) {
-                // Policy names are only unique per table; qualify with the table.
-                facts.creates.push(qn(node.table.schemaname ?? null, `${node.table.relname}.${node.policy_name}`));
-                // The guarded table lives on `node.table`; the generic RangeVar walker
-                // does not descend into it, so capture the reference explicitly.
-                if (node.table.schemaname) {
-                    pushRef(facts.references, qn(node.table.schemaname, node.table.relname));
-                }
-            }
-            break;
-        case 'CreateSeqStmt':
-            if (node.sequence) {
-                facts.creates.push(qn(node.sequence.schemaname ?? null, node.sequence.relname));
-            }
-            break;
-        case 'CompositeTypeStmt':
-            if (node.typevar) {
-                facts.creates.push(qn(node.typevar.schemaname ?? null, node.typevar.relname));
-            }
-            break;
-        case 'CreateEnumStmt':
-        case 'CreateRangeStmt': {
-            const name = nameListToQualified(node.typeName);
-            if (name)
-                facts.creates.push(name);
-            break;
-        }
-        case 'CreateDomainStmt': {
-            // `typeName` on a domain is the base type; the name is `domainname`.
-            const name = nameListToQualified(node.domainname);
-            if (name)
-                facts.creates.push(name);
-            break;
-        }
-        case 'AlterObjectSchemaStmt':
-            // ALTER EXTENSION <name> SET SCHEMA <newschema>. Other object types
-            // (TABLE/TYPE/FUNCTION ... SET SCHEMA) keep their default classification.
-            if (node.objectType === 'OBJECT_EXTENSION') {
-                const name = node.object?.String?.sval;
-                if (typeof name === 'string') {
-                    facts.kind = 'extension';
-                    facts.extension = {
-                        name,
-                        schema: typeof node.newschema === 'string' ? node.newschema : null,
-                        action: 'set_schema'
-                    };
-                }
-            }
-            break;
-        case 'DropStmt':
-            // DROP EXTENSION <name> [, ...]. Extension names are bare String nodes.
-            // Other DROP object types keep their default classification. When
-            // several extensions are dropped in one statement the first names the
-            // fact; the full list stays available via the raw node.
-            if (node.removeType === 'OBJECT_EXTENSION' && Array.isArray(node.objects)) {
-                const name = node.objects[0]?.String?.sval;
-                if (typeof name === 'string') {
-                    facts.kind = 'extension';
-                    facts.extension = { name, schema: null, action: 'drop' };
-                }
-            }
-            break;
-        case 'AlterTableStmt': {
-            if (node.relation) {
-                facts.creates.push(qn(node.relation.schemaname ?? null, node.relation.relname));
-            }
-            const cmds = node.cmds ?? [];
-            for (const cmd of cmds) {
-                const subtype = cmd?.AlterTableCmd?.subtype;
-                if (subtype === 'AT_EnableRowSecurity' || subtype === 'AT_ForceRowSecurity' ||
-                    subtype === 'AT_DisableRowSecurity' || subtype === 'AT_NoForceRowSecurity') {
-                    facts.kind = 'rls_enable';
-                    facts.securityRelevant = true;
-                }
-                else if (subtype === 'AT_AddConstraint') {
-                    const contype = cmd?.AlterTableCmd?.def?.Constraint?.contype;
-                    facts.kind = contype === 'CONSTR_FOREIGN' ? 'fk_constraint' : 'constraint';
-                }
-                else if (subtype === 'AT_ChangeOwner') {
-                    facts.securityRelevant = true;
-                    const owner = cmd?.AlterTableCmd?.newowner?.rolename;
-                    if (owner && !facts.roles.includes(owner))
-                        facts.roles.push(owner);
-                }
-            }
-            break;
-        }
-        case 'InsertStmt':
-        case 'UpdateStmt':
-        case 'DeleteStmt':
-            if (node.relation) {
-                facts.creates.push(qn(node.relation.schemaname ?? null, node.relation.relname));
-            }
-            break;
-        default:
-            break;
-    }
-    collectRoles(node, facts.roles);
-    return facts;
-}
-/** Read a `CreateFunctionStmt` DefElem option's scalar/list value. */
-function functionOption(node, defname) {
-    for (const opt of node.options ?? []) {
-        if (opt?.DefElem?.defname === defname)
-            return opt.DefElem.arg;
-    }
-    return undefined;
-}
-/**
- * Collect references from a `LANGUAGE sql` function body supplied as a string
- * literal (`AS $$ ... $$`). That body is an opaque String node the AST walker
- * never parses, so — mirroring the schema transformer's body rewrite — parse
- * it standalone and walk each statement with the facts visitor. The standard
- * `BEGIN ATOMIC` / `RETURN` `sql_body` form is already part of the AST and is
- * covered by the outer walk, so only the string form needs this.
- */
-function collectSqlBodyReferences(node, facts) {
-    const language = functionOption(node, 'language')?.String?.sval;
-    if (typeof language !== 'string' || language.toLowerCase() !== 'sql')
-        return;
-    const asArg = functionOption(node, 'as');
-    const items = asArg?.List?.items ?? [];
-    const body = items[0]?.String?.sval;
-    if (typeof body !== 'string')
-        return;
-    try {
-        const stmts = (0, plpgsql_parser_1.parseSql)(body)?.stmts ?? [];
-        const visitor = createFactsVisitor(facts, facts.bodyReferences);
-        for (const stmt of stmts) {
-            if (stmt?.stmt)
-                (0, traverse_1.walkSqlAst)(stmt.stmt, visitor);
-        }
-    }
-    catch {
-        // A non-parseable body (C symbol name, etc.) contributes no references.
-    }
-}
+Object.defineProperty(exports, "__esModule", { value: true });
 /**
- * Classify each top-level statement in a SQL script into {@link StatementFacts}.
- *
- * Uses the same parser stack as the schema transformer (pgsql AST walk plus
- * hydrated PL/pgSQL body walk), so references inside function bodies are
- * included. The input SQL is never modified.
+ * The statement-classification facts layer now lives in `@pgsql/semantics`.
+ * It is re-exported here so existing `@pgsql/transform` consumers — and this
+ * package's own drivers (`qualify`, `restructure`, `naming`, `graph`) — keep
+ * importing the same symbols from the same paths.
  */
-function classifyStatements(sql) {
-    const allFacts = [];
-    (0, plpgsql_parser_1.transformSync)(sql, (ctx) => {
-        const stmts = ctx.sql?.stmts ?? [];
-        for (const stmt of stmts) {
-            const stmtNode = stmt?.stmt;
-            const nodeTag = stmtNode ? Object.keys(stmtNode)[0] : 'other';
-            const node = stmtNode?.[nodeTag] ?? {};
-            const facts = classifyOne(nodeTag, node);
-            const start = stmt?.stmt_location ?? 0;
-            facts.span = { start, len: stmt?.stmt_len ?? Math.max(0, sql.length - start) };
-            if (stmtNode) {
-                facts.stmt = stmtNode;
-                (0, traverse_1.walkSqlAst)(stmtNode, createFactsVisitor(facts));
-            }
-            if (nodeTag === 'CreateFunctionStmt') {
-                collectSqlBodyReferences(node, facts);
-            }
-            allFacts.push(facts);
-        }
-        for (const fn of ctx.functions ?? []) {
-            const facts = allFacts[fn.stmtIndex];
-            if (!facts || !fn.plpgsql?.hydrated)
-                continue;
-            // Refs already found outside the body (signature types, defaults)
-            // constrain deploy order and are not body-only.
-            const outer = new Set(facts.references.map(r => `${r.schema ?? '?'}.${r.name}`));
-            (0, plpgsql_parser_1.walkPlpgsqlAst)(fn.plpgsql.hydrated, {
-                PLpgSQL_stmt_dynexecute: () => { facts.dynamicSql = true; },
-                PLpgSQL_stmt_dynfors: () => { facts.dynamicSql = true; }
-            }, {
-                walkSqlExpressions: true,
-                sqlVisitor: createFactsVisitor(facts, facts.bodyReferences)
-            });
-            facts.bodyReferences = facts.bodyReferences.filter(r => !outer.has(`${r.schema ?? '?'}.${r.name}`));
-        }
-    }, { hydrate: true });
-    for (const facts of allFacts) {
-        const selfRef = (r) => facts.creates.some(c => c.schema === r.schema && c.name === r.name);
-        facts.references = facts.references.filter(r => !selfRef(r));
-        facts.bodyReferences = facts.bodyReferences.filter(r => !selfRef(r));
-        facts.referencedSchemas = [...new Set(facts.references.map(r => r.schema).filter(Boolean))];
-    }
-    return allFacts;
-}
+__exportStar(require("@pgsql/semantics"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pgsql/transform",
-  "version": "18.14.1",
+  "version": "18.15.1",
   "author": "Constructive <developers@constructive.io>",
   "description": "AST-based SQL transformation, qualification, classification and closure analysis for PostgreSQL",
   "main": "index.js",
@@ -33,8 +33,9 @@
   },
   "dependencies": {
     "@pgsql/quotes": "18.2.0",
-    "@pgsql/traverse": "18.7.1",
-    "plpgsql-parser": "18.5.1"
+    "@pgsql/semantics": "18.1.1",
+    "@pgsql/traverse": "18.7.2",
+    "plpgsql-parser": "18.5.2"
   },
   "devDependencies": {
     "makage": "^0.1.8"
@@ -49,5 +50,5 @@
     "classify",
     "plpgsql"
   ],
-  "gitHead": "4c8ecf62465ed608f068ef127d2b9f4a23844f6f"
+  "gitHead": "bc21e590439743a236da9757adf2d43d34432710"
 }