rawsql-ts 0.5.0-beta → 0.7.0-beta

package/dist/esm/types/transformers/QueryBuilder.d.ts

@@ -1,3 +1,4 @@
+import { UpdateQuery } from '../models/UpdateQuery';
 import { BinarySelectQuery, SelectQuery, SimpleSelectQuery } from "../models/SelectQuery";
 import { CreateTableQuery } from "../models/CreateTableQuery";
 import { InsertQuery } from "../models/InsertQuery";
@@ -51,4 +52,12 @@ export declare class QueryBuilder {
      * @returns An InsertQuery instance
      */
     static buildInsertQuery(selectQuery: SimpleSelectQuery, tableName: string): InsertQuery;
+    /**
+     * Builds an UPDATE query from a SELECT query, table name, and primary key(s).
+     * @param selectQuery The SELECT query providing new values (must select all columns to update and PKs)
+     * @param updateTableExprRaw The table name to update
+     * @param primaryKeys The primary key column name(s)
+     * @returns UpdateQuery instance
+     */
+    static buildUpdateQuery(selectQuery: SimpleSelectQuery, selectSourceName: string, updateTableExprRaw: string, primaryKeys: string | string[]): UpdateQuery;
 }

package/dist/esm/types/transformers/SelectableColumnCollector.d.ts

@@ -56,6 +56,8 @@ export declare class SelectableColumnCollector implements SqlComponentVisitor<vo
     private visitWindowFrameClause;
     private visitWindowFrameExpression;
     private visitLimitClause;
+    private offsetClause;
+    private visitFetchClause;
     private visitJoinOnClause;
     private visitJoinUsingClause;
     private visitColumnReference;

package/dist/esm/types/transformers/SqlFormatter.d.ts

@@ -0,0 +1,40 @@
+import { CommaBreakStyle, AndBreakStyle } from './SqlPrinter';
+import { IndentCharOption, NewlineOption } from './LinePrinter';
+import { SqlComponent } from '../models/SqlComponent';
+export declare const VALID_PRESETS: readonly ["mysql", "postgres", "sqlserver", "sqlite"];
+export type PresetName = (typeof VALID_PRESETS)[number];
+/**
+ * SqlFormatter class combines parsing and printing of SQL queries into a single interface.
+ */
+export declare class SqlFormatter {
+    private parser;
+    private printer;
+    constructor(options?: {
+        preset?: PresetName;
+        identifierEscape?: {
+            start: string;
+            end: string;
+        };
+        parameterSymbol?: string | {
+            start: string;
+            end: string;
+        };
+        parameterStyle?: 'anonymous' | 'indexed' | 'named';
+        indentSize?: number;
+        indentChar?: IndentCharOption;
+        newline?: NewlineOption;
+        keywordCase?: 'none' | 'upper' | 'lower';
+        commaBreak?: CommaBreakStyle;
+        andBreak?: AndBreakStyle;
+    });
+    /**
+     * Formats a SQL query string with the given parameters.
+     * @param sqlText The SQL query string to format.
+     * @param parameters A dictionary of parameters to replace in the query.
+     * @returns An object containing the formatted SQL string and the parameters.
+     */
+    format(sql: SqlComponent): {
+        formattedSql: string;
+        params: Record<string, any>;
+    };
+}

package/dist/esm/types/transformers/SqlOutputToken.d.ts

@@ -0,0 +1,6 @@
+export declare class SqlOutputToken {
+    type: string;
+    text: string;
+    innerTokens: SqlOutputToken[];
+    constructor(type: string, text: string, innerTokens?: SqlOutputToken[]);
+}

package/dist/esm/types/transformers/SqlPrinter.d.ts

