@tanstack/db 0.0.14 → 0.0.15

package/src/query/schema.ts

@@ -1,268 +0,0 @@
-import type {
-  Context,
-  InputReference,
-  PropertyReference,
-  PropertyReferenceString,
-  Schema,
-  WildcardReferenceString,
-} from "./types.js"
-import type { Collection } from "../collection"
-
-// Identifiers
-export type ColumnName<TColumnNames extends string> = TColumnNames
-
-// JSONLike supports any JSON-compatible value plus Date objects.
-export type JSONLike =
-  | string
-  | number
-  | boolean
-  | Date
-  | null
-  | Array<JSONLike>
-  | { [key: string]: JSONLike }
-
-// LiteralValue supports common primitives, JS Date, or undefined.
-// We exclude strings that start with "@" because they are property references.
-export type LiteralValue =
-  | (string & {})
-  | number
-  | boolean
-  | Date
-  | null
-  | undefined
-
-// `in` and `not in` operators require an array of values
-// the other operators require a single literal value
-export type ComparatorValue<
-  T extends Comparator,
-  TContext extends Context<Schema>,
-> = T extends `in` | `not in`
-  ? Array<LiteralValue>
-  : PropertyReferenceString<TContext> | LiteralValue
-
-// These versions are for use with methods on the query builder where we want to
-// ensure that the argument is a string that does not start with "@".
-// Can be combined with PropertyReference for validating references.
-export type SafeString<T extends string> = T extends `@${string}` ? never : T
-export type OptionalSafeString<T extends any> = T extends string
-  ? SafeString<T>
-  : never
-export type LiteralValueWithSafeString<T extends any> =
-  | (OptionalSafeString<T> & {})
-  | number
-  | boolean
-  | Date
-  | null
-  | undefined
-
-// To force a literal value (which may be arbitrary JSON or a Date), wrap it in an object with the "value" key.
-export interface ExplicitLiteral {
-  value: JSONLike
-}
-
-// Allowed function names (common SQL functions)
-export type AllowedFunctionName =
-  | `DATE`
-  | `JSON_EXTRACT`
-  | `JSON_EXTRACT_PATH`
-  | `UPPER`
-  | `LOWER`
-  | `COALESCE`
-  | `CONCAT`
-  | `LENGTH`
-  | `ORDER_INDEX`
-
-// A function call is represented as a union of objects—each having exactly one key that is one of the allowed function names.
-export type FunctionCall<TContext extends Context = Context> = {
-  [K in AllowedFunctionName]: {
-    [key in K]: ConditionOperand<TContext> | Array<ConditionOperand<TContext>>
-  }
-}[AllowedFunctionName]
-
-export type AggregateFunctionName =
-  | `SUM`
-  | `COUNT`
-  | `AVG`
-  | `MIN`
-  | `MAX`
-  | `MEDIAN`
-  | `MODE`
-
-export type AggregateFunctionCall<TContext extends Context = Context> = {
-  [K in AggregateFunctionName]: {
-    [key in K]: ConditionOperand<TContext> | Array<ConditionOperand<TContext>>
-  }
-}[AggregateFunctionName]
-
-/**
- * An operand in a condition may be:
- * - A literal value (LiteralValue)
- * - A column reference (a string starting with "@" or an explicit { col: string } object)
- * - An explicit literal (to wrap arbitrary JSON or Date values) as { value: ... }
- * - A function call (as defined above)
- * - An array of operands (for example, for "in" clauses)
- */
-export type ConditionOperand<
-  TContext extends Context = Context,
-  T extends any = any,
-> =
-  | LiteralValue
-  | PropertyReference<TContext>
-  | ExplicitLiteral
-  | FunctionCall<TContext>
-  | Array<ConditionOperand<TContext, T>>
-
-// Allowed SQL comparators.
-export type Comparator =
-  | `=`
-  | `!=`
-  | `<`
-  | `<=`
-  | `>`
-  | `>=`
-  | `like`
-  | `not like`
-  | `in`
-  | `not in`
-  | `is`
-  | `is not`
-
-// Logical operators.
-export type LogicalOperator = `and` | `or`
-
-// A simple condition is a tuple: [left operand, comparator, right operand].
-export type SimpleCondition<
-  TContext extends Context = Context,
-  T extends any = any,
-> = [ConditionOperand<TContext, T>, Comparator, ConditionOperand<TContext, T>]
-
-// A flat composite condition allows all elements to be at the same level:
-// [left1, op1, right1, 'and'/'or', left2, op2, right2, ...]
-export type FlatCompositeCondition<
-  TContext extends Context = Context,
-  T extends any = any,
-> = [
-  ConditionOperand<TContext, T>,
-  Comparator,
-  ConditionOperand<TContext, T>,
-  ...Array<LogicalOperator | ConditionOperand<TContext, T> | Comparator>,
-]
-
-// A nested composite condition combines conditions with logical operators
-// The first element can be a SimpleCondition or FlatCompositeCondition
-// followed by logical operators and more conditions
-export type NestedCompositeCondition<
-  TContext extends Context = Context,
-  T extends any = any,
-> = [
-  SimpleCondition<TContext, T> | FlatCompositeCondition<TContext, T>,
-  ...Array<
-    | LogicalOperator
-    | SimpleCondition<TContext, T>
-    | FlatCompositeCondition<TContext, T>
-  >,
-]
-
-// A condition is either a simple condition or a composite condition (flat or nested).
-export type Condition<
-  TContext extends Context = Context,
-  T extends any = any,
-> =
-  | SimpleCondition<TContext, T>
-  | FlatCompositeCondition<TContext, T>
-  | NestedCompositeCondition<TContext, T>
-
-// A join clause includes a join type, the table to join, an optional alias,
-// an "on" condition, and an optional "where" clause specific to the join.
-export interface JoinClause<TContext extends Context = Context> {
-  type: `inner` | `left` | `right` | `full` | `cross`
-  from: string
-  as?: string
-  on: Condition<TContext>
-}
-
-// The orderBy clause can be a string, an object mapping a column to "asc" or "desc",
-// or an array of such items.
-export type OrderBy<TContext extends Context = Context> =
-  | PropertyReferenceString<TContext>
-  | { [column in PropertyReferenceString<TContext>]?: `asc` | `desc` }
-  | Record<PropertyReferenceString<TContext>, `asc` | `desc`>
-  | Array<
-      | PropertyReferenceString<TContext>
-      | { [column in PropertyReferenceString<TContext>]?: `asc` | `desc` }
-    >
-
-export type Select<TContext extends Context = Context> =
-  | PropertyReferenceString<TContext>
-  | {
-      [alias: string]:
-        | PropertyReference<TContext>
-        | FunctionCall<TContext>
-        | AggregateFunctionCall<TContext>
-    }
-  | WildcardReferenceString<TContext>
-  | SelectCallback<TContext>
-
-export type SelectCallback<TContext extends Context = Context> = (
-  context: TContext extends { schema: infer S } ? S : any
-) => any
-
-export type As<_TContext extends Context = Context> = string
-
-export type From<TContext extends Context = Context> = InputReference<{
-  baseSchema: TContext[`baseSchema`]
-  schema: TContext[`baseSchema`]
-}>
-
-export type WhereCallback<TContext extends Context = Context> = (
-  context: TContext extends { schema: infer S } ? S : any
-) => boolean
-
-export type Where<TContext extends Context = Context> = Array<
-  Condition<TContext> | WhereCallback<TContext>
->
-
-// Having is the same implementation as a where clause, its just run after the group by
-export type Having<TContext extends Context = Context> = Where<TContext>
-
-export type GroupBy<TContext extends Context = Context> =
-  | PropertyReference<TContext>
-  | Array<PropertyReference<TContext>>
-
-export type Limit<_TContext extends Context = Context> = number
-
-export type Offset<_TContext extends Context = Context> = number
-
-export interface BaseQuery<TContext extends Context = Context> {
-  // The select clause is an array of either plain strings or objects mapping alias names
-  // to expressions. Plain strings starting with "@" denote column references.
-  // Plain string "@*" denotes all columns from all tables.
-  // Plain string "@table.*" denotes all columns from a specific table.
-  select?: Array<Select<TContext>>
-  as?: As<TContext>
-  from: From<TContext>
-  join?: Array<JoinClause<TContext>>
-  where?: Where<TContext>
-  groupBy?: GroupBy<TContext>
-  having?: Having<TContext>
-  orderBy?: OrderBy<TContext>
-  limit?: Limit<TContext>
-  offset?: Offset<TContext>
-}
-
-// The top-level query interface.
-export interface Query<TContext extends Context = Context>
-  extends BaseQuery<TContext> {
-  with?: Array<WithQuery<TContext>>
-  collections?: {
-    [K: string]: Collection<any>
-  }
-}
-
-// A WithQuery is a query that is used as a Common Table Expression (CTE)
-// It cannot be keyed and must have an alias (as)
-// There is no support for recursive CTEs
-export interface WithQuery<TContext extends Context = Context>
-  extends BaseQuery<TContext> {
-  as: string
-}

