rawsql-ts 0.19.0 → 0.21.0
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 +12 -13
- package/dist/esm/index.d.ts +1 -11
- package/dist/esm/index.js +1 -11
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/index.min.js +5 -41
- package/dist/esm/index.min.js.map +4 -4
- package/dist/esm/transformers/DynamicQueryBuilder.d.ts +4 -27
- package/dist/esm/transformers/DynamicQueryBuilder.js +10 -27
- package/dist/esm/transformers/DynamicQueryBuilder.js.map +1 -1
- package/dist/esm/transformers/SSSQLFilterBuilder.d.ts +48 -1
- package/dist/esm/transformers/SSSQLFilterBuilder.js +578 -31
- package/dist/esm/transformers/SSSQLFilterBuilder.js.map +1 -1
- package/dist/esm/utils/SchemaManager.d.ts +3 -19
- package/dist/esm/utils/SchemaManager.js +2 -62
- package/dist/esm/utils/SchemaManager.js.map +1 -1
- package/dist/index.js +2 -18
- package/dist/index.js.map +1 -1
- package/dist/index.min.js +5 -41
- package/dist/index.min.js.map +4 -4
- package/dist/src/index.d.ts +1 -11
- package/dist/src/transformers/DynamicQueryBuilder.d.ts +4 -27
- package/dist/src/transformers/SSSQLFilterBuilder.d.ts +48 -1
- package/dist/src/utils/SchemaManager.d.ts +3 -19
- package/dist/transformers/DynamicQueryBuilder.js +10 -27
- package/dist/transformers/DynamicQueryBuilder.js.map +1 -1
- package/dist/transformers/SSSQLFilterBuilder.js +576 -29
- package/dist/transformers/SSSQLFilterBuilder.js.map +1 -1
- package/dist/tsconfig.browser.tsbuildinfo +1 -1
- package/dist/utils/SchemaManager.js +2 -63
- package/dist/utils/SchemaManager.js.map +1 -1
- package/package.json +10 -2
- package/dist/esm/transformers/EnhancedJsonMapping.d.ts +0 -194
- package/dist/esm/transformers/EnhancedJsonMapping.js +0 -217
- package/dist/esm/transformers/EnhancedJsonMapping.js.map +0 -1
- package/dist/esm/transformers/JsonMappingConverter.d.ts +0 -200
- package/dist/esm/transformers/JsonMappingConverter.js +0 -388
- package/dist/esm/transformers/JsonMappingConverter.js.map +0 -1
- package/dist/esm/transformers/JsonMappingUnifier.d.ts +0 -100
- package/dist/esm/transformers/JsonMappingUnifier.js +0 -207
- package/dist/esm/transformers/JsonMappingUnifier.js.map +0 -1
- package/dist/esm/transformers/ModelDrivenJsonMapping.d.ts +0 -62
- package/dist/esm/transformers/ModelDrivenJsonMapping.js +0 -115
- package/dist/esm/transformers/ModelDrivenJsonMapping.js.map +0 -1
- package/dist/esm/transformers/PostgresArrayEntityCteBuilder.d.ts +0 -138
- package/dist/esm/transformers/PostgresArrayEntityCteBuilder.js +0 -454
- package/dist/esm/transformers/PostgresArrayEntityCteBuilder.js.map +0 -1
- package/dist/esm/transformers/PostgresJsonQueryBuilder.d.ts +0 -88
- package/dist/esm/transformers/PostgresJsonQueryBuilder.js +0 -241
- package/dist/esm/transformers/PostgresJsonQueryBuilder.js.map +0 -1
- package/dist/esm/transformers/PostgresObjectEntityCteBuilder.d.ts +0 -165
- package/dist/esm/transformers/PostgresObjectEntityCteBuilder.js +0 -343
- package/dist/esm/transformers/PostgresObjectEntityCteBuilder.js.map +0 -1
- package/dist/esm/transformers/TypeTransformationPostProcessor.d.ts +0 -108
- package/dist/esm/transformers/TypeTransformationPostProcessor.js +0 -354
- package/dist/esm/transformers/TypeTransformationPostProcessor.js.map +0 -1
- package/dist/esm/utils/JsonSchemaValidator.d.ts +0 -81
- package/dist/esm/utils/JsonSchemaValidator.js +0 -211
- package/dist/esm/utils/JsonSchemaValidator.js.map +0 -1
- package/dist/src/transformers/EnhancedJsonMapping.d.ts +0 -194
- package/dist/src/transformers/JsonMappingConverter.d.ts +0 -200
- package/dist/src/transformers/JsonMappingUnifier.d.ts +0 -100
- package/dist/src/transformers/ModelDrivenJsonMapping.d.ts +0 -62
- package/dist/src/transformers/PostgresArrayEntityCteBuilder.d.ts +0 -138
- package/dist/src/transformers/PostgresJsonQueryBuilder.d.ts +0 -88
- package/dist/src/transformers/PostgresObjectEntityCteBuilder.d.ts +0 -165
- package/dist/src/transformers/TypeTransformationPostProcessor.d.ts +0 -108
- package/dist/src/utils/JsonSchemaValidator.d.ts +0 -81
- package/dist/transformers/EnhancedJsonMapping.js +0 -223
- package/dist/transformers/EnhancedJsonMapping.js.map +0 -1
- package/dist/transformers/JsonMappingConverter.js +0 -392
- package/dist/transformers/JsonMappingConverter.js.map +0 -1
- package/dist/transformers/JsonMappingUnifier.js +0 -216
- package/dist/transformers/JsonMappingUnifier.js.map +0 -1
- package/dist/transformers/ModelDrivenJsonMapping.js +0 -122
- package/dist/transformers/ModelDrivenJsonMapping.js.map +0 -1
- package/dist/transformers/PostgresArrayEntityCteBuilder.js +0 -458
- package/dist/transformers/PostgresArrayEntityCteBuilder.js.map +0 -1
- package/dist/transformers/PostgresJsonQueryBuilder.js +0 -245
- package/dist/transformers/PostgresJsonQueryBuilder.js.map +0 -1
- package/dist/transformers/PostgresObjectEntityCteBuilder.js +0 -347
- package/dist/transformers/PostgresObjectEntityCteBuilder.js.map +0 -1
- package/dist/transformers/TypeTransformationPostProcessor.js +0 -363
- package/dist/transformers/TypeTransformationPostProcessor.js.map +0 -1
- package/dist/utils/JsonSchemaValidator.js +0 -215
- package/dist/utils/JsonSchemaValidator.js.map +0 -1
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { SelectQuery } from "../models/SelectQuery";
|
|
2
2
|
import { SortConditions } from "./SqlSortInjector";
|
|
3
3
|
import { PaginationOptions } from "./SqlPaginationInjector";
|
|
4
|
-
import { JsonMapping } from "./PostgresJsonQueryBuilder";
|
|
5
4
|
import { SqlParameterValue } from "../models/ValueComponent";
|
|
6
5
|
import { SchemaInfo } from "./OptimizeUnusedLeftJoins";
|
|
7
6
|
import { OptionalConditionParameterStates, OptionalConditionPruningParameters } from "./PruneOptionalConditionBranches";
|
|
@@ -104,18 +103,6 @@ export interface QueryBuildOptions {
|
|
|
104
103
|
* Filters apply subtractively and only drop columns that exist in the original output.
|
|
105
104
|
*/
|
|
106
105
|
excludeColumns?: string[];
|
|
107
|
-
/** JSON serialization mapping to transform results into hierarchical JSON
|
|
108
|
-
* - JsonMapping object: explicit mapping configuration
|
|
109
|
-
* - true: auto-load mapping from corresponding .json file
|
|
110
|
-
* - false/undefined: no serialization
|
|
111
|
-
*/
|
|
112
|
-
serialize?: JsonMapping | boolean;
|
|
113
|
-
/**
|
|
114
|
-
* JSONB usage setting. Must be true (default) for PostgreSQL GROUP BY compatibility.
|
|
115
|
-
* Setting to false will throw an error as JSON type cannot be used in GROUP BY clauses.
|
|
116
|
-
* @default true
|
|
117
|
-
*/
|
|
118
|
-
jsonb?: boolean;
|
|
119
106
|
/**
|
|
120
107
|
* Throw when column-anchored EXISTS filters fail to resolve.
|
|
121
108
|
* Defaults to false so invalid definitions are skipped silently.
|
|
@@ -158,12 +145,12 @@ export interface DynamicQueryBuilderOptions {
|
|
|
158
145
|
schemaInfo?: SchemaInfo;
|
|
159
146
|
}
|
|
160
147
|
/**
|
|
161
|
-
* DynamicQueryBuilder combines SQL parsing with dynamic condition injection (filters, sorts, paging
|
|
148
|
+
* DynamicQueryBuilder combines SQL parsing with dynamic condition injection (filters, sorts, paging).
|
|
162
149
|
*
|
|
163
150
|
* Key behaviours verified in packages/core/tests/transformers/DynamicQueryBuilder.test.ts:
|
|
164
151
|
* - Preserves the input SQL when no options are supplied.
|
|
165
152
|
* - Applies filter, sort, and pagination in a deterministic order.
|
|
166
|
-
* -
|
|
153
|
+
* - Fails fast for removed SQL-result JSON shaping.
|
|
167
154
|
*/
|
|
168
155
|
export declare class DynamicQueryBuilder {
|
|
169
156
|
private tableColumnResolver?;
|
|
@@ -179,7 +166,7 @@ export declare class DynamicQueryBuilder {
|
|
|
179
166
|
* Builds a SelectQuery from SQL content with dynamic conditions.
|
|
180
167
|
* This is a pure function that does not perform any I/O operations.
|
|
181
168
|
* @param sqlContent Raw SQL string to parse and modify
|
|
182
|
-
* @param options Dynamic conditions to apply (filter, sort, paging
|
|
169
|
+
* @param options Dynamic conditions to apply (filter, sort, paging)
|
|
183
170
|
* @returns Modified SelectQuery with all dynamic conditions applied
|
|
184
171
|
* @example
|
|
185
172
|
* ```typescript
|
|
@@ -189,8 +176,7 @@ export declare class DynamicQueryBuilder {
|
|
|
189
176
|
* {
|
|
190
177
|
* filter: { status: 'premium' },
|
|
191
178
|
* sort: { created_at: { desc: true } },
|
|
192
|
-
* paging: { page: 2, pageSize: 10 }
|
|
193
|
-
* serialize: { rootName: 'user', rootEntity: { id: 'user', name: 'User', columns: { id: 'id', name: 'name' } }, nestedEntities: [] }
|
|
179
|
+
* paging: { page: 2, pageSize: 10 }
|
|
194
180
|
* }
|
|
195
181
|
* );
|
|
196
182
|
* ```
|
|
@@ -227,15 +213,6 @@ export declare class DynamicQueryBuilder {
|
|
|
227
213
|
* @returns Modified SelectQuery with pagination applied
|
|
228
214
|
*/
|
|
229
215
|
buildPaginatedQuery(sqlContent: string, paging: PaginationOptions): SelectQuery;
|
|
230
|
-
/**
|
|
231
|
-
* Builds a SelectQuery with only JSON serialization applied.
|
|
232
|
-
* Convenience method for when you only need hierarchical JSON transformation.
|
|
233
|
-
*
|
|
234
|
-
* @param sqlContent Raw SQL string to parse and modify
|
|
235
|
-
* @param serialize JSON mapping configuration to apply
|
|
236
|
-
* @returns Modified SelectQuery with JSON serialization applied
|
|
237
|
-
*/
|
|
238
|
-
buildSerializedQuery(sqlContent: string, serialize: JsonMapping): SelectQuery;
|
|
239
216
|
/**
|
|
240
217
|
* Validates SQL content by attempting to parse it.
|
|
241
218
|
* Useful for testing SQL validity without applying any modifications.
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { SelectQueryParser } from "../parsers/SelectQueryParser";
|
|
2
2
|
import { SqlSortInjector } from "./SqlSortInjector";
|
|
3
3
|
import { SqlPaginationInjector } from "./SqlPaginationInjector";
|
|
4
|
-
import { PostgresJsonQueryBuilder } from "./PostgresJsonQueryBuilder";
|
|
5
4
|
import { QueryBuilder } from "./QueryBuilder";
|
|
6
5
|
import { SqlParameterBinder } from "./SqlParameterBinder";
|
|
7
6
|
import { ParameterDetector } from "../utils/ParameterDetector";
|
|
@@ -9,12 +8,12 @@ import { ColumnReference } from "../models/ValueComponent";
|
|
|
9
8
|
import { optimizeUnusedLeftJoinsToFixedPoint, optimizeUnusedCtesToFixedPoint } from "./OptimizeUnusedLeftJoins";
|
|
10
9
|
import { pruneOptionalConditionBranches } from "./PruneOptionalConditionBranches";
|
|
11
10
|
/**
|
|
12
|
-
* DynamicQueryBuilder combines SQL parsing with dynamic condition injection (filters, sorts, paging
|
|
11
|
+
* DynamicQueryBuilder combines SQL parsing with dynamic condition injection (filters, sorts, paging).
|
|
13
12
|
*
|
|
14
13
|
* Key behaviours verified in packages/core/tests/transformers/DynamicQueryBuilder.test.ts:
|
|
15
14
|
* - Preserves the input SQL when no options are supplied.
|
|
16
15
|
* - Applies filter, sort, and pagination in a deterministic order.
|
|
17
|
-
* -
|
|
16
|
+
* - Fails fast for removed SQL-result JSON shaping.
|
|
18
17
|
*/
|
|
19
18
|
export class DynamicQueryBuilder {
|
|
20
19
|
/**
|
|
@@ -36,7 +35,7 @@ export class DynamicQueryBuilder {
|
|
|
36
35
|
* Builds a SelectQuery from SQL content with dynamic conditions.
|
|
37
36
|
* This is a pure function that does not perform any I/O operations.
|
|
38
37
|
* @param sqlContent Raw SQL string to parse and modify
|
|
39
|
-
* @param options Dynamic conditions to apply (filter, sort, paging
|
|
38
|
+
* @param options Dynamic conditions to apply (filter, sort, paging)
|
|
40
39
|
* @returns Modified SelectQuery with all dynamic conditions applied
|
|
41
40
|
* @example
|
|
42
41
|
* ```typescript
|
|
@@ -46,14 +45,17 @@ export class DynamicQueryBuilder {
|
|
|
46
45
|
* {
|
|
47
46
|
* filter: { status: 'premium' },
|
|
48
47
|
* sort: { created_at: { desc: true } },
|
|
49
|
-
* paging: { page: 2, pageSize: 10 }
|
|
50
|
-
* serialize: { rootName: 'user', rootEntity: { id: 'user', name: 'User', columns: { id: 'id', name: 'name' } }, nestedEntities: [] }
|
|
48
|
+
* paging: { page: 2, pageSize: 10 }
|
|
51
49
|
* }
|
|
52
50
|
* );
|
|
53
51
|
* ```
|
|
54
52
|
*/
|
|
55
53
|
buildQuery(sqlContent, options = {}) {
|
|
56
54
|
var _a;
|
|
55
|
+
const removedOptions = options;
|
|
56
|
+
if ('serialize' in removedOptions || 'jsonb' in removedOptions) {
|
|
57
|
+
throw new Error("DynamicQueryBuilder SQL-result JSON shaping has been removed. Keep SQL results as rows and use generated AOT mappers so the executed SQL remains debuggable.");
|
|
58
|
+
}
|
|
57
59
|
// Parse the base SQL
|
|
58
60
|
let parsedQuery;
|
|
59
61
|
try {
|
|
@@ -102,23 +104,15 @@ export class DynamicQueryBuilder {
|
|
|
102
104
|
if (Object.keys(optionalConditionParameters).length > 0) {
|
|
103
105
|
modifiedQuery = pruneOptionalConditionBranches(modifiedQuery, optionalConditionParameters);
|
|
104
106
|
}
|
|
105
|
-
// 6. Remove unused LEFT JOINs when asked
|
|
107
|
+
// 6. Remove unused LEFT JOINs when asked.
|
|
106
108
|
const effectiveSchemaInfo = (_a = options.schemaInfo) !== null && _a !== void 0 ? _a : this.defaultSchemaInfo;
|
|
107
109
|
if (options.removeUnusedLeftJoins && (effectiveSchemaInfo === null || effectiveSchemaInfo === void 0 ? void 0 : effectiveSchemaInfo.length)) {
|
|
108
110
|
modifiedQuery = optimizeUnusedLeftJoinsToFixedPoint(modifiedQuery, effectiveSchemaInfo);
|
|
109
111
|
}
|
|
110
|
-
// 7. Remove unused CTEs
|
|
112
|
+
// 7. Remove unused CTEs when requested.
|
|
111
113
|
if (options.removeUnusedCtes) {
|
|
112
114
|
modifiedQuery = optimizeUnusedCtesToFixedPoint(modifiedQuery);
|
|
113
115
|
}
|
|
114
|
-
// Apply serialization last (transform the final query structure to JSON)
|
|
115
|
-
// Note: boolean values are handled at RawSqlClient level for auto-loading
|
|
116
|
-
if (options.serialize && typeof options.serialize === 'object') {
|
|
117
|
-
const jsonBuilder = new PostgresJsonQueryBuilder();
|
|
118
|
-
// Ensure we have a SimpleSelectQuery for the JSON builder
|
|
119
|
-
const simpleQuery = QueryBuilder.buildSimpleQuery(modifiedQuery);
|
|
120
|
-
modifiedQuery = jsonBuilder.buildJsonQuery(simpleQuery, options.serialize);
|
|
121
|
-
}
|
|
122
116
|
return modifiedQuery;
|
|
123
117
|
}
|
|
124
118
|
resolveOptionalConditionPruningParameters(options) {
|
|
@@ -256,17 +250,6 @@ export class DynamicQueryBuilder {
|
|
|
256
250
|
buildPaginatedQuery(sqlContent, paging) {
|
|
257
251
|
return this.buildQuery(sqlContent, { paging });
|
|
258
252
|
}
|
|
259
|
-
/**
|
|
260
|
-
* Builds a SelectQuery with only JSON serialization applied.
|
|
261
|
-
* Convenience method for when you only need hierarchical JSON transformation.
|
|
262
|
-
*
|
|
263
|
-
* @param sqlContent Raw SQL string to parse and modify
|
|
264
|
-
* @param serialize JSON mapping configuration to apply
|
|
265
|
-
* @returns Modified SelectQuery with JSON serialization applied
|
|
266
|
-
*/
|
|
267
|
-
buildSerializedQuery(sqlContent, serialize) {
|
|
268
|
-
return this.buildQuery(sqlContent, { serialize });
|
|
269
|
-
}
|
|
270
253
|
/**
|
|
271
254
|
* Validates SQL content by attempting to parse it.
|
|
272
255
|
* Useful for testing SQL validity without applying any modifications.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DynamicQueryBuilder.js","sourceRoot":"","sources":["../../../src/transformers/DynamicQueryBuilder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAkB,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAqB,MAAM,yBAAyB,CAAC;AACnF,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"DynamicQueryBuilder.js","sourceRoot":"","sources":["../../../src/transformers/DynamicQueryBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,43 @@
|
|
|
1
|
-
import { SelectQuery } from "../models/SelectQuery";
|
|
1
|
+
import { SelectQuery, SimpleSelectQuery } from "../models/SelectQuery";
|
|
2
|
+
import { type ValueComponent } from "../models/ValueComponent";
|
|
2
3
|
import { type SupportedOptionalConditionBranch } from "./PruneOptionalConditionBranches";
|
|
3
4
|
export type SSSQLFilterValue = unknown;
|
|
4
5
|
export type SSSQLFilterInput = Record<string, SSSQLFilterValue>;
|
|
5
6
|
export type SssqlScaffoldFilters = SSSQLFilterInput;
|
|
7
|
+
export type SssqlScalarOperator = "=" | "<>" | "<" | "<=" | ">" | ">=" | "like" | "ilike";
|
|
8
|
+
export type SssqlScalarOperatorInput = SssqlScalarOperator | "!=";
|
|
9
|
+
export type SssqlBranchKind = "scalar" | "exists" | "not-exists" | "expression";
|
|
6
10
|
export interface SssqlTransformResult {
|
|
7
11
|
query: SelectQuery;
|
|
8
12
|
}
|
|
13
|
+
export interface SssqlBranchInfo {
|
|
14
|
+
parameterName: string;
|
|
15
|
+
kind: SssqlBranchKind;
|
|
16
|
+
operator?: SssqlScalarOperator;
|
|
17
|
+
target?: string;
|
|
18
|
+
query: SimpleSelectQuery;
|
|
19
|
+
expression: ValueComponent;
|
|
20
|
+
sql: string;
|
|
21
|
+
}
|
|
22
|
+
export interface SssqlScalarScaffoldSpec {
|
|
23
|
+
kind?: "scalar";
|
|
24
|
+
target: string;
|
|
25
|
+
parameterName?: string;
|
|
26
|
+
operator?: SssqlScalarOperatorInput;
|
|
27
|
+
}
|
|
28
|
+
export interface SssqlExistsScaffoldSpec {
|
|
29
|
+
kind: "exists" | "not-exists";
|
|
30
|
+
parameterName: string;
|
|
31
|
+
query: string;
|
|
32
|
+
anchorColumns: string[];
|
|
33
|
+
}
|
|
34
|
+
export type SssqlScaffoldSpec = SssqlScalarScaffoldSpec | SssqlExistsScaffoldSpec;
|
|
35
|
+
export interface SssqlRemoveSpec {
|
|
36
|
+
parameterName: string;
|
|
37
|
+
kind?: SssqlBranchKind;
|
|
38
|
+
operator?: SssqlScalarOperatorInput;
|
|
39
|
+
target?: string;
|
|
40
|
+
}
|
|
9
41
|
/**
|
|
10
42
|
* Builds and refreshes truthful SSSQL optional filter branches.
|
|
11
43
|
* Runtime callers should use pruning, not dynamic predicate injection.
|
|
@@ -14,16 +46,31 @@ export declare class SSSQLFilterBuilder {
|
|
|
14
46
|
private readonly tableColumnResolver?;
|
|
15
47
|
private readonly finder;
|
|
16
48
|
constructor(tableColumnResolver?: ((tableName: string) => string[]) | undefined);
|
|
49
|
+
list(query: SelectQuery | string): SssqlBranchInfo[];
|
|
17
50
|
scaffold(query: SelectQuery | string, filters: SSSQLFilterInput): SelectQuery;
|
|
51
|
+
scaffoldBranch(query: SelectQuery | string, spec: SssqlScaffoldSpec): SelectQuery;
|
|
18
52
|
refresh(query: SelectQuery | string, filters: SSSQLFilterInput): SelectQuery;
|
|
53
|
+
remove(query: SelectQuery | string, spec: SssqlRemoveSpec): SelectQuery;
|
|
54
|
+
removeAll(query: SelectQuery | string): SelectQuery;
|
|
19
55
|
private parseQuery;
|
|
56
|
+
private findMatchingBranchInfos;
|
|
57
|
+
private scaffoldScalarBranch;
|
|
58
|
+
private scaffoldExistsBranch;
|
|
20
59
|
private resolveTarget;
|
|
21
60
|
private resolveTargetInQuery;
|
|
22
61
|
private resolveQualifiedTarget;
|
|
23
62
|
private resolveUnqualifiedTarget;
|
|
24
63
|
private findAliasForTable;
|
|
25
64
|
private resolveAliasForSource;
|
|
65
|
+
private buildCorrelatedRefreshPlan;
|
|
66
|
+
private collectSourceAliases;
|
|
67
|
+
private resolveCorrelatedAnchorTarget;
|
|
68
|
+
private findSourceExpressionByAlias;
|
|
69
|
+
private resolveSourceExpressionToUpstreamQuery;
|
|
70
|
+
private resolveAnchorTargetInQuery;
|
|
71
|
+
private getSourceAlias;
|
|
26
72
|
private rebaseMovedBranch;
|
|
73
|
+
private rebaseMovedBranchByAlias;
|
|
27
74
|
}
|
|
28
75
|
export type { SupportedOptionalConditionBranch };
|
|
29
76
|
export declare const scaffoldSssqlQuery: (sqlContent: string, filters: SssqlScaffoldFilters) => SssqlTransformResult;
|