@@ -0,0 +1,54 @@
+import { SqlPrintToken } from "../models/SqlPrintToken";
+import { IndentCharOption, NewlineOption } from "./LinePrinter";
+/**
+ * CommaBreakStyle determines how commas are placed in formatted SQL output.
+ * - 'none': No line break for commas
+ * - 'before': Line break before comma
+ * - 'after': Line break after comma
+ */
+export type CommaBreakStyle = 'none' | 'before' | 'after';
+/**
+ * AndBreakStyle determines how AND operators are placed in formatted SQL output.
+ * - 'none': No line break for AND
+ * - 'before': Line break before AND
+ * - 'after': Line break after AND
+ */
+export type AndBreakStyle = 'none' | 'before' | 'after';
+/**
+ * SqlPrinter formats a SqlPrintToken tree into a SQL string with flexible style options.
+ */
+export declare class SqlPrinter {
+    /** Indent character (e.g., ' ' or '\\t') */
+    indentChar: IndentCharOption;
+    /** Indent size (number of indentChar repetitions per level) */
+    indentSize: number;
+    /** Newline character (e.g., '\\n' or '\\r\\n') */
+    newline: NewlineOption;
+    /** Comma break style: 'none', 'before', or 'after' */
+    commaBreak: CommaBreakStyle;
+    /** AND break style: 'none', 'before', or 'after' */
+    andBreak: AndBreakStyle;
+    /** Keyword case style: 'none', 'upper' | 'lower' */
+    keywordCase: 'none' | 'upper' | 'lower';
+    private linePrinter;
+    private indentIncrementContainers;
+    /**
+     * @param options Optional style settings for pretty printing
+     */
+    constructor(options?: {
+        indentChar?: IndentCharOption;
+        indentSize?: number;
+        newline?: NewlineOption;
+        commaBreak?: CommaBreakStyle;
+        andBreak?: AndBreakStyle;
+        keywordCase?: 'none' | 'upper' | 'lower';
+        indentIncrementContainerTypes?: string[];
+    });
+    /**
+     * Converts a SqlPrintToken tree to a formatted SQL string.
+     * @param token The root SqlPrintToken
+     * @param level Indentation level (default: 0)
+     */
+    print(token: SqlPrintToken, level?: number): string;
+    private appendToken;
+}

package/dist/esm/types/transformers/TableSourceCollector.d.ts

