rawsql-ts 0.11.42-beta → 0.11.44-beta

package/dist/esm/src/transformers/LinePrinter.js

@@ -66,6 +66,18 @@ export class LinePrinter {
             workLine.text += text;
         }
     }
+    trimTrailingWhitespaceFromPreviousLine() {
+        if (this.lines.length < 2) {
+            return;
+        }
+        const previousLine = this.lines[this.lines.length - 2];
+        const newlineMatch = previousLine.text.match(/(\r?\n)$/);
+        const trailingNewline = newlineMatch ? newlineMatch[1] : '';
+        const content = trailingNewline
+            ? previousLine.text.slice(0, -trailingNewline.length)
+            : previousLine.text;
+        previousLine.text = content.replace(/[ \t]+$/, '') + trailingNewline;
+    }
     /**
      * Cleans up the current line for comma formatting.
      * For 'after' and 'none' comma styles, removes empty line when a comma is being added.
@@ -75,12 +87,33 @@ export class LinePrinter {
     cleanupLine(text) {
         const workLine = this.getCurrentLine();
         if (text === ',' && workLine.text.trim() === '' && this.lines.length > 1 && (this.commaBreak === 'after' || this.commaBreak === 'none')) {
-            // Remove current empty line
+            let previousIndex = this.lines.length - 2;
+            while (previousIndex >= 0 && this.lines[previousIndex].text.trim() === '') {
+                this.lines.splice(previousIndex, 1);
+                previousIndex--;
+            }
+            if (previousIndex < 0) {
+                return false;
+            }
+            const previousLine = this.lines[previousIndex];
+            // Avoid pulling commas onto a line comment to keep the comma executable
+            if (this.lineHasTrailingComment(previousLine.text)) {
+                return false;
+            }
             this.lines.pop(); // Safe: we checked lines.length > 1
             return true; // Cleanup performed
         }
         return false; // No cleanup needed
     }
+    lineHasTrailingComment(text) {
+        // Strip simple quoted sections so comment markers inside literals are ignored.
+        const withoutStrings = text
+            .replace(/'([^']|'')*'/g, '')
+            .replace(/"([^"]|"")*"/g, '')
+            .trim();
+        // Treat any remaining '--' as a line comment marker so we never pull commas onto commented lines.
+        return withoutStrings.includes('--');
+    }
     getCurrentLine() {
         if (this.lines.length > 0) {
             return this.lines[this.lines.length - 1];

package/dist/esm/src/transformers/LinePrinter.js.map

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

package/dist/esm/src/transformers/OnelineFormattingHelper.d.ts

@@ -0,0 +1,29 @@
+import { SqlPrintToken, SqlPrintTokenContainerType } from "../models/SqlPrintToken";
+import type { WithClauseStyle } from "./SqlFormatter";
+export type CommaBreakStyle = 'none' | 'before' | 'after';
+export interface OnelineFormattingOptions {
+    parenthesesOneLine: boolean;
+    betweenOneLine: boolean;
+    valuesOneLine: boolean;
+    joinOneLine: boolean;
+    caseOneLine: boolean;
+    subqueryOneLine: boolean;
+    insertColumnsOneLine: boolean;
+    withClauseStyle: WithClauseStyle;
+}
+interface FormatInsertClauseResult {
+    handled: boolean;
+    text?: string;
+}
+export declare class OnelineFormattingHelper {
+    private readonly options;
+    constructor(options: OnelineFormattingOptions);
+    shouldFormatContainer(token: SqlPrintToken, shouldIndentNested: boolean): boolean;
+    isInsertClauseOneline(parentContainerType?: SqlPrintTokenContainerType): boolean;
+    shouldInsertJoinNewline(insideWithClause: boolean): boolean;
+    resolveCommaBreak(parentContainerType: SqlPrintTokenContainerType | undefined, commaBreak: CommaBreakStyle, cteCommaBreak: CommaBreakStyle, valuesCommaBreak: CommaBreakStyle): CommaBreakStyle;
+    shouldSkipInsertClauseSpace(parentContainerType: SqlPrintTokenContainerType | undefined, nextToken: SqlPrintToken | undefined, currentLineText: string): boolean;
+    shouldSkipCommentBlockSpace(parentContainerType: SqlPrintTokenContainerType | undefined, insideWithClause: boolean): boolean;
+    formatInsertClauseToken(text: string, parentContainerType: SqlPrintTokenContainerType | undefined, currentLineText: string, ensureTrailingSpace: () => void): FormatInsertClauseResult;
+}
+export {};

package/dist/esm/src/transformers/OnelineFormattingHelper.js

@@ -0,0 +1,88 @@
+import { SqlPrintTokenContainerType, SqlPrintTokenType } from "../models/SqlPrintToken";
+export class OnelineFormattingHelper {
+    constructor(options) {
+        this.options = options;
+    }
+    shouldFormatContainer(token, shouldIndentNested) {
+        switch (token.containerType) {
+            case SqlPrintTokenContainerType.ParenExpression:
+                return this.options.parenthesesOneLine && !shouldIndentNested;
+            case SqlPrintTokenContainerType.BetweenExpression:
+                return this.options.betweenOneLine;
+            case SqlPrintTokenContainerType.Values:
+                return this.options.valuesOneLine;
+            case SqlPrintTokenContainerType.JoinOnClause:
+                return this.options.joinOneLine;
+            case SqlPrintTokenContainerType.CaseExpression:
+                return this.options.caseOneLine;
+            case SqlPrintTokenContainerType.InlineQuery:
+                return this.options.subqueryOneLine;
+            default:
+                return false;
+        }
+    }
+    isInsertClauseOneline(parentContainerType) {
+        if (!this.options.insertColumnsOneLine) {
+            return false;
+        }
+        return parentContainerType === SqlPrintTokenContainerType.InsertClause ||
+            parentContainerType === SqlPrintTokenContainerType.MergeInsertAction;
+    }
+    shouldInsertJoinNewline(insideWithClause) {
+        return !(insideWithClause && this.options.withClauseStyle === 'full-oneline');
+    }
+    resolveCommaBreak(parentContainerType, commaBreak, cteCommaBreak, valuesCommaBreak) {
+        if (parentContainerType === SqlPrintTokenContainerType.WithClause) {
+            return cteCommaBreak;
+        }
+        if (parentContainerType === SqlPrintTokenContainerType.Values) {
+            return valuesCommaBreak;
+        }
+        if (this.isInsertClauseOneline(parentContainerType)) {
+            return 'none';
+        }
+        return commaBreak;
+    }
+    shouldSkipInsertClauseSpace(parentContainerType, nextToken, currentLineText) {
+        const isInsertContainer = parentContainerType === SqlPrintTokenContainerType.InsertClause ||
+            parentContainerType === SqlPrintTokenContainerType.MergeInsertAction;
+        if (!isInsertContainer) {
+            return false;
+        }
+        if (nextToken && nextToken.type === SqlPrintTokenType.parenthesis && nextToken.text === '(') {
+            return true;
+        }
+        if (!this.options.insertColumnsOneLine) {
+            return false;
+        }
+        const lastChar = currentLineText.slice(-1);
+        return lastChar === '(' || lastChar === ' ' || lastChar === '';
+    }
+    shouldSkipCommentBlockSpace(parentContainerType, insideWithClause) {
+        return parentContainerType === SqlPrintTokenContainerType.CommentBlock &&
+            insideWithClause &&
+            this.options.withClauseStyle === 'full-oneline';
+    }
+    formatInsertClauseToken(text, parentContainerType, currentLineText, ensureTrailingSpace) {
+        var _a, _b;
+        if (!this.isInsertClauseOneline(parentContainerType)) {
+            return { handled: false };
+        }
+        if (text === '') {
+            return { handled: true };
+        }
+        const leadingWhitespace = (_b = (_a = text.match(/^\s+/)) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : '';
+        const trimmed = leadingWhitespace ? text.slice(leadingWhitespace.length) : text;
+        if (trimmed === '') {
+            return { handled: true };
+        }
+        if (leadingWhitespace) {
+            const lastChar = currentLineText.slice(-1);
+            if (lastChar !== '(' && lastChar !== ' ' && lastChar !== '') {
+                ensureTrailingSpace();
+            }
+        }
+        return { handled: true, text: trimmed };
+    }
+}
+//# sourceMappingURL=OnelineFormattingHelper.js.map

package/dist/esm/src/transformers/OnelineFormattingHelper.js.map

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

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

@@ -1,7 +1,10 @@
 import { UpdateQuery } from '../models/UpdateQuery';
+import { DeleteQuery } from '../models/DeleteQuery';
+import { MergeQuery } from '../models/MergeQuery';
 import { BinarySelectQuery, SelectQuery, SimpleSelectQuery } from "../models/SelectQuery";
 import { CreateTableQuery } from "../models/CreateTableQuery";
 import { InsertQuery } from "../models/InsertQuery";
+import type { InsertQueryConversionOptions, UpdateQueryConversionOptions, DeleteQueryConversionOptions, MergeQueryConversionOptions } from "../models/SelectQuery";
 /**
  * QueryBuilder provides static methods to build or convert various SQL query objects.
  */
