@query-graph/core 1.1.5 → 1.1.7

package/native.js

@@ -81,12 +81,12 @@ function requireNative() {
         const binding = require('@query-graph/core-android-arm64')
         const bindingPackageVersion = require('@query-graph/core-android-arm64/package.json').version
         if (
-          bindingPackageVersion !== '1.1.5' &&
+          bindingPackageVersion !== '1.1.7' &&
           process.env.NAPI_RS_ENFORCE_VERSION_CHECK &&
           process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0'
         ) {
           throw new Error(
-            `Native binding package version mismatch, expected 1.1.5 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
+            `Native binding package version mismatch, expected 1.1.7 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
           )
         }
         return binding
@@ -103,12 +103,12 @@ function requireNative() {
         const binding = require('@query-graph/core-android-arm-eabi')
         const bindingPackageVersion = require('@query-graph/core-android-arm-eabi/package.json').version
         if (
-          bindingPackageVersion !== '1.1.5' &&
+          bindingPackageVersion !== '1.1.7' &&
           process.env.NAPI_RS_ENFORCE_VERSION_CHECK &&
           process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0'
         ) {
           throw new Error(
-            `Native binding package version mismatch, expected 1.1.5 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
+            `Native binding package version mismatch, expected 1.1.7 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
           )
         }
         return binding
@@ -129,12 +129,12 @@ function requireNative() {
         const binding = require('@query-graph/core-win32-x64-msvc')
         const bindingPackageVersion = require('@query-graph/core-win32-x64-msvc/package.json').version
         if (
-          bindingPackageVersion !== '1.1.5' &&
+          bindingPackageVersion !== '1.1.7' &&
           process.env.NAPI_RS_ENFORCE_VERSION_CHECK &&
           process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0'
         ) {
           throw new Error(
-            `Native binding package version mismatch, expected 1.1.5 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
+            `Native binding package version mismatch, expected 1.1.7 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
           )
         }
         return binding
@@ -151,12 +151,12 @@ function requireNative() {
         const binding = require('@query-graph/core-win32-ia32-msvc')
         const bindingPackageVersion = require('@query-graph/core-win32-ia32-msvc/package.json').version
         if (
-          bindingPackageVersion !== '1.1.5' &&
+          bindingPackageVersion !== '1.1.7' &&
           process.env.NAPI_RS_ENFORCE_VERSION_CHECK &&
           process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0'
         ) {
           throw new Error(
-            `Native binding package version mismatch, expected 1.1.5 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
+            `Native binding package version mismatch, expected 1.1.7 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
           )
         }
         return binding
@@ -173,12 +173,12 @@ function requireNative() {
         const binding = require('@query-graph/core-win32-arm64-msvc')
         const bindingPackageVersion = require('@query-graph/core-win32-arm64-msvc/package.json').version
         if (
-          bindingPackageVersion !== '1.1.5' &&
+          bindingPackageVersion !== '1.1.7' &&
           process.env.NAPI_RS_ENFORCE_VERSION_CHECK &&
           process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0'
         ) {
           throw new Error(
-            `Native binding package version mismatch, expected 1.1.5 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
+            `Native binding package version mismatch, expected 1.1.7 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
           )
         }
         return binding
@@ -198,12 +198,12 @@ function requireNative() {
       const binding = require('@query-graph/core-darwin-universal')
       const bindingPackageVersion = require('@query-graph/core-darwin-universal/package.json').version
       if (
-        bindingPackageVersion !== '1.1.5' &&
+        bindingPackageVersion !== '1.1.7' &&
         process.env.NAPI_RS_ENFORCE_VERSION_CHECK &&
         process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0'
       ) {
         throw new Error(
-          `Native binding package version mismatch, expected 1.1.5 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
+          `Native binding package version mismatch, expected 1.1.7 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
         )
       }
       return binding
@@ -220,12 +220,12 @@ function requireNative() {
         const binding = require('@query-graph/core-darwin-x64')
         const bindingPackageVersion = require('@query-graph/core-darwin-x64/package.json').version
         if (
-          bindingPackageVersion !== '1.1.5' &&
+          bindingPackageVersion !== '1.1.7' &&
           process.env.NAPI_RS_ENFORCE_VERSION_CHECK &&
           process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0'
         ) {
           throw new Error(
-            `Native binding package version mismatch, expected 1.1.5 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
+            `Native binding package version mismatch, expected 1.1.7 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
           )
         }
         return binding
@@ -242,12 +242,12 @@ function requireNative() {
         const binding = require('@query-graph/core-darwin-arm64')
         const bindingPackageVersion = require('@query-graph/core-darwin-arm64/package.json').version
         if (
-          bindingPackageVersion !== '1.1.5' &&
+          bindingPackageVersion !== '1.1.7' &&
           process.env.NAPI_RS_ENFORCE_VERSION_CHECK &&
           process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0'
         ) {
           throw new Error(
-            `Native binding package version mismatch, expected 1.1.5 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
+            `Native binding package version mismatch, expected 1.1.7 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
           )
         }
         return binding
@@ -268,12 +268,12 @@ function requireNative() {
         const binding = require('@query-graph/core-freebsd-x64')
         const bindingPackageVersion = require('@query-graph/core-freebsd-x64/package.json').version
         if (
-          bindingPackageVersion !== '1.1.5' &&
+          bindingPackageVersion !== '1.1.7' &&
           process.env.NAPI_RS_ENFORCE_VERSION_CHECK &&
           process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0'
         ) {
           throw new Error(
-            `Native binding package version mismatch, expected 1.1.5 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
+            `Native binding package version mismatch, expected 1.1.7 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
           )
         }
         return binding
@@ -290,12 +290,12 @@ function requireNative() {
         const binding = require('@query-graph/core-freebsd-arm64')
         const bindingPackageVersion = require('@query-graph/core-freebsd-arm64/package.json').version
         if (
-          bindingPackageVersion !== '1.1.5' &&
+          bindingPackageVersion !== '1.1.7' &&
           process.env.NAPI_RS_ENFORCE_VERSION_CHECK &&
           process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0'
         ) {
           throw new Error(
-            `Native binding package version mismatch, expected 1.1.5 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
+            `Native binding package version mismatch, expected 1.1.7 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
           )
         }
         return binding
@@ -317,12 +317,12 @@ function requireNative() {
           const binding = require('@query-graph/core-linux-x64-musl')
           const bindingPackageVersion = require('@query-graph/core-linux-x64-musl/package.json').version
           if (
-            bindingPackageVersion !== '1.1.5' &&
+            bindingPackageVersion !== '1.1.7' &&
             process.env.NAPI_RS_ENFORCE_VERSION_CHECK &&
             process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0'
           ) {
             throw new Error(
-              `Native binding package version mismatch, expected 1.1.5 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
+              `Native binding package version mismatch, expected 1.1.7 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
             )
           }
           return binding
@@ -339,12 +339,12 @@ function requireNative() {
           const binding = require('@query-graph/core-linux-x64-gnu')
           const bindingPackageVersion = require('@query-graph/core-linux-x64-gnu/package.json').version
           if (
-            bindingPackageVersion !== '1.1.5' &&
+            bindingPackageVersion !== '1.1.7' &&
             process.env.NAPI_RS_ENFORCE_VERSION_CHECK &&
             process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0'
           ) {
             throw new Error(
-              `Native binding package version mismatch, expected 1.1.5 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
+              `Native binding package version mismatch, expected 1.1.7 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
             )
           }
           return binding
@@ -363,12 +363,12 @@ function requireNative() {
           const binding = require('@query-graph/core-linux-arm64-musl')
           const bindingPackageVersion = require('@query-graph/core-linux-arm64-musl/package.json').version
           if (
-            bindingPackageVersion !== '1.1.5' &&
+            bindingPackageVersion !== '1.1.7' &&
             process.env.NAPI_RS_ENFORCE_VERSION_CHECK &&
             process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0'
           ) {
             throw new Error(
-              `Native binding package version mismatch, expected 1.1.5 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
+              `Native binding package version mismatch, expected 1.1.7 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
             )
           }
           return binding
@@ -385,12 +385,12 @@ function requireNative() {
           const binding = require('@query-graph/core-linux-arm64-gnu')
           const bindingPackageVersion = require('@query-graph/core-linux-arm64-gnu/package.json').version
           if (
-            bindingPackageVersion !== '1.1.5' &&
+            bindingPackageVersion !== '1.1.7' &&
             process.env.NAPI_RS_ENFORCE_VERSION_CHECK &&
             process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0'
           ) {
             throw new Error(
-              `Native binding package version mismatch, expected 1.1.5 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
+              `Native binding package version mismatch, expected 1.1.7 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
             )
           }
           return binding
@@ -409,12 +409,12 @@ function requireNative() {
           const binding = require('@query-graph/core-linux-arm-musleabihf')
           const bindingPackageVersion = require('@query-graph/core-linux-arm-musleabihf/package.json').version
           if (
-            bindingPackageVersion !== '1.1.5' &&
+            bindingPackageVersion !== '1.1.7' &&
             process.env.NAPI_RS_ENFORCE_VERSION_CHECK &&
             process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0'
           ) {
             throw new Error(
-              `Native binding package version mismatch, expected 1.1.5 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
+              `Native binding package version mismatch, expected 1.1.7 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
             )
           }
           return binding
@@ -431,12 +431,12 @@ function requireNative() {
           const binding = require('@query-graph/core-linux-arm-gnueabihf')
           const bindingPackageVersion = require('@query-graph/core-linux-arm-gnueabihf/package.json').version
           if (
-            bindingPackageVersion !== '1.1.5' &&
+            bindingPackageVersion !== '1.1.7' &&
             process.env.NAPI_RS_ENFORCE_VERSION_CHECK &&
             process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0'
           ) {
             throw new Error(
-              `Native binding package version mismatch, expected 1.1.5 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
+              `Native binding package version mismatch, expected 1.1.7 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
             )
           }
           return binding
@@ -455,12 +455,12 @@ function requireNative() {
           const binding = require('@query-graph/core-linux-loong64-musl')
           const bindingPackageVersion = require('@query-graph/core-linux-loong64-musl/package.json').version
           if (
-            bindingPackageVersion !== '1.1.5' &&
+            bindingPackageVersion !== '1.1.7' &&
             process.env.NAPI_RS_ENFORCE_VERSION_CHECK &&
             process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0'
           ) {
             throw new Error(
-              `Native binding package version mismatch, expected 1.1.5 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
+              `Native binding package version mismatch, expected 1.1.7 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
             )
           }
           return binding
@@ -477,12 +477,12 @@ function requireNative() {
           const binding = require('@query-graph/core-linux-loong64-gnu')
           const bindingPackageVersion = require('@query-graph/core-linux-loong64-gnu/package.json').version
           if (
-            bindingPackageVersion !== '1.1.5' &&
+            bindingPackageVersion !== '1.1.7' &&
             process.env.NAPI_RS_ENFORCE_VERSION_CHECK &&
             process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0'
           ) {
             throw new Error(
-              `Native binding package version mismatch, expected 1.1.5 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
+              `Native binding package version mismatch, expected 1.1.7 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
             )
           }
           return binding
@@ -501,12 +501,12 @@ function requireNative() {
           const binding = require('@query-graph/core-linux-riscv64-musl')
           const bindingPackageVersion = require('@query-graph/core-linux-riscv64-musl/package.json').version
           if (
-            bindingPackageVersion !== '1.1.5' &&
+            bindingPackageVersion !== '1.1.7' &&
             process.env.NAPI_RS_ENFORCE_VERSION_CHECK &&
             process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0'
           ) {
             throw new Error(
-              `Native binding package version mismatch, expected 1.1.5 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
+              `Native binding package version mismatch, expected 1.1.7 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
             )
           }
           return binding
@@ -523,12 +523,12 @@ function requireNative() {
           const binding = require('@query-graph/core-linux-riscv64-gnu')
           const bindingPackageVersion = require('@query-graph/core-linux-riscv64-gnu/package.json').version
           if (
-            bindingPackageVersion !== '1.1.5' &&
+            bindingPackageVersion !== '1.1.7' &&
             process.env.NAPI_RS_ENFORCE_VERSION_CHECK &&
             process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0'
           ) {
             throw new Error(
-              `Native binding package version mismatch, expected 1.1.5 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
+              `Native binding package version mismatch, expected 1.1.7 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
             )
           }
           return binding
@@ -546,12 +546,12 @@ function requireNative() {
         const binding = require('@query-graph/core-linux-ppc64-gnu')
         const bindingPackageVersion = require('@query-graph/core-linux-ppc64-gnu/package.json').version
         if (
-          bindingPackageVersion !== '1.1.5' &&
+          bindingPackageVersion !== '1.1.7' &&
           process.env.NAPI_RS_ENFORCE_VERSION_CHECK &&
           process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0'
         ) {
           throw new Error(
-            `Native binding package version mismatch, expected 1.1.5 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
+            `Native binding package version mismatch, expected 1.1.7 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
           )
         }
         return binding
@@ -568,12 +568,12 @@ function requireNative() {
         const binding = require('@query-graph/core-linux-s390x-gnu')
         const bindingPackageVersion = require('@query-graph/core-linux-s390x-gnu/package.json').version
         if (
-          bindingPackageVersion !== '1.1.5' &&
+          bindingPackageVersion !== '1.1.7' &&
           process.env.NAPI_RS_ENFORCE_VERSION_CHECK &&
           process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0'
         ) {
           throw new Error(
-            `Native binding package version mismatch, expected 1.1.5 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
+            `Native binding package version mismatch, expected 1.1.7 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
           )
         }
         return binding
@@ -594,12 +594,12 @@ function requireNative() {
         const binding = require('@query-graph/core-openharmony-arm64')
         const bindingPackageVersion = require('@query-graph/core-openharmony-arm64/package.json').version
         if (
-          bindingPackageVersion !== '1.1.5' &&
+          bindingPackageVersion !== '1.1.7' &&
           process.env.NAPI_RS_ENFORCE_VERSION_CHECK &&
           process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0'
         ) {
           throw new Error(
-            `Native binding package version mismatch, expected 1.1.5 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
+            `Native binding package version mismatch, expected 1.1.7 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
           )
         }
         return binding
@@ -616,12 +616,12 @@ function requireNative() {
         const binding = require('@query-graph/core-openharmony-x64')
         const bindingPackageVersion = require('@query-graph/core-openharmony-x64/package.json').version
         if (
-          bindingPackageVersion !== '1.1.5' &&
+          bindingPackageVersion !== '1.1.7' &&
           process.env.NAPI_RS_ENFORCE_VERSION_CHECK &&
           process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0'
         ) {
           throw new Error(
-            `Native binding package version mismatch, expected 1.1.5 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
+            `Native binding package version mismatch, expected 1.1.7 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
           )
         }
         return binding
@@ -638,12 +638,12 @@ function requireNative() {
         const binding = require('@query-graph/core-openharmony-arm')
         const bindingPackageVersion = require('@query-graph/core-openharmony-arm/package.json').version
         if (
-          bindingPackageVersion !== '1.1.5' &&
+          bindingPackageVersion !== '1.1.7' &&
           process.env.NAPI_RS_ENFORCE_VERSION_CHECK &&
           process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0'
         ) {
           throw new Error(
-            `Native binding package version mismatch, expected 1.1.5 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
+            `Native binding package version mismatch, expected 1.1.7 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`,
           )
         }
         return binding

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@query-graph/core",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "description": "Native query graph planner and SQL compiler for Node.js",
   "workspaces": [
     "packages/*"
@@ -141,9 +141,9 @@
   },
   "packageManager": "yarn@4.13.0",
   "optionalDependencies": {
-    "@query-graph/core-win32-x64-msvc": "1.1.5",
-    "@query-graph/core-darwin-x64": "1.1.5",
-    "@query-graph/core-linux-x64-gnu": "1.1.5",
-    "@query-graph/core-darwin-arm64": "1.1.5"
+    "@query-graph/core-win32-x64-msvc": "1.1.7",
+    "@query-graph/core-darwin-x64": "1.1.7",
+    "@query-graph/core-linux-x64-gnu": "1.1.7",
+    "@query-graph/core-darwin-arm64": "1.1.7"
   }
 }

package/types/authoring.d.ts

@@ -1,5 +1,6 @@
 import type {
   AggregateExpression,
+  AllGroupsExpression,
   AllNullability,
   AnyNullability,
   BinaryExpression,
@@ -13,7 +14,9 @@ import type {
   FirstBySelection,
   FunctionExpression,
   GraphDefinition,
+  GroupKeyExpression,
   InExpression,
+  InGroupValuesExpression,
   InParameterExpression,
   JoinProjectionPath,
   LikeExpression,
@@ -84,11 +87,14 @@ export interface SourceRef<Key extends string = string, Fields extends FieldSpec
   >
 }
 
+declare const parameterRefBrand: unique symbol
+
 export interface ScalarParameterRef<
   Name extends string = string,
   Type extends ScalarType = ScalarType,
   Required extends boolean = boolean,
 > extends ParameterDefinition {
+  readonly [parameterRefBrand]: true
   name: Name
   scalarType: Type
   shape?: 'scalar'
@@ -100,17 +106,52 @@ export interface ListParameterRef<
   Type extends ScalarType = ScalarType,
   Required extends boolean = boolean,
 > extends ParameterDefinition {
+  readonly [parameterRefBrand]: true
   name: Name
   scalarType: Type
   shape: 'list'
   required?: Required
 }
 
+export interface GroupedListParameterRef<
+  Name extends string = string,
+  Key extends ScalarType = ScalarType,
+  Value extends ScalarType = ScalarType,
+  Required extends boolean = boolean,
+> extends ParameterDefinition {
+  readonly [parameterRefBrand]: true
+  name: Name
+  scalarType: Value
+  shape: 'groupedList'
+  keyType: Key
+  required?: Required
+}
+
+declare const groupValuesRefBrand: unique symbol
+
+export interface GroupValuesRef<Type extends ScalarType = ScalarType> {
+  readonly [groupValuesRefBrand]: Type
+  readonly scope: string
+}
+
+export interface GroupedListParameterTypes<Key extends ScalarType = ScalarType, Value extends ScalarType = ScalarType> {
+  key: Key
+  value: Value
+}
+
+export interface GroupScope<Key extends ScalarType = ScalarType, Value extends ScalarType = ScalarType> {
+  key: TypedExpression<GroupKeyExpression, Key, false>
+  values: GroupValuesRef<Value>
+}
+
 export type ParameterRef<
   Name extends string = string,
   Type extends ScalarType = ScalarType,
   Required extends boolean = boolean,
-> = ScalarParameterRef<Name, Type, Required> | ListParameterRef<Name, Type, Required>
+> =
+  | ScalarParameterRef<Name, Type, Required>
+  | ListParameterRef<Name, Type, Required>
+  | GroupedListParameterRef<Name, ScalarType, Type, Required>
 
 export type RelationRef<
   Name extends string = string,
@@ -121,7 +162,7 @@ export type RelationRef<
 > = RelationDefinition<Name, From, To, Required, Cardinality>
 
 export type LiteralInput = null | boolean | string | number
-export type ExpressionInput = Expression | LiteralInput | SummaryFieldDefinition
+export type ExpressionInput = Expression | LiteralInput | ScalarParameterRef | SummaryFieldDefinition
 
 type NumberLiteralScalarType<Value extends number> = number extends Value
   ? 'int64' | 'decimal'
@@ -134,26 +175,30 @@ type InputScalarType<Input extends ExpressionInput> =
     ? Type
     : Input extends ProjectionFieldDefinition<infer _Path, infer Type, infer _Nullability, infer _SelectedByDefault>
       ? Type
-      : Input extends null
-        ? null
-        : Input extends boolean
-          ? 'boolean'
-          : Input extends string
-            ? 'string'
-            : Input extends number
-              ? NumberLiteralScalarType<Input>
-              : ScalarType
+      : Input extends ScalarParameterRef<infer _Name, infer Type, infer _Required>
+        ? Type
+        : Input extends null
+          ? null
+          : Input extends boolean
+            ? 'boolean'
+            : Input extends string
+              ? 'string'
+              : Input extends number
+                ? NumberLiteralScalarType<Input>
+                : ScalarType
 
 type InputNullability<Input extends ExpressionInput> =
   Input extends ExpressionTypeMetadata<infer _Type, infer Nullability>
     ? Nullability
     : Input extends ProjectionFieldDefinition<infer _Path, infer _Type, infer Nullability, infer _SelectedByDefault>
       ? Nullability
-      : Input extends null
-        ? true
-        : Input extends Expression
-          ? boolean
-          : false
+      : Input extends ScalarParameterRef
+        ? false
+        : Input extends null
+          ? true
+          : Input extends Expression
+            ? boolean
+            : false
 
 export type ExpressionScalarType<Input extends ExpressionInput> = InputScalarType<Input>
 export type ExpressionNullability<Input extends ExpressionInput> = InputNullability<Input>
@@ -176,6 +221,8 @@ type AverageScalarType<Type extends ScalarType | null> = Type extends 'float64'
     ? 'decimal'
     : Exclude<Type, null>
 
+type DivideScalarType<Type extends ScalarType | null> = 'float64' extends Type ? 'float64' : 'decimal'
+
 type InputNullabilities<Inputs extends readonly ExpressionInput[]> = {
   [Index in keyof Inputs]: InputNullability<Inputs[Index]>
 }
@@ -188,7 +235,13 @@ export interface FieldTypeOptions {
   selectable?: boolean
 }
 
-type OptionNullable<Options extends FieldTypeOptions> = Options extends { nullable: true } ? true : false
+type OptionNullable<Options extends FieldTypeOptions> = Options extends unknown
+  ? Options['nullable'] extends infer Nullable
+    ? Nullable extends true
+      ? true
+      : false
+    : never
+  : never
 type OptionSelectable<Options extends FieldTypeOptions> = Options extends { selectable: false } ? false : true
 
 export function fieldType<const Type extends ScalarType, const Options extends FieldTypeOptions = Record<never, never>>(
@@ -211,18 +264,44 @@ export function requiredParameter<const Name extends string, const Type extends
   name: Name,
   scalarType: Type,
 ): ScalarParameterRef<Name, Type, true>
+export const requiredParam: typeof requiredParameter
 export function optionalParameter<const Name extends string, const Type extends ScalarType>(
   name: Name,
   scalarType: Type,
 ): ScalarParameterRef<Name, Type, false>
+export const optionalParam: typeof optionalParameter
 export function requiredListParameter<const Name extends string, const Type extends ScalarType>(
   name: Name,
   scalarType: Type,
 ): ListParameterRef<Name, Type, true>
+export const requiredListParam: typeof requiredListParameter
 export function optionalListParameter<const Name extends string, const Type extends ScalarType>(
   name: Name,
   scalarType: Type,
 ): ListParameterRef<Name, Type, false>
+export const optionalListParam: typeof optionalListParameter
+export function requiredGroupsParameter<
+  const Name extends string,
+  const Key extends ScalarType,
+  const Value extends ScalarType,
+>(name: Name, types: GroupedListParameterTypes<Key, Value>): GroupedListParameterRef<Name, Key, Value, true>
+export const requiredGroupsParam: typeof requiredGroupsParameter
+export function optionalGroupsParameter<
+  const Name extends string,
+  const Key extends ScalarType,
+  const Value extends ScalarType,
+>(name: Name, types: GroupedListParameterTypes<Key, Value>): GroupedListParameterRef<Name, Key, Value, false>
+export const optionalGroupsParam: typeof optionalGroupsParameter
+export function allGroups<
+  const Name extends string,
+  const Key extends ScalarType,
+  const Value extends ScalarType,
+  const Predicate extends ExpressionInput,
+>(
+  parameter: GroupedListParameterRef<Name, Key, Value>,
+  predicate: (group: GroupScope<Key, Value>) => Predicate,
+): TypedExpression<AllGroupsExpression<Name>, 'boolean', InputNullability<Predicate>>
+/** @deprecated Pass a scalar parameter reference directly to an expression factory. */
 export function param<const Name extends string, const Type extends ScalarType>(
   parameter: ScalarParameterRef<Name, Type>,
 ): TypedExpression<ParameterExpression<Name>, Type, false>
@@ -233,11 +312,20 @@ export function literal<const Value extends LiteralInput>(
 export function integer(value: number): TypedExpression<LiteralExpression, 'int64', false>
 export function decimal(value: string | number): TypedExpression<LiteralExpression, 'decimal', false>
 
-type EqualityNullability<Left extends ExpressionInput, Right extends ExpressionInput> = null extends
-  | InputScalarType<Left>
-  | InputScalarType<Right>
+// A null literal becomes IS NULL / IS NOT NULL, so literals do not add equality nullability.
+type EqualityOperandNullability<Input extends ExpressionInput> = Input extends LiteralExpression
   ? false
-  : AnyInputNullability<readonly [Left, Right]>
+  : InputNullability<Input>
+
+type EqualityNullability<Left extends ExpressionInput, Right extends ExpressionInput> = Left extends unknown
+  ? Right extends unknown
+    ? [InputScalarType<Left>] extends [null]
+      ? false
+      : [InputScalarType<Right>] extends [null]
+        ? false
+        : AnyNullability<readonly [EqualityOperandNullability<Left>, EqualityOperandNullability<Right>]>
+    : never
+  : never
 
 export function eq<const Left extends ExpressionInput, const Right extends ExpressionInput>(
   left: Left,
@@ -282,6 +370,11 @@ export function inParameter<
   expression: Value,
   parameter: ListParameterRef<Name, Type>,
 ): TypedExpression<InParameterExpression<Name>, 'boolean', InputNullability<Value>>
+export function inParameter<const Value extends ExpressionInput, const Type extends ScalarType>(
+  expression: Value,
+  values: GroupValuesRef<Type>,
+): TypedExpression<InGroupValuesExpression, 'boolean', InputNullability<Value>>
+export const inParam: typeof inParameter
 export function or<const Expressions extends readonly ExpressionInput[]>(
   ...expressions: Expressions
 ): TypedExpression<ExpressionGroup, 'boolean', AnyInputNullability<Expressions>>
@@ -326,6 +419,25 @@ export function concat<const First extends ExpressionInput, const Rest extends r
   first: First,
   ...rest: Rest
 ): TypedExpression<FunctionExpression, 'string', AllInputNullability<readonly [First, ...Rest]>>
+export function divide<const Left extends ExpressionInput, const Right extends ExpressionInput>(
+  left: Left,
+  right: Right,
+): TypedExpression<
+  FunctionExpression,
+  DivideScalarType<InputScalarType<Left | Right>>,
+  AnyInputNullability<readonly [Left, Right]>
+>
+export function truncate<const Value extends ExpressionInput>(
+  expression: Value,
+): TypedExpression<FunctionExpression, Exclude<InputScalarType<Value>, null>, InputNullability<Value>>
+export function modulo<const Left extends ExpressionInput, const Right extends ExpressionInput>(
+  left: Left,
+  right: Right,
+): TypedExpression<
+  FunctionExpression,
+  PromoteScalarType<InputScalarType<Left | Right>>,
+  AnyInputNullability<readonly [Left, Right]>
+>
 
 export function count(expression?: ExpressionInput): TypedExpression<AggregateExpression, 'int64', false>
 export function countDistinct(expression: ExpressionInput): TypedExpression<AggregateExpression, 'int64', false>