neoorm 0.7.3 → 0.8.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 +4 -4
- package/dist/bin/neoorm.js +36 -27
- package/dist/bin/neoorm.js.map +1 -1
- package/dist/codegen/diff-manifest.d.ts.map +1 -1
- package/dist/codegen/diff-manifest.js +55 -30
- package/dist/codegen/diff-manifest.js.map +1 -1
- package/dist/codegen/emit-includes.d.ts.map +1 -1
- package/dist/codegen/emit-includes.js +6 -6
- package/dist/codegen/emit-includes.js.map +1 -1
- package/dist/codegen/emit-models.d.ts.map +1 -1
- package/dist/codegen/emit-models.js +14 -14
- package/dist/codegen/emit-models.js.map +1 -1
- package/dist/codegen/generate.d.ts +11 -1
- package/dist/codegen/generate.d.ts.map +1 -1
- package/dist/codegen/generate.js +30 -11
- package/dist/codegen/generate.js.map +1 -1
- package/dist/codegen/manifest-relations.d.ts +2 -1
- package/dist/codegen/manifest-relations.d.ts.map +1 -1
- package/dist/codegen/manifest-relations.js +4 -27
- package/dist/codegen/manifest-relations.js.map +1 -1
- package/dist/codegen/schema-to-manifest.d.ts +3 -2
- package/dist/codegen/schema-to-manifest.d.ts.map +1 -1
- package/dist/codegen/schema-to-manifest.js +9 -38
- package/dist/codegen/schema-to-manifest.js.map +1 -1
- package/dist/config.d.ts +6 -2
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +21 -13
- package/dist/config.js.map +1 -1
- package/dist/datasource-provider.d.ts +7 -0
- package/dist/datasource-provider.d.ts.map +1 -0
- package/dist/datasource-provider.js +11 -0
- package/dist/datasource-provider.js.map +1 -0
- package/dist/dialect/fk.d.ts.map +1 -1
- package/dist/dialect/fk.js +4 -2
- package/dist/dialect/fk.js.map +1 -1
- package/dist/dialect/postgres.d.ts.map +1 -1
- package/dist/dialect/postgres.js +11 -15
- package/dist/dialect/postgres.js.map +1 -1
- package/dist/dialect/shared.d.ts +3 -1
- package/dist/dialect/shared.d.ts.map +1 -1
- package/dist/dialect/shared.js +4 -0
- package/dist/dialect/shared.js.map +1 -1
- package/dist/dialect/sqlite.d.ts.map +1 -1
- package/dist/dialect/sqlite.js +15 -18
- package/dist/dialect/sqlite.js.map +1 -1
- package/dist/dialect/sqlite.test.d.ts +2 -0
- package/dist/dialect/sqlite.test.d.ts.map +1 -0
- package/dist/dialect/sqlite.test.js +122 -0
- package/dist/dialect/sqlite.test.js.map +1 -0
- package/dist/dialect/types.d.ts +2 -1
- package/dist/dialect/types.d.ts.map +1 -1
- package/dist/docs/render.d.ts.map +1 -1
- package/dist/docs/render.js.map +1 -1
- package/dist/docs/search.d.ts.map +1 -1
- package/dist/docs/search.js +4 -4
- package/dist/docs/search.js.map +1 -1
- package/dist/docs/server.d.ts.map +1 -1
- package/dist/docs/server.js +3 -3
- package/dist/docs/server.js.map +1 -1
- package/dist/index.d.ts +12 -10
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -4
- package/dist/index.js.map +1 -1
- package/dist/init/scaffold.d.ts.map +1 -1
- package/dist/init/scaffold.js +3 -1
- package/dist/init/scaffold.js.map +1 -1
- package/dist/introspect/pull.d.ts.map +1 -1
- package/dist/introspect/pull.js +209 -154
- package/dist/introspect/pull.js.map +1 -1
- package/dist/introspect/queries.d.ts +6 -0
- package/dist/introspect/queries.d.ts.map +1 -1
- package/dist/introspect/queries.js +19 -0
- package/dist/introspect/queries.js.map +1 -1
- package/dist/introspect/sqlite/to-manifest.d.ts.map +1 -1
- package/dist/introspect/sqlite/to-manifest.js +6 -9
- package/dist/introspect/sqlite/to-manifest.js.map +1 -1
- package/dist/introspect/to-manifest.d.ts +8 -1
- package/dist/introspect/to-manifest.d.ts.map +1 -1
- package/dist/introspect/to-manifest.js +96 -21
- package/dist/introspect/to-manifest.js.map +1 -1
- package/dist/migrate/runner.d.ts +16 -0
- package/dist/migrate/runner.d.ts.map +1 -1
- package/dist/migrate/runner.js +147 -24
- package/dist/migrate/runner.js.map +1 -1
- package/dist/plugins/builtin.d.ts.map +1 -1
- package/dist/plugins/builtin.js +15 -16
- package/dist/plugins/builtin.js.map +1 -1
- package/dist/plugins/json/operators.d.ts.map +1 -1
- package/dist/plugins/json/operators.js +100 -27
- package/dist/plugins/json/operators.js.map +1 -1
- package/dist/plugins/postgis/columns.d.ts +18 -4
- package/dist/plugins/postgis/columns.d.ts.map +1 -1
- package/dist/plugins/postgis/columns.js +69 -10
- package/dist/plugins/postgis/columns.js.map +1 -1
- package/dist/plugins/postgis/columns.test.d.ts +2 -0
- package/dist/plugins/postgis/columns.test.d.ts.map +1 -0
- package/dist/plugins/postgis/columns.test.js +67 -0
- package/dist/plugins/postgis/columns.test.js.map +1 -0
- package/dist/plugins/postgis/index.d.ts +4 -2
- package/dist/plugins/postgis/index.d.ts.map +1 -1
- package/dist/plugins/postgis/index.js +2 -1
- package/dist/plugins/postgis/index.js.map +1 -1
- package/dist/plugins/postgis/where-types.d.ts +18 -0
- package/dist/plugins/postgis/where-types.d.ts.map +1 -0
- package/dist/plugins/postgis/where-types.js +2 -0
- package/dist/plugins/postgis/where-types.js.map +1 -0
- package/dist/plugins/registry.d.ts.map +1 -1
- package/dist/plugins/registry.js +20 -5
- package/dist/plugins/registry.js.map +1 -1
- package/dist/plugins/types.d.ts +1 -1
- package/dist/plugins/types.d.ts.map +1 -1
- package/dist/runtime/client.d.ts +60 -11
- package/dist/runtime/client.d.ts.map +1 -1
- package/dist/runtime/client.js +85 -39
- package/dist/runtime/client.js.map +1 -1
- package/dist/runtime/client.test.d.ts +2 -0
- package/dist/runtime/client.test.d.ts.map +1 -0
- package/dist/runtime/client.test.js +170 -0
- package/dist/runtime/client.test.js.map +1 -0
- package/dist/runtime/compile-error.d.ts +14 -0
- package/dist/runtime/compile-error.d.ts.map +1 -0
- package/dist/runtime/compile-error.js +14 -0
- package/dist/runtime/compile-error.js.map +1 -0
- package/dist/runtime/driver-sqlite.test.d.ts +2 -0
- package/dist/runtime/driver-sqlite.test.d.ts.map +1 -0
- package/dist/runtime/driver-sqlite.test.js +195 -0
- package/dist/runtime/driver-sqlite.test.js.map +1 -0
- package/dist/runtime/driver.d.ts +16 -1
- package/dist/runtime/driver.d.ts.map +1 -1
- package/dist/runtime/driver.js +118 -96
- package/dist/runtime/driver.js.map +1 -1
- package/dist/runtime/error-builders.d.ts +7 -6
- package/dist/runtime/error-builders.d.ts.map +1 -1
- package/dist/runtime/error-builders.js +2 -2
- package/dist/runtime/error-builders.js.map +1 -1
- package/dist/runtime/error-codes.d.ts +50 -0
- package/dist/runtime/error-codes.d.ts.map +1 -0
- package/dist/runtime/error-codes.js +54 -0
- package/dist/runtime/error-codes.js.map +1 -0
- package/dist/runtime/error-hints.d.ts +1 -0
- package/dist/runtime/error-hints.d.ts.map +1 -1
- package/dist/runtime/error-hints.js +13 -1
- package/dist/runtime/error-hints.js.map +1 -1
- package/dist/runtime/errors.d.ts +55 -8
- package/dist/runtime/errors.d.ts.map +1 -1
- package/dist/runtime/errors.js +143 -12
- package/dist/runtime/errors.js.map +1 -1
- package/dist/runtime/errors.test.d.ts +2 -0
- package/dist/runtime/errors.test.d.ts.map +1 -0
- package/dist/runtime/errors.test.js +115 -0
- package/dist/runtime/errors.test.js.map +1 -0
- package/dist/runtime/executor.d.ts +22 -3
- package/dist/runtime/executor.d.ts.map +1 -1
- package/dist/runtime/executor.js +93 -39
- package/dist/runtime/executor.js.map +1 -1
- package/dist/runtime/parse-db-json.d.ts +8 -0
- package/dist/runtime/parse-db-json.d.ts.map +1 -0
- package/dist/runtime/parse-db-json.js +33 -0
- package/dist/runtime/parse-db-json.js.map +1 -0
- package/dist/runtime/pg-error.d.ts.map +1 -1
- package/dist/runtime/pg-error.js +16 -16
- package/dist/runtime/pg-error.js.map +1 -1
- package/dist/runtime/pg-rollback.test.d.ts +2 -0
- package/dist/runtime/pg-rollback.test.d.ts.map +1 -0
- package/dist/runtime/pg-rollback.test.js +39 -0
- package/dist/runtime/pg-rollback.test.js.map +1 -0
- package/dist/runtime/query/aggregate.d.ts.map +1 -1
- package/dist/runtime/query/aggregate.js +15 -4
- package/dist/runtime/query/aggregate.js.map +1 -1
- package/dist/runtime/query/compile-aggregate.d.ts +39 -0
- package/dist/runtime/query/compile-aggregate.d.ts.map +1 -0
- package/dist/runtime/query/compile-aggregate.js +456 -0
- package/dist/runtime/query/compile-aggregate.js.map +1 -0
- package/dist/runtime/query/compile-where.d.ts +32 -0
- package/dist/runtime/query/compile-where.d.ts.map +1 -0
- package/dist/runtime/query/compile-where.js +708 -0
- package/dist/runtime/query/compile-where.js.map +1 -0
- package/dist/runtime/query/compile-write.d.ts +53 -0
- package/dist/runtime/query/compile-write.d.ts.map +1 -0
- package/dist/runtime/query/compile-write.js +467 -0
- package/dist/runtime/query/compile-write.js.map +1 -0
- package/dist/runtime/query/compile.d.ts +3 -114
- package/dist/runtime/query/compile.d.ts.map +1 -1
- package/dist/runtime/query/compile.js +3 -1536
- package/dist/runtime/query/compile.js.map +1 -1
- package/dist/runtime/query/count.d.ts +1 -0
- package/dist/runtime/query/count.d.ts.map +1 -1
- package/dist/runtime/query/count.js +12 -14
- package/dist/runtime/query/count.js.map +1 -1
- package/dist/runtime/query/create.d.ts.map +1 -1
- package/dist/runtime/query/create.js +20 -49
- package/dist/runtime/query/create.js.map +1 -1
- package/dist/runtime/query/cursor-codec.d.ts.map +1 -1
- package/dist/runtime/query/cursor-codec.js +8 -2
- package/dist/runtime/query/cursor-codec.js.map +1 -1
- package/dist/runtime/query/cursor.d.ts.map +1 -1
- package/dist/runtime/query/cursor.js +31 -7
- package/dist/runtime/query/cursor.js.map +1 -1
- package/dist/runtime/query/delete.d.ts.map +1 -1
- package/dist/runtime/query/delete.js +17 -17
- package/dist/runtime/query/delete.js.map +1 -1
- package/dist/runtime/query/execute.d.ts.map +1 -1
- package/dist/runtime/query/execute.js +11 -12
- package/dist/runtime/query/execute.js.map +1 -1
- package/dist/runtime/query/find-or-create.d.ts +4 -2
- package/dist/runtime/query/find-or-create.d.ts.map +1 -1
- package/dist/runtime/query/find-or-create.js +53 -43
- package/dist/runtime/query/find-or-create.js.map +1 -1
- package/dist/runtime/query/find-or-create.test.d.ts +2 -0
- package/dist/runtime/query/find-or-create.test.d.ts.map +1 -0
- package/dist/runtime/query/find-or-create.test.js +189 -0
- package/dist/runtime/query/find-or-create.test.js.map +1 -0
- package/dist/runtime/query/find.d.ts.map +1 -1
- package/dist/runtime/query/find.js +86 -58
- package/dist/runtime/query/find.js.map +1 -1
- package/dist/runtime/query/group-by.d.ts.map +1 -1
- package/dist/runtime/query/group-by.js +3 -2
- package/dist/runtime/query/group-by.js.map +1 -1
- package/dist/runtime/query/manifest-lookup.d.ts.map +1 -1
- package/dist/runtime/query/manifest-lookup.js +1 -1
- package/dist/runtime/query/manifest-lookup.js.map +1 -1
- package/dist/runtime/query/map-row.d.ts.map +1 -1
- package/dist/runtime/query/map-row.js +1 -1
- package/dist/runtime/query/map-row.js.map +1 -1
- package/dist/runtime/query/paginate.d.ts +3 -0
- package/dist/runtime/query/paginate.d.ts.map +1 -1
- package/dist/runtime/query/paginate.js +49 -11
- package/dist/runtime/query/paginate.js.map +1 -1
- package/dist/runtime/query/primary-key.d.ts +1 -1
- package/dist/runtime/query/primary-key.d.ts.map +1 -1
- package/dist/runtime/query/primary-key.js +45 -8
- package/dist/runtime/query/primary-key.js.map +1 -1
- package/dist/runtime/query/projection.d.ts +1 -0
- package/dist/runtime/query/projection.d.ts.map +1 -1
- package/dist/runtime/query/projection.js +23 -7
- package/dist/runtime/query/projection.js.map +1 -1
- package/dist/runtime/query/relation-planner.d.ts.map +1 -1
- package/dist/runtime/query/relation-planner.js +82 -53
- package/dist/runtime/query/relation-planner.js.map +1 -1
- package/dist/runtime/query/relation-writes.d.ts +3 -1
- package/dist/runtime/query/relation-writes.d.ts.map +1 -1
- package/dist/runtime/query/relation-writes.js +145 -54
- package/dist/runtime/query/relation-writes.js.map +1 -1
- package/dist/runtime/query/serialize-dialect.test.d.ts +2 -0
- package/dist/runtime/query/serialize-dialect.test.d.ts.map +1 -0
- package/dist/runtime/query/serialize-dialect.test.js +79 -0
- package/dist/runtime/query/serialize-dialect.test.js.map +1 -0
- package/dist/runtime/query/sqlite-constraint-errors.test.d.ts +2 -0
- package/dist/runtime/query/sqlite-constraint-errors.test.d.ts.map +1 -0
- package/dist/runtime/query/sqlite-constraint-errors.test.js +60 -0
- package/dist/runtime/query/sqlite-constraint-errors.test.js.map +1 -0
- package/dist/runtime/query/strip.d.ts.map +1 -1
- package/dist/runtime/query/strip.js.map +1 -1
- package/dist/runtime/query/table-index.d.ts.map +1 -1
- package/dist/runtime/query/table-index.js +4 -3
- package/dist/runtime/query/table-index.js.map +1 -1
- package/dist/runtime/query/unique.d.ts +8 -1
- package/dist/runtime/query/unique.d.ts.map +1 -1
- package/dist/runtime/query/unique.js +89 -4
- package/dist/runtime/query/unique.js.map +1 -1
- package/dist/runtime/query/unique.test.d.ts +2 -0
- package/dist/runtime/query/unique.test.d.ts.map +1 -0
- package/dist/runtime/query/unique.test.js +231 -0
- package/dist/runtime/query/unique.test.js.map +1 -0
- package/dist/runtime/query/update.d.ts.map +1 -1
- package/dist/runtime/query/update.js +30 -35
- package/dist/runtime/query/update.js.map +1 -1
- package/dist/runtime/query/update.test.d.ts +2 -0
- package/dist/runtime/query/update.test.d.ts.map +1 -0
- package/dist/runtime/query/update.test.js +186 -0
- package/dist/runtime/query/update.test.js.map +1 -0
- package/dist/runtime/query/updated-at.d.ts.map +1 -1
- 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 +5 -7
- package/dist/runtime/query/upsert.js.map +1 -1
- package/dist/runtime/schema-error.d.ts.map +1 -1
- package/dist/runtime/schema-error.js +6 -2
- package/dist/runtime/schema-error.js.map +1 -1
- package/dist/runtime/sqlite-error.d.ts.map +1 -1
- package/dist/runtime/sqlite-error.js +11 -12
- package/dist/runtime/sqlite-error.js.map +1 -1
- package/dist/runtime/sqlite-open.d.ts +2 -0
- package/dist/runtime/sqlite-open.d.ts.map +1 -1
- package/dist/runtime/sqlite-open.js +18 -1
- package/dist/runtime/sqlite-open.js.map +1 -1
- package/dist/runtime/transaction.d.ts +4 -0
- package/dist/runtime/transaction.d.ts.map +1 -1
- package/dist/runtime/transaction.js +31 -1
- package/dist/runtime/transaction.js.map +1 -1
- package/dist/runtime/transaction.test.d.ts +2 -0
- package/dist/runtime/transaction.test.d.ts.map +1 -0
- package/dist/runtime/transaction.test.js +43 -0
- package/dist/runtime/transaction.test.js.map +1 -0
- package/dist/runtime/types.d.ts +50 -17
- package/dist/runtime/types.d.ts.map +1 -1
- package/dist/schema/column-where.d.ts +11 -1
- package/dist/schema/column-where.d.ts.map +1 -1
- package/dist/schema/column.d.ts +1 -1
- package/dist/schema/column.d.ts.map +1 -1
- package/dist/schema/column.js +1 -1
- package/dist/schema/column.js.map +1 -1
- package/dist/schema/define-schema.d.ts +1 -1
- package/dist/schema/define-schema.d.ts.map +1 -1
- package/dist/schema/define-schema.js +5 -23
- package/dist/schema/define-schema.js.map +1 -1
- package/dist/schema/index.d.ts +2 -2
- package/dist/schema/index.d.ts.map +1 -1
- package/dist/schema/index.js +1 -1
- package/dist/schema/index.js.map +1 -1
- package/dist/schema/relation-types.d.ts +29 -22
- package/dist/schema/relation-types.d.ts.map +1 -1
- package/dist/schema/relation.d.ts.map +1 -1
- package/dist/schema/relation.js +6 -4
- package/dist/schema/relation.js.map +1 -1
- package/dist/schema/table-registry.d.ts.map +1 -1
- package/dist/schema/table-registry.js +8 -2
- package/dist/schema/table-registry.js.map +1 -1
- package/dist/schema/table.d.ts +6 -3
- package/dist/schema/table.d.ts.map +1 -1
- package/dist/schema/table.js +30 -31
- package/dist/schema/table.js.map +1 -1
- package/dist/schema/types.d.ts +33 -25
- package/dist/schema/types.d.ts.map +1 -1
- package/dist/sql/builder.d.ts +5 -1
- package/dist/sql/builder.d.ts.map +1 -1
- package/dist/sql/builder.js +23 -3
- package/dist/sql/builder.js.map +1 -1
- package/dist/sql/index.d.ts +5 -2
- package/dist/sql/index.d.ts.map +1 -1
- package/dist/sql/index.js +5 -2
- package/dist/sql/index.js.map +1 -1
- package/dist/utils/case.d.ts +4 -0
- package/dist/utils/case.d.ts.map +1 -1
- package/dist/utils/case.js +11 -0
- package/dist/utils/case.js.map +1 -1
- package/dist/utils/dotenv.d.ts +8 -0
- package/dist/utils/dotenv.d.ts.map +1 -0
- package/dist/utils/dotenv.js +70 -0
- package/dist/utils/dotenv.js.map +1 -0
- package/dist/utils/dotenv.test.d.ts +2 -0
- package/dist/utils/dotenv.test.d.ts.map +1 -0
- package/dist/utils/dotenv.test.js +32 -0
- package/dist/utils/dotenv.test.js.map +1 -0
- package/dist/utils/inflect.d.ts +6 -0
- package/dist/utils/inflect.d.ts.map +1 -0
- package/dist/utils/inflect.js +80 -0
- package/dist/utils/inflect.js.map +1 -0
- package/docs/cli.md +6 -2
- package/docs/configuration.md +3 -1
- package/docs/errors.md +61 -6
- package/docs/examples.md +63 -13
- package/docs/getting-started.md +24 -1
- package/docs/migrations.md +15 -2
- package/docs/plugins.md +13 -1
- package/docs/queries.md +109 -10
- package/docs/relations.md +5 -1
- package/docs/schema.md +12 -5
- package/docs/sqlite.md +24 -10
- package/docs/transactions.md +13 -2
- package/package.json +4 -2
|
@@ -1,19 +1,35 @@
|
|
|
1
1
|
import { postgresDialect } from "../../dialect/postgres.js";
|
|
2
|
-
import {
|
|
2
|
+
import { compileError } from "../compile-error.js";
|
|
3
|
+
import { buildExistsQuery, buildPaginateQuery, columnsForOutput, compileWhere, } from "./compile.js";
|
|
3
4
|
import { compileCursorWhere, compileOrderByFromSpec, cursorFromRow, flipOrderSpec, mergeWhereWithCursor, resolveOrderSpec, } from "./cursor.js";
|
|
4
5
|
import { runQuery } from "./execute.js";
|
|
5
6
|
import { hydrateAndLoadRelations } from "./find.js";
|
|
7
|
+
import { applyParentProjection, mergeSqlColumns, projectFindRows, resolveParentProjection, } from "./projection.js";
|
|
6
8
|
import { buildPlanExtraSelectCols, planRelationLoad, } from "./relation-planner.js";
|
|
9
|
+
import { getTableIndex, requireTable } from "./table-index.js";
|
|
10
|
+
function projectPaginateItems(rows, projection, orderSpec, defaultOutNames, withSpec) {
|
|
11
|
+
if (projection.hasProjection) {
|
|
12
|
+
return projectFindRows(rows, projection, withSpec);
|
|
13
|
+
}
|
|
14
|
+
const defaultOut = new Set(defaultOutNames);
|
|
15
|
+
const fetchedHiddenOrder = orderSpec.some((spec) => !defaultOut.has(spec.tsName));
|
|
16
|
+
if (!fetchedHiddenOrder) {
|
|
17
|
+
return rows;
|
|
18
|
+
}
|
|
19
|
+
return applyParentProjection(rows, defaultOutNames, withSpec);
|
|
20
|
+
}
|
|
7
21
|
export async function paginateRecords(executor, runtime, tableAccessor, args) {
|
|
8
22
|
const dialect = runtime.dialect ?? postgresDialect;
|
|
9
23
|
const { manifest } = runtime;
|
|
10
|
-
const table = manifest
|
|
11
|
-
if (!table)
|
|
12
|
-
throw new Error(`Unknown table: ${tableAccessor}`);
|
|
24
|
+
const table = requireTable(manifest, tableAccessor, "select");
|
|
13
25
|
if (!Number.isInteger(args.take) || args.take <= 0) {
|
|
14
|
-
|
|
26
|
+
compileError("paginate requires take to be a positive integer");
|
|
15
27
|
}
|
|
16
28
|
const orderSpec = resolveOrderSpec(table, args.orderBy, runtime.tableIndex);
|
|
29
|
+
const tableIndex = getTableIndex(runtime.tableIndex, table.accessor);
|
|
30
|
+
const projection = resolveParentProjection(table, args, tableIndex);
|
|
31
|
+
const defaultOutNames = columnsForOutput(tableIndex, table, undefined, projection.includeHidden).map((col) => col.tsName);
|
|
32
|
+
const sqlColumns = mergeSqlColumns(projection.sqlColumns ?? defaultOutNames, orderSpec.map((spec) => spec.tsName));
|
|
17
33
|
const { sql: userWhereSql, params: userParams } = compileWhere(manifest, table, args?.where, dialect, 1, runtime.tableIndex);
|
|
18
34
|
let whereSql = userWhereSql;
|
|
19
35
|
let params = userParams;
|
|
@@ -36,7 +52,7 @@ export async function paginateRecords(executor, runtime, tableAccessor, args) {
|
|
|
36
52
|
const extraSelect = args.with
|
|
37
53
|
? buildPlanExtraSelectCols(manifest, table, plan, dialect, runtime.tableIndex, params.length + 1)
|
|
38
54
|
: { cols: [], params: [] };
|
|
39
|
-
const query = buildPaginateQuery(table, whereSql, orderSql, args.take, extraSelect.cols.length > 0 ? extraSelect.cols : undefined, plan.joins.length > 0 ? plan.joins : undefined, runtime.tableIndex);
|
|
55
|
+
const query = buildPaginateQuery(table, whereSql, orderSql, args.take, extraSelect.cols.length > 0 ? extraSelect.cols : undefined, plan.joins.length > 0 ? plan.joins : undefined, runtime.tableIndex, sqlColumns, projection.includeHidden);
|
|
40
56
|
const rows = await runQuery(executor, runtime, { operation: "select", tableAccessor }, query, [...params, ...extraSelect.params]);
|
|
41
57
|
const extra = rows.length > args.take;
|
|
42
58
|
const sliced = extra ? rows.slice(0, args.take) : rows;
|
|
@@ -51,12 +67,34 @@ export async function paginateRecords(executor, runtime, tableAccessor, args) {
|
|
|
51
67
|
hasPrevious: false,
|
|
52
68
|
};
|
|
53
69
|
}
|
|
54
|
-
const hasMore = backward || extra;
|
|
55
|
-
const hasPrevious = args.after !== undefined || (backward && extra);
|
|
56
70
|
const firstItem = loaded[0];
|
|
57
71
|
const lastItem = loaded[loaded.length - 1];
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
72
|
+
if (!firstItem || !lastItem) {
|
|
73
|
+
return {
|
|
74
|
+
items: loaded,
|
|
75
|
+
nextCursor: null,
|
|
76
|
+
prevCursor: null,
|
|
77
|
+
hasMore: false,
|
|
78
|
+
hasPrevious: false,
|
|
79
|
+
};
|
|
80
|
+
}
|
|
81
|
+
const hasPrevious = backward ? extra : args.after !== undefined;
|
|
82
|
+
let hasMore = extra;
|
|
83
|
+
if (backward) {
|
|
84
|
+
const lastCursor = cursorFromRow(orderSpec, lastItem);
|
|
85
|
+
const cursorWhere = compileCursorWhere(orderSpec, lastCursor, userParams.length + 1, dialect, "after");
|
|
86
|
+
const merged = mergeWhereWithCursor(userWhereSql, userParams, cursorWhere);
|
|
87
|
+
const probeRows = await runQuery(executor, runtime, { operation: "select", tableAccessor }, buildExistsQuery(table, merged.sql), merged.params);
|
|
88
|
+
hasMore = probeRows.length > 0;
|
|
89
|
+
}
|
|
90
|
+
const nextCursor = hasMore ? cursorFromRow(orderSpec, lastItem) : null;
|
|
91
|
+
const prevCursor = hasPrevious ? cursorFromRow(orderSpec, firstItem) : null;
|
|
92
|
+
return {
|
|
93
|
+
items: projectPaginateItems(loaded, projection, orderSpec, defaultOutNames, args.with),
|
|
94
|
+
nextCursor,
|
|
95
|
+
prevCursor,
|
|
96
|
+
hasMore,
|
|
97
|
+
hasPrevious,
|
|
98
|
+
};
|
|
61
99
|
}
|
|
62
100
|
//# sourceMappingURL=paginate.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paginate.js","sourceRoot":"","sources":["../../../src/runtime/query/paginate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"paginate.js","sourceRoot":"","sources":["../../../src/runtime/query/paginate.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import type { ManifestColumn, ManifestRelation, ManifestTable } from "../../dial
|
|
|
2
2
|
import { type TableIndex } from "./table-index.js";
|
|
3
3
|
export declare function primaryKeyTsNames(table: ManifestTable, tableIndex?: TableIndex): string[];
|
|
4
4
|
export declare function primaryKeySqlName(table: ManifestTable, index?: number): string;
|
|
5
|
-
export type ScalarPrimaryKeyOperation = "findById" | "updateById" | "deleteById" | "cursorPaginate";
|
|
5
|
+
export type ScalarPrimaryKeyOperation = "findById" | "updateById" | "deleteById" | "cursorPaginate" | "connect";
|
|
6
6
|
export declare function requireScalarPrimaryKey(table: ManifestTable, operation?: ScalarPrimaryKeyOperation, tableIndex?: TableIndex): {
|
|
7
7
|
tsName: string;
|
|
8
8
|
sqlName: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"primary-key.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/primary-key.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACX,cAAc,EACd,gBAAgB,EAChB,aAAa,EACb,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"primary-key.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/primary-key.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACX,cAAc,EACd,gBAAgB,EAChB,aAAa,EACb,MAAM,wBAAwB,CAAC;AAIhC,OAAO,EAGN,KAAK,UAAU,EACf,MAAM,kBAAkB,CAAC;AAI1B,wBAAgB,iBAAiB,CAChC,KAAK,EAAE,aAAa,EACpB,UAAU,CAAC,EAAE,UAAU,GACrB,MAAM,EAAE,CAIV;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,aAAa,EAAE,KAAK,SAAI,GAAG,MAAM,CAazE;AAED,MAAM,MAAM,yBAAyB,GAClC,UAAU,GACV,YAAY,GACZ,YAAY,GACZ,gBAAgB,GAChB,SAAS,CAAC;AAEb,wBAAgB,uBAAuB,CACtC,KAAK,EAAE,aAAa,EACpB,SAAS,CAAC,EAAE,yBAAyB,EACrC,UAAU,CAAC,EAAE,UAAU,GACrB;IACF,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CAChB,CAmCA;AAED,wBAAgB,gBAAgB,CAC/B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,KAAK,EAAE,aAAa,GAClB,MAAM,CAeR;AAED,wBAAgB,cAAc,CAC7B,KAAK,EAAE,aAAa,EACpB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpC,UAAU,CAAC,EAAE,UAAU,GACrB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAgCzB;AAED,wBAAgB,QAAQ,CACvB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,KAAK,EAAE,aAAa,EACpB,UAAU,CAAC,EAAE,UAAU,GACrB,MAAM,CAUR;AAED,wBAAgB,mBAAmB,CAClC,WAAW,EAAE,aAAa,EAC1B,QAAQ,CAAC,EAAE,gBAAgB,GACzB,MAAM,CAKR;AAED,wBAAgB,wBAAwB,CACvC,WAAW,EAAE,aAAa,EAC1B,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,UAAU,CAAC,EAAE,UAAU,GACrB,MAAM,CAQR;AAOD,wBAAgB,sBAAsB,CACrC,KAAK,EAAE,aAAa,EACpB,GAAG,EAAE,cAAc,GACjB,MAAM,CAKR;AAED,wBAAgB,iBAAiB,CAChC,KAAK,EAAE,aAAa,EACpB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,UAAU,CAAC,EAAE,UAAU,GACrB,OAAO,CAUT;AAED,wBAAgB,sBAAsB,CACrC,KAAK,EAAE,aAAa,EACpB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,UAAU,CAAC,EAAE,UAAU,GACrB,IAAI,CAoBN"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { randomUUID } from "node:crypto";
|
|
2
2
|
import { generateUuid, resolveUuidVersion } from "../../utils/uuid.js";
|
|
3
|
+
import { compileError } from "../compile-error.js";
|
|
4
|
+
import { QueryErrorCode } from "../error-codes.js";
|
|
3
5
|
import { columnBySqlName, columnByTsName, } from "./table-index.js";
|
|
4
6
|
const PK_KEY_SEP = "\0";
|
|
5
7
|
export function primaryKeyTsNames(table, tableIndex) {
|
|
@@ -10,21 +12,38 @@ export function primaryKeyTsNames(table, tableIndex) {
|
|
|
10
12
|
export function primaryKeySqlName(table, index = 0) {
|
|
11
13
|
const sqlName = table.primaryKey[index];
|
|
12
14
|
if (!sqlName) {
|
|
13
|
-
|
|
15
|
+
compileError(`Primary key index ${index} not found for table "${table.accessor}"`, {
|
|
16
|
+
code: QueryErrorCode.missing_primary_key,
|
|
17
|
+
tableAccessor: table.accessor,
|
|
18
|
+
tableSqlName: table.sqlName,
|
|
19
|
+
});
|
|
14
20
|
}
|
|
15
21
|
return sqlName;
|
|
16
22
|
}
|
|
17
23
|
export function requireScalarPrimaryKey(table, operation, tableIndex) {
|
|
18
24
|
if (table.primaryKey.length !== 1) {
|
|
19
|
-
|
|
25
|
+
const label = operation ?? "Operation";
|
|
26
|
+
compileError(`${label} requires a single-column primary key on table "${table.accessor}"`, {
|
|
27
|
+
code: QueryErrorCode.missing_primary_key,
|
|
28
|
+
tableAccessor: table.accessor,
|
|
29
|
+
tableSqlName: table.sqlName,
|
|
30
|
+
});
|
|
20
31
|
}
|
|
21
32
|
const sqlName = table.primaryKey[0];
|
|
22
33
|
if (!sqlName) {
|
|
23
|
-
|
|
34
|
+
compileError(`Primary key column not found for table "${table.accessor}"`, {
|
|
35
|
+
code: QueryErrorCode.missing_primary_key,
|
|
36
|
+
tableAccessor: table.accessor,
|
|
37
|
+
tableSqlName: table.sqlName,
|
|
38
|
+
});
|
|
24
39
|
}
|
|
25
40
|
const col = columnBySqlName(tableIndex, table, sqlName);
|
|
26
41
|
if (!col) {
|
|
27
|
-
|
|
42
|
+
compileError(`Primary key column not found for table "${table.accessor}"`, {
|
|
43
|
+
code: QueryErrorCode.missing_primary_key,
|
|
44
|
+
tableAccessor: table.accessor,
|
|
45
|
+
tableSqlName: table.sqlName,
|
|
46
|
+
});
|
|
28
47
|
}
|
|
29
48
|
return { tsName: col.tsName, sqlName: col.sqlName };
|
|
30
49
|
}
|
|
@@ -33,7 +52,12 @@ export function rowScalarPkValue(row, table) {
|
|
|
33
52
|
const { tsName } = requireScalarPrimaryKey(table);
|
|
34
53
|
const val = row[tsName];
|
|
35
54
|
if (val == null) {
|
|
36
|
-
|
|
55
|
+
compileError(`Missing primary key "${tsName}" on row`, {
|
|
56
|
+
code: QueryErrorCode.missing_primary_key,
|
|
57
|
+
tableAccessor: table.accessor,
|
|
58
|
+
tableSqlName: table.sqlName,
|
|
59
|
+
columnTsName: tsName,
|
|
60
|
+
});
|
|
37
61
|
}
|
|
38
62
|
return String(val);
|
|
39
63
|
}
|
|
@@ -44,13 +68,22 @@ export function resolvePkWhere(table, id, tableIndex) {
|
|
|
44
68
|
const pkTsNames = primaryKeyTsNames(table, tableIndex);
|
|
45
69
|
for (const tsName of pkTsNames) {
|
|
46
70
|
if (!(tsName in id)) {
|
|
47
|
-
|
|
71
|
+
compileError(`Missing primary key column "${tsName}" for table "${table.accessor}". The object must include all PK columns: ${pkTsNames.join(", ")}`, {
|
|
72
|
+
code: QueryErrorCode.missing_primary_key,
|
|
73
|
+
tableAccessor: table.accessor,
|
|
74
|
+
tableSqlName: table.sqlName,
|
|
75
|
+
columnTsName: tsName,
|
|
76
|
+
});
|
|
48
77
|
}
|
|
49
78
|
}
|
|
50
79
|
return id;
|
|
51
80
|
}
|
|
52
81
|
if (table.primaryKey.length !== 1) {
|
|
53
|
-
|
|
82
|
+
compileError(`Table "${table.accessor}" has a composite primary key. Pass an object with PK columns (${primaryKeyTsNames(table, tableIndex).join(", ")}) instead of a string.`, {
|
|
83
|
+
code: QueryErrorCode.missing_primary_key,
|
|
84
|
+
tableAccessor: table.accessor,
|
|
85
|
+
tableSqlName: table.sqlName,
|
|
86
|
+
});
|
|
54
87
|
}
|
|
55
88
|
const { tsName } = requireScalarPrimaryKey(table, undefined, tableIndex);
|
|
56
89
|
return { [tsName]: id };
|
|
@@ -58,7 +91,11 @@ export function resolvePkWhere(table, id, tableIndex) {
|
|
|
58
91
|
export function rowPkKey(row, table, tableIndex) {
|
|
59
92
|
const tsNames = primaryKeyTsNames(table, tableIndex);
|
|
60
93
|
if (tsNames.length === 0) {
|
|
61
|
-
|
|
94
|
+
compileError(`No primary key defined for table "${table.accessor}"`, {
|
|
95
|
+
code: QueryErrorCode.missing_primary_key,
|
|
96
|
+
tableAccessor: table.accessor,
|
|
97
|
+
tableSqlName: table.sqlName,
|
|
98
|
+
});
|
|
62
99
|
}
|
|
63
100
|
return tsNames.map((name) => String(row[name] ?? "")).join(PK_KEY_SEP);
|
|
64
101
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"primary-key.js","sourceRoot":"","sources":["../../../src/runtime/query/primary-key.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAMzC,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,EACN,eAAe,EACf,cAAc,GAEd,MAAM,kBAAkB,CAAC;AAE1B,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,UAAU,iBAAiB,CAChC,KAAoB,EACpB,UAAuB;IAEvB,OAAO,KAAK,CAAC,UAAU;SACrB,GAAG,
|
|
1
|
+
{"version":3,"file":"primary-key.js","sourceRoot":"","sources":["../../../src/runtime/query/primary-key.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAMzC,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EACN,eAAe,EACf,cAAc,GAEd,MAAM,kBAAkB,CAAC;AAE1B,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,UAAU,iBAAiB,CAChC,KAAoB,EACpB,UAAuB;IAEvB,OAAO,KAAK,CAAC,UAAU;SACrB,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,eAAe,CAAC,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC;SACrE,MAAM,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;AACxD,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAAoB,EAAE,KAAK,GAAG,CAAC;IAChE,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IACxC,IAAI,CAAC,OAAO,EAAE,CAAC;QACd,YAAY,CACX,qBAAqB,KAAK,yBAAyB,KAAK,CAAC,QAAQ,GAAG,EACpE;YACC,IAAI,EAAE,cAAc,CAAC,mBAAmB;YACxC,aAAa,EAAE,KAAK,CAAC,QAAQ;YAC7B,YAAY,EAAE,KAAK,CAAC,OAAO;SAC3B,CACD,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC;AAChB,CAAC;AASD,MAAM,UAAU,uBAAuB,CACtC,KAAoB,EACpB,SAAqC,EACrC,UAAuB;IAKvB,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnC,MAAM,KAAK,GAAG,SAAS,IAAI,WAAW,CAAC;QACvC,YAAY,CACX,GAAG,KAAK,mDAAmD,KAAK,CAAC,QAAQ,GAAG,EAC5E;YACC,IAAI,EAAE,cAAc,CAAC,mBAAmB;YACxC,aAAa,EAAE,KAAK,CAAC,QAAQ;YAC7B,YAAY,EAAE,KAAK,CAAC,OAAO;SAC3B,CACD,CAAC;IACH,CAAC;IACD,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IACpC,IAAI,CAAC,OAAO,EAAE,CAAC;QACd,YAAY,CACX,2CAA2C,KAAK,CAAC,QAAQ,GAAG,EAC5D;YACC,IAAI,EAAE,cAAc,CAAC,mBAAmB;YACxC,aAAa,EAAE,KAAK,CAAC,QAAQ;YAC7B,YAAY,EAAE,KAAK,CAAC,OAAO;SAC3B,CACD,CAAC;IACH,CAAC;IACD,MAAM,GAAG,GAAG,eAAe,CAAC,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACxD,IAAI,CAAC,GAAG,EAAE,CAAC;QACV,YAAY,CACX,2CAA2C,KAAK,CAAC,QAAQ,GAAG,EAC5D;YACC,IAAI,EAAE,cAAc,CAAC,mBAAmB;YACxC,aAAa,EAAE,KAAK,CAAC,QAAQ;YAC7B,YAAY,EAAE,KAAK,CAAC,OAAO;SAC3B,CACD,CAAC;IACH,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC/B,GAA4B,EAC5B,KAAoB;IAEpB,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnC,MAAM,EAAE,MAAM,EAAE,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAC;QAClD,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC;QACxB,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;YACjB,YAAY,CAAC,wBAAwB,MAAM,UAAU,EAAE;gBACtD,IAAI,EAAE,cAAc,CAAC,mBAAmB;gBACxC,aAAa,EAAE,KAAK,CAAC,QAAQ;gBAC7B,YAAY,EAAE,KAAK,CAAC,OAAO;gBAC3B,YAAY,EAAE,MAAM;aACpB,CAAC,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;IACpB,CAAC;IACD,OAAO,QAAQ,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,cAAc,CAC7B,KAAoB,EACpB,EAAoC,EACpC,UAAuB;IAEvB,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;QAC3C,MAAM,SAAS,GAAG,iBAAiB,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QACvD,KAAK,MAAM,MAAM,IAAI,SAAS,EAAE,CAAC;YAChC,IAAI,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,CAAC;gBACrB,YAAY,CACX,+BAA+B,MAAM,gBAAgB,KAAK,CAAC,QAAQ,8CAA8C,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EACvI;oBACC,IAAI,EAAE,cAAc,CAAC,mBAAmB;oBACxC,aAAa,EAAE,KAAK,CAAC,QAAQ;oBAC7B,YAAY,EAAE,KAAK,CAAC,OAAO;oBAC3B,YAAY,EAAE,MAAM;iBACpB,CACD,CAAC;YACH,CAAC;QACF,CAAC;QACD,OAAO,EAAE,CAAC;IACX,CAAC;IAED,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnC,YAAY,CACX,UAAU,KAAK,CAAC,QAAQ,kEAAkE,iBAAiB,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAwB,EACjK;YACC,IAAI,EAAE,cAAc,CAAC,mBAAmB;YACxC,aAAa,EAAE,KAAK,CAAC,QAAQ;YAC7B,YAAY,EAAE,KAAK,CAAC,OAAO;SAC3B,CACD,CAAC;IACH,CAAC;IAED,MAAM,EAAE,MAAM,EAAE,GAAG,uBAAuB,CAAC,KAAK,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;IACzE,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,QAAQ,CACvB,GAA4B,EAC5B,KAAoB,EACpB,UAAuB;IAEvB,MAAM,OAAO,GAAG,iBAAiB,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IACrD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,YAAY,CAAC,qCAAqC,KAAK,CAAC,QAAQ,GAAG,EAAE;YACpE,IAAI,EAAE,cAAc,CAAC,mBAAmB;YACxC,aAAa,EAAE,KAAK,CAAC,QAAQ;YAC7B,YAAY,EAAE,KAAK,CAAC,OAAO;SAC3B,CAAC,CAAC;IACJ,CAAC;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AACxE,CAAC;AAED,MAAM,UAAU,mBAAmB,CAClC,WAA0B,EAC1B,QAA2B;IAE3B,IAAI,QAAQ,EAAE,YAAY,EAAE,CAAC;QAC5B,OAAO,QAAQ,CAAC,YAAY,CAAC;IAC9B,CAAC;IACD,OAAO,iBAAiB,CAAC,WAAW,CAAC,CAAC;AACvC,CAAC;AAED,MAAM,UAAU,wBAAwB,CACvC,WAA0B,EAC1B,MAA0B,EAC1B,UAAuB;IAEvB,IAAI,CAAC,MAAM,EAAE,CAAC;QACb,OAAO,iBAAiB,CAAC,WAAW,CAAC,CAAC;IACvC,CAAC;IACD,MAAM,GAAG,GACR,cAAc,CAAC,UAAU,EAAE,WAAW,EAAE,MAAM,CAAC;QAC/C,eAAe,CAAC,UAAU,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;IAClD,OAAO,GAAG,EAAE,OAAO,IAAI,MAAM,CAAC;AAC/B,CAAC;AAED,SAAS,cAAc,CAAC,aAAqB;IAC5C,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC3D,OAAO,GAAG,MAAM,IAAI,UAAU,EAAE,EAAE,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,sBAAsB,CACrC,KAAoB,EACpB,GAAmB;IAEnB,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QACzB,OAAO,YAAY,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;AACvC,CAAC;AAED,MAAM,UAAU,iBAAiB,CAChC,KAAoB,EACpB,IAA6B,EAC7B,UAAuB;IAEvB,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAChD,KAAK,MAAM,OAAO,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;QACxC,MAAM,GAAG,GAAG,eAAe,CAAC,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QACxD,IAAI,CAAC,GAAG;YAAE,OAAO,KAAK,CAAC;QACvB,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,SAAS;YAAE,OAAO,KAAK,CAAC;QACzD,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACjC,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,IAAI;YAAE,OAAO,KAAK,CAAC;IAC7D,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC;AAED,MAAM,UAAU,sBAAsB,CACrC,KAAoB,EACpB,IAA6B,EAC7B,UAAuB;IAEvB,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,KAAK,MAAM,OAAO,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;QACxC,MAAM,GAAG,GAAG,eAAe,CAAC,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QACxD,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,SAAS;YAAE,SAAS;QAC7D,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACjC,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;YAC/C,SAAS,GAAG,IAAI,CAAC;YACjB,MAAM;QACP,CAAC;IACF,CAAC;IACD,IAAI,CAAC,SAAS;QAAE,OAAO;IAEvB,KAAK,MAAM,OAAO,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;QACxC,MAAM,GAAG,GAAG,eAAe,CAAC,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QACxD,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,SAAS;YAAE,SAAS;QAC7D,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACjC,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,IAAI;YAAE,SAAS;QACxD,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,sBAAsB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACvD,CAAC;AACF,CAAC"}
|
|
@@ -13,6 +13,7 @@ export type ParentProjectionArgs = {
|
|
|
13
13
|
with?: Record<string, unknown>;
|
|
14
14
|
includeHidden?: boolean;
|
|
15
15
|
};
|
|
16
|
+
export declare function mergeSqlColumns(requested: readonly string[], extras: readonly string[]): string[];
|
|
16
17
|
export declare function projectionSignature(sqlColumns: readonly string[] | undefined, includeHidden?: boolean): string;
|
|
17
18
|
export declare function resolveParentProjection(table: ManifestTable, args: ParentProjectionArgs | undefined, tableIndex?: TableIndex): ParentProjection;
|
|
18
19
|
export declare function applyParentProjection(rows: Record<string, unknown>[], requested: readonly string[], withSpec?: Record<string, unknown>): Record<string, unknown>[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projection.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/projection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"projection.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/projection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAM5D,OAAO,EAGN,KAAK,UAAU,EACf,MAAM,kBAAkB,CAAC;AAE1B,MAAM,MAAM,aAAa,GACtB,SAAS,MAAM,EAAE,GACjB,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC,CAAC;AAEvC,MAAM,MAAM,gBAAgB,GAAG;IAC9B,aAAa,EAAE,OAAO,CAAC;IACvB,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;IAC7B,UAAU,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;IAC1C,aAAa,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IAClC,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,IAAI,CAAC,EAAE,aAAa,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,aAAa,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AA+CF,wBAAgB,eAAe,CAC9B,SAAS,EAAE,SAAS,MAAM,EAAE,EAC5B,MAAM,EAAE,SAAS,MAAM,EAAE,GACvB,MAAM,EAAE,CASV;AAED,wBAAgB,mBAAmB,CAClC,UAAU,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,EACzC,aAAa,CAAC,EAAE,OAAO,GACrB,MAAM,CAKR;AAED,wBAAgB,uBAAuB,CACtC,KAAK,EAAE,aAAa,EACpB,IAAI,EAAE,oBAAoB,GAAG,SAAS,EACtC,UAAU,CAAC,EAAE,UAAU,GACrB,gBAAgB,CAiFlB;AAED,wBAAgB,qBAAqB,CACpC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAC/B,SAAS,EAAE,SAAS,MAAM,EAAE,EAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAChC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAiB3B;AAED,wBAAgB,eAAe,CAC9B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAC/B,UAAU,EAAE,gBAAgB,EAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAChC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAG3B;AAED,wBAAgB,cAAc,CAC7B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,UAAU,EAAE,gBAAgB,EAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAChC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAEzB"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
+
import { compileError } from "../compile-error.js";
|
|
1
2
|
import { columnsForOutput, normalizeSelectColumns } from "./compile.js";
|
|
2
3
|
import { findRelation, tableOwnsFkColumn } from "./manifest-lookup.js";
|
|
3
4
|
import { primaryKeyTsNames } from "./primary-key.js";
|
|
4
|
-
import { requireTsColumn } from "./table-index.js";
|
|
5
|
+
import { requireTsColumn, } from "./table-index.js";
|
|
5
6
|
function hasWithSpec(withSpec) {
|
|
6
7
|
return Boolean(withSpec && Object.keys(withSpec).length > 0);
|
|
7
8
|
}
|
|
@@ -34,7 +35,7 @@ function internalSelectColumns(table, withSpec, tableIndex) {
|
|
|
34
35
|
}
|
|
35
36
|
return extras;
|
|
36
37
|
}
|
|
37
|
-
function mergeSqlColumns(requested, extras) {
|
|
38
|
+
export function mergeSqlColumns(requested, extras) {
|
|
38
39
|
const sqlColumns = [...requested];
|
|
39
40
|
const seen = new Set(requested);
|
|
40
41
|
for (const extra of extras) {
|
|
@@ -55,7 +56,10 @@ export function resolveParentProjection(table, args, tableIndex) {
|
|
|
55
56
|
const select = args?.select;
|
|
56
57
|
const omit = args?.omit;
|
|
57
58
|
if (select !== undefined && omit !== undefined) {
|
|
58
|
-
|
|
59
|
+
compileError("select and omit cannot be used together", {
|
|
60
|
+
tableAccessor: table.accessor,
|
|
61
|
+
tableSqlName: table.sqlName,
|
|
62
|
+
});
|
|
59
63
|
}
|
|
60
64
|
const withSpec = args?.with;
|
|
61
65
|
const includeHidden = args?.includeHidden === true;
|
|
@@ -63,12 +67,18 @@ export function resolveParentProjection(table, args, tableIndex) {
|
|
|
63
67
|
if (select !== undefined) {
|
|
64
68
|
const keys = normalizeSelectColumns(select) ?? [];
|
|
65
69
|
if (keys.length === 0) {
|
|
66
|
-
|
|
70
|
+
compileError("select must include at least one column", {
|
|
71
|
+
tableAccessor: table.accessor,
|
|
72
|
+
tableSqlName: table.sqlName,
|
|
73
|
+
});
|
|
67
74
|
}
|
|
68
75
|
validateProjectionColumns(table, keys, "select", tableIndex);
|
|
69
76
|
const sqlColumns = mergeSqlColumns(keys, extras);
|
|
70
77
|
if (sqlColumns.length === 0) {
|
|
71
|
-
|
|
78
|
+
compileError("select must include at least one column", {
|
|
79
|
+
tableAccessor: table.accessor,
|
|
80
|
+
tableSqlName: table.sqlName,
|
|
81
|
+
});
|
|
72
82
|
}
|
|
73
83
|
return {
|
|
74
84
|
hasProjection: true,
|
|
@@ -93,11 +103,17 @@ export function resolveParentProjection(table, args, tableIndex) {
|
|
|
93
103
|
.map((col) => col.tsName)
|
|
94
104
|
.filter((name) => !omitSet.has(name));
|
|
95
105
|
if (requested.length === 0 && !hasWithSpec(withSpec)) {
|
|
96
|
-
|
|
106
|
+
compileError("omit cannot remove every column", {
|
|
107
|
+
tableAccessor: table.accessor,
|
|
108
|
+
tableSqlName: table.sqlName,
|
|
109
|
+
});
|
|
97
110
|
}
|
|
98
111
|
const sqlColumns = mergeSqlColumns(requested, extras);
|
|
99
112
|
if (sqlColumns.length === 0) {
|
|
100
|
-
|
|
113
|
+
compileError("omit cannot remove every column", {
|
|
114
|
+
tableAccessor: table.accessor,
|
|
115
|
+
tableSqlName: table.sqlName,
|
|
116
|
+
});
|
|
101
117
|
}
|
|
102
118
|
return { hasProjection: true, requested, sqlColumns, includeHidden };
|
|
103
119
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projection.js","sourceRoot":"","sources":["../../../src/runtime/query/projection.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,
|
|
1
|
+
{"version":3,"file":"projection.js","sourceRoot":"","sources":["../../../src/runtime/query/projection.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relation-planner.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/relation-planner.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACX,OAAO,EACP,QAAQ,EACR,gBAAgB,EAChB,aAAa,EACb,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"relation-planner.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/relation-planner.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACX,OAAO,EACP,QAAQ,EACR,gBAAgB,EAChB,aAAa,EACb,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAQN,KAAK,YAAY,EAGjB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAI3C,OAAO,EAKN,KAAK,aAAa,EAElB,MAAM,kBAAkB,CAAC;AAE1B,MAAM,MAAM,iBAAiB,GAAG,IAAI,GAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CAAC;AAE3E,MAAM,MAAM,kBAAkB,GAAG;IAChC,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC,CAAC;IACjE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACjC,aAAa,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,KAAK,aAAa,GAAG;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,OAAO,EAAE,CAAC;CAClB,CAAC;AA6BF,MAAM,MAAM,eAAe,GAAG;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,WAAW,EAAE,aAAa,CAAC;IAC3B,UAAU,CAAC,EAAE,kBAAkB,CAAC;IAChC,KAAK,CAAC,EAAE,eAAe,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC/B,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,eAAe,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,iBAAiB,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAChC,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,YAAY,EAAE,eAAe,EAAE,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IAClC,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,aAAa,EAAE,iBAAiB,EAAE,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC9B,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC7B,aAAa,EAAE,iBAAiB,EAAE,CAAC;IACnC,YAAY,EAAE,eAAe,EAAE,CAAC;IAChC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACrC,cAAc,CAAC,EAAE,kBAAkB,CAAC;IACpC,gBAAgB,CAAC,EAAE,oBAAoB,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IACjC,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC9B,CAAC;AAWF,wBAAgB,yBAAyB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAEtE;AAED,wBAAgB,sBAAsB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAEnE;AAmiBD,wBAAgB,2BAA2B,CAC1C,WAAW,EAAE,aAAa,EAC1B,KAAK,EAAE,eAAe,EACtB,OAAO,EAAE,OAAO,EAChB,aAAa,CAAC,EAAE,aAAa,EAC7B,QAAQ,CAAC,EAAE,QAAQ,EACnB,KAAK,CAAC,EAAE,aAAa,GACnB,MAAM,CAeR;AAED,wBAAgB,yBAAyB,CACxC,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,aAAa,EAC1B,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,iBAAiB,EACvB,OAAO,EAAE,OAAO,EAChB,aAAa,CAAC,EAAE,aAAa,EAC7B,KAAK,CAAC,EAAE,aAAa,GACnB,MAAM,CAgDR;AAED,wBAAgB,gBAAgB,CAC/B,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,aAAa,EAC1B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,SAAS,EAC/C,OAAO,EAAE,OAAO,EAChB,aAAa,CAAC,EAAE,aAAa,EAC7B,OAAO,CAAC,EAAE,mBAAmB,GAC3B,gBAAgB,CA6KlB;AA+FD,wBAAgB,mBAAmB,CAClC,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,aAAa,EAC1B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAClC,IAAI,EAAE,gBAAgB,GACpB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CA0C3B;AAED,wBAAgB,wBAAwB,CACvC,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,aAAa,EAC1B,IAAI,EAAE,gBAAgB,EACtB,OAAO,EAAE,OAAO,EAChB,aAAa,CAAC,EAAE,aAAa,EAC7B,eAAe,SAAI,GACjB;IAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAAC,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,CA6CvC;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,gBAAgB,GAAG,MAAM,CAQpE;AAED,4CAA4C;AAC5C,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,gBAAgB,GAAG,MAAM,CAEzE;AAED,wBAAgB,mBAAmB,CAClC,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,aAAa,EAC1B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAC5C,IAAI,EAAE,gBAAgB,EACtB,aAAa,CAAC,EAAE,aAAa,GAC3B,MAAM,CAuDR;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAQtE;AAED,wBAAgB,kBAAkB,CACjC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GACjC,MAAM,CAmDR;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAEjE;AAED,wBAAgB,qBAAqB,CACpC,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EACnC,OAAO,EAAE,OAAO,EAChB,aAAa,CAAC,EAAE,aAAa,EAC7B,OAAO,CAAC,EAAE,mBAAmB,GAC3B,gBAAgB,CAgBlB;AAED,wBAAgB,0BAA0B,CACzC,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EACnC,OAAO,EAAE,OAAO,EAChB,aAAa,CAAC,EAAE,aAAa,EAC7B,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,GAC9B;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,gBAAgB,CAAA;CAAE,GAAG,IAAI,CAyDhD"}
|