@@ -74,6 +74,8 @@ export declare class TableSourceCollector implements SqlComponentVisitor<void> {
     private visitOrderByClause;
     private visitWindowFrameClause;
     private visitLimitClause;
+    private visitOffsetClause;
+    private visitFetchClause;
     private visitForClause;
     private visitOrderByItem;
     private visitSelectClause;

package/dist/esm/utils/stringUtils.js

@@ -24,6 +24,23 @@ export class StringUtils {
      */
     static skipWhiteSpace(input, position) {
         const length = input.length;
+        /*
+         * Optimization: Try to skip 4 spaces at once (for 4-space indents).
+         * This is effective when SQL is deeply nested and uses 4-space indentation.
+         * In typical cases, charCodeAt in a loop is fastest, but for large/indented SQL,
+         * this can reduce the number of iterations and improve stability (lower error/deviation in benchmarks).
+         * If indentation is not 4 spaces, this check is skipped quickly, so overhead is minimal.
+         *
+         * Even for 2-space indents or mixed indents (2, 4, tab),
+         * the remaining whitespace is handled by the following loop, so there is no performance loss.
+         *
+         * Benchmark results show that this optimization does not slow down short queries,
+         * and can make long/indented queries more stable and slightly faster.
+         */
+        while (position + 4 <= length && input.slice(position, position + 4) === '    ') {
+            position += 4;
+        }
+        // Then skip remaining whitespace one by one (space, tab, newline, carriage return)
         while (position < length) {
             const charCode = input.charCodeAt(position);
             // ' '=32, '\t'=9, '\n'=10, '\r'=13

package/dist/esm/utils/stringUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"stringUtils.js","sourceRoot":"","sources":["../../../src/utils/stringUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD;;GAEG;AACH,MAAM,OAAO,WAAW;IACpB;;;;;OAKG;IACI,MAAM,CAAC,oBAAoB,CAAC,KAAa,EAAE,WAAmB;QACjE,8CAA8C;QAC9C,sFAAsF;QACtF,mDAAmD;QACnD,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,GAAG,CAAC,CAAC,CAAC;QAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,WAAW,GAAG,CAAC,CAAC,CAAC;QACpD,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC1C,MAAM,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,WAAW,GAAG,KAAK,CAAC,GAAG,GAAG,CAAC;QACpD,OAAO,GAAG,SAAS,KAAK,KAAK,EAAE,CAAC;IACpC,CAAC;IAED;;OAEG;IACK,MAAM,CAAC,cAAc,CAAC,KAAa,EAAE,QAAgB;QACzD,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAE5B,OAAO,QAAQ,GAAG,MAAM,EAAE,CAAC;YACvB,MAAM,QAAQ,GAAG,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YAC5C,mCAAmC;YACnC,IAAI,QAAQ,KAAK,EAAE,IAAI,QAAQ,KAAK,CAAC,IAAI,QAAQ,KAAK,EAAE,IAAI,QAAQ,KAAK,EAAE,EAAE,CAAC;gBAC1E,MAAM;YACV,CAAC;YACD,QAAQ,EAAE,CAAC;QACf,CAAC;QAED,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED;;OAEG;IACK,MAAM,CAAC,eAAe,CAAC,KAAa,EAAE,QAAgB;QAC1D,IAAI,QAAQ,GAAG,CAAC,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YAC/B,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QACpD,CAAC;QAED,SAAS;QACT,IAAI,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,KAAK,CAAC,UAAU,CAAC,QAAQ,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;YAC7E,MAAM,KAAK,GAAG,QAAQ,CAAC;YACvB,QAAQ,IAAI,CAAC,CAAC;YAEd,UAAU;YACV,OAAO,QAAQ,GAAG,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC;gBAClE,QAAQ,EAAE,CAAC;YACf,CAAC;YAED,2DAA2D;YAC3D,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC;YACxD,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;QAC9C,CAAC;QACD,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IACpD,CAAC;IAED;;OAEG;IACK,MAAM,CAAC,gBAAgB,CAAC,KAAa,EAAE,QAAgB;QAC3D,IAAI,QAAQ,GAAG,CAAC,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YAC/B,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;QACrD,CAAC;QAED,yBAAyB;QACzB,IAAI,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,KAAK,CAAC,UAAU,CAAC,QAAQ,GAAG,CAAC,CAAC,KAAK,EAAE,IAAI,KAAK,CAAC,UAAU,CAAC,QAAQ,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;YACtH,MAAM,KAAK,GAAG,QAAQ,CAAC;YACvB,QAAQ,IAAI,CAAC,CAAC;YAEd,OAAO,QAAQ,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;gBACjC,iBAAiB;gBACjB,IAAI,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,KAAK,CAAC,UAAU,CAAC,QAAQ,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;oBAC7E,QAAQ,IAAI,CAAC,CAAC;oBAEd,8BAA8B;oBAC9B,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,EAAE,QAAQ,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBAClF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;wBACpC,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;oBAC/B,CAAC;oBAED,wDAAwD;oBACxD,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;wBACzC,KAAK,CAAC,KAAK,EAAE,CAAC;oBAClB,CAAC;oBACD,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;wBACxD,KAAK,CAAC,GAAG,EAAE,CAAC;oBAChB,CAAC;oBAED,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;gBACtD,CAAC;gBACD,QAAQ,EAAE,CAAC;YACf,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,0CAA0C,QAAQ,EAAE,CAAC,CAAC;QAC1E,CAAC;QACD,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACrD,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,wBAAwB,CAAC,KAAa,EAAE,QAAgB;QAClE,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAE5B,OAAO,QAAQ,GAAG,MAAM,EAAE,CAAC;YACvB,yBAAyB;YACzB,MAAM,WAAW,GAAG,QAAQ,CAAC;YAE7B,wBAAwB;YACxB,QAAQ,GAAG,WAAW,CAAC,cAAc,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YACvD,IAAI,QAAQ,KAAK,WAAW,EAAE,CAAC;gBAC3B,SAAS;YACb,CAAC;YAED,4BAA4B;YAC5B,MAAM,QAAQ,GAAG,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YAE5C,wBAAwB;YACxB,IAAI,QAAQ,KAAK,EAAE,EAAE,CAAC;gBAClB,MAAM,iBAAiB,GAAG,WAAW,CAAC,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;gBACvE,IAAI,iBAAiB,CAAC,WAAW,KAAK,QAAQ,EAAE,CAAC;oBAC7C,QAAQ,GAAG,iBAAiB,CAAC,WAAW,CAAC;oBACzC,IAAI,iBAAiB,CAAC,OAAO,EAAE,CAAC;wBAC5B,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;oBACjD,CAAC;oBACD,SAAS;gBACb,CAAC;YACL,CAAC;YACD,yBAAyB;iBACpB,IAAI,QAAQ,KAAK,EAAE,EAAE,CAAC;gBACvB,MAAM,kBAAkB,GAAG,WAAW,CAAC,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;gBACzE,IAAI,kBAAkB,CAAC,WAAW,KAAK,QAAQ,EAAE,CAAC;oBAC9C,QAAQ,GAAG,kBAAkB,CAAC,WAAW,CAAC;oBAC1C,IAAI,kBAAkB,CAAC,QAAQ,EAAE,CAAC;wBAC9B,KAAK,CAAC,IAAI,CAAC,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;oBAC/C,CAAC;oBACD,SAAS;gBACb,CAAC;YACL,CAAC;YAED,uCAAuC;YACvC,MAAM;QACV,CAAC;QAED,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;IACtC,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,qBAAqB,CAAC,KAAa,EAAE,QAAgB;QAC/D,MAAM,MAAM,GAAG,IAAI,CAAC,wBAAwB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAE9D,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,mCAAmC,QAAQ,KAAK,WAAW,CAAC,oBAAoB,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;QACzH,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,MAAM,CAAC,wBAAwB,CAAC,KAAa,EAAE,QAAgB;QAClE,MAAM,KAAK,GAAG,QAAQ,CAAC;QAEvB,OAAO,QAAQ,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;YAC7B,IAAI,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;gBAC/C,MAAM;YACV,CAAC;YACD,QAAQ,EAAE,CAAC;QACf,CAAC;QAED,IAAI,KAAK,KAAK,QAAQ,EAAE,CAAC;YACrB,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,OAAO;YACH,UAAU,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC;YACxC,WAAW,EAAE,QAAQ;SACxB,CAAC;IACN,CAAC;CACJ"}
+{"version":3,"file":"stringUtils.js","sourceRoot":"","sources":["../../../src/utils/stringUtils.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -7,6 +7,7 @@ export * from './models/ValuesQuery';
 export * from './transformers/CTECollector';
 export * from './transformers/CTENormalizer';
 export * from './transformers/Formatter';
+export * from './transformers/SqlFormatter';
 export * from './transformers/QueryBuilder';
 export * from './transformers/SelectValueCollector';
 export * from './transformers/SelectableColumnCollector';

package/dist/index.js

@@ -24,6 +24,7 @@ __exportStar(require("./models/ValuesQuery"), exports);
 __exportStar(require("./transformers/CTECollector"), exports);
 __exportStar(require("./transformers/CTENormalizer"), exports);
 __exportStar(require("./transformers/Formatter"), exports);
+__exportStar(require("./transformers/SqlFormatter"), exports);
 __exportStar(require("./transformers/QueryBuilder"), exports); // old name:QueryConverter
 __exportStar(require("./transformers/SelectValueCollector"), exports);
 __exportStar(require("./transformers/SelectableColumnCollector"), exports);

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oCAAoC;AACpC,8DAA4C;AAC5C,8DAA4C;AAE5C,6DAA2C;AAC3C,uDAAqC;AACrC,0DAAwC;AACxC,uDAAqC;AAErC,8DAA4C;AAC5C,+DAA6C;AAC7C,2DAAyC;AACzC,8DAA4C,CAAC,0BAA0B;AACvE,sEAAoD;AACpD,2EAAyD;AACzD,qEAAmD;AACnD,sEAAoD;AACpD,2EAAyD;AACzD,oEAAoE"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oCAAoC;AACpC,8DAA4C;AAC5C,8DAA4C;AAE5C,6DAA2C;AAC3C,uDAAqC;AACrC,0DAAwC;AACxC,uDAAqC;AAErC,8DAA4C;AAC5C,+DAA6C;AAC7C,2DAAyC;AACzC,8DAA4C;AAC5C,8DAA4C,CAAC,0BAA0B;AACvE,sEAAoD;AACpD,2EAAyD;AACzD,qEAAmD;AACnD,sEAAoD;AACpD,2EAAyD;AACzD,oEAAoE"}

package/dist/models/Clause.d.ts

@@ -1,6 +1,6 @@
 import { SelectQuery } from "./SelectQuery";
 import { SqlComponent } from "./SqlComponent";
-import { IdentifierString, RawString, ValueComponent, WindowFrameExpression } from "./ValueComponent";
+import { IdentifierString, RawString, ValueComponent, WindowFrameExpression, QualifiedName } from "./ValueComponent";
 export declare class SelectItem extends SqlComponent {
     static kind: symbol;
     value: ValueComponent;
@@ -39,6 +39,15 @@ export declare class WindowFrameClause extends SqlComponent {
     expression: WindowFrameExpression;
     constructor(name: string, expression: WindowFrameExpression);
 }
+/**
+ * Represents a collection of window definitions (WINDOW clause in SQL).
+ * @param windows Array of WindowFrameClause
+ */
+export declare class WindowsClause extends SqlComponent {
+    static kind: symbol;
+    windows: WindowFrameClause[];
+    constructor(windows: WindowFrameClause[]);
+}
 export declare enum SortDirection {
     Ascending = "asc",
     Descending = "desc"
@@ -73,17 +82,38 @@ export declare class HavingClause extends SqlComponent {
 export type SourceComponent = TableSource | FunctionSource | SubQuerySource | ParenSource;
 export declare class TableSource extends SqlComponent {
     static kind: symbol;
-    namespaces: IdentifierString[] | null;
-    table: IdentifierString;
-    identifier: IdentifierString;
-    constructor(namespaces: string[] | null, table: string);
+    qualifiedName: QualifiedName;
+    /**
+     * For backward compatibility: returns the namespaces as IdentifierString[] | null (readonly)
+     */
+    get namespaces(): IdentifierString[] | null;
+    /**
+     * For backward compatibility: returns the table name as IdentifierString (readonly)
+     */
+    get table(): IdentifierString;
+    /**
+     * For backward compatibility: returns the table name as IdentifierString (readonly)
+     */
+    get identifier(): IdentifierString;
+    constructor(namespaces: string[] | IdentifierString[] | null, table: string | IdentifierString);
     getSourceName(): string;
 }
 export declare class FunctionSource extends SqlComponent {
     static kind: symbol;
-    name: RawString;
+    qualifiedName: QualifiedName;
     argument: ValueComponent | null;
-    constructor(functionName: string, argument: ValueComponent | null);
+    constructor(name: string | IdentifierString | {
+        namespaces: string[] | IdentifierString[] | null;
+        name: string | RawString | IdentifierString;
+    }, argument: ValueComponent | null);
+    /**
+     * For backward compatibility: returns the namespaces as IdentifierString[] | null (readonly)
+     */
+    get namespaces(): IdentifierString[] | null;
+    /**
+     * For backward compatibility: returns the function name as RawString | IdentifierString (readonly)
+     */
+    get name(): RawString | IdentifierString;
 }
 export declare class ParenSource extends SqlComponent {
     static kind: symbol;
@@ -120,14 +150,14 @@ export declare class JoinClause extends SqlComponent {
     condition: JoinConditionComponent | null;
     lateral: boolean;
     constructor(joinType: string, source: SourceExpression, condition: JoinConditionComponent | null, lateral: boolean);
-    getAliasSourceName(): string | null;
+    getSourceAliasName(): string | null;
 }
 export declare class FromClause extends SqlComponent {
     static kind: symbol;
     source: SourceExpression;
     joins: JoinClause[] | null;
     constructor(source: SourceExpression, join: JoinClause[] | null);
-    getAliasSourceName(): string | null;
+    getSourceAliasName(): string | null;
     /**
      * Returns all SourceExpression objects in this FROM clause, including main source and all JOIN sources.
      */
@@ -139,7 +169,7 @@ export declare class CommonTable extends SqlComponent {
     materialized: boolean | null;
     aliasExpression: SourceAliasExpression;
     constructor(query: SelectQuery, aliasExpression: SourceAliasExpression | string, materialized: boolean | null);
-    getAliasSourceName(): string;
+    getSourceAliasName(): string;
 }
 export declare class WithClause extends SqlComponent {
     static kind: symbol;
@@ -149,9 +179,8 @@ export declare class WithClause extends SqlComponent {
 }
 export declare class LimitClause extends SqlComponent {
     static kind: symbol;
-    limit: ValueComponent;
-    offset: ValueComponent | null;
-    constructor(limit: ValueComponent, offset: ValueComponent | null);
+    value: ValueComponent;
+    constructor(limit: ValueComponent);
 }
 export declare enum FetchType {
     Next = "next",
@@ -162,7 +191,17 @@ export declare enum FetchUnit {
     Percent = "percent",
     PercentWithTies = "percent with ties"
 }
-export declare class FetchSpecification extends SqlComponent {
+export declare class OffsetClause extends SqlComponent {
+    static kind: symbol;
+    value: ValueComponent;
+    constructor(value: ValueComponent);
+}
+export declare class FetchClause extends SqlComponent {
+    static kind: symbol;
+    expression: FetchExpression;
+    constructor(expression: FetchExpression);
+}
+export declare class FetchExpression extends SqlComponent {
     static kind: symbol;
     type: FetchType;
     count: ValueComponent;
@@ -186,3 +225,69 @@ export declare class SourceAliasExpression extends SqlComponent {
     columns: IdentifierString[] | null;
     constructor(alias: string, columnAlias: string[] | null);
 }
+export declare class ReturningClause extends SqlComponent {
+    static kind: symbol;
+    columns: IdentifierString[];
+    /**
+     * Constructs a ReturningClause.
+     * @param columns Array of IdentifierString or string representing column names.
+     */
+    constructor(columns: (IdentifierString | string)[]);
+}
+export declare class SetClause extends SqlComponent {
+    static kind: symbol;
+    items: SetClauseItem[];
+    constructor(items: (SetClauseItem | {
+        column: string | IdentifierString;
+        value: ValueComponent;
+    })[]);
+}
+/**
+ * Represents a single SET clause item in an UPDATE statement.
+ */
+/**
+ * Represents a single SET clause item in an UPDATE statement.
+ * Now supports namespaces for fully qualified column names (e.g. schema.table.column).
+ */
+/**
+ * Represents a single SET clause item in an UPDATE statement.
+ * Now supports namespaces for fully qualified column names (e.g. schema.table.column).
+ * Refactored to use QualifiedName for unified name/namespace handling.
+ */
+export declare class SetClauseItem extends SqlComponent {
+    static kind: symbol;
+    qualifiedName: QualifiedName;
+    value: ValueComponent;
+    constructor(column: string | IdentifierString | {
+        namespaces: string[] | IdentifierString[] | null;
+        column: string | IdentifierString;
+    }, value: ValueComponent);
+    /**
+     * For backward compatibility: returns the namespaces as IdentifierString[] | null (readonly)
+     */
+    get namespaces(): IdentifierString[] | null;
+    /**
+     * For backward compatibility: returns the column name as IdentifierString (readonly)
+     */
+    get column(): IdentifierString;
+    /**
+     * Returns the fully qualified column name as a string.
+     */
+    getFullName(): string;
+}
+export declare class UpdateClause extends SqlComponent {
+    static kind: symbol;
+    source: SourceExpression;
+    constructor(source: SourceExpression);
+    getSourceAliasName(): string | null;
+}
+/**
+ * Represents the target table (with optional alias/schema) and columns for an INSERT statement.
+ * @param source The target table as a SourceExpression (can include schema, alias, etc.)
+ * @param columns Array of column names (as strings)
+ */
+export declare class InsertClause extends SqlComponent {
+    source: SourceExpression;
+    columns: IdentifierString[];
+    constructor(source: SourceExpression, columns: string[]);
+}