@@ -65,21 +68,52 @@ export declare class QueryBuilder {
      * @param isTemporary If true, creates a temporary table
      * @returns A CreateTableQuery instance
      */
-    static buildCreateTableQuery(query: SelectQuery, tableName: string, isTemporary?: boolean): CreateTableQuery;
+    static buildCreateTableQuery(query: SelectQuery, tableName: string, isTemporary?: boolean, ifNotExists?: boolean): CreateTableQuery;
     /**
-     * Converts a SELECT query to an INSERT query (INSERT INTO ... SELECT ...)
-     * @param selectQuery The SELECT query to use as the source
-     * @param tableName The name of the table to insert into
-     * @param columns Optional: array of column names. If omitted, columns are inferred from the selectQuery
-     * @returns An InsertQuery instance
+     * Converts a SELECT query to an INSERT query (INSERT INTO ... SELECT ...).
      */
-    static buildInsertQuery(selectQuery: SimpleSelectQuery, tableName: string): InsertQuery;
+    static buildInsertQuery(selectQuery: SimpleSelectQuery, targetOrOptions: string | InsertQueryConversionOptions, explicitColumns?: 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
+     * Converts an INSERT ... VALUES query into INSERT ... SELECT form using UNION ALL.
+     * @param insertQuery The VALUES-based InsertQuery to convert.
+     * @returns A new InsertQuery that selects rows instead of using VALUES.
      */
-    static buildUpdateQuery(selectQuery: SimpleSelectQuery, selectSourceName: string, updateTableExprRaw: string, primaryKeys: string | string[]): UpdateQuery;
+    static convertInsertValuesToSelect(insertQuery: InsertQuery): InsertQuery;
+    /**
+     * Converts an INSERT ... SELECT (optionally with UNION ALL) into INSERT ... VALUES form.
+     * @param insertQuery The SELECT-based InsertQuery to convert.
+     * @returns A new InsertQuery that uses VALUES tuples.
+     */
+    static convertInsertSelectToValues(insertQuery: InsertQuery): InsertQuery;
+    /**
+     * Builds an UPDATE query from a SELECT query and conversion options.
+     */
+    static buildUpdateQuery(selectQuery: SimpleSelectQuery, selectSourceOrOptions: string | UpdateQueryConversionOptions, updateTableExprRaw?: string, primaryKeys?: string | string[]): UpdateQuery;
+    /**
+     * Builds a DELETE query that deletes the rows matched by the SELECT query output.
+     */
+    static buildDeleteQuery(selectQuery: SimpleSelectQuery, options: DeleteQueryConversionOptions): DeleteQuery;
+    /**
+     * Builds a MERGE query (upsert) that coordinates actions based on row matches.
+     */
+    static buildMergeQuery(selectQuery: SimpleSelectQuery, options: MergeQueryConversionOptions): MergeQuery;
+    private static normalizeInsertOptions;
+    private static normalizeUpdateOptions;
+    private static normalizeDeleteOptions;
+    private static normalizeMergeOptions;
+    private static normalizeColumnArray;
+    private static collectSelectItems;
+    private static collectSelectColumnNames;
+    private static ensurePrimaryKeys;
+    private static prepareInsertColumns;
+    private static prepareUpdateColumns;
+    private static prepareDeleteColumns;
+    private static prepareMergeColumns;
+    private static rebuildSelectClause;
+    private static getSelectItemName;
+    private static ensureSelectClauseSize;
+    private static extractWithClause;
+    private static buildEqualityPredicate;
+    private static toColumnReference;
+    private static mergeUniqueColumns;
 }