@tanstack/db 0.0.14 → 0.0.15

package/dist/esm/query/group-by.js

@@ -1,88 +0,0 @@
-import { groupBy, groupByOperators } from "@electric-sql/d2mini";
-import { extractValueFromNamespacedRow, evaluateOperandOnNamespacedRow } from "./extractors.js";
-import { isAggregateFunctionCall } from "./utils.js";
-const { sum, count, avg, min, max, median, mode } = groupByOperators;
-function processGroupBy(pipeline, query, mainTableAlias) {
-  const groupByColumns = Array.isArray(query.groupBy) ? query.groupBy : [query.groupBy];
-  const keyExtractor = ([_oldKey, namespacedRow]) => {
-    const key = {};
-    for (const column of groupByColumns) {
-      if (typeof column === `string` && column.startsWith(`@`)) {
-        const columnRef = column.substring(1);
-        const columnName = columnRef.includes(`.`) ? columnRef.split(`.`)[1] : columnRef;
-        key[columnName] = extractValueFromNamespacedRow(
-          namespacedRow,
-          columnRef,
-          mainTableAlias
-        );
-      }
-    }
-    return key;
-  };
-  const aggregates = {};
-  if (!query.select) {
-    throw new Error(`SELECT clause is required for GROUP BY`);
-  }
-  for (const item of query.select) {
-    if (typeof item === `object`) {
-      for (const [alias, expr] of Object.entries(item)) {
-        if (typeof expr === `object` && isAggregateFunctionCall(expr)) {
-          const functionName = Object.keys(expr)[0];
-          const columnRef = expr[functionName];
-          aggregates[alias] = getAggregateFunction(
-            functionName,
-            columnRef,
-            mainTableAlias
-          );
-        }
-      }
-    }
-  }
-  if (Object.keys(aggregates).length > 0) {
-    pipeline = pipeline.pipe(groupBy(keyExtractor, aggregates));
-  }
-  return pipeline;
-}
-function getAggregateFunction(functionName, columnRef, mainTableAlias) {
-  const valueExtractor = ([_oldKey, namespacedRow]) => {
-    let value;
-    if (typeof columnRef === `string` && columnRef.startsWith(`@`)) {
-      value = extractValueFromNamespacedRow(
-        namespacedRow,
-        columnRef.substring(1),
-        mainTableAlias
-      );
-    } else {
-      value = evaluateOperandOnNamespacedRow(
-        namespacedRow,
-        columnRef,
-        mainTableAlias
-      );
-    }
-    return typeof value === `number` ? value : 0;
-  };
-  switch (functionName.toUpperCase()) {
-    case `SUM`:
-      return sum(valueExtractor);
-    case `COUNT`:
-      return count();
-    // count() doesn't need a value extractor
-    case `AVG`:
-      return avg(valueExtractor);
-    case `MIN`:
-      return min(valueExtractor);
-    case `MAX`:
-      return max(valueExtractor);
-    case `MEDIAN`:
-      return median(valueExtractor);
-    case `MODE`:
-      return mode(valueExtractor);
-    default:
-      throw new Error(`Unsupported aggregate function: ${functionName}`);
-  }
-}
-export {
-  getAggregateFunction,
-  processGroupBy
-};
-//# sourceMappingURL=group-by.js.map

