@query-graph/core 1.1.5 → 1.1.7

package/types/composition.d.ts

@@ -12,35 +12,17 @@ import type {
   DefinitionParameter,
   DefinitionProjectionField,
   DefinitionProjectionPath,
-  OperationParameters,
+  OperationParameterInput,
+  OptionalParameter,
   OracleCompileOptions,
   ParameterValue,
   QueryOperationBase,
   RelationalQueryGraph,
+  RequiredParameter,
   SqlServerCompileOptions,
 } from './runtime.js'
 import type { ListParameterRef } from './authoring.js'
 
-type RequiredParameter<Parameter extends ParameterDefinition> = Parameter extends unknown
-  ? Parameter extends { required?: true }
-    ? Parameter
-    : never
-  : never
-
-type OptionalParameter<Parameter extends ParameterDefinition> = Parameter extends unknown
-  ? Parameter extends { required?: true }
-    ? never
-    : Parameter
-  : never
-
-type OperationParameterInput<Definition extends GraphDefinitionInput> = [DefinitionParameter<Definition>] extends [
-  never,
-]
-  ? { parameters?: never }
-  : [RequiredParameter<DefinitionParameter<Definition>>] extends [never]
-    ? { parameters?: OperationParameters<Definition> }
-    : { parameters: OperationParameters<Definition> }
-
 type ProjectionFieldPath<Field> =
   Field extends ProjectionTypeMetadata<infer Path, infer _Type, infer _Nullability, infer _SelectedByDefault>
     ? Path

package/types/model.d.ts

@@ -24,11 +24,11 @@ export type ScalarParameterValue<Type extends ScalarType> = Type extends 'boolea
           ? JsonValue
           : never
 
-export type ParameterShape = 'scalar' | 'list'
+export type ParameterShape = 'scalar' | 'list' | 'groupedList'
 export type RelationCardinality = 'one' | 'many'
 export type OrderDirection = 'asc' | 'desc'
 export type NullsOrder = 'first' | 'last'
-export type SemanticFunctionName = 'lower' | 'upper' | 'coalesce' | 'concat'
+export type SemanticFunctionName = 'lower' | 'upper' | 'coalesce' | 'concat' | 'divide' | 'truncate' | 'modulo'
 export type AggregateFunctionName = 'count' | 'countDistinct' | 'sum' | 'average' | 'minimum' | 'maximum'
 export type ProjectionFieldRole = 'value' | 'dimension' | 'measure'
 
@@ -86,6 +86,7 @@ export interface ParameterDefinition {
   name: string
   scalarType: ScalarType
   shape?: ParameterShape
+  keyType?: ScalarType
   required?: boolean
 }
 
@@ -144,6 +145,24 @@ export interface InParameterExpression<Name extends string = string> {
   parameter: Name
 }
 
+export interface GroupKeyExpression {
+  kind: 'groupKey'
+  scope: string
+}
+
+export interface InGroupValuesExpression {
+  kind: 'inGroupValues'
+  expression: Expression
+  scope: string
+}
+
+export interface AllGroupsExpression<Name extends string = string> {
+  kind: 'allGroups'
+  parameter: Name
+  scope: string
+  predicate: Expression
+}
+
 export interface ExpressionGroup {
   kind: 'and' | 'or'
   expressions: Expression[]
@@ -181,6 +200,9 @@ export type Expression =
   | LikeExpression
   | InExpression
   | InParameterExpression
+  | GroupKeyExpression
+  | InGroupValuesExpression
+  | AllGroupsExpression
   | ExpressionGroup
   | UnaryExpression
   | ExistsExpression
@@ -376,7 +398,7 @@ export interface FirstBySelection {
 export type RelationSelection = FirstBySelection
 
 export interface GraphDefinitionInput {
-  schemaVersion: 10
+  schemaVersion: 12
   name: string
   root: string
   sources: SourceDefinition[]

package/types/runtime.d.ts

@@ -6,6 +6,7 @@ import type {
   ProjectionDefinitionInput,
   RelationalMapping,
   ScalarParameterValue,
+  ScalarType,
 } from './model.js'
 
 export interface QueryOperationBase<SelectPath extends string = string, OrderingName extends string = string> {
@@ -66,17 +67,22 @@ export type DefinitionRelation<Definition extends GraphDefinitionInput> = NonNul
 
 export type DefinitionRoot<Definition extends GraphDefinitionInput> = Definition['root']
 
-export type ParameterValue<Parameter extends ParameterDefinition> = Parameter extends { shape: 'list' }
-  ? readonly ScalarParameterValue<Parameter['scalarType']>[]
-  : ScalarParameterValue<Parameter['scalarType']>
+export type ParameterValue<Parameter extends ParameterDefinition> = Parameter extends {
+  shape: 'groupedList'
+  keyType: infer Key extends ScalarType
+}
+  ? readonly { key: ScalarParameterValue<Key>; values: readonly ScalarParameterValue<Parameter['scalarType']>[] }[]
+  : Parameter extends { shape: 'list' }
+    ? readonly ScalarParameterValue<Parameter['scalarType']>[]
+    : ScalarParameterValue<Parameter['scalarType']>
 
-type RequiredParameter<Parameter extends ParameterDefinition> = Parameter extends unknown
+export type RequiredParameter<Parameter extends ParameterDefinition> = Parameter extends unknown
   ? Parameter extends { required?: true }
     ? Parameter
     : never
   : never
 
-type OptionalParameter<Parameter extends ParameterDefinition> = Parameter extends unknown
+export type OptionalParameter<Parameter extends ParameterDefinition> = Parameter extends unknown
   ? Parameter extends { required?: true }
     ? never
     : Parameter
@@ -88,9 +94,9 @@ export type OperationParameters<Definition extends GraphDefinitionInput> = {
   [Parameter in OptionalParameter<DefinitionParameter<Definition>> as Parameter['name']]?: ParameterValue<Parameter>
 }
 
-type OperationParameterInput<Definition extends GraphDefinitionInput> = [DefinitionParameter<Definition>] extends [
-  never,
-]
+export type OperationParameterInput<Definition extends GraphDefinitionInput> = [
+  DefinitionParameter<Definition>,
+] extends [never]
   ? { parameters?: never }
   : [RequiredParameter<DefinitionParameter<Definition>>] extends [never]
     ? { parameters?: OperationParameters<Definition> }