rawsql-ts 0.24.3 → 0.24.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +10 -1
- package/dist/esm/index.min.js +8 -8
- package/dist/esm/index.min.js.map +2 -2
- package/dist/esm/models/ValueComponent.d.ts +2 -1
- package/dist/esm/models/ValueComponent.js +2 -1
- package/dist/esm/models/ValueComponent.js.map +1 -1
- package/dist/esm/parsers/ParameterDecorator.d.ts +2 -2
- package/dist/esm/parsers/ParameterDecorator.js +1 -1
- package/dist/esm/parsers/ParameterDecorator.js.map +1 -1
- package/dist/esm/parsers/ParameterExpressionParser.js +2 -1
- package/dist/esm/parsers/ParameterExpressionParser.js.map +1 -1
- package/dist/esm/parsers/SqlPrintTokenParser.d.ts +15 -4
- package/dist/esm/parsers/SqlPrintTokenParser.js +65 -12
- package/dist/esm/parsers/SqlPrintTokenParser.js.map +1 -1
- package/dist/esm/transformers/FormatOptionResolver.js +1 -0
- package/dist/esm/transformers/FormatOptionResolver.js.map +1 -1
- package/dist/esm/transformers/LinePrinter.d.ts +1 -1
- package/dist/esm/transformers/OnelineFormattingHelper.d.ts +1 -0
- package/dist/esm/transformers/OnelineFormattingHelper.js.map +1 -1
- package/dist/esm/transformers/SqlFormatter.d.ts +9 -5
- package/dist/esm/transformers/SqlFormatter.js +4 -4
- package/dist/esm/transformers/SqlFormatter.js.map +1 -1
- package/dist/esm/transformers/SqlPrinter.d.ts +17 -2
- package/dist/esm/transformers/SqlPrinter.js +182 -21
- package/dist/esm/transformers/SqlPrinter.js.map +1 -1
- package/dist/index.min.js +8 -8
- package/dist/index.min.js.map +2 -2
- package/dist/models/ValueComponent.js +2 -1
- package/dist/models/ValueComponent.js.map +1 -1
- package/dist/parsers/ParameterDecorator.js +1 -1
- package/dist/parsers/ParameterDecorator.js.map +1 -1
- package/dist/parsers/ParameterExpressionParser.js +2 -1
- package/dist/parsers/ParameterExpressionParser.js.map +1 -1
- package/dist/parsers/SqlPrintTokenParser.js +65 -12
- package/dist/parsers/SqlPrintTokenParser.js.map +1 -1
- package/dist/src/models/ValueComponent.d.ts +2 -1
- package/dist/src/parsers/ParameterDecorator.d.ts +2 -2
- package/dist/src/parsers/SqlPrintTokenParser.d.ts +15 -4
- package/dist/src/transformers/LinePrinter.d.ts +1 -1
- package/dist/src/transformers/OnelineFormattingHelper.d.ts +1 -0
- package/dist/src/transformers/SqlFormatter.d.ts +9 -5
- package/dist/src/transformers/SqlPrinter.d.ts +17 -2
- package/dist/transformers/FormatOptionResolver.js +1 -0
- package/dist/transformers/FormatOptionResolver.js.map +1 -1
- package/dist/transformers/OnelineFormattingHelper.js.map +1 -1
- package/dist/transformers/SqlFormatter.js +5 -3
- package/dist/transformers/SqlFormatter.js.map +1 -1
- package/dist/transformers/SqlPrinter.js +182 -21
- package/dist/transformers/SqlPrinter.js.map +1 -1
- package/dist/tsconfig.browser.tsbuildinfo +1 -1
- package/package.json +2 -2
|
@@ -108,12 +108,13 @@ export declare class ParameterExpression extends SqlComponent {
|
|
|
108
108
|
static kind: symbol;
|
|
109
109
|
name: RawString;
|
|
110
110
|
value: SqlParameterValue;
|
|
111
|
+
sourceText: string | null;
|
|
111
112
|
/**
|
|
112
113
|
* The index assigned by the formatter when generating parameterized queries.
|
|
113
114
|
* Used for naming parameters like $1, $2, etc.
|
|
114
115
|
*/
|
|
115
116
|
index: number | null;
|
|
116
|
-
constructor(name: string, value?: SqlParameterValue);
|
|
117
|
+
constructor(name: string, value?: SqlParameterValue, sourceText?: string | null);
|
|
117
118
|
}
|
|
118
119
|
export declare class SwitchCaseArgument extends SqlComponent {
|
|
119
120
|
static kind: symbol;
|
|
@@ -5,11 +5,11 @@
|
|
|
5
5
|
export declare class ParameterDecorator {
|
|
6
6
|
prefix: string;
|
|
7
7
|
suffix: string;
|
|
8
|
-
style: 'named' | 'indexed' | 'anonymous';
|
|
8
|
+
style: 'named' | 'indexed' | 'anonymous' | 'original';
|
|
9
9
|
constructor(options?: {
|
|
10
10
|
prefix?: string;
|
|
11
11
|
suffix?: string;
|
|
12
|
-
style?: 'named' | 'indexed' | 'anonymous';
|
|
12
|
+
style?: 'named' | 'indexed' | 'anonymous' | 'original';
|
|
13
13
|
});
|
|
14
14
|
/**
|
|
15
15
|
* Decorate a parameter token with DBMS-specific format.
|
|
@@ -9,11 +9,14 @@ import { CreateTableQuery } from "../models/CreateTableQuery";
|
|
|
9
9
|
export declare enum ParameterStyle {
|
|
10
10
|
Anonymous = "anonymous",
|
|
11
11
|
Indexed = "indexed",
|
|
12
|
-
Named = "named"
|
|
12
|
+
Named = "named",
|
|
13
|
+
Original = "original"
|
|
13
14
|
}
|
|
14
15
|
export type CastStyle = 'postgres' | 'standard';
|
|
15
16
|
export type ConstraintStyle = 'postgres' | 'mysql';
|
|
16
|
-
export type
|
|
17
|
+
export type AliasKeywordStyle = 'explicit' | 'omit' | 'as' | 'implicit';
|
|
18
|
+
export type SourceAliasStyle = AliasKeywordStyle;
|
|
19
|
+
export type ColumnAliasStyle = AliasKeywordStyle;
|
|
17
20
|
export type OrderByDefaultDirectionStyle = 'omit' | 'explicit';
|
|
18
21
|
export interface FormatterConfig {
|
|
19
22
|
identifierEscape?: {
|
|
@@ -26,7 +29,7 @@ export interface FormatterConfig {
|
|
|
26
29
|
end: string;
|
|
27
30
|
};
|
|
28
31
|
/**
|
|
29
|
-
* Parameter style: anonymous (?), indexed ($1),
|
|
32
|
+
* Parameter style: anonymous (?), indexed ($1), named (:name), or original parsed spelling.
|
|
30
33
|
*/
|
|
31
34
|
parameterStyle?: ParameterStyle;
|
|
32
35
|
/** Controls how CAST expressions are rendered */
|
|
@@ -35,6 +38,8 @@ export interface FormatterConfig {
|
|
|
35
38
|
constraintStyle?: ConstraintStyle;
|
|
36
39
|
/** Controls whether source aliases are rendered with an explicit AS keyword */
|
|
37
40
|
sourceAliasStyle?: SourceAliasStyle;
|
|
41
|
+
/** Controls whether column aliases are rendered with an explicit AS keyword */
|
|
42
|
+
columnAliasStyle?: ColumnAliasStyle;
|
|
38
43
|
/** Controls whether the default ASC direction is omitted or rendered explicitly */
|
|
39
44
|
orderByDefaultDirectionStyle?: OrderByDefaultDirectionStyle;
|
|
40
45
|
}
|
|
@@ -55,6 +60,7 @@ export declare class SqlPrintTokenParser implements SqlComponentVisitor<SqlPrint
|
|
|
55
60
|
private castStyle;
|
|
56
61
|
private constraintStyle;
|
|
57
62
|
private sourceAliasStyle;
|
|
63
|
+
private columnAliasStyle;
|
|
58
64
|
private orderByDefaultDirectionStyle;
|
|
59
65
|
private readonly normalizeJoinConditionOrder;
|
|
60
66
|
private readonly listContinuationCommentComponents;
|
|
@@ -70,10 +76,11 @@ export declare class SqlPrintTokenParser implements SqlComponentVisitor<SqlPrint
|
|
|
70
76
|
start: string;
|
|
71
77
|
end: string;
|
|
72
78
|
};
|
|
73
|
-
parameterStyle?: 'anonymous' | 'indexed' | 'named';
|
|
79
|
+
parameterStyle?: 'anonymous' | 'indexed' | 'named' | 'original';
|
|
74
80
|
castStyle?: CastStyle;
|
|
75
81
|
constraintStyle?: ConstraintStyle;
|
|
76
82
|
sourceAliasStyle?: SourceAliasStyle;
|
|
83
|
+
columnAliasStyle?: ColumnAliasStyle;
|
|
77
84
|
orderByDefaultDirectionStyle?: OrderByDefaultDirectionStyle;
|
|
78
85
|
joinConditionOrderByDeclaration?: boolean;
|
|
79
86
|
});
|
|
@@ -219,6 +226,8 @@ export declare class SqlPrintTokenParser implements SqlComponentVisitor<SqlPrint
|
|
|
219
226
|
private visitParenExpression;
|
|
220
227
|
private visitCastExpression;
|
|
221
228
|
private visitCaseExpression;
|
|
229
|
+
private removeCaseAfterCommentsDuplicatedOnFirstWhen;
|
|
230
|
+
private normalizeCommentSignature;
|
|
222
231
|
private extractSwitchAfterComments;
|
|
223
232
|
private collectCaseLeadingCommentsFromSwitch;
|
|
224
233
|
private findCaseKeyToken;
|
|
@@ -260,6 +269,8 @@ export declare class SqlPrintTokenParser implements SqlComponentVisitor<SqlPrint
|
|
|
260
269
|
private visitTableSource;
|
|
261
270
|
private visitSourceExpression;
|
|
262
271
|
private appendSourceAliasKeyword;
|
|
272
|
+
private shouldPrintColumnAliasKeyword;
|
|
273
|
+
private normalizeAliasKeywordStyle;
|
|
263
274
|
visitFromClause(arg: FromClause): SqlPrintToken;
|
|
264
275
|
visitJoinClause(arg: JoinClause): SqlPrintToken;
|
|
265
276
|
visitJoinOnClause(arg: JoinOnClause): SqlPrintToken;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export type NewlineLogicalName = 'lf' | 'crlf' | 'cr';
|
|
1
|
+
export type NewlineLogicalName = 'lf' | 'crlf' | 'cr' | 'space';
|
|
2
2
|
export type NewlineOption = NewlineLogicalName | '\n' | '\r\n' | '\r' | ' ';
|
|
3
3
|
export type IndentCharLogicalName = 'space' | 'tab';
|
|
4
4
|
export type IndentCharOption = IndentCharLogicalName | string;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { CastStyle, ConstraintStyle, SourceAliasStyle, OrderByDefaultDirectionStyle } from '../parsers/SqlPrintTokenParser';
|
|
1
|
+
import { CastStyle, ConstraintStyle, SourceAliasStyle, ColumnAliasStyle, OrderByDefaultDirectionStyle } from '../parsers/SqlPrintTokenParser';
|
|
2
2
|
import { CommaBreakStyle, AndBreakStyle, OrBreakStyle, JoinOnBreakStyle } from './SqlPrinter';
|
|
3
3
|
import { CommentExportMode } from '../types/Formatting';
|
|
4
4
|
import { IndentCharOption, NewlineOption } from './LinePrinter';
|
|
@@ -38,7 +38,7 @@ export interface BaseFormattingOptions {
|
|
|
38
38
|
/** Newline character style (logical 'lf'/'crlf'/'cr' or literal newline string) */
|
|
39
39
|
newline?: NewlineOption;
|
|
40
40
|
/** Case transformation for SQL keywords */
|
|
41
|
-
keywordCase?: 'none' | 'upper' | 'lower';
|
|
41
|
+
keywordCase?: 'none' | 'upper' | 'lower' | 'preserve';
|
|
42
42
|
/** Style for comma line breaks */
|
|
43
43
|
commaBreak?: CommaBreakStyle;
|
|
44
44
|
/** Style for comma line breaks inside WITH clause definitions */
|
|
@@ -63,6 +63,8 @@ export interface BaseFormattingOptions {
|
|
|
63
63
|
betweenOneLine?: boolean;
|
|
64
64
|
/** Keep VALUES clause on one line regardless of comma break settings */
|
|
65
65
|
valuesOneLine?: boolean;
|
|
66
|
+
/** Keep IN value lists on one line until oneLineMaxLength forces expansion */
|
|
67
|
+
inOneLine?: boolean;
|
|
66
68
|
/** Keep JOIN conditions on one line regardless of AND/OR break settings */
|
|
67
69
|
joinOneLine?: boolean;
|
|
68
70
|
/** Keep CASE expressions on one line regardless of formatting settings */
|
|
@@ -75,8 +77,8 @@ export interface BaseFormattingOptions {
|
|
|
75
77
|
insertColumnsOneLine?: boolean;
|
|
76
78
|
/** Keep MERGE WHEN clause predicates on one line regardless of AND break settings */
|
|
77
79
|
whenOneLine?: boolean;
|
|
78
|
-
/** Maximum rendered width for opt-in one-line constructs.
|
|
79
|
-
oneLineMaxLength?: number;
|
|
80
|
+
/** Maximum rendered width for opt-in one-line constructs. Use 0, null, or omit to disable the limit. */
|
|
81
|
+
oneLineMaxLength?: number | null;
|
|
80
82
|
/** Indent AND/OR continuation lines inside JOIN ON predicates */
|
|
81
83
|
joinConditionContinuationIndent?: boolean;
|
|
82
84
|
/** Reorder JOIN ON column comparisons to follow table declaration order */
|
|
@@ -106,13 +108,15 @@ export interface SqlFormatterOptions extends BaseFormattingOptions {
|
|
|
106
108
|
end: string;
|
|
107
109
|
};
|
|
108
110
|
/** Style for parameter formatting */
|
|
109
|
-
parameterStyle?: 'anonymous' | 'indexed' | 'named';
|
|
111
|
+
parameterStyle?: 'anonymous' | 'indexed' | 'named' | 'original';
|
|
110
112
|
/** Preferred CAST rendering style */
|
|
111
113
|
castStyle?: CastStyle;
|
|
112
114
|
/** Constraint rendering style (affects CREATE TABLE constraint layout) */
|
|
113
115
|
constraintStyle?: ConstraintStyle;
|
|
114
116
|
/** Source alias rendering style for FROM/JOIN sources */
|
|
115
117
|
sourceAliasStyle?: SourceAliasStyle;
|
|
118
|
+
/** Column alias rendering style for SELECT items */
|
|
119
|
+
columnAliasStyle?: ColumnAliasStyle;
|
|
116
120
|
/** Default ORDER BY direction rendering style */
|
|
117
121
|
orderByDefaultDirectionStyle?: OrderByDefaultDirectionStyle;
|
|
118
122
|
}
|
|
@@ -28,8 +28,9 @@ export type OrBreakStyle = 'none' | 'before' | 'after';
|
|
|
28
28
|
* JoinOnBreakStyle determines whether JOIN ON starts on the JOIN line or its own indented line.
|
|
29
29
|
* - 'none': Keep ON inline with the JOIN target
|
|
30
30
|
* - 'before': Break before ON and indent the join condition
|
|
31
|
+
* - 'after': Legacy alias accepted as 'none'
|
|
31
32
|
*/
|
|
32
|
-
export type JoinOnBreakStyle = 'none' | 'before';
|
|
33
|
+
export type JoinOnBreakStyle = 'none' | 'before' | 'after';
|
|
33
34
|
/**
|
|
34
35
|
* Options for configuring SqlPrinter formatting behavior
|
|
35
36
|
*/
|
|
@@ -74,7 +75,7 @@ export declare class SqlPrinter {
|
|
|
74
75
|
andBreak: AndBreakStyle;
|
|
75
76
|
/** OR break style: 'none', 'before', or 'after' */
|
|
76
77
|
orBreak: OrBreakStyle;
|
|
77
|
-
/** JOIN ON break style: 'none' or 'before' */
|
|
78
|
+
/** JOIN ON break style: 'none' or 'before' (legacy 'after' is treated as 'none') */
|
|
78
79
|
joinOnBreak: JoinOnBreakStyle;
|
|
79
80
|
/** Keyword case style: 'none', 'upper' | 'lower' */
|
|
80
81
|
keywordCase: 'none' | 'upper' | 'lower';
|
|
@@ -94,6 +95,8 @@ export declare class SqlPrinter {
|
|
|
94
95
|
private betweenOneLine;
|
|
95
96
|
/** Whether to keep VALUES clause on one line */
|
|
96
97
|
private valuesOneLine;
|
|
98
|
+
/** Whether to keep IN value lists on one line */
|
|
99
|
+
private inOneLine;
|
|
97
100
|
/** Whether to keep JOIN conditions on one line */
|
|
98
101
|
private joinOneLine;
|
|
99
102
|
/** Whether to keep CASE expressions on one line */
|
|
@@ -145,6 +148,7 @@ export declare class SqlPrinter {
|
|
|
145
148
|
private shouldAlignExplainStatementChild;
|
|
146
149
|
private shouldExpandCommentedFunctionCall;
|
|
147
150
|
private containsCommentBlock;
|
|
151
|
+
private containsRenderableCommentBlock;
|
|
148
152
|
private isLogicalOperatorWithComment;
|
|
149
153
|
private currentLineEndsWithLogicalOperator;
|
|
150
154
|
private isCaseContext;
|
|
@@ -183,6 +187,8 @@ export declare class SqlPrinter {
|
|
|
183
187
|
* Decides whether the current container should collapse into a single line.
|
|
184
188
|
*/
|
|
185
189
|
private shouldFormatContainerAsOneline;
|
|
190
|
+
private isInValueListExpression;
|
|
191
|
+
private getInValueListParts;
|
|
186
192
|
/**
|
|
187
193
|
* Detects an INSERT column list that must stay on a single line.
|
|
188
194
|
*/
|
|
@@ -206,8 +212,11 @@ export declare class SqlPrinter {
|
|
|
206
212
|
private normalizeSmartBlockLine;
|
|
207
213
|
private extractLineCommentContent;
|
|
208
214
|
private flushSmartCommentBlockBuilder;
|
|
215
|
+
private shouldFallbackSmartLineCommentToBlock;
|
|
216
|
+
private buildSmartLineComment;
|
|
209
217
|
private collectCommentBlockLines;
|
|
210
218
|
private extractRawCommentBlockLines;
|
|
219
|
+
private extractDirectBlockCommentTexts;
|
|
211
220
|
private normalizeCommentForSmart;
|
|
212
221
|
private buildBlockComment;
|
|
213
222
|
private getIndentString;
|
|
@@ -236,12 +245,15 @@ export declare class SqlPrinter {
|
|
|
236
245
|
*/
|
|
237
246
|
private isOnelineMode;
|
|
238
247
|
private normalizeOneLineMaxLength;
|
|
248
|
+
private normalizeKeywordCase;
|
|
249
|
+
private normalizeJoinOnBreak;
|
|
239
250
|
private fitsOneLineMaxLength;
|
|
240
251
|
/**
|
|
241
252
|
* Handles CTE tokens with one-liner formatting.
|
|
242
253
|
* Creates a nested SqlPrinter instance for proper CTE oneline formatting.
|
|
243
254
|
*/
|
|
244
255
|
private tryHandleCteOnelineToken;
|
|
256
|
+
private shouldPreserveCteComments;
|
|
245
257
|
/**
|
|
246
258
|
* Creates a SqlPrinter instance configured for CTE oneline formatting.
|
|
247
259
|
*/
|
|
@@ -251,6 +263,9 @@ export declare class SqlPrinter {
|
|
|
251
263
|
* Creates a unified oneline printer that formats everything as one line regardless of content type.
|
|
252
264
|
*/
|
|
253
265
|
private tryHandleOnelineToken;
|
|
266
|
+
private tryHandleInOneLineToken;
|
|
267
|
+
private appendExpandedInValueList;
|
|
268
|
+
private splitValueListItems;
|
|
254
269
|
private isBooleanParenExpression;
|
|
255
270
|
private containsLogicalOperator;
|
|
256
271
|
private getClauseBreakIndentLevel;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FormatOptionResolver.js","sourceRoot":"","sources":["../../src/transformers/FormatOptionResolver.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"FormatOptionResolver.js","sourceRoot":"","sources":["../../src/transformers/FormatOptionResolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OnelineFormattingHelper.js","sourceRoot":"","sources":["../../src/transformers/OnelineFormattingHelper.ts"],"names":[],"mappings":";;;AAAA,2DAAuG;
|
|
1
|
+
{"version":3,"file":"OnelineFormattingHelper.js","sourceRoot":"","sources":["../../src/transformers/OnelineFormattingHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,7 @@ exports.VALID_PRESETS = ['mysql', 'postgres', 'sqlserver', 'sqlite'];
|
|
|
19
19
|
*/
|
|
20
20
|
class SqlFormatter {
|
|
21
21
|
constructor(options = {}) {
|
|
22
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
22
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
|
|
23
23
|
const presetConfig = options.preset ? SqlPrintTokenParser_1.PRESETS[options.preset] : undefined;
|
|
24
24
|
if (options.preset && !presetConfig) {
|
|
25
25
|
throw new Error(`Invalid preset: ${options.preset}`); // Throw error for invalid preset
|
|
@@ -33,10 +33,11 @@ class SqlFormatter {
|
|
|
33
33
|
parameterStyle: (_d = options.parameterStyle) !== null && _d !== void 0 ? _d : presetConfig === null || presetConfig === void 0 ? void 0 : presetConfig.parameterStyle,
|
|
34
34
|
castStyle: (_e = options.castStyle) !== null && _e !== void 0 ? _e : presetConfig === null || presetConfig === void 0 ? void 0 : presetConfig.castStyle,
|
|
35
35
|
sourceAliasStyle: (_f = options.sourceAliasStyle) !== null && _f !== void 0 ? _f : presetConfig === null || presetConfig === void 0 ? void 0 : presetConfig.sourceAliasStyle,
|
|
36
|
-
|
|
36
|
+
columnAliasStyle: (_g = options.columnAliasStyle) !== null && _g !== void 0 ? _g : presetConfig === null || presetConfig === void 0 ? void 0 : presetConfig.columnAliasStyle,
|
|
37
|
+
orderByDefaultDirectionStyle: (_h = options.orderByDefaultDirectionStyle) !== null && _h !== void 0 ? _h : presetConfig === null || presetConfig === void 0 ? void 0 : presetConfig.orderByDefaultDirectionStyle,
|
|
37
38
|
joinConditionOrderByDeclaration: options.joinConditionOrderByDeclaration,
|
|
38
39
|
};
|
|
39
|
-
const constraintStyle = (
|
|
40
|
+
const constraintStyle = (_k = (_j = options.constraintStyle) !== null && _j !== void 0 ? _j : presetConfig === null || presetConfig === void 0 ? void 0 : presetConfig.constraintStyle) !== null && _k !== void 0 ? _k : 'postgres';
|
|
40
41
|
const parserConfig = {
|
|
41
42
|
...parserOptions,
|
|
42
43
|
constraintStyle,
|
|
@@ -56,6 +57,7 @@ class SqlFormatter {
|
|
|
56
57
|
parenthesesOneLine: options.parenthesesOneLine,
|
|
57
58
|
betweenOneLine: options.betweenOneLine,
|
|
58
59
|
valuesOneLine: options.valuesOneLine,
|
|
60
|
+
inOneLine: options.inOneLine,
|
|
59
61
|
joinOneLine: options.joinOneLine,
|
|
60
62
|
caseOneLine: options.caseOneLine,
|
|
61
63
|
subqueryOneLine: options.subqueryOneLine,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SqlFormatter.js","sourceRoot":"","sources":["../../src/transformers/SqlFormatter.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"SqlFormatter.js","sourceRoot":"","sources":["../../src/transformers/SqlFormatter.ts"],"names":[],"mappings":"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"}
|