package/dist/esm/query/group-by.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"group-by.js","sources":["../../../src/query/group-by.ts"],"sourcesContent":["import { groupBy, groupByOperators } from \"@electric-sql/d2mini\"\nimport {\n  evaluateOperandOnNamespacedRow,\n  extractValueFromNamespacedRow,\n} from \"./extractors\"\nimport { isAggregateFunctionCall } from \"./utils\"\nimport type { ConditionOperand, FunctionCall, Query } from \"./schema\"\nimport type { NamespacedAndKeyedStream } from \"../types.js\"\n\nconst { sum, count, avg, min, max, median, mode } = groupByOperators\n\n/**\n * Process the groupBy clause in a D2QL query\n */\nexport function processGroupBy(\n  pipeline: NamespacedAndKeyedStream,\n  query: Query,\n  mainTableAlias: string\n) {\n  // Normalize groupBy to an array of column references\n  const groupByColumns = Array.isArray(query.groupBy)\n    ? query.groupBy\n    : [query.groupBy]\n\n  // Create a key extractor function for the groupBy operator\n  const keyExtractor = ([_oldKey, namespacedRow]: [\n    string,\n    Record<string, unknown>,\n  ]) => {\n    const key: Record<string, unknown> = {}\n\n    // Extract each groupBy column value\n    for (const column of groupByColumns) {\n      if (typeof column === `string` && (column as string).startsWith(`@`)) {\n        const columnRef = (column as string).substring(1)\n        const columnName = columnRef.includes(`.`)\n          ? columnRef.split(`.`)[1]\n          : columnRef\n\n        key[columnName!] = extractValueFromNamespacedRow(\n          namespacedRow,\n          columnRef,\n          mainTableAlias\n        )\n      }\n    }\n\n    return key\n  }\n\n  // Create aggregate functions for any aggregated columns in the SELECT clause\n  const aggregates: Record<string, any> = {}\n\n  if (!query.select) {\n    throw new Error(`SELECT clause is required for GROUP BY`)\n  }\n\n  // Scan the SELECT clause for aggregate functions\n  for (const item of query.select) {\n    if (typeof item === `object`) {\n      for (const [alias, expr] of Object.entries(item)) {\n        if (typeof expr === `object` && isAggregateFunctionCall(expr)) {\n          // Get the function name (the only key in the object)\n          const functionName = Object.keys(expr)[0]\n          // Get the column reference or expression to aggregate\n          const columnRef = (expr as FunctionCall)[\n            functionName as keyof FunctionCall\n          ]\n\n          // Add the aggregate function to our aggregates object\n          aggregates[alias] = getAggregateFunction(\n            functionName!,\n            columnRef,\n            mainTableAlias\n          )\n        }\n      }\n    }\n  }\n\n  // Apply the groupBy operator if we have any aggregates\n  if (Object.keys(aggregates).length > 0) {\n    pipeline = pipeline.pipe(groupBy(keyExtractor, aggregates))\n  }\n\n  return pipeline\n}\n\n/**\n * Helper function to get an aggregate function based on the function name\n */\nexport function getAggregateFunction(\n  functionName: string,\n  columnRef: string | ConditionOperand,\n  mainTableAlias: string\n) {\n  // Create a value extractor function for the column to aggregate\n  const valueExtractor = ([_oldKey, namespacedRow]: [\n    string,\n    Record<string, unknown>,\n  ]) => {\n    let value: unknown\n    if (typeof columnRef === `string` && columnRef.startsWith(`@`)) {\n      value = extractValueFromNamespacedRow(\n        namespacedRow,\n        columnRef.substring(1),\n        mainTableAlias\n      )\n    } else {\n      value = evaluateOperandOnNamespacedRow(\n        namespacedRow,\n        columnRef as ConditionOperand,\n        mainTableAlias\n      )\n    }\n    // Ensure we return a number for aggregate functions\n    return typeof value === `number` ? value : 0\n  }\n\n  // Return the appropriate aggregate function\n  switch (functionName.toUpperCase()) {\n    case `SUM`:\n      return sum(valueExtractor)\n    case `COUNT`:\n      return count() // count() doesn't need a value extractor\n    case `AVG`:\n      return avg(valueExtractor)\n    case `MIN`:\n      return min(valueExtractor)\n    case `MAX`:\n      return max(valueExtractor)\n    case `MEDIAN`:\n      return median(valueExtractor)\n    case `MODE`:\n      return mode(valueExtractor)\n    default:\n      throw new Error(`Unsupported aggregate function: ${functionName}`)\n  }\n}\n"],"names":[],"mappings":";;;AASA,MAAM,EAAE,KAAK,OAAO,KAAK,KAAK,KAAK,QAAQ,SAAS;AAKpC,SAAA,eACd,UACA,OACA,gBACA;AAEM,QAAA,iBAAiB,MAAM,QAAQ,MAAM,OAAO,IAC9C,MAAM,UACN,CAAC,MAAM,OAAO;AAGlB,QAAM,eAAe,CAAC,CAAC,SAAS,aAAa,MAGvC;AACJ,UAAM,MAA+B,CAAC;AAGtC,eAAW,UAAU,gBAAgB;AACnC,UAAI,OAAO,WAAW,YAAa,OAAkB,WAAW,GAAG,GAAG;AAC9D,cAAA,YAAa,OAAkB,UAAU,CAAC;AAC1C,cAAA,aAAa,UAAU,SAAS,GAAG,IACrC,UAAU,MAAM,GAAG,EAAE,CAAC,IACtB;AAEJ,YAAI,UAAW,IAAI;AAAA,UACjB;AAAA,UACA;AAAA,UACA;AAAA,QACF;AAAA,MAAA;AAAA,IACF;AAGK,WAAA;AAAA,EACT;AAGA,QAAM,aAAkC,CAAC;AAErC,MAAA,CAAC,MAAM,QAAQ;AACX,UAAA,IAAI,MAAM,wCAAwC;AAAA,EAAA;AAI/C,aAAA,QAAQ,MAAM,QAAQ;AAC3B,QAAA,OAAO,SAAS,UAAU;AAC5B,iBAAW,CAAC,OAAO,IAAI,KAAK,OAAO,QAAQ,IAAI,GAAG;AAChD,YAAI,OAAO,SAAS,YAAY,wBAAwB,IAAI,GAAG;AAE7D,gBAAM,eAAe,OAAO,KAAK,IAAI,EAAE,CAAC;AAElC,gBAAA,YAAa,KACjB,YACF;AAGA,qBAAW,KAAK,IAAI;AAAA,YAClB;AAAA,YACA;AAAA,YACA;AAAA,UACF;AAAA,QAAA;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAIF,MAAI,OAAO,KAAK,UAAU,EAAE,SAAS,GAAG;AACtC,eAAW,SAAS,KAAK,QAAQ,cAAc,UAAU,CAAC;AAAA,EAAA;AAGrD,SAAA;AACT;AAKgB,SAAA,qBACd,cACA,WACA,gBACA;AAEA,QAAM,iBAAiB,CAAC,CAAC,SAAS,aAAa,MAGzC;AACA,QAAA;AACJ,QAAI,OAAO,cAAc,YAAY,UAAU,WAAW,GAAG,GAAG;AACtD,cAAA;AAAA,QACN;AAAA,QACA,UAAU,UAAU,CAAC;AAAA,QACrB;AAAA,MACF;AAAA,IAAA,OACK;AACG,cAAA;AAAA,QACN;AAAA,QACA;AAAA,QACA;AAAA,MACF;AAAA,IAAA;AAGK,WAAA,OAAO,UAAU,WAAW,QAAQ;AAAA,EAC7C;AAGQ,UAAA,aAAa,YAAe,GAAA;AAAA,IAClC,KAAK;AACH,aAAO,IAAI,cAAc;AAAA,IAC3B,KAAK;AACH,aAAO,MAAM;AAAA;AAAA,IACf,KAAK;AACH,aAAO,IAAI,cAAc;AAAA,IAC3B,KAAK;AACH,aAAO,IAAI,cAAc;AAAA,IAC3B,KAAK;AACH,aAAO,IAAI,cAAc;AAAA,IAC3B,KAAK;AACH,aAAO,OAAO,cAAc;AAAA,IAC9B,KAAK;AACH,aAAO,KAAK,cAAc;AAAA,IAC5B;AACE,YAAM,IAAI,MAAM,mCAAmC,YAAY,EAAE;AAAA,EAAA;AAEvE;"}

package/dist/esm/query/joins.d.ts

@@ -1,14 +0,0 @@
-import { Query } from './index.js';
-import { IStreamBuilder } from '@electric-sql/d2mini';
-import { KeyedStream, NamespacedAndKeyedStream, NamespacedRow } from '../types.js';
-/**
- * Creates a processing pipeline for join clauses
- */
-export declare function processJoinClause(pipeline: NamespacedAndKeyedStream, query: Query, tables: Record<string, KeyedStream>, mainTableAlias: string, allInputs: Record<string, KeyedStream>): NamespacedAndKeyedStream;
-/**
- * Creates a processing pipeline for join results
- */
-export declare function processJoinResults(mainTableAlias: string, joinedTableAlias: string, joinClause: {
-    on: any;
-    type: string;
-}): (pipeline: IStreamBuilder<[key: string, [[string, NamespacedRow] | undefined, [string, NamespacedRow] | undefined]]>) => NamespacedAndKeyedStream;

package/dist/esm/query/joins.js

