neoorm 0.3.0 → 0.4.0

package/dist/runtime/query/primary-key.d.ts

@@ -1,15 +1,18 @@
 import type { ManifestColumn, ManifestRelation, ManifestTable } from "../../dialect/types.js";
-export declare function primaryKeyTsNames(table: ManifestTable): string[];
+import { type TableIndex } from "./table-index.js";
+export declare function primaryKeyTsNames(table: ManifestTable, tableIndex?: TableIndex): string[];
 export declare function primaryKeySqlName(table: ManifestTable, index?: number): string;
-export type ScalarPrimaryKeyOperation = "findById" | "updateById" | "deleteById";
-export declare function requireScalarPrimaryKey(table: ManifestTable, operation?: ScalarPrimaryKeyOperation): {
+export type ScalarPrimaryKeyOperation = "findById" | "updateById" | "deleteById" | "cursorPaginate";
+export declare function requireScalarPrimaryKey(table: ManifestTable, operation?: ScalarPrimaryKeyOperation, tableIndex?: TableIndex): {
     tsName: string;
     sqlName: string;
 };
 export declare function rowScalarPkValue(row: Record<string, unknown>, table: ManifestTable): string;
-export declare function rowPkKey(row: Record<string, unknown>, table: ManifestTable): string;
+export declare function resolvePkWhere(table: ManifestTable, id: string | Record<string, unknown>, tableIndex?: TableIndex): Record<string, unknown>;
+export declare function rowPkKey(row: Record<string, unknown>, table: ManifestTable, tableIndex?: TableIndex): string;
 export declare function targetRelationPkSql(targetTable: ManifestTable, relation?: ManifestRelation): string;
-export declare function resolveFkTargetSqlColumn(targetTable: ManifestTable, colRef: string | undefined): string;
+export declare function resolveFkTargetSqlColumn(targetTable: ManifestTable, colRef: string | undefined, tableIndex?: TableIndex): string;
 export declare function defaultPrimaryKeyValue(table: ManifestTable, col: ManifestColumn): string;
-export declare function fillMissingPrimaryKeys(table: ManifestTable, data: Record<string, unknown>): void;
+export declare function scalarPkAvailable(table: ManifestTable, data: Record<string, unknown>, tableIndex?: TableIndex): boolean;
+export declare function fillMissingPrimaryKeys(table: ManifestTable, data: Record<string, unknown>, tableIndex?: TableIndex): void;
 //# sourceMappingURL=primary-key.d.ts.map

package/dist/runtime/query/primary-key.d.ts.map

@@ -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;AAKhC,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,aAAa,GAAG,MAAM,EAAE,CAOhE;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,aAAa,EAAE,KAAK,SAAI,GAAG,MAAM,CAQzE;AAED,MAAM,MAAM,yBAAyB,GAClC,UAAU,GACV,YAAY,GACZ,YAAY,CAAC;AAiBhB,wBAAgB,uBAAuB,CACtC,KAAK,EAAE,aAAa,EACpB,SAAS,CAAC,EAAE,yBAAyB,GACnC;IACF,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CAChB,CAwBA;AAED,wBAAgB,gBAAgB,CAC/B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,KAAK,EAAE,aAAa,GAClB,MAAM,CAOR;AAED,wBAAgB,QAAQ,CACvB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,KAAK,EAAE,aAAa,GAClB,MAAM,CAMR;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,GACxB,MAAM,CAQR;AAOD,wBAAgB,sBAAsB,CACrC,KAAK,EAAE,aAAa,EACpB,GAAG,EAAE,cAAc,GACjB,MAAM,CAKR;AAED,wBAAgB,sBAAsB,CACrC,KAAK,EAAE,aAAa,EACpB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC3B,IAAI,CAQN"}
+{"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;AAEhC,OAAO,EAGN,KAAK,UAAU,EACf,MAAM,kBAAkB,CAAC;AAI1B,wBAAgB,iBAAiB,CAChC,KAAK,EAAE,aAAa,EACpB,UAAU,CAAC,EAAE,UAAU,GACrB,MAAM,EAAE,CAOV;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,aAAa,EAAE,KAAK,SAAI,GAAG,MAAM,CAQzE;AAED,MAAM,MAAM,yBAAyB,GAClC,UAAU,GACV,YAAY,GACZ,YAAY,GACZ,gBAAgB,CAAC;AAEpB,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,CAmBA;AAED,wBAAgB,gBAAgB,CAC/B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,KAAK,EAAE,aAAa,GAClB,MAAM,CAUR;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,CAqBzB;AAED,wBAAgB,QAAQ,CACvB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,KAAK,EAAE,aAAa,EACpB,UAAU,CAAC,EAAE,UAAU,GACrB,MAAM,CAMR;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"}

package/dist/runtime/query/primary-key.js

@@ -1,9 +1,10 @@
 import { randomUUID } from "node:crypto";
 import { generateUuid, resolveUuidVersion } from "../../utils/uuid.js";
+import { columnBySqlName, columnByTsName, } from "./table-index.js";
 const PK_KEY_SEP = "\0";
-export function primaryKeyTsNames(table) {
+export function primaryKeyTsNames(table, tableIndex) {
     return table.primaryKey
-        .map((sqlName) => table.columns.find((c) => c.sqlName === sqlName)?.tsName)
+        .map((sqlName) => columnBySqlName(tableIndex, table, sqlName)?.tsName)
         .filter((name) => name !== undefined);
 }
 export function primaryKeySqlName(table, index = 0) {
@@ -13,47 +14,49 @@ export function primaryKeySqlName(table, index = 0) {
     }
     return sqlName;
 }
-function compositePkAlternative(operation) {
-    switch (operation) {
-        case "findById":
-            return "findFirst({ where: ... })";
-        case "updateById":
-            return "update({ where: ..., data: ... })";
-        case "deleteById":
-            return "delete({ where: ... })";
-        default: {
-            const _exhaustive = operation;
-            return _exhaustive;
-        }
-    }
-}
-export function requireScalarPrimaryKey(table, operation) {
+export function requireScalarPrimaryKey(table, operation, tableIndex) {
     if (table.primaryKey.length !== 1) {
-        if (operation) {
-            throw new Error(`${operation} requires a single-column primary key on table "${table.accessor}". For composite primary keys, use ${compositePkAlternative(operation)} instead.`);
-        }
         throw new Error(`Operation requires a single-column primary key on table "${table.accessor}"`);
     }
     const sqlName = table.primaryKey[0];
     if (!sqlName) {
         throw new Error(`Primary key column not found for table "${table.accessor}"`);
     }
-    const col = table.columns.find((c) => c.sqlName === sqlName);
+    const col = columnBySqlName(tableIndex, table, sqlName);
     if (!col) {
         throw new Error(`Primary key column not found for table "${table.accessor}"`);
     }
     return { tsName: col.tsName, sqlName: col.sqlName };
 }
 export function rowScalarPkValue(row, table) {
-    const { tsName } = requireScalarPrimaryKey(table);
-    const val = row[tsName];
-    if (val == null) {
-        throw new Error(`Missing primary key "${tsName}" on row`);
+    if (table.primaryKey.length === 1) {
+        const { tsName } = requireScalarPrimaryKey(table);
+        const val = row[tsName];
+        if (val == null) {
+            throw new Error(`Missing primary key "${tsName}" on row`);
+        }
+        return String(val);
+    }
+    return rowPkKey(row, table);
+}
+export function resolvePkWhere(table, id, tableIndex) {
+    if (typeof id === "object" && id !== null) {
+        const pkTsNames = primaryKeyTsNames(table, tableIndex);
+        for (const tsName of pkTsNames) {
+            if (!(tsName in id)) {
+                throw new Error(`Missing primary key column "${tsName}" for table "${table.accessor}". The object must include all PK columns: ${pkTsNames.join(", ")}`);
+            }
+        }
+        return id;
+    }
+    if (table.primaryKey.length !== 1) {
+        throw new Error(`Table "${table.accessor}" has a composite primary key. Pass an object with PK columns (${primaryKeyTsNames(table, tableIndex).join(", ")}) instead of a string.`);
     }
-    return String(val);
+    const { tsName } = requireScalarPrimaryKey(table, undefined, tableIndex);
+    return { [tsName]: id };
 }
-export function rowPkKey(row, table) {
-    const tsNames = primaryKeyTsNames(table);
+export function rowPkKey(row, table, tableIndex) {
+    const tsNames = primaryKeyTsNames(table, tableIndex);
     if (tsNames.length === 0) {
         throw new Error(`No primary key defined for table "${table.accessor}"`);
     }
@@ -65,12 +68,12 @@ export function targetRelationPkSql(targetTable, relation) {
     }
     return primaryKeySqlName(targetTable);
 }
-export function resolveFkTargetSqlColumn(targetTable, colRef) {
+export function resolveFkTargetSqlColumn(targetTable, colRef, tableIndex) {
     if (!colRef) {
         return primaryKeySqlName(targetTable);
     }
-    const col = targetTable.columns.find((c) => c.tsName === colRef) ??
-        targetTable.columns.find((c) => c.sqlName === colRef);
+    const col = columnByTsName(tableIndex, targetTable, colRef) ??
+        columnBySqlName(tableIndex, targetTable, colRef);
     return col?.sqlName ?? colRef;
 }
 function generateTextId(tableAccessor) {
@@ -83,11 +86,38 @@ export function defaultPrimaryKeyValue(table, col) {
     }
     return generateTextId(table.accessor);
 }
-export function fillMissingPrimaryKeys(table, data) {
-    for (const col of table.columns) {
-        if (!col.primary)
-            continue;
+export function scalarPkAvailable(table, data, tableIndex) {
+    if (table.primaryKey.length === 0)
+        return false;
+    for (const sqlName of table.primaryKey) {
+        const col = columnBySqlName(tableIndex, table, sqlName);
+        if (!col)
+            return false;
         if (col.kind === "serial" || col.generated)
+            return false;
+        const current = data[col.tsName];
+        if (current === undefined || current === null)
+            return false;
+    }
+    return true;
+}
+export function fillMissingPrimaryKeys(table, data, tableIndex) {
+    let needsFill = false;
+    for (const sqlName of table.primaryKey) {
+        const col = columnBySqlName(tableIndex, table, sqlName);
+        if (!col || col.kind === "serial" || col.generated)
+            continue;
+        const current = data[col.tsName];
+        if (current === undefined || current === null) {
+            needsFill = true;
+            break;
+        }
+    }
+    if (!needsFill)
+        return;
+    for (const sqlName of table.primaryKey) {
+        const col = columnBySqlName(tableIndex, table, sqlName);
+        if (!col || col.kind === "serial" || col.generated)
             continue;
         const current = data[col.tsName];
         if (current !== undefined && current !== null)

package/dist/runtime/query/primary-key.js.map

@@ -1 +1 @@
-{"version":3,"file":"primary-key.js","sourceRoot":"","sources":["../../../src/runtime/query/primary-key.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"primary-key.js","sourceRoot":"","sources":["../../../src/runtime/query/primary-key.ts"],"names":[],"mappings":"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"}

package/dist/runtime/query/relation-planner.d.ts

@@ -0,0 +1,74 @@
+import type { Dialect, Manifest, ManifestRelation, ManifestTable } from "../../dialect/types.js";
+import { type OrderByInput } from "./compile.js";
+import type { QueryRuntime } from "./execute.js";
+import type { WithInput } from "./find.js";
+import { type ManifestIndex } from "./table-index.js";
+export type RelationCountSpec = true | {
+    where?: Record<string, unknown>;
+};
+export type InlineRelationSpec = {
+    select?: readonly string[] | Record<string, boolean | undefined>;
+    orderBy?: OrderByInput;
+    limit?: number;
+    with?: Record<string, WithInput>;
+};
+export type InlineChainNode = {
+    relationName: string;
+    relation: ManifestRelation;
+    targetTable: ManifestTable;
+    nestedSpec?: InlineRelationSpec;
+    child?: InlineChainNode;
+};
+export type InlineJsonAggPlan = {
+    relationName: string;
+    chain: InlineChainNode;
+};
+export type InlineCountPlan = {
+    relationName: string;
+    spec: RelationCountSpec;
+};
+export type CountAggregatePlan = {
+    joins: string[];
+    selectCols: string[];
+    groupByCols: string[];
+    inlineCounts: InlineCountPlan[];
+};
+export type HasManyAggregatePlan = {
+    joins: string[];
+    selectCols: string[];
+    groupByCols: string[];
+    inlineJsonAgg: InlineJsonAggPlan[];
+};
+export type RelationLoadPlan = {
+    joins: string[];
+    joinSelectCols: string[];
+    joinedRelations: Set<string>;
+    inlineJsonAgg: InlineJsonAggPlan[];
+    inlineCounts: InlineCountPlan[];
+    batchWith: Record<string, WithInput>;
+    countAggregate?: CountAggregatePlan;
+    hasManyAggregate?: HasManyAggregatePlan;
+};
+export type RelationPlanOptions = {
+    useHasManyAggregate?: boolean;
+};
+export declare function inlineRelationColumnAlias(relationName: string): string;
+export declare function inlineCountColumnAlias(relationName: string): string;
+export declare function buildInlineJsonAggSelectCol(parentTable: ManifestTable, chain: InlineChainNode, dialect: Dialect, manifestIndex?: ManifestIndex): string;
+export declare function buildInlineCountSelectCol(manifest: Manifest, parentTable: ManifestTable, relationName: string, spec: RelationCountSpec, dialect: Dialect, manifestIndex?: ManifestIndex): string;
+export declare function planRelationLoad(manifest: Manifest, parentTable: ManifestTable, withSpec: Record<string, WithInput> | undefined, dialect: Dialect, manifestIndex?: ManifestIndex, options?: RelationPlanOptions): RelationLoadPlan;
+export declare function hydrateRowsWithPlan(runtime: QueryRuntime, parentTable: ManifestTable, rawRows: Record<string, unknown>[], plan: RelationLoadPlan): Record<string, unknown>[];
+export declare function buildPlanExtraSelectCols(manifest: Manifest, parentTable: ManifestTable, plan: RelationLoadPlan, dialect: Dialect, manifestIndex?: ManifestIndex): string[];
+export declare function buildAggregateGroupBy(plan: RelationLoadPlan): string;
+/** @deprecated Use buildAggregateGroupBy */
+export declare function buildCountAggregateGroupBy(plan: RelationLoadPlan): string;
+export declare function compileCountOrderBy(manifest: Manifest, parentTable: ManifestTable, orderBy: Record<string, unknown> | undefined, plan: RelationLoadPlan, manifestIndex?: ManifestIndex): string;
+export declare function hasPlanMainQueryExtras(plan: RelationLoadPlan): boolean;
+export declare function withShapeSignature(withSpec: Record<string, WithInput>): string;
+export declare function planIsFullyInline(plan: RelationLoadPlan): boolean;
+export declare function getCachedRelationPlan(manifest: Manifest, table: ManifestTable, withSpec: Record<string, WithInput>, dialect: Dialect, manifestIndex?: ManifestIndex, options?: RelationPlanOptions): RelationLoadPlan;
+export declare function getCachedFindByIdWithQuery(manifest: Manifest, table: ManifestTable, withSpec: Record<string, WithInput>, dialect: Dialect, manifestIndex?: ManifestIndex): {
+    sql: string;
+    plan: RelationLoadPlan;
+} | null;
+//# sourceMappingURL=relation-planner.d.ts.map

package/dist/runtime/query/relation-planner.d.ts.map

@@ -0,0 +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;AAChC,OAAO,EASN,KAAK,YAAY,EACjB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAU3C,OAAO,EAKN,KAAK,aAAa,EAClB,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,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CACjC,CAAC;AAEF,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;AAmdD,wBAAgB,2BAA2B,CAC1C,WAAW,EAAE,aAAa,EAC1B,KAAK,EAAE,eAAe,EACtB,OAAO,EAAE,OAAO,EAChB,aAAa,CAAC,EAAE,aAAa,GAC3B,MAAM,CAWR;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,GAC3B,MAAM,CAoCR;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,CAkJlB;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,CA6C3B;AAED,wBAAgB,wBAAwB,CACvC,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,aAAa,EAC1B,IAAI,EAAE,gBAAgB,EACtB,OAAO,EAAE,OAAO,EAChB,aAAa,CAAC,EAAE,aAAa,GAC3B,MAAM,EAAE,CAiCV;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,CAqCR;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAQtE;AAED,wBAAgB,kBAAkB,CACjC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GACjC,MAAM,CAwBR;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,CASlB;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,GAC3B;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,gBAAgB,CAAA;CAAE,GAAG,IAAI,CAuDhD"}