rawsql-ts 0.3.0-beta → 0.5.0-beta
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 +73 -17
- package/dist/esm/index.js +1 -1
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/models/BinarySelectQuery.js +10 -2
- package/dist/esm/models/BinarySelectQuery.js.map +1 -1
- package/dist/esm/models/SelectQuery.js.map +1 -1
- package/dist/esm/models/SimpleSelectQuery.js +12 -2
- package/dist/esm/models/SimpleSelectQuery.js.map +1 -1
- package/dist/esm/models/ValueComponent.js +12 -2
- package/dist/esm/models/ValueComponent.js.map +1 -1
- package/dist/esm/models/ValuesQuery.js +16 -1
- package/dist/esm/models/ValuesQuery.js.map +1 -1
- package/dist/esm/transformers/Formatter.js +60 -10
- package/dist/esm/transformers/Formatter.js.map +1 -1
- package/dist/esm/transformers/ParameterCollector.js +33 -0
- package/dist/esm/transformers/ParameterCollector.js.map +1 -0
- package/dist/esm/transformers/{QueryConverter.js → QueryBuilder.js} +42 -42
- package/dist/esm/transformers/QueryBuilder.js.map +1 -0
- package/dist/esm/types/index.d.ts +1 -1
- package/dist/esm/types/models/BinarySelectQuery.d.ts +7 -1
- package/dist/esm/types/models/SelectQuery.d.ts +4 -1
- package/dist/esm/types/models/SimpleSelectQuery.d.ts +7 -1
- package/dist/esm/types/models/ValueComponent.d.ts +8 -2
- package/dist/esm/types/models/ValuesQuery.d.ts +17 -2
- package/dist/esm/types/transformers/Formatter.d.ts +12 -3
- package/dist/esm/types/transformers/ParameterCollector.d.ts +12 -0
- package/dist/esm/types/transformers/{QueryConverter.d.ts → QueryBuilder.d.ts} +14 -21
- package/dist/esm/types/utils/ParameterHelper.d.ts +14 -0
- package/dist/esm/utils/ParameterHelper.js +27 -0
- package/dist/esm/utils/ParameterHelper.js.map +1 -0
- package/dist/index.d.ts +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/models/BinarySelectQuery.d.ts +7 -1
- package/dist/models/BinarySelectQuery.js +10 -2
- package/dist/models/BinarySelectQuery.js.map +1 -1
- package/dist/models/SelectQuery.d.ts +4 -1
- package/dist/models/SelectQuery.js.map +1 -1
- package/dist/models/SimpleSelectQuery.d.ts +7 -1
- package/dist/models/SimpleSelectQuery.js +12 -2
- package/dist/models/SimpleSelectQuery.js.map +1 -1
- package/dist/models/ValueComponent.d.ts +8 -2
- package/dist/models/ValueComponent.js +12 -2
- package/dist/models/ValueComponent.js.map +1 -1
- package/dist/models/ValuesQuery.d.ts +17 -2
- package/dist/models/ValuesQuery.js +16 -1
- package/dist/models/ValuesQuery.js.map +1 -1
- package/dist/transformers/Formatter.d.ts +12 -3
- package/dist/transformers/Formatter.js +61 -11
- package/dist/transformers/Formatter.js.map +1 -1
- package/dist/transformers/ParameterCollector.d.ts +12 -0
- package/dist/transformers/ParameterCollector.js +37 -0
- package/dist/transformers/ParameterCollector.js.map +1 -0
- package/dist/transformers/{QueryConverter.d.ts → QueryBuilder.d.ts} +14 -21
- package/dist/transformers/{QueryConverter.js → QueryBuilder.js} +44 -44
- package/dist/transformers/QueryBuilder.js.map +1 -0
- package/dist/utils/ParameterHelper.d.ts +14 -0
- package/dist/utils/ParameterHelper.js +31 -0
- package/dist/utils/ParameterHelper.js.map +1 -0
- package/package.json +2 -2
- package/dist/esm/transformers/QueryConverter.js.map +0 -1
- package/dist/transformers/QueryConverter.js.map +0 -1
package/dist/index.js
CHANGED
|
@@ -24,7 +24,7 @@ __exportStar(require("./models/ValuesQuery"), exports);
|
|
|
24
24
|
__exportStar(require("./transformers/CTECollector"), exports);
|
|
25
25
|
__exportStar(require("./transformers/CTENormalizer"), exports);
|
|
26
26
|
__exportStar(require("./transformers/Formatter"), exports);
|
|
27
|
-
__exportStar(require("./transformers/
|
|
27
|
+
__exportStar(require("./transformers/QueryBuilder"), exports); // old name:QueryConverter
|
|
28
28
|
__exportStar(require("./transformers/SelectValueCollector"), exports);
|
|
29
29
|
__exportStar(require("./transformers/SelectableColumnCollector"), exports);
|
|
30
30
|
__exportStar(require("./transformers/TableColumnResolver"), exports);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +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,
|
|
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"}
|
|
@@ -5,7 +5,7 @@ import { RawString } from "./ValueComponent";
|
|
|
5
5
|
/**
|
|
6
6
|
* Represents a binary SELECT query (e.g., UNION, INTERSECT, EXCEPT).
|
|
7
7
|
*/
|
|
8
|
-
export declare class BinarySelectQuery extends SqlComponent {
|
|
8
|
+
export declare class BinarySelectQuery extends SqlComponent implements SelectQuery {
|
|
9
9
|
static kind: symbol;
|
|
10
10
|
left: SelectQuery;
|
|
11
11
|
operator: RawString;
|
|
@@ -88,4 +88,10 @@ export declare class BinarySelectQuery extends SqlComponent {
|
|
|
88
88
|
exceptRaw(sql: string): BinarySelectQuery;
|
|
89
89
|
exceptAllRaw(sql: string): BinarySelectQuery;
|
|
90
90
|
toSource(alias?: string): SourceExpression;
|
|
91
|
+
/**
|
|
92
|
+
* Sets the value of a parameter by name in this query.
|
|
93
|
+
* @param name Parameter name
|
|
94
|
+
* @param value Value to set
|
|
95
|
+
*/
|
|
96
|
+
setParameter(name: string, value: any): this;
|
|
91
97
|
}
|
|
@@ -6,6 +6,7 @@ const SqlComponent_1 = require("./SqlComponent");
|
|
|
6
6
|
const ValueComponent_1 = require("./ValueComponent");
|
|
7
7
|
const CTENormalizer_1 = require("../transformers/CTENormalizer");
|
|
8
8
|
const SelectQueryParser_1 = require("../parsers/SelectQueryParser");
|
|
9
|
+
const ParameterHelper_1 = require("../utils/ParameterHelper");
|
|
9
10
|
/**
|
|
10
11
|
* Represents a binary SELECT query (e.g., UNION, INTERSECT, EXCEPT).
|
|
11
12
|
*/
|
|
@@ -95,8 +96,6 @@ class BinarySelectQuery extends SqlComponent_1.SqlComponent {
|
|
|
95
96
|
this.left = new BinarySelectQuery(this.left, this.operator.value, this.right);
|
|
96
97
|
this.operator = new ValueComponent_1.RawString(operator);
|
|
97
98
|
this.right = query;
|
|
98
|
-
// const normalizer = new CTENormalizer();
|
|
99
|
-
// normalizer.normalize(this);
|
|
100
99
|
CTENormalizer_1.CTENormalizer.normalize(this);
|
|
101
100
|
return this;
|
|
102
101
|
}
|
|
@@ -135,6 +134,15 @@ class BinarySelectQuery extends SqlComponent_1.SqlComponent {
|
|
|
135
134
|
toSource(alias = "subq") {
|
|
136
135
|
return new Clause_1.SourceExpression(new Clause_1.SubQuerySource(this), new Clause_1.SourceAliasExpression(alias, null));
|
|
137
136
|
}
|
|
137
|
+
/**
|
|
138
|
+
* Sets the value of a parameter by name in this query.
|
|
139
|
+
* @param name Parameter name
|
|
140
|
+
* @param value Value to set
|
|
141
|
+
*/
|
|
142
|
+
setParameter(name, value) {
|
|
143
|
+
ParameterHelper_1.ParameterHelper.set(this, name, value);
|
|
144
|
+
return this;
|
|
145
|
+
}
|
|
138
146
|
}
|
|
139
147
|
exports.BinarySelectQuery = BinarySelectQuery;
|
|
140
148
|
BinarySelectQuery.kind = Symbol("BinarySelectQuery");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BinarySelectQuery.js","sourceRoot":"","sources":["../../src/models/BinarySelectQuery.ts"],"names":[],"mappings":";;;AAAA,qCAAmF;
|
|
1
|
+
{"version":3,"file":"BinarySelectQuery.js","sourceRoot":"","sources":["../../src/models/BinarySelectQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
|
+
import { SqlComponent } from "./SqlComponent";
|
|
1
2
|
import { InsertQuery } from "./InsertQuery";
|
|
2
3
|
import { SimpleSelectQuery } from "./SimpleSelectQuery";
|
|
3
4
|
import { BinarySelectQuery } from "./BinarySelectQuery";
|
|
4
5
|
import { ValuesQuery } from "./ValuesQuery";
|
|
5
|
-
export
|
|
6
|
+
export interface SelectQuery extends SqlComponent {
|
|
7
|
+
setParameter(name: string, value: any): this;
|
|
8
|
+
}
|
|
6
9
|
export { SimpleSelectQuery, BinarySelectQuery, ValuesQuery, InsertQuery };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SelectQuery.js","sourceRoot":"","sources":["../../src/models/SelectQuery.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"SelectQuery.js","sourceRoot":"","sources":["../../src/models/SelectQuery.ts"],"names":[],"mappings":";;;AACA,+CAA4C;AAQgB,4FARnD,yBAAW,OAQmD;AAPvE,2DAAwD;AAO/C,kGAPA,qCAAiB,OAOA;AAN1B,2DAAwD;AAM5B,kGANnB,qCAAiB,OAMmB;AAL7C,+CAA4C;AAKG,4FALtC,yBAAW,OAKsC"}
|
|
@@ -7,7 +7,7 @@ import { TableColumnResolver } from "../transformers/TableColumnResolver";
|
|
|
7
7
|
/**
|
|
8
8
|
* Represents a simple SELECT query in SQL.
|
|
9
9
|
*/
|
|
10
|
-
export declare class SimpleSelectQuery extends SqlComponent {
|
|
10
|
+
export declare class SimpleSelectQuery extends SqlComponent implements SelectQuery {
|
|
11
11
|
static kind: symbol;
|
|
12
12
|
WithClause: WithClause | null;
|
|
13
13
|
selectClause: SelectClause;
|
|
@@ -195,4 +195,10 @@ export declare class SimpleSelectQuery extends SqlComponent {
|
|
|
195
195
|
appendWhereExpr(columnName: string, exprBuilder: (expr: string) => string, options?: {
|
|
196
196
|
upstream?: boolean;
|
|
197
197
|
}): void;
|
|
198
|
+
/**
|
|
199
|
+
* Sets the value of a parameter by name in this query.
|
|
200
|
+
* @param name Parameter name
|
|
201
|
+
* @param value Value to set
|
|
202
|
+
*/
|
|
203
|
+
setParameter(name: string, value: any): this;
|
|
198
204
|
}
|
|
@@ -8,10 +8,11 @@ const ValueParser_1 = require("../parsers/ValueParser");
|
|
|
8
8
|
const CTENormalizer_1 = require("../transformers/CTENormalizer");
|
|
9
9
|
const SelectableColumnCollector_1 = require("../transformers/SelectableColumnCollector");
|
|
10
10
|
const SourceParser_1 = require("../parsers/SourceParser");
|
|
11
|
-
const BinarySelectQuery_1 = require("./BinarySelectQuery");
|
|
12
11
|
const SelectQueryParser_1 = require("../parsers/SelectQueryParser");
|
|
13
12
|
const Formatter_1 = require("../transformers/Formatter");
|
|
14
13
|
const UpstreamSelectQueryFinder_1 = require("../transformers/UpstreamSelectQueryFinder");
|
|
14
|
+
const QueryBuilder_1 = require("../transformers/QueryBuilder");
|
|
15
|
+
const ParameterHelper_1 = require("../utils/ParameterHelper");
|
|
15
16
|
/**
|
|
16
17
|
* Represents a simple SELECT query in SQL.
|
|
17
18
|
*/
|
|
@@ -99,7 +100,7 @@ class SimpleSelectQuery extends SqlComponent_1.SqlComponent {
|
|
|
99
100
|
* @returns A new BinarySelectQuery representing "this [operator] rightQuery"
|
|
100
101
|
*/
|
|
101
102
|
toBinaryQuery(operator, rightQuery) {
|
|
102
|
-
return
|
|
103
|
+
return QueryBuilder_1.QueryBuilder.buildBinaryQuery([this, rightQuery], operator);
|
|
103
104
|
}
|
|
104
105
|
/**
|
|
105
106
|
* Appends a new condition to the query's WHERE clause using AND logic.
|
|
@@ -356,6 +357,15 @@ class SimpleSelectQuery extends SqlComponent_1.SqlComponent {
|
|
|
356
357
|
this.appendWhereRaw(exprBuilder(exprStr));
|
|
357
358
|
}
|
|
358
359
|
}
|
|
360
|
+
/**
|
|
361
|
+
* Sets the value of a parameter by name in this query.
|
|
362
|
+
* @param name Parameter name
|
|
363
|
+
* @param value Value to set
|
|
364
|
+
*/
|
|
365
|
+
setParameter(name, value) {
|
|
366
|
+
ParameterHelper_1.ParameterHelper.set(this, name, value);
|
|
367
|
+
return this;
|
|
368
|
+
}
|
|
359
369
|
}
|
|
360
370
|
exports.SimpleSelectQuery = SimpleSelectQuery;
|
|
361
371
|
SimpleSelectQuery.kind = Symbol("SelectQuery");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SimpleSelectQuery.js","sourceRoot":"","sources":["../../src/models/SimpleSelectQuery.ts"],"names":[],"mappings":";;;AAAA,iDAA8C;AAC9C,qCAAoQ;AACpQ,qDAAqF;AACrF,wDAAqD;AACrD,iEAA8D;AAC9D,yFAAsF;AACtF,0DAAuD;
|
|
1
|
+
{"version":3,"file":"SimpleSelectQuery.js","sourceRoot":"","sources":["../../src/models/SimpleSelectQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ export declare class ColumnReference extends SqlComponent {
|
|
|
16
16
|
static kind: symbol;
|
|
17
17
|
namespaces: IdentifierString[] | null;
|
|
18
18
|
column: IdentifierString;
|
|
19
|
-
constructor(namespaces: string[] | null, column: string);
|
|
19
|
+
constructor(namespaces: string | string[] | null, column: string);
|
|
20
20
|
toString(): string;
|
|
21
21
|
getNamespace(): string;
|
|
22
22
|
}
|
|
@@ -85,7 +85,13 @@ export declare class LiteralValue extends SqlComponent {
|
|
|
85
85
|
export declare class ParameterExpression extends SqlComponent {
|
|
86
86
|
static kind: symbol;
|
|
87
87
|
name: RawString;
|
|
88
|
-
|
|
88
|
+
value: any | null;
|
|
89
|
+
/**
|
|
90
|
+
* The index assigned by the formatter when generating parameterized queries.
|
|
91
|
+
* This is used for naming parameters like $1, $2, ...
|
|
92
|
+
*/
|
|
93
|
+
index: number | null;
|
|
94
|
+
constructor(name: string, value?: any | null);
|
|
89
95
|
}
|
|
90
96
|
export declare class SwitchCaseArgument extends SqlComponent {
|
|
91
97
|
static kind: symbol;
|
|
@@ -21,7 +21,15 @@ ValueList.kind = Symbol("ValueList");
|
|
|
21
21
|
class ColumnReference extends SqlComponent_1.SqlComponent {
|
|
22
22
|
constructor(namespaces, column) {
|
|
23
23
|
super();
|
|
24
|
-
|
|
24
|
+
if (typeof namespaces === "string") {
|
|
25
|
+
this.namespaces = [new IdentifierString(namespaces)];
|
|
26
|
+
}
|
|
27
|
+
else if (Array.isArray(namespaces)) {
|
|
28
|
+
this.namespaces = namespaces.map((namespace) => new IdentifierString(namespace));
|
|
29
|
+
}
|
|
30
|
+
else {
|
|
31
|
+
this.namespaces = null;
|
|
32
|
+
}
|
|
25
33
|
this.column = new IdentifierString(column);
|
|
26
34
|
}
|
|
27
35
|
toString() {
|
|
@@ -130,9 +138,11 @@ class LiteralValue extends SqlComponent_1.SqlComponent {
|
|
|
130
138
|
exports.LiteralValue = LiteralValue;
|
|
131
139
|
LiteralValue.kind = Symbol("LiteralExpression");
|
|
132
140
|
class ParameterExpression extends SqlComponent_1.SqlComponent {
|
|
133
|
-
constructor(name) {
|
|
141
|
+
constructor(name, value = null) {
|
|
134
142
|
super();
|
|
135
143
|
this.name = new RawString(name);
|
|
144
|
+
this.value = value;
|
|
145
|
+
this.index = null;
|
|
136
146
|
}
|
|
137
147
|
}
|
|
138
148
|
exports.ParameterExpression = ParameterExpression;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValueComponent.js","sourceRoot":"","sources":["../../src/models/ValueComponent.ts"],"names":[],"mappings":";;;AAEA,iDAA8C;AAuB9C,MAAa,WAAY,SAAQ,2BAAY;IAGzC,YAAY,WAAwB;QAChC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACnC,CAAC;;AANL,kCAOC;AANU,gBAAI,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;AAQxC,MAAa,SAAU,SAAQ,2BAAY;IAGvC,YAAY,MAAwB;QAChC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;;AANL,8BAOC;AANU,cAAI,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;AAQtC,MAAa,eAAgB,SAAQ,2BAAY;IAM7C,YAAY,
|
|
1
|
+
{"version":3,"file":"ValueComponent.js","sourceRoot":"","sources":["../../src/models/ValueComponent.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,25 @@
|
|
|
1
|
+
import { SelectQuery } from "./SelectQuery";
|
|
2
|
+
import { SimpleSelectQuery } from "./SimpleSelectQuery";
|
|
1
3
|
import { SqlComponent } from "./SqlComponent";
|
|
2
4
|
import { TupleExpression } from "./ValueComponent";
|
|
3
5
|
/**
|
|
4
6
|
* Represents a VALUES query in SQL.
|
|
5
7
|
*/
|
|
6
|
-
export declare class ValuesQuery extends SqlComponent {
|
|
8
|
+
export declare class ValuesQuery extends SqlComponent implements SelectQuery {
|
|
7
9
|
static kind: symbol;
|
|
8
10
|
tuples: TupleExpression[];
|
|
9
|
-
|
|
11
|
+
/**
|
|
12
|
+
* Column aliases for the VALUES query.
|
|
13
|
+
* These represent the logical column names for each value tuple.
|
|
14
|
+
* Note: This property is optional and is not referenced during SQL output, but is used when converting to a SimpleSelectQuery.
|
|
15
|
+
*/
|
|
16
|
+
columnAliases: string[] | null;
|
|
17
|
+
constructor(tuples: TupleExpression[], columnAliases?: string[] | null);
|
|
18
|
+
toSimpleSelectQuery(): SimpleSelectQuery;
|
|
19
|
+
/**
|
|
20
|
+
* Sets the value of a parameter by name in this query.
|
|
21
|
+
* @param name Parameter name
|
|
22
|
+
* @param value Value to set
|
|
23
|
+
*/
|
|
24
|
+
setParameter(name: string, value: any): this;
|
|
10
25
|
}
|
|
@@ -1,14 +1,29 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ValuesQuery = void 0;
|
|
4
|
+
const ParameterHelper_1 = require("../utils/ParameterHelper");
|
|
5
|
+
const QueryBuilder_1 = require("../transformers/QueryBuilder");
|
|
4
6
|
const SqlComponent_1 = require("./SqlComponent");
|
|
5
7
|
/**
|
|
6
8
|
* Represents a VALUES query in SQL.
|
|
7
9
|
*/
|
|
8
10
|
class ValuesQuery extends SqlComponent_1.SqlComponent {
|
|
9
|
-
constructor(tuples) {
|
|
11
|
+
constructor(tuples, columnAliases = null) {
|
|
10
12
|
super();
|
|
11
13
|
this.tuples = tuples;
|
|
14
|
+
this.columnAliases = columnAliases;
|
|
15
|
+
}
|
|
16
|
+
toSimpleSelectQuery() {
|
|
17
|
+
return QueryBuilder_1.QueryBuilder.buildSimpleQuery(this);
|
|
18
|
+
}
|
|
19
|
+
/**
|
|
20
|
+
* Sets the value of a parameter by name in this query.
|
|
21
|
+
* @param name Parameter name
|
|
22
|
+
* @param value Value to set
|
|
23
|
+
*/
|
|
24
|
+
setParameter(name, value) {
|
|
25
|
+
ParameterHelper_1.ParameterHelper.set(this, name, value);
|
|
26
|
+
return this;
|
|
12
27
|
}
|
|
13
28
|
}
|
|
14
29
|
exports.ValuesQuery = ValuesQuery;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValuesQuery.js","sourceRoot":"","sources":["../../src/models/ValuesQuery.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"ValuesQuery.js","sourceRoot":"","sources":["../../src/models/ValuesQuery.ts"],"names":[],"mappings":";;;AAAA,8DAA2D;AAE3D,+DAA4D;AAG5D,iDAA8C;AAG9C;;GAEG;AACH,MAAa,WAAY,SAAQ,2BAAY;IAUzC,YAAY,MAAyB,EAAE,gBAAiC,IAAI;QACxE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACvC,CAAC;IAEM,mBAAmB;QACtB,OAAO,2BAAY,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC;IAED;;;;SAIK;IACE,YAAY,CAAC,IAAY,EAAE,KAAU;QACxC,iCAAe,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QACvC,OAAO,IAAI,CAAC;IAChB,CAAC;;AA5BL,kCA6BC;AA5BU,gBAAI,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC"}
|
|
@@ -1,4 +1,9 @@
|
|
|
1
1
|
import { SqlComponent, SqlComponentVisitor } from "../models/SqlComponent";
|
|
2
|
+
export declare enum ParameterStyle {
|
|
3
|
+
Anonymous = "anonymous",// ?
|
|
4
|
+
Indexed = "indexed",// $1, $2, ...
|
|
5
|
+
Named = "named"
|
|
6
|
+
}
|
|
2
7
|
interface FormatterConfig {
|
|
3
8
|
identifierEscape?: {
|
|
4
9
|
start: string;
|
|
@@ -9,10 +14,9 @@ interface FormatterConfig {
|
|
|
9
14
|
end: string;
|
|
10
15
|
};
|
|
11
16
|
/**
|
|
12
|
-
*
|
|
13
|
-
* If true (default), named parameters are output (e.g. :userId, @userId).
|
|
17
|
+
* Parameter style: anonymous (?), indexed ($1), or named (:name)
|
|
14
18
|
*/
|
|
15
|
-
|
|
19
|
+
parameterStyle?: ParameterStyle;
|
|
16
20
|
}
|
|
17
21
|
export declare class Formatter implements SqlComponentVisitor<string> {
|
|
18
22
|
/**
|
|
@@ -21,6 +25,7 @@ export declare class Formatter implements SqlComponentVisitor<string> {
|
|
|
21
25
|
static readonly PRESETS: Record<string, FormatterConfig>;
|
|
22
26
|
private handlers;
|
|
23
27
|
private config;
|
|
28
|
+
private parameterIndex;
|
|
24
29
|
constructor();
|
|
25
30
|
/**
|
|
26
31
|
* Formats the given SQL AST node into a SQL string.
|
|
@@ -30,6 +35,10 @@ export declare class Formatter implements SqlComponentVisitor<string> {
|
|
|
30
35
|
* @returns The formatted SQL string.
|
|
31
36
|
*/
|
|
32
37
|
format(arg: SqlComponent, config?: FormatterConfig | null): string;
|
|
38
|
+
formatWithParameters(arg: SqlComponent, config?: FormatterConfig | null): {
|
|
39
|
+
sql: string;
|
|
40
|
+
params: any[] | Record<string, any>[] | Record<string, any>;
|
|
41
|
+
};
|
|
33
42
|
/**
|
|
34
43
|
* Visitor entry point for SQL AST nodes.
|
|
35
44
|
* Note: This method is public only for interface compatibility.
|
|
@@ -1,13 +1,21 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.Formatter = void 0;
|
|
3
|
+
exports.Formatter = exports.ParameterStyle = void 0;
|
|
4
4
|
const SelectQuery_1 = require("../models/SelectQuery");
|
|
5
5
|
const ValueComponent_1 = require("../models/ValueComponent");
|
|
6
6
|
const Clause_1 = require("../models/Clause");
|
|
7
7
|
const CreateTableQuery_1 = require("../models/CreateTableQuery");
|
|
8
8
|
const InsertQuery_1 = require("../models/InsertQuery");
|
|
9
|
+
const ParameterCollector_1 = require("./ParameterCollector");
|
|
10
|
+
var ParameterStyle;
|
|
11
|
+
(function (ParameterStyle) {
|
|
12
|
+
ParameterStyle["Anonymous"] = "anonymous";
|
|
13
|
+
ParameterStyle["Indexed"] = "indexed";
|
|
14
|
+
ParameterStyle["Named"] = "named";
|
|
15
|
+
})(ParameterStyle || (exports.ParameterStyle = ParameterStyle = {}));
|
|
9
16
|
class Formatter {
|
|
10
17
|
constructor() {
|
|
18
|
+
this.parameterIndex = 0;
|
|
11
19
|
this.handlers = new Map();
|
|
12
20
|
// Default settings
|
|
13
21
|
this.config = {
|
|
@@ -16,6 +24,7 @@ class Formatter {
|
|
|
16
24
|
end: '"'
|
|
17
25
|
},
|
|
18
26
|
parameterSymbol: ':',
|
|
27
|
+
parameterStyle: ParameterStyle.Named,
|
|
19
28
|
};
|
|
20
29
|
// value
|
|
21
30
|
this.handlers.set(ValueComponent_1.LiteralValue.kind, (expr) => this.visitLiteralExpression(expr));
|
|
@@ -93,12 +102,47 @@ class Formatter {
|
|
|
93
102
|
* @returns The formatted SQL string.
|
|
94
103
|
*/
|
|
95
104
|
format(arg, config = null) {
|
|
105
|
+
this.parameterIndex = 0; // Reset counter for each format
|
|
96
106
|
if (config) {
|
|
97
107
|
// Always reset to default before merging user config
|
|
98
108
|
this.config = Object.assign({ identifierEscape: { start: '"', end: '"' }, parameterSymbol: ':' }, config);
|
|
99
109
|
}
|
|
100
110
|
return this.visit(arg);
|
|
101
111
|
}
|
|
112
|
+
formatWithParameters(arg, config = null) {
|
|
113
|
+
var _a;
|
|
114
|
+
const sql = this.format(arg, config); // Sort parameters by index
|
|
115
|
+
const paramsRaw = ParameterCollector_1.ParameterCollector.collect(arg).sort((a, b) => { var _a, _b; return ((_a = a.index) !== null && _a !== void 0 ? _a : 0) - ((_b = b.index) !== null && _b !== void 0 ? _b : 0); });
|
|
116
|
+
const style = ((_a = this.config.parameterStyle) !== null && _a !== void 0 ? _a : ParameterStyle.Named);
|
|
117
|
+
if (style === ParameterStyle.Named) {
|
|
118
|
+
// Named: { name: value, ... }
|
|
119
|
+
const paramsObj = {};
|
|
120
|
+
for (const p of paramsRaw) {
|
|
121
|
+
const key = p.name.value;
|
|
122
|
+
if (paramsObj.hasOwnProperty(key)) {
|
|
123
|
+
if (paramsObj[key] !== p.value) {
|
|
124
|
+
throw new Error(`Duplicate parameter name '${key}' with different values detected during query composition.`);
|
|
125
|
+
}
|
|
126
|
+
// If value is the same, skip (already set)
|
|
127
|
+
continue;
|
|
128
|
+
}
|
|
129
|
+
paramsObj[key] = p.value;
|
|
130
|
+
}
|
|
131
|
+
return { sql, params: paramsObj };
|
|
132
|
+
}
|
|
133
|
+
else if (style === ParameterStyle.Indexed) {
|
|
134
|
+
// Indexed: [value1, value2, ...] (sorted by index)
|
|
135
|
+
const paramsArr = paramsRaw.map(p => p.value);
|
|
136
|
+
return { sql, params: paramsArr };
|
|
137
|
+
}
|
|
138
|
+
else if (style === ParameterStyle.Anonymous) {
|
|
139
|
+
// Anonymous: [value1, value2, ...] (sorted by index, name is empty)
|
|
140
|
+
const paramsArr = paramsRaw.map(p => p.value);
|
|
141
|
+
return { sql, params: paramsArr };
|
|
142
|
+
}
|
|
143
|
+
// Fallback (just in case)
|
|
144
|
+
return { sql, params: [] };
|
|
145
|
+
}
|
|
102
146
|
/**
|
|
103
147
|
* Visitor entry point for SQL AST nodes.
|
|
104
148
|
* Note: This method is public only for interface compatibility.
|
|
@@ -317,17 +361,23 @@ class Formatter {
|
|
|
317
361
|
return arg.value.toString();
|
|
318
362
|
}
|
|
319
363
|
visitParameterExpression(arg) {
|
|
320
|
-
var _a;
|
|
321
|
-
//
|
|
322
|
-
|
|
323
|
-
|
|
364
|
+
var _a, _b;
|
|
365
|
+
// update index
|
|
366
|
+
arg.index = this.parameterIndex;
|
|
367
|
+
this.parameterIndex++;
|
|
368
|
+
// Decide output style based on config
|
|
369
|
+
const style = (_a = this.config.parameterStyle) !== null && _a !== void 0 ? _a : ParameterStyle.Named;
|
|
370
|
+
if (style === ParameterStyle.Anonymous) {
|
|
324
371
|
return '?';
|
|
325
372
|
}
|
|
373
|
+
if (style === ParameterStyle.Indexed) {
|
|
374
|
+
return `$${arg.index + 1}`; // 0-based to 1-based
|
|
375
|
+
}
|
|
376
|
+
// Named (default)
|
|
326
377
|
if (typeof this.config.parameterSymbol === 'object' && this.config.parameterSymbol !== null) {
|
|
327
378
|
return `${this.config.parameterSymbol.start}${arg.name.accept(this)}${this.config.parameterSymbol.end}`;
|
|
328
379
|
}
|
|
329
|
-
|
|
330
|
-
return `${(_a = this.config.parameterSymbol) !== null && _a !== void 0 ? _a : ':'}${arg.name.accept(this)}`;
|
|
380
|
+
return `${(_b = this.config.parameterSymbol) !== null && _b !== void 0 ? _b : ':'}${arg.name.accept(this)}`;
|
|
331
381
|
}
|
|
332
382
|
visitSelectItemExpression(arg) {
|
|
333
383
|
if (arg.identifier) {
|
|
@@ -517,22 +567,22 @@ Formatter.PRESETS = {
|
|
|
517
567
|
mysql: {
|
|
518
568
|
identifierEscape: { start: '`', end: '`' },
|
|
519
569
|
parameterSymbol: '?',
|
|
520
|
-
|
|
570
|
+
parameterStyle: ParameterStyle.Anonymous,
|
|
521
571
|
},
|
|
522
572
|
postgres: {
|
|
523
573
|
identifierEscape: { start: '"', end: '"' },
|
|
524
574
|
parameterSymbol: ':',
|
|
525
|
-
|
|
575
|
+
parameterStyle: ParameterStyle.Indexed,
|
|
526
576
|
},
|
|
527
577
|
sqlserver: {
|
|
528
578
|
identifierEscape: { start: '[', end: ']' },
|
|
529
579
|
parameterSymbol: '@',
|
|
530
|
-
|
|
580
|
+
parameterStyle: ParameterStyle.Named,
|
|
531
581
|
},
|
|
532
582
|
sqlite: {
|
|
533
583
|
identifierEscape: { start: '"', end: '"' },
|
|
534
584
|
parameterSymbol: ':',
|
|
535
|
-
|
|
585
|
+
parameterStyle: ParameterStyle.Named,
|
|
536
586
|
},
|
|
537
587
|
};
|
|
538
588
|
//# sourceMappingURL=Formatter.js.map
|