@@ -1,141 +0,0 @@
-import { map, join, consolidate, filter } from "@electric-sql/d2mini";
-import { evaluateConditionOnNamespacedRow } from "./evaluators.js";
-import { extractJoinKey } from "./extractors.js";
-function processJoinClause(pipeline, query, tables, mainTableAlias, allInputs) {
-  if (!query.join) return pipeline;
-  const input = allInputs[query.from];
-  for (const joinClause of query.join) {
-    const joinedTableAlias = joinClause.as || joinClause.from;
-    const joinType = joinClause.type === `cross` ? `inner` : joinClause.type;
-    const [mainKeyRef, , joinedKeyRefs] = joinClause.on;
-    const mainPipeline = pipeline.pipe(
-      map(([currentKey, namespacedRow]) => {
-        const mainRow = namespacedRow[mainTableAlias];
-        const key = extractJoinKey(mainRow, mainKeyRef, mainTableAlias);
-        return [key, [currentKey, namespacedRow]];
-      })
-    );
-    let joinedTableInput;
-    if (allInputs[joinClause.from]) {
-      joinedTableInput = allInputs[joinClause.from];
-    } else {
-      joinedTableInput = input.graph.newInput();
-    }
-    tables[joinedTableAlias] = joinedTableInput;
-    const joinedPipeline = joinedTableInput.pipe(
-      map(([currentKey, row]) => {
-        const namespacedRow = { [joinedTableAlias]: row };
-        const key = extractJoinKey(row, joinedKeyRefs, joinedTableAlias);
-        return [key, [currentKey, namespacedRow]];
-      })
-    );
-    switch (joinType) {
-      case `inner`:
-        pipeline = mainPipeline.pipe(
-          join(joinedPipeline, `inner`),
-          consolidate(),
-          processJoinResults(mainTableAlias, joinedTableAlias, joinClause)
-        );
-        break;
-      case `left`:
-        pipeline = mainPipeline.pipe(
-          join(joinedPipeline, `left`),
-          consolidate(),
-          processJoinResults(mainTableAlias, joinedTableAlias, joinClause)
-        );
-        break;
-      case `right`:
-        pipeline = mainPipeline.pipe(
-          join(joinedPipeline, `right`),
-          consolidate(),
-          processJoinResults(mainTableAlias, joinedTableAlias, joinClause)
-        );
-        break;
-      case `full`:
-        pipeline = mainPipeline.pipe(
-          join(joinedPipeline, `full`),
-          consolidate(),
-          processJoinResults(mainTableAlias, joinedTableAlias, joinClause)
-        );
-        break;
-      default:
-        pipeline = mainPipeline.pipe(
-          join(joinedPipeline, `inner`),
-          consolidate(),
-          processJoinResults(mainTableAlias, joinedTableAlias, joinClause)
-        );
-    }
-  }
-  return pipeline;
-}
-function processJoinResults(mainTableAlias, joinedTableAlias, joinClause) {
-  return function(pipeline) {
-    return pipeline.pipe(
-      // Process the join result and handle nulls in the same step
-      map((result) => {
-        const [_key, [main, joined]] = result;
-        const mainKey = main == null ? void 0 : main[0];
-        const mainNamespacedRow = main == null ? void 0 : main[1];
-        const joinedKey = joined == null ? void 0 : joined[0];
-        const joinedNamespacedRow = joined == null ? void 0 : joined[1];
-        if (joinClause.type === `inner` || joinClause.type === `cross`) {
-          if (!mainNamespacedRow || !joinedNamespacedRow) {
-            return void 0;
-          }
-        }
-        if (joinClause.type === `left` && !mainNamespacedRow) {
-          return void 0;
-        }
-        if (joinClause.type === `right` && !joinedNamespacedRow) {
-          return void 0;
-        }
-        const mergedNamespacedRow = {};
-        if (mainNamespacedRow) {
-          Object.entries(mainNamespacedRow).forEach(
-            ([tableAlias, tableData]) => {
-              mergedNamespacedRow[tableAlias] = tableData;
-            }
-          );
-        }
-        if (joinedNamespacedRow) {
-          Object.entries(joinedNamespacedRow).forEach(
-            ([tableAlias, tableData]) => {
-              mergedNamespacedRow[tableAlias] = tableData;
-            }
-          );
-        } else if (joinClause.type === `left` || joinClause.type === `full`) ;
-        if (!mainNamespacedRow && (joinClause.type === `right` || joinClause.type === `full`)) ;
-        const newKey = `[${mainKey},${joinedKey}]`;
-        return [newKey, mergedNamespacedRow];
-      }),
-      // Filter out undefined results
-      filter((value) => value !== void 0),
-      // Process the ON condition
-      filter(([_key, namespacedRow]) => {
-        if (!joinClause.on || joinClause.type === `cross`) {
-          return true;
-        }
-        if (joinClause.type === `left` && namespacedRow[joinedTableAlias] === void 0) {
-          return true;
-        }
-        if (joinClause.type === `right` && namespacedRow[mainTableAlias] === void 0) {
-          return true;
-        }
-        if (joinClause.type === `full` && (namespacedRow[mainTableAlias] === void 0 || namespacedRow[joinedTableAlias] === void 0)) {
-          return true;
-        }
-        return evaluateConditionOnNamespacedRow(
-          namespacedRow,
-          joinClause.on,
-          mainTableAlias,
-          joinedTableAlias
-        );
-      })
-    );
-  };
-}
-export {
-  processJoinClause,
-  processJoinResults
-};
-//# sourceMappingURL=joins.js.map

