neoorm 0.8.7 → 0.8.8
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/dist/codegen/emit-includes.d.ts.map +1 -1
- package/dist/codegen/emit-includes.js +1 -0
- package/dist/codegen/emit-includes.js.map +1 -1
- package/dist/migrate/dev-lock.d.ts.map +1 -1
- package/dist/migrate/dev-lock.js +18 -3
- package/dist/migrate/dev-lock.js.map +1 -1
- package/dist/plugins/postgis/columns.js +2 -2
- package/dist/plugins/postgis/columns.js.map +1 -1
- package/dist/plugins/postgis/columns.test.js +36 -1
- package/dist/plugins/postgis/columns.test.js.map +1 -1
- package/dist/plugins/postgis/geojson.d.ts +2 -1
- package/dist/plugins/postgis/geojson.d.ts.map +1 -1
- package/dist/plugins/postgis/geojson.js +7 -2
- package/dist/plugins/postgis/geojson.js.map +1 -1
- package/dist/runtime/mysql-placeholders.d.ts.map +1 -1
- package/dist/runtime/mysql-placeholders.js +8 -1
- package/dist/runtime/mysql-placeholders.js.map +1 -1
- package/dist/runtime/mysql-placeholders.test.js +10 -0
- package/dist/runtime/mysql-placeholders.test.js.map +1 -1
- package/dist/runtime/query/aggregate.d.ts.map +1 -1
- package/dist/runtime/query/aggregate.js +3 -3
- package/dist/runtime/query/aggregate.js.map +1 -1
- package/dist/runtime/query/compile-aggregate.d.ts.map +1 -1
- package/dist/runtime/query/compile-aggregate.js +5 -5
- package/dist/runtime/query/compile-aggregate.js.map +1 -1
- package/dist/runtime/query/compile-where.d.ts +17 -0
- package/dist/runtime/query/compile-where.d.ts.map +1 -1
- package/dist/runtime/query/compile-where.js +106 -22
- package/dist/runtime/query/compile-where.js.map +1 -1
- package/dist/runtime/query/compile-write.d.ts.map +1 -1
- package/dist/runtime/query/compile-write.js +17 -6
- package/dist/runtime/query/compile-write.js.map +1 -1
- package/dist/runtime/query/compile.d.ts +1 -1
- package/dist/runtime/query/compile.d.ts.map +1 -1
- package/dist/runtime/query/compile.js +1 -1
- package/dist/runtime/query/compile.js.map +1 -1
- package/dist/runtime/query/count.js +1 -1
- package/dist/runtime/query/count.js.map +1 -1
- package/dist/runtime/query/cursor.d.ts.map +1 -1
- package/dist/runtime/query/cursor.js +7 -2
- package/dist/runtime/query/cursor.js.map +1 -1
- package/dist/runtime/query/find.d.ts +1 -0
- package/dist/runtime/query/find.d.ts.map +1 -1
- package/dist/runtime/query/find.js +15 -14
- package/dist/runtime/query/find.js.map +1 -1
- package/dist/runtime/query/relation-planner.d.ts +1 -0
- package/dist/runtime/query/relation-planner.d.ts.map +1 -1
- package/dist/runtime/query/relation-planner.js +11 -9
- package/dist/runtime/query/relation-planner.js.map +1 -1
- package/dist/runtime/query/table-index.d.ts +18 -0
- package/dist/runtime/query/table-index.d.ts.map +1 -1
- package/dist/runtime/query/table-index.js +77 -1
- package/dist/runtime/query/table-index.js.map +1 -1
- package/dist/runtime/query/update.js +3 -3
- package/dist/runtime/query/update.js.map +1 -1
- package/dist/runtime/query/updated-at.d.ts +1 -1
- package/dist/runtime/query/updated-at.d.ts.map +1 -1
- package/dist/runtime/query/updated-at.js +2 -12
- package/dist/runtime/query/updated-at.js.map +1 -1
- package/dist/runtime/query/upsert.d.ts.map +1 -1
- package/dist/runtime/query/upsert.js +6 -4
- package/dist/runtime/query/upsert.js.map +1 -1
- package/dist/schema/relation-types.d.ts +2 -1
- package/dist/schema/relation-types.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emit-includes.d.ts","sourceRoot":"","sources":["../../src/codegen/emit-includes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,QAAQ,EAIR,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"emit-includes.d.ts","sourceRoot":"","sources":["../../src/codegen/emit-includes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,QAAQ,EAIR,MAAM,qBAAqB,CAAC;AA+E7B,wBAAgB,cAAc,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAsCzD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emit-includes.js","sourceRoot":"","sources":["../../src/codegen/emit-includes.ts"],"names":[],"mappings":"AAMA,OAAO,EACN,kBAAkB,EAClB,aAAa,EACb,UAAU,GACV,MAAM,yBAAyB,CAAC;AAEjC,SAAS,WAAW,CAAC,OAAyB;IAC7C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,OAAO,CAAC;IACzC,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACxD,CAAC;AAED,SAAS,UAAU,CAAC,OAAyB;IAC5C,MAAM,KAAK,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IACnC,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzE,OAAO,aAAa,KAAK,WAAW,YAAY,IAAI,CAAC;AACtD,CAAC;AAED,SAAS,WAAW,CAAC,OAAyB;IAC7C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,uBAAuB,CAAC;IACzD,MAAM,MAAM,GAAG,OAAO;SACpB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,mBAAmB,CAAC;SAC1C,IAAI,CAAC,IAAI,CAAC,CAAC;IACb,OAAO,KAAK,MAAM,IAAI,CAAC;AACxB,CAAC;AAED,SAAS,uBAAuB,CAC/B,QAAkB,EAClB,aAAqB,EACrB,QAA0B;IAE1B,MAAM,QAAQ,GAAG,GAAG,aAAa,CAAC,aAAa,CAAC,GAAG,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC;IACtF,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;IACxD,MAAM,OAAO,GAAG,MAAM,EAAE,OAAO,IAAI,EAAE,CAAC;IACtC,MAAM,UAAU,GAAG,GAAG,aAAa,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC;IACnE,MAAM,WAAW,GAAG,GAAG,aAAa,CAAC,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC;IAErE,OAAO,eAAe,QAAQ;;;iBAGd,UAAU,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"emit-includes.js","sourceRoot":"","sources":["../../src/codegen/emit-includes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-lock.d.ts","sourceRoot":"","sources":["../../src/migrate/dev-lock.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,qBAAqB,GAAG;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACnC,CAAC;AAMF,eAAO,MAAM,yBAAyB,6BAA6B,CAAC;AAqDpE;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CAC1C,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,qBAA0B,GACjC,OAAO,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"dev-lock.d.ts","sourceRoot":"","sources":["../../src/migrate/dev-lock.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,qBAAqB,GAAG;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACnC,CAAC;AAMF,eAAO,MAAM,yBAAyB,6BAA6B,CAAC;AAqDpE;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CAC1C,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,qBAA0B,GACjC,OAAO,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAoF9B;AAQD;;;GAGG;AACH,wBAAsB,kBAAkB,CAAC,CAAC,EACzC,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACpB,OAAO,GAAE,qBAA0B,GACjC,OAAO,CAAC,CAAC,CAAC,CAkBZ"}
|
package/dist/migrate/dev-lock.js
CHANGED
|
@@ -77,8 +77,18 @@ export async function acquireMigrateDevLock(outDir, options = {}) {
|
|
|
77
77
|
while (true) {
|
|
78
78
|
try {
|
|
79
79
|
const fh = await open(lockPath, "wx");
|
|
80
|
-
|
|
81
|
-
|
|
80
|
+
try {
|
|
81
|
+
await fh.writeFile(content, "utf-8");
|
|
82
|
+
await fh.close();
|
|
83
|
+
}
|
|
84
|
+
catch (error) {
|
|
85
|
+
// Best-effort cleanup: never leak the fd, and never leave a
|
|
86
|
+
// partial lock behind. The file is ours alone (O_EXCL just
|
|
87
|
+
// created it), so unlinking cannot remove another holder.
|
|
88
|
+
await fh.close().catch(() => undefined);
|
|
89
|
+
await tryUnlinkLock(lockPath);
|
|
90
|
+
throw error;
|
|
91
|
+
}
|
|
82
92
|
let released = false;
|
|
83
93
|
return async () => {
|
|
84
94
|
if (released)
|
|
@@ -86,7 +96,11 @@ export async function acquireMigrateDevLock(outDir, options = {}) {
|
|
|
86
96
|
released = true;
|
|
87
97
|
try {
|
|
88
98
|
const current = await readFile(lockPath, "utf-8");
|
|
89
|
-
|
|
99
|
+
// Exact full-content match: a substring check could
|
|
100
|
+
// match a successor's token, and check-and-unlink is
|
|
101
|
+
// inherently non-atomic, so never delete content that
|
|
102
|
+
// is not provably ours.
|
|
103
|
+
if (current.trim() !== content)
|
|
90
104
|
return;
|
|
91
105
|
await unlink(lockPath);
|
|
92
106
|
}
|
|
@@ -117,6 +131,7 @@ export async function acquireMigrateDevLock(outDir, options = {}) {
|
|
|
117
131
|
catch (error) {
|
|
118
132
|
if (isNotFoundError(error))
|
|
119
133
|
continue;
|
|
134
|
+
throw error;
|
|
120
135
|
}
|
|
121
136
|
if (!loggedWait) {
|
|
122
137
|
loggedWait = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-lock.js","sourceRoot":"","sources":["../../src/migrate/dev-lock.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"dev-lock.js","sourceRoot":"","sources":["../../src/migrate/dev-lock.ts"],"names":[],"mappings":"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"}
|
|
@@ -160,8 +160,8 @@ function createSpatialTypePlugin(kind, base, defaultOptions) {
|
|
|
160
160
|
serializeValue(_col, value) {
|
|
161
161
|
return geoJsonToParam(value);
|
|
162
162
|
},
|
|
163
|
-
deserializeValue(
|
|
164
|
-
return geoJsonFromValue(dbValue);
|
|
163
|
+
deserializeValue(col, dbValue) {
|
|
164
|
+
return geoJsonFromValue(dbValue, col);
|
|
165
165
|
},
|
|
166
166
|
whereOperators: postgisWhereOperators,
|
|
167
167
|
introspect(_pgDataType, udtName) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"columns.js","sourceRoot":"","sources":["../../../src/plugins/postgis/columns.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"columns.js","sourceRoot":"","sources":["../../../src/plugins/postgis/columns.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { describe, expect, it } from "vitest";
|
|
2
|
-
import { NeoOrmSchemaError } from "../../runtime/errors.js";
|
|
2
|
+
import { InvalidInputError, NeoOrmSchemaError } from "../../runtime/errors.js";
|
|
3
3
|
import { geography, geographyType, geometry, geometryType, point, pointType, } from "./columns.js";
|
|
4
|
+
import { geoJsonFromValue } from "./geojson.js";
|
|
4
5
|
function spatialColumn(kind, typeOptions) {
|
|
5
6
|
return {
|
|
6
7
|
tsName: "location",
|
|
@@ -77,4 +78,38 @@ describe("PostGIS spatial SQL types", () => {
|
|
|
77
78
|
expect(geometryIr?.kind).toBe("union");
|
|
78
79
|
});
|
|
79
80
|
});
|
|
81
|
+
describe("PostGIS GeoJSON parsing", () => {
|
|
82
|
+
const col = spatialColumn("geometry");
|
|
83
|
+
it("parses valid GeoJSON and passes through null/objects", () => {
|
|
84
|
+
expect(geoJsonFromValue('{"type":"Point","coordinates":[1,2]}', col)).toEqual({ type: "Point", coordinates: [1, 2] });
|
|
85
|
+
expect(geoJsonFromValue(null, col)).toBeNull();
|
|
86
|
+
expect(geoJsonFromValue(undefined, col)).toBeNull();
|
|
87
|
+
const obj = { type: "Point", coordinates: [1, 2] };
|
|
88
|
+
expect(geoJsonFromValue(obj, col)).toBe(obj);
|
|
89
|
+
});
|
|
90
|
+
it("wraps corrupt JSON in InvalidInputError instead of SyntaxError", () => {
|
|
91
|
+
let caught;
|
|
92
|
+
try {
|
|
93
|
+
geoJsonFromValue("not-json{{{", col);
|
|
94
|
+
}
|
|
95
|
+
catch (err) {
|
|
96
|
+
caught = err;
|
|
97
|
+
}
|
|
98
|
+
expect(caught).toBeInstanceOf(InvalidInputError);
|
|
99
|
+
expect(caught).not.toBeInstanceOf(SyntaxError);
|
|
100
|
+
expect(String(caught.message)).toContain("Database returned invalid JSON");
|
|
101
|
+
});
|
|
102
|
+
it("carries column context and surfaces via deserializeValue", () => {
|
|
103
|
+
try {
|
|
104
|
+
geometryType.deserializeValue?.(col, "not-json{{{");
|
|
105
|
+
expect.unreachable("expected corrupt GeoJSON to throw");
|
|
106
|
+
}
|
|
107
|
+
catch (err) {
|
|
108
|
+
expect(err).toBeInstanceOf(InvalidInputError);
|
|
109
|
+
const context = err.context;
|
|
110
|
+
expect(context?.columnTsName).toBe("location");
|
|
111
|
+
expect(context?.columnSqlName).toBe("location");
|
|
112
|
+
}
|
|
113
|
+
});
|
|
114
|
+
});
|
|
80
115
|
//# sourceMappingURL=columns.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"columns.test.js","sourceRoot":"","sources":["../../../src/plugins/postgis/columns.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"columns.test.js","sourceRoot":"","sources":["../../../src/plugins/postgis/columns.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
+
import type { ManifestColumn } from "../../dialect/types.js";
|
|
1
2
|
import type { GeoJsonGeometry } from "./columns.js";
|
|
2
3
|
export declare function geoJsonToParam(value: unknown): unknown;
|
|
3
|
-
export declare function geoJsonFromValue(dbValue: unknown): GeoJsonGeometry | null;
|
|
4
|
+
export declare function geoJsonFromValue(dbValue: unknown, col?: ManifestColumn): GeoJsonGeometry | null;
|
|
4
5
|
//# sourceMappingURL=geojson.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"geojson.d.ts","sourceRoot":"","sources":["../../../src/plugins/postgis/geojson.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAEpD,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAQtD;AAED,wBAAgB,gBAAgB,
|
|
1
|
+
{"version":3,"file":"geojson.d.ts","sourceRoot":"","sources":["../../../src/plugins/postgis/geojson.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAE7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAEpD,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAQtD;AAED,wBAAgB,gBAAgB,CAC/B,OAAO,EAAE,OAAO,EAChB,GAAG,CAAC,EAAE,cAAc,GAClB,eAAe,GAAG,IAAI,CAexB"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { parseDbJsonValue } from "../../runtime/parse-db-json.js";
|
|
1
2
|
export function geoJsonToParam(value) {
|
|
2
3
|
if (value === null || value === undefined) {
|
|
3
4
|
return null;
|
|
@@ -7,12 +8,16 @@ export function geoJsonToParam(value) {
|
|
|
7
8
|
}
|
|
8
9
|
return JSON.stringify(value);
|
|
9
10
|
}
|
|
10
|
-
export function geoJsonFromValue(dbValue) {
|
|
11
|
+
export function geoJsonFromValue(dbValue, col) {
|
|
11
12
|
if (dbValue === null || dbValue === undefined) {
|
|
12
13
|
return null;
|
|
13
14
|
}
|
|
14
15
|
if (typeof dbValue === "string") {
|
|
15
|
-
return
|
|
16
|
+
return parseDbJsonValue(dbValue, {
|
|
17
|
+
...(col !== undefined
|
|
18
|
+
? { columnTsName: col.tsName, columnSqlName: col.sqlName }
|
|
19
|
+
: {}),
|
|
20
|
+
});
|
|
16
21
|
}
|
|
17
22
|
if (typeof dbValue === "object") {
|
|
18
23
|
return dbValue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"geojson.js","sourceRoot":"","sources":["../../../src/plugins/postgis/geojson.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"geojson.js","sourceRoot":"","sources":["../../../src/plugins/postgis/geojson.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAGlE,MAAM,UAAU,cAAc,CAAC,KAAc;IAC5C,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAC3C,OAAO,IAAI,CAAC;IACb,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC/B,OAAO,KAAK,CAAC;IACd,CAAC;IACD,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;AAC9B,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC/B,OAAgB,EAChB,GAAoB;IAEpB,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC/C,OAAO,IAAI,CAAC;IACb,CAAC;IACD,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QACjC,OAAO,gBAAgB,CAAC,OAAO,EAAE;YAChC,GAAG,CAAC,GAAG,KAAK,SAAS;gBACpB,CAAC,CAAC,EAAE,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,CAAC,OAAO,EAAE;gBAC1D,CAAC,CAAC,EAAE,CAAC;SACN,CAAoB,CAAC;IACvB,CAAC;IACD,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QACjC,OAAO,OAA0B,CAAC;IACnC,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql-placeholders.d.ts","sourceRoot":"","sources":["../../src/runtime/mysql-placeholders.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mysql-placeholders.d.ts","sourceRoot":"","sources":["../../src/runtime/mysql-placeholders.ts"],"names":[],"mappings":"AAIA;;;GAGG;AAEH,MAAM,MAAM,cAAc,GAAG;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,EAAE,CAAC;CAChB,CAAC;AAMF,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CAuG3E;AAED,wBAAgB,mBAAmB,CAClC,IAAI,EAAE,cAAc,GAAG,IAAI,EAC3B,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,OAAO,EAAE,GACf;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,CAcpC;AAWD,wBAAgB,2BAA2B,CAC1C,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,OAAO,EAAE,GACf;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,CAMpC"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { compileError } from "./compile-error.js";
|
|
2
|
+
import { QueryErrorCode } from "./error-codes.js";
|
|
1
3
|
import { CappedMap } from "./query/table-index.js";
|
|
2
4
|
const NUMBERED_PLACEHOLDER = /\$\d/;
|
|
3
5
|
const PLAN_CACHE_MAX = 1000;
|
|
@@ -113,7 +115,12 @@ export function applyPositionalPlan(plan, sql, params) {
|
|
|
113
115
|
return { sql, params };
|
|
114
116
|
return {
|
|
115
117
|
sql: plan.sql,
|
|
116
|
-
params: plan.slots.map((index) =>
|
|
118
|
+
params: plan.slots.map((index) => {
|
|
119
|
+
if (index < 1 || index > params.length) {
|
|
120
|
+
compileError(`placeholder $${index} has no bound value (${params.length} params provided)`, { code: QueryErrorCode.invalid_args });
|
|
121
|
+
}
|
|
122
|
+
return params[index - 1] ?? null;
|
|
123
|
+
}),
|
|
117
124
|
};
|
|
118
125
|
}
|
|
119
126
|
function planNumberedToPositionalCached(sql) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql-placeholders.js","sourceRoot":"","sources":["../../src/runtime/mysql-placeholders.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"mysql-placeholders.js","sourceRoot":"","sources":["../../src/runtime/mysql-placeholders.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,5 +29,15 @@ describe("convertNumberedToPositional", () => {
|
|
|
29
29
|
params: ["second", "second"],
|
|
30
30
|
});
|
|
31
31
|
});
|
|
32
|
+
it("throws on out-of-range placeholders instead of binding NULL", () => {
|
|
33
|
+
expect(() => convertNumberedToPositional("SELECT $1, $3", ["a", "b"])).toThrow("placeholder $3 has no bound value (2 params provided)");
|
|
34
|
+
expect(() => convertNumberedToPositional("SELECT $0", ["a"])).toThrow("placeholder $0 has no bound value (1 params provided)");
|
|
35
|
+
});
|
|
36
|
+
it("still coerces in-range undefined to NULL", () => {
|
|
37
|
+
expect(convertNumberedToPositional("SELECT $1", [undefined])).toEqual({
|
|
38
|
+
sql: "SELECT ?",
|
|
39
|
+
params: [null],
|
|
40
|
+
});
|
|
41
|
+
});
|
|
32
42
|
});
|
|
33
43
|
//# sourceMappingURL=mysql-placeholders.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql-placeholders.test.js","sourceRoot":"","sources":["../../src/runtime/mysql-placeholders.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EACN,2BAA2B,EAC3B,wBAAwB,GACxB,MAAM,yBAAyB,CAAC;AAEjC,QAAQ,CAAC,6BAA6B,EAAE,GAAG,EAAE;IAC5C,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;QACjD,MAAM,MAAM,GAAG,2BAA2B,CACzC,oDAAoD,EACpD,CAAC,GAAG,EAAE,GAAG,CAAC,CACV,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CACtB,iDAAiD,CACjD,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QAC1D,MAAM,MAAM,GAAG,2BAA2B,CACzC,wCAAwC,EACxC,CAAC,CAAC,CAAC,CACH,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;QACjE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACrD,MAAM,CAAC,wBAAwB,CAAC,6BAA6B,CAAC,CAAC,CAAC,IAAI,CACnE,IAAI,CACJ,CAAC;QACF,MAAM,CACL,wBAAwB,CACvB,oFAAoF,CACpF,CACD,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACb,MAAM,MAAM,GAAG,2BAA2B,CACzC,6BAA6B,EAC7B,CAAC,GAAG,CAAC,CACL,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;QACvD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;QACtD,MAAM,GAAG,GAAG,yBAAyB,CAAC;QACtC,MAAM,CAAC,2BAA2B,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YAC3D,GAAG,EAAE,uBAAuB;YAC5B,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;SAC1B,CAAC,CAAC;QACH,MAAM,CAAC,2BAA2B,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YAC5D,GAAG,EAAE,uBAAuB;YAC5B,MAAM,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;SAC5B,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"mysql-placeholders.test.js","sourceRoot":"","sources":["../../src/runtime/mysql-placeholders.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggregate.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/aggregate.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EACN,KAAK,kBAAkB,
|
|
1
|
+
{"version":3,"file":"aggregate.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/aggregate.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EACN,KAAK,kBAAkB,EAIvB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,KAAK,YAAY,EAAe,MAAM,cAAc,CAAC;AA8C9D,wBAAgB,iBAAiB,CAChC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,SAAS,EAAE,kBAAkB,GAC3B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAiCzB;AAED,wBAAsB,gBAAgB,CACrC,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE;IACL,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,MAAM,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACrC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;CAC5B,GACC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAoDlC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { postgresDialect } from "../../dialect/postgres.js";
|
|
2
|
-
import {
|
|
2
|
+
import { compileWhere, getCachedAggregateQuery, toCountSelector, } from "./compile.js";
|
|
3
3
|
import { runQueryOne } from "./execute.js";
|
|
4
|
-
import { getTableIndex, requireTable } from "./table-index.js";
|
|
4
|
+
import { countAllSqlFor, getTableIndex, requireTable } from "./table-index.js";
|
|
5
5
|
function coerceAggregateNumber(value) {
|
|
6
6
|
if (value === null || value === undefined)
|
|
7
7
|
return null;
|
|
@@ -77,7 +77,7 @@ export async function aggregateRecords(executor, runtime, tableAccessor, args) {
|
|
|
77
77
|
const table = requireTable(manifest, tableAccessor, "select");
|
|
78
78
|
if (isSimpleStarCount(args)) {
|
|
79
79
|
const tableIndex = getTableIndex(runtime.tableIndex, tableAccessor);
|
|
80
|
-
const query = tableIndex
|
|
80
|
+
const query = countAllSqlFor(tableIndex, table, dialect);
|
|
81
81
|
const row = await runQueryOne(executor, runtime, { operation: "select", tableAccessor }, query, []);
|
|
82
82
|
return { _count: coerceStarCount(row?.c) };
|
|
83
83
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggregate.js","sourceRoot":"","sources":["../../../src/runtime/query/aggregate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,EAEN,
|
|
1
|
+
{"version":3,"file":"aggregate.js","sourceRoot":"","sources":["../../../src/runtime/query/aggregate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compile-aggregate.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/compile-aggregate.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACX,OAAO,EACP,cAAc,EACd,aAAa,EACb,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAGN,KAAK,YAAY,
|
|
1
|
+
{"version":3,"file":"compile-aggregate.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/compile-aggregate.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { compileMysqlFamilyInList } from "../../dialect/mysql-family.js";
|
|
|
2
2
|
import { postgresDialect } from "../../dialect/postgres.js";
|
|
3
3
|
import { isMysqlFamilyDialect } from "../../dialect/resolve.js";
|
|
4
4
|
import { compileError } from "../compile-error.js";
|
|
5
|
-
import { buildSelectColumns, normalizeLimitOffset, } from "./compile-where.js";
|
|
5
|
+
import { buildSelectColumns, normalizeLimitOffset, parseOrderDirection, } from "./compile-where.js";
|
|
6
6
|
import { columnByTsName, getOrSetSqlCache, getTableIndex, requireTsColumn, } from "./table-index.js";
|
|
7
7
|
function countSqlCol(table, tsName, dialect = postgresDialect, manifestIndex) {
|
|
8
8
|
const tableIndex = getTableIndex(manifestIndex, table.accessor);
|
|
@@ -378,7 +378,7 @@ export function compileGroupByOrderBy(table, byKeys, selectors, orderBy, dialect
|
|
|
378
378
|
if (tsKey === "_count") {
|
|
379
379
|
if (typeof direction === "string") {
|
|
380
380
|
requireStarCount(selectors, "orderBy._count");
|
|
381
|
-
const dir = direction
|
|
381
|
+
const dir = parseOrderDirection(direction);
|
|
382
382
|
parts.push(`${countStarExpr()} ${dir}`);
|
|
383
383
|
continue;
|
|
384
384
|
}
|
|
@@ -389,7 +389,7 @@ export function compileGroupByOrderBy(table, byKeys, selectors, orderBy, dialect
|
|
|
389
389
|
if (typeof colDir !== "string")
|
|
390
390
|
continue;
|
|
391
391
|
requireCountMapField(selectors, field, `orderBy._count.${field}`);
|
|
392
|
-
const dir = colDir
|
|
392
|
+
const dir = parseOrderDirection(colDir);
|
|
393
393
|
parts.push(`${countFieldExpr(table, field, manifestIndex, dialect)} ${dir}`);
|
|
394
394
|
}
|
|
395
395
|
continue;
|
|
@@ -409,7 +409,7 @@ export function compileGroupByOrderBy(table, byKeys, selectors, orderBy, dialect
|
|
|
409
409
|
compileError(`orderBy.${key}.${colName} requires ${key}: { ${colName}: true }`);
|
|
410
410
|
}
|
|
411
411
|
const expr = requireFieldAggExpression(key, table, colName, dialect, manifestIndex);
|
|
412
|
-
const dir = colDir
|
|
412
|
+
const dir = parseOrderDirection(colDir);
|
|
413
413
|
parts.push(`${expr} ${dir}`);
|
|
414
414
|
}
|
|
415
415
|
continue;
|
|
@@ -420,7 +420,7 @@ export function compileGroupByOrderBy(table, byKeys, selectors, orderBy, dialect
|
|
|
420
420
|
compileError(`orderBy column "${tsKey}" is not in groupBy by`);
|
|
421
421
|
}
|
|
422
422
|
const col = requireTsColumn(tableIndex, table, tsKey, "groupBy orderBy", "select");
|
|
423
|
-
const dir = direction
|
|
423
|
+
const dir = parseOrderDirection(direction);
|
|
424
424
|
parts.push(`${dialect.quoteIdentifier(col.sqlName)} ${dir}`);
|
|
425
425
|
}
|
|
426
426
|
return parts.length > 0 ? `ORDER BY ${parts.join(", ")}` : "";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compile-aggregate.js","sourceRoot":"","sources":["../../../src/runtime/query/compile-aggregate.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"compile-aggregate.js","sourceRoot":"","sources":["../../../src/runtime/query/compile-aggregate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAMhE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EACN,kBAAkB,EAClB,oBAAoB,EAEpB,mBAAmB,GACnB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACN,cAAc,EACd,gBAAgB,EAChB,aAAa,EAEb,eAAe,GAEf,MAAM,kBAAkB,CAAC;AAY1B,SAAS,WAAW,CACnB,KAAoB,EACpB,MAAc,EACd,OAAO,GAAY,eAAe,EAClC,aAA6B;IAE7B,MAAM,UAAU,GAAG,aAAa,CAAC,aAAa,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IAChE,MAAM,GAAG,GAAG,cAAc,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IACtD,IAAI,CAAC,GAAG;QAAE,OAAO,SAAS,CAAC;IAC3B,OAAO,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,kBAAkB,CACjC,KAAoB,EACpB,MAAc,EACd,aAA6B,EAC7B,OAAO,GAAY,eAAe;IAElC,MAAM,MAAM,GAAG,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;IAClE,IAAI,MAAM,EAAE,CAAC;QACZ,OAAO,MAAM,CAAC;IACf,CAAC;IACD,eAAe,CACd,aAAa,CAAC,aAAa,EAAE,KAAK,CAAC,QAAQ,CAAC,EAC5C,KAAK,EACL,MAAM,EACN,OAAO,EACP,QAAQ,CACR,CAAC;IACF,MAAM,IAAI,KAAK,CAAC,iBAAiB,MAAM,yBAAyB,CAAC,CAAC;AACnE,CAAC;AAED,MAAM,UAAU,iBAAiB,CAChC,MAA+B;IAE/B,MAAM,GAAG,GAAyB,EAAE,CAAC;IACrC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QACnD,IAAI,KAAK,KAAK,IAAI;YAAE,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;IACrC,CAAC;IACD,OAAO,GAAG,CAAC;AACZ,CAAC;AAED,MAAM,UAAU,eAAe,CAC9B,KAAqC;IAErC,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAChC,MAAM,GAAG,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;IACrC,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnC,YAAY,CAAC,oCAAoC,CAAC,CAAC;IACpD,CAAC;IACD,OAAO,GAAG,CAAC;AACZ,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,SAA6B;IACzD,OAAO,CACN,SAAS,CAAC,MAAM,KAAK,IAAI;QACzB,CAAC,OAAO,SAAS,CAAC,MAAM,KAAK,QAAQ,IAAI,SAAS,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC,CACxE,CAAC;AACH,CAAC;AAED,MAAM,UAAU,aAAa,CAC5B,SAA6B,EAC7B,KAAa;IAEb,OAAO,CACN,OAAO,SAAS,CAAC,MAAM,KAAK,QAAQ,IAAI,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,IAAI,CACxE,CAAC;AACH,CAAC;AAED,MAAM,UAAU,eAAe,CAC9B,KAAoB,EACpB,QAAgB,EAChB,OAAO,GAAY,eAAe,EAClC,QAAiB,EACjB,MAA6B,EAC7B,aAA6B;IAE7B,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QAC1B,IAAI,QAAQ,EAAE,CAAC;YACd,YAAY,CAAC,0CAA0C,CAAC,CAAC;QAC1D,CAAC;QACD,MAAM,KAAK,GAAG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;QACtE,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,YAAY,CAAC,0CAA0C,CAAC,CAAC;QAC1D,CAAC;QACD,IAAI,GAAG,GAAG,UAAU,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACvE,IAAI,QAAQ;YAAE,GAAG,IAAI,IAAI,QAAQ,EAAE,CAAC;QACpC,OAAO,GAAG,CAAC;IACZ,CAAC;IAED,IAAI,IAAI,GAAG,UAAU,CAAC;IACtB,IAAI,QAAQ,EAAE,CAAC;QACd,MAAM,MAAM,GAAG,kBAAkB,CAChC,KAAK,EACL,QAAQ,EACR,aAAa,EACb,OAAO,CACP,CAAC;QACF,IAAI,GAAG,kBAAkB,MAAM,GAAG,CAAC;IACpC,CAAC;IACD,IAAI,GAAG,GAAG,UAAU,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,kBAAkB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;IACvF,IAAI,QAAQ;QAAE,GAAG,IAAI,IAAI,QAAQ,EAAE,CAAC;IACpC,OAAO,GAAG,CAAC;AACZ,CAAC;AAED,MAAM,UAAU,kBAAkB,CACjC,KAAoB,EACpB,OAAO,GAAY,eAAe;IAElC,OAAO,6BAA6B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;AAC/D,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC/B,KAAoB,EACpB,MAA4B,EAC5B,OAAO,GAAY,eAAe,EAClC,aAA6B;IAE7B,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;QACjB,KAAK,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;IAC1D,CAAC;IACD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;QAC9C,IAAI,GAAG,KAAK,MAAM;YAAE,SAAS;QAC7B,MAAM,MAAM,GAAG,kBAAkB,CAAC,KAAK,EAAE,GAAG,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QACtE,KAAK,CAAC,IAAI,CACT,GAAG,OAAO,CAAC,SAAS,CAAC,SAAS,MAAM,GAAG,CAAC,OAAO,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,CAC7E,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC;AAED,SAAS,eAAe,CACvB,KAAoB,EACpB,MAAc,EACd,OAAgB,EAChB,aAA6B;IAE7B,MAAM,UAAU,GAAG,aAAa,CAAC,aAAa,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IAChE,MAAM,GAAG,GAAG,cAAc,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IACtD,IAAI,CAAC,GAAG;QAAE,OAAO,SAAS,CAAC;IAC3B,MAAM,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACpD,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS;QAAE,OAAO,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IACjE,OAAO,MAAM,CAAC;AACf,CAAC;AAED,MAAM,cAAc,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAU,CAAC;AAIjE,SAAS,gBAAgB,CAAC,GAAgB;IACzC,QAAQ,GAAG,EAAE,CAAC;QACb,KAAK,MAAM;YACV,OAAO,KAAK,CAAC;QACd,KAAK,MAAM;YACV,OAAO,KAAK,CAAC;QACd,KAAK,MAAM;YACV,OAAO,KAAK,CAAC;QACd,KAAK,MAAM;YACV,OAAO,KAAK,CAAC;QACd,SAAS,CAAC;YACT,MAAM,MAAM,GAAU,GAAG,CAAC;YAC1B,YAAY,CAAC,0BAA0B,MAAM,EAAE,CAAC,CAAC;QAClD,CAAC;IACF,CAAC;AACF,CAAC;AAED,SAAS,kBAAkB,CAC1B,GAAgB,EAChB,KAAoB,EACpB,OAAe,EACf,OAAgB,EAChB,aAA6B;IAE7B,MAAM,MAAM,GAAG,eAAe,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;IACvE,IAAI,CAAC,MAAM;QAAE,OAAO,SAAS,CAAC;IAC9B,OAAO,GAAG,gBAAgB,CAAC,GAAG,CAAC,IAAI,MAAM,GAAG,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,oBAAoB,CACnC,KAAoB,EACpB,SAA6B,EAC7B,OAAO,GAAY,eAAe,EAClC,aAA6B;IAE7B,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,IAAI,SAAS,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;QAC/B,KAAK,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;IAC7D,CAAC;SAAM,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;QAC7B,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;YACxD,IAAI,GAAG,KAAK,MAAM,EAAE,CAAC;gBACpB,KAAK,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC;gBAChE,SAAS;YACV,CAAC;YACD,MAAM,MAAM,GAAG,kBAAkB,CAChC,KAAK,EACL,GAAG,EACH,aAAa,EACb,OAAO,CACP,CAAC;YACF,KAAK,CAAC,IAAI,CACT,GAAG,OAAO,CAAC,SAAS,CAAC,SAAS,MAAM,GAAG,CAAC,gBAAgB,GAAG,GAAG,CAC9D,CAAC;QACH,CAAC;IACF,CAAC;IAED,KAAK,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;QAClC,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;QAChC,IAAI,CAAC,QAAQ;YAAE,SAAS;QACxB,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7C,MAAM,IAAI,GAAG,kBAAkB,CAC9B,GAAG,EACH,KAAK,EACL,OAAO,EACP,OAAO,EACP,aAAa,CACb,CAAC;YACF,IAAI,IAAI;gBAAE,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,QAAQ,GAAG,IAAI,OAAO,GAAG,CAAC,CAAC;QACxD,CAAC;IACF,CAAC;IAED,OAAO,KAAK,CAAC;AACd,CAAC;AAED,MAAM,UAAU,mBAAmB,CAClC,KAAoB,EACpB,SAA6B,EAC7B,QAAgB,EAChB,aAA6B,EAC7B,OAAO,GAAY,eAAe;IAElC,MAAM,KAAK,GAAG,oBAAoB,CACjC,KAAK,EACL,SAAS,EACT,OAAO,EACP,aAAa,CACb,CAAC;IAEF,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,YAAY,CAAC,0CAA0C,CAAC,CAAC;IAC1D,CAAC;IAED,IAAI,GAAG,GAAG,UAAU,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;IACvE,IAAI,QAAQ;QAAE,GAAG,IAAI,IAAI,QAAQ,EAAE,CAAC;IACpC,OAAO,GAAG,CAAC;AACZ,CAAC;AAED,MAAM,UAAU,yBAAyB,CACxC,SAA6B;IAE7B,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,SAAS,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;QAC/B,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACtB,CAAC;SAAM,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;QAC7B,KAAK,CAAC,IAAI,CAAC,UAAU,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACxE,CAAC;IACD,KAAK,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAU,EAAE,CAAC;QAC7D,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;QAChC,IAAI,CAAC,QAAQ;YAAE,SAAS;QACxB,KAAK,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChE,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,uBAAuB,CACtC,UAAkC,EAClC,KAAoB,EACpB,SAA6B,EAC7B,QAAgB,EAChB,aAA6B,EAC7B,OAAO,GAAY,eAAe;IAElC,MAAM,QAAQ,GAAG,GAAG,OAAO,CAAC,IAAI,IAAI,yBAAyB,CAAC,SAAS,CAAC,IAAI,QAAQ,EAAE,CAAC;IACvF,IAAI,CAAC,UAAU,EAAE,CAAC;QACjB,OAAO,mBAAmB,CACzB,KAAK,EACL,SAAS,EACT,QAAQ,EACR,aAAa,EACb,OAAO,CACP,CAAC;IACH,CAAC;IACD,OAAO,gBAAgB,CAAC,UAAU,CAAC,sBAAsB,EAAE,QAAQ,EAAE,GAAG,EAAE,CACzE,mBAAmB,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,OAAO,CAAC,CACvE,CAAC;AACH,CAAC;AAYD,SAAS,gBAAgB,CAAC,EAAU;IACnC,OAAO,CACN,EAAE,KAAK,QAAQ;QACf,EAAE,KAAK,IAAI;QACX,EAAE,KAAK,KAAK;QACZ,EAAE,KAAK,IAAI;QACX,EAAE,KAAK,KAAK;QACZ,EAAE,KAAK,IAAI;QACX,EAAE,KAAK,OAAO,CACd,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CACxB,SAA6B,EAC7B,OAAe;IAEf,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,CAAC;QAC9B,YAAY,CACX,GAAG,OAAO,kDAAkD,CAC5D,CAAC;IACH,CAAC;AACF,CAAC;AAED,SAAS,oBAAoB,CAC5B,SAA6B,EAC7B,KAAa,EACb,OAAe;IAEf,IAAI,KAAK,KAAK,MAAM,EAAE,CAAC;QACtB,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACrC,OAAO;IACR,CAAC;IACD,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC;QACtC,YAAY,CAAC,GAAG,OAAO,uBAAuB,KAAK,UAAU,CAAC,CAAC;IAChE,CAAC;AACF,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAsC;IAC/D,IAAI,OAAO,IAAI,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IAC1C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/B,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC;AACnD,CAAC;AAED,SAAS,kBAAkB,CAAC,IAA6B;IACxD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/B,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC;IACzD,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC;IAC7D,OAAO,MAAM,IAAI,SAAS,CAAC;AAC5B,CAAC;AAED,SAAS,aAAa;IACrB,OAAO,UAAU,CAAC;AACnB,CAAC;AAED,SAAS,cAAc,CACtB,KAAoB,EACpB,KAAa,EACb,aAAwC,EACxC,OAAO,GAAY,eAAe;IAElC,IAAI,KAAK,KAAK,MAAM;QAAE,OAAO,aAAa,EAAE,CAAC;IAC7C,OAAO,SAAS,kBAAkB,CAAC,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC;AAC7E,CAAC;AAED,SAAS,uBAAuB,CAC/B,SAA6B,EAC7B,GAAgB,EAChB,OAAe;IAEf,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;QAChC,YAAY,CACX,UAAU,GAAG,IAAI,OAAO,aAAa,GAAG,OAAO,OAAO,UAAU,CAChE,CAAC;IACH,CAAC;AACF,CAAC;AAED,SAAS,oBAAoB,CAC5B,IAAY,EACZ,IAAsC,EACtC,OAAgB,EAChB,UAAkB;IAOlB,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,MAAM,MAAM,GAAc,EAAE,CAAC;IAC7B,IAAI,cAAc,GAAG,UAAU,CAAC;IAChC,IAAI,UAAU,GAAG,KAAK,CAAC;IAEvB,MAAM,GAAG,GACR,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAEpD,KAAK,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QAC/C,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,EAAE,CAAC;YAC3B,YAAY,CAAC,gCAAgC,EAAE,EAAE,CAAC,CAAC;QACpD,CAAC;QACD,QAAQ,EAAE,EAAE,CAAC;YACZ,KAAK,IAAI,CAAC;YACV,KAAK,OAAO,EAAE,CAAC;gBACd,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBAChD,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;wBACjB,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;wBACvB,UAAU,GAAG,IAAI,CAAC;oBACnB,CAAC;yBAAM,CAAC;wBACP,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBACxB,CAAC;oBACD,MAAM;gBACP,CAAC;gBACD,IAAI,oBAAoB,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC3D,MAAM,QAAQ,GAAG,wBAAwB,CACxC,OAAO,EACP,IAAI,EACJ,KAAK,EACL,cAAc,EACd,EAAE,KAAK,OAAO,CACd,CAAC;oBACF,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;oBAC9B,MAAM,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;oBAChC,cAAc,GAAG,QAAQ,CAAC,cAAc,CAAC;oBACzC,MAAM;gBACP,CAAC;gBACD,UAAU,CAAC,IAAI,CACd,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,cAAc,CAAC,CAChD,CAAC;gBACF,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACnB,cAAc,EAAE,CAAC;gBACjB,MAAM;YACP,CAAC;YACD,KAAK,QAAQ,CAAC;YACd,KAAK,IAAI,CAAC;YACV,KAAK,KAAK,CAAC;YACX,KAAK,IAAI,CAAC;YACV,KAAK,KAAK,EAAE,CAAC;gBACZ,UAAU,CAAC,IAAI,CACd,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,cAAc,CAAC,CAChD,CAAC;gBACF,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACnB,cAAc,EAAE,CAAC;gBACjB,MAAM;YACP,CAAC;YACD,SAAS,CAAC;gBACT,MAAM,MAAM,GAAU,EAAE,CAAC;gBACzB,YAAY,CAAC,gCAAgC,MAAM,EAAE,CAAC,CAAC;YACxD,CAAC;QACF,CAAC;IACF,CAAC;IAED,OAAO;QACN,GAAG,EAAE,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC;QAC7B,MAAM;QACN,cAAc;QACd,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC3C,CAAC;AACH,CAAC;AAED,SAAS,yBAAyB,CACjC,GAAgB,EAChB,KAAoB,EACpB,OAAe,EACf,OAAgB,EAChB,aAA6B;IAE7B,MAAM,IAAI,GAAG,kBAAkB,CAC9B,GAAG,EACH,KAAK,EACL,OAAO,EACP,OAAO,EACP,aAAa,CACb,CAAC;IACF,IAAI,IAAI,EAAE,CAAC;QACV,OAAO,IAAI,CAAC;IACb,CAAC;IACD,eAAe,CACd,aAAa,CAAC,aAAa,EAAE,KAAK,CAAC,QAAQ,CAAC,EAC5C,KAAK,EACL,OAAO,EACP,aAAa,GAAG,EAAE,EAClB,QAAQ,CACR,CAAC;IACF,MAAM,IAAI,KAAK,CACd,6BAA6B,OAAO,yBAAyB,CAC7D,CAAC;AACH,CAAC;AAED,MAAM,UAAU,aAAa,CAC5B,KAAoB,EACpB,SAA6B,EAC7B,MAA+B,EAC/B,OAAgB,EAChB,eAAe,GAAG,CAAC,EACnB,aAA6B;IAE7B,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACjD,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;IAChC,CAAC;IAED,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACvC,IACC,GAAG,KAAK,QAAQ;YAChB,GAAG,KAAK,MAAM;YACd,GAAG,KAAK,MAAM;YACd,GAAG,KAAK,MAAM;YACd,GAAG,KAAK,MAAM,EACb,CAAC;YACF,YAAY,CAAC,2BAA2B,GAAG,EAAE,CAAC,CAAC;QAChD,CAAC;IACF,CAAC;IAED,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,MAAM,MAAM,GAAc,EAAE,CAAC;IAC7B,IAAI,UAAU,GAAG,eAAe,CAAC;IACjC,IAAI,UAAU,GAAG,KAAK,CAAC;IAEvB,MAAM,WAAW,GAAG,CACnB,IAAY,EACZ,IAAsC,EAC/B,EAAE;QACT,MAAM,QAAQ,GAAG,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;QACvE,IAAI,QAAQ,CAAC,GAAG;YAAE,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAChD,MAAM,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;QAChC,UAAU,GAAG,QAAQ,CAAC,cAAc,CAAC;QACrC,IAAI,QAAQ,CAAC,UAAU;YAAE,UAAU,GAAG,IAAI,CAAC;IAC5C,CAAC,CAAC;IAEF,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QACjC,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC;QAC3B,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC9B,gBAAgB,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;YAC7C,WAAW,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,CAAC;QACpC,CAAC;aAAM,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YACtD,IAAI,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC9B,YAAY,CACX,+DAA+D,CAC/D,CAAC;YACH,CAAC;YACD,IAAI,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC5B,gBAAgB,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;gBAC7C,WAAW,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,CAAC;YACpC,CAAC;iBAAM,CAAC;gBACP,KAAK,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;oBACvD,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;wBACnC,oBAAoB,CACnB,SAAS,EACT,KAAK,EACL,iBAAiB,KAAK,EAAE,CACxB,CAAC;wBACF,WAAW,CACV,cAAc,CACb,KAAK,EACL,KAAK,EACL,aAAa,EACb,OAAO,CACP,EACD,SAAS,CACT,CAAC;wBACF,SAAS;oBACV,CAAC;oBACD,IAAI,OAAO,SAAS,KAAK,QAAQ,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;wBACzD,YAAY,CACX,yBAAyB,KAAK,YAAY,CAC1C,CAAC;oBACH,CAAC;oBACD,oBAAoB,CACnB,SAAS,EACT,KAAK,EACL,iBAAiB,KAAK,EAAE,CACxB,CAAC;oBACF,WAAW,CACV,cAAc,CAAC,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,OAAO,CAAC,EACpD,SAAoC,CACpC,CAAC;gBACH,CAAC;YACF,CAAC;QACF,CAAC;IACF,CAAC;IAED,KAAK,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;QAClC,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,CAAC,QAAQ;YAAE,SAAS;QACxB,KAAK,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YACxD,uBAAuB,CAAC,SAAS,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;YACjD,IACC,OAAO,IAAI,KAAK,QAAQ;gBACxB,CAAC,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,CAAC,EAC1C,CAAC;gBACF,YAAY,CAAC,kBAAkB,GAAG,IAAI,OAAO,YAAY,CAAC,CAAC;YAC5D,CAAC;YACD,MAAM,IAAI,GAAG,yBAAyB,CACrC,GAAG,EACH,KAAK,EACL,OAAO,EACP,OAAO,EACP,aAAa,CACb,CAAC;YACF,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACzB,CAAC;IACF,CAAC;IAED,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;IAC5D,OAAO;QACN,GAAG,EAAE,UAAU,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;QACzC,MAAM;QACN,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC3C,CAAC;AACH,CAAC;AAED,MAAM,UAAU,qBAAqB,CACpC,KAAoB,EACpB,MAAyB,EACzB,SAA6B,EAC7B,OAAiC,EACjC,OAAO,GAAY,eAAe,EAClC,aAA6B;IAE7B,IAAI,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAE7D,MAAM,UAAU,GAAG,aAAa,CAAC,aAAa,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IAChE,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;IAC9B,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,KAAK,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAC1D,IAAI,KAAK,KAAK,QAAQ,EAAE,CAAC;YACxB,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;gBACnC,gBAAgB,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;gBAC9C,MAAM,GAAG,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC;gBAC3C,KAAK,CAAC,IAAI,CAAC,GAAG,aAAa,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;gBACxC,SAAS;YACV,CAAC;YACD,IAAI,OAAO,SAAS,KAAK,QAAQ,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;gBACzD,YAAY,CACX,uDAAuD,CACvD,CAAC;YACH,CAAC;YACD,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;gBACzD,IAAI,OAAO,MAAM,KAAK,QAAQ;oBAAE,SAAS;gBACzC,oBAAoB,CACnB,SAAS,EACT,KAAK,EACL,kBAAkB,KAAK,EAAE,CACzB,CAAC;gBACF,MAAM,GAAG,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;gBACxC,KAAK,CAAC,IAAI,CACT,GAAG,cAAc,CAAC,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,OAAO,CAAC,IAAI,GAAG,EAAE,CAChE,CAAC;YACH,CAAC;YACD,SAAS;QACV,CAAC;QAED,IACC,KAAK,KAAK,MAAM;YAChB,KAAK,KAAK,MAAM;YAChB,KAAK,KAAK,MAAM;YAChB,KAAK,KAAK,MAAM,EACf,CAAC;YACF,MAAM,GAAG,GAAG,KAAK,CAAC;YAClB,IAAI,OAAO,SAAS,KAAK,QAAQ,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;gBACzD,YAAY,CAAC,WAAW,GAAG,uBAAuB,CAAC,CAAC;YACrD,CAAC;YACD,KAAK,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC3D,IAAI,OAAO,MAAM,KAAK,QAAQ;oBAAE,SAAS;gBACzC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;oBAChC,YAAY,CACX,WAAW,GAAG,IAAI,OAAO,aAAa,GAAG,OAAO,OAAO,UAAU,CACjE,CAAC;gBACH,CAAC;gBACD,MAAM,IAAI,GAAG,yBAAyB,CACrC,GAAG,EACH,KAAK,EACL,OAAO,EACP,OAAO,EACP,aAAa,CACb,CAAC;gBACF,MAAM,GAAG,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;gBACxC,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,GAAG,EAAE,CAAC,CAAC;YAC9B,CAAC;YACD,SAAS;QACV,CAAC;QAED,IAAI,OAAO,SAAS,KAAK,QAAQ;YAAE,SAAS;QAC5C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YACvB,YAAY,CAAC,mBAAmB,KAAK,wBAAwB,CAAC,CAAC;QAChE,CAAC;QACD,MAAM,GAAG,GAAG,eAAe,CAC1B,UAAU,EACV,KAAK,EACL,KAAK,EACL,iBAAiB,EACjB,QAAQ,CACR,CAAC;QACF,MAAM,GAAG,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC;QAC3C,KAAK,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AAC/D,CAAC;AAED,MAAM,UAAU,qBAAqB,CACpC,KAAoB,EACpB,MAAyB,EACzB,aAA6B;IAE7B,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,YAAY,CAAC,sCAAsC,CAAC,CAAC;IACtD,CAAC;IACD,MAAM,UAAU,GAAG,aAAa,CAAC,aAAa,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IAChE,MAAM,IAAI,GAAqB,EAAE,CAAC;IAClC,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;QAC1B,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;IACzE,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC;AAED,MAAM,UAAU,iBAAiB,CAChC,KAAoB,EACpB,MAAyB,EACzB,SAA6B,EAC7B,QAAgB,EAChB,SAAiB,EACjB,QAAgB,EAChB,IAAa,EACb,IAAa,EACb,aAA6B,EAC7B,OAAO,GAAY,eAAe;IAElC,MAAM,MAAM,GAAG,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;IACnE,MAAM,QAAQ,GAAG,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;IAClE,MAAM,QAAQ,GAAG,oBAAoB,CACpC,KAAK,EACL,SAAS,EACT,OAAO,EACP,aAAa,CACb,CAAC;IACF,MAAM,UAAU,GACf,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,KAAK,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;IACxE,MAAM,SAAS,GAAG,MAAM;SACtB,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;SAClD,IAAI,CAAC,IAAI,CAAC,CAAC;IAEb,IAAI,GAAG,GAAG,UAAU,UAAU,SAAS,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;IACjE,IAAI,QAAQ;QAAE,GAAG,IAAI,IAAI,QAAQ,EAAE,CAAC;IACpC,GAAG,IAAI,aAAa,SAAS,EAAE,CAAC;IAChC,IAAI,SAAS;QAAE,GAAG,IAAI,IAAI,SAAS,EAAE,CAAC;IACtC,IAAI,QAAQ;QAAE,GAAG,IAAI,IAAI,QAAQ,EAAE,CAAC;IACpC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACxB,GAAG,IAAI,UAAU,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC;IACvD,CAAC;IACD,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACxB,GAAG,IAAI,WAAW,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC;IACxD,CAAC;IACD,OAAO,GAAG,CAAC;AACZ,CAAC;AAED,MAAM,UAAU,qBAAqB,CACpC,UAAkC,EAClC,KAAoB,EACpB,MAAyB,EACzB,SAA6B,EAC7B,QAAgB,EAChB,SAAiB,EACjB,QAAgB,EAChB,IAAa,EACb,IAAa,EACb,aAA6B,EAC7B,OAAO,GAAY,eAAe;IAElC,MAAM,QAAQ,GAAG,GAAG,OAAO,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,yBAAyB,CAAC,SAAS,CAAC,IAAI,QAAQ,IAAI,SAAS,IAAI,QAAQ,IAAI,IAAI,IAAI,EAAE,IAAI,IAAI,IAAI,EAAE,EAAE,CAAC;IAChK,IAAI,CAAC,UAAU,EAAE,CAAC;QACjB,OAAO,iBAAiB,CACvB,KAAK,EACL,MAAM,EACN,SAAS,EACT,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,IAAI,EACJ,IAAI,EACJ,aAAa,EACb,OAAO,CACP,CAAC;IACH,CAAC;IACD,OAAO,gBAAgB,CAAC,UAAU,CAAC,qBAAqB,EAAE,QAAQ,EAAE,GAAG,EAAE,CACxE,iBAAiB,CAChB,KAAK,EACL,MAAM,EACN,SAAS,EACT,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,IAAI,EACJ,IAAI,EACJ,aAAa,EACb,OAAO,CACP,CACD,CAAC;AACH,CAAC"}
|
|
@@ -16,8 +16,25 @@ export declare function orderByShapeKey(orderBy: OrderByInput | undefined, table
|
|
|
16
16
|
export declare function getCachedOrderByClause(table: ManifestTable, orderBy: OrderByInput | undefined, tableAlias?: string, manifestIndex?: ManifestIndex, dialect?: Dialect): string;
|
|
17
17
|
export declare function isImpossibleWhereSql(sql: string): boolean;
|
|
18
18
|
export declare function isImpossibleWhere(whereSql: string): boolean;
|
|
19
|
+
/**
|
|
20
|
+
* Fail-loud orderBy direction parsing shared by every orderBy compiler.
|
|
21
|
+
* Mirrors sqlOrderDirection in sql/builder.ts: anything but asc/desc
|
|
22
|
+
* (any casing) is a user error, never silently coerced to ASC.
|
|
23
|
+
*/
|
|
24
|
+
export declare function parseOrderDirection(direction: string): "ASC" | "DESC";
|
|
19
25
|
export declare function compileOrderBy(table: ManifestTable, orderBy: OrderByInput | undefined, tableAlias?: string, manifestIndex?: ManifestIndex, dialect?: Dialect): string;
|
|
20
26
|
export declare function normalizeSelectColumns(select?: readonly string[] | Record<string, boolean | undefined>): readonly string[] | undefined;
|
|
27
|
+
export type RelationSelectSpec = {
|
|
28
|
+
select?: readonly string[] | Record<string, boolean | undefined>;
|
|
29
|
+
omit?: readonly string[] | Record<string, boolean | undefined>;
|
|
30
|
+
includeHidden?: boolean;
|
|
31
|
+
};
|
|
32
|
+
/**
|
|
33
|
+
* Resolve nested-relation select keys honoring both select and omit,
|
|
34
|
+
* mirroring the top-level projection errors. Returns undefined for
|
|
35
|
+
* "all columns".
|
|
36
|
+
*/
|
|
37
|
+
export declare function resolveRelationSelectKeys(table: ManifestTable, spec: RelationSelectSpec | undefined, tableIndex?: TableIndex): readonly string[] | undefined;
|
|
21
38
|
/** Columns returned by default SELECT (omits `.hidden()` unless `includeHidden` or explicitly selected). */
|
|
22
39
|
export declare function columnsForOutput(tableIndex: TableIndex | undefined, table: ManifestTable, select?: readonly string[], includeHidden?: boolean): ManifestColumn[];
|
|
23
40
|
export declare function buildSelectColumns(table: ManifestTable, select?: readonly string[], manifestIndex?: ManifestIndex, includeHidden?: boolean, tableAlias?: string, dialect?: Dialect): string;
|