package/src/query/select.ts

@@ -1,208 +0,0 @@
-import { map } from "@electric-sql/d2mini"
-import {
-  evaluateOperandOnNamespacedRow,
-  extractValueFromNamespacedRow,
-} from "./extractors"
-import type { ConditionOperand, Query, SelectCallback } from "./schema"
-import type { KeyedStream, NamespacedAndKeyedStream } from "../types"
-
-export function processSelect(
-  pipeline: NamespacedAndKeyedStream,
-  query: Query,
-  mainTableAlias: string,
-  inputs: Record<string, KeyedStream>
-): KeyedStream {
-  return pipeline.pipe(
-    map(([key, namespacedRow]) => {
-      const result: Record<string, unknown> = {}
-
-      // Check if this is a grouped result (has no nested table structure)
-      // If it's a grouped result, we need to handle it differently
-      const isGroupedResult =
-        query.groupBy &&
-        Object.keys(namespacedRow).some(
-          (namespaceKey) =>
-            !Object.keys(inputs).includes(namespaceKey) &&
-            typeof namespacedRow[namespaceKey] !== `object`
-        )
-
-      if (!query.select) {
-        throw new Error(`Cannot process missing SELECT clause`)
-      }
-
-      for (const item of query.select) {
-        // Handle callback functions
-        if (typeof item === `function`) {
-          const callback = item as SelectCallback
-          const callbackResult = callback(namespacedRow)
-
-          // If the callback returns an object, merge its properties into the result
-          if (
-            callbackResult &&
-            typeof callbackResult === `object` &&
-            !Array.isArray(callbackResult)
-          ) {
-            Object.assign(result, callbackResult)
-          } else {
-            // If the callback returns a primitive value, we can't merge it
-            // This would need a specific key, but since we don't have one, we'll skip it
-            // In practice, select callbacks should return objects with keys
-            console.warn(
-              `SelectCallback returned a non-object value. SelectCallbacks should return objects with key-value pairs.`
-            )
-          }
-          continue
-        }
-
-        if (typeof item === `string`) {
-          // Handle wildcard select - all columns from all tables
-          if ((item as string) === `@*`) {
-            // For grouped results, just return the row as is
-            if (isGroupedResult) {
-              Object.assign(result, namespacedRow)
-            } else {
-              // Extract all columns from all tables
-              Object.assign(
-                result,
-                extractAllColumnsFromAllTables(namespacedRow)
-              )
-            }
-            continue
-          }
-
-          // Handle @table.* syntax - all columns from a specific table
-          if (
-            (item as string).startsWith(`@`) &&
-            (item as string).endsWith(`.*`)
-          ) {
-            const tableAlias = (item as string).slice(1, -2) // Remove the '@' and '.*' parts
-
-            // For grouped results, check if we have columns from this table
-            if (isGroupedResult) {
-              // In grouped results, we don't have the nested structure anymore
-              // So we can't extract by table. Just continue to the next item.
-              continue
-            } else {
-              // Extract all columns from the specified table
-              Object.assign(
-                result,
-                extractAllColumnsFromTable(namespacedRow, tableAlias)
-              )
-            }
-            continue
-          }
-
-          // Handle simple column references like "@table.column" or "@column"
-          if ((item as string).startsWith(`@`)) {
-            const columnRef = (item as string).substring(1)
-            const alias = columnRef
-
-            // For grouped results, check if the column is directly in the row first
-            if (isGroupedResult && columnRef in namespacedRow) {
-              result[alias] = namespacedRow[columnRef]
-            } else {
-              // Extract the value from the nested structure
-              result[alias] = extractValueFromNamespacedRow(
-                namespacedRow,
-                columnRef,
-                mainTableAlias,
-                undefined
-              )
-            }
-
-            // If the alias contains a dot (table.column),
-            // use just the column part as the field name
-            if (alias.includes(`.`)) {
-              const columnName = alias.split(`.`)[1]
-              result[columnName!] = result[alias]
-              delete result[alias]
-            }
-          }
-        } else {
-          // Handle aliased columns like { alias: "@column_name" }
-          for (const [alias, expr] of Object.entries(item)) {
-            if (typeof expr === `string` && (expr as string).startsWith(`@`)) {
-              const columnRef = (expr as string).substring(1)
-
-              // For grouped results, check if the column is directly in the row first
-              if (isGroupedResult && columnRef in namespacedRow) {
-                result[alias] = namespacedRow[columnRef]
-              } else {
-                // Extract the value from the nested structure
-                result[alias] = extractValueFromNamespacedRow(
-                  namespacedRow,
-                  columnRef,
-                  mainTableAlias,
-                  undefined
-                )
-              }
-            } else if (typeof expr === `object`) {
-              // For grouped results, the aggregate results are already in the row
-              if (isGroupedResult && alias in namespacedRow) {
-                result[alias] = namespacedRow[alias]
-              } else if ((expr as { ORDER_INDEX: unknown }).ORDER_INDEX) {
-                result[alias] = namespacedRow[mainTableAlias]![alias]
-              } else {
-                // This might be a function call
-                result[alias] = evaluateOperandOnNamespacedRow(
-                  namespacedRow,
-                  expr as ConditionOperand,
-                  mainTableAlias,
-                  undefined
-                )
-              }
-            }
-          }
-        }
-      }
-
-      return [key, result] as [string, typeof result]
-    })
-  )
-}
-
-// Helper function to extract all columns from all tables in a nested row
-function extractAllColumnsFromAllTables(
-  namespacedRow: Record<string, unknown>
-): Record<string, unknown> {
-  const result: Record<string, unknown> = {}
-
-  // Process each table in the nested row
-  for (const [tableAlias, tableData] of Object.entries(namespacedRow)) {
-    if (tableData && typeof tableData === `object`) {
-      // Add all columns from this table to the result
-      // If there are column name conflicts, the last table's columns will overwrite previous ones
-      Object.assign(
-        result,
-        extractAllColumnsFromTable(namespacedRow, tableAlias)
-      )
-    }
-  }
-
-  return result
-}
-
-// Helper function to extract all columns from a table in a nested row
-function extractAllColumnsFromTable(
-  namespacedRow: Record<string, unknown>,
-  tableAlias: string
-): Record<string, unknown> {
-  const result: Record<string, unknown> = {}
-
-  // Get the table data
-  const tableData = namespacedRow[tableAlias] as
-    | Record<string, unknown>
-    | null
-    | undefined
-
-  if (!tableData || typeof tableData !== `object`) {
-    return result
-  }
-
-  // Add all columns from the table to the result
-  for (const [columnName, value] of Object.entries(tableData)) {
-    result[columnName] = value
-  }
-
-  return result
-}