package/dist/esm/query/joins.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"joins.js","sources":["../../../src/query/joins.ts"],"sourcesContent":["import {\n  consolidate,\n  filter,\n  join as joinOperator,\n  map,\n} from \"@electric-sql/d2mini\"\nimport { evaluateConditionOnNamespacedRow } from \"./evaluators.js\"\nimport { extractJoinKey } from \"./extractors.js\"\nimport type { Query } from \"./index.js\"\nimport type { IStreamBuilder, JoinType } from \"@electric-sql/d2mini\"\nimport type {\n  KeyedStream,\n  NamespacedAndKeyedStream,\n  NamespacedRow,\n} from \"../types.js\"\n\n/**\n * Creates a processing pipeline for join clauses\n */\nexport function processJoinClause(\n  pipeline: NamespacedAndKeyedStream,\n  query: Query,\n  tables: Record<string, KeyedStream>,\n  mainTableAlias: string,\n  allInputs: Record<string, KeyedStream>\n) {\n  if (!query.join) return pipeline\n  const input = allInputs[query.from]\n\n  for (const joinClause of query.join) {\n    // Create a stream for the joined table\n    const joinedTableAlias = joinClause.as || joinClause.from\n\n    // Get the right join type for the operator\n    const joinType: JoinType =\n      joinClause.type === `cross` ? `inner` : joinClause.type\n\n    // The `in` is formatted as ['@mainKeyRef', '=', '@joinedKeyRef']\n    // Destructure the main key reference and the joined key references\n    const [mainKeyRef, , joinedKeyRefs] = joinClause.on\n\n    // We need to prepare the main pipeline and the joined pipeline\n    // to have the correct key format for joining\n    const mainPipeline = pipeline.pipe(\n      map(([currentKey, namespacedRow]) => {\n        // Extract the key from the ON condition left side for the main table\n        const mainRow = namespacedRow[mainTableAlias]!\n\n        // Extract the join key from the main row\n        const key = extractJoinKey(mainRow, mainKeyRef, mainTableAlias)\n\n        // Return [key, namespacedRow] as a KeyValue type\n        return [key, [currentKey, namespacedRow]] as [\n          unknown,\n          [string, typeof namespacedRow],\n        ]\n      })\n    )\n\n    // Get the joined table input from the inputs map\n    let joinedTableInput: KeyedStream\n\n    if (allInputs[joinClause.from]) {\n      // Use the provided input if available\n      joinedTableInput = allInputs[joinClause.from]!\n    } else {\n      // Create a new input if not provided\n      joinedTableInput =\n        input!.graph.newInput<[string, Record<string, unknown>]>()\n    }\n\n    tables[joinedTableAlias] = joinedTableInput\n\n    // Create a pipeline for the joined table\n    const joinedPipeline = joinedTableInput.pipe(\n      map(([currentKey, row]) => {\n        // Wrap the row in an object with the table alias as the key\n        const namespacedRow: NamespacedRow = { [joinedTableAlias]: row }\n\n        // Extract the key from the ON condition right side for the joined table\n        const key = extractJoinKey(row, joinedKeyRefs, joinedTableAlias)\n\n        // Return [key, namespacedRow] as a KeyValue type\n        return [key, [currentKey, namespacedRow]] as [\n          string,\n          [string, typeof namespacedRow],\n        ]\n      })\n    )\n\n    // Apply join with appropriate typings based on join type\n    switch (joinType) {\n      case `inner`:\n        pipeline = mainPipeline.pipe(\n          joinOperator(joinedPipeline, `inner`),\n          consolidate(),\n          processJoinResults(mainTableAlias, joinedTableAlias, joinClause)\n        )\n        break\n      case `left`:\n        pipeline = mainPipeline.pipe(\n          joinOperator(joinedPipeline, `left`),\n          consolidate(),\n          processJoinResults(mainTableAlias, joinedTableAlias, joinClause)\n        )\n        break\n      case `right`:\n        pipeline = mainPipeline.pipe(\n          joinOperator(joinedPipeline, `right`),\n          consolidate(),\n          processJoinResults(mainTableAlias, joinedTableAlias, joinClause)\n        )\n        break\n      case `full`:\n        pipeline = mainPipeline.pipe(\n          joinOperator(joinedPipeline, `full`),\n          consolidate(),\n          processJoinResults(mainTableAlias, joinedTableAlias, joinClause)\n        )\n        break\n      default:\n        pipeline = mainPipeline.pipe(\n          joinOperator(joinedPipeline, `inner`),\n          consolidate(),\n          processJoinResults(mainTableAlias, joinedTableAlias, joinClause)\n        )\n    }\n  }\n  return pipeline\n}\n\n/**\n * Creates a processing pipeline for join results\n */\nexport function processJoinResults(\n  mainTableAlias: string,\n  joinedTableAlias: string,\n  joinClause: { on: any; type: string }\n) {\n  return function (\n    pipeline: IStreamBuilder<\n      [\n        key: string,\n        [\n          [string, NamespacedRow] | undefined,\n          [string, NamespacedRow] | undefined,\n        ],\n      ]\n    >\n  ): NamespacedAndKeyedStream {\n    return pipeline.pipe(\n      // Process the join result and handle nulls in the same step\n      map((result) => {\n        const [_key, [main, joined]] = result\n        const mainKey = main?.[0]\n        const mainNamespacedRow = main?.[1]\n        const joinedKey = joined?.[0]\n        const joinedNamespacedRow = joined?.[1]\n\n        // For inner joins, both sides should be non-null\n        if (joinClause.type === `inner` || joinClause.type === `cross`) {\n          if (!mainNamespacedRow || !joinedNamespacedRow) {\n            return undefined // Will be filtered out\n          }\n        }\n\n        // For left joins, the main row must be non-null\n        if (joinClause.type === `left` && !mainNamespacedRow) {\n          return undefined // Will be filtered out\n        }\n\n        // For right joins, the joined row must be non-null\n        if (joinClause.type === `right` && !joinedNamespacedRow) {\n          return undefined // Will be filtered out\n        }\n\n        // Merge the nested rows\n        const mergedNamespacedRow: NamespacedRow = {}\n\n        // Add main row data if it exists\n        if (mainNamespacedRow) {\n          Object.entries(mainNamespacedRow).forEach(\n            ([tableAlias, tableData]) => {\n              mergedNamespacedRow[tableAlias] = tableData\n            }\n          )\n        }\n\n        // If we have a joined row, add it to the merged result\n        if (joinedNamespacedRow) {\n          Object.entries(joinedNamespacedRow).forEach(\n            ([tableAlias, tableData]) => {\n              mergedNamespacedRow[tableAlias] = tableData\n            }\n          )\n        } else if (joinClause.type === `left` || joinClause.type === `full`) {\n          // For left or full joins, add the joined table with undefined data if missing\n          // mergedNamespacedRow[joinedTableAlias] = undefined\n        }\n\n        // For right or full joins, add the main table with undefined data if missing\n        if (\n          !mainNamespacedRow &&\n          (joinClause.type === `right` || joinClause.type === `full`)\n        ) {\n          // mergedNamespacedRow[mainTableAlias] = undefined\n        }\n\n        // New key\n        const newKey = `[${mainKey},${joinedKey}]`\n\n        return [newKey, mergedNamespacedRow] as [\n          string,\n          typeof mergedNamespacedRow,\n        ]\n      }),\n      // Filter out undefined results\n      filter((value) => value !== undefined),\n      // Process the ON condition\n      filter(([_key, namespacedRow]: [string, NamespacedRow]) => {\n        // If there's no ON condition, or it's a cross join, always return true\n        if (!joinClause.on || joinClause.type === `cross`) {\n          return true\n        }\n\n        // For LEFT JOIN, if the right side is null, we should include the row\n        if (\n          joinClause.type === `left` &&\n          namespacedRow[joinedTableAlias] === undefined\n        ) {\n          return true\n        }\n\n        // For RIGHT JOIN, if the left side is null, we should include the row\n        if (\n          joinClause.type === `right` &&\n          namespacedRow[mainTableAlias] === undefined\n        ) {\n          return true\n        }\n\n        // For FULL JOIN, if either side is null, we should include the row\n        if (\n          joinClause.type === `full` &&\n          (namespacedRow[mainTableAlias] === undefined ||\n            namespacedRow[joinedTableAlias] === undefined)\n        ) {\n          return true\n        }\n\n        return evaluateConditionOnNamespacedRow(\n          namespacedRow,\n          joinClause.on,\n          mainTableAlias,\n          joinedTableAlias\n        )\n      })\n    )\n  }\n}\n"],"names":["joinOperator"],"mappings":"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"}

package/dist/esm/query/order-by.d.ts

@@ -1,3 +0,0 @@
-import { Query } from './schema.js';
-import { NamespacedAndKeyedStream } from '../types.js';
-export declare function processOrderBy(resultPipeline: NamespacedAndKeyedStream, query: Query, mainTableAlias: string): NamespacedAndKeyedStream;

package/dist/esm/query/order-by.js

@@ -1,185 +0,0 @@
-import { orderByWithIndex, map, orderByWithFractionalIndex, orderBy } from "@electric-sql/d2mini";
-import { evaluateOperandOnNamespacedRow } from "./extractors.js";
-import { isOrderIndexFunctionCall } from "./utils.js";
-function processOrderBy(resultPipeline, query, mainTableAlias) {
-  let hasOrderIndexColumn = false;
-  let orderIndexType = `numeric`;
-  let orderIndexAlias = ``;
-  for (const item of query.select) {
-    if (typeof item === `object`) {
-      for (const [alias, expr] of Object.entries(item)) {
-        if (typeof expr === `object` && isOrderIndexFunctionCall(expr)) {
-          hasOrderIndexColumn = true;
-          orderIndexAlias = alias;
-          orderIndexType = getOrderIndexType(expr);
-          break;
-        }
-      }
-    }
-    if (hasOrderIndexColumn) break;
-  }
-  const orderByItems = [];
-  if (typeof query.orderBy === `string`) {
-    orderByItems.push({
-      operand: query.orderBy,
-      direction: `asc`
-    });
-  } else if (Array.isArray(query.orderBy)) {
-    for (const item of query.orderBy) {
-      if (typeof item === `string`) {
-        orderByItems.push({
-          operand: item,
-          direction: `asc`
-        });
-      } else if (typeof item === `object`) {
-        for (const [column, direction] of Object.entries(item)) {
-          orderByItems.push({
-            operand: column,
-            direction
-          });
-        }
-      }
-    }
-  } else if (typeof query.orderBy === `object`) {
-    for (const [column, direction] of Object.entries(query.orderBy)) {
-      orderByItems.push({
-        operand: column,
-        direction
-      });
-    }
-  }
-  const valueExtractor = (namespacedRow) => {
-    if (orderByItems.length > 1) {
-      return orderByItems.map(
-        (item) => evaluateOperandOnNamespacedRow(
-          namespacedRow,
-          item.operand,
-          mainTableAlias
-        )
-      );
-    } else if (orderByItems.length === 1) {
-      const item = orderByItems[0];
-      const val = evaluateOperandOnNamespacedRow(
-        namespacedRow,
-        item.operand,
-        mainTableAlias
-      );
-      return val;
-    }
-    return null;
-  };
-  const ascComparator = (a, b) => {
-    if (typeof a === `string` && typeof b === `string`) {
-      return a.localeCompare(b);
-    }
-    if (Array.isArray(a) && Array.isArray(b)) {
-      for (let i = 0; i < Math.min(a.length, b.length); i++) {
-        const result = ascComparator(a[i], b[i]);
-        if (result !== 0) {
-          return result;
-        }
-      }
-      return a.length - b.length;
-    }
-    const bothObjects = typeof a === `object` && typeof b === `object`;
-    const bothDates = a instanceof Date && b instanceof Date;
-    const notNull = a !== null && b !== null;
-    if (bothObjects && !bothDates && notNull) {
-      return a.toString().localeCompare(b.toString());
-    }
-    if (a < b) return -1;
-    if (a > b) return 1;
-    return 0;
-  };
-  const descComparator = (a, b) => {
-    return ascComparator(b, a);
-  };
-  const makeComparator = (orderByProps) => {
-    return (a, b) => {
-      if (orderByProps.length > 1) {
-        const arrayA = a;
-        const arrayB = b;
-        for (let i = 0; i < orderByProps.length; i++) {
-          const direction = orderByProps[i].direction;
-          const compareFn = direction === `desc` ? descComparator : ascComparator;
-          const result = compareFn(arrayA[i], arrayB[i]);
-          if (result !== 0) {
-            return result;
-          }
-        }
-        return arrayA.length - arrayB.length;
-      }
-      if (orderByProps.length === 1) {
-        const direction = orderByProps[0].direction;
-        return direction === `desc` ? descComparator(a, b) : ascComparator(a, b);
-      }
-      return ascComparator(a, b);
-    };
-  };
-  const comparator = makeComparator(orderByItems);
-  if (hasOrderIndexColumn) {
-    if (orderIndexType === `numeric`) {
-      resultPipeline = resultPipeline.pipe(
-        orderByWithIndex(valueExtractor, {
-          limit: query.limit,
-          offset: query.offset,
-          comparator
-        }),
-        map(([key, [value, index]]) => {
-          const result = {
-            ...value,
-            [mainTableAlias]: {
-              ...value[mainTableAlias],
-              [orderIndexAlias]: index
-            }
-          };
-          return [key, result];
-        })
-      );
-    } else {
-      resultPipeline = resultPipeline.pipe(
-        orderByWithFractionalIndex(valueExtractor, {
-          limit: query.limit,
-          offset: query.offset,
-          comparator
-        }),
-        map(([key, [value, index]]) => {
-          const result = {
-            ...value,
-            [mainTableAlias]: {
-              ...value[mainTableAlias],
-              [orderIndexAlias]: index
-            }
-          };
-          return [key, result];
-        })
-      );
-    }
-  } else {
-    resultPipeline = resultPipeline.pipe(
-      orderBy(valueExtractor, {
-        limit: query.limit,
-        offset: query.offset,
-        comparator
-      })
-    );
-  }
-  return resultPipeline;
-}
-function getOrderIndexType(obj) {
-  if (!isOrderIndexFunctionCall(obj)) {
-    throw new Error(`Not an ORDER_INDEX function call`);
-  }
-  const arg = obj[`ORDER_INDEX`];
-  if (arg === `numeric` || arg === true || arg === `default`) {
-    return `numeric`;
-  } else if (arg === `fractional`) {
-    return `fractional`;
-  } else {
-    throw new Error(`Invalid ORDER_INDEX type: ` + arg);
-  }
-}
-export {
-  processOrderBy
-};
-//# sourceMappingURL=order-by.js.map

package/dist/esm/query/order-by.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"order-by.js","sources":["../../../src/query/order-by.ts"],"sourcesContent":["import {\n  map,\n  orderBy,\n  orderByWithFractionalIndex,\n  orderByWithIndex,\n} from \"@electric-sql/d2mini\"\nimport { evaluateOperandOnNamespacedRow } from \"./extractors\"\nimport { isOrderIndexFunctionCall } from \"./utils\"\nimport type { ConditionOperand, Query } from \"./schema\"\nimport type {\n  KeyedNamespacedRow,\n  NamespacedAndKeyedStream,\n  NamespacedRow,\n} from \"../types\"\n\ntype OrderByItem = {\n  operand: ConditionOperand\n  direction: `asc` | `desc`\n}\n\ntype OrderByItems = Array<OrderByItem>\n\nexport function processOrderBy(\n  resultPipeline: NamespacedAndKeyedStream,\n  query: Query,\n  mainTableAlias: string\n) {\n  // Check if any column in the SELECT clause is an ORDER_INDEX function call\n  let hasOrderIndexColumn = false\n  let orderIndexType: `numeric` | `fractional` = `numeric`\n  let orderIndexAlias = ``\n\n  // Scan the SELECT clause for ORDER_INDEX functions\n  // TODO: Select is going to be optional in future - we will automatically add an\n  // attribute for the index column\n  for (const item of query.select!) {\n    if (typeof item === `object`) {\n      for (const [alias, expr] of Object.entries(item)) {\n        if (typeof expr === `object` && isOrderIndexFunctionCall(expr)) {\n          hasOrderIndexColumn = true\n          orderIndexAlias = alias\n          orderIndexType = getOrderIndexType(expr)\n          break\n        }\n      }\n    }\n    if (hasOrderIndexColumn) break\n  }\n\n  // Normalize orderBy to an array of objects\n  const orderByItems: OrderByItems = []\n\n  if (typeof query.orderBy === `string`) {\n    // Handle string format: '@column'\n    orderByItems.push({\n      operand: query.orderBy,\n      direction: `asc`,\n    })\n  } else if (Array.isArray(query.orderBy)) {\n    // Handle array format: ['@column1', { '@column2': 'desc' }]\n    for (const item of query.orderBy) {\n      if (typeof item === `string`) {\n        orderByItems.push({\n          operand: item,\n          direction: `asc`,\n        })\n      } else if (typeof item === `object`) {\n        for (const [column, direction] of Object.entries(item)) {\n          orderByItems.push({\n            operand: column,\n            direction: direction as `asc` | `desc`,\n          })\n        }\n      }\n    }\n  } else if (typeof query.orderBy === `object`) {\n    // Handle object format: { '@column': 'desc' }\n    for (const [column, direction] of Object.entries(query.orderBy)) {\n      orderByItems.push({\n        operand: column,\n        direction: direction as `asc` | `desc`,\n      })\n    }\n  }\n\n  // Create a value extractor function for the orderBy operator\n  // const valueExtractor = ([key, namespacedRow]: [\n  const valueExtractor = (namespacedRow: NamespacedRow) => {\n    // For multiple orderBy columns, create a composite key\n    if (orderByItems.length > 1) {\n      return orderByItems.map((item) =>\n        evaluateOperandOnNamespacedRow(\n          namespacedRow,\n          item.operand,\n          mainTableAlias\n        )\n      )\n    } else if (orderByItems.length === 1) {\n      // For a single orderBy column, use the value directly\n      const item = orderByItems[0]\n      const val = evaluateOperandOnNamespacedRow(\n        namespacedRow,\n        item!.operand,\n        mainTableAlias\n      )\n      return val\n    }\n\n    // Default case - no ordering\n    return null\n  }\n\n  const ascComparator = (a: any, b: any): number => {\n    // if a and b are both strings, compare them based on locale\n    if (typeof a === `string` && typeof b === `string`) {\n      return a.localeCompare(b)\n    }\n\n    // if a and b are both arrays, compare them element by element\n    if (Array.isArray(a) && Array.isArray(b)) {\n      for (let i = 0; i < Math.min(a.length, b.length); i++) {\n        // Compare the values\n        const result = ascComparator(a[i], b[i])\n\n        if (result !== 0) {\n          return result\n        }\n      }\n      // All elements are equal up to the minimum length\n      return a.length - b.length\n    }\n\n    // If at least one of the values is an object then we don't really know how to meaningfully compare them\n    // therefore we turn them into strings and compare those\n    // There are 2 exceptions:\n    // 1) if both objects are dates then we can compare them\n    // 2) if either object is nullish then we can't call toString on it\n    const bothObjects = typeof a === `object` && typeof b === `object`\n    const bothDates = a instanceof Date && b instanceof Date\n    const notNull = a !== null && b !== null\n    if (bothObjects && !bothDates && notNull) {\n      // Every object should support `toString`\n      return a.toString().localeCompare(b.toString())\n    }\n\n    if (a < b) return -1\n    if (a > b) return 1\n    return 0\n  }\n\n  const descComparator = (a: unknown, b: unknown): number => {\n    return ascComparator(b, a)\n  }\n\n  // Create a multi-property comparator that respects the order and direction of each property\n  const makeComparator = (orderByProps: OrderByItems) => {\n    return (a: unknown, b: unknown) => {\n      // If we're comparing arrays (multiple properties), compare each property in order\n      if (orderByProps.length > 1) {\n        // `a` and `b` must be arrays since `orderByItems.length > 1`\n        // hence the extracted values must be arrays\n        const arrayA = a as Array<unknown>\n        const arrayB = b as Array<unknown>\n        for (let i = 0; i < orderByProps.length; i++) {\n          const direction = orderByProps[i]!.direction\n          const compareFn =\n            direction === `desc` ? descComparator : ascComparator\n          const result = compareFn(arrayA[i], arrayB[i])\n          if (result !== 0) {\n            return result\n          }\n        }\n        // should normally always be 0 because\n        // both values are extracted based on orderByItems\n        return arrayA.length - arrayB.length\n      }\n\n      // Single property comparison\n      if (orderByProps.length === 1) {\n        const direction = orderByProps[0]!.direction\n        return direction === `desc` ? descComparator(a, b) : ascComparator(a, b)\n      }\n\n      return ascComparator(a, b)\n    }\n  }\n  const comparator = makeComparator(orderByItems)\n\n  // Apply the appropriate orderBy operator based on whether an ORDER_INDEX column is requested\n  if (hasOrderIndexColumn) {\n    if (orderIndexType === `numeric`) {\n      // Use orderByWithIndex for numeric indices\n      resultPipeline = resultPipeline.pipe(\n        orderByWithIndex(valueExtractor, {\n          limit: query.limit,\n          offset: query.offset,\n          comparator,\n        }),\n        map(([key, [value, index]]) => {\n          // Add the index to the result\n          // We add this to the main table alias for now\n          // TODO: re are going to need to refactor the whole order by pipeline\n          const result = {\n            ...(value as Record<string, unknown>),\n            [mainTableAlias]: {\n              ...value[mainTableAlias],\n              [orderIndexAlias]: index,\n            },\n          }\n          return [key, result] as KeyedNamespacedRow\n        })\n      )\n    } else {\n      // Use orderByWithFractionalIndex for fractional indices\n      resultPipeline = resultPipeline.pipe(\n        orderByWithFractionalIndex(valueExtractor, {\n          limit: query.limit,\n          offset: query.offset,\n          comparator,\n        }),\n        map(([key, [value, index]]) => {\n          // Add the index to the result\n          // We add this to the main table alias for now\n          // TODO: re are going to need to refactor the whole order by pipeline\n          const result = {\n            ...(value as Record<string, unknown>),\n            [mainTableAlias]: {\n              ...value[mainTableAlias],\n              [orderIndexAlias]: index,\n            },\n          }\n          return [key, result] as KeyedNamespacedRow\n        })\n      )\n    }\n  } else {\n    // Use regular orderBy if no index column is requested\n    resultPipeline = resultPipeline.pipe(\n      orderBy(valueExtractor, {\n        limit: query.limit,\n        offset: query.offset,\n        comparator,\n      })\n    )\n  }\n\n  return resultPipeline\n}\n\n// Helper function to extract the ORDER_INDEX type from a function call\nfunction getOrderIndexType(obj: any): `numeric` | `fractional` {\n  if (!isOrderIndexFunctionCall(obj)) {\n    throw new Error(`Not an ORDER_INDEX function call`)\n  }\n\n  const arg = obj[`ORDER_INDEX`]\n  if (arg === `numeric` || arg === true || arg === `default`) {\n    return `numeric`\n  } else if (arg === `fractional`) {\n    return `fractional`\n  } else {\n    throw new Error(`Invalid ORDER_INDEX type: ` + arg)\n  }\n}\n"],"names":[],"mappings":"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"}

package/dist/esm/query/pipeline-compiler.d.ts

@@ -1,10 +0,0 @@
-import { Query } from './schema.js';
-import { IStreamBuilder } from '@electric-sql/d2mini';
-import { KeyedStream } from '../types.js';
-/**
- * Compiles a query into a D2 pipeline
- * @param query The query to compile
- * @param inputs Mapping of table names to input streams
- * @returns A stream builder representing the compiled query
- */
-export declare function compileQueryPipeline<T extends IStreamBuilder<unknown>>(query: Query, inputs: Record<string, KeyedStream>): T;

package/dist/esm/query/pipeline-compiler.js

@@ -1,89 +0,0 @@
-import { map, filter } from "@electric-sql/d2mini";
-import { evaluateWhereOnNamespacedRow } from "./evaluators.js";
-import { processJoinClause } from "./joins.js";
-import { processGroupBy } from "./group-by.js";
-import { processOrderBy } from "./order-by.js";
-import { processSelect } from "./select.js";
-function compileQueryPipeline(query, inputs) {
-  const allInputs = { ...inputs };
-  if (query.with && query.with.length > 0) {
-    for (const withQuery of query.with) {
-      if (!withQuery.as) {
-        throw new Error(`WITH query must have an "as" property`);
-      }
-      if (allInputs[withQuery.as]) {
-        throw new Error(`CTE with name "${withQuery.as}" already exists`);
-      }
-      const withQueryWithoutWith = { ...withQuery, with: void 0 };
-      const compiledWithQuery = compileQueryPipeline(
-        withQueryWithoutWith,
-        allInputs
-      );
-      allInputs[withQuery.as] = compiledWithQuery;
-    }
-  }
-  const tables = {};
-  const mainTableAlias = query.as || query.from;
-  const input = allInputs[query.from];
-  if (!input) {
-    throw new Error(`Input for table "${query.from}" not found in inputs map`);
-  }
-  tables[mainTableAlias] = input;
-  let pipeline = input.pipe(
-    map(([key, row]) => {
-      const ret = [key, { [mainTableAlias]: row }];
-      return ret;
-    })
-  );
-  if (query.join) {
-    pipeline = processJoinClause(
-      pipeline,
-      query,
-      tables,
-      mainTableAlias,
-      allInputs
-    );
-  }
-  if (query.where) {
-    pipeline = pipeline.pipe(
-      filter(([_key, row]) => {
-        const result = evaluateWhereOnNamespacedRow(
-          row,
-          query.where,
-          mainTableAlias
-        );
-        return result;
-      })
-    );
-  }
-  if (query.groupBy) {
-    pipeline = processGroupBy(pipeline, query, mainTableAlias);
-  }
-  if (query.having) {
-    pipeline = pipeline.pipe(
-      filter(([_key, row]) => {
-        const result = evaluateWhereOnNamespacedRow(
-          row,
-          query.having,
-          mainTableAlias
-        );
-        return result;
-      })
-    );
-  }
-  if (query.orderBy) {
-    pipeline = processOrderBy(pipeline, query, mainTableAlias);
-  } else if (query.limit !== void 0 || query.offset !== void 0) {
-    throw new Error(
-      `LIMIT and OFFSET require an ORDER BY clause to ensure deterministic results`
-    );
-  }
-  const resultPipeline = query.select ? processSelect(pipeline, query, mainTableAlias, allInputs) : !query.join && !query.groupBy ? pipeline.pipe(
-    map(([key, row]) => [key, row[mainTableAlias]])
-  ) : pipeline;
-  return resultPipeline;
-}
-export {
-  compileQueryPipeline
-};
-//# sourceMappingURL=pipeline-compiler.js.map

package/dist/esm/query/pipeline-compiler.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"pipeline-compiler.js","sources":["../../../src/query/pipeline-compiler.ts"],"sourcesContent":["import { filter, map } from \"@electric-sql/d2mini\"\nimport { evaluateWhereOnNamespacedRow } from \"./evaluators.js\"\nimport { processJoinClause } from \"./joins.js\"\nimport { processGroupBy } from \"./group-by.js\"\nimport { processOrderBy } from \"./order-by.js\"\nimport { processSelect } from \"./select.js\"\nimport type { Query } from \"./schema.js\"\nimport type { IStreamBuilder } from \"@electric-sql/d2mini\"\nimport type {\n  InputRow,\n  KeyedStream,\n  NamespacedAndKeyedStream,\n} from \"../types.js\"\n\n/**\n * Compiles a query into a D2 pipeline\n * @param query The query to compile\n * @param inputs Mapping of table names to input streams\n * @returns A stream builder representing the compiled query\n */\nexport function compileQueryPipeline<T extends IStreamBuilder<unknown>>(\n  query: Query,\n  inputs: Record<string, KeyedStream>\n): T {\n  // Create a copy of the inputs map to avoid modifying the original\n  const allInputs = { ...inputs }\n\n  // Process WITH queries if they exist\n  if (query.with && query.with.length > 0) {\n    // Process each WITH query in order\n    for (const withQuery of query.with) {\n      // Ensure the WITH query has an alias\n      if (!withQuery.as) {\n        throw new Error(`WITH query must have an \"as\" property`)\n      }\n\n      // Check if this CTE name already exists in the inputs\n      if (allInputs[withQuery.as]) {\n        throw new Error(`CTE with name \"${withQuery.as}\" already exists`)\n      }\n\n      // Create a new query without the 'with' property to avoid circular references\n      const withQueryWithoutWith = { ...withQuery, with: undefined }\n\n      // Compile the WITH query using the current set of inputs\n      // (which includes previously compiled WITH queries)\n      const compiledWithQuery = compileQueryPipeline(\n        withQueryWithoutWith,\n        allInputs\n      )\n\n      // Add the compiled query to the inputs map using its alias\n      allInputs[withQuery.as] = compiledWithQuery as KeyedStream\n    }\n  }\n\n  // Create a map of table aliases to inputs\n  const tables: Record<string, KeyedStream> = {}\n\n  // The main table is the one in the FROM clause\n  const mainTableAlias = query.as || query.from\n\n  // Get the main input from the inputs map (now including CTEs)\n  const input = allInputs[query.from]\n  if (!input) {\n    throw new Error(`Input for table \"${query.from}\" not found in inputs map`)\n  }\n\n  tables[mainTableAlias] = input\n\n  // Prepare the initial pipeline with the main table wrapped in its alias\n  let pipeline: NamespacedAndKeyedStream = input.pipe(\n    map(([key, row]) => {\n      // Initialize the record with a nested structure\n      const ret = [key, { [mainTableAlias]: row }] as [\n        string,\n        Record<string, typeof row>,\n      ]\n      return ret\n    })\n  )\n\n  // Process JOIN clauses if they exist\n  if (query.join) {\n    pipeline = processJoinClause(\n      pipeline,\n      query,\n      tables,\n      mainTableAlias,\n      allInputs\n    )\n  }\n\n  // Process the WHERE clause if it exists\n  if (query.where) {\n    pipeline = pipeline.pipe(\n      filter(([_key, row]) => {\n        const result = evaluateWhereOnNamespacedRow(\n          row,\n          query.where!,\n          mainTableAlias\n        )\n        return result\n      })\n    )\n  }\n\n  // Process the GROUP BY clause if it exists\n  if (query.groupBy) {\n    pipeline = processGroupBy(pipeline, query, mainTableAlias)\n  }\n\n  // Process the HAVING clause if it exists\n  // This works similarly to WHERE but is applied after any aggregations\n  if (query.having) {\n    pipeline = pipeline.pipe(\n      filter(([_key, row]) => {\n        // For HAVING, we're working with the flattened row that contains both\n        // the group by keys and the aggregate results directly\n        const result = evaluateWhereOnNamespacedRow(\n          row,\n          query.having!,\n          mainTableAlias\n        )\n        return result\n      })\n    )\n  }\n\n  // Process orderBy parameter if it exists\n  if (query.orderBy) {\n    pipeline = processOrderBy(pipeline, query, mainTableAlias)\n  } else if (query.limit !== undefined || query.offset !== undefined) {\n    // If there's a limit or offset without orderBy, throw an error\n    throw new Error(\n      `LIMIT and OFFSET require an ORDER BY clause to ensure deterministic results`\n    )\n  }\n\n  // Process the SELECT clause - this is where we flatten the structure\n  const resultPipeline: KeyedStream | NamespacedAndKeyedStream = query.select\n    ? processSelect(pipeline, query, mainTableAlias, allInputs)\n    : !query.join && !query.groupBy\n      ? pipeline.pipe(\n          map(([key, row]) => [key, row[mainTableAlias]] as InputRow)\n        )\n      : pipeline\n  return resultPipeline as T\n}\n"],"names":[],"mappings":";;;;;;AAoBgB,SAAA,qBACd,OACA,QACG;AAEG,QAAA,YAAY,EAAE,GAAG,OAAO;AAG9B,MAAI,MAAM,QAAQ,MAAM,KAAK,SAAS,GAAG;AAE5B,eAAA,aAAa,MAAM,MAAM;AAE9B,UAAA,CAAC,UAAU,IAAI;AACX,cAAA,IAAI,MAAM,uCAAuC;AAAA,MAAA;AAIrD,UAAA,UAAU,UAAU,EAAE,GAAG;AAC3B,cAAM,IAAI,MAAM,kBAAkB,UAAU,EAAE,kBAAkB;AAAA,MAAA;AAIlE,YAAM,uBAAuB,EAAE,GAAG,WAAW,MAAM,OAAU;AAI7D,YAAM,oBAAoB;AAAA,QACxB;AAAA,QACA;AAAA,MACF;AAGU,gBAAA,UAAU,EAAE,IAAI;AAAA,IAAA;AAAA,EAC5B;AAIF,QAAM,SAAsC,CAAC;AAGvC,QAAA,iBAAiB,MAAM,MAAM,MAAM;AAGnC,QAAA,QAAQ,UAAU,MAAM,IAAI;AAClC,MAAI,CAAC,OAAO;AACV,UAAM,IAAI,MAAM,oBAAoB,MAAM,IAAI,2BAA2B;AAAA,EAAA;AAG3E,SAAO,cAAc,IAAI;AAGzB,MAAI,WAAqC,MAAM;AAAA,IAC7C,IAAI,CAAC,CAAC,KAAK,GAAG,MAAM;AAEZ,YAAA,MAAM,CAAC,KAAK,EAAE,CAAC,cAAc,GAAG,KAAK;AAIpC,aAAA;AAAA,IACR,CAAA;AAAA,EACH;AAGA,MAAI,MAAM,MAAM;AACH,eAAA;AAAA,MACT;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,EAAA;AAIF,MAAI,MAAM,OAAO;AACf,eAAW,SAAS;AAAA,MAClB,OAAO,CAAC,CAAC,MAAM,GAAG,MAAM;AACtB,cAAM,SAAS;AAAA,UACb;AAAA,UACA,MAAM;AAAA,UACN;AAAA,QACF;AACO,eAAA;AAAA,MACR,CAAA;AAAA,IACH;AAAA,EAAA;AAIF,MAAI,MAAM,SAAS;AACN,eAAA,eAAe,UAAU,OAAO,cAAc;AAAA,EAAA;AAK3D,MAAI,MAAM,QAAQ;AAChB,eAAW,SAAS;AAAA,MAClB,OAAO,CAAC,CAAC,MAAM,GAAG,MAAM;AAGtB,cAAM,SAAS;AAAA,UACb;AAAA,UACA,MAAM;AAAA,UACN;AAAA,QACF;AACO,eAAA;AAAA,MACR,CAAA;AAAA,IACH;AAAA,EAAA;AAIF,MAAI,MAAM,SAAS;AACN,eAAA,eAAe,UAAU,OAAO,cAAc;AAAA,EAAA,WAChD,MAAM,UAAU,UAAa,MAAM,WAAW,QAAW;AAElE,UAAM,IAAI;AAAA,MACR;AAAA,IACF;AAAA,EAAA;AAIF,QAAM,iBAAyD,MAAM,SACjE,cAAc,UAAU,OAAO,gBAAgB,SAAS,IACxD,CAAC,MAAM,QAAQ,CAAC,MAAM,UACpB,SAAS;AAAA,IACP,IAAI,CAAC,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,cAAc,CAAC,CAAa;AAAA,EAAA,IAE5D;AACC,SAAA